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

release-0.6
thomascube 17 years ago
parent c3bc10eb42
commit 0e6bdbe8f5

@ -101,8 +101,9 @@ class rcmail
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 @@ class rcmail
$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 @@ class rcmail
$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 @@ class rcmail
$this->contacts->close();
// before closing the database connection, write session data
session_write_close();
if ($_SERVER['REMOTE_ADDR'])
session_write_close();
}

@ -102,7 +102,7 @@ class rcube_imap
* @return boolean TRUE on success, FALSE on failure
* @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;
@ -119,8 +119,6 @@ class rcube_imap
$ICL_PORT = $port;
$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;
$this->user = $user;

Loading…
Cancel
Save