- Stop execution when LDAP addressbook is configured but PHP's ldap functio...

alecpl

2011-05-04 56651c15c8fb076b61c41c8e649dda6b9bf4f56f

 program/include/rcmail.php

@@ -5,7 +5,7 @@
 | program/include/rcmail.php                                            |
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2008-2010, The Roundcube Dev Team                       |
 | Copyright (C) 2008-2011, The Roundcube Dev Team                       |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -570,13 +570,12 @@
    if (session_id())
      return;

    $lifetime = $this->config->get('session_lifetime', 0) * 60;

    // set session domain
    if ($domain = $this->config->get('session_domain')) {
      ini_set('session.cookie_domain', $domain);
    }
    // set session garbage collecting time according to session_lifetime
    $lifetime = $this->config->get('session_lifetime', 0) * 60;
    if ($lifetime) {
      ini_set('session.gc_maxlifetime', $lifetime * 2);
    }
@@ -588,7 +587,7 @@
    ini_set('session.serialize_handler', 'php');

    // use database for storing session data
    $this->session = new rcube_session($this->get_dbh(), $lifetime);
    $this->session = new rcube_session($this->get_dbh(), $this->config);

    $this->session->register_gc_handler('rcmail_temp_gc');
    if ($this->config->get('enable_caching'))
@@ -1179,7 +1178,7 @@
      mcrypt_module_close($td);
    }
    else {
      @include_once('lib/des.inc');
      @include_once 'des.inc';

      if (function_exists('des')) {
        $des_iv_size = 8;
@@ -1231,7 +1230,7 @@
      mcrypt_module_close($td);
    }
    else {
      @include_once('lib/des.inc');
      @include_once 'des.inc';

      if (function_exists('des')) {
        $des_iv_size = 8;