From 9e8e5fa634ace418e6b34280133685485b97a9c0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 26 Aug 2008 03:21:50 -0400
Subject: [PATCH] - Removed support for PEAR::DB driver
---
program/include/rcmail.php | 109 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 29 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index ccd46d6..8a061be 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -62,14 +62,11 @@
/**
* Private constructor
- *
- * @todo Remove global $CONFIG
*/
private function __construct()
{
// load configuration
$this->config = new rcube_config();
- $GLOBALS['CONFIG'] = $this->config->all();
register_shutdown_function(array($this, 'shutdown'));
}
@@ -87,7 +84,7 @@
// set task and action properties
$this->set_task(strip_quotes(get_input_value('_task', RCUBE_INPUT_GPC)));
- $this->action = strip_quotes(get_input_value('_action', RCUBE_INPUT_GPC));
+ $this->action = asciiwords(get_input_value('_action', RCUBE_INPUT_GPC));
// connect to database
$GLOBALS['DB'] = $this->get_dbh();
@@ -104,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'])) {
@@ -141,7 +139,7 @@
$task = 'mail';
$this->task = $task;
- $this->comm_path = './?_task=' . $task;
+ $this->comm_path = $this->url(array('task' => $task));
if ($this->output)
$this->output->set_env('task', $task);
@@ -164,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');
}
@@ -183,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)) {
@@ -210,10 +216,9 @@
public function get_dbh()
{
if (!$this->db) {
- $dbclass = "rcube_" . $this->config->get('db_backend', 'mdb2');
$config_all = $this->config->all();
- $this->db = new $dbclass($config_all['db_dsnw'], $config_all['db_dsnr'], $config_all['db_persistent']);
+ $this->db = new rcube_mdb2($config_all['db_dsnw'], $config_all['db_dsnr'], $config_all['db_persistent']);
$this->db->sqlite_initials = INSTALL_PATH . 'SQL/sqlite.initial.sql';
$this->db->set_debug((bool)$config_all['sql_debug']);
$this->db->db_connect('w');
@@ -227,13 +232,17 @@
* Init output object for GUI and add common scripts.
* This will instantiate a rcmail_template object and set
* environment vars according to the current session and configuration
+ *
+ * @param boolean True if this request is loaded in a (i)frame
+ * @return object rcube_template Reference to HTML output object
*/
public function load_gui($framed = false)
{
// init output page
- $this->output = new rcube_template($this->task, $framed);
+ if (!($this->output instanceof rcube_template))
+ $this->output = new rcube_template($this->task, $framed);
- foreach (array('flag_for_deletion') as $js_config_var) {
+ foreach (array('flag_for_deletion','read_when_deleted') as $js_config_var) {
$this->output->set_env($js_config_var, $this->config->get($js_config_var));
}
@@ -256,10 +265,13 @@
/**
* Create an output object for JSON responses
+ *
+ * @return object rcube_json_output Reference to JSON output object
*/
public function init_json()
{
- $this->output = new rcube_json_output($this->task);
+ if (!($this->output instanceof rcube_json_output))
+ $this->output = new rcube_json_output($this->task);
return $this->output;
}
@@ -302,8 +314,8 @@
{
$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 ($_SESSION['imap_host'] && !$this->imap->conn) {
+ 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');
}
@@ -311,7 +323,7 @@
$this->set_imap_prop();
}
- return $conn;
+ return $conn;
}
@@ -384,7 +396,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
@@ -468,12 +480,20 @@
public function autoselect_host()
{
$default_host = $this->config->get('default_host');
- $host = !empty($default_host) ? get_input_value('_host', RCUBE_INPUT_POST) : $default_host;
+ $host = null;
- if (is_array($host)) {
+ if (is_array($default_host)) {
+ $post_host = get_input_value('_host', RCUBE_INPUT_POST);
+
+ // direct match in default_host array
+ if ($default_host[$post_host] || in_array($post_host, array_values($default_host))) {
+ $host = $post_host;
+ }
+
+ // try to select host by mail domain
list($user, $domain) = explode('@', get_input_value('_user', RCUBE_INPUT_POST));
if (!empty($domain)) {
- foreach ($host as $imap_host => $mail_domains) {
+ foreach ($default_host as $imap_host => $mail_domains) {
if (is_array($mail_domains) && in_array($domain, $mail_domains)) {
$host = $imap_host;
break;
@@ -482,9 +502,15 @@
}
// take the first entry if $host is still an array
- if (is_array($host))
- $host = array_shift($host);
+ if (empty($host)) {
+ $host = array_shift($default_host);
+ }
}
+ else if (empty($default_host)) {
+ $host = get_input_value('_host', RCUBE_INPUT_POST);
+ }
+ else
+ $host = $default_host;
return $host;
}
@@ -730,7 +756,8 @@
$this->contacts->close();
// before closing the database connection, write session data
- session_write_close();
+ if ($_SERVER['REMOTE_ADDR'])
+ session_write_close();
}
@@ -761,7 +788,7 @@
* @param string Password to encrypt
* @return string Encryprted string
*/
- private function encrypt_passwd($pass)
+ public function encrypt_passwd($pass)
{
if (function_exists('mcrypt_module_open') && ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, ""))) {
$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
@@ -813,6 +840,30 @@
return preg_replace('/\x00/', '', $pass);
}
+
+ /**
+ * Build a valid URL to this instance of RoundCube
+ *
+ * @param mixed Either a string with the action or url parameters as key-value pairs
+ * @return string Valid application URL
+ */
+ public function url($p)
+ {
+ if (!is_array($p))
+ $p = array('_action' => @func_get_arg(0));
+
+ if ($p['task'] && in_array($p['task'], rcmail::$main_tasks))
+ $url = './?_task='.$p['task'];
+ else
+ $url = $this->comm_path;
+
+ unset($p['task']);
+ foreach ($p as $par => $val)
+ if (isset($val))
+ $url .= '&'.urlencode($par).'='.urlencode($val);
+
+ return $url;
+ }
}
--
Gitblit v1.9.1