Changeset 3555 in subversion

Timestamp:

Apr 23, 2010 8:25:44 AM (3 years ago)

Author:

alec

Message:

• Skip session initialization/configuration if session is initialized already (e.g. using Installer)

File:

• trunk/roundcubemail/program/include/rcmail.php (modified) (4 diffs)

trunk/roundcubemail/program/include/rcmail.php

@@ -351 +351 @@
 
     // set keep-alive/check-recent interval
-    if ($keep_alive = $this->session->get_keep_alive()) {
+    if ($this->session && ($keep_alive = $this->session->get_keep_alive())) {
       $this->output->set_env('keep_alive', $keep_alive);
     }
@@ -482 +482 @@
   public function session_init()
   {
+    // session started (Installer?)
+    if (session_id())
+      return;
+
     $lifetime = $this->config->get('session_lifetime', 0) * 60;
 
@@ -523 +527 @@
   public function session_configure()
   {
+    if (!$this->session)
+      return;
+
     $lifetime = $this->config->get('session_lifetime', 0) * 60;
 
@@ -981 +988 @@
 
       $log = $this->task . ($this->action ? '/'.$this->action : '') . ($mem ? " [$mem]" : '');
-      rcube_print_time(RCMAIL_START, $log);
+      if (defined('RCMAIL_START'))
+        rcube_print_time(RCMAIL_START, $log);
+      else
+        console($log);
     }
   }