-fixed last commit

alecpl

2008-05-29 75da0b6f74203c6ea2656a1bbcf6bacba17a15c6

-fixed last commit

 program/include/rcmail.php

@@ -101,8 +101,9 @@
      ini_set('session.gc_maxlifetime', ($config_all['session_lifetime']) * 120);
    }

    // start PHP session
    session_start();
    // start PHP session (if not in CLI mode)
    if ($_SERVER['REMOTE_ADDR'])
      session_start();

    // set initial session vars
    if (!isset($_SESSION['auth_time'])) {
@@ -300,7 +301,7 @@
    $conn = false;
    
    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');
      }
@@ -381,7 +382,7 @@
      $username = $user->data['username'];

    // 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;

    // user already registered -> update user's record
@@ -727,7 +728,8 @@
      $this->contacts->close();

    // before closing the database connection, write session data
    session_write_close();
    if ($_SERVER['REMOTE_ADDR'])
      session_write_close();
  }