From: Luke E. <lke...@us...> - 2001-02-01 20:51:49
|
Update of /cvsroot/squirrelmail/squirrelmail/src In directory usw-pr-cvs1:/tmp/cvs-serv22781/src Modified Files: compose.php download.php left_main.php load_prefs.php webmail.php Log Message: removed error messages Index: compose.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/compose.php,v retrieving revision 1.117 retrieving revision 1.118 diff -u -w -r1.117 -r1.118 Index: download.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/download.php,v retrieving revision 1.52 retrieving revision 1.53 diff -u -w -r1.52 -r1.53 --- download.php 2001/01/31 03:00:08 1.52 +++ download.php 2001/02/01 20:51:51 1.53 @@ -108,15 +108,13 @@ // viewer (built in to squirrelmail). Otherwise, it sets the // content-type as application/octet-stream - header("Pragma: "); - header("Content-Description: SquirrelMail Attachment"); if (isset($absolute_dl) && $absolute_dl == "true") { switch($type0) { case "text": $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); $body = decodeBody($body, $header->encoding); - header("Content-Disposition: attachment; filename=$filename"); - header("Content-type: application/octet-stream; name=$filename"); + header("Content-Disposition: attachment; filename=\"$filename\""); + header("Content-type: application/octet-stream; name=\"$filename\""); set_up_language(getPref($data_dir, $username, "language")); if ($type1 == "plain") { echo _("Subject") . ": " . decodeHeader(sqStripSlashes($top_header->subject)) . "\n"; @@ -127,8 +125,8 @@ echo trim($body); break; default: - header("Content-Disposition: attachment; filename=$filename"); - header("Content-type: application/octet-stream; name=$filename"); + header("Content-Disposition: attachment; filename=\"$filename\""); + header("Content-type: application/octet-stream; name=\"$filename\""); mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding); break; } @@ -143,8 +141,8 @@ } else { $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); $body = decodeBody($body, $header->encoding); - header("Content-type: $type0/$type1; name=$filename"); - header("Content-Disposition: attachment; filename=$filename"); + header("Content-type: $type0/$type1; name=\"$filename\""); + header("Content-Disposition: attachment; filename=\"$filename\""); echo $body; } break; Index: left_main.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/left_main.php,v retrieving revision 1.62 retrieving revision 1.63 diff -u -w -r1.62 -r1.63 --- left_main.php 2001/01/30 17:22:38 1.62 +++ left_main.php 2001/02/01 20:51:51 1.63 @@ -138,7 +138,7 @@ $line = ""; $mailbox = $boxes[$i]["formatted"]; - if ($boxes[$i]["flags"]) { + if (isset($boxes[$i]["flags"])) { $noselect = false; for ($h = 0; $h < count($boxes[$i]["flags"]); $h++) { if (strtolower($boxes[$i]["flags"][$h]) == "noselect") @@ -154,6 +154,8 @@ $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]); } } else { + if (!isset($boxes[$i]["unseen"])) + $boxes[$i]["unseen"] = ""; $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]); } echo "$line<BR>\n"; Index: load_prefs.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/load_prefs.php,v retrieving revision 1.41 retrieving revision 1.42 diff -u -w -r1.41 -r1.42 --- load_prefs.php 2001/01/30 17:22:38 1.41 +++ load_prefs.php 2001/02/01 20:51:52 1.42 @@ -165,7 +165,7 @@ $index_order[$i] = $order; $order = getPref($data_dir, $username, "order".($i+1)); } - if (!$index_order) { + if (!isset($index_order)) { $index_order[1] = 1; $index_order[2] = 2; $index_order[3] = 3; Index: webmail.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/webmail.php,v retrieving revision 1.45 retrieving revision 1.46 diff -u -w -r1.45 -r1.46 --- webmail.php 2001/01/30 19:16:25 1.45 +++ webmail.php 2001/02/01 20:51:52 1.46 @@ -72,6 +72,8 @@ This was done to create a pure HTML way of refreshing the folder list since we would like to use as little Javascript as possible. **/ + if (!isset($right_frame)) $right_frame = ""; + if ($right_frame == 'right_main.php') { $urlMailbox = urlencode($mailbox); $right_frame_url = "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage"; |