From 5e9e90fd78a930cc74432034fad600d38ac50563 Mon Sep 17 00:00:00 2001 From: brong Date: Tue, 19 Feb 2002 12:31:13 +0000 Subject: [PATCH] Wow - I believe this is finally all the &'s in the current code (not counting plugins..). Now to grep for other things. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2472 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/compose.php | 14 +++++++------- src/delete_message.php | 8 ++++---- src/image.php | 12 ++++++------ src/login.php | 10 +++++----- src/move_messages.php | 25 +++++++++++++------------ src/options_highlight.php | 4 ++-- src/options_order.php | 8 ++++---- src/printer_friendly_main.php | 6 +++--- src/retrievalerror.php | 8 ++++---- src/search.php | 22 +++++++++++----------- src/vcard.php | 14 +++++++------- 11 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/compose.php b/src/compose.php index d25a9e39..85e3376c 100644 --- a/src/compose.php +++ b/src/compose.php @@ -50,7 +50,7 @@ if (isset($draft)) { /* If this is a resumed draft, then delete the original */ if(isset($delete_draft)) { Header("Location: delete_message.php?mailbox=" . urlencode($draft_folder) . - "&message=$delete_draft&sort=$sort&startMessage=1&saved_draft=yes"); + "&message=$delete_draft&sort=$sort&startMessage=1&saved_draft=yes"); exit(); } else { @@ -59,8 +59,8 @@ if (isset($draft)) { exit(); } else { - Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort". - "&startMessage=1¬e=$draft_message"); + Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort". + "&startMessage=1&note=$draft_message"); exit(); } } @@ -128,15 +128,15 @@ if (isset($send)) { } if ( isset($delete_draft)) { Header("Location: delete_message.php?mailbox=" . urlencode( $draft_folder ). - "&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes"); + "&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes"); exit(); } if ($compose_new_win == '1') { Header("Location: compose.php?mail_sent=yes"); } else { - Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort". - "&startMessage=1"); + Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort". + "&startMessage=1"); } } else { /* @@ -830,4 +830,4 @@ function getReplyCitation($orig_from) return ($start . $orig_from . $end . "\n"); } -?> \ No newline at end of file +?> diff --git a/src/delete_message.php b/src/delete_message.php index a801ba40..7b7d6cc6 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -35,17 +35,17 @@ $location = get_location(); if (isset($where) && isset($what)) { header("Location: $location/search.php?where=" . urlencode($where) . - '&what=' . urlencode($what) . '&mailbox=' . urlencode($mailbox)); + '&what=' . urlencode($what) . '&mailbox=' . urlencode($mailbox)); } else { if (!empty($saved_draft) || !empty($mail_sent)) { - header("Location: $location/compose.php?mail_sent=$mail_sent&saved_draft=$saved_draft"); + header("Location: $location/compose.php?mail_sent=$mail_sent&saved_draft=$saved_draft"); } else { - header("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=" . + header("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=" . urlencode($mailbox)); } } sqimap_logout($imapConnection); -?> \ No newline at end of file +?> diff --git a/src/image.php b/src/image.php index 4cad2b00..52f6c854 100644 --- a/src/image.php +++ b/src/image.php @@ -27,17 +27,17 @@ echo '
' . if (isset($where) && isset($what)) { // from a search echo '' . _("View message") . ''; + '&passed_id=' . $passed_id . '&where=' . urlencode($where) . + '&what=' . urlencode($what). '">' . _("View message") . ''; } else { echo '' . _("View message") . ''; + '&passed_id=' . $passed_id . '&startMessage=' . $startMessage . + '&show_more=0">' . _("View message") . ''; } $DownloadLink = '../src/download.php?passed_id=' . $passed_id . - '&mailbox=' . urlencode($mailbox) . - '&passed_ent_id=' . $passed_ent_id . '&absolute_dl=true'; + '&mailbox=' . urlencode($mailbox) . + '&passed_ent_id=' . $passed_ent_id . '&absolute_dl=true'; echo '' . "\n" . '' . diff --git a/src/login.php b/src/login.php index 5f1b6893..62ae3238 100644 --- a/src/login.php +++ b/src/login.php @@ -39,13 +39,13 @@ if (isset($emailaddress)) { $key = strtolower($k); $value = urlencode($v); if ($key == 'cc') { - $rcptaddress .= '&send_to_cc=' . $value; + $rcptaddress .= '&send_to_cc=' . $value; } else if ($key == 'bcc') { - $rcptaddress .= '&send_to_bcc=' . $value; + $rcptaddress .= '&send_to_bcc=' . $value; } else if ($key == 'subject') { - $rcptaddress .= '&subject=' . $value; + $rcptaddress .= '&subject=' . $value; } else if ($key == 'body') { - $rcptaddress .= '&body=' . $value; + $rcptaddress .= '&body=' . $value; } } @@ -149,4 +149,4 @@ echo "\n"; do_hook('login_bottom'); echo "\n". "\n"; -?> \ No newline at end of file +?> diff --git a/src/move_messages.php b/src/move_messages.php index 74320bf3..c234a5db 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -25,10 +25,11 @@ function putSelectedMessagesIntoString($msg) { // see if msg[0] is set or not to fix this. while (($j < count($msg)) && ($msg[0])) { if ($msg[$i]) { - if ($firstLoop != true) - $selectedMessages .= "&"; - else - $firstLoop = false; + if ($firstLoop != true) { + $selectedMessages .= "&"; + } else { + $firstLoop = false; + } $selectedMessages .= "selMsg[$j]=$msg[$i]"; @@ -46,9 +47,9 @@ if(isset($expungeButton)) { sqimap_mailbox_expunge($imapConnection, $mailbox, true); $location = get_location(); if ($where && $what) { - header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); + header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); } else { - header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); + header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); } } elseif(isset($undeleteButton)) { @@ -71,9 +72,9 @@ if(isset($expungeButton)) { $location = get_location(); if ($where && $what) - header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); + header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); else - header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); + header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); } else { displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); @@ -105,9 +106,9 @@ if(isset($expungeButton)) { } $location = get_location(); if (isset($where) && isset($what)) { - header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); + header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); } else { - header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); + header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); } } else { displayPageHeader($color, $mailbox); @@ -135,9 +136,9 @@ if(isset($expungeButton)) { $location = get_location(); if (isset($where) && isset($what)) - header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); + header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); else - header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); + header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); } else { displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); diff --git a/src/options_highlight.php b/src/options_highlight.php index bade16cb..b3e044ad 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -70,9 +70,9 @@ if (count($message_highlight_list) >= 1) { for ($i=0; $i < count($message_highlight_list); $i++) { echo ''. "". - "[". + "[". _("Edit") . - '] [' . _("Delete") . ']'. ''. htmlspecialchars($message_highlight_list[$i]['name']) . diff --git a/src/options_order.php b/src/options_order.php index 1d55b975..3be5f87f 100644 --- a/src/options_order.php +++ b/src/options_order.php @@ -91,14 +91,14 @@ displayPageHeader($color, 'None'); for ($i=1; $i <= count($index_order); $i++) { $tmp = $index_order[$i]; echo ''; - echo "". _("up") ."\n"; + echo "". _("up") ."\n"; echo ' | ' . "\n"; - echo "". _("down") . "\n"; + echo "". _("down") . "\n"; echo ' | ' . "\n"; echo ''; /* Always show the subject */ if ($tmp != 4) - echo "" . _("remove") . ''; + echo "" . _("remove") . ''; echo "\n"; echo ' - ' . "\n"; echo '' . $available[$tmp] . "\n"; @@ -135,4 +135,4 @@ displayPageHeader($color, 'None'); - \ No newline at end of file + diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php index faaedc9c..688c5758 100644 --- a/src/printer_friendly_main.php +++ b/src/printer_friendly_main.php @@ -17,10 +17,10 @@ displayHtmlHeader( _("Printer Friendly"), '', FALSE ); echo "\n". "". '". "\n". "\n"; -?> \ No newline at end of file +?> diff --git a/src/retrievalerror.php b/src/retrievalerror.php index edce30cf..1b4ed723 100644 --- a/src/retrievalerror.php +++ b/src/retrievalerror.php @@ -92,11 +92,11 @@ sendMessage($destination, '', '', 'submitted message', $body, 0); displayPageHeader($color, $mailbox); -$par = 'mailbox='.urlencode($mailbox)."&passed_id=$passed_id"; +$par = 'mailbox='.urlencode($mailbox)."&passed_id=$passed_id"; if (isset($where) && isset($what)) { - $par .= '&where='.urlencode($where).'&what='.urlencode($what); + $par .= '&where='.urlencode($where).'&what='.urlencode($what); } else { - $par .= "&startMessage=$startMessage&show_more=0"; + $par .= "&startMessage=$startMessage&show_more=0"; } echo '
The message has been submitted to the developers knowledgebase!
' . @@ -104,4 +104,4 @@ echo '
The message has been submitted to the developers knowledgebase!
' . 'Please submit every message only once
' . "View the message
"; -?> \ No newline at end of file +?> diff --git a/src/search.php b/src/search.php index 78f3f7e7..564825f5 100644 --- a/src/search.php +++ b/src/search.php @@ -237,18 +237,18 @@ if ($saved_count > 0) { . '' . '' . _("edit") . '' . ' | ' . '' . _("search") . '' . ' | ' - . "" + . "" . _("delete") . '' . ''; @@ -276,18 +276,18 @@ if ($recent_count > 0) { . "$what_array[$i]" . "$where_array[$i]" . '' - . "" + . "" . _("save") . '' . ' | ' . '' . _("search") . '' . ' | ' - . "" + . "" . _("forget") . '' . ''; diff --git a/src/vcard.php b/src/vcard.php index 14d91660..e6343006 100644 --- a/src/vcard.php +++ b/src/vcard.php @@ -31,12 +31,12 @@ echo '
' . _("View message") . ''; + '&passed_id=' . $passed_id . '&where=' . urlencode($where) . + '&what=' . urlencode($what). '">' . _("View message") . ''; } else { echo '' . _("View message") . ''; + '&passed_id=' . $passed_id . '&startMessage=' . $startMessage . + '&show_more=0">' . _("View message") . ''; } echo ''; @@ -190,9 +190,9 @@ echo '' . '' . '' . '
' . - '' . + '' . _("Download this as a file") . '' . '
' . -- 2.25.1