From 583f1c8d80c42195d0ee41f30a885e13d777b79f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 08 Nov 2005 15:18:56 -0500
Subject: [PATCH] Added reply-to-all function (submitted by Julien Brette)
---
program/include/main.inc | 235 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 169 insertions(+), 66 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 2e5be7b..adb0b88 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -30,7 +30,7 @@
// check client
$BROWSER = rcube_browser();
-
+
// load config file
include_once('config/main.inc.php');
$CONFIG = is_array($rcmail_config) ? $rcmail_config : array();
@@ -51,14 +51,21 @@
ini_set('display_errors', 1);
else
ini_set('display_errors', 0);
+
+ // set session garbage collecting time according to session_lifetime
+ if (!empty($CONFIG['session_lifetime']))
+ ini_set('session.gc_maxlifetime', ($CONFIG['session_lifetime']+2)*60);
// prepare DB connection
+ require_once('include/rcube_'.(empty($CONFIG['db_backend']) ? 'db' : $CONFIG['db_backend']).'.inc');
+
$DB = new rcube_db($CONFIG['db_dsnw'], $CONFIG['db_dsnr']);
$DB->sqlite_initials = $INSTALL_PATH.'SQL/sqlite.initial.sql';
// we can use the database for storing session data
- if (is_object($DB) && $DB->db_provider!='sqlite')
+ // session queries do not work with MDB2
+ if ($CONFIG['db_backend']!='mdb2' && is_object($DB) && $DB->db_provider!='sqlite')
include_once('include/session.inc');
@@ -70,7 +77,7 @@
if (!$_SESSION['client_id'])
{
$_SESSION['client_id'] = $sess_id;
- $_SESSION['user_lang'] = 'en';
+ $_SESSION['user_lang'] = substr($CONFIG['locale_string'], 0, 2);
$_SESSION['auth_time'] = mktime();
$_SESSION['auth'] = rcmail_auth_hash($sess_id, $_SESSION['auth_time']);
unset($GLOBALS['_auth']);
@@ -136,34 +143,43 @@
$IMAP = new rcube_imap();
+ // connect with stored session data
+ if ($connect)
+ {
+ if (!($conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl'])))
+ show_message('imaperror', 'error');
+
+ rcmail_set_imap_prop();
+ }
+
// enable caching of imap data
if ($CONFIG['enable_caching']===TRUE)
$IMAP->set_caching(TRUE);
- // set root dir from config
- if (strlen($CONFIG['imap_root']))
- $IMAP->set_rootdir($CONFIG['imap_root']);
-
if (is_array($CONFIG['default_imap_folders']))
$IMAP->set_default_mailboxes($CONFIG['default_imap_folders']);
-
- if (strlen($_SESSION['mbox']))
- $IMAP->set_mailbox($_SESSION['mbox']);
-
- if (isset($_SESSION['page']))
- $IMAP->set_page($_SESSION['page']);
// set pagesize from config
if (isset($CONFIG['pagesize']))
$IMAP->set_pagesize($CONFIG['pagesize']);
+ }
- // connect with stored session data
- if ($connect)
- {
- if (!($conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']))))
- show_message('imaperror', 'error');
- }
+// set root dir and last stored mailbox
+// this must be done AFTER connecting to the server
+function rcmail_set_imap_prop()
+ {
+ global $CONFIG, $IMAP;
+
+ // set root dir from config
+ if (strlen($CONFIG['imap_root']))
+ $IMAP->set_rootdir($CONFIG['imap_root']);
+
+ if (strlen($_SESSION['mbox']))
+ $IMAP->set_mailbox($_SESSION['mbox']);
+
+ if (isset($_SESSION['page']))
+ $IMAP->set_page($_SESSION['page']);
}
@@ -211,7 +227,7 @@
// init output object for GUI and add common scripts
function load_gui()
{
- global $CONFIG, $OUTPUT, $COMM_PATH, $IMAP, $JS_OBJECT_NAME;
+ global $CONFIG, $OUTPUT, $COMM_PATH, $JS_OBJECT_NAME, $sess_user_lang;
// init output page
$OUTPUT = new rcube_html_page();
@@ -222,11 +238,36 @@
if (!empty($GLOBALS['_framed']))
$javascript .= "$JS_OBJECT_NAME.set_env('framed', true);\n";
-
+
$OUTPUT->add_script($javascript);
$OUTPUT->include_script('program/js/common.js');
- $OUTPUT->include_script('program/js/app.js');
+ $OUTPUT->include_script('program/js/app.js');
+
+ // set user-selected charset
+ if ($CONFIG['charset'])
+ $OUTPUT->set_charset($CONFIG['charset']);
+ else
+ rcmail_set_locale($sess_user_lang);
+
+ // add some basic label to client
+ rcube_add_label('loading');
}
+
+
+// set localization charset based on the given language
+function rcmail_set_locale($lang)
+ {
+ global $OUTPUT, $INSTLL_PATH;
+ static $rcube_charsets;
+
+ if (!$rcube_charsets)
+ @include($INSTLL_PATH.'program/localization/index.inc');
+
+ if (isset($rcube_charsets[$lang]))
+ $OUTPUT->set_charset($rcube_charsets[$lang]);
+ else
+ $OUTPUT->set_charset('ISO-8859-1');
+ }
// perfom login to the IMAP server and to the webmail service
@@ -238,29 +279,28 @@
if (!$host)
$host = $CONFIG['default_host'];
- // query if user already registered
- $sql_result = $DB->query(sprintf("SELECT user_id, username, language, preferences
- FROM %s
- WHERE mail_host='%s' AND (username='%s' OR alias='%s')",
- get_table_name('users'),
- addslashes($host),
- addslashes($user),
- addslashes($user)));
-
- // user already registered -> overwrite username
- if ($sql_arr = $DB->fetch_assoc($sql_result))
- {
- $user_id = $sql_arr['user_id'];
- $user = $sql_arr['username'];
- }
-
// parse $host URL
$a_host = parse_url($host);
if ($a_host['host'])
{
$host = $a_host['host'];
$imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
- $imap_port = isset($a_host['post']) ? $a_host['post'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
+ $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
+ }
+
+ // query if user already registered
+ $sql_result = $DB->query("SELECT user_id, username, language, preferences
+ FROM ".get_table_name('users')."
+ WHERE mail_host=? AND (username=? OR alias=?)",
+ $host,
+ $user,
+ $user);
+
+ // user already registered -> overwrite username
+ if ($sql_arr = $DB->fetch_assoc($sql_result))
+ {
+ $user_id = $sql_arr['user_id'];
+ $user = $sql_arr['username'];
}
// exit if IMAP login failed
@@ -278,16 +318,16 @@
array_merge($CONFIG, $user_prefs);
}
+
// set user specific language
if (strlen($sql_arr['language']))
$sess_user_lang = $_SESSION['user_lang'] = $sql_arr['language'];
-
+
// update user's record
- $DB->query(sprintf("UPDATE %s
- SET last_login=NOW()
- WHERE user_id=%d",
- get_table_name('users'),
- $user_id));
+ $DB->query("UPDATE ".get_table_name('users')."
+ SET last_login=now()
+ WHERE user_id=?",
+ $user_id);
}
// create new system user
else if ($CONFIG['auto_create_user'])
@@ -299,7 +339,10 @@
{
$_SESSION['user_id'] = $user_id;
$_SESSION['imap_host'] = $host;
+ $_SESSION['imap_port'] = $imap_port;
+ $_SESSION['imap_ssl'] = $imap_ssl;
$_SESSION['username'] = $user;
+ $_SESSION['user_lang'] = $sess_user_lang;
$_SESSION['password'] = encrypt_passwd($pass);
// force reloading complete list of subscribed mailboxes
@@ -316,27 +359,26 @@
function rcmail_create_user($user, $host)
{
global $DB, $CONFIG, $IMAP;
+
+ $DB->query("INSERT INTO ".get_table_name('users')."
+ (created, last_login, username, mail_host, language)
+ VALUES (now(), now(), ?, ?, ?)",
+ $user,
+ $host,
+ $_SESSION['user_lang']);
- $DB->query(sprintf("INSERT INTO %s
- (created, last_login, username, mail_host)
- VALUES (NOW(), NOW(), '%s', '%s')",
- get_table_name('users'),
- addslashes($user),
- addslashes($host)));
-
- if ($user_id = $DB->insert_id())
+ if ($user_id = $DB->insert_id('user_ids'))
{
$user_email = strstr($user, '@') ? $user : sprintf('%s@%s', $user, $host);
$user_name = $user!=$user_email ? $user : '';
// also create a new identity record
- $DB->query(sprintf("INSERT INTO %s
- (user_id, `default`, name, email)
- VALUES (%d, '1', '%s', '%s')",
- get_table_name('identities'),
- $user_id,
- addslashes($user_name),
- addslashes($user_email)));
+ $DB->query("INSERT INTO ".get_table_name('identities')."
+ (user_id, `default`, name, email)
+ VALUES (?, '1', ?, ?)",
+ $user_id,
+ $user_name,
+ $user_email);
// get existing mailboxes
$a_mailboxes = $IMAP->list_mailboxes();
@@ -359,6 +401,16 @@
}
return $user_id;
+ }
+
+
+// overwrite action variable
+function rcmail_overwrite_action($action)
+ {
+ global $OUTPUT, $JS_OBJECT_NAME;
+ $GLOBALS['_action'] = $action;
+
+ $OUTPUT->add_script(sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $action));
}
@@ -423,6 +475,47 @@
}
+// read directory program/localization/ and return a list of available languages
+function rcube_list_languages()
+ {
+ global $CONFIG, $INSTALL_PATH;
+ static $sa_languages = array();
+
+ if (!sizeof($sa_languages))
+ {
+ @include($INSTLL_PATH.'program/localization/index.inc');
+
+ if ($dh = @opendir($INSTLL_PATH.'program/localization'))
+ {
+ while (($name = readdir($dh)) !== false)
+ {
+ if ($name{0}=='.' || !is_dir($INSTLL_PATH.'program/localization/'.$name))
+ continue;
+
+ if ($label = $rcube_languages[$name])
+ $sa_languages[$name] = $label ? $label : $name;
+ }
+ closedir($dh);
+ }
+ }
+
+ return $sa_languages;
+ }
+
+
+// add a localized label to the client environment
+function rcube_add_label()
+ {
+ global $OUTPUT, $JS_OBJECT_NAME;
+
+ $arg_list = func_get_args();
+ foreach ($arg_list as $i => $name)
+ $OUTPUT->add_script(sprintf("%s.add_label('%s', '%s');",
+ $JS_OBJECT_NAME,
+ $name,
+ rep_specialchars_output(rcube_label($name), 'js')));
+ }
+
// ************** template parsing and gui functions **************
@@ -480,6 +573,7 @@
// replace all strings ($varname) with the content of the according global variable
function parse_with_globals($input)
{
+ $GLOBALS['__comm_path'] = $GLOBALS['COMM_PATH'];
$output = preg_replace('/\$(__[a-z0-9_\-]+)/e', '$GLOBALS["\\1"]', $input);
return $output;
}
@@ -521,7 +615,7 @@
// show a label
case 'label':
if ($attrib['name'] || $attrib['command'])
- return rcube_label($attrib);
+ return rep_specialchars_output(rcube_label($attrib));
break;
// create a menu item
@@ -653,7 +747,7 @@
else if (isset($GLOBALS['PAGE_TITLE']))
return rep_specialchars_output("RoundCube|Mail :: ".$GLOBALS['PAGE_TITLE']);
else if ($task=='mail' && ($mbox_name = $IMAP->get_mailbox_name()))
- return "RoundCube|Mail :: $mbox_name";
+ return "RoundCube|Mail :: ".rep_specialchars_output(UTF7DecodeString($mbox_name), 'html', 'all');
else
return "RoundCube|Mail :: $task";
}
@@ -671,7 +765,7 @@
// create and register a button
function rcube_button($attrib)
{
- global $CONFIG, $OUTPUT, $JS_OBJECT_NAME;
+ global $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $BROWSER;
static $sa_buttons = array();
static $s_button_count = 100;
@@ -728,7 +822,14 @@
if ($attrib['alt'])
$attrib['alt'] = rep_specialchars_output(rcube_label($attrib['alt']));
-
+
+ // set title to alt attribute for IE browsers
+ if ($BROWSER['ie'] && $attrib['title'] && !$attrib['alt'])
+ {
+ $attrib['alt'] = $attrib['title'];
+ unset($attrib['title']);
+ }
+
// add empty alt attribute for XHTML compatibility
if (!isset($attrib['alt']))
$attrib['alt'] = '';
@@ -820,7 +921,7 @@
$table .= "<thead><tr>\n";
foreach ($a_show_cols as $col)
- $table .= '<td class="'.$col.'">' . rcube_label($col) . "</td>\n";
+ $table .= '<td class="'.$col.'">' . rep_specialchars_output(rcube_label($col)) . "</td>\n";
$table .= "</tr></thead>\n<tbody>\n";
@@ -897,8 +998,10 @@
if (is_numeric($date))
$ts = $date;
- else
+ else if (!empty($date))
$ts = strtotime($date);
+ else
+ return '';
// convert time to user's timezone
$timestamp = $ts - date('Z', $ts) + ($CONFIG['timezone'] * 3600);
--
Gitblit v1.9.1