Getting ready for 1.2.0 release.

[squirrelmail.git] / src / validate.php

diff --git a/src/validate.php b/src/validate.php
index c74be9c4d9af1dfc8067bd492c319fba2886d58f..bb16732f4ef819ab5dcf6460e462cbb9bf3482ff 100644 (file)
--- a/src/validate.php
+++ b/src/validate.php
@@ -1,19 +1,34 @@
 <?php
-    /**
-     * validate.php
-     *
-     * Copyright (c) 1999-2000 The SquirrelMail Development Team
-     * Licensed under the GNU GPL. For full terms see the file COPYING.
-     *
-     * $Id$
-     */
 
-    if (defined ('validate_php')) { return; }
-    define ('validate_php', true);
+/**
+ * validate.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * $Id$
+ */
 
-    session_start();
-    require_once('../functions/i18n.php');
-    require_once('../functions/auth.php');
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+session_start();
+require_once('../functions/i18n.php');
+require_once('../functions/auth.php');
+require_once('../functions/strings.php');
 
     is_logged_in();
 
@@ -52,54 +67,15 @@
         }
     }
 
-    /************************************/
-    /* Trims every element in the array */
-    /************************************/
-    function TrimArray(&$array) {
-        foreach ($array as $k => $v) {
-            global $$k;
-            if (is_array($$k)) {
-                foreach ($$k as $k2 => $v2) {
-                  $$k[$k2] = substr($v2, 1);
-                }
-            } else {
-                $$k = substr($v, 1);
-            }
-
-           /* Re-assign back to array. */
-            $array[$k] = $$k;
-        }
-    }
-   
-   
-    /***************************************************/
-    /* Removes slashes from every element in the array */
-    /***************************************************/
-    function RemoveSlashes(&$array) {
-        foreach ($array as $k => $v) {
-            global $$k;
-            if (is_array($$k)) {
-                foreach ($$k as $k2 => $v2) {
-                    $newArray[stripslashes($k2)] = stripslashes($v2);
-                }
-                $$k = $newArray;
-            } else {
-                $$k = stripslashes($v);
-            }
-
-           /* Re-assign back to the array. */
-            $array[$k] = $$k;
-        }
-    }
-
-   /**
-    * Everyone needs stuff from config, and config needs stuff from
-    * strings.php, so include them both here.
-    *
-    * Include them down here instead of at the top so that all config
-    * variables overwrite any passed in variables (for security).
-    */
-    require_once('../functions/strings.php');
+    /**
+     * Everyone needs stuff from config, and config needs stuff from
+     * strings.php, so include them both here. Actually, strings is
+     * included at the top now as the string array functions have
+     * been moved into it.
+     *
+     * Include them down here instead of at the top so that all config
+     * variables overwrite any passed in variables (for security).
+     */
     require_once('../config/config.php');
     require_once('../src/load_prefs.php');
     require_once('../functions/page_header.php');