/**
* mailbox_display.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains functions that display mailbox information, such as the
$aFlags = (isset($msg['FLAGS'])) ? $msg['FLAGS'] : array();
$iPrio = (isset($msg['PRIORITY'])) ? $msg['PRIORITY'] : 3;
$iSize = (isset($msg['SIZE'])) ? $msg['SIZE'] : 0;
+
+ // These don't appear to be used... are they safe to remove
$sType0 = (isset($msg['TYPE0'])) ? $msg['TYPE0'] : 'text';
$sType1 = (isset($msg['TYPE1'])) ? $msg['TYPE1'] : 'plain';
if (isset($msg['INTERNALDATE'])) {
// If the From address is the same as $email_address, then handle as Sent
$from_array = parseAddress($sFrom, 1);
if (!isset($email_address)) {
- global $datadir, $username;
- $email_address = getPref($datadir, $username, 'email_address');
+ global $data_dir, $username;
+ $email_address = getPref($data_dir, $username, 'email_address');
}
$bHandleAsSent = ((isset($from_array[0][0])) && ($from_array[0][0] == $email_address));
} else {
$senderName = truncateWithEntities($senderName, $truncate_sender);
}
- $flag = $flag_end = $bold = $bold_end = $fontstr = $fontstr_end = $italic = $italic_end = '';
+ $flag = $flag_end = $fontstr = $fontstr_end = $italic = $italic_end = '';
$bold = '<b>';
$bold_end = '</b>';
case 2: /* from */
if ($senderAddress != $senderName) {
$senderAddress = strtr($senderAddress, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
- $title = ' title="' . str_replace('"', "''", $senderAddress) . '"';
+ $title = ' title="' . str_replace(array('"', '<', '>'), array("''", '<', '>'), $senderAddress) . '"';
} else {
$title = '';
}
$fontstr_end . $flag_end . $bold_end,
'center',
$hlt_color,
- 'nowrap' );
+ 'style="white-space: nowrap;"' );
break;
case 4: /* subject */
$td_str = $bold;
$title = get_html_translation_table(HTML_SPECIALCHARS);
$title = array_flip($title);
$title = strtr($sSubject, $title);
- $title = str_replace('"', "''", $title);
+ $title = str_replace(array('"', '<', '>'), array("''", '<', '>'), $title);
$td_str .= " title=\"$title\"";
}
$td_str .= ">$flag$subject$flag_end</a>$bold_end";
$td_str,
'right',
$hlt_color,
- 'nowrap' );
+ 'style="white-space: nowrap;"' );
}
// plain text message markers
$td_str,
'center',
$hlt_color,
- 'nowrap' );
+ 'style="white-space: nowrap;"' );
}
break;
case 6: /* size */
/**
* 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,
(!($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;
}
}
// 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
* @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
$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<!-- start of compact paginator javascript -->\n"
+ . "<script language=\"JavaScript\">\n"
+ . "function SubmitOnSelect(select, URL)\n"
+ . "{\n"
+ . " URL += select.options[select.selectedIndex].value;\n"
+ . " window.location.href = URL;\n"
+ . "}\n"
+ . "</script>\n"
+ . "<!-- end of compact paginator javascript -->\n";
+ }
+ mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $paginator_str);
?>
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-<tr>
- <td>
- <?php mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $paginator_str); ?>
- </td>
-</tr>
<tr><td height="5" bgcolor="<?php echo $color[4]; ?>"></td></tr>
<tr>
<td>
<tr>
<td>
<table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="<?php echo $color[5]; ?>">
- <tr>
- <td>
<?php
printHeader($aMailbox);
displayMessageArray($imapConnection, $aMailbox);
?>
- </td>
- </tr>
</table>
</td>
</tr>
</table>
- <?php
- mail_message_listing_end($aMailbox['EXISTS'], $paginator_str, $msg_cnt_str);
- ?>
</td>
</tr>
-</table>
+<?php
+ mail_message_listing_end($aMailbox, $paginator_str, $msg_cnt_str);
+?>
+</table></form>
<?php
}
$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 = '';
$sort = $aMailbox['SORT'] + SQSORT_THREAD;
}
$thread_link_str = '<small>[<a href="' . $source_url . '?srt='
- . $sort . '&start_messages=1'
- . '&mailbox=' . urlencode($aMailbox['NAME']) . '">' . $thread_name
+ . $sort . '&start_messages=1'
+ . '&mailbox=' . urlencode($aMailbox['NAME']) . '">' . $thread_name
. '</a>]</small>';
} else {
$thread_link_str ='';
echo '<form name="' . $form_name . '" method="post" action="'.$php_self.'">' ."\n"
. $moveFields;
+ echo '<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td>';
$button_str = '';
// display flag buttons only if supported
<table bgcolor="<?php echo $color[4]; ?>" border="0" width="100%" cellpadding="1" cellspacing="0">
<tr>
<?php echo html_tag('td', '<small>' . $paginator . $thread_link_str . '</small>', 'left') . "\n"; ?>
- <?php echo html_tag('td', '', 'center') . "\n"; ?>
+ <?php echo html_tag('td', ' ', 'center') . "\n"; ?>
<?php echo html_tag('td', '<small>' . $msg_cnt_str . '</small>', 'right') . "\n"; ?>
</tr>
</table>
</td>
</tr>
- <tr width="100%" cellpadding="1" cellspacing="0" border="0" bgcolor="<?php echo $color[0]; ?>">
+ <tr bgcolor="<?php echo $color[0]; ?>">
<td>
<table border="0" width="100%" cellpadding="1" cellspacing="0">
<tr>
</td>
</tr>
</table>
+</td></tr>
<?php
do_hook('mailbox_form_before');
}
* Function to add the last row in a message list, it contains the paginator and info about
* the number of messages.
*
- * @param integer $num_msgs number of messages in a mailbox
+ * @param array $aMailbox associative array with mailbox related information
* @param string $paginator_str Paginator string [Prev | Next] [ 1 2 3 ... 91 92 94 ] [Show all]
* @param string $msg_cnt_str Message count string Viewing Messages: 21 to 1861 (20 total)
*/
-function mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str) {
-global $color;
-if ($num_msgs) {
- /* space between list and footer */
+function mail_message_listing_end($aMailbox, $paginator_str, $msg_cnt_str) {
+ global $color;
+
+ if ($aMailbox['EXISTS']) {
+ /* space between list and footer */
+
?>
<tr><td height="5" bgcolor="<?php echo $color[4]; ?>" colspan="1"></td></tr>
<tr>
<td>
<table bgcolor="<?php echo $color[4]; ?>" border="0" width="100%" cellpadding="1" cellspacing="0">
<tr>
- <?php echo html_tag('td', '<small>' . $paginator_str . '</small>', 'left'); ?>
- <?php echo html_tag('td', '<small>' . $msg_cnt_str . '</small>', 'right'); ?>
+ <?php echo html_tag('td', '<small>' . $paginator_str . '</small>', 'left'); ?>
+ <?php echo html_tag('td', '<small>' . $msg_cnt_str . '</small>', 'right'); ?>
</tr>
</table>
</td>
/* End of message-list table */
do_hook('mailbox_index_after');
- echo "</form>\n";
}
/**
echo html_tag( 'td',get_selectall_link($aMailbox) , '', '', 'width="1%"' );
break;
case 5: /* flags */
- echo html_tag( 'td','' , '', '', 'width="1%"' );
+ echo html_tag( 'td',' ' , '', '', 'width="1%"' );
break;
case 2: /* from */
if (handleAsSent($aMailbox['NAME'])) {
echo "</td>\n";
break;
case 3: /* date */
- echo html_tag( 'td' ,'' , 'left', '', 'width="5%" nowrap' )
+ echo html_tag( 'td' ,'' , 'left', '', 'width="5%" style="white-space: nowrap;"' )
. '<b>' . _("Date") . '</b>';
if ($showsort) {
if ($internal_date_sort) {
echo "</td>\n";
break;
case 6: /* size */
- echo html_tag( 'td', '', 'center','','width="5%" nowrap')
+ echo html_tag( 'td', '', 'center','','width="5%" style="white-space: nowrap;"')
. '<b>' . _("Size") . '</b>';
if ($showsort) {
ShowSortButton($aMailbox, SQSORT_SIZE_ASC, SQSORT_SIZE_DEC);
. "//-->\n"
. '</script>'
. '<input type="checkbox" name="toggleAll" title="'._("Toggle All").'" onclick="'.$func_name.'();" />';
-// . <a href="javascript:void(0)" onClick="' . $func_name . '();">' . _("Toggle All")
+// . <a href="javascript:void(0)" onclick="' . $func_name . '();">' . _("Toggle All")
// . "</a>\n";
} else {
+ $result .= "<a href=\"$PHP_SELF";
+ // FIXME: why strpos() is used to detect presense of the symbol in the string.
+ // Function returns boolean value only when symbol is not found
if (strpos($PHP_SELF, "?")) {
- $result .= "<a href=\"$PHP_SELF&mailbox=" . urlencode($aMailbox['NAME'])
- . "&startMessage=$aMailbox[PAGEOFFSET]&srt=$aMailbox[SORT]&checkall=";
+ $prefix = '&';
} else {
- $result .= "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox)
- . "&startMessage=$aMailbox[PAGEOFFSET]&srt=$aMailbox[SORT]&checkall=";
+ $prefix = '?';
+ }
+
+ // If variables are part of GET request, they are present in $PHP_SELF
+ // maybe other functions can be used instead of sqgetGlobalVar (like preg_match)
+ if (! sqgetGlobalVar('mailbox',$tmp,SQ_GET)) {
+ $result .= $prefix . 'mailbox=' . urlencode($aMailbox['NAME']);
+ $prefix = '&';
+ }
+ if (! sqgetGlobalVar('startMessage',$tmp,SQ_GET)) {
+ $result .= $prefix . 'startMessage=' . $aMailbox['PAGEOFFSET'];
+ $prefix = '&';
+ }
+ if (! sqgetGlobalVar('str',$tmp,SQ_GET)) {
+ $result .= $prefix . 'str=' . $aMailbox['SORT'];
+ $prefix = '&';
}
+
if (isset($checkall) && $checkall == '1') {
- $result .= '0';
+ $checkall_val = '0';
+ } else {
+ $checkall_val = '1';
+ }
+ if (! sqgetGlobalVar('checkall',$tmp,SQ_GET) ) {
+ $result .= $prefix . 'checkall=' . $checkall_val;
+ $prefix = '&';
} else {
- $result .= '1';
+ // checkall is already present in php_self. replace it
+ $result = preg_replace("/checkall=(\d)/","checkall=$checkall_val",$result);
}
- if (isset($aMailbox['SEARCH']) && $aMailbox['SEARCH'][0]) {
- $result .= '&where=' . urlencode($aMailbox['SEARCH'][0])
- . '&what=' . urlencode($aMailbox['SEARCH'][1]);
+ // FIXME: I suspect that search pages use different variables in 1.5.1cvs
+ // and these variables are present in $PHP_SELF.
+ if (isset($aMailbox['SEARCH']) && isset($aMailbox['SEARCH'][0]) && ! sqgetGlobalVar('where',$tmp,SQ_GET)) {
+ $result .= '&where=' . urlencode($aMailbox['SEARCH'][0]);
+ if (isset($aMailbox['SEARCH'][1]) && ! sqgetGlobalVar('what',$tmp,SQ_GET)) {
+ $result .= '&what=' . urlencode($aMailbox['SEARCH'][1]);
+ }
}
$result .= "\">";
$result .= _("All");
* @return string $result paginate string with links to pages
*/
function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll) {
- global $username, $data_dir;
+ global $username, $data_dir, $javascript_on;
+ // page selector globals
+ global $page_selector, $page_selector_max, $compact_paginator;
sqgetGlobalVar('PHP_SELF',$php_self,SQ_SERVER);
/* Initialize paginator string chunks. */
$spc = ' '; /* This will be used as a space. */
$sep = '|'; /* This will be used as a seperator. */
- /* Get some paginator preference values. */
- $pg_sel = getPref($data_dir, $username, 'page_selector', SMPREF_ON);
- $pg_max = getPref($data_dir, $username, 'page_selector_max', PG_SEL_MAX);
-
/* Make sure that our start message number is not too big. */
$iOffset = min($iOffset, $iTotal);
if (!$bShowAll) {
/* Compute the basic previous and next strings. */
- 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"));
+ 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) . '<br />';
- */
+ /*
+ * 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) . '<br />';
+ */
- /* 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 = "<a href=\"$php_self?showall=0"
$all_str = "<a href=\"$php_self?showall=1"
. "&startMessage=1&mailbox=$box\" "
. ">" . _("Show All") . '</a>';
- $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 . '<select name="startMessage"';
+ if ($javascript_on) {
+ $result .= ' onchange="JavaScript:SubmitOnSelect'
+ . '(this, \'' . $pg_url . '&startMessage=\')"';
+ }
+ $result .='>';
+
+ for ($p = 0; $p < $tot_pgs; $p++) {
+ $result .= '<option ';
+ if (($p+1) == $cur_pg) $result .= 'selected ';
+ $result .= 'value="' . (($p*$iLimit)+1) . '">'
+ . ($p+1) . "/$tot_pgs" . '</option>';
+ }
+ $result .= '</select>';
+
+ if ($javascript_on) {
+ $result .= '<noscript language="JavaScript">'
+ . addSubmit(_("Go"))
+ . '</noscript>';
+ } 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);
}
return call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_strimwidth', $subject, $trim_val);
}
- return substr_replace($subject, '...', $trim_val);
+ return substr_replace($subject, '...', $trim_val + 1);
}
/**
'<small>' . $string . ': </small>',
$align,
'',
- 'nowrap' );
+ 'style="white-space: nowrap;"' );
}
/**
if (($aMailbox['PAGEOFFSET']-1) >= $aMailbox['EXISTS']) {
$aMailbox['PAGEOFFSET'] = ($aMailbox['PAGEOFFSET'] > $aMailbox['LIMIT']) ?
$aMailbox['PAGEOFFSET'] - $aMailbox['LIMIT'] : 1;
- $aMailbox['OFFSET'] = $aMailbox['PAGEOFFSET'] - 1 ;
+ $aMailbox['OFFSET'] = $aMailbox['PAGEOFFSET'] - 1 ;
}
}
}
projects / squirrelmail.git / blobdiff