X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=ad3355a2d1456d045f13ede080bc93c9f087e61f;hp=06c9677143d4472ce4974870063f914f6ac61f9e;hb=34e035f76d08e1919ada7e68af9a304d2d6d4ddd;hpb=b3e4bf7100bcc9ec2cc49153ab0f90601fce1082 diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 06c96771..ad3355a2 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,17 +1,17 @@ '; $bold_end = ''; @@ -296,44 +300,126 @@ function printMessageInfo($aMsg) { if (!isset($hlt_color)) { $hlt_color = $color_string; } + $col = 0; $sSubject = str_replace(' ', ' ', decodeHeader($sSubject)); $subject = processSubject($sSubject, $iIndent); - echo html_tag( 'tr','','','','VALIGN="top"') . "\n"; + + $row_extra = 'valign="top"'; + + + // this stuff does the auto row highlighting on mouseover + // + if ($javascript_on && $fancy_index_highlite) { + + $mouseoverColor = $color[5]; + + // set this to an empty string to turn off extra + // highlighting of checked rows + // + //$clickedColor = ''; + if (!empty($color[16])) + $clickedColor = $color[16]; + else + $clickedColor = $color[2]; + + $row_extra .= ' onmouseover="setPointer(this, ' . $t . ', \'over\', \'' . $hlt_color . '\', \'' . $mouseoverColor . '\', \'' . $clickedColor . '\');" onmouseout="setPointer(this, ' . $t . ', \'out\', \'' . $hlt_color . '\', \'' . $mouseoverColor . '\', \'' . $clickedColor . '\');" onmousedown="setPointer(this, ' . $t . ', \'click\', \'' . $hlt_color . '\', \'' . $mouseoverColor . '\', \'' . $clickedColor . '\');"'; + + } + + + if ($javascript_on && $fancy_index_highlite) + echo ""; + echo html_tag( 'tr', '', '', '', $row_extra) . "\n"; + + + // this does the auto-checking of the checkbox no matter + // where on the row you click + // + $javascript_auto_click = ''; + $checkbox_javascript = ''; + if ($javascript_on && $fancy_index_highlite) { + $javascript_auto_click = ' onMouseDown="row_click(\'msg[' . $t . ']\')"'; + $checkbox_javascript = ' onClick="this.checked = !this.checked;"'; + } + if (sizeof($index_order)) { + + // figure out which columns should serve as labels for checkbox: + // we try to grab the two columns before and after the checkbox, + // except the subject column, since it is the link that opens + // the message view + // + // if $javascript_on is set, then the highlighting code takes + // care of this; just skip it + // + $show_label_columns = array(); + if (!($javascript_on && $fancy_index_highlite)) { + $get_next_two = 0; + $last_order_part = 0; + $last_last_order_part = 0; + foreach ($index_order as $index_order_part) { + + if ($index_order_part == 1) { + $get_next_two = 1; + if ($last_last_order_part != 4) + $show_label_columns[] = $last_last_order_part; + if ($last_order_part != 4) + $show_label_columns[] = $last_order_part; + + } else if ($get_next_two > 0 && $get_next_two < 3 && $index_order_part != 4) { + $show_label_columns[] = $index_order_part; + $get_next_two++; + } + $last_last_order_part = $last_order_part; + $last_order_part = $index_order_part; + } + } + + + // build the actual columns for display + // foreach ($index_order as $index_order_part) { + if (in_array($index_order_part, $show_label_columns)) { + $label_start = ''; + } else { + $label_start = ''; + $label_end = ''; + } switch ($index_order_part) { case 1: /* checkbox */ echo html_tag( 'td', - addCheckBox("msg[$t]", $checkall, $iId), + addCheckBox("msg[$t]", $checkall, $iId, $checkbox_javascript), 'center', - $hlt_color ); + $hlt_color, $javascript_auto_click); break; 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 = ''; } echo html_tag( 'td', - $italic . $bold . $flag . $fontstr . $senderName . - $fontstr_end . $flag_end . $bold_end . $italic_end, + $label_start . $italic . $bold . $flag . $fontstr . $senderName . + $fontstr_end . $flag_end . $bold_end . $italic_end . $label_end, 'left', - $hlt_color, $title ); + $hlt_color, $title . $javascript_auto_click); break; case 3: /* date */ if ($sDate == '') { $sDate = _("Unknown date"); } echo html_tag( 'td', - $bold . $flag . $fontstr . $sDate . - $fontstr_end . $flag_end . $bold_end, + $label_start . $bold . $flag . $fontstr . $sDate . + $fontstr_end . $flag_end . $bold_end . $label_end, 'center', $hlt_color, - 'nowrap' ); + 'style="white-space: nowrap;"' . $javascript_auto_click ); break; case 4: /* subject */ $td_str = $bold; @@ -343,16 +429,25 @@ function printMessageInfo($aMsg) { $td_str .= ''), array("''", '<', '>'), $title); $td_str .= " title=\"$title\""; } $td_str .= ">$flag$subject$flag_end$bold_end"; - echo html_tag( 'td', $td_str, 'left', $hlt_color ); + echo html_tag( 'td', $td_str, 'left', $hlt_color, $javascript_auto_click ); break; case 5: /* flags */ @@ -401,10 +496,10 @@ function printMessageInfo($aMsg) { $td_str .= ''. $msg_alt . ''; $td_str .= ''; echo html_tag( 'td', - $td_str, + $label_start . $td_str . $label_end, 'right', $hlt_color, - 'nowrap' ); + 'style="white-space: nowrap;"' . $javascript_auto_click ); } // plain text message markers @@ -439,18 +534,18 @@ function printMessageInfo($aMsg) { } $td_str .= ''; echo html_tag( 'td', - $td_str, + $label_start . $td_str . $label_end, 'center', $hlt_color, - 'nowrap' ); + 'style="white-space: nowrap;"' . $javascript_auto_click ); } break; case 6: /* size */ echo html_tag( 'td', - $bold . $fontstr . show_readable_size($iSize) . - $fontstr_end . $bold_end, + $label_start . $bold . $fontstr . show_readable_size($iSize) . + $fontstr_end . $bold_end . $label_end, 'right', - $hlt_color ); + $hlt_color, $javascript_auto_click ); break; } ++$col; @@ -492,6 +587,7 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { /** * In case the properties arrays are empty set the defaults. */ + // Doesn't appear to be used... safe to remove? $aDefaultMbxPref = array (); // MBX_PREF_SORT => 0, // MBX_PREF_LIMIT => 15, @@ -595,7 +691,6 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { (!($newsort % 2) && ($newsort - 1 == $oldsort))) { $aMailbox['UIDSET'][$iSetIndx] = array_reverse($aCachedMailbox['UIDSET'][$iSetIndx]); } else { - $server_sort_array = false; $aMailbox['MSG_HEADERS'] = false; $aMailbox['ID'] = false; } @@ -710,12 +805,12 @@ function sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aProps) { /** -* Does the $srt $_GET var to field mapping -* -* @param int $srt Field to sort on -* @param bool $bServerSort Server sorting is true -* @return string $sSortField Field to sort on -*/ + * Does the $srt $_GET var to field mapping + * + * @param int $srt Field to sort on + * @param bool $bServerSort Server sorting is true + * @return string $sSortField Field to sort on + */ function getSortField($sort,$bServerSort) { switch($sort) { case SQSORT_NONE: @@ -771,7 +866,7 @@ function get_sorted_msgs_list($imapConnection,&$aMailbox,&$error) { if ($aRes === false) { $error = '
' . _("Thread sorting is not supported by your IMAP server.") . '
' . - _("Please report this to the system administrator.") . + _("Please contact your system administrator and report this error.") . '
'; $aMailbox['SORT'] -= SQSORT_THREAD; } else { @@ -785,7 +880,7 @@ function get_sorted_msgs_list($imapConnection,&$aMailbox,&$error) { if ($id === false) { $error = '
' . _("Server-side sorting is not supported by your IMAP server.") . '
' . - _("Please report this to the system administrator.") . + _("Please contact your system administrator and report this error.") . '
'; } else { $aMailbox['UIDSET'][$iSetIndx] = $id; @@ -836,7 +931,7 @@ function fetchMessageHeaders($imapConnection, &$aMailbox) { } // 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 @@ -932,10 +1027,10 @@ function fetchMessageHeaders($imapConnection, &$aMailbox) { } /** - * retrieve messages by sequence id's and fetch the UID to retrieve - * the UID. for sorted lists this is not needed because a UID FETCH - * automaticly add the UID value in fetch results - **/ + * retrieve messages by sequence id's and fetch the UID to retrieve + * the UID. for sorted lists this is not needed because a UID FETCH + * automaticly add the UID value in fetch results + **/ $aFetchItems[] = 'UID'; //create id range @@ -999,14 +1094,14 @@ function fetchMessageHeaders($imapConnection, &$aMailbox) { } /** -* This function loops through a group of messages in the mailbox -* and shows them to the user. -* -* @param mixed $imapConnection -* @param array $aMailbox associative array with mailbox related vars -*/ + * This function loops through a group of messages in the mailbox + * and shows them to the user. + * + * @param mixed $imapConnection + * @param array $aMailbox associative array with mailbox related vars + */ function showMessagesForMailbox($imapConnection, &$aMailbox) { - global $color; + global $color, $javascript_on, $compact_paginator; // to retrieve the internaldate pref: (I know this is not the right place to do that, move up in front // and use a properties array as function argument to provide user preferences @@ -1021,18 +1116,26 @@ function showMessagesForMailbox($imapConnection, &$aMailbox) { $aMailbox['PAGEOFFSET'] + $iLimit - 1 : $aMailbox['EXISTS']; $paginator_str = get_paginator_str($aMailbox['NAME'], $aMailbox['PAGEOFFSET'], - $aMailbox['EXISTS'], $aMailbox['LIMIT'], $aMailbox['SHOWALL'][$iSetIndx]); + $aMailbox['EXISTS'], $aMailbox['LIMIT'], $aMailbox['SHOWALL'][$iSetIndx]); $msg_cnt_str = get_msgcnt_str($aMailbox['PAGEOFFSET'], $iEnd,$aMailbox['EXISTS']); do_hook('mailbox_index_before'); + + if ($javascript_on && $compact_paginator) { + // Insert compact paginator javascript + echo "\n\n" + . "\n" + . "\n"; + } + mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $paginator_str); ?> - - - -
- -
@@ -1040,38 +1143,34 @@ function showMessagesForMailbox($imapConnection, &$aMailbox) {
- - -
-
- - + + "; -* -* @param resource $imapConnection -* @param array $aMailbox associative array with mailbox related information -* @param string $msg_cnt_str -* @param string $paginator Paginator string -*/ + * Displays the standard message list header. + * + * To finish the table, you need to do a ""; + * + * @param resource $imapConnection + * @param array $aMailbox associative array with mailbox related information + * @param string $msg_cnt_str + * @param string $paginator Paginator string + */ function mail_message_listing_beginning ($imapConnection, $aMailbox, $msg_cnt_str = '', @@ -1142,13 +1241,12 @@ function mail_message_listing_beginning ($imapConnection, $php_self = $PHP_SELF; - $urlMailbox = urlencode($aMailbox['NAME']); - if (preg_match('/^(.+)\?.+$/',$php_self,$regs)) { $source_url = $regs[1]; } else { $source_url = $php_self; } + $php_self = str_replace('&', '&', $php_self); if (!isset($msg)) { $msg = ''; @@ -1169,8 +1267,8 @@ function mail_message_listing_beginning ($imapConnection, $sort = $aMailbox['SORT'] + SQSORT_THREAD; } $thread_link_str = '[' . $thread_name + . $sort . '&start_messages=1' + . '&mailbox=' . urlencode($aMailbox['NAME']) . '">' . $thread_name . ']'; } else { $thread_link_str =''; @@ -1184,29 +1282,30 @@ function mail_message_listing_beginning ($imapConnection, echo '
' ."\n" . $moveFields; + echo ' - + @@ -1276,8 +1378,8 @@ if ($num_msgs) { @@ -1290,14 +1392,13 @@ if ($num_msgs) { /* End of message-list table */ do_hook('mailbox_index_after'); - echo "\n"; } /** -* Prints the table header for the messages list view -* -* @param array $aMailbox -*/ + * Prints the table header for the messages list view + * + * @param array $aMailbox + */ function printHeader($aMailbox) { global $index_order, $internal_date_sort, $color; @@ -1310,7 +1411,7 @@ function printHeader($aMailbox) { 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) { @@ -1323,7 +1424,7 @@ function printHeader($aMailbox) { 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'])) { @@ -1342,7 +1443,7 @@ function printHeader($aMailbox) { echo "\n"; break; case 3: /* date */ - echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' ) + echo html_tag( 'td' ,'' , 'left', '', 'width="5%" style="white-space: nowrap;"' ) . '' . _("Date") . ''; if ($showsort) { if ($internal_date_sort) { @@ -1362,7 +1463,7 @@ function printHeader($aMailbox) { echo "\n"; break; case 6: /* size */ - echo html_tag( 'td', '', 'center','','width="5%" nowrap') + echo html_tag( 'td', '', 'center','','width="5%" style="white-space: nowrap;"') . '' . _("Size") . ''; if ($showsort) { ShowSortButton($aMailbox, SQSORT_SIZE_ASC, SQSORT_SIZE_DEC); @@ -1376,12 +1477,12 @@ function printHeader($aMailbox) { /** -* This function shows the sort button. Isn't this a good comment? -* -* @param array $aMailbox -* @param integer $Down -* @param integer $Up -*/ + * This function shows the sort button. Isn't this a good comment? + * + * @param array $aMailbox + * @param integer $Down + * @param integer $Up + */ function ShowSortButton($aMailbox, $Down, $Up ) { global $PHP_SELF; @@ -1412,14 +1513,23 @@ function ShowSortButton($aMailbox, $Down, $Up ) { } /** -* FIXME: Undocumented function -* -* @param array $aMailbox -*/ + * FIXME: Undocumented function + * + * @param array $aMailbox + */ function get_selectall_link($aMailbox) { - global $checkall, $javascript_on; + global $checkall, $javascript_on, $fancy_index_highlite, $color; global $PHP_SELF; + // set this to an empty string to turn off extra + // highlighting of checked rows + // + //$clickedColor = ''; + if (!empty($color[16])) + $clickedColor = $color[16]; + else + $clickedColor = $color[2]; + $result = ''; if ($javascript_on) { $safe_name = preg_replace("/[^0-9A-Za-z_]/", '_', $aMailbox['NAME']); @@ -1427,37 +1537,67 @@ function get_selectall_link($aMailbox) { $form_name = "FormMsgs" . $safe_name; $result = '' . ''; -// . ' . _("Toggle All") +// . ' . _("Toggle All") // . "\n"; } else { + $result .= ""; $result .= _("All"); @@ -1469,13 +1609,13 @@ function get_selectall_link($aMailbox) { } /** -* 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 -*/ + * 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 = ''; @@ -1492,14 +1632,14 @@ function get_msgcnt_str($start_msg, $end_msg, $num_msgs) { } /** -* Generate a paginator link. -* -* @param mixed $box Mailbox name -* @param mixed $start_msg Message Offset -* @param mixed $use -* @param string $text text used for paginator link -* @return string -*/ + * Generate a paginator link. + * + * @param mixed $box Mailbox name + * @param mixed $start_msg Message Offset + * @param mixed $use + * @param string $text text used for paginator link + * @return string + */ function get_paginator_link($box, $start_msg, $text) { sqgetGlobalVar('PHP_SELF',$php_self,SQ_SERVER); $result = "= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, _("Previous")); - $nxt_str = get_paginator_link($box, $next_grp, _("Next")); - } else if (($next_grp > $iTotal) && ($prev_grp >= 0)) { - $prv_str = get_paginator_link($box, $prev_grp, _("Previous")); - $nxt_str = _("Next"); - } else if (($next_grp <= $iTotal) && ($prev_grp < 0)) { - $prv_str = _("Previous"); - $nxt_str = get_paginator_link($box, $next_grp, _("Next")); + if ($compact_paginator) { + if (($next_grp <= $iTotal) && ($prev_grp >= 0)) { + $prv_str = get_paginator_link($box, $prev_grp, '<'); + $nxt_str = get_paginator_link($box, $next_grp, '>'); + } else if (($next_grp > $iTotal) && ($prev_grp >= 0)) { + $prv_str = get_paginator_link($box, $prev_grp, '<'); + $nxt_str = '>'; + } else if (($next_grp <= $iTotal) && ($prev_grp < 0)) { + $prv_str = '<'; + $nxt_str = get_paginator_link($box, $next_grp, '>'); + } + } else { + if (($next_grp <= $iTotal) && ($prev_grp >= 0)) { + $prv_str = get_paginator_link($box, $prev_grp, _("Previous")); + $nxt_str = get_paginator_link($box, $next_grp, _("Next")); + } else if (($next_grp > $iTotal) && ($prev_grp >= 0)) { + $prv_str = get_paginator_link($box, $prev_grp, _("Previous")); + $nxt_str = _("Next"); + } else if (($next_grp <= $iTotal) && ($prev_grp < 0)) { + $prv_str = _("Previous"); + $nxt_str = get_paginator_link($box, $next_grp, _("Next")); + } } /* Page selector block. Following code computes page links. */ - if ($iLimit != 0 && $pg_sel && ($iTotal > $iLimit)) { + if ($iLimit != 0 && $page_selector && ($iTotal > $iLimit)) { /* Most importantly, what is the current page!!! */ $cur_pg = intval($iOffset / $iLimit) + 1; /* Compute total # of pages and # of paginator page links. */ $tot_pgs = ceil($iTotal / $iLimit); /* Total number of Pages */ - $vis_pgs = min($pg_max, $tot_pgs - 1); /* Visible Pages */ - /* Compute the size of the four quarters of the page links. */ + if (!$compact_paginator) { + $vis_pgs = min($page_selector_max, $tot_pgs - 1); /* Visible Pages */ - /* If we can, just show all the pages. */ - if (($tot_pgs - 1) <= $pg_max) { - $q1_pgs = $cur_pg - 1; - $q2_pgs = $q3_pgs = 0; - $q4_pgs = $tot_pgs - $cur_pg; + /* Compute the size of the four quarters of the page links. */ - /* 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. - */ - $q1_pgs = floor($vis_pgs/4); - $q2_pgs = round($vis_pgs/4, 0); - $q3_pgs = ceil($vis_pgs/4); - $q4_pgs = round(($vis_pgs - $q2_pgs)/3, 0); - - /* Adjust if the first quarter contains the current page. */ - if (($cur_pg - $q1_pgs) < 1) { - $extra_pgs = ($q1_pgs - ($cur_pg - 1)) + $q2_pgs; + /* If we can, just show all the pages. */ + if (($tot_pgs - 1) <= $page_selector_max) { $q1_pgs = $cur_pg - 1; - $q2_pgs = 0; - $q3_pgs += ceil($extra_pgs / 2); - $q4_pgs += floor($extra_pgs / 2); - - /* 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) * 3/4); - $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 3/4); - $q3_pgs += ceil($extra_pgs / 2); - $q4_pgs += floor($extra_pgs / 2); - - /* Adjust if the fourth quarter contains the current page. */ - } else if (($cur_pg + $q4_pgs) >= $tot_pgs) { - $extra_pgs = ($q4_pgs - ($tot_pgs - $cur_pg)) + $q3_pgs; - $q3_pgs = 0; + $q2_pgs = $q3_pgs = 0; $q4_pgs = $tot_pgs - $cur_pg; - $q1_pgs += floor($extra_pgs / 2); - $q2_pgs += ceil($extra_pgs / 2); - - /* 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) * 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); + + /* 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. + */ + $q1_pgs = floor($vis_pgs/4); + $q2_pgs = round($vis_pgs/4, 0); + $q3_pgs = ceil($vis_pgs/4); + $q4_pgs = round(($vis_pgs - $q2_pgs)/3, 0); + + /* Adjust if the first quarter contains the current page. */ + if (($cur_pg - $q1_pgs) < 1) { + $extra_pgs = ($q1_pgs - ($cur_pg - 1)) + $q2_pgs; + $q1_pgs = $cur_pg - 1; + $q2_pgs = 0; + $q3_pgs += ceil($extra_pgs / 2); + $q4_pgs += floor($extra_pgs / 2); + + /* 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) * 3/4); + $q2_pgs = ceil(($cur_pg - $q1_pgs - 1) * 3/4); + $q3_pgs += ceil($extra_pgs / 2); + $q4_pgs += floor($extra_pgs / 2); + + /* Adjust if the fourth quarter contains the current page. */ + } else if (($cur_pg + $q4_pgs) >= $tot_pgs) { + $extra_pgs = ($q4_pgs - ($tot_pgs - $cur_pg)) + $q3_pgs; + $q3_pgs = 0; + $q4_pgs = $tot_pgs - $cur_pg; + $q1_pgs += floor($extra_pgs / 2); + $q2_pgs += ceil($extra_pgs / 2); + + /* 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) * 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. */ + /* Print out the page links from the compute page quarters. */ - /* Start with the first quarter. */ - if (($q1_pgs == 0) && ($cur_pg > 1)) { - $pg_str .= "...$spc"; - } else { - for ($pg = 1; $pg <= $q1_pgs; ++$pg) { - $start = (($pg-1) * $iLimit) + 1; - $pg_str .= get_paginator_link($box, $start, $pg) . $spc; - } - if ($cur_pg - $q2_pgs - $q1_pgs > 1) { + /* Start with the first quarter. */ + if (($q1_pgs == 0) && ($cur_pg > 1)) { $pg_str .= "...$spc"; + } else { + for ($pg = 1; $pg <= $q1_pgs; ++$pg) { + $start = (($pg-1) * $iLimit) + 1; + $pg_str .= get_paginator_link($box, $start, $pg) . $spc; + } + if ($cur_pg - $q2_pgs - $q1_pgs > 1) { + $pg_str .= "...$spc"; + } } - } - /* Continue with the second quarter. */ - for ($pg = $cur_pg - $q2_pgs; $pg < $cur_pg; ++$pg) { - $start = (($pg-1) * $iLimit) + 1; - $pg_str .= get_paginator_link($box, $start, $pg) . $spc; - } + /* Continue with the second quarter. */ + for ($pg = $cur_pg - $q2_pgs; $pg < $cur_pg; ++$pg) { + $start = (($pg-1) * $iLimit) + 1; + $pg_str .= get_paginator_link($box, $start, $pg) . $spc; + } - /* Now print the current page. */ - $pg_str .= $cur_pg . $spc; + /* Now print the current page. */ + $pg_str .= $cur_pg . $spc; - /* Next comes the third quarter. */ - for ($pg = $cur_pg + 1; $pg <= $cur_pg + $q3_pgs; ++$pg) { - $start = (($pg-1) * $iLimit) + 1; - $pg_str .= get_paginator_link($box, $start, $pg) . $spc; - } + /* Next comes the third quarter. */ + for ($pg = $cur_pg + 1; $pg <= $cur_pg + $q3_pgs; ++$pg) { + $start = (($pg-1) * $iLimit) + 1; + $pg_str .= get_paginator_link($box, $start, $pg) . $spc; + } - /* And last, print the forth quarter page links. */ - if (($q4_pgs == 0) && ($cur_pg < $tot_pgs)) { - $pg_str .= "...$spc"; - } else { - if (($tot_pgs - $q4_pgs) > ($cur_pg + $q3_pgs)) { + /* And last, print the forth quarter page links. */ + if (($q4_pgs == 0) && ($cur_pg < $tot_pgs)) { $pg_str .= "...$spc"; - } - for ($pg = $tot_pgs - $q4_pgs + 1; $pg <= $tot_pgs; ++$pg) { - $start = (($pg-1) * $iLimit) + 1; - $pg_str .= get_paginator_link($box, $start,$pg) . $spc; + } else { + if (($tot_pgs - $q4_pgs) > ($cur_pg + $q3_pgs)) { + $pg_str .= "...$spc"; + } + for ($pg = $tot_pgs - $q4_pgs + 1; $pg <= $tot_pgs; ++$pg) { + $start = (($pg-1) * $iLimit) + 1; + $pg_str .= get_paginator_link($box, $start,$pg) . $spc; + } } } + $last_grp = (($tot_pgs - 1) * $iLimit) + 1; } } else { $pg_str = "" . _("Show All") . ''; - $result .= '['; - $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); - $result .= ($nxt_str != '' ? $nxt_str : ''); - $result .= ']' . $spc ; - } - $result .= ($pg_str != '' ? $spc . '['.$spc.$pg_str.']' . $spc : ''); - $result .= ($all_str != '' ? $spc . '['.$all_str.']' . $spc . $spc : ''); + if ($compact_paginator) { + if ( $prv_str || $nxt_str ) { + $result .= '[' . get_paginator_link($box, 1, '<<') . ']'; + $result .= '[' . $prv_str . ']'; + + $pg_url = $php_self . '?mailbox=' . $box; + $result .= '[' . $nxt_str . ']'; + $result .= '[' . get_paginator_link($box, $last_grp, '>>') . ']'; + + if ($page_selector) { + $result .= $spc . ''; + + if ($javascript_on) { + $result .= ''; + } else { + $result .= addSubmit(_("Go")); + } + } + } + + $result .= ($pg_str != '' ? '['.$pg_str.']' . $spc : ''); + $result .= ($all_str != '' ? $spc . '['.$all_str.']' . $spc . $spc : ''); + } else { + if ( $prv_str || $nxt_str ) { + $result .= '['; + $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : ''); + $result .= ($nxt_str != '' ? $nxt_str : ''); + $result .= ']' . $spc ; + } + + $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 == '') { $result = ' '; } - /* Return our final magical paginator string. */ return ($result); } /** -* FIXME: Undocumented function -*/ + * FIXME: Undocumented function + */ function truncateWithEntities($subject, $trim_at) { $ent_strlen = strlen($subject); @@ -1721,11 +1917,11 @@ function truncateWithEntities($subject, $trim_at) 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 $trim_at, substr with an updated trim value. - */ + * 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; @@ -1749,12 +1945,12 @@ function truncateWithEntities($subject, $trim_at) 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); } /** -* FIXME: Undocumented function -*/ + * FIXME: Undocumented function + */ function processSubject($subject, $threadlevel = 0) { /* Shouldn't ever happen -- caught too many times in the IMAP functions */ if ($subject == '') { @@ -1773,15 +1969,15 @@ function processSubject($subject, $threadlevel = 0) { /** -* 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 -*/ + * 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.' ' : '' ); @@ -1793,23 +1989,23 @@ function getButton($type, $name, $value, $js = '', $enabled = TRUE) { } /** -* Puts string into cell, aligns it and adds tag -* -* @param string $string string -* @param string $align alignment -*/ + * 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 . ':  ', $align, '', - 'nowrap' ); + 'style="white-space: nowrap;"' ); } /** -* This should go in imap_mailbox.php -* @param string $mailbox -*/ + * This should go in imap_mailbox.php + * @param string $mailbox + */ function handleAsSent($mailbox) { global $handleAsSent_result; @@ -1867,11 +2063,8 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar !in_array($aUid[0],$aMailbox['UIDSET'][$aMailbox['SETINDEX']])) { break; } - // What kind of hook is this, can it be removed? Disabled for now because it can invalidate the cache - //if (!boolean_hook_function('move_messages_button_action', NULL, 1)) { - $aUpdatedMsgs = sqimap_msgs_list_delete($imapConnection, $mailbox, $aUid,$bypass_trash); - $bExpunge = true; - //} + $aUpdatedMsgs = sqimap_msgs_list_delete($imapConnection, $mailbox, $aUid,$bypass_trash); + $bExpunge = true; break; case 'unsetDeleted': case 'setSeen': @@ -1899,6 +2092,10 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar $aMailbox['FORWARD_SESSION'] = $composesession; } break; + default: + // Hook for plugin buttons + do_hook_function('mailbox_display_button_action', $aUid); + break; } /** * Updates messages is an array containing the result of the untagged @@ -1960,9 +2157,10 @@ function handleMessageListForm($imapConnection,&$aMailbox,$sButton='',$aUid = ar $aMailbox['EXISTS'] -= (int) $iExpungedMessages; } // Change the startMessage number if the mailbox was changed - if (($aMailbox['PAGEOFFSET']+$iExpungedMessages-1) >= $aMailbox['EXISTS']) { + if (($aMailbox['PAGEOFFSET']-1) >= $aMailbox['EXISTS']) { $aMailbox['PAGEOFFSET'] = ($aMailbox['PAGEOFFSET'] > $aMailbox['LIMIT']) ? $aMailbox['PAGEOFFSET'] - $aMailbox['LIMIT'] : 1; + $aMailbox['OFFSET'] = $aMailbox['PAGEOFFSET'] - 1 ; } } }
'; $button_str = ''; // display flag buttons only if supported if ($show_flag_buttons && in_array('\\flagged',$aMailbox['PERMANENTFLAGS'], true) ) { - $button_str .= getButton('SUBMIT', 'markUnflagged', _("Unflag")); - $button_str .= getButton('SUBMIT', 'markFlagged', _("Flag")); + $button_str .= getButton('submit', 'markUnflagged', _("Unflag")); + $button_str .= getButton('submit', 'markFlagged', _("Flag")); $button_str .= " \n"; } if (in_array('\\seen',$aMailbox['PERMANENTFLAGS'], true)) { - $button_str .= getButton('SUBMIT', 'markUnread', _("Unread")); - $button_str .= getButton('SUBMIT', 'markRead', _("Read")); + $button_str .= getButton('submit', 'markUnread', _("Unread")); + $button_str .= getButton('submit', 'markRead', _("Read")); $button_str .= " \n"; } - $button_str .= getButton('SUBMIT', 'attache',_("Forward")) . + $button_str .= getButton('submit', 'attache',_("Forward")) . " \n"; if (in_array('\\deleted',$aMailbox['PERMANENTFLAGS'], true)) { - $button_str .= getButton('SUBMIT', 'delete',_("Delete")); + $button_str .= getButton('submit', 'delete',_("Delete")); $button_str .= '' . _("Bypass Trash"); $button_str .= " \n"; } if (!$aMailbox['AUTO_EXPUNGE'] && $aMailbox['RIGHTS'] != 'READ-ONLY') { - $button_str .= getButton('SUBMIT', 'expungeButton',_("Expunge")) .' ' . _("mailbox") . "\n"; + $button_str .= getButton('submit', 'expungeButton',_("Expunge")) .' ' . _("mailbox") . "\n"; $button_str .= ' '; } ?> @@ -1216,13 +1315,13 @@ function mail_message_listing_beginning ($imapConnection, ' . $paginator . $thread_link_str . '', 'left') . "\n"; ?> - + ' . $msg_cnt_str . '', 'right') . "\n"; ?>
@@ -1240,7 +1339,7 @@ function mail_message_listing_beginning ($imapConnection,   - +
+
- ' . $paginator_str . '', 'left'); ?> - ' . $msg_cnt_str . '', 'right'); ?> + ' . $paginator_str . '', 'left'); ?> + ' . $msg_cnt_str . '', 'right'); ?>