|
@@ -94,10 +94,10 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ $senderName = str_replace(' ',' ',$senderName);
|
|
|
$msg['SUBJECT'] = decodeHeader($msg['SUBJECT']);
|
|
|
$subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]);
|
|
|
-
|
|
|
+ $subject = str_replace(' ',' ',$subject);
|
|
|
echo html_tag( 'tr','','','','VALIGN="top"') . "\n";
|
|
|
|
|
|
if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) {
|
|
@@ -675,7 +675,9 @@ function mail_message_listing_beginning ($imapConnection,
|
|
|
* This is the beginning of the message list table.
|
|
|
* It wraps around all messages
|
|
|
*/
|
|
|
- echo '<form name="messageList" method="post" action="move_messages.php">' ."\n"
|
|
|
+ $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox);
|
|
|
+ $form_name = "FormMsgs" . $safe_name;
|
|
|
+ echo '<form name="' . $form_name . '" method="post" action="move_messages.php">' ."\n"
|
|
|
. $moveFields
|
|
|
. html_tag( 'table' ,
|
|
|
html_tag( 'tr',
|
|
@@ -881,18 +883,22 @@ function get_selectall_link($start_msg, $sort) {
|
|
|
|
|
|
$result = '';
|
|
|
if ($javascript_on) {
|
|
|
+ $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox);
|
|
|
+ $func_name = "CheckAll" . $safe_name;
|
|
|
+ $form_name = "FormMsgs" . $safe_name;
|
|
|
$result = '<script language="JavaScript" type="text/javascript">'
|
|
|
. "\n<!-- \n"
|
|
|
- . "function CheckAll() {\n"
|
|
|
- . " for (var i = 0; i < document.messageList.elements.length; i++) {\n"
|
|
|
- . " if(document.messageList.elements[i].type == 'checkbox'){\n"
|
|
|
- . " document.messageList.elements[i].checked = "
|
|
|
- . " !(document.messageList.elements[i].checked);\n"
|
|
|
+ . "function " . $func_name . "() {\n"
|
|
|
+ . " for (var i = 0; i < document." . $form_name . ".elements.length; i++) {\n"
|
|
|
+ . " if(document." . $form_name . ".elements[i].type == 'checkbox'){\n"
|
|
|
+ . " document." . $form_name . ".elements[i].checked = "
|
|
|
+ . " !(document." . $form_name . ".elements[i].checked);\n"
|
|
|
. " }\n"
|
|
|
. " }\n"
|
|
|
. "}\n"
|
|
|
. "//-->\n"
|
|
|
- . '</script><a href="#" onClick="CheckAll();">' . _("Toggle All")
|
|
|
+ . '</script><a href="javascript:void(0)" onClick="' . $func_name . '();">' . _("Toggle All")
|
|
|
+/* . '</script><a href="javascript:' . $func_name . '()">' . _("Toggle All")*/
|
|
|
. "</a>\n";
|
|
|
} else {
|
|
|
if (strpos($PHP_SELF, "?")) {
|