X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=66d80ed8a7932148604f81e3b816f28ecb5d794d;hb=e432a21cf4ec12d42f980beb721645e1f49dff44;hp=5c9ab721b28c039bb06dc557aee13725370be07e;hpb=306b6393bb6b488e37686900f36161a262b49f5c;p=squirrelmail.git
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 5c9ab721..66d80ed8 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1,54 +1,113 @@
';
} else {
- $senderName .= htmlspecialchars($senderNames_part[0]);
+ $senderName .= $sender_address_part;
+ $senderAddress .= $sender_address_part;
}
}
}
+ // If Sent, prefix with To: but only if not Sent folder
+ if ($bHandleAsSent ^ $bSentFolder) {
+ $senderName = _("To:") . ' ' . $senderName;
+ $senderAddress = _("To:") . ' ' . $senderAddress;
+ }
- $msg['SUBJECT'] = decodeHeader($msg['SUBJECT']);
- $subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]);
+ if ($truncate_sender > 0)
+ $senderName = truncateWithEntities($senderName, $truncate_sender);
echo html_tag( 'tr','','','','VALIGN="top"') . "\n";
- if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) {
+ if (isset($aFlags['\\flagged']) && ($aFlags['\\flagged'] == true)) {
$flag = "";
$flag_end = ' ';
} else {
$flag = '';
$flag_end = '';
}
- if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) {
+ if (!isset($aFlags['\\seen']) || ($aFlags['\\seen'] == false)) {
$bold = '';
$bold_end = ' ';
} else {
$bold = '';
$bold_end = '';
}
- if (handleAsSent($mailbox)) {
+ if ($bHandleAsSent) {
$italic = '';
$italic_end = ' ';
} else {
$italic = '';
$italic_end = '';
}
- if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) {
+ if (isset($aFlags['\\deleted']) && $aFlags['\\deleted']) {
$fontstr = "";
$fontstr_end = ' ';
} else {
@@ -132,58 +211,43 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
} else {
$searchstr = '';
}
- /**
- * AAAAH! Make my eyes stop bleeding!
- * Who wrote this?!
- */
+
+ $matches = array('TO' => 'sTo', 'CC' => 'sCc', 'FROM' => 'sFrom', 'SUBJECT' => 'sSubject');
if (is_array($message_highlight_list) && count($message_highlight_list)) {
+ $sTo = parseAddress($sTo);
+ $sCc = parseAddress($sCc);
foreach ($message_highlight_list as $message_highlight_list_part) {
if (trim($message_highlight_list_part['value']) != '') {
$high_val = strtolower($message_highlight_list_part['value']);
$match_type = strtoupper($message_highlight_list_part['match_type']);
- switch($match_type) {
- case('TO'):
- case('TO_CC'):
- foreach ($msg['TO'] as $address) {
- $address[0] = decodeHeader($address[0]);
- $address[1] = decodeHeader($address[1]);
- if (strstr('^^' . strtolower($address[0]), $high_val) ||
- strstr('^^' . strtolower($address[1]), $high_val)) {
- $hlt_color = $message_highlight_list_part['color'];
- continue;
+ if($match_type == 'TO_CC') {
+ $match = array('TO', 'CC');
+ } else {
+ $match = array($match_type);
+ }
+ foreach($match as $match_type) {
+ switch($match_type) {
+ case('TO'):
+ case('CC'):
+ case('FROM'):
+ foreach ($$matches[$match_type] as $address) {
+ $address[0] = decodeHeader($address[0], true, false);
+ $address[1] = decodeHeader($address[1], true, false);
+ if (strstr('^^' . strtolower($address[0]), $high_val) ||
+ strstr('^^' . strtolower($address[1]), $high_val)) {
+ $hlt_color = $message_highlight_list_part['color'];
+ break 4;
+ }
}
- }
- if($match_type != 'TO_CC') {
break;
- }
- case('CC'):
- foreach ($msg['CC'] as $address) {
- $address[0] = decodeHeader($address[0]);
- $address[1] = decodeHeader($address[1]);
- if( strstr('^^' . strtolower($address[0]), $high_val) ||
- strstr('^^' . strtolower($address[1]), $high_val)) {
- $hlt_color = $message_highlight_list_part['color'];
- continue;
- }
- }
- break;
- case('FROM'):
- foreach ($msg['FROM'] as $address) {
- $address[0] = decodeHeader($address[0]);
- $address[1] = decodeHeader($address[1]);
- if( strstr('^^' . strtolower($address[0]), $high_val) ||
- strstr('^^' . strtolower($address[1]), $high_val)) {
+ default:
+ $headertest = strtolower(decodeHeader($$matches[$match_type], true, false));
+ if (strstr('^^' . $headertest, $high_val)) {
$hlt_color = $message_highlight_list_part['color'];
- continue;
+ break 3;
}
- }
- break;
- default:
- if (strstr('^^' . strtolower($msg[$match_type]), $high_val)) {
- $hlt_color = $message_highlight_list_part['color'];
- continue;
- }
- break;
+ break;
+ }
}
}
}
@@ -192,51 +256,61 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
if (!isset($hlt_color)) {
$hlt_color = $color_string;
}
- $checked = ($checkall == 1) ? ' CHECKED' : '';
$col = 0;
+ $sSubject = str_replace(' ', ' ', decodeHeader($sSubject));
+ if (isset($indent_array[$iId])) {
+ $subject = processSubject($sSubject, $indent_array[$iId]);
+ } else {
+ $subject = processSubject($sSubject, 0);
+ }
if (sizeof($index_order)) {
foreach ($index_order as $index_order_part) {
switch ($index_order_part) {
case 1: /* checkbox */
echo html_tag( 'td',
- " ",
- 'center',
- $hlt_color );
+ addCheckBox("msg[$t]", $checkall, $iId),
+ 'center',
+ $hlt_color );
break;
case 2: /* from */
+ if ($senderAddress != $senderName) {
+ $senderAddress = strtr($senderAddress, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
+ $title = ' title="' . str_replace('"', "''", $senderAddress) . '"';
+ }
+ else
+ $title = '';
echo html_tag( 'td',
- $italic . $bold . $flag . $fontstr . $senderName .
- $fontstr_end . $flag_end . $bold_end . $italic_end,
- 'left',
- $hlt_color );
+ $italic . $bold . $flag . $fontstr . $senderName .
+ $fontstr_end . $flag_end . $bold_end . $italic_end,
+ 'left',
+ $hlt_color, $title );
break;
case 3: /* date */
- $date_string = $msg['DATE_STRING'] . '';
- if ($date_string == '') {
- $date_string = _("Unknown date");
+ if ($sDate == '') {
+ $sDate = _("Unknown date");
}
echo html_tag( 'td',
- $bold . $flag . $fontstr . $date_string .
- $fontstr_end . $flag_end . $bold_end,
- 'center',
- $hlt_color,
- 'nowrap' );
+ $bold . $flag . $fontstr . $sDate .
+ $fontstr_end . $flag_end . $bold_end,
+ 'center',
+ $hlt_color,
+ 'nowrap' );
break;
case 4: /* subject */
$td_str = $bold;
if ($thread_sort_messages == 1) {
- if (isset($indent_array[$msg['ID']])) {
- $td_str .= str_repeat(" ",$indent_array[$msg['ID']]);
+ if (isset($indent_array[$iId])) {
+ $td_str .= str_repeat(" ",$indent_array[$iId]);
}
}
$td_str .= '";
- if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) {
- $td_str .= _("A");
- $stuff = true;
- }
- if ($msg['TYPE0'] == 'multipart') {
- $td_str .= '+';
- $stuff = true;
+ // icon message markers
+ //
+ if ($use_icons && $icon_theme != 'none') {
+ $td_str = "";
+ if (isset($aFlags['\\flagged']) && $aFlags['\\flagged'] == true) {
+ $td_str .= ' ';
+ }
+ if ($default_use_priority) {
+ if ( ($iPrio == 1) || ($iPrio == 2) ) {
+ $td_str .= ' ';
+ }
+ else if ($iPrio == 5) {
+ $td_str .= ' ';
+ }
+ else {
+ $td_str .= ' ';
+ }
+ }
+ if ($sType1 == 'mixed') {
+ $td_str .= ' ';
+ } else {
+ $td_str .= ' ';
+ }
+
+ $msg_icon = '';
+ if (!isset($aFlags['\\seen']) || ($aFlags['\\seen']) == false) {
+ $msg_alt = '(' . _("New") . ')';
+ $msg_title = '(' . _("New") . ')';
+ $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_new';
+ } else {
+ $msg_alt = '(' . _("Read") . ')';
+ $msg_title = '(' . _("Read") . ')';
+ $msg_icon .= SM_PATH . 'images/themes/' . $icon_theme . '/msg_read';
+ }
+ if (isset($aFlags['\\deleted']) && ($aFlags['\\deleted']) == true) {
+ $msg_icon .= '_deleted';
+ }
+ if (isset($aFlags['\\answered']) && ($aFlags['\\answered']) == true) {
+ $msg_alt = '(' . _("Answered") . ')';
+ $msg_title = '(' . _("Answered") . ')';
+ $msg_icon .= '_reply';
+ }
+ $td_str .= ' ';
+ $td_str .= ' ';
+ echo html_tag( 'td',
+ $td_str,
+ 'right',
+ $hlt_color,
+ 'nowrap' );
}
- if ($default_use_priority) {
- if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) {
- $td_str .= "! ";
+
+
+ // plain text message markers
+ //
+ else {
+ $stuff = false;
+ $td_str = "";
+ if (isset($aFlags['\\answered']) && $aFlags['\\answered'] == true) {
+ $td_str .= _("A");
$stuff = true;
}
- if ($msg['PRIORITY'] == 5) {
- $td_str .= "? ";
+ if ($sType1 == 'mixed') {
+ $td_str .= '+';
$stuff = true;
}
+ if ($default_use_priority) {
+ if ( ($iPrio == 1) || ($iPrio == 2) ) {
+ $td_str .= "! ";
+ $stuff = true;
+ }
+ if ($iPrio == 5) {
+ $td_str .= "? ";
+ $stuff = true;
+ }
+ }
+ if (isset($aFlags['\\deleted']) && $aFlags['\\deleted'] == true) {
+ $td_str .= "D ";
+ $stuff = true;
+ }
+ if (!$stuff) {
+ $td_str .= ' ';
+ }
+ $td_str .= ' ';
+ echo html_tag( 'td',
+ $td_str,
+ 'center',
+ $hlt_color,
+ 'nowrap' );
}
- if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) {
- $td_str .= "D ";
- $stuff = true;
- }
- if (!$stuff) {
- $td_str .= ' ';
- }
- do_hook("msg_envelope");
- $td_str .= ' ';
- echo html_tag( 'td',
- $td_str,
- 'center',
- $hlt_color,
- 'nowrap' );
break;
case 6: /* size */
echo html_tag( 'td',
- $bold . $fontstr . show_readable_size($msg['SIZE']) .
- $fontstr_end . $bold_end,
- 'right',
- $hlt_color );
+ $bold . $fontstr . show_readable_size($iSize) .
+ $fontstr_end . $bold_end,
+ 'right',
+ $hlt_color );
break;
}
++$col;
}
}
- if ($not_last) {
- echo '' . "\n" . ' ' . "\n";
- } else {
+ if ($last) {
echo ''."\n";
- }
-}
-
-function getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id) {
- if ($id != 'no') {
- $id = array_slice($id, ($start_msg-1), $show_num);
- $end = $start_msg + $show_num - 1;
- if ($num_msgs < $show_num) {
- $end_loop = $num_msgs;
- } else if ($end > $num_msgs) {
- $end_loop = $num_msgs - $start_msg + 1;
- } else {
- $end_loop = $show_num;
- }
- return fillMessageArray($imapConnection,$id,$end_loop);
} else {
- return false;
+ echo '' . "\n" . ' ' . "\n";
}
}
-function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) {
- $id = get_thread_sort($imapConnection);
- return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id);
-}
-
-function getServerSortMessages($imapConnection, $start_msg, $show_num,
- $num_msgs, $server_sort_order, $mbxresponse) {
- $id = sqimap_get_sort_order($imapConnection, $server_sort_order,$mbxresponse);
- return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id);
+/**
+* Does the $sort $_GET var to field mapping
+*
+* @param int $sort Field to sort on
+* @param bool $bServerSort Server sorting is true
+* @param mixed $key UNDOCUMENTED
+* @return string $sSortField Field tosort on
+*/
+function getSortField($sort,$bServerSort) {
+ switch($sort) {
+ case SQSORT_NONE:
+ $sSortField = 'UID';
+ break;
+ case SQSORT_DATE_ASC:
+ case SQSORT_DATE_DEC:
+ $sSortField = 'DATE';
+ break;
+ case SQSORT_FROM_ASC:
+ case SQSORT_FROM_DEC:
+ $sSortField = 'FROM';
+ break;
+ case SQSORT_SUBJ_ASC:
+ case SQSORT_SUBJ_DEC:
+ $sSortField = 'SUBJECT';
+ break;
+ case SQSORT_SIZE_ASC:
+ case SQSORT_SIZE_DEC:
+ $sSortField = ($bServerSort) ? 'SIZE' : 'RFC822.SIZE';
+ break;
+ case SQSORT_TO_ASC:
+ case SQSORT_TO_DEC:
+ $sSortField = 'TO';
+ break;
+ case SQSORT_CC_ASC:
+ case SQSORT_CC_DEC:
+ $sSortField = 'CC';
+ break;
+ case SQSORT_INT_DATE_ASC:
+ case SQSORT_INT_DATE_DEC:
+ $sSortField = ($bServerSort) ? 'ARRIVAL' : 'INTERNALDATE';
+ break;
+ default: $sSortField = 'DATE';
+ break;
+ }
+ return $sSortField;
}
-function getSelfSortMessages($imapConnection, $start_msg, $show_num,
- $num_msgs, $sort, $mbxresponse) {
- $msgs = array();
- if ($num_msgs >= 1) {
- $id = sqimap_get_php_sort_order ($imapConnection, $mbxresponse);
- if ($sort < 6 ) {
- $end = $num_msgs;
- $end_loop = $end;
- } else {
- /* if it's not sorted */
- if ($start_msg + ($show_num - 1) < $num_msgs) {
- $end_msg = $start_msg + ($show_num - 1);
- } else {
- $end_msg = $num_msgs;
- }
- if ($end_msg < $start_msg) {
- $start_msg = $start_msg - $show_num;
- if ($start_msg < 1) {
- $start_msg = 1;
- }
- }
- $id = array_slice(array_reverse($id), ($start_msg-1), $show_num);
- $end = $start_msg + $show_num - 1;
- if ($num_msgs < $show_num) {
- $end_loop = $num_msgs;
- } else if ($end > $num_msgs) {
- $end_loop = $num_msgs - $start_msg + 1;
- } else {
- $end_loop = $show_num;
- }
+function get_sorted_msgs_list($imapConnection,$sort,$mode,&$error) {
+ $bDirection = ($sort % 2);
+ $error = false;
+ switch ($mode) {
+ case 'thread':
+ $id = get_thread_sort($imapConnection);
+ if ($id === false) {
+ $error = '' .
+ _("Thread sorting is not supported by your IMAP server.") . ' ' .
+ _("Please report this to the system administrator.").
+ ' ';
+ }
+ break;
+ case 'server_sort':
+ $sSortField = getSortField($sort,true);
+ $id = sqimap_get_sort_order($imapConnection, $sSortField, $bDirection);
+ if ($id === false) {
+ $error = '' .
+ _( "Server-side sorting is not supported by your IMAP server.") . ' ' .
+ _("Please report this to the system administrator.").
+ ' ';
}
- $msgs = fillMessageArray($imapConnection,$id,$end_loop);
+ break;
+ default:
+ $sSortField = getSortField($sort,false);
+ $id = get_squirrel_sort($imapConnection, $sSortField, $bDirection);
+ break;
}
- return $msgs;
+ return $id;
}
-
-
-/*
- * This function loops through a group of messages in the mailbox
- * and shows them to the user.
- */
+/**
+* This function loops through a group of messages in the mailbox
+* and shows them to the user.
+*
+* @param mixed $imapConnection
+* @param string $mailbox mail folder
+* @param mixed $num_msgs
+* @param mixed $start_msg
+* @param mixed $sort
+* @param mixed $color
+* @param mixed $show_num
+* @param mixed $use_cache
+* @param mixed $mode
+*/
function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
$start_msg, $sort, $color, $show_num,
- $use_cache, $mode='') {
- global $msgs, $msort, $auto_expunge, $thread_sort_messages,
- $allow_server_sort, $server_sort_order;
-
- /*
- * For some reason, on PHP 4.3+, this being unset, and set in the session causes havoc
- * so setting it to an empty array beforehand seems to clean up the issue, and stopping the
- * "Your script possibly relies on a session side-effect which existed until PHP 4.2.3" error
- */
-
- if (!isset($msort)) {
- $msort = array();
- }
-
- if (!isset($msgs)) {
- $msgs = array();
- }
-
- $start = microtime();
- /* If autoexpunge is turned on, then do it now. */
- $mbxresponse = sqimap_mailbox_select($imapConnection, $mailbox);
- $srt = $sort;
- /* If autoexpunge is turned on, then do it now. */
- if ($auto_expunge == true) {
- $exp_cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, false, '');
- $mbxresponse['EXISTS'] = $mbxresponse['EXISTS'] - $exp_cnt;
- $num_msgs = $mbxresponse['EXISTS'];
+ $use_cache, $mode='',$mbxresponse) {
+ global $msgs, $msort, $auto_expunge, $thread_sort_messages,$server_sort_array,
+ $allow_server_sort, $server_sort_order;
+ /* if there's no messages in this folder */
+ if ($mbxresponse['EXISTS'] == 0) {
+ $string = '' . _("THIS FOLDER IS EMPTY") . ' ';
+ echo '
';
+ echo ' ';
+ echo ' ';
+ echo ' ';
+ echo ' ';
+ echo ' ' . html_tag( 'td', $string."\n", 'left')
+ . ' ';
+ echo '
';
+ echo ' ';
+ echo '
';
+ echo '
';
+ return;
}
if ($mbxresponse['EXISTS'] > 0) {
/* if $start_msg is lower than $num_msgs, we probably deleted all messages
- * in the last page. We need to re-adjust the start_msg
- */
+ * in the last page. We need to re-adjust the start_msg
+ */
if($start_msg > $num_msgs) {
$start_msg -= $show_num;
@@ -413,62 +555,51 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
}
/* This code and the next if() block check for
- * server-side sorting methods. The $id array is
- * formatted and $sort is set to 6 to disable
- * SM internal sorting
- */
+ * server-side sorting methods. The $id array is
+ * formatted and $sort is set to 6 to disable
+ * SM internal sorting
+ */
if ($thread_sort_messages == 1) {
$mode = 'thread';
- } elseif ($allow_server_sort == 1) {
- $mode = 'serversort';
+ } else if ($allow_server_sort == 1) {
+ $mode = 'server_sort';
} else {
$mode = '';
}
- sqsession_unregister('msort');
- sqsession_unregister('msgs');
- switch ($mode) {
- case 'thread':
- $id = get_thread_sort($imapConnection);
- $msgs = getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id);
- if ($msgs === false) {
- echo '' .
- _("Thread sorting is not supported by your IMAP server. Please report this to the system administrator.").
- ' ';
- $thread_sort_messages = 0;
- $msort = $msgs = array();
- } else {
- $msort= $msgs;
- $sort = 6;
- }
- break;
- case 'serversort':
- $id = sqimap_get_sort_order($imapConnection, $sort, $mbxresponse);
- $msgs = getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id);
- if ($msgs === false) {
- echo '' .
- _( "Server-side sorting is not supported by your IMAP server. Please report this to the system administrator.").
- ' ';
- $sort = $server_sort_order;
- $allow_server_sort = FALSE;
- $msort = $msgs = array();
- $id = array();
+ if (isset($mbxresponse['SORT_ARRAY']) && is_array($mbxresponse['SORT_ARRAY'])) {
+ $id = $mbxresponse['SORT_ARRAY'];
+ if (sqsession_is_registered('msgs')) {
+ sqsession_unregister('msgs');
+ }
+ $id_slice = array_slice($id,$start_msg-1, $show_num);
+ if (count($id_slice)) {
+ $msgs = sqimap_get_small_header_list($imapConnection,$id_slice,$show_num);
+ } else {
+ return false;
+ }
+ sqsession_register($msgs, 'msgs');
+ } else {
+ if (sqsession_is_registered('server_sort_array')) {
+ sqsession_unregister('server_sort_array');
+ }
+ $id = get_sorted_msgs_list($imapConnection,$sort,$mode,$error);
+ if ($id !== false) {
+ sqsession_register($id, 'server_sort_array');
+ $id_slice = array_slice($id,$start_msg-1, $show_num);
+ if (count($id_slice)) {
+ $msgs = sqimap_get_small_header_list($imapConnection,$id_slice,$show_num);
} else {
- $msort = $msgs;
- $sort = 6;
+ return false;
}
- break;
- default:
- if (!$use_cache) {
- $msgs = getSelfSortMessages($imapConnection, $start_msg, $show_num,
- $num_msgs, $sort, $mbxresponse);
- $msort = calc_msort($msgs, $sort);
- } /* !use cache */
- break;
- } // switch
- sqsession_register($msort, 'msort');
- sqsession_register($msgs, 'msgs');
+ sqsession_register($msgs, 'msgs');
+ } else {
+ echo $error;
+ return false;
+ }
+
+ }
} /* if exists > 0 */
$res = getEndMessage($start_msg, $show_num, $num_msgs);
@@ -476,184 +607,119 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
$end_msg = $res[1];
$paginator_str = get_paginator_str($mailbox, $start_msg, $end_msg,
- $num_msgs, $show_num, $sort);
+ $num_msgs, $show_num, $sort);
$msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs);
do_hook('mailbox_index_before');
- echo '';
- echo '';
-
- mail_message_listing_beginning($imapConnection, $mailbox, $sort,
- $msg_cnt_str, $paginator_str, $start_msg);
- echo ' ';
- /* line between the button area and the list */
- echo ' ';
-
- echo '';
- echo ' ';
- echo ' ';
- echo ' ';
- echo '';
- printHeader($mailbox, $srt, $color, !$thread_sort_messages);
-
- displayMessageArray($imapConnection, $num_msgs, $start_msg,
- $msort, $mailbox, $sort, $color, $show_num,0,0);
- echo '
';
-
- mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color);
- echo '
';
- $t = elapsed($start);
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $show_num) {
- $end_msg = $show_num;
- $start_msg = 1;
- }
- }
- $endVar = $end_msg + 1;
+ // if client side sorting and no sort we only fetch num_msgs so the start_msg in the $msgs
+ // array must be corrected
+ $i = $start_msg -1;
/*
- * Loop through and display the info for each message.
- * ($t is used for the checkbox number)
- */
- $t = 0;
-
- /* messages display */
+ * Loop through and display the info for each message.
+ * ($t is used for the checkbox number)
+ */
- if (!$num_msgs) {
- /* if there's no messages in this folder */
- echo html_tag( 'tr',
- html_tag( 'td',
- "" . _("THIS FOLDER IS EMPTY") . " ",
- 'center',
- $color[4],
- 'COLSPAN="' . count($index_order) . '"'
- )
- );
- } elseif ($start_msg == $end_msg) {
- /* if there's only one message in the box, handle it differently. */
- if ($sort != 6) {
- $i = $start_msg;
+ $iEnd = $i + $show_num;
+ for ($j=$i,$t=0;$j<$iEnd;++$j) {
+ if (isset($id[$j])) {
+ $last = (isset($id[$j+1]) || $j == $iEnd) ? false : true;
+ $msg = $msgs[$id[$j]];
+ printMessageInfo($t, $last, $msg, $mailbox,
+ $start_msg, $where, $what);
+ ++$t;
} else {
- $i = 1;
+ break;
}
- reset($msort);
- $k = 0;
- do {
- $key = key($msort);
- next($msort);
- $k++;
- } while (isset ($key) && ($k < $i));
- printMessageInfo($imapConnection, $t, true, $key, $mailbox,
- $real_startMessage, $where, $what);
- } else {
- $i = $start_msg;
- reset($msort);
- $k = 0;
- do {
- $key = key($msort);
- next($msort);
- $k++;
- } while (isset ($key) && ($k < $i));
- $not_last = true;
- do {
- if (!$i || $i == $endVar-1) $not_last = false;
- printMessageInfo($imapConnection, $t, $not_last, $key, $mailbox,
- $real_startMessage, $where, $what);
- $key = key($msort);
- $t++;
- $i++;
- next($msort);
- } while ($i && $i < $endVar);
}
}
-/*
- * Displays the standard message list header. To finish the table,
- * you need to do a "";
- *
- * $moveURL is the URL to submit the delete/move form to
- * $mailbox is the current mailbox
- * $sort is the current sorting method (-1 for no sorting available [searches])
- * $Message is a message that is centered on top of the list
- * $More is a second line that is left aligned
- */
-
+/**
+* Displays the standard message list header.
+*
+* To finish the table, you need to do a "";
+*
+* @param mixed $imapConnection
+* @param array $mbxresponse the array with the results of SELECT against the current mailbox
+* @param string $mailbox the current mailbox
+* @param mixed $sort the current sorting method (-1 for no sorting available [searches])
+* @param mixed $msg_cnt_str
+* @param mixed $paginator
+* @param mixed $start_msg
+*/
function mail_message_listing_beginning ($imapConnection,
- $mailbox = '', $sort = -1,
- $msg_cnt_str = '',
- $paginator = ' ',
- $start_msg = 1) {
- global $color, $auto_expunge, $base_uri, $thread_sort_messages,
- $allow_thread_sort, $allow_server_sort, $server_sort_order,
- $PHP_SELF;
+ $mbxresponse,
+ $mailbox = '', $sort = -1,
+ $msg_cnt_str = '',
+ $paginator = ' ',
+ $start_msg = 1) {
+ global $color, $auto_expunge, $base_uri, $show_flag_buttons,
+ $allow_server_sort, $server_sort_order,
+ $PHP_SELF, $allow_thread_sort, $thread_sort_messages;
$php_self = $PHP_SELF;
/* fix for incorrect $PHP_SELF */
@@ -671,179 +737,230 @@ function mail_message_listing_beginning ($imapConnection,
if (!isset($msg)) {
$msg = '';
}
- $moveFields = ' ' .
- ' ' .
- ' ';
-// $moveURL = "move_messages.php?msg=$msg&mailbox=$urlMailbox"
-// . "&startMessage=$start_msg";
- /*
- * This is the beginning of the message list table.
- * It wraps around all messages
- */
- echo '\n";
}
-function printHeader($mailbox, $sort, $color, $showsort=true) {
- global $index_order;
+/**
+* FIXME: Undocumented function
+*
+* @param string $mailbox
+* @param mixed $sort
+* @param mixed $color
+* @param bool $showsort
+* @param mixed $start_msg
+*/
+function printHeader($mailbox, $sort, $color, $showsort=true, $start_msg=1) {
+ global $index_order, $internal_date_sort;
echo html_tag( 'tr' ,'' , 'center', $color[5] );
/* calculate the width of the subject column based on the
- * widths of the other columns */
+ * widths of the other columns */
$widths = array(1=>1,2=>25,3=>5,4=>0,5=>1,6=>5);
$subjectwidth = 100;
foreach($index_order as $item) {
- $subjectwidth -= $widths[$item];
+ $subjectwidth -= $widths[$item];
}
foreach ($index_order as $item) {
switch ($item) {
case 1: /* checkbox */
+ echo html_tag( 'td',get_selectall_link($start_msg, $sort, $mailbox) , '', '', 'width="1%"' );
+ break;
case 5: /* flags */
- echo html_tag( 'td' ,' ' , '', '', 'width="1%"' );
+ echo html_tag( 'td','' , '', '', 'width="1%"' );
break;
case 2: /* from */
if (handleAsSent($mailbox)) {
echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' )
- . '' . _("To") . ' ';
+ . '' . _("To") . ' ';
+ if ($showsort) {
+ ShowSortButton($sort, $mailbox, SQSORT_TO_ASC, SQSORT_TO_DEC);
+ }
} else {
echo html_tag( 'td' ,'' , 'left', '', 'width="25%"' )
- . '' . _("From") . ' ';
- }
- if ($showsort) {
- ShowSortButton($sort, $mailbox, 2, 3);
+ . '' . _("From") . ' ';
+ if ($showsort) {
+ ShowSortButton($sort, $mailbox, SQSORT_FROM_ASC, SQSORT_FROM_DEC);
+ }
}
echo "\n";
break;
case 3: /* date */
echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' )
- . '' . _("Date") . ' ';
+ . '' . _("Date") . ' ';
if ($showsort) {
- ShowSortButton($sort, $mailbox, 0, 1);
+ if ($internal_date_sort) {
+ ShowSortButton($sort, $mailbox, SQSORT_INT_DATE_ASC, SQSORT_INT_DATE_DEC);
+ } else {
+ ShowSortButton($sort, $mailbox, SQSORT_DATE_ASC, SQSORT_DATE_DEC);
+ }
}
echo "\n";
break;
case 4: /* subject */
echo html_tag( 'td' ,'' , 'left', '', 'width="'.$subjectwidth.'%"' )
- . '' . _("Subject") . ' ';
+ . '' . _("Subject") . ' ';
if ($showsort) {
- ShowSortButton($sort, $mailbox, 4, 5);
+ ShowSortButton($sort, $mailbox, SQSORT_SUBJ_ASC, SQSORT_SUBJ_DEC);
}
echo "\n";
break;
case 6: /* size */
- echo html_tag( 'td', '' . _("Size") . ' ', 'center', '', 'width="5%" nowrap' );
+ echo html_tag( 'td', '', 'center','','width="5%" nowrap')
+ . '' . _("Size") . ' ';
+ if ($showsort) {
+ ShowSortButton($sort, $mailbox, SQSORT_SIZE_ASC, SQSORT_SIZE_DEC);
+ }
+ echo "\n";
break;
}
}
@@ -851,11 +968,17 @@ function printHeader($mailbox, $sort, $color, $showsort=true) {
}
-/*
- * This function shows the sort button. Isn't this a good comment?
- */
-function ShowSortButton($sort, $mailbox, $Up, $Down ) {
+/**
+* This function shows the sort button. Isn't this a good comment?
+*
+* @param mixed $sort
+* @param string $mailbox
+* @param mixed $Down
+* @param mixed $Up
+*/
+function ShowSortButton($sort, $mailbox, $Down, $Up ) {
global $PHP_SELF;
+
/* Figure out which image we want to use. */
if ($sort != $Up && $sort != $Down) {
$img = 'sort_none.png';
@@ -865,7 +988,7 @@ function ShowSortButton($sort, $mailbox, $Up, $Down ) {
$which = $Down;
} else {
$img = 'down_pointer.png';
- $which = 6;
+ $which = 0;
}
if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) {
@@ -876,30 +999,44 @@ function ShowSortButton($sort, $mailbox, $Up, $Down ) {
/* Now that we have everything figured out, show the actual button. */
echo ' ';
+ . '&startMessage=1&mailbox=' . urlencode($mailbox)
+ . '"> ';
}
-function get_selectall_link($start_msg, $sort) {
- global $checkall, $what, $where, $mailbox, $javascript_on;
+/**
+* FIXME: Undocumented function
+*
+* @param mixed $start_msg
+* @param mixed $sort
+* @param string $mailbox
+*/
+function get_selectall_link($start_msg, $sort, $mailbox) {
+ global $checkall, $what, $where, $javascript_on;
global $PHP_SELF, $PG_SHOWNUM;
$result = '';
if ($javascript_on) {
+ $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox);
+ $func_name = "CheckAll" . $safe_name;
+ $form_name = "FormMsgs" . $safe_name;
$result = '' . _("Toggle All")
- . " \n";
+ . ''
+ . ' ';
+// . ' . _("Toggle All")
+// . " \n";
} else {
if (strpos($PHP_SELF, "?")) {
$result .= "";
-
- if (isset($checkall) && ($checkall == '1')) {
- $result .= _("Unselect All");
- } else {
- $result .= _("Select All");
- }
- $result .= " \n";
+ $result .= _("All");
+ $result .= "\n";
}
/* Return our final result. */
return ($result);
}
-/*
- * This function computes the "Viewing Messages..." string.
- */
+/**
+* This function computes the "Viewing Messages..." string.
+*
+* @param integer $start_msg first message number
+* @param integer $end_msg last message number
+* @param integer $num_msgs total number of message in folder
+* @return string
+*/
function get_msgcnt_str($start_msg, $end_msg, $num_msgs) {
/* Compute the $msg_cnt_str. */
$result = '';
if ($start_msg < $end_msg) {
- $result = sprintf(_("Viewing Messages: %s to %s (%s total)"),
- $start_msg, $end_msg, $num_msgs);
+ $result = sprintf(_("Viewing Messages: %s to %s (%s total)"),
+ ''.$start_msg.' ', ''.$end_msg.' ', $num_msgs);
} else if ($start_msg == $end_msg) {
- $result = sprintf(_("Viewing Message: %s (1 total)"), $start_msg);
+ $result = sprintf(_("Viewing Message: %s (1 total)"), ''.$start_msg.' ');
} else {
- $result = ' ';
+ $result = ' ';
}
/* Return our result string. */
return ($result);
}
-/*
- * Generate a paginator link.
- */
+/**
+* Generate a paginator link.
+*
+* @param mixed $box
+* @param mixed $start_msg
+* @param mixed $use
+* @param string $text text used for paginator link
+* @return string
+*/
function get_paginator_link($box, $start_msg, $use, $text) {
- global $PHP_SELF;
- $result = "$text ";
- return ($result);
-/*
- if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) {
- $source_url = $regs[1];
- } else {
- $source_url = $PHP_SELF;
- }
+ . ">$text";
- $result = '$text ";
return ($result);
-*/
}
-/*
- * This function computes the paginator string.
- */
+/**
+* This function computes the paginator string.
+*
+* @param mixed $box
+* @param mixed $start_msg
+* @param mixed $end_msg
+* @param integer $num_msgs
+* @param mixed $show_num
+* @param mixed $sort
+*/
function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
- $show_num, $sort) {
+ $show_num, $sort) {
global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM;
/* Initialize paginator string chunks. */
@@ -986,7 +1124,6 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
$nxt_str = '';
$pg_str = '';
$all_str = '';
- $tgl_str = '';
$box = urlencode($box);
@@ -1019,9 +1156,9 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
$nxt_str = get_paginator_link($box, $next_grp, $use, _("Next"));
} else if (($next_grp > $num_msgs) && ($prev_grp >= 0)) {
$prv_str = get_paginator_link($box, $prev_grp, $use, _("Previous"));
- $nxt_str = ""._("Next")." \n";
+ $nxt_str = _("Next");
} else if (($next_grp <= $num_msgs) && ($prev_grp < 0)) {
- $prv_str = ""._("Previous") . ' ';
+ $prv_str = _("Previous");
$nxt_str = get_paginator_link($box, $next_grp, $use, _("Next"));
}
@@ -1045,11 +1182,11 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
/* Otherwise, compute some magic to choose the four quarters. */
} else {
/*
- * Compute the magic base values. Added together,
- * these values will always equal to the $pag_pgs.
- * NOTE: These are DEFAULT values and do not take
- * the current page into account. That is below.
- */
+ * Compute the magic base values. Added together,
+ * these values will always equal to the $pag_pgs.
+ * NOTE: These are DEFAULT values and do not take
+ * the current page into account. That is below.
+ */
$q1_pgs = floor($vis_pgs/4);
$q2_pgs = round($vis_pgs/4, 0);
$q3_pgs = ceil($vis_pgs/4);
@@ -1066,8 +1203,8 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
/* Adjust if the first and second quarters intersect. */
} else if (($cur_pg - $q2_pgs - ceil($q2_pgs/3)) <= $q1_pgs) {
$extra_pgs = $q2_pgs;
- $extra_pgs -= ceil(($cur_pg - $q1_pgs - 1) * 0.75);
- $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 0.75);
+ $extra_pgs -= ceil(($cur_pg - $q1_pgs - 1) * 3/4);
+ $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 3/4);
$q3_pgs += ceil($extra_pgs / 2);
$q4_pgs += floor($extra_pgs / 2);
@@ -1082,19 +1219,19 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
/* Adjust if the third and fourth quarter intersect. */
} else if (($cur_pg + $q3_pgs + 1) >= ($tot_pgs - $q4_pgs + 1)) {
$extra_pgs = $q3_pgs;
- $extra_pgs -= ceil(($tot_pgs - $cur_pg - $q4_pgs) * 0.75);
- $q3_pgs = ceil(($tot_pgs - $cur_pg - $q4_pgs) * 0.75);
+ $extra_pgs -= ceil(($tot_pgs - $cur_pg - $q4_pgs) * 3/4);
+ $q3_pgs = ceil(($tot_pgs - $cur_pg - $q4_pgs) * 3/4);
$q1_pgs += floor($extra_pgs / 2);
$q2_pgs += ceil($extra_pgs / 2);
}
}
/*
- * I am leaving this debug code here, commented out, because
- * it is a really nice way to see what the above code is doing.
- * echo "qts = $q1_pgs/$q2_pgs/$q3_pgs/$q4_pgs = "
- * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . ' ';
- */
+ * I am leaving this debug code here, commented out, because
+ * it is a really nice way to see what the above code is doing.
+ * echo "qts = $q1_pgs/$q2_pgs/$q3_pgs/$q4_pgs = "
+ * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . ' ';
+ */
/* Print out the page links from the compute page quarters. */
@@ -1139,32 +1276,32 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
}
}
} else if ($PG_SHOWNUM == 999999) {
- $pg_str = "" ._("Paginate") . ' ' . $spc;
- }
-
- /* If necessary, compute the 'show all' string. */
- if (($prv_str != '') || ($nxt_str != '')) {
- $all_str = "" . _("Show All") . ' ';
+ . ">" ._("Paginate") . '';
}
- /* Last but not least, get the value for the toggle all link. */
- $tgl_str = get_selectall_link($start_msg, $sort);
-
/* Put all the pieces of the paginator string together. */
/**
- * Hairy code... But let's leave it like it is since I am not certain
- * a different approach would be any easier to read. ;)
- */
+ * Hairy code... But let's leave it like it is since I am not certain
+ * a different approach would be any easier to read. ;)
+ */
$result = '';
+ if ( $prv_str != '' || $nxt_str != '' )
+ {
+ $result .= '[';
$result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : '');
- $result .= ($nxt_str != '' ? $nxt_str . $spc . $sep . $spc : '');
- $result .= ($pg_str != '' ? $pg_str : '');
- $result .= ($all_str != '' ? $sep . $spc . $all_str . $spc : '');
- $result .= ($result != '' ? $sep . $spc . $tgl_str: $tgl_str);
+ $result .= ($nxt_str != '' ? $nxt_str : '');
+ $result .= ']' . $spc ;
+
+ /* Compute the 'show all' string. */
+ $all_str = "" . _("Show All") . ' ';
+ }
+
+ $result .= ($pg_str != '' ? $spc . '['.$spc.$pg_str.']' . $spc : '');
+ $result .= ($all_str != '' ? $spc . '['.$all_str.']' . $spc . $spc : '');
/* If the resulting string is blank, return a non-breaking space. */
if ($result == '') {
@@ -1175,66 +1312,107 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs,
return ($result);
}
-function processSubject($subject, $threadlevel = 0) {
- global $languages, $squirrelmail_language;
- /* Shouldn't ever happen -- caught too many times in the IMAP functions */
- if ($subject == '')
- return _("(no subject)");
-
- $trim_at = 55;
-
- /* if this is threaded, subtract two chars per indentlevel */
- if($threadlevel > 0 && $threadlevel <= 10)
- $trim_at -= (2*$threadlevel);
-
- if (strlen($subject) <= $trim_at)
+/**
+* FIXME: Undocumented function
+*/
+function truncateWithEntities($subject, $trim_at)
+{
+ $ent_strlen = strlen($subject);
+ if (($trim_at <= 0) || ($ent_strlen <= $trim_at))
return $subject;
- $ent_strlen = $orig_len = strlen($subject);
- $trim_val = $trim_at - 5;
- $ent_offset = 0;
+ global $languages, $squirrelmail_language;
+
/*
- * see if this is entities-encoded string
- * If so, Iterate through the whole string, find out
- * the real number of characters, and if more
- * than 55, substr with an updated trim value.
- */
- $step = $ent_loc = 0;
+ * see if this is entities-encoded string
+ * If so, Iterate through the whole string, find out
+ * the real number of characters, and if more
+ * than $trim_at, substr with an updated trim value.
+ */
+ $trim_val = $trim_at;
+ $ent_offset = 0;
+ $ent_loc = 0;
while ( $ent_loc < $trim_val && (($ent_loc = strpos($subject, '&', $ent_offset)) !== false) &&
(($ent_loc_end = strpos($subject, ';', $ent_loc+3)) !== false) ) {
$trim_val += ($ent_loc_end-$ent_loc);
$ent_offset = $ent_loc_end+1;
- ++$step;
}
-
- if (($trim_val > 50) && (strlen($subject) > ($trim_val))&& (strpos($subject,';',$trim_val) < ($trim_val +6))) {
+ if (($trim_val > $trim_at) && ($ent_strlen > $trim_val) && (strpos($subject,';',$trim_val) < ($trim_val + 6))) {
$i = strpos($subject,';',$trim_val);
if ($i) {
$trim_val = strpos($subject,';',$trim_val);
}
}
- if ($ent_strlen <= $trim_at){
+ // only print '...' when we're actually dropping part of the subject
+ if ($ent_strlen <= $trim_val)
return $subject;
- }
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
return $languages[$squirrelmail_language]['XTRA_CODE']('strimwidth', $subject, $trim_val);
}
- return substr($subject, 0, $trim_val) . '...';
+
+ return substr_replace($subject, '...', $trim_val);
+}
+
+/**
+* FIXME: Undocumented function
+*/
+function processSubject($subject, $threadlevel = 0) {
+ /* Shouldn't ever happen -- caught too many times in the IMAP functions */
+ if ($subject == '') {
+ return _("(no subject)");
+ }
+
+ global $truncate_subject; /* number of characters for Subject field (<= 0 for unchanged) */
+ $trim_at = $truncate_subject;
+
+ /* if this is threaded, subtract two chars per indentlevel */
+ if (($threadlevel > 0) && ($threadlevel <= 10))
+ $trim_at -= (2*$threadlevel);
+
+ return truncateWithEntities($subject, $trim_at);
}
-function getMbxList($imapConnection) {
+/**
+* FIXME: Undocumented function
+*
+* @param mixed $imapConnection
+* @param mixed $boxes
+*/
+function getMbxList($imapConnection, $boxes = 0) {
global $lastTargetMailbox;
echo ' ';
- echo sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)) );
- echo ' ';
+ echo sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)), 0, $boxes);
+ echo ' ';
}
-function getButton($type, $name, $value) {
- return ' ';
+/**
+* Creates button
+*
+* @deprecated see form functions available in 1.5.1 and 1.4.3.
+* @param string $type
+* @param string $name
+* @param string $value
+* @param string $js
+* @param bool $enabled
+*/
+function getButton($type, $name, $value, $js = '', $enabled = TRUE) {
+ $disabled = ( $enabled ? '' : 'disabled ' );
+ $js = ( $js ? $js.' ' : '' );
+ return ' ';
}
+/**
+* Puts string into cell, aligns it and adds tag
+*
+* @param string $string string
+* @param string $align alignment
+*/
function getSmallStringCell($string, $align) {
return html_tag('td',
'' . $string . ': ',
@@ -1243,6 +1421,13 @@ function getSmallStringCell($string, $align) {
'nowrap' );
}
+/**
+* FIXME: Undocumented function
+*
+* @param integer $start_msg
+* @param integer $show_num
+* @param integer $num_msgs
+*/
function getEndMessage($start_msg, $show_num, $num_msgs) {
if ($start_msg + ($show_num - 1) < $num_msgs){
$end_msg = $start_msg + ($show_num - 1);
@@ -1259,9 +1444,13 @@ function getEndMessage($start_msg, $show_num, $num_msgs) {
return (array($start_msg,$end_msg));
}
+/**
+* This should go in imap_mailbox.php
+* @param string $mailbox
+*/
function handleAsSent($mailbox) {
global $handleAsSent_result;
-
+
/* First check if this is the sent or draft folder. */
$handleAsSent_result = isSentMailbox($mailbox) || isDraftMailbox($mailbox);