Wow - I believe this is finally all the &'s in the current code

(not counting plugins..).  Now to grep for other things.

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&note=$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");
 }
 
-?>
+?>

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);
 
-?>
+?>

src/image.php

@@ -27,17 +27,17 @@ echo '<BR>' .
 if (isset($where) && isset($what)) {
   // from a search
   echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-        '&passed_id=' . $passed_id . '&where=' . urlencode($where) . 
-        '&what=' . urlencode($what). '">' . _("View message") . '</a>';
+        '&amp;passed_id=' . $passed_id . '&amp;where=' . urlencode($where) . 
+        '&amp;what=' . urlencode($what). '">' . _("View message") . '</a>';
 } else {   
   echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-       '&passed_id=' . $passed_id . '&startMessage=' . $startMessage .
-       '&show_more=0">' . _("View message") . '</a>';
+       '&amp;passed_id=' . $passed_id . '&amp;startMessage=' . $startMessage .
+       '&amp;show_more=0">' . _("View message") . '</a>';
 }   
 
 $DownloadLink = '../src/download.php?passed_id=' . $passed_id .
-               '&mailbox=' . urlencode($mailbox) . 
-               '&passed_ent_id=' . $passed_ent_id . '&absolute_dl=true';
+               '&amp;mailbox=' . urlencode($mailbox) . 
+               '&amp;passed_ent_id=' . $passed_ent_id . '&amp;absolute_dl=true';
 
 echo '</b></td></tr>' . "\n" .
     '<tr><td align=center><A HREF="' . $DownloadLink . '">' .

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 "</FORM>\n";
 do_hook('login_bottom');
 echo "</BODY>\n".
      "</HTML>\n";
-?>
+?>

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 .= "&amp;";
+            } 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)."&amp;what=".urlencode($what)."&amp;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&amp;startMessage=$startMessage&amp;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)."&amp;what=".urlencode($what)."&amp;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&amp;startMessage=$startMessage&amp;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)."&amp;what=".urlencode($what)."&amp;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&amp;startMessage=$startMessage&amp;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)."&amp;what=".urlencode($what)."&amp;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&amp;startMessage=$startMessage&amp;mailbox=". urlencode($mailbox));
     } else {
         displayPageHeader($color, $mailbox);
         error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);

src/options_highlight.php

