Fix: When session auto-start not enabled, undefined var notice for

[squirrelmail.git] / include / init.php

diff --git a/include/init.php b/include/init.php
index 811205ff26ca84994bd41da846bd72682216c540..a6eb383b5db0500b9c6200c100b568b0404baa88 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -65,14 +65,14 @@ if ((bool) ini_get('register_globals') &&
  * Used as a dummy value, e.g., for passing as an empty
  * hook argument.
  */
-global $null; 
+global $null;
 $null = NULL;
 
 /**
  * [#1518885] session.use_cookies = off breaks SquirrelMail
  *
- * When session cookies are not used, all http redirects, meta refreshes, 
- * src/download.php and javascript URLs are broken. Setting must be set 
+ * When session cookies are not used, all http redirects, meta refreshes,
+ * src/download.php and javascript URLs are broken. Setting must be set
  * before session is started.
  */
 if (!(bool)ini_get('session.use_cookies') ||
@@ -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');
@@ -225,7 +226,7 @@ sqsession_is_active();
 /**
  * SquirrelMail version number -- DO NOT CHANGE
  */
-$version = '1.5.2 [CVS]';
+$version = '1.5.2 [SVN]';
 
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE
@@ -234,7 +235,7 @@ $version = '1.5.2 [CVS]';
 $SQM_INTERNAL_VERSION = array(1,5,2);
 
 
-/* if plugins are disabled only for one user and 
+/* if plugins are disabled only for one user and
  * the current user is NOT that user, turn them
  * back on
  */
@@ -258,7 +259,7 @@ if (!$disable_plugins && file_exists(SM_PATH . 'plugins/compatibility/functions.
 
 /**
  * MAIN PLUGIN LOADING CODE HERE
- * On init, we no longer need to load all plugin setup files. 
+ * On init, we no longer need to load all plugin setup files.
  * Now, we load the statically generated hook registrations here
  * and let the hook calls include only the plugins needed.
  */
@@ -276,9 +277,9 @@ do_hook('config_override', $null);
 /**
  * DISABLED.
  * Remove globalized session data in rg=on setups
- * 
+ *
  * Code can be utilized when session is started, but data is not loaded.
- * We have already loaded configuration and other important vars. Can't 
+ * We have already loaded configuration and other important vars. Can't
  * clean session globals here.
 if ((bool) @ini_get('register_globals') &&
     strtolower(ini_get('register_globals'))!='off') {
@@ -306,7 +307,7 @@ if (!isset($sInitLocation)) {
 }
 
 switch ($sInitLocation) {
-    case 'style': 
+    case 'style':
 
         // need to get the right template set up
         //
@@ -336,7 +337,6 @@ switch ($sInitLocation) {
         }
 
         session_write_close();
-        sqsetcookieflush();
         break;
 
     case 'redirect':
@@ -388,7 +388,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;
@@ -427,8 +429,8 @@ switch ($sInitLocation) {
              * Initialize the template object (logout_error uses it)
              */
             /*
-             * $sTemplateID is not initialized when a user is not logged in, so we 
-             * will use the config file defaults here.  If the neccesary variables 
+             * $sTemplateID is not initialized when a user is not logged in, so we
+             * will use the config file defaults here.  If the neccesary variables
              * are net set, force a default value.
              */
             $sTemplateID = Template::get_default_template_set();
@@ -491,8 +493,6 @@ switch ($sInitLocation) {
          * Set up the language.
          */
         $err=set_up_language(getPref($data_dir, $username, 'language'));
-        /* this is the last cookie we set so flush it. */
-        sqsetcookieflush();
 
         // Japanese translation used without mbstring support
         if ($err==2) {
@@ -546,18 +546,18 @@ switch ($sInitLocation) {
             } else {
                 // interface runs on server's time zone. Remove php E_STRICT complains
                 $default_timezone = @date_default_timezone_get();
-                date_default_timezone_set($default_timezone);        
+                date_default_timezone_set($default_timezone);
             }
         }
         break;
 }
 
 /*
- * $sTemplateID is not initialized when a user is not logged in, so we 
- * will use the config file defaults here.  If the neccesary variables 
+ * $sTemplateID is not initialized when a user is not logged in, so we
+ * will use the config file defaults here.  If the neccesary variables
  * are not set, force a default value.
- * 
- * If the user is logged in, $sTemplateID will be set in load_prefs.php, 
+ *
+ * If the user is logged in, $sTemplateID will be set in load_prefs.php,
  * so we shouldn't change it here.
  */
 if (!isset($sTemplateID)) {
@@ -606,9 +606,9 @@ function checkForJavascript($reset = FALSE) {
     return $javascript_on;
 
   if ( ( $reset || !isset($javascript_setting) )
-    // getPref() not defined (nor is it meaningful) when user not 
+    // getPref() not defined (nor is it meaningful) when user not
     // logged in, but that begs the question if $javascript_on is
-    // not in the session in that case, where do we get it from? 
+    // not in the session in that case, where do we get it from?
     && ( sqGetGlobalVar('user_is_logged_in', $user_is_logged_in, SQ_SESSION)
       && $user_is_logged_in) )
     $javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);