X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_order.php;h=bfc0a678d33c14ebe9755c39c392a1731dc0b2b7;hp=8088d7982cb71c1c72d5f0806971e4db4c8c6f8f;hb=e0d7bbf4116047c6504f76e839adbd61557de722;hpb=5c54e435cf4a3ee9ecdaf2305205a2fbc7af4662

diff --git a/src/options_order.php b/src/options_order.php
index 8088d798..bfc0a678 100644
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -1,141 +1,166 @@
 <?php
-   /**
-    **  options_highlight.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Displays message highlighting options
-    **
-    **/
-
-   session_start();
-
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($i18n_php))
-      include("../functions/i18n.php");
-   if (!isset($plugin_php))
-      include("../functions/plugin.php");
-
-
-   if ($action == "delete" && isset($theid)) {
-      removePref($data_dir, $username, "highlight$theid");
-   } else if ($action == "save") {
-   } 
-   include("../src/load_prefs.php");
-   displayPageHeader($color, "None");
-?>
-   <br>
-   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . " - " . _("Index Order"); ?></b></center>
-   </td></tr></table>
-
-   <table width=95% align=center border=0><tr><td>
-<?php
+/**
+ * options_order.php
+ *
+ * Displays messagelist column order options
+ *
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage prefs
+ */
 
-   $available[1] = _("Checkbox");
-   $available[2] = _("From");
-   $available[3] = _("Date");
-   $available[4] = _("Subject");
-   $available[5] = _("Flags");
-   $available[6] = _("Size");
-   
-   if ($method == "up" && $num > 1) {
-      $prev = $num-1;
-      $tmp = $index_order[$prev];
-      $index_order[$prev] = $index_order[$num];
-      $index_order[$num] = $tmp;
-   } else if ($method == "down" && $num < count($index_order)) {
-      $next = $num++;
-      $tmp = $index_order[$next];
-      $index_order[$next] = $index_order[$num];
-      $index_order[$num] = $tmp;
-   } else if ($method == "remove" && $num) {
-      for ($i=1; $i < 8; $i++) {
-         removePref($data_dir, $username, "order$i"); 
-      }
-      for ($j=1,$i=1; $i <= count($index_order); $i++) {
-         if ($i != $num) {
-            $new_ary[$j] = $index_order[$i];
-            $j++;
-         }
-      }
-      $index_order = array();
-      $index_order = $new_ary;
-      if (count($index_order) < 1) {
-         include "../src/load_prefs.php";
-      }
-   } else if ($method == "add" && $add) {
-      $index_order[count($index_order)+1] = $add;
-   }
+/** This is the options_order page */
+define('PAGE_NAME', 'options_order');
 
