drop call to session_register, this is redundant in PHP >4.1.0,

[squirrelmail.git] / functions / global.php

diff --git a/functions/global.php b/functions/global.php
index 18ee0e2e61f066f41ff55d04a4e0d3eb054f743e..73f4ef9b1c7f9814bcea81420878ffe980626f07 100644 (file)
--- a/functions/global.php
+++ b/functions/global.php
@@ -93,9 +93,7 @@ function sqsession_register ($var, $name) {
 
     sqsession_is_active();
 
-    $_SESSION["$name"] = $var;
-
-    session_register("$name");
+    $_SESSION[$name] = $var;
 }
 
 /**
@@ -385,6 +383,12 @@ function sqsetcookie($sName,$sValue="deleted",$iExpire=0,$sPath="",$sDomain="",$
     if ($sName && isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']) {
         $bSecure = true;
     }
+
+    // admin config can override the restriction of secure-only cookies
+    global $only_secure_cookies;
+    if (!$only_secure_cookies)
+        $bSecure = false;
+
     if (false && check_php_version(5,2)) {
        // php 5 supports the httponly attribute in setcookie, but because setcookie seems a bit
        // broken we use the header function for php 5.2 as well. We might change that later.