Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 45b2c3c7

Přidáno uživatelem Michal Kliment před více než 9 roky(ů)

Merge from SVN trunk.

Zobrazit rozdíly:

application/controllers/messages.php
if (module::e('sms') &&
Message_Model::has_sms_content($message->type))
{
$sms_text = trim(text::cs_utf2ascii(strip_tags($form_data['sms_text'])));
$sms_text = trim(text::cs_utf2ascii($form_data['sms_text']));
$message->sms_text = empty($sms_text) ? NULL : $sms_text;
}
......
Message_Model::has_sms_content($message->type))
{
// sms text
$sms_text = trim(text::cs_utf2ascii(strip_tags($form_data['sms_text'])));
$sms_text = trim(text::cs_utf2ascii($form_data['sms_text']));
// set var
$message->sms_text = empty($sms_text) ? NULL : $sms_text;
}
application/controllers/settings.php
// Delete body and html tags
$html = preg_replace('/<html.*?>.*?<body.*?>/is', '', $html);
$html = preg_replace('/<\/body><\/html>/is', '', $html);
$html = preg_replace('/table border="0"/is', 'table class="extended"', $html);
$html = preg_replace('/width="600"/is', 'width="720" style="table-layout:fixed; overflow: hidden"', $html);
if (PHP_VERSION_ID >= 50600) {
$html = preg_replace('/<table>/is', '<table class="extended" width="720" style="table-layout:fixed; overflow: hidden">', $html);
} else {
$html = preg_replace('/table border="0"/is', 'table class="extended"', $html);
$html = preg_replace('/width="600"/is', 'width="720" style="table-layout:fixed; overflow: hidden"', $html);
}
}
$table = new View('table_2_columns');
application/views/messages/show.php
<?php if (module::e('sms') && $message->sms_text): ?>
<tr>
<th><?php echo __('Content of the message for SMS') ?></th>
<td class="notification_message_content"><?php echo $message->sms_text ?></td>
<td class="notification_message_content"><?php echo html::specialchars($message->sms_text) ?></td>
</tr>
<?php endif ?>
</table>

Také k dispozici: Unified diff