X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=107d2d968f0e2a8c8d662b7808b5838e54754359;hp=426609ed4aef42d66cdb22ea75721201eade1f94;hb=74091b64ffddec9db154d7a76c202b98401b1117;hpb=267b2e40ac4bcbd2baabf89594d9e8a2e7e5372e diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 426609ed..107d2d96 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -3,23 +3,33 @@ /** * mailbox_display.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Copyright (c) 1999-2004 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 * table row that has sender, date, subject, etc... * * $Id$ + * @package squirrelmail */ +/** The standard includes.. */ require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'functions/html.php'); require_once(SM_PATH . 'class/html.class.php'); require_once(SM_PATH . 'functions/imap_mailbox.php'); +require_once(SM_PATH . 'functions/imap_messages.php'); +require_once(SM_PATH . 'functions/mime.php'); +require_once(SM_PATH . 'functions/forms.php'); -/* Default value for page_selector_max. */ +/** + * default value for page_selector_max + */ define('PG_SEL_MAX', 10); +/** + * @param mixed $start UNDOCUMENTED + */ function elapsed($start) { $end = microtime(); @@ -34,6 +44,18 @@ function elapsed($start) return $diff2 + $diff1; } +/** + * Displays message listing + * + * @param mixed $imapConnection + * @param mixed $t UNDOCUMENTED + * @param bool $not_last UNDOCUMENTED + * @param mixed $key UNDOCUMENTED + * @param string $mailbox mail folder + * @param mixed $start_msg UNDOCUMENTED + * @param mixed $where UNDOCUMENTED + * @param mixed $what UNDOCUMENTED + */ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, $start_msg, $where, $what) { global $checkall, @@ -41,12 +63,18 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, $default_use_priority, $message_highlight_list, $index_order, - $indent_array, /* indent subject by */ - $pos, /* Search postion (if any) */ + $indent_array, /* indent subject by */ + $pos, /* Search postion (if any) */ $thread_sort_messages, /* thread sorting on/off */ - $server_sort_order, /* sort value when using server-sorting */ + $server_sort_order, /* sort value when using server-sorting */ $row_count, - $allow_server_sort; /* enable/disable server-side sorting */ + $allow_server_sort, /* enable/disable server-side sorting */ + $truncate_sender, /* number of characters for From/To field (<= 0 for unchanged) */ + $email_address, + $show_recipient_instead, /* show recipient name instead of default identity */ + $use_icons, /* indicates to use icons or text markers */ + $icon_theme; /* icons theming */ + $color_string = $color[4]; if ($GLOBALS['alt_index_colors']) { @@ -70,34 +98,57 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, } $urlMailbox = urlencode($mailbox); - if (handleAsSent($mailbox)) { - $msg['FROM'] = $msg['TO']; + $bSentFolder = handleAsSent($mailbox); + if ((!$bSentFolder) && ($show_recipient_instead)) { + // If the From address is the same as $email_address, then handle as Sent + $from_array = parseAddress($msg['FROM'], 1); + if (!isset($email_address)) { + global $datadir, $username; + $email_address = getPref($datadir, $username, 'email_address'); + } + $bHandleAsSent = ((isset($from_array[0][0])) && ($from_array[0][0] == $email_address)); } - $msg['FROM'] = parseAddress($msg['FROM'],1); - + else + $bHandleAsSent = $bSentFolder; + // If this is a Sent message, display To address instead of From + if ($bHandleAsSent) + $msg['FROM'] = $msg['TO']; + // Passing 1 below results in only 1 address being parsed, thus defeating the following code + $msg['FROM'] = parseAddress($msg['FROM']/*,1*/); + /* * This is done in case you're looking into Sent folders, * because you can have multiple receivers. */ - $senderNames = $msg['FROM']; $senderName = ''; + $senderAddress = ''; if (sizeof($senderNames)){ foreach ($senderNames as $senderNames_part) { if ($senderName != '') { $senderName .= ', '; + $senderAddress .= ', '; } - if ($senderNames_part[1]) { - $senderName .= decodeHeader($senderNames_part[1]); + $sender_address_part = htmlspecialchars($senderNames_part[0]); + $sender_name_part = str_replace(' ',' ', decodeHeader($senderNames_part[1])); + if ($sender_name_part) { + $senderName .= $sender_name_part; + $senderAddress .= $sender_name_part . ' <' . $sender_address_part . '>'; } 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; + } + + if ($truncate_sender > 0) + $senderName = truncateWithEntities($senderName, $truncate_sender); - $msg['SUBJECT'] = decodeHeader($msg['SUBJECT']); - $subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]); - echo html_tag( 'tr','','','','VALIGN="top"') . "\n"; if (isset($msg['FLAG_FLAGGED']) && ($msg['FLAG_FLAGGED'] == true)) { @@ -114,7 +165,7 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, $bold = ''; $bold_end = ''; } - if (handleAsSent($mailbox)) { + if ($bHandleAsSent) { $italic = ''; $italic_end = ''; } else { @@ -134,7 +185,7 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, } else { $searchstr = ''; } - + if (is_array($message_highlight_list) && count($message_highlight_list)) { $msg['TO'] = parseAddress($msg['TO']); $msg['CC'] = parseAddress($msg['CC']); @@ -153,8 +204,8 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, case('CC'): case('FROM'): foreach ($msg[$match_type] as $address) { - $address[0] = decodeHeader($address[0]); - $address[1] = decodeHeader($address[1]); + $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']; @@ -163,7 +214,8 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, } break; default: - if (strstr('^^' . strtolower($msg[$match_type]), $high_val)) { + $headertest = strtolower(decodeHeader($msg[$match_type], true, false)); + if (strstr('^^' . $headertest, $high_val)) { $hlt_color = $message_highlight_list_part['color']; break 3; } @@ -177,23 +229,30 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, if (!isset($hlt_color)) { $hlt_color = $color_string; } - $checked = ($checkall == 1) ? ' CHECKED' : ''; $col = 0; + $msg['SUBJECT'] = str_replace(' ', ' ', decodeHeader($msg['SUBJECT'])); + $subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]); if (sizeof($index_order)) { foreach ($index_order as $index_order_part) { switch ($index_order_part) { case 1: /* checkbox */ echo html_tag( 'td', - "", + addCheckBox("msg[$t]", $checkall, $msg['ID']), '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 ); + $hlt_color, $title ); break; case 3: /* date */ $date_string = $msg['DATE_STRING'] . ''; @@ -217,7 +276,7 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, $td_str .= ' '; + } + if ($default_use_priority) { + if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) { + $td_str .= ' '; + } + else if ($msg['PRIORITY'] == 5) { + $td_str .= ' '; + } + else + { + $td_str .= ' '; + } + } + if ($msg['TYPE0'] == 'multipart') { + $td_str .= ''; + } + else + { + $td_str .= ''; + } + + $msg_icon = ''; + if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_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($msg['FLAG_DELETED']) && ($msg['FLAG_DELETED']) == true) + { + $msg_icon .= '_deleted'; + } + if (isset($msg['FLAG_ANSWERED']) && ($msg['FLAG_ANSWERED']) == true) + { + $msg_alt = '(' . _("Answered") . ')'; + $msg_title = '(' . _("Answered") . ')'; + $msg_icon .= '_reply'; + } + $td_str .= ''. $msg_alt . ''; + $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($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) { + $td_str .= _("A"); $stuff = true; } - if ($msg['PRIORITY'] == 5) { - $td_str .= "?"; + if ($msg['TYPE0'] == 'multipart') { + $td_str .= '+'; $stuff = true; } + if ($default_use_priority) { + if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) { + $td_str .= "!"; + $stuff = true; + } + if ($msg['PRIORITY'] == 5) { + $td_str .= "?"; + $stuff = true; + } + } + if (isset($msg['FLAG_DELETED']) && $msg['FLAG_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', @@ -277,13 +399,23 @@ function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox, } } if ($not_last) { - echo '' . "\n" . '' . "\n"; + echo '' . "\n" . '' . "\n"; } else { echo ''."\n"; } } +/** + * FIXME: Undocumented function + * + * @param mixed $imapConnection + * @param mixed $start_msg + * @param mixed $show_num + * @param mixed $num_msgs + * @param mixed $id + * @return array + */ function getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id) { if ($id != 'no') { $id = array_slice($id, ($start_msg-1), $show_num); @@ -301,17 +433,48 @@ function getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $i } } +/** + * FIXME: Undocumented function + * + * @param mixed $imapConnection + * @param mixed $start_msg + * @param mixed $show_num + * @param mixed $num_msgs + * @return array + */ function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) { $id = get_thread_sort($imapConnection); return getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); } +/** + * FIXME: Undocumented function + * + * @param mixed $imapConnection + * @param mixed $start_msg + * @param mixed $show_num + * @param mixed $num_msgs + * @param mixed $server_sort_order + * @param mixed $mbxresponse + * @return array + */ 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); } +/** + * FIXME: Undocumented function + * + * @param mixed $imapConnection + * @param mixed $start_msg + * @param mixed $show_num + * @param mixed $num_msgs + * @param mixed $sort + * @param mixed $mbxresponse + * @return array + */ function getSelfSortMessages($imapConnection, $start_msg, $show_num, $num_msgs, $sort, $mbxresponse) { $msgs = array(); @@ -320,6 +483,9 @@ function getSelfSortMessages($imapConnection, $start_msg, $show_num, if ($sort < 6 ) { $end = $num_msgs; $end_loop = $end; + /* set shownum to 999999 to fool sqimap_get_small_header_list + and rebuild the msgs_str to 1:* */ + $show_num = 999999; } else { /* if it's not sorted */ if ($start_msg + ($show_num - 1) < $num_msgs) { @@ -350,9 +516,19 @@ function getSelfSortMessages($imapConnection, $start_msg, $show_num, -/* +/** * 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, @@ -411,15 +587,19 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $mode = ''; } - sqsession_unregister('msort'); - sqsession_unregister('msgs'); + if ($use_cache) { + sqgetGlobalVar('msgs', $msgs, SQ_SESSION); + sqgetGlobalVar('msort', $msort, SQ_SESSION); + } else { + 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); + $msgs = getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs); if ($msgs === false) { echo '
' . - _("Thread sorting is not supported by your IMAP server.
Please report this to the system administrator."). + _("Thread sorting is not supported by your IMAP server.") . '
' . + _("Please report this to the system administrator."). '
'; $thread_sort_messages = 0; $msort = $msgs = array(); @@ -429,11 +609,12 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, } break; case 'serversort': - $id = sqimap_get_sort_order($imapConnection, $sort, $mbxresponse); - $msgs = getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id); + $msgs = getServerSortMessages($imapConnection, $start_msg, $show_num, + $num_msgs, $sort, $mbxresponse); if ($msgs === false) { echo '
' . - _( "Server-side sorting is not supported by your IMAP server.
Please report this to the system administrator."). + _( "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; @@ -454,6 +635,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, } // switch sqsession_register($msort, 'msort'); sqsession_register($msgs, 'msgs'); + } /* if exists > 0 */ $res = getEndMessage($start_msg, $show_num, $num_msgs); @@ -466,32 +648,52 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs, $msg_cnt_str = get_msgcnt_str($start_msg, $end_msg, $num_msgs); do_hook('mailbox_index_before'); - echo ''; - echo ''; - /* line between the button area and the list */ - echo ''; - - echo '
'; - - mail_message_listing_beginning($imapConnection, $mailbox, $sort, - $msg_cnt_str, $paginator_str, $start_msg); - 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 '
'; +?> + + + + + + + + +
+ +
+ + + + +
+ + + + +
+ +
+
+ +
+" . _("THIS FOLDER IS EMPTY") . "
 ", + "
" . _("THIS FOLDER IS EMPTY") . "
 ", 'center', $color[4], - 'COLSPAN="' . count($index_order) . '"' + 'colspan="' . count($index_order) . '"' ) ); } elseif ($start_msg == $end_msg) { @@ -620,25 +843,28 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, } } -/* - * Displays the standard message list header. To finish the table, - * you need to do a ""; +/** + * Displays the standard message list header. * - * $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 + * 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, + $mbxresponse, $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; + 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 */ @@ -656,92 +882,101 @@ 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" - . $moveFields - . html_tag( 'table' , - html_tag( 'tr', - html_tag( 'td' , - html_tag( 'table' , - html_tag( 'tr', - html_tag( 'td', $paginator, 'left' ) . - html_tag( 'td', $msg_cnt_str, 'right' ) - ) - , '', $color[4], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) - , 'left', '', '' ) - , '', $color[0] ) - , '', '', 'border="0" width="100%" cellpadding="1" cellspacing="0"' ); - /* line between header and button area */ - echo ''; - - echo ''; - echo html_tag( 'tr' ) . "\n" - . html_tag( 'td' ,'' , 'left', '', '' ) - . html_tag( 'table' ,'' , '', $color[9], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) - . '' - . html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="1" cellspacing="0"' ) - . html_tag( 'tr', - getSmallStringCell(_("Move Selected To"), 'left', 'nowrap') . - getSmallStringCell(_("Transform Selected Messages"), 'right') - ) - . html_tag( 'tr' ) ."\n" - . html_tag( 'td', '', 'left', '', 'valign="middle" nowrap' ); - getMbxList($imapConnection); - echo getButton('SUBMIT', 'moveButton',_("Move")) . "\n"; - echo getButton('SUBMIT', 'attache',_("Forward")) . "\n"; - - echo " \n" - . html_tag( 'td', '', 'right', '', 'nowrap' ); - - - - if (!$auto_expunge) { - echo getButton('SUBMIT', 'expungeButton',_("Expunge")) - .' ' . _("mailbox") . "\n"; - } - echo getButton('SUBMIT', 'markRead',_("Read")); - echo getButton('SUBMIT', 'markUnread',_("Unread")); - echo getButton('SUBMIT', 'delete',_("Delete")) ." \n"; - if (!strpos($php_self,'mailbox')) { + if (!strpos($php_self,'?')) { $location = $php_self.'?mailbox=INBOX&startMessage=1'; } else { $location = $php_self; } - echo ''; - echo "\n" - . " \n"; - /* draws thread sorting links */ + $moveFields = addHidden('msg', $msg). + addHidden('mailbox', $mailbox). + addHidden('startMessage', $start_msg). + addHidden('location', $location); + + /* build thread sorting links */ if ($allow_thread_sort == TRUE) { - if ($thread_sort_messages == 1 ) { - $set_thread = 2; - $thread_name = _("Unthread View"); - } elseif ($thread_sort_messages == 0) { - $set_thread = 1; - $thread_name = _("Thread View"); - } - echo html_tag( 'tr' , - html_tag( 'td' , - ' ' . $thread_name - . ' ' - , '', '', '' ) - , '', '', '' ); + if ($thread_sort_messages == 1 ) { + $set_thread = 2; + $thread_name = _("Unthread View"); + } elseif ($thread_sort_messages == 0) { + $set_thread = 1; + $thread_name = _("Thread View"); + } + $thread_link_str = '[' . $thread_name + . ']'; } + else + $thread_link_str =''; - echo "\n"; + /* + * This is the beginning of the message list table. + * It wraps around all messages + */ + $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $mailbox); + $form_name = "FormMsgs" . $safe_name; + echo '' ."\n" + . $moveFields; +?> + + + + + + + +
+ + + + + + +
+
+ + + + + +
+ ' . _("Bypass Trash"); + echo ' '; + if (!$auto_expunge) { + echo getButton('SUBMIT', 'expungeButton',_("Expunge")) .' ' . _("mailbox") . "\n"; + echo ' '; + } + do_hook('mailbox_display_buttons'); + ?> + + +
+
+ +'; - - echo ''; - echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', - html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', $paginator_str ) . - html_tag( 'td', $msg_cnt_str, 'right' ) - ) - , '', $color[4], 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) - ) - ) - , '', $color[9], 'width="100%" border="0" cellpadding="1" cellspacing="0"' ); - echo ''; +?> + + + + + + + +
+ + + + + +
+
+ + +\n"; + echo "
\n"; } -function printHeader($mailbox, $sort, $color, $showsort=true) { +/** + * 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; echo html_tag( 'tr' ,'' , 'center', $color[5] ); @@ -795,8 +1050,10 @@ function printHeader($mailbox, $sort, $color, $showsort=true) { 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)) { @@ -836,11 +1093,17 @@ function printHeader($mailbox, $sort, $color, $showsort=true) { } -/* +/** * 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, $Up, $Down ) { +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'; @@ -862,29 +1125,43 @@ function ShowSortButton($sort, $mailbox, $Up, $Down ) { /* Now that we have everything figured out, show the actual button. */ echo ' sort'; + . '">sort'; } -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 .= "%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. + * + * @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. + * + * @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) { @@ -971,7 +1249,6 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, $nxt_str = ''; $pg_str = ''; $all_str = ''; - $tgl_str = ''; $box = urlencode($box); @@ -1004,9 +1281,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")); } @@ -1051,8 +1328,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); @@ -1067,8 +1344,8 @@ 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); } @@ -1078,7 +1355,7 @@ function get_paginator_str($box, $start_msg, $end_msg, $num_msgs, * 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) . '
'; + * . ($q1_pgs + $q2_pgs + $q3_pgs + $q4_pgs) . '
'; */ /* Print out the page links from the compute page quarters. */ @@ -1124,32 +1401,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. ;) */ $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); + if ( $prv_str != '' || $nxt_str != '' ) + { + $result .= '['; + $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); + $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 == '') { @@ -1160,66 +1437,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. + * than $trim_at, substr with an updated trim value. */ - $step = $ent_loc = 0; + $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); } -function getMbxList($imapConnection) { +/** + * 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); +} + +/** + * 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)), 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 . ':  ', @@ -1228,6 +1546,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); @@ -1244,6 +1569,10 @@ 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;