Typos in sqsetcookie. This might explain a few things. :-)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12500 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/global.php b/functions/global.php
index bd984edaca80f980716c85fc99d4f8e96c462350..2903511a7e6b7f8d64ec8c244f916bb6b6083593 100644 (file)
--- a/functions/global.php
+++ b/functions/global.php
@@ -401,18 +401,18 @@ function sqsetcookie($sName,$sValue='deleted',$iExpire=0,$sPath="",$sDomain="",$
        // broken we use the header function for php 5.2 as well. We might change that later.
        //setcookie($sName,$sValue,(int) $iExpire,$sPath,$sDomain,$bSecure,$bHttpOnly);
     } else {
-        if (!empty($Domain)) {
+        if (!empty($sDomain)) {
             // Fix the domain to accept domains with and without 'www.'.
-            if (strtolower(substr($Domain, 0, 4)) == 'www.')  $Domain = substr($Domain, 4);
-            $Domain = '.' . $Domain;
+            if (strtolower(substr($sDomain, 0, 4)) == 'www.')  $sDomain = substr($sDomain, 4);
+            $sDomain = '.' . $sDomain;
 
             // Remove port information.
-            $Port = strpos($Domain, ':');
-            if ($Port !== false)  $Domain = substr($Domain, 0, $Port);
+            $Port = strpos($sDomain, ':');
+            if ($Port !== false)  $sDomain = substr($sDomain, 0, $Port);
         }
         if (!$sValue) $sValue = 'deleted';
         header('Set-Cookie: ' . rawurlencode($sName) . '=' . rawurlencode($sValue)
-                            . (empty($iExpires) ? '' : '; expires=' . gmdate('D, d-M-Y H:i:s', $iExpires) . ' GMT')
+                            . (empty($iExpire) ? '' : '; expires=' . gmdate('D, d-M-Y H:i:s', $iExpire) . ' GMT')
                             . (empty($sPath) ? '' : '; path=' . $sPath)
                             . (empty($sDomain) ? '' : '; domain=' . $sDomain)
                             . (!$bSecure ? '' : '; secure')