Remove &amp usage from Location headers

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 {
         /*

src/move_messages.php

@@ -47,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)) {
@@ -72,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);
@@ -106,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);
@@ -136,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);