Eugh, this code is getting messy, can somebody verify this regex for me,

[squirrelmail.git] / src / options_order.php

diff --git a/src/options_order.php b/src/options_order.php
index 14a366cae5c9b0d04a84e60db1b44f1b9658dd89..7309da7b3a31423077d919e4ec820285a508cddb 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -3,10 +3,10 @@
 /**
  * options_order.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * Displays message highlighting options
+ * Displays messagelist column order options
  *
  * $Id$
  */
@@ -16,40 +16,20 @@ define('SM_PATH','../');
 
 /* 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');
 
 /* get globals */
-if (isset($_GET['action'])) {
-    $action = $_GET['action'];
-}
-if (isset($_GET['num'])) {
-    $num = $_GET['num'];
-}
-if (isset($_GET['method'])) {
-    $method = $_GET['method'];
-}
-elseif (isset($_POST['method'])) {
-    $method = $_POST['method'];
-}
-if (isset($_POST['add'])) {
-    $add = $_POST['add'];
-}
-if (isset($_GET['submit'])) {
-    $submit = $_GET['submit'];
-}
-elseif (isset($_POST['submit'])) {
-    $submit = $_POST['submit'];
-}
+sqgetGlobalVar('num',       $num,       SQ_GET);  
+sqgetGlobalVar('add',       $add,       SQ_POST);
+
+sqgetGlobalVar('submit',    $submit);
+sqgetGlobalVar('method',    $method);
 /* end of get globals */
 
-if (! isset($action)) { $action = ''; }
-if ($action == 'delete' && isset($theid)) {
-    removePref($data_dir, $username, "highlight$theid");
-} elseif ($action == 'save') {
-} 
 displayPageHeader($color, 'None');
 
    echo