From c060677d209ad3eef97dd6711ddfd5cc7ff9f2f4 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 12 Jun 2008 03:32:04 -0400
Subject: [PATCH] Enable direct download of (main|db).inc.php from the installer.
---
program/include/rcmail.php | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 04928b2..0b5bcdb 100644
--- a/program/include/rcmail.php
+++ b/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'])) {
@@ -161,9 +162,9 @@
}
$_SESSION['language'] = $this->user->language = $this->language_prop($this->config->get('language'));
-
+
// set localization
- setlocale(LC_ALL, $_SESSION['language']);
+ setlocale(LC_ALL, $_SESSION['language'] . '.utf8');
}
@@ -180,15 +181,23 @@
if (empty($rcube_languages)) {
@include(INSTALL_PATH . 'program/localization/index.inc');
}
-
+
// check if we have an alias for that language
if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) {
$lang = $rcube_language_aliases[$lang];
}
-
// try the first two chars
- if (!isset($rcube_languages[$lang]) && strlen($lang)>2) {
- $lang = $this->language_prop(substr($lang, 0, 2));
+ else if (!isset($rcube_languages[$lang])) {
+ $short = substr($lang, 0, 2);
+
+ // check if we have an alias for the short language code
+ if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) {
+ $lang = $rcube_language_aliases[$short];
+ }
+ // expand 'nn' to 'nn_NN'
+ else if (!isset($rcube_languages[$short])) {
+ $lang = $short.'_'.strtoupper($short);
+ }
}
if (!isset($rcube_languages[$lang]) || !is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {
@@ -300,7 +309,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 +390,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 +736,8 @@
$this->contacts->close();
// before closing the database connection, write session data
- session_write_close();
+ if ($_SERVER['REMOTE_ADDR'])
+ session_write_close();
}
--
Gitblit v1.9.1