Changeset 5884 in subversion

Timestamp:

Feb 15, 2012 6:21:26 AM (15 months ago)

Author:

thomasb

Message:

Split rcube::shutdown()

Location:

branches/devel-framework/roundcubemail/program/include

Files:

• rcmail.php (modified) (1 diff)
• rcube.php (modified) (2 diffs)

branches/devel-framework/roundcubemail/program/include/rcmail.php

@@ -740 +740 @@
   }
 
+
+  /**
+   * Function to be executed in script shutdown
+   */
+  public function shutdown()
+  {
+    parent::shutdown();
+
+    foreach ($this->address_books as $book) {
+      if (is_object($book) && is_a($book, 'rcube_addressbook'))
+        $book->close();
+    }
+
+    // before closing the database connection, write session data
+    if ($_SERVER['REMOTE_ADDR'] && is_object($this->session)) {
+      session_write_close();
+    }
+
+    // write performance stats to logs/console
+    if ($this->config->get('devel_mode')) {
+      if (function_exists('memory_get_usage'))
+        $mem = rcube_ui::show_bytes(memory_get_usage());
+      if (function_exists('memory_get_peak_usage'))
+        $mem .= '/'.rcube_ui::show_bytes(memory_get_peak_usage());
+
+      $log = $this->task . ($this->action ? '/'.$this->action : '') . ($mem ? " [$mem]" : '');
+      if (defined('RCMAIL_START'))
+        self::print_timer(RCMAIL_START, $log);
+      else
+        self::console($log);
+    }
+  }
 
   /**

branches/devel-framework/roundcubemail/program/include/rcube.php

@@ -763 +763 @@
     if (is_object($this->smtp))
       $this->smtp->disconnect();
-/*
-    foreach ($this->address_books as $book) {
-      if (is_object($book) && is_a($book, 'rcube_addressbook'))
-        $book->close();
-    }
-*/
+
     foreach ($this->caches as $cache) {
         if (is_object($cache))
@@ -776 +771 @@
     if (is_object($this->storage))
       $this->storage->close();
-
-    // before closing the database connection, write session data
-    if ($_SERVER['REMOTE_ADDR'] && is_object($this->session)) {
-      session_write_close();
-    }
-
-    // write performance stats to logs/console
-    if ($this->config->get('devel_mode')) {
-      if (function_exists('memory_get_usage'))
-        $mem = rcube_ui::show_bytes(memory_get_usage());
-      if (function_exists('memory_get_peak_usage'))
-        $mem .= '/'.rcube_ui::show_bytes(memory_get_peak_usage());
-
-      $log = $this->task . ($this->action ? '/'.$this->action : '') . ($mem ? " [$mem]" : '');
-      if (defined('RCMAIL_START'))
-        self::print_timer(RCMAIL_START, $log);
-      else
-        self::console($log);
-    }
   }