From 7d89b19d6affc41e285ed71cba66a078a863b00b Mon Sep 17 00:00:00 2001 From: brong Date: Tue, 19 Feb 2002 01:43:19 +0000 Subject: [PATCH] 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 --- functions/attachment_common.php | 32 ++++++++++++++++---------------- functions/display_messages.php | 4 ++-- functions/mailbox_display.php | 30 +++++++++++++++--------------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/functions/attachment_common.php b/functions/attachment_common.php index fc37d988..3587331d 100644 --- 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 0604b78c..ec88fb69 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -78,7 +78,7 @@ function error_message($message, $mailbox, $sort, $startMessage, $color) { ''. "

$message
\n". '
'. - ""; + ""; printf (_("Click here to return to %s"), $mailbox); echo '.'. ''. @@ -98,4 +98,4 @@ function plain_error_message($message, $color) { ''; } -?> \ No newline at end of file +?> diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index eafd71fa..76f48180 100644 --- 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 " $bold"; if (! isset($search_stuff)) { $search_stuff = ''; } - echo "'; } @@ -626,7 +626,7 @@ function get_selectall_link($start_msg, $sort) { $result = ''; if ($javascript_on) { $result = - '' . _("Toggle All") . "\n"; } else { if (strpos($PHP_SELF, "?")) { - $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 = "$text"; return ($result); } @@ -869,14 +869,14 @@ function get_paginator_str } } else if ($PG_SHOWNUM == 999999) { $pg_str = "" + . "&startMessage=1&mailbox=$box\" TARGET=\"right\">" . _("Paginate") . '' . $spc; } /* If necessary, compute the 'show all' string. */ if (($prv_str != '') || ($nxt_str != '')) { $all_str = "" . _("Show All") . ''; } @@ -944,4 +944,4 @@ function handleAsSent($mailbox) { return ($handleAsSent_result); } -?> \ No newline at end of file +?> -- 2.25.1