drop unnecessary mt_rand() call, found by Tomas Kuliavas

[squirrelmail.git] / include / init.php

diff --git a/include/init.php b/include/init.php
index 68873912caa256a1b2068a5dc757a1608779b7c1..a06084b58558a20b8f9b2aee902e2dc499812614 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -203,6 +203,7 @@ if (!isset($session_name) || !$session_name) {
  * if session.auto_start is On then close the session
  */
 $sSessionAutostartName = session_name();
+$sCookiePath = null;
 if ((isset($sSessionAutostartName) || $sSessionAutostartName == '') &&
      $sSessionAutostartName !== $session_name) {
     $sCookiePath = ini_get('session.cookie_path');
@@ -222,16 +223,12 @@ ini_set('session.name' , $session_name);
 session_set_cookie_params (0, $base_uri);
 sqsession_is_active();
 
-/**
- * SquirrelMail version number -- DO NOT CHANGE
- */
-$version = '1.5.2 [CVS]';
-
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE
  * $sm_internal_version = array (release, major, minor)
  */
-$SQM_INTERNAL_VERSION = array(1,5,2);
+$SQM_INTERNAL_VERSION = explode('.', SM_VERSION, 3);
+$SQM_INTERNAL_VERSION[2] = intval($SQM_INTERNAL_VERSION[2]);
 
 
 /* if plugins are disabled only for one user and
@@ -387,7 +384,9 @@ switch ($sInitLocation) {
              * because they probably belong to other php apps
              */
             if (ini_get('session.name') !== $sSessionAutostartName) {
-                sqsetcookie(ini_get('session.name'),'',0,$sCookiePath);
+                //  This does not work. Sometimes the cookie with SQSESSID=deleted and path /
+                // is picked up in webmail.php => login will fail
+                //sqsetcookie(ini_get('session.name'),'',0,$sCookiePath);
             }
         }
         break;