-   if ($method) {
-      for ($i=1; $i <= count($index_order); $i++) {
-         setPref($data_dir, $username, "order$i", $index_order[$i]);
-      }
-   }
-   echo "<center>";
-   echo "<table cellspacing=0 cellpadding=0 border=0 width=65%><tr><td>\n";
-   echo _("The index order is the order that the columns are arranged in the message index.  You can add, remove, and move columns around to customize them to fit your needs.");
-   echo "</td></tr></table></center><br>";
-
-   if (count($index_order))
-   {
-      echo "<center>";
-      echo "<table cellspacing=0 cellpadding=0 border=0>\n";
-      for ($i=1; $i <= count($index_order); $i++) {
-         $tmp = $index_order[$i];
-         echo "<tr>";
-         echo "<td><small><a href=\"options_order.php?method=up&num=$i\">". _("up") ."</a></small></td>\n";
-         echo "<td><small>&nbsp;|&nbsp;</small></td>\n";
-         echo "<td><small><a href=\"options_order.php?method=down&num=$i\">". _("down") . "</a></small></td>\n";
-         echo "<td><small>&nbsp;|&nbsp;</small></td>\n";
-         echo "<td>";
-         // Always show the subject
-         if ($tmp != 4)
-            echo "<small><a href=\"options_order.php?method=remove&num=$i\">" . _("remove") . "</a></small>";
-         echo "</td>\n";
-         echo "<td><small>&nbsp;-&nbsp;</small></td>\n";
-         echo "<td>" . $available[$tmp] . "</td>\n";
-         echo "</tr>\n";
-      }
-      echo "</table>\n";
-      echo "</center>";
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'functions/forms.php');
+
+/* get globals */
+if (sqgetGlobalVar('num',       $num,       SQ_GET)) {
+   $num = (int) $num;
+} else {
+   $num = false;
+}
+if (!sqgetGlobalVar('method', $method)) {
+    $method = '';
+} else {
+    $method = htmlspecialchars($method);
+}
+if (!sqgetGlobalVar('positions', $pos, SQ_GET)) {
+    $pos = 0;
+} else {
+    $pos = (int) $pos;
+}
+
+if (!sqgetGlobalVar('account', $account, SQ_GET)) {
+    $iAccount = 0;
+} else {
+    $iAccount = (int) $account;
+}
+
+if (sqgetGlobalVar('mailbox', $mailbox, SQ_GET)) {
+   $aMailboxPrefs = unserialize(getPref($data_dir, $username, "pref_".$iAccount.'_'.$mailbox));
+   if (isset($aMailboxPrefs[MBX_PREF_COLUMNS])) {
+       $index_order = $aMailboxPrefs[MBX_PREF_COLUMNS];
    }
-   
-   if (count($index_order) != count($available)) {
-   echo "<center><form name=f method=post action=options_order.php>";
-   echo "<select name=add>";
-   for ($i=1; $i <= count($available); $i++) {
-      $found = false;
-      for ($j=1; $j <= count($index_order); $j++) {
-         if ($index_order[$j] == $i) {
-            $found = true;
+} else {
+    $index_order_ser = getPref($data_dir, $username, 'index_order');
+    if ($index_order_ser) {
+        $index_order=unserialize($index_order_ser);
+    }
+}
+if (!isset($index_order)) {
+    if (isset($internal_date_sort) && $internal_date_sort == false) {
+        $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ);
+    } else {
+        $index_order = array(SQM_COL_CHECK,SQM_COL_FROM,SQM_COL_INT_DATE,SQM_COL_FLAGS,SQM_COL_ATTACHMENT,SQM_COL_PRIO,SQM_COL_SUBJ);
+    }
+}
+
+if (!sqgetGlobalVar('account', $account,  SQ_GET)) {
+   $account = 0; // future work, multiple imap accounts
+} else {
+   $account = (int) $account;
+}
+
+/* end of get globals */
+
+/***************************************************************/
+/* Finally, display whatever page we are supposed to show now. */
+/***************************************************************/
+
+displayPageHeader($color, null, (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : ''));
+
+
+/**
+ * Change the column order of a mailbox
+ *
+ * @param array  $index_order (reference) contains an ordered list with columns
+ * @param string $method action to take, move, add and remove are supported
+ * @param int    $num target column
+ * @param int    $pos positions to move a column in the index_order array
+ * @return bool  $r A change in the ordered list took place.
+ */
+function change_columns_list(&$index_order,$method,$num,$pos=0) {
+    $r = false;
+    switch ($method) {
+      case 'move': $r = sqm_array_move_value($index_order,$num,$pos); break;
+      case 'add':
+          $index_order[] = (int) $num;
+          $r = true;
+          /**
+           * flush the cache in order to retrieve the new columns
+           */
+          sqsession_unregister('mailbox_cache');
+          break;
+      case 'remove':
+        if(in_array($num, $index_order)) {
+            unset($index_order[array_search($num, $index_order)]);
+            $index_order = array_values($index_order);
+            $r = true;
+        }
+        break;
+      default: break;
+    }
+    return $r;
+}
+
+/**
+ * Column to string translation array
+ */
+$available[SQM_COL_CHECK]      = _("Checkbox");
+$available[SQM_COL_FROM]       = _("From");
+$available[SQM_COL_DATE]       = _("Date");
+$available[SQM_COL_SUBJ]       = _("Subject");
+$available[SQM_COL_FLAGS]      = _("Flags");
+$available[SQM_COL_SIZE]       = _("Size");
+$available[SQM_COL_PRIO]       = _("Priority");
+$available[SQM_COL_ATTACHMENT] = _("Attachments");
+$available[SQM_COL_INT_DATE]   = _("Received");
+$available[SQM_COL_TO]         = _("To");
+$available[SQM_COL_CC]         = _("Cc");
+$available[SQM_COL_BCC]        = _("Bcc");
+
+if (change_columns_list($index_order,$method,$num,$pos)) {
+    if ($method) {
+        // TODO, bound index_order to mailbox and make a difference between the global index_order and mailbox bounded index_order
+        setPref($data_dir, $username, 'index_order', serialize($index_order));
+    }
+}
+
+
+$opts = array();
+if (count($index_order) != count($available)) {
+    for ($i=0; $i < count($available); $i++) {
+        if (!in_array($i,$index_order)) {
+             $opts[$i] = $available[$i];
          }
-      }
-      if (!$found) {
-         echo "<option value=$i>$available[$i]</option>";
-      }
-   }
-   echo "</select>";
-   echo "<input type=hidden value=add name=method>";
-   echo "<input type=submit value=\""._("Add")."\" name=submit>";
-   echo "</form></center>";
-   }
+    }
+}
+
+// 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 ? '&amp;mailbox='.urlencode($mailbox) : '';
+
+$oTemplate->assign('fields', $available);
+$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&amp;positions=-1'. $x .'&amp;num=');
+$oTemplate->assign('move_down', $PHP_SELF .'?method=move&amp;positions=1'. $x .'&amp;num=');
+$oTemplate->assign('remove', $PHP_SELF .'?method=remove'. $x .'&amp;num=');
+$oTemplate->assign('add', $PHP_SELF.'?method=add'.$x.'&amp;num=');
+$oTemplate->assign('addField_action', $PHP_SELF);
 
-   echo "<br><center><a href=\"../src/options.php\">" . _("Return to options page") . "</a></center>";
+$oTemplate->display('options_order.tpl');
 
-?>
-   </td></tr></table>
-</body></html>
+$oTemplate->display('footer.tpl');