X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Foptions_order.php;h=831dbf2601f05194c36aa3b8067078de6a79862c;hb=1f80d9f527d2cc2933ee7040aecba908692a20ac;hp=b3559bd437e09c75243447f01d120f40153cf0f8;hpb=4b5049de2fa934c45599d6e4c74bf2bbee10d34d;p=squirrelmail.git

diff --git a/src/options_order.php b/src/options_order.php
index b3559bd4..831dbf26 100644
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -4,13 +4,16 @@
  *
  * Displays messagelist column order options
  *
- * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @copyright © 1999-2009 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage prefs
  */
 
+/** This is the options_order page */
+define('PAGE_NAME', 'options_order');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -43,7 +46,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];
    }
@@ -73,7 +76,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'] : ''));
 
 
 /**
@@ -142,6 +145,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) : '';
 
@@ -150,6 +154,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=');
@@ -159,4 +164,3 @@ $oTemplate->assign('addField_action', $PHP_SELF);
 $oTemplate->display('options_order.tpl');
 
 $oTemplate->display('footer.tpl');
-?>