X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_order.php;h=29ed772f7ed6d3a767cd8a91f59d165188730b85;hb=2878b00ba5a908f5ca4b3d6e7d00c5bfb6618cc8;hp=76980b479118a4b2dfaf78af0b79bd6dad5fb78d;hpb=fda44c83adae32290b438468e257031e45cf4c0c;p=squirrelmail.git diff --git a/src/options_order.php b/src/options_order.php index 76980b47..29ed772f 100644 --- a/src/options_order.php +++ b/src/options_order.php @@ -4,7 +4,7 @@ * * Displays messagelist column order options * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail @@ -18,7 +18,6 @@ require('../include/init.php'); /* SquirrelMail required files. */ require_once(SM_PATH . 'functions/forms.php'); -require_once(SM_PATH . 'functions/arrays.php'); /* get globals */ if (sqgetGlobalVar('num', $num, SQ_GET)) { @@ -44,7 +43,7 @@ if (!sqgetGlobalVar('account', $account, SQ_GET)) { } if (sqgetGlobalVar('mailbox', $mailbox, SQ_GET)) { - $aMailboxPrefs = unserialize(getPref($data_dir, $username, "pref_".$iAccount.'_'.urldecode($mailbox))); + $aMailboxPrefs = unserialize(getPref($data_dir, $username, "pref_".$iAccount.'_'.$mailbox)); if (isset($aMailboxPrefs[MBX_PREF_COLUMNS])) { $index_order = $aMailboxPrefs[MBX_PREF_COLUMNS]; } @@ -74,7 +73,7 @@ if (!sqgetGlobalVar('account', $account, SQ_GET)) { /* Finally, display whatever page we are supposed to show now. */ /***************************************************************/ -displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : '')); +displayPageHeader($color, null, (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : '')); /** @@ -143,6 +142,7 @@ if (count($index_order) != count($available)) { } } +// FIXME: why are we using this? $PHP_SELF is already a global var processed (and therefore trustworthy) by init.php sqgetGlobalVar('PHP_SELF', $PHP_SELF, SQ_SERVER); $x = isset($mailbox) && $mailbox ? '&mailbox='.urlencode($mailbox) : ''; @@ -151,6 +151,7 @@ $oTemplate->assign('current_order', $index_order); $oTemplate->assign('not_used', $opts); $oTemplate->assign('always_show', array(SQM_COL_SUBJ, SQM_COL_FLAGS)); +// FIXME: (related to the above) $PHP_SELF might already have a query string... don't assume otherwise here by adding the ? sign!! $oTemplate->assign('move_up', $PHP_SELF .'?method=move&positions=-1'. $x .'&num='); $oTemplate->assign('move_down', $PHP_SELF .'?method=move&positions=1'. $x .'&num='); $oTemplate->assign('remove', $PHP_SELF .'?method=remove'. $x .'&num='); @@ -160,4 +161,4 @@ $oTemplate->assign('addField_action', $PHP_SELF); $oTemplate->display('options_order.tpl'); $oTemplate->display('footer.tpl'); -?> \ No newline at end of file +?>