@@ -70,9 +70,9 @@ if (count($message_highlight_list) >= 1) {
     for ($i=0; $i < count($message_highlight_list); $i++) {
         echo '<tr bgcolor="' . $message_highlight_list[$i]['color'] . '">'.
                 "<td width=\"20%\" bgcolor=\"$color[4]\" nowrap>".
-                "<small>[<a href=\"options_highlight.php?action=edit&theid=$i\">".
+                "<small>[<a href=\"options_highlight.php?action=edit&amp;theid=$i\">".
             _("Edit") .
-            '</a>]&nbsp;[<a href="options_highlight.php?action=delete&theid='.
+            '</a>]&nbsp;[<a href="options_highlight.php?action=delete&amp;theid='.
             $i . '">' . _("Delete") . '</a>]</small>'.
             '</td><td>'.
             htmlspecialchars($message_highlight_list[$i]['name']) .

src/options_order.php

@@ -91,14 +91,14 @@ displayPageHeader($color, 'None');
         for ($i=1; $i <= count($index_order); $i++) {
             $tmp = $index_order[$i];
             echo '<tr>';
-            echo "<td><small><a href=\"options_order.php?method=up&num=$i\">". _("up") ."</a></small></td>\n";
+            echo "<td><small><a href=\"options_order.php?method=up&amp;num=$i\">". _("up") ."</a></small></td>\n";
             echo '<td><small>&nbsp;|&nbsp;</small></td>' . "\n";
-            echo "<td><small><a href=\"options_order.php?method=down&num=$i\">". _("down") . "</a></small></td>\n";
+            echo "<td><small><a href=\"options_order.php?method=down&amp;num=$i\">". _("down") . "</a></small></td>\n";
             echo '<td><small>&nbsp;|&nbsp;</small></td>' . "\n";
             echo '<td>';
             /* Always show the subject */
             if ($tmp != 4)
-               echo "<small><a href=\"options_order.php?method=remove&num=$i\">" . _("remove") . '</a></small>';
+               echo "<small><a href=\"options_order.php?method=remove&amp;num=$i\">" . _("remove") . '</a></small>';
             echo "</td>\n";
             echo '<td><small>&nbsp;-&nbsp;</small></td>' . "\n";
             echo '<td>' . $available[$tmp] . "</td>\n";
@@ -135,4 +135,4 @@ displayPageHeader($color, 'None');
 
 </td></tr>
 </table>
-</body></html>
+</body></html>

src/printer_friendly_main.php

@@ -17,10 +17,10 @@ displayHtmlHeader( _("Printer Friendly"), '', FALSE );
 echo "<frameset rows=\"60, *\" noresize border=\"0\">\n".
      "<frame src=\"printer_friendly_top.php\" name=\"top_frame\" scrolling=\"off\">".
      '<frame src="printer_friendly_bottom.php?passed_ent_id='.
-     $passed_ent_id . '&mailbox=' . urlencode($mailbox) .
-     '&passed_id=' . $passed_id .
+     $passed_ent_id . '&amp;mailbox=' . urlencode($mailbox) .
+     '&amp;passed_id=' . $passed_id .
      "\" name=\"bottom_frame\">".
      "</frameset>\n".
      "</html>\n";
 
-?>
+?>

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 '<BR>The message has been submitted to the developers knowledgebase!<BR>' .
@@ -104,4 +104,4 @@ echo '<BR>The message has been submitted to the developers knowledgebase!<BR>' .
      'Please submit every message only once<BR>' .
      "<A HREF=\"../src/read_body.php?$par\">View the message</A><BR>";
 
-?>
+?>

src/search.php

@@ -237,18 +237,18 @@ if ($saved_count > 0) {
         . '<TD ALIGN=RIGHT>'
         .   '<A HREF=search.php'
         .     '?mailbox=' . urlencode($saved_folder_array[$i])
-        .     '&what=' . urlencode($saved_what_array[$i])
-        .     '&where=' . urlencode($saved_where_array[$i])
+        .     '&amp;what=' . urlencode($saved_what_array[$i])
+        .     '&amp;where=' . urlencode($saved_where_array[$i])
         .   '>' . _("edit") . '</A>'
         .   '&nbsp;|&nbsp;'
         .   '<A HREF=search.php'
         .     '?mailbox=' . urlencode($saved_folder_array[$i])
-        .     '&what=' . urlencode($saved_what_array[$i])
-        .     '&where=' . urlencode($saved_where_array[$i])
-        .     '&submit=Search_no_update'
+        .     '&amp;what=' . urlencode($saved_what_array[$i])
+        .     '&amp;where=' . urlencode($saved_where_array[$i])
+        .     '&amp;submit=Search_no_update'
         .   '>' . _("search") . '</A>'
         .   '&nbsp;|&nbsp;'
-        .   "<A HREF=search.php?count=$i&submit=delete>"
+        .   "<A HREF=search.php?count=$i&amp;submit=delete>"
         .     _("delete")
         .   '</A>'
         . '</TD></TR>';
@@ -276,18 +276,18 @@ if ($recent_count > 0) {
                . "<TD ALIGN=LEFT>$what_array[$i]</TD>"
                . "<TD ALIGN=CENTER>$where_array[$i]</TD>"
                . '<TD ALIGN=RIGHT>'
-               .   "<A HREF=search.php?count=$i&submit=save>"
+               .   "<A HREF=search.php?count=$i&amp;submit=save>"
                .     _("save")
                .   '</A>'
                .   '&nbsp;|&nbsp;'
                .   '<A HREF=search.php'
                .     '?mailbox=' . urlencode($folder_array[$i])
-               .     '&what=' . urlencode($what_array[$i])
-               .     '&where=' . urlencode($where_array[$i])
-               .     '&submit=Search_no_update'
+               .     '&amp;what=' . urlencode($what_array[$i])
+               .     '&amp;where=' . urlencode($where_array[$i])
+               .     '&amp;submit=Search_no_update'
                .   '>' . _("search") . '</A>'
                .   '&nbsp;|&nbsp;'
-               .   "<A HREF=search.php?count=$i&submit=forget>"
+               .   "<A HREF=search.php?count=$i&amp;submit=forget>"
                .     _("forget")
                .   '</A>'
                . '</TD></TR>';

src/vcard.php

@@ -31,12 +31,12 @@ echo '<br><table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
 if (isset($where) && isset($what)) {
     // from a search
     echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-            '&passed_id=' . $passed_id . '&where=' . urlencode($where) .
-            '&what=' . urlencode($what). '">' . _("View message") . '</a>';
+            '&amp;passed_id=' . $passed_id . '&amp;where=' . urlencode($where) .
+            '&amp;what=' . urlencode($what). '">' . _("View message") . '</a>';
 } else {
     echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-        '&passed_id=' . $passed_id . '&startMessage=' . $startMessage .
-        '&show_more=0">' . _("View message") . '</a>';
+        '&amp;passed_id=' . $passed_id . '&amp;startMessage=' . $startMessage .
+        '&amp;show_more=0">' . _("View message") . '</a>';
 }
 echo '</center></b></td></tr>';
 
@@ -190,9 +190,9 @@ echo '</select>' .
         '</FORM>' .
         '</td></tr>' .
         '<tr><td align=center>' .
-        '<a href="../src/download.php?absolute_dl=true&passed_id=' .
-        $passed_id . '&mailbox=' . urlencode($mailbox) .
-        '&passed_ent_id=' . $passed_ent_id . '">' .
+        '<a href="../src/download.php?absolute_dl=true&amp;passed_id=' .
+        $passed_id . '&amp;mailbox=' . urlencode($mailbox) .
+        '&amp;passed_ent_id=' . $passed_ent_id . '">' .
         _("Download this as a file") . '</A>' .
         '</TD></TR></TABLE>' .