Minor cleanups

[squirrelmail.git] / functions / global.php

diff --git a/functions/global.php b/functions/global.php
index bed433d2c0824ad89ebd037e01ed7bee7874a368..1330022c647bfb297b8cf26a43a1fda65ced18cc 100644 (file)
--- a/functions/global.php
+++ b/functions/global.php
@@ -6,9 +6,9 @@
  * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * This includes code to update < 4.1.0 globals to the newer format 
+ * This includes code to update < 4.1.0 globals to the newer format
  * It also has some session register functions that work across various
- * php versions. 
+ * php versions.
  *
  * @version $Id$
  * @package squirrelmail
@@ -18,10 +18,10 @@
 require_once(SM_PATH . 'config/config.php');
 
 /** set the name of the session cookie */
-if(isset($session_name) && $session_name) {  
-    ini_set('session.name' , $session_name);  
-} else {  
-    ini_set('session.name' , 'SQMSESSID');  
+if(isset($session_name) && $session_name) {
+    ini_set('session.name' , $session_name);
+} else {
+    ini_set('session.name' , 'SQMSESSID');
 }
 
 /** If magic_quotes_runtime is on, SquirrelMail breaks in new and creative ways.
@@ -54,23 +54,23 @@ if (get_magic_quotes_gpc()) {
 
 $_SERVER['PHP_SELF'] = strip_tags($_SERVER['PHP_SELF']);
 
-/** 
- * returns true if current php version is at mimimum a.b.c 
- * 
+/**
+ * returns true if current php version is at mimimum a.b.c
+ *
  * Called: check_php_version(4,1)
  * @param int a major version number
  * @param int b minor version number
  * @param int c release number
  * @return bool
  */
-function check_php_version ($a = '0', $b = '0', $c = '0')             
+function check_php_version ($a = '0', $b = '0', $c = '0')
 {
     return version_compare ( PHP_VERSION, "$a.$b.$c", 'ge' );
 }
 
 /**
- * returns true if the current internal SM version is at minimum a.b.c 
- * These are plain integer comparisons, as our internal version is 
+ * returns true if the current internal SM version is at minimum a.b.c
+ * These are plain integer comparisons, as our internal version is
  * constructed by us, as an array of 3 ints.
  *
  * Called: check_sm_version(1,3,3)
@@ -90,8 +90,8 @@ function check_sm_version($a = 0, $b = 0, $c = 0)
            $SQM_INTERNAL_VERSION[1] == $b &&
            $SQM_INTERNAL_VERSION[2] < $c ) ) {
         return FALSE;
-    } 
-    return TRUE;  
+    }
+    return TRUE;
 }
 
 
@@ -123,8 +123,8 @@ function sqsession_register ($var, $name) {
 
     sqsession_is_active();
 
-    $_SESSION["$name"] = $var; 
-    
+    $_SESSION["$name"] = $var;
+
     session_register("$name");
 }
 
@@ -138,7 +138,7 @@ function sqsession_unregister ($name) {
     sqsession_is_active();
 
     unset($_SESSION[$name]);
-    
+
     session_unregister("$name");
 }
 
@@ -151,11 +151,11 @@ function sqsession_unregister ($name) {
 function sqsession_is_registered ($name) {
     $test_name = &$name;
     $result = false;
-    
+
     if (isset($_SESSION[$test_name])) {
         $result = true;
     }
-    
+
     return $result;
 }
 
@@ -170,14 +170,14 @@ define('SQ_FORM',6);
 
 /**
  * Search for the var $name in $_SESSION, $_POST, $_GET,
- * $_COOKIE, or $_SERVER and set it in provided var. 
+ * $_COOKIE, or $_SERVER and set it in provided var.
  *
  * If $search is not provided,  or == SQ_INORDER, it will search
  * $_SESSION, then $_POST, then $_GET. Otherwise,
- * use one of the defined constants to look for 
+ * use one of the defined constants to look for
  * a var in one place specifically.
  *
- * Note: $search is an int value equal to one of the 
+ * Note: $search is an int value equal to one of the
  * constants defined above.
  *
  * example:
@@ -196,8 +196,8 @@ function sqgetGlobalVar($name, &$value, $search = SQ_INORDER) {
        enclosing them in quotes will cause them to evaluate
        as strings. */
     switch ($search) {
-        /* we want the default case to be first here,  
-          so that if a valid value isn't specified, 
+        /* we want the default case to be first here,
+          so that if a valid value isn't specified,
           all three arrays will be searched. */
       default:
       case SQ_INORDER: // check session, post, get
@@ -220,13 +220,13 @@ function sqgetGlobalVar($name, &$value, $search = SQ_INORDER) {
         if ( isset($_GET[$name]) ) {
             $value = $_GET[$name];
             return TRUE;
-        } 
+        }
         /* NO IF HERE. FOR SQ_INORDER CASE, EXIT after GET */
         break;
       case SQ_COOKIE:
         if ( isset($_COOKIE[$name]) ) {
             $value = $_COOKIE[$name];
-            return TRUE; 
+            return TRUE;
         }
         break;
       case SQ_SERVER:
@@ -278,7 +278,7 @@ function sqsession_destroy() {
  */
 
 function sqsession_is_active() {
-    
+
     $sessid = session_id();
     if ( empty( $sessid ) ) {
         session_start();
@@ -286,4 +286,4 @@ function sqsession_is_active() {
 }
 
 // vim: et ts=4
-?>
+?>
\ No newline at end of file