Fix & in URLs to & for correctness of HTML, also 100% to "100%" in

table definitions.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2460 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index fc37d988421dc981719eaeb06292505f8731c843..3587331d48568642e80bf6405b9ca8ee87bd6e7c 100644 (file)
--- a/functions/attachment_common.php
+++ b/functions/attachment_common.php
@@ -93,13 +93,13 @@ function attachment_common_link_text(&$Args)
       
        This sets the 'href' of this plugin for a new link. */
     $Args[1]['attachment_common']['href'] = '../src/download.php?startMessage=' .
-        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
-        '&passed_ent_id=' . $Args[5] . '&override_type0=text&override_type1=plain';
+        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
+        '&passed_ent_id=' . $Args[5] . '&override_type0=text&override_type1=plain';
     
     /* If we got here from a search, we should preserve these variables */
     if ($Args[8] && $Args[9])
-        $Args[1]['attachment_common']['href'] .= '&where=' . 
-        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
+        $Args[1]['attachment_common']['href'] .= '&where=' . 
+        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
   
     /* The link that we created needs a name.  "view" will be displayed for
        all text attachments handled by this plugin. */
@@ -120,12 +120,12 @@ function attachment_common_link_text(&$Args)
 function attachment_common_link_html(&$Args)
 {
     $Args[1]['attachment_common']['href'] = '../src/download.php?startMessage=' . 
-        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
-       '&passed_ent_id=' . $Args[5] . '&override_type0=text&override_type1=html';
+        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
+       '&passed_ent_id=' . $Args[5] . '&override_type0=text&override_type1=html';
     
     if ($Args[8] && $Args[9]) {
-        $Args[1]['attachment_common']['href'] .= '&where=' . 
-        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
+        $Args[1]['attachment_common']['href'] .= '&where=' . 
+        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
     }
 
     $Args[1]['attachment_common']['text'] = _("view");
@@ -145,12 +145,12 @@ function attachment_common_link_image(&$Args)
     $attachment_common_show_images_list[] = $info;
     
     $Args[1]['attachment_common']['href'] = '../src/image.php?startMessage=' .
-        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
-        '&passed_ent_id=' . $Args[5];
+        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
+        '&passed_ent_id=' . $Args[5];
     
     if ($Args[8] && $Args[9]) {
-        $Args[1]['attachment_common']['href'] .= '&where=' . 
-        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
+        $Args[1]['attachment_common']['href'] .= '&where=' . 
+        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
     }
   
     $Args[1]['attachment_common']['text'] = _("view");
@@ -163,12 +163,12 @@ function attachment_common_link_image(&$Args)
 function attachment_common_link_vcard(&$Args)
 {
     $Args[1]['attachment_common']['href'] = '../src/vcard.php?startMessage=' .
-        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
-        '&passed_ent_id=' . $Args[5];
+        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
+        '&passed_ent_id=' . $Args[5];
   
     if (isset($where) && isset($what))
-        $Args[1]['attachment_common']['href'] .= '&where=' . 
-        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
+        $Args[1]['attachment_common']['href'] .= '&where=' . 
+        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
   
     $Args[1]['attachment_common']['text'] = _("Business Card");
   

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 0604b78ca2a65f0ce30c52068affa8be5c819927..ec88fb69ce592f15226f248c3ba6a4beaeb722fa 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -78,7 +78,7 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) {
             '</TD></TR><TR><TD>'.
                "<CENTER><BR>$message<BR>\n".
                '<BR>'.
-                  "<A HREF=\"right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
+                  "<A HREF=\"right_main.php?sort=$sort&amp;startMessage=$startMessage&amp;mailbox=$urlMailbox\">";
     printf (_("Click here to return to %s"), $mailbox);
     echo '</A>.'.
             '</TD></TR>'.
@@ -98,4 +98,4 @@ function plain_error_message($message, $color) {
          '</TABLE>';
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index eafd71fa69fe4d8615b6b1a0e65ea5f505412e0f..76f48180abac906d07d9d805bda151b8ab0ad46b 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -117,7 +117,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
         if( !isset( $pos ) || $pos == '' ) {
             $pos = '0';
         }
-        $search_stuff = "&pos=" . urlencode( $pos ) . "&where=".urlencode($where).'&what='.urlencode($what);
+        $search_stuff = "&pos=" . urlencode( $pos ) . "&where=".urlencode($where).'&what='.urlencode($what);
     }
 
     $checked = ($checkall == 1 ?' checked' : '');
@@ -136,7 +136,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
         case 4: /* subject */
             echo "   <td bgcolor=\"$hlt_color\">$bold";
                 if (! isset($search_stuff)) { $search_stuff = ''; }
-            echo "<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$start_msg&show_more=0$search_stuff\"";
+            echo "<a href=\"read_body.php?mailbox=$urlMailbox&amp;passed_id=".$msg["ID"]."&amp;startMessage=$start_msg&amp;show_more=0$search_stuff\"";
             do_hook("subject_link");
 
             if ($subject != $msg['SUBJECT']) {
@@ -406,7 +406,7 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $ms
     }
 
     mail_message_listing_beginning( $imapConnection,
-        "move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$start_msg",
+        "move_messages.php?msg=$msg&amp;mailbox=$urlMailbox&amp;startMessage=$start_msg",
         $mailbox, $sort, $msg_cnt_str, $paginator_str, $start_msg);
 
     $groupNum = $start_msg % ($show_num - 1);
@@ -614,7 +614,7 @@ function ShowSortButton($sort, $mailbox, $Up, $Down) {
 
     /* Now that we have everything figured out, show the actual button. */
     echo ' <a href="right_main.php?newsort=' . $which .
-        '&startMessage=1&mailbox=' . urlencode($mailbox) .
+        '&amp;startMessage=1&amp;mailbox=' . urlencode($mailbox) .
         '"><IMG SRC="../images/' . $img .
         '" BORDER=0 WIDTH=12 HEIGHT=10></a>';
 }
@@ -626,7 +626,7 @@ function get_selectall_link($start_msg, $sort) {
     $result = '';
     if ($javascript_on) {
         $result =
-            '<script language="JavaScript">' .
+            '<script language="JavaScript" type="text/javascript">' .
             "\n<!-- \n" .
             "function CheckAll() {\n" .
             "   for (var i = 0; i < document.messageList.elements.length; i++) {\n" .
@@ -639,12 +639,12 @@ function get_selectall_link($start_msg, $sort) {
             '</script><a href="#" onClick="CheckAll();">' . _("Toggle All") . "</a>\n";
     } else {
         if (strpos($PHP_SELF, "?")) {
-            $result .= "<a href=\"$PHP_SELF&mailbox=" . urlencode($mailbox)
-                    . "&startMessage=$start_msg&sort=$sort&checkall=";
+            $result .= "<a href=\"$PHP_SELF&amp;mailbox=" . urlencode($mailbox)
+                    . "&amp;startMessage=$start_msg&amp;sort=$sort&amp;checkall=";
         }
                else {
             $result .= "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox)
-                    . "&startMessage=$start_msg&sort=$sort&checkall=";
+                    . "&amp;startMessage=$start_msg&amp;sort=$sort&amp;checkall=";
         }
         if (isset($checkall) && $checkall == '1') {
             $result .= '0';
@@ -653,12 +653,12 @@ function get_selectall_link($start_msg, $sort) {
         }
 
         if (isset($where) && isset($what)) {
-            $result .= '&where=' . urlencode($where)
-                    . '&what=' . urlencode($what);
+            $result .= '&amp;where=' . urlencode($where)
+                    . '&amp;what=' . urlencode($what);
         }
 
         if ($PG_SHOWNUM == 999999) {
-            $result .= '&PG_SHOWNUM=999999';
+            $result .= '&amp;PG_SHOWNUM=999999';
         }
 
         $result .= "\">";
@@ -700,7 +700,7 @@ function get_msgcnt_str($start_msg, $end_msg, $num_msgs) {
 function get_paginator_link
 ($box, $start_msg, $use, $text) {
     $result = "<A HREF=\"right_main.php?use_mailbox_cache=$use"
-            . "&startMessage=$start_msg&mailbox=$box\" "
+            . "&amp;startMessage=$start_msg&amp;mailbox=$box\" "
             . "TARGET=\"right\">$text</A>";
     return ($result);
 }
@@ -869,14 +869,14 @@ function get_paginator_str
         }
     } else if ($PG_SHOWNUM == 999999) {
         $pg_str = "<A HREF=\"right_main.php?use_mailbox_cache=$use"
-                . "&startMessage=1&mailbox=$box\" TARGET=\"right\">"
+                . "&amp;startMessage=1&amp;mailbox=$box\" TARGET=\"right\">"
                 . _("Paginate") . '</A>' . $spc;
     }
 
     /* If necessary, compute the 'show all' string. */
     if (($prv_str != '') || ($nxt_str != '')) {
         $all_str = "<A HREF=\"right_main.php?PG_SHOWNUM=999999"
-                 . "&use_mailbox_cache=$use&startMessage=1&mailbox=$box\" "
+                 . "&amp;use_mailbox_cache=$use&amp;startMessage=1&amp;mailbox=$box\" "
                  . "TARGET=\"right\">" . _("Show All") . '</A>';
     }
 
@@ -944,4 +944,4 @@ function handleAsSent($mailbox) {
     return ($handleAsSent_result);
 }
 
-?>
\ No newline at end of file
+?>