Menu
▾
▴
[SM-CVS] CVS: squirrelmail/src compose.php,1.306,1.307 download.php,1.102,1.103 printer_friendly_bottom.php,1.25,1.26 read_body.php,1.279,1.280 vcard.php,1.19,1.20 view_header.php,1.12,1.13
|
From: Marc G. K. <st...@us...> - 2003-02-28 19:13:14
|
Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1098
Modified Files:
compose.php download.php printer_friendly_bottom.php
read_body.php vcard.php view_header.php
Log Message:
charset encode /decode fixes
Index: compose.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/compose.php,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -w -r1.306 -r1.307
--- compose.php 7 Feb 2003 23:09:16 -0000 1.306
+++ compose.php 28 Feb 2003 19:12:58 -0000 1.307
@@ -165,20 +165,24 @@
foreach($display as $key => $val) {
$display[$key] = $key .': '. str_pad('', $maxsize - $val);
}
+ $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false);
+ $from = str_replace(' ',' ',$from);
+ $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false);
+ $to = str_replace(' ',' ',$to);
+ $subject = decodeHeader($orig_header->subject,false,false);
+ $subject = str_replace(' ',' ',$subject);
$bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) .
- "\n". $display[_("Subject")] .
- decodeHeader($orig_header->subject) . "\n" .
- $display[_("From")] .
- decodeHeader($orig_header->getAddr_s('from',"\n$indent")) . "\n" .
- $display[_("Date")] .
- getLongDateString( $orig_header->date ). "\n" .
- $display[_("To")] .
- decodeHeader($orig_header->getAddr_s('to',"\n$indent")) ."\n";
+ "\n\n". $display[_("Subject")] . $subject . "\n" .
+ $display[_("From")] . $from . "\n" .
+ $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" .
+ $display[_("To")] . $to . "\n";
if ($orig_header->cc != array() && $orig_header->cc !='') {
- $bodyTop .= $display[_("Cc")] . decodeHeader($orig_header->getAddr_s('cc',"\n$indent")) . "\n";
+ $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false);
+ $cc = str_replace(' ',' ',$cc);
+ $bodyTop .= $display[_("Cc")] .$cc . "\n";
}
$bodyTop .= str_pad('', $editor_size -2 , '-') .
- "\n";
+ "\n\n";
return $bodyTop;
}
/* ----------------------------------------------------------------------- */
@@ -616,10 +620,10 @@
switch ($action) {
case ('draft'):
$use_signature = FALSE;
- $send_to = decodeHeader($orig_header->getAddr_s('to'));
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'));
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'));
- $subject = decodeHeader($orig_header->subject);
+ $send_to = $orig_header->getAddr_s('to');
+ $send_to_cc = $orig_header->getAddr_s('cc');
+ $send_to_bcc = $orig_header->getAddr_s('bcc');
+ $subject = $orig_header->subject;
$body_ary = explode("\n", $body);
$cnt = count($body_ary) ;
@@ -635,10 +639,10 @@
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
break;
case ('edit_as_new'):
- $send_to = decodeHeader($orig_header->getAddr_s('to'));
- $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'));
- $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'));
- $subject = decodeHeader($orig_header->subject);
+ $send_to = $orig_header->getAddr_s('to');
+ $send_to_cc = $orig_header->getAddr_s('cc');
+ $send_to_bcc = $orig_header->getAddr_s('bcc');
+ $subject = $orig_header->subject;
$mailprio = $orig_header->priority;
$orig_from = '';
$composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection);
@@ -646,7 +650,7 @@
break;
case ('forward'):
$send_to = '';
- $subject = decodeHeader($orig_header->subject);
+ $subject = decodeHeader($orig_header->subject,true,false);
if ((substr(strtolower($subject), 0, 4) != 'fwd:') &&
(substr(strtolower($subject), 0, 5) != '[fwd:') &&
(substr(strtolower($subject), 0, 6) != '[ fwd:')) {
@@ -666,13 +670,13 @@
case ('reply'):
$send_to = $orig_header->reply_to;
if (is_array($send_to) && count($send_to)) {
- $send_to = decodeHeader($orig_header->getAddr_s('reply_to'));
+ $send_to = $orig_header->getAddr_s('reply_to');
} else if (is_object($send_to)) { /* unnessecarry, just for falesafe purpose */
- $send_to = decodeHeader($orig_header->getAddr_s('reply_to'));
+ $send_to = $orig_header->getAddr_s('reply_to');
} else {
- $send_to = decodeHeader($orig_header->getAddr_s('from'));
+ $send_to = $orig_header->getAddr_s('from');
}
- $subject = decodeHeader($orig_header->subject);
+ $subject = $orig_header->subject;
$subject = str_replace('"', "'", $subject);
$subject = trim($subject);
if (substr(strtolower($subject), 0, 3) != 're:') {
@@ -725,23 +729,23 @@
switch ($message->type0) {
case 'message':
if ($message->type1 == 'rfc822') {
- $filename = decodeHeader($message->rfc822_header->subject.'.eml');
+ $filename = $message->rfc822_header->subject.'.eml';
if ($filename == "") {
$filename = "untitled-".$message->entity_id.'.eml';
}
} else {
- $filename = decodeHeader($message->getFilename());
+ $filename = $message->getFilename();
}
break;
default:
- $filename = decodeHeader($message->getFilename());
+ $filename = $message->getFilename();
break;
}
+ $filename = decodeHeader($filename);
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
$filename = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $filename);
}
-
$localfilename = GenerateRandomString(32, '', 7);
$full_localfilename = "$hashed_attachment_dir/$localfilename";
while (file_exists($full_localfilename)) {
@@ -767,7 +771,6 @@
$composeMessage=getAttachments($message->entities[$i], $composeMessage, $passed_id, $entities, $imapConnection);
}
}
-// setPref($data_dir, $username, 'attachments', serialize($attachments));
return $composeMessage;
}
@@ -816,7 +819,6 @@
$composeMessage = $compose_messages[$session];
- $subject = decodeHeader($subject, false);
if ($values) {
$send_to = $values['send_to'];
$send_to_cc = $values['send_to_cc'];
@@ -908,7 +910,7 @@
_("To:") . '</TD>' . "\n" .
html_tag( 'td', '', 'left', $color[4], 'WIDTH="90%"' ) .
' <INPUT TYPE=text NAME="send_to" VALUE="' .
- htmlspecialchars($send_to) . '" SIZE=60><BR>' . "\n" .
+ decodeHeader($send_to,false) . '" SIZE=60><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
@@ -916,7 +918,7 @@
_("CC:") . '</TD>' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
' <INPUT TYPE=text NAME="send_to_cc" SIZE=60 VALUE="' .
- htmlspecialchars($send_to_cc) . '"><BR>' . "\n" .
+ decodeHeader($send_to_cc,false) . '"><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
@@ -924,7 +926,7 @@
_("BCC:") . '</TD>' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) .
' <INPUT TYPE=text NAME="send_to_bcc" VALUE="' .
- htmlspecialchars($send_to_bcc) . '" SIZE=60><BR>' . "\n" .
+ decodeHeader($send_to_bcc,false) . '" SIZE=60><BR>' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n" .
' <TR>' . "\n" .
@@ -932,7 +934,7 @@
_("Subject:") . '</TD>' . "\n" .
html_tag( 'td', '', 'left', $color[4] ) . "\n";
echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
- htmlspecialchars($subject) . '">' . "\n" .
+ decodeHeader($subject,false) . '">' . "\n" .
' </TD>' . "\n" .
' </TR>' . "\n\n";
@@ -966,21 +968,21 @@
if ($default_charset == 'iso-2022-jp') {
echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
} else {
- echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
+ echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false);
}
- echo "\n\n".htmlspecialchars($body);
+ echo "\n\n".decodeHeader($body,false);
}
else {
- echo "\n\n".htmlspecialchars($body);
+ echo "\n\n".decodeHeader($body,false);
if ($default_charset == 'iso-2022-jp') {
echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
}else{
- echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
+ echo "\n\n".($prefix_sig==true? "-- \n":'').decodeHeader($signature,false);
}
}
}
else {
- echo htmlspecialchars($body);
+ echo decodeHeader($body,false);
}
echo '</TEXTAREA><BR>' . "\n" .
' </TD>' . "\n" .
@@ -1027,11 +1029,11 @@
$type = $attachment->mime_header->type0.'/'.
$attachment->mime_header->type1;
- $s_a[] = '<table bgcolor="'.$color[0].'" border="0"><tr><td><input type="checkbox" name="delete[]" value
-="' .
- $key . "\"></td><td>\n" . $attached_filename . '</td><td>-</
-td><td> ' . $type . '</td><td>('.show_readable_size( filesize( $attached_file ) ) . '
-)</td></tr></table>'."\n";
+ $s_a[] = '<table bgcolor="'.$color[0].
+ '" border="0"><tr><td><input type="checkbox" name="delete[]" value="' .
+ $key . "\"></td><td>\n" . $attached_filename .
+ '</td><td>-</td><td> ' . $type . '</td><td>('.
+ show_readable_size( filesize( $attached_file ) ) . ')</td></tr></table>'."\n";
}
}
}
@@ -1258,7 +1260,6 @@
$rfc822_header = $composeMessage->rfc822_header;
$abook = addressbook_init(false, true);
-
$rfc822_header->to = $rfc822_header->parseAddress($send_to,true, array(), '', $domain, array(&$abook,'lookup'));
$rfc822_header->cc = $rfc822_header->parseAddress($send_to_cc,true,array(), '',$domain, array(&$abook,'lookup'));
$rfc822_header->bcc = $rfc822_header->parseAddress($send_to_bcc,true, array(), '',$domain, array(&$abook,'lookup'));
Index: download.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/download.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -w -r1.102 -r1.103
--- download.php 30 Jan 2003 18:05:49 -0000 1.102
+++ download.php 28 Feb 2003 19:13:00 -0000 1.103
@@ -38,7 +38,7 @@
}
/* end globals */
-$mailbox = decodeHeader($mailbox);
+$mailbox = urldecode($mailbox);
global $uid_support;
@@ -85,17 +85,17 @@
}
$filename = '';
if (is_object($message->header->disposition)) {
- $filename = decodeHeader($header->disposition->getProperty('filename'));
+ $filename = $header->disposition->getProperty('filename');
if (!$filename) {
- $filename = decodeHeader($header->disposition->getProperty('name'));
+ $filename = $header->disposition->getProperty('name');
}
if (!$filename) {
- $filename = decodeHeader($header->getParameter('name'));
+ $filename = $header->getParameter('name');
}
} else {
- $filename = decodeHeader($header->getParameter('name'));
+ $filename = $header->getParameter('name');
}
-
+$filename = decodeHeader($filename);
if (strlen($filename) < 1) {
if ($type1 == 'plain' && $type0 == 'text') {
$suffix = 'txt';
Index: printer_friendly_bottom.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/printer_friendly_bottom.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- printer_friendly_bottom.php 31 Dec 2002 12:49:42 -0000 1.25
+++ printer_friendly_bottom.php 28 Feb 2003 19:13:02 -0000 1.26
@@ -58,13 +58,13 @@
$rfc822_header = $message->rfc822_header;
/* From and Date are usually fine as they are... */
-$from = decodeHeader($rfc822_header->getAddr_s('from'));
+$from = $rfc822_header->getAddr_s('from');
$date = getLongDateString($rfc822_header->date);
-$subject = trim(decodeHeader($rfc822_header->subject));
+$subject = trim($rfc822_header->subject);
/* we can clean these up if the list is too long... */
-$cc = decodeHeader($rfc822_header->getAddr_s('cc'));
-$to = decodeHeader($rfc822_header->getAddr_s('to'));
+$cc = $rfc822_header->getAddr_s('cc');
+$to = $rfc822_header->getAddr_s('to');
if ($show_html_default == 1) {
$ent_ar = $message->findDisplayEntity(array());
@@ -105,6 +105,11 @@
} // end cleanup
+$to = decodeHeader($to);
+$cc = decodeHeader($cc);
+$from = decodeHeader($from);
+$subject = decodeHeader($subject);
+
// --end display setup--
@@ -116,11 +121,11 @@
html_tag( 'table', '', 'center', '', 'cellspacing="0" cellpadding="0" border="0" width="100%"' ) .
html_tag( 'tr',
html_tag( 'td', _("From").' ', 'left' ,'','valign="top"') .
- html_tag( 'td', htmlspecialchars($from), 'left' )
+ html_tag( 'td', $from, 'left' )
) . "\n" .
html_tag( 'tr',
html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) .
- html_tag( 'td', htmlspecialchars($subject), 'left' )
+ html_tag( 'td', $subject, 'left' )
) . "\n" .
html_tag( 'tr',
html_tag( 'td', _("Date").' ', 'left' ) .
@@ -128,12 +133,12 @@
) . "\n" .
html_tag( 'tr',
html_tag( 'td', _("To").' ', 'left','','valign="top"' ) .
- html_tag( 'td', htmlspecialchars($to), 'left' )
+ html_tag( 'td', $to, 'left' )
) . "\n";
if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */
echo html_tag( 'tr',
html_tag( 'td', _("CC").' ', 'left','','valign="top"' ) .
- html_tag( 'td', htmlspecialchars($cc), 'left' )
+ html_tag( 'td', $cc, 'left' )
);
}
/* body */
@@ -152,7 +157,7 @@
/* $string = pf_clean_string($string, 9); */
function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
global $data_dir, $username;
-
+ $unclean_string = str_replace(' ',' ',$unclean_string);
$wrap_at = getPref($data_dir, $username, 'wrap_at', 86);
$wrap_at = $wrap_at - $num_leading_spaces; /* header stuff */
@@ -172,12 +177,12 @@
}
else
{
- $clean_string .= substr( $this_line, 0, strrpos( $this_line, ' ' ));
+ $i = strrpos( $this_line, ' ');
+ $clean_string .= substr( $this_line, 0, $i);
$clean_string .= "\n" . $leading_spaces;
- $unclean_string = substr($unclean_string, (1+strrpos( $this_line, ' ' )));
+ $unclean_string = substr($unclean_string, 1+$i);
}
}
-
$clean_string .= $unclean_string;
return $clean_string;
Index: read_body.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/read_body.php,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -w -r1.279 -r1.280
--- read_body.php 27 Feb 2003 04:50:53 -0000 1.279
+++ read_body.php 28 Feb 2003 19:13:02 -0000 1.280
@@ -369,7 +369,7 @@
$cnt = count($recipients);
foreach($recipients as $r) {
- $add = htmlspecialchars(decodeHeader($r->getAddress()));
+ $add = decodeHeader($r->getAddress(true));
if ($string) {
$string .= '<BR>' . $add;
} else {
@@ -397,7 +397,7 @@
$header = $message->rfc822_header;
$env = array();
- $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
+ $env[_("Subject")] = decodeHeader($header->subject);
$from_name = $header->getAddr_s('from');
if (!$from_name) {
$from_name = $header->getAddr_s('sender');
@@ -405,7 +405,7 @@
$from_name = _("Unknown sender");
}
}
- $env[_("From")] = htmlspecialchars(decodeHeader($from_name));
+ $env[_("From")] = decodeHeader($from_name);
$env[_("Date")] = getLongDateString($header->date);
$env[_("To")] = formatRecipientString($header->to, "to");
$env[_("Cc")] = formatRecipientString($header->cc, "cc");
@@ -414,7 +414,7 @@
$env[_("Priority")] = htmlspecialchars(getPriorityStr($header->priority));
}
if ($show_xmailer_default) {
- $env[_("Mailer")] = htmlspecialchars(decodeHeader($header->xmailer));
+ $env[_("Mailer")] = decodeHeader($header->xmailer);
}
if ($default_use_mdn) {
if ($mdn_user_support) {
@@ -601,7 +601,7 @@
$s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '</a>';
}
- $comp_action_uri = decodeHeader($comp_uri . '&action=reply');
+ $comp_action_uri = $comp_uri . '&action=reply';
$s .= $topbar_delimiter;
$s .= $link_open . $comp_action_uri . $link_close . _("Reply") . '</a>';
Index: vcard.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/vcard.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- vcard.php 11 Jan 2003 13:30:17 -0000 1.19
+++ vcard.php 28 Feb 2003 19:13:06 -0000 1.20
@@ -25,7 +25,7 @@
$key = $_COOKIE['key'];
$username = $_SESSION['username'];
$onetimepad = $_SESSION['onetimepad'];
-$mailbox = decodeHeader($_GET['mailbox']);
+$mailbox = urldecode($_GET['mailbox']);
$passed_id = (int) $_GET['passed_id'];
$ent_id = $_GET['ent_id'];
$passed_ent_id = $_GET['passed_ent_id'];
Index: view_header.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/view_header.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- view_header.php 31 Dec 2002 12:49:42 -0000 1.12
+++ view_header.php 28 Feb 2003 19:13:07 -0000 1.13
@@ -114,7 +114,7 @@
$passed_ent_id = $_GET['passed_ent_id'];
}
-$mailbox = decodeHeader($_GET['mailbox']);
+$mailbox = urldecode($_GET['mailbox']);
$imapConnection = sqimap_login($username, $key, $imapServerAddress,
$imapPort, 0);
|
