Changeset 0ece58d in github

Timestamp:

Jul 28, 2008 6:28:32 AM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

8c72e33

Parents:

3ac95d5

Message:

Add consistency checks + complete some phpdoc

File:

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

program/include/rcmail.php

@@ -234 +234 @@
    * This will instantiate a rcmail_template object and set
    * environment vars according to the current session and configuration
+   *
+   * @param boolean True if this request is loaded in a (i)frame
+   * @return object rcube_template Reference to HTML output object
    */
   public function load_gui($framed = false)
   {
     // init output page
-    $this->output = new rcube_template($this->task, $framed);
+    if (!($this->output instanceof rcube_template))
+      $this->output = new rcube_template($this->task, $framed);
 
     foreach (array('flag_for_deletion') as $js_config_var) {
@@ -263 +267 @@
   /**
    * Create an output object for JSON responses
+   *
+   * @return object rcube_json_output Reference to JSON output object
    */
   public function init_json()
   {
-    $this->output = new rcube_json_output($this->task);
+    if (!($this->output instanceof rcube_json_output))
+      $this->output = new rcube_json_output($this->task);
     
     return $this->output;
@@ -309 +316 @@
     $conn = false;
     
-    if ($_SESSION['imap_host']) {
+    if ($_SESSION['imap_host'] && !$this->imap->conn) {
       if (!($conn = $this->imap->connect($_SESSION['imap_host'], $_SESSION['username'], $this->decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl'], rcmail::get_instance()->config->get('imap_auth_type', 'check')))) {
         if ($this->output)
@@ -318 +325 @@
     }
 
-    return $conn;    
+    return $conn;
   }