X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Ftemplate%2Fpaginator_util.php;h=2c50927792734e4846f1e4c36a1d709b3528aab6;hb=6881bcbd08b766c0f234b0207279f2fcd0b34aa1;hp=242791990d42f3b8432e0cab67956fed7395861a;hpb=47485591c277f6da6aab7fe2b18482ea93234105;p=squirrelmail.git diff --git a/functions/template/paginator_util.php b/functions/template/paginator_util.php index 24279199..2c509277 100644 --- a/functions/template/paginator_util.php +++ b/functions/template/paginator_util.php @@ -6,7 +6,7 @@ * The following functions are utility functions for templates. Do not * echo output in these functions. * - * @copyright © 2005-2006 The SquirrelMail Project Team + * @copyright 2005-2017 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail @@ -28,9 +28,12 @@ include_once(SM_PATH . 'functions/forms.php'); */ function get_paginator_link($box, $start_msg, $text, $accesskey='NONE') { sqgetGlobalVar('PHP_SELF',$php_self,SQ_SERVER); - return create_hyperlink("$php_self?startMessage=$start_msg&mailbox=$box", + return create_hyperlink("$php_self?startMessage=$start_msg&mailbox=$box" + . (strpos($php_self, 'src/search.php') ? '&smtoken=' . sm_generate_security_token() : ''), $text, '', '', '', '', '', - array('accesskey' => $accesskey)); + ($accesskey == 'NONE' + ? array() + : array('accesskey' => $accesskey))); } @@ -92,20 +95,20 @@ function get_compact_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll, if (($next_grp <= $iTotal) && ($prev_grp >= 0)) { $prv_str = get_paginator_link($box, $prev_grp, '<', ($accesskeys_constructed - ? '' : $accesskey_mailbox_previous)); + ? 'NONE' : $accesskey_mailbox_previous)); $nxt_str = get_paginator_link($box, $next_grp, '>', ($accesskeys_constructed - ? '' : $accesskey_mailbox_next)); + ? 'NONE' : $accesskey_mailbox_next)); } else if (($next_grp > $iTotal) && ($prev_grp >= 0)) { $prv_str = get_paginator_link($box, $prev_grp, '<', ($accesskeys_constructed - ? '' : $accesskey_mailbox_previous)); + ? 'NONE' : $accesskey_mailbox_previous)); $nxt_str = '>'; } else if (($next_grp <= $iTotal) && ($prev_grp < 0)) { $prv_str = '<'; $nxt_str = get_paginator_link($box, $next_grp, '>', ($accesskeys_constructed - ? '' : $accesskey_mailbox_next)); + ? 'NONE' : $accesskey_mailbox_next)); } /* Page selector block. Following code computes page links. */ @@ -120,7 +123,7 @@ function get_compact_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll, } } else { global $accesskey_mailbox_all_paginate; - $pg_str = create_hyperlink("$php_self?showall=0&startMessage=1&mailbox=$box", _("Paginate"), '', '', '', '', '', array('accesskey' => ($accesskeys_constructed ? 'NONE' : $accesskey_mailbox_all_paginate))); + $pg_str = create_hyperlink("$php_self?showall=0&startMessage=1&mailbox=$box" . (strpos($php_self, 'src/search.php') ? '&smtoken=' . sm_generate_security_token() : ''), _("Paginate"), '', '', '', '', '', ($accesskeys_constructed ? array() : array('accesskey' => $accesskey_mailbox_all_paginate))); } /* Put all the pieces of the paginator string together. */ @@ -133,12 +136,12 @@ function get_compact_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll, /* Compute the 'show all' string. */ global $accesskey_mailbox_all_paginate; - $all_str = create_hyperlink("$php_self?showall=1&startMessage=1&mailbox=$box", _("Show All"), '', '', '', '', '', array('accesskey' => ($accesskeys_constructed ? 'NONE' : $accesskey_mailbox_all_paginate))); + $all_str = create_hyperlink("$php_self?showall=1&startMessage=1&mailbox=$box" . (strpos($php_self, 'src/search.php') ? '&smtoken=' . sm_generate_security_token() : ''), _("Show All"), '', '', '', '', '', ($accesskeys_constructed ? array() : array('accesskey' => $accesskey_mailbox_all_paginate))); $result .= '[' . get_paginator_link($box, 1, '<<') . ']'; $result .= '[' . $prv_str . ']'; - $pg_url = $php_self . '?mailbox=' . $box; + $pg_url = $php_self . '?mailbox=' . $box . (strpos($php_self, 'src/search.php') ? '&smtoken=' . sm_generate_security_token() : ''); $result .= '[' . $nxt_str . ']'; $result .= '[' . get_paginator_link($box, $last_grp, '>>') . ']'; @@ -234,20 +237,20 @@ function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,$page_sel if (($next_grp <= $iTotal) && ($prev_grp >= 0)) { $prv_str = get_paginator_link($box, $prev_grp, _("Previous"), ($accesskeys_constructed - ? '' : $accesskey_mailbox_previous)); + ? 'NONE' : $accesskey_mailbox_previous)); $nxt_str = get_paginator_link($box, $next_grp, _("Next"), ($accesskeys_constructed - ? '' : $accesskey_mailbox_next)); + ? 'NONE' : $accesskey_mailbox_next)); } else if (($next_grp > $iTotal) && ($prev_grp >= 0)) { $prv_str = get_paginator_link($box, $prev_grp, _("Previous"), ($accesskeys_constructed - ? '' : $accesskey_mailbox_previous)); + ? 'NONE' : $accesskey_mailbox_previous)); $nxt_str = _("Next"); } else if (($next_grp <= $iTotal) && ($prev_grp < 0)) { $prv_str = _("Previous"); $nxt_str = get_paginator_link($box, $next_grp, _("Next"), ($accesskeys_constructed - ? '' : $accesskey_mailbox_next)); + ? 'NONE' : $accesskey_mailbox_next)); } /* Page selector block. Following code computes page links. */ @@ -369,7 +372,8 @@ function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,$page_sel } } else { global $accesskey_mailbox_all_paginate; - $pg_str = create_hyperlink("$php_self?showall=0&startMessage=1&mailbox=$box", _("Paginate"), '', '', '', '', '', array('accesskey' => ($accesskeys_constructed ? 'NONE' : $accesskey_mailbox_all_paginate))); + $pg_str = create_hyperlink("$php_self?showall=0&startMessage=1&mailbox=$box" . (strpos($php_self, 'src/search.php') ? '&smtoken=' . sm_generate_security_token() : ''), _("Paginate"), '', '', '', '', '', ($accesskeys_constructed ? array() : array('accesskey' => +$accesskey_mailbox_all_paginate))); } /* Put all the pieces of the paginator string together. */ @@ -382,7 +386,8 @@ function get_paginator_str($box, $iOffset, $iTotal, $iLimit, $bShowAll,$page_sel /* Compute the 'show all' string. */ global $accesskey_mailbox_all_paginate; - $all_str = create_hyperlink("$php_self?showall=1&startMessage=1&mailbox=$box", _("Show All"), '', '', '', '', '', array('accesskey' => ($accesskeys_constructed ? 'NONE' : $accesskey_mailbox_all_paginate))); + $all_str = create_hyperlink("$php_self?showall=1&startMessage=1&mailbox=$box" . (strpos($php_self, 'src/search.php') ? '&smtoken=' . sm_generate_security_token() : ''), _("Show All"), '', '', '', '', '', ($accesskeys_constructed ? array() : array('accesskey' => +$accesskey_mailbox_all_paginate))); $result .= '['; $result .= ($prv_str != '' ? $prv_str . $nbsp . $sep . $nbsp : '');