Since changing to rg=0 we make extensive use of $_SESSION and $HTTP_SESSION_VARS...

[squirrelmail.git] / functions / global.php

diff --git a/functions/global.php b/functions/global.php
index fcaceff04b7594900f4d641222ae93ff1e8dc1a8..b9d63097676b9ba9bc4bafa85376d3ee88d4e86d 100644 (file)
--- a/functions/global.php
+++ b/functions/global.php
@@ -62,26 +62,41 @@ function sqstripslashes(&$array) {
 }
 
 function sqsession_register ($var, $name) {
-    $rg = ini_get('register_globals');
-    if ( (float)substr(PHP_VERSION,0,3) < 4.1 && empty($rg)) {
+    if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
         global $HTTP_SESSION_VARS;
         $HTTP_SESSION_VARS["$name"] = $var;
     }
     else {
-        session_register("$name");
+        $_SESSION["$name"] = $var; 
     }
 }
 function sqsession_unregister ($name) {
-    $rg = ini_get('register_globals');
-    if ( (float)substr(PHP_VERSION,0,3) < 4.1 && empty($rg)) {
-    global $HTTP_SESSION_VARS;
+    if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
+        global $HTTP_SESSION_VARS;
         unset($HTTP_SESSION_VARS["$name"]);
     }
     else {
-        session_unregister("$name");
+        unset($_SESSION["$name"]);
+    }
+}
+function sqsession_is_registered ($name) {
+    $test_name = &$name;
+    $result = false;
+    if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
+        global $HTTP_SESSION_VARS;
+        if (isset($HTTP_SESSION_VARS[$test_name])) {
+            $result = true;
+        }
+    }
+    else {
+        if (isset($_SESSION[$test_name])) {
+            $result = true;
+        }
     }
+    return $result;
 }
 
+
 /**
  *  Search for the var $name in $_SESSION, $_POST, $_GET
  *  (in that order) and register it as a global var.