/**
* mailbox_display.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains functions that display mailbox information, such as the
case 2: /* from */
if ($senderAddress != $senderName) {
$senderAddress = strtr($senderAddress, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
- $title = ' title="' . str_replace('"', "''", $senderAddress) . '"';
+ $title = ' title="' . str_replace(array('"', '<', '>'), array("''", '<', '>'), $senderAddress) . '"';
} else {
$title = '';
}
$fontstr_end . $flag_end . $bold_end,
'center',
$hlt_color,
- 'nowrap' );
+ 'style="white-space: nowrap;"' );
break;
case 4: /* subject */
$td_str = $bold;
$title = get_html_translation_table(HTML_SPECIALCHARS);
$title = array_flip($title);
$title = strtr($sSubject, $title);
- $title = str_replace('"', "''", $title);
+ $title = str_replace(array('"', '<', '>'), array("''", '<', '>'), $title);
$td_str .= " title=\"$title\"";
}
$td_str .= ">$flag$subject$flag_end</a>$bold_end";
$td_str,
'right',
$hlt_color,
- 'nowrap' );
+ 'style="white-space: nowrap;"' );
}
// plain text message markers
$td_str,
'center',
$hlt_color,
- 'nowrap' );
+ 'style="white-space: nowrap;"' );
}
break;
case 6: /* size */
}
// initialize the fields we want to retrieve:
- $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Content-Type');
+ $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Importance', 'Priority', 'Content-Type');
$aFetchItems = array('FLAGS', 'RFC822.SIZE');
// Are we sorting on internaldate then retrieve the internaldate value as well
. "}\n"
. "</script>\n"
. "<!-- end of compact paginator javascript -->\n";
- } ?>
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-<tr>
- <td>
- <?php mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $paginator_str); ?>
- </td>
-</tr>
+ }
+ mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $paginator_str);
+?>
<tr><td height="5" bgcolor="<?php echo $color[4]; ?>"></td></tr>
<tr>
<td>
<tr>
<td>
<table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="<?php echo $color[5]; ?>">
- <tr>
- <td>
<?php
printHeader($aMailbox);
displayMessageArray($imapConnection, $aMailbox);
?>
- </td>
- </tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
-<tr>
- <td>
<?php
mail_message_listing_end($aMailbox, $paginator_str, $msg_cnt_str);
?>
- </td>
-</tr>
-</table>
+</table></form>
<?php
}
} else {
$source_url = $php_self;
}
+ $php_self = str_replace('&', '&', $php_self);
if (!isset($msg)) {
$msg = '';
$sort = $aMailbox['SORT'] + SQSORT_THREAD;
}
$thread_link_str = '<small>[<a href="' . $source_url . '?srt='
- . $sort . '&start_messages=1'
- . '&mailbox=' . urlencode($aMailbox['NAME']) . '">' . $thread_name
+ . $sort . '&start_messages=1'
+ . '&mailbox=' . urlencode($aMailbox['NAME']) . '">' . $thread_name
. '</a>]</small>';
} else {
$thread_link_str ='';
echo '<form name="' . $form_name . '" method="post" action="'.$php_self.'">' ."\n"
. $moveFields;
+ echo '<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td>';
$button_str = '';
// display flag buttons only if supported
<table bgcolor="<?php echo $color[4]; ?>" border="0" width="100%" cellpadding="1" cellspacing="0">
<tr>
<?php echo html_tag('td', '<small>' . $paginator . $thread_link_str . '</small>', 'left') . "\n"; ?>
- <?php echo html_tag('td', '', 'center') . "\n"; ?>
+ <?php echo html_tag('td', ' ', 'center') . "\n"; ?>
<?php echo html_tag('td', '<small>' . $msg_cnt_str . '</small>', 'right') . "\n"; ?>
</tr>
</table>
</td>
</tr>
- <tr width="100%" cellpadding="1" cellspacing="0" border="0" bgcolor="<?php echo $color[0]; ?>">
+ <tr bgcolor="<?php echo $color[0]; ?>">
<td>
<table border="0" width="100%" cellpadding="1" cellspacing="0">
<tr>
</td>
</tr>
</table>
+</td></tr>
<?php
do_hook('mailbox_form_before');
}
<td>
<table bgcolor="<?php echo $color[4]; ?>" border="0" width="100%" cellpadding="1" cellspacing="0">
<tr>
- <?php echo html_tag('td', '<small>' . $paginator_str . '</small>', 'left'); ?>
- <?php echo html_tag('td', '<small>' . $msg_cnt_str . '</small>', 'right'); ?>
+ <?php echo html_tag('td', '<small>' . $paginator_str . '</small>', 'left'); ?>
+ <?php echo html_tag('td', '<small>' . $msg_cnt_str . '</small>', 'right'); ?>
</tr>
</table>
</td>
/* End of message-list table */
do_hook('mailbox_index_after');
- echo "</form>\n";
}
/**
echo html_tag( 'td',get_selectall_link($aMailbox) , '', '', 'width="1%"' );
break;
case 5: /* flags */
- echo html_tag( 'td','' , '', '', 'width="1%"' );
+ echo html_tag( 'td',' ' , '', '', 'width="1%"' );
break;
case 2: /* from */
if (handleAsSent($aMailbox['NAME'])) {
echo "</td>\n";
break;
case 3: /* date */
- echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' )
+ echo html_tag( 'td' ,'' , 'left', '', 'width="5%" style="white-space: nowrap;"' )
. '<b>' . _("Date") . '</b>';
if ($showsort) {
if ($internal_date_sort) {
echo "</td>\n";
break;
case 6: /* size */
- echo html_tag( 'td', '', 'center','','width="5%" nowrap')
+ echo html_tag( 'td', '', 'center','','width="5%" style="white-space: nowrap;"')
. '<b>' . _("Size") . '</b>';
if ($showsort) {
ShowSortButton($aMailbox, SQSORT_SIZE_ASC, SQSORT_SIZE_DEC);
. "//-->\n"
. '</script>'
. '<input type="checkbox" name="toggleAll" title="'._("Toggle All").'" onclick="'.$func_name.'();" />';
-// . <a href="javascript:void(0)" onClick="' . $func_name . '();">' . _("Toggle All")
+// . <a href="javascript:void(0)" onclick="' . $func_name . '();">' . _("Toggle All")
// . "</a>\n";
} else {
$result .= "<a href=\"$PHP_SELF";
$result .= $spc . '<select name="startMessage"';
if ($javascript_on) {
$result .= ' onchange="JavaScript:SubmitOnSelect'
- . '(this, \'' . $pg_url . '&startMessage=\')"';
+ . '(this, \'' . $pg_url . '&startMessage=\')"';
}
$result .='>';
return call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_strimwidth', $subject, $trim_val);
}
- return substr_replace($subject, '...', $trim_val);
+ return substr_replace($subject, '...', $trim_val + 1);
}
/**
'<small>' . $string . ': </small>',
$align,
'',
- 'nowrap' );
+ 'style="white-space: nowrap;"' );
}
/**