Changeset 1447 in subversion

Timestamp:

May 28, 2008 6:44:22 PM (5 years ago)

Author:

thomasb

Message:

Pass auth_type as argument; don't start session if started from command line

Location:

trunk/roundcubemail/program/include

Files:

• rcmail.php (modified) (4 diffs)
• rcube_imap.php (modified) (2 diffs)

trunk/roundcubemail/program/include/rcmail.php

@@ -102 +102 @@
     }
 
-    // start PHP session
-    session_start();
+    // start PHP session (if not in CLI mode)
+    if ($_SERVER['REMOTE_ADDR'])
+      session_start();
 
     // set initial session vars
@@ -301 +302 @@
     
     if ($_SESSION['imap_host']) {
-      if (!($conn = $this->imap->connect($_SESSION['imap_host'], $_SESSION['username'], $this->decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl']))) {
+      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)
           $this->output->show_message($this->imap->error_code == -1 ? 'imaperror' : 'sessionerror', 'error');
@@ -382 +383 @@
 
     // exit if IMAP login failed
-    if (!($imap_login  = $this->imap->connect($host, $username, $pass, $imap_port, $imap_ssl)))
+    if (!($imap_login  = $this->imap->connect($host, $username, $pass, $imap_port, $imap_ssl, $config['imap_auth_type'])))
       return false;
 
@@ -728 +729 @@
 
     // before closing the database connection, write session data
-    session_write_close();
+    if ($_SERVER['REMOTE_ADDR'])
+      session_write_close();
   }
   

trunk/roundcubemail/program/include/rcube_imap.php

@@ -103 +103 @@
    * @access public
    */
-  function connect($host, $user, $pass, $port=143, $use_ssl=null)
+  function connect($host, $user, $pass, $port=143, $use_ssl=null, $auth_type='check')
     {
     global $ICL_SSL, $ICL_PORT, $IMAP_USE_INTERNAL_DATE;
@@ -120 +120 @@
     $IMAP_USE_INTERNAL_DATE = false;
 
-    $auth_type = rcmail::get_instance()->config->get('imap_auth_type', 'check');
-    
     $this->conn = iil_Connect($host, $user, $pass, array('imap' => $auth_type));
     $this->host = $host;