don't add delimiter to folder name, when folder with subfolders is

[squirrelmail.git] / src / options_order.php

diff --git a/src/options_order.php b/src/options_order.php
index ae5235201141d710cc7c29f6753565d17d3d2659..cd3c2d40e76937d1d53e6bbac1a6f78d5b25b0d4 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -3,31 +3,23 @@
 /**
  * options_order.php
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Displays messagelist column order options
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
+ * @subpackage prefs
  */
 
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-define('SM_PATH','../');
+require('../include/init.php');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
-require_once(SM_PATH . 'functions/display_messages.php');
-require_once(SM_PATH . 'functions/imap.php');
-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');
 
 /* get globals */
 if (sqgetGlobalVar('num',       $num,       SQ_GET)) {
@@ -100,7 +92,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 +149,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 +194,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 { ?>
@@ -234,8 +226,8 @@ function viewOrderForm($aColumns, $aOrder, $aOpts, $mailbox) {
       </table>
     </td></tr>
   </table>
-</body></html>
 
 <?php
 }
+$oTemplate->display('footer.tpl');
 ?>
\ No newline at end of file