translateText($body, $wrap_at,
$body_message->header->getParameter('charset'));
}
- $link = 'read_body.php?passed_id=' . $id . '&ent_id='.$ent_num.
+ $link = 'passed_id=' . $id . '&ent_id='.$ent_num.
'&mailbox=' . $urlmailbox .'&sort=' . $sort .
'&startMessage=' . $startMessage . '&show_more=0';
if (isset($passed_ent_id)) {
$link .= '&passed_ent_id='.$passed_ent_id;
}
+ $body .= '<center><small><a href="download.php?absolute_dl=true&' .
+ $link . '">' . _("Download this as a file") . '</a>';
if ($view_unsafe_images) {
$text = _("Hide Unsafe Images");
} else {
$text = '';
}
}
- $body .= '<center><small><a href="'.$link.'">'.$text.
- '</a></small></center><br>' . "\n";
+ if($text != '') {
+ $body .= ' | <a href="read_body.php?' . $link . '">' . $text . '</a>';
+ }
+ $body .= '</small></center><br>' . "\n";
}
return $body;
}
$chunk = $res[5];
$encoded = true;
}
-
- if (!$encoded && $htmlsave) {
- $ret .= htmlspecialchars($chunk);
- } else {
- $ret .= $chunk;
- }
-
if (!$encoded) {
if ($htmlsave) {
$ret .= ' ';
$ret .= ' ';
}
}
+
+ if (!$encoded && $htmlsave) {
+ $ret .= htmlspecialchars($chunk);
+ } else {
+ $ret .= $chunk;
+ }
++$i;
}
+ /* remove the first added space */
+ if ($ret) {
+ if ($htmlsave) {
+ $ret = substr($ret,6);
+ } else {
+ $ret = substr($ret,1);
+ }
+ }
return $ret;
}
/**
* Remove any backslashes. See if there are any first.
*/
+
if (strstr($attvalue, '\\') !== false){
$attvalue = stripslashes($attvalue);
}
* @param $attvalue A string to run entity check against.
* @return Translated value.
*/
+
function sq_deent($attvalue){
$me = 'sq_deent';
/**
* See if we have to run the checks first. All entities must start
* with "&".
*/
- if (strpos($attvalue, "&") === false){
+ if (strpos($attvalue, '&') === false){
return $attvalue;
}
/**
* Leave " in, as it can mess us up.
*/
$trans = array_flip($trans);
- unset($trans{"""});
+ unset($trans{'"'});
while (list($ent, $val) = each($trans)){
- $attvalue = preg_replace("/$ent*(\W)/si", "$val\\1", $attvalue);
+ $attvalue = preg_replace('/' . $ent . '*/si', $val, $attvalue);
}
/**
* Now translate numbered entities from 1 to 255 if needed.
*/
- if (strpos($attvalue, "#") !== false){
+ if (strpos($attvalue, '#') !== false){
$omit = Array(34, 39);
- for ($asc=1; $asc<256; $asc++){
+ for ($asc = 256; $asc >= 0; $asc--){
if (!in_array($asc, $omit)){
$chr = chr($asc);
- $attvalue = preg_replace("/\�*$asc;*(\D)/si", "$chr\\1",
- $attvalue);
- $attvalue = preg_replace("/\�*".dechex($asc).";*(\W)/si",
- "$chr\\1", $attvalue);
+ $octrule = '/\�*' . $asc . ';*/si';
+ $hexrule = '/\�*' . dechex($asc) . ';*/si';
+ $attvalue = preg_replace($octrule, $chr, $attvalue);
+ $attvalue = preg_replace($hexrule, $chr, $attvalue);
}
}
}