Make Flags a required column just as subject. If we don't then the flags

will not be fetched from the imap server and we cannot provide information
about the seen state of a message.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9349 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/options_order.php b/src/options_order.php
index ae5235201141d710cc7c29f6753565d17d3d2659..c5c5339a4511384de3945e20dca920e8919eb2d6 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -27,7 +27,7 @@ require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/html.php');
 require_once(SM_PATH . 'functions/forms.php');
 require_once(SM_PATH . 'functions/arrays.php');
-require_once(SM_PATH . 'functions/options.php');
+//require_once(SM_PATH . 'functions/options.php');
 
 /* get globals */
 if (sqgetGlobalVar('num',       $num,       SQ_GET)) {
@@ -100,7 +100,8 @@ function change_columns_list(&$index_order,$method,$num,$pos=0) {
     switch ($method) {
       case 'move': $r = sqm_array_move_value($index_order,$num,$pos); break;
       case 'add':
-          $index_order[] = (int) $num; $r = true;
+          $index_order[] = (int) $num;
+          $r = true;
           /**
            * flush the cache in order to retrieve the new columns
            */
@@ -156,7 +157,6 @@ if (count($index_order) != count($available)) {
 viewOrderForm($available, $index_order,$opts,urldecode($mailbox));
 
 
-
 // FOOD for html designers
 function viewOrderForm($aColumns, $aOrder, $aOpts, $mailbox) {
    global $color;
@@ -202,7 +202,7 @@ function viewOrderForm($aColumns, $aOrder, $aOpts, $mailbox) {
                   <td><small>&nbsp;|&nbsp;</small></td>
 <?php
               /* Always show the subject */
-              if ($iCol != SQM_COL_SUBJ) {
+              if ($iCol !== SQM_COL_SUBJ && $iCol !== SQM_COL_FLAGS) {
 ?>
                   <td><small><a href="options_order.php?method=remove&amp;num=<?php echo $sQuery; ?>"> <?php echo _("remove");?> </a></small></td>
 <?php         } else { ?>