Add comments reminding someone to make a fix here

[squirrelmail.git] / src / options_order.php

diff --git a/src/options_order.php b/src/options_order.php
index 77f2b4ad13ff4d7327c4897e2d4b3cb127eb237c..02cbf19e66c7b94ced4cea55c50ac612b7a87e57 100644 (file)
--- 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)) {
@@ -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,12 +151,14 @@ $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=');
+$oTemplate->assign('add', $PHP_SELF.'?method=add'.$x.'&num=');
 $oTemplate->assign('addField_action', $PHP_SELF);
 
 $oTemplate->display('options_order.tpl');
 
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file
+?>