From f5121b5639992fc9e51fd551bac2254429b638fa Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 04 Mar 2006 08:43:25 -0500
Subject: [PATCH] Updated localizations
---
program/include/main.inc | 1068 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 854 insertions(+), 214 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 7173917..515de03 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -20,6 +20,14 @@
*/
require_once('lib/des.inc');
+require_once('lib/utf7.inc');
+require_once('lib/utf8.class.php');
+
+
+// define constannts for input reading
+define('RCUBE_INPUT_GET', 0x0101);
+define('RCUBE_INPUT_POST', 0x0102);
+define('RCUBE_INPUT_GPC', 0x0103);
// register session and connect to server
@@ -30,7 +38,7 @@
// check client
$BROWSER = rcube_browser();
-
+
// load config file
include_once('config/main.inc.php');
$CONFIG = is_array($rcmail_config) ? $rcmail_config : array();
@@ -40,24 +48,36 @@
include_once('config/db.inc.php');
$CONFIG = array_merge($CONFIG, $rcmail_config);
+ if (empty($CONFIG['log_dir']))
+ $CONFIG['log_dir'] = $INSTALL_PATH.'logs';
+ else
+ $CONFIG['log_dir'] = ereg_replace('\/$', '', $CONFIG['log_dir']);
// set PHP error logging according to config
if ($CONFIG['debug_level'] & 1)
{
ini_set('log_errors', 1);
- ini_set('error_log', $INSTALL_PATH.'logs/errors');
+ ini_set('error_log', $CONFIG['log_dir'].'/errors');
}
if ($CONFIG['debug_level'] & 4)
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))
+ // session queries do not work with MDB2
+ if ($CONFIG['db_backend']!='mdb2' && is_object($DB))
include_once('include/session.inc');
@@ -69,7 +89,7 @@
if (!$_SESSION['client_id'])
{
$_SESSION['client_id'] = $sess_id;
- $_SESSION['user_lang'] = 'en';
+ $_SESSION['user_lang'] = rcube_language_prop($CONFIG['locale_string']);
$_SESSION['auth_time'] = mktime();
$_SESSION['auth'] = rcmail_auth_hash($sess_id, $_SESSION['auth_time']);
unset($GLOBALS['_auth']);
@@ -77,7 +97,7 @@
// set session vars global
$sess_auth = $_SESSION['auth'];
- $sess_user_lang = $_SESSION['user_lang'];
+ $sess_user_lang = rcube_language_prop($_SESSION['user_lang']);
// overwrite config with user preferences
@@ -131,38 +151,50 @@
// create IMAP object and connect to server
function rcmail_imap_init($connect=FALSE)
{
- global $CONFIG, $IMAP;
+ global $CONFIG, $DB, $IMAP;
- $IMAP = new rcube_imap();
-
- // 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']);
+ $IMAP = new rcube_imap($DB);
+ $IMAP->debug_level = $CONFIG['debug_level'];
+ $IMAP->skip_deleted = $CONFIG['skip_deleted'];
// connect with stored session data
if ($connect)
{
- if (!($conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']))))
+ 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);
+
+ if (is_array($CONFIG['default_imap_folders']))
+ $IMAP->set_default_mailboxes($CONFIG['default_imap_folders']);
+
+ // set pagesize from config
+ if (isset($CONFIG['pagesize']))
+ $IMAP->set_pagesize($CONFIG['pagesize']);
+ }
+
+
+// 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']);
}
@@ -176,6 +208,9 @@
$IMAP->close();
$IMAP->write_cache();
}
+
+ // before closing the database connection, write session data
+ session_write_close();
}
@@ -206,11 +241,63 @@
}
+// return correct name for a specific database sequence
+// (used for Postres only)
+function get_sequence_name($sequence)
+ {
+ global $CONFIG;
+
+ // return table name if configured
+ $config_key = 'db_sequence_'.$sequence;
+
+ if (strlen($CONFIG[$config_key]))
+ return $CONFIG[$config_key];
+
+ return $table;
+ }
+
+
+// check the given string and returns language properties
+function rcube_language_prop($lang, $prop='lang')
+ {
+ global $INSTLL_PATH;
+ static $rcube_languages, $rcube_language_aliases, $rcube_charsets;
+
+ if (empty($rcube_languages))
+ @include($INSTLL_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 = substr($lang, 0, 2);
+ $lang = rcube_language_prop($lang);
+ }
+
+ if (!isset($rcube_languages[$lang]))
+ $lang = 'en_US';
+
+ // language has special charset configured
+ if (isset($rcube_charsets[$lang]))
+ $charset = $rcube_charsets[$lang];
+ else
+ $charset = 'UTF-8';
+
+
+ if ($prop=='charset')
+ return $charset;
+ else
+ return $lang;
+ }
+
// 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();
@@ -219,39 +306,112 @@
$javascript = "var $JS_OBJECT_NAME = new rcube_webmail();\n";
$javascript .= "$JS_OBJECT_NAME.set_env('comm_path', '$COMM_PATH');\n";
- if ($_GET['_framed'] || $_POST['_framed'])
+ 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 locale setting
+ rcmail_set_locale($sess_user_lang);
+
+ // set user-selected charset
+ if (!empty($CONFIG['charset']))
+ $OUTPUT->set_charset($CONFIG['charset']);
+
+ // 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, $MBSTRING, $MBSTRING_ENCODING;
+ static $s_mbstring_loaded = NULL;
+
+ // settings for mbstring module (by Tadashi Jokagi)
+ if ($s_mbstring_loaded===NULL)
+ {
+ if ($s_mbstring_loaded = extension_loaded("mbstring"))
+ {
+ $MBSTRING = TRUE;
+ if (function_exists("mb_mbstring_encodings"))
+ $MBSTRING_ENCODING = mb_mbstring_encodings();
+ else
+ $MBSTRING_ENCODING = array("ISO-8859-1", "UTF-7", "UTF7-IMAP", "UTF-8",
+ "ISO-2022-JP", "EUC-JP", "EUCJP-WIN",
+ "SJIS", "SJIS-WIN");
+
+ $MBSTRING_ENCODING = array_map("strtoupper", $MBSTRING_ENCODING);
+ if (in_array("SJIS", $MBSTRING_ENCODING))
+ $MBSTRING_ENCODING[] = "SHIFT_JIS";
+ }
+ else
+ {
+ $MBSTRING = FALSE;
+ $MBSTRING_ENCODING = array();
+ }
+ }
+
+ if ($MBSTRING && function_exists("mb_language"))
+ {
+ if (!@mb_language(strtok($lang, "_")))
+ $MBSTRING = FALSE; // unsupport language
+ }
+
+ $OUTPUT->set_charset(rcube_language_prop($lang, 'charset'));
+ }
// perfom login to the IMAP server and to the webmail service
function rcmail_login($user, $pass, $host=NULL)
{
global $CONFIG, $IMAP, $DB, $sess_user_lang;
+ $user_id = NULL;
if (!$host)
$host = $CONFIG['default_host'];
- // exit if IMAP login failed
- if (!($imap_login = $IMAP->connect($host, $user, $pass)))
- return FALSE;
+ // 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['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
+ }
+ else
+ $imap_port = $CONFIG['default_port'];
// query if user already registered
- $sql_result = $DB->query(sprintf("SELECT user_id, language, preferences
- FROM %s
- WHERE username='%s' AND mail_host='%s'",
- get_table_name('users'),
- $user, $host));
+ $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
+ // user already registered -> overwrite username
if ($sql_arr = $DB->fetch_assoc($sql_result))
{
$user_id = $sql_arr['user_id'];
-
+ $user = $sql_arr['username'];
+ }
+
+ // try to resolve email address from virtuser table
+ if (!empty($CONFIG['virtuser_file']) && strstr($user, '@'))
+ $user = rcmail_email2user($user);
+
+
+ // exit if IMAP login failed
+ if (!($imap_login = $IMAP->connect($host, $user, $pass, $imap_port, $imap_ssl)))
+ return FALSE;
+
+ // user already registered
+ if ($user_id && !empty($sql_arr))
+ {
// get user prefs
if (strlen($sql_arr['preferences']))
{
@@ -260,16 +420,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'])
@@ -281,7 +441,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
@@ -299,39 +462,152 @@
{
global $DB, $CONFIG, $IMAP;
- $DB->query(sprintf("INSERT INTO %s
- (created, last_login, username, mail_host)
- VALUES (NOW(), NOW(), '%s', '%s')",
- get_table_name('users'),
- $user, $host));
+ $user_email = '';
- if ($user_id = $DB->insert_id())
+ // try to resolve user in virtusertable
+ if (!empty($CONFIG['virtuser_file']) && strstr($user, '@')==FALSE)
+ $user_email = rcmail_user2email($user);
+
+ $DB->query("INSERT INTO ".get_table_name('users')."
+ (created, last_login, username, mail_host, alias, language)
+ VALUES (now(), now(), ?, ?, ?, ?)",
+ $user,
+ $host,
+ $user_email,
+ $_SESSION['user_lang']);
+
+ if ($user_id = $DB->insert_id(get_sequence_name('users')))
{
- $user_email = strstr($user, '@') ? $user : sprintf('%s@%s', $user, $host);
+ if (is_array($CONFIG['mail_domain']) && isset($CONFIG['mail_domain'][$host]))
+ $mail_domain = $CONFIG['mail_domain'][$host];
+ else if (!empty($CONFIG['mail_domain']))
+ $mail_domain = $CONFIG['mail_domain'];
+ else
+ $mail_domain = $host;
+
+ if ($user_email=='')
+ $user_email = strstr($user, '@') ? $user : sprintf('%s@%s', $user, $mail_domain);
+
$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,
- $user_name,
- $user_email));
+
+ // try to resolve the e-mail address from the virtuser table
+ if (!empty($CONFIG['virtuser_query']))
+ {
+ $sql_result = $DB->query(preg_replace('/%u/', $user, $CONFIG['virtuser_query']));
+ if ($sql_arr = $DB->fetch_array($sql_result))
+ $user_email = $sql_arr[0];
+ }
+
+ // also create new identity records
+ $DB->query("INSERT INTO ".get_table_name('identities')."
+ (user_id, del, standard, name, email)
+ VALUES (?, 0, 1, ?, ?)",
+ $user_id,
+ $user_name,
+ $user_email);
+
// get existing mailboxes
$a_mailboxes = $IMAP->list_mailboxes();
-
- // check if the configured mailbox for sent messages exists
- if ($CONFIG['sent_mbox'] && !in_array_nocase($CONFIG['sent_mbox'], $a_mailboxes))
- $IMAP->create_mailbox($CONFIG['sent_mbox'], TRUE);
-
- // check if the configured mailbox for sent messages exists
- if ($CONFIG['trash_mbox'] && !in_array_nocase($CONFIG['trash_mbox'], $a_mailboxes))
- $IMAP->create_mailbox($CONFIG['trash_mbox'], TRUE);
+ }
+ else
+ {
+ raise_error(array('code' => 500,
+ 'type' => 'php',
+ 'line' => __LINE__,
+ 'file' => __FILE__,
+ 'message' => "Failed to create new user"), TRUE, FALSE);
}
return $user_id;
+ }
+
+
+// load virtuser table in array
+function rcmail_getvirtualfile()
+ {
+ global $CONFIG;
+ if (empty($CONFIG['virtuser_file']) || !is_file($CONFIG['virtuser_file']))
+ return FALSE;
+
+ // read file
+ $a_lines = file($CONFIG['virtuser_file']);
+ return $a_lines;
+ }
+
+
+// find matches of the given pattern in virtuser table
+function rcmail_findinvirtual($pattern)
+ {
+ $result = array();
+ $virtual = rcmail_getvirtualfile();
+ if ($virtual==FALSE)
+ return $result;
+
+ // check each line for matches
+ foreach ($virtual as $line)
+ {
+ $line = trim($line);
+ if (empty($line) || $line{0}=='#')
+ continue;
+
+ if (eregi($pattern, $line))
+ $result[] = $line;
+ }
+
+ return $result;
+ }
+
+
+// resolve username with virtuser table
+function rcmail_email2user($email)
+ {
+ $user = $email;
+ $r = rcmail_findinvirtual("^$email");
+
+ for ($i=0; $i<count($r); $i++)
+ {
+ $data = $r[$i];
+ $arr = preg_split('/\s+/', $data);
+ if(count($arr)>0)
+ {
+ $user = trim($arr[count($arr)-1]);
+ break;
+ }
+ }
+
+ return $user;
+ }
+
+
+// resolve e-mail address with virtuser table
+function rcmail_user2email($user)
+ {
+ $email = "";
+ $r = rcmail_findinvirtual("$user$");
+
+ for ($i=0; $i<count($r); $i++)
+ {
+ $data=$r[$i];
+ $arr = preg_split('/\s+/', $data);
+ if (count($arr)>0)
+ {
+ $email = trim($arr[0]);
+ break;
+ }
+ }
+
+ return $email;
+ }
+
+
+// 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));
}
@@ -339,7 +615,7 @@
{
global $OUTPUT, $JS_OBJECT_NAME, $REMOTE_REQUEST;
- $framed = ($_GET['framed'] || $_POST['_framed']);
+ $framed = $GLOBALS['_framed'];
$command = sprintf("display_message('%s', '%s');",
addslashes(rep_specialchars_output(rcube_label($message))),
$type);
@@ -359,8 +635,13 @@
function console($msg, $type=1)
{
- print $msg;
- print "\n<hr>\n";
+ if ($GLOBALS['REMOTE_REQUEST'])
+ print "// $msg\n";
+ else
+ {
+ print $msg;
+ print "\n<hr>\n";
+ }
}
@@ -379,15 +660,290 @@
// send correct response on a remote request
-function rcube_remote_response($js_code)
+function rcube_remote_response($js_code, $flush=FALSE)
{
- send_nocacheing_headers();
- //header('Content-Type: text/javascript');
- header('Content-Type: application/x-javascript');
+ global $OUTPUT, $CHARSET;
+ static $s_header_sent = FALSE;
+
+ if (!$s_header_sent)
+ {
+ $s_header_sent = TRUE;
+ send_nocacheing_headers();
+ header('Content-Type: application/x-javascript');
+ print '/** remote response ['.date('d/M/Y h:i:s O')."] **/\n";
+ }
- print '/** remote response ['.date('d/M/Y h:i:s O')."] **/\n";
- print $js_code;
- exit;
+ // send response code
+ print rcube_charset_convert($js_code, $CHARSET, $OUTPUT->get_charset());
+
+ if ($flush) // flush the output buffer
+ flush();
+ else // terminate script
+ exit;
+ }
+
+
+// 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')));
+ }
+
+
+// remove temp files of a session
+function rcmail_clear_session_temp($sess_id)
+ {
+ global $CONFIG;
+
+ $temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : '');
+ $cache_dir = $temp_dir.$sess_id;
+
+ if (is_dir($cache_dir))
+ {
+ clear_directory($cache_dir);
+ rmdir($cache_dir);
+ }
+ }
+
+
+// remove all expired message cache records
+function rcmail_message_cache_gc()
+ {
+ global $DB, $CONFIG;
+
+ // no cache lifetime configured
+ if (empty($CONFIG['message_cache_lifetime']))
+ return;
+
+ // get target timestamp
+ $ts = get_offset_time($CONFIG['message_cache_lifetime'], -1);
+
+ $DB->query("DELETE FROM ".get_table_name('messages')."
+ WHERE created < ".$DB->fromunixtime($ts));
+ }
+
+
+// convert a string from one charset to another
+// this function is not complete and not tested well
+function rcube_charset_convert($str, $from, $to=NULL)
+ {
+ global $MBSTRING, $MBSTRING_ENCODING;
+
+ $from = strtoupper($from);
+ $to = $to==NULL ? strtoupper($GLOBALS['CHARSET']) : strtoupper($to);
+
+ if ($from==$to)
+ return $str;
+
+ // convert charset using mbstring module
+ if ($MBSTRING)
+ {
+ $to = $to=="UTF-7" ? "UTF7-IMAP" : $to;
+ $from = $from=="UTF-7" ? "UTF7-IMAP": $from;
+
+ if (in_array($to, $MBSTRING_ENCODING) && in_array($from, $MBSTRING_ENCODING))
+ return mb_convert_encoding($str, $to, $from);
+ }
+
+ // convert charset using iconv module
+ if (function_exists('iconv') && $from!='UTF-7' && $to!='UTF-7')
+ return iconv($from, $to, $str);
+
+ $conv = new utf8();
+
+ // convert string to UTF-8
+ if ($from=='UTF-7')
+ $str = rcube_charset_convert(UTF7DecodeString($str), 'ISO-8859-1');
+ else if ($from=='ISO-8859-1' && function_exists('utf8_encode'))
+ $str = utf8_encode($str);
+ else if ($from!='UTF-8')
+ {
+ $conv->loadCharset($from);
+ $str = $conv->strToUtf8($str);
+ }
+
+ // encode string for output
+ if ($to=='UTF-7')
+ return UTF7EncodeString($str);
+ else if ($to=='ISO-8859-1' && function_exists('utf8_decode'))
+ return utf8_decode($str);
+ else if ($to!='UTF-8')
+ {
+ $conv->loadCharset($to);
+ return $conv->utf8ToStr($str);
+ }
+
+ // return UTF-8 string
+ return $str;
+ }
+
+
+
+// replace specials characters to a specific encoding type
+function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
+ {
+ global $OUTPUT_TYPE, $OUTPUT;
+ static $html_encode_arr, $js_rep_table, $rtf_rep_table, $xml_rep_table;
+
+ if (!$enctype)
+ $enctype = $GLOBALS['OUTPUT_TYPE'];
+
+ // convert nbsps back to normal spaces if not html
+ if ($enctype!='html')
+ $str = str_replace(chr(160), ' ', $str);
+
+ // encode for plaintext
+ if ($enctype=='text')
+ return str_replace("\r\n", "\n", $mode=='remove' ? strip_tags($str) : $str);
+
+ // encode for HTML output
+ if ($enctype=='html')
+ {
+ if (!$html_encode_arr)
+ {
+ $html_encode_arr = get_html_translation_table(HTML_SPECIALCHARS);
+ unset($html_encode_arr['?']);
+ unset($html_encode_arr['&']);
+ }
+
+ $ltpos = strpos($str, '<');
+ $encode_arr = $html_encode_arr;
+
+ // don't replace quotes and html tags
+ if (($mode=='show' || $mode=='') && $ltpos!==false && strpos($str, '>', $ltpos)!==false)
+ {
+ unset($encode_arr['"']);
+ unset($encode_arr['<']);
+ unset($encode_arr['>']);
+ }
+ else if ($mode=='remove')
+ $str = strip_tags($str);
+
+ $out = strtr($str, $encode_arr);
+
+ return $newlines ? nl2br($out) : $out;
+ }
+
+
+ if ($enctype=='url')
+ return rawurlencode($str);
+
+
+ // if the replace tables for RTF, XML and JS are not yet defined
+ if (!$js_rep_table)
+ {
+ $js_rep_table = $rtf_rep_table = $xml_rep_table = array();
+ $xml_rep_table['&'] = '&';
+
+ for ($c=160; $c<256; $c++) // can be increased to support more charsets
+ {
+ $hex = dechex($c);
+ $rtf_rep_table[Chr($c)] = "\\'$hex";
+ $xml_rep_table[Chr($c)] = "&#$c;";
+
+ if ($OUTPUT->get_charset()=='ISO-8859-1')
+ $js_rep_table[Chr($c)] = sprintf("\u%s%s", str_repeat('0', 4-strlen($hex)), $hex);
+ }
+
+ $js_rep_table['"'] = sprintf("\u%s%s", str_repeat('0', 4-strlen(dechex(34))), dechex(34));
+ $xml_rep_table['"'] = '"';
+ }
+
+ // encode for RTF
+ if ($enctype=='xml')
+ return strtr($str, $xml_rep_table);
+
+ // encode for javascript use
+ if ($enctype=='js')
+ {
+ if ($OUTPUT->get_charset()!='UTF-8')
+ $str = rcube_charset_convert($str, $GLOBALS['CHARSET'], $OUTPUT->get_charset());
+
+ return preg_replace(array("/\r\n/", '/"/', "/([^\\\])'/"), array('\n', '\"', "$1\'"), strtr($str, $js_rep_table));
+ }
+
+ // encode for RTF
+ if ($enctype=='rtf')
+ return preg_replace("/\r\n/", "\par ", strtr($str, $rtf_rep_table));
+
+ // no encoding given -> return original string
+ return $str;
+ }
+
+
+/**
+ * Read input value and convert it for internal use
+ * Performs stripslashes() and charset conversion if necessary
+ *
+ * @param string Field name to read
+ * @param int Source to get value from (GPC)
+ * @param boolean Allow HTML tags in field value
+ * @param string Charset to convert into
+ * @return string Field value or NULL if not available
+ */
+function get_input_value($fname, $source, $allow_html=FALSE, $charset=NULL)
+ {
+ global $OUTPUT;
+ $value = NULL;
+
+ if ($source==RCUBE_INPUT_GET && isset($_GET[$fname]))
+ $value = $_GET[$fname];
+ else if ($source==RCUBE_INPUT_POST && isset($_POST[$fname]))
+ $value = $_POST[$fname];
+ else if ($source==RCUBE_INPUT_GPC)
+ {
+ if (isset($_GET[$fname]))
+ $value = $_GET[$fname];
+ else if (isset($_POST[$fname]))
+ $value = $_POST[$fname];
+ else if (isset($_COOKIE[$fname]))
+ $value = $_COOKIE[$fname];
+ }
+
+ // strip slashes if magic_quotes enabled
+ if ((bool)get_magic_quotes_gpc())
+ $value = stripslashes($value);
+
+ // remove HTML tags if not allowed
+ if (!$allow_html)
+ $value = strip_tags($value);
+
+ // convert to internal charset
+ return rcube_charset_convert($value, $OUTPUT->get_charset(), $charset);
}
@@ -448,6 +1004,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;
}
@@ -463,7 +1020,7 @@
function rcube_xml_command($command, $str_attrib, $a_attrib=NULL)
{
- global $IMAP, $CONFIG;
+ global $IMAP, $CONFIG, $OUTPUT;
$attrib = array();
$command = strtolower($command);
@@ -489,7 +1046,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
@@ -514,120 +1071,73 @@
case 'object':
$object = strtolower($attrib['name']);
- if ($object=='loginform')
- return rcmail_login_form($attrib);
-
- else if ($object=='message')
- return rcmail_message_container($attrib);
-
- // MAIL
- else if ($object=='mailboxlist' && function_exists('rcmail_mailbox_list'))
- return rcmail_mailbox_list($attrib);
+ $object_handlers = array(
+ // GENERAL
+ 'loginform' => 'rcmail_login_form',
+ 'username' => 'rcmail_current_username',
- else if ($object=='messages' && function_exists('rcmail_message_list'))
- return rcmail_message_list($attrib);
-
- else if ($object=='messagecountdisplay' && function_exists('rcmail_messagecount_display'))
- return rcmail_messagecount_display($attrib);
-
- else if ($object=='messageheaders' && function_exists('rcmail_message_headers'))
- return rcmail_message_headers($attrib);
-
- else if ($object=='messageattachments' && function_exists('rcmail_message_attachments'))
- return rcmail_message_attachments($attrib);
-
- else if ($object=='messagebody' && function_exists('rcmail_message_body'))
- return rcmail_message_body($attrib);
+ // MAIL
+ 'mailboxlist' => 'rcmail_mailbox_list',
+ 'message' => 'rcmail_message_container',
+ 'messages' => 'rcmail_message_list',
+ 'messagecountdisplay' => 'rcmail_messagecount_display',
+ 'quotadisplay' => 'rcmail_quota_display',
+ 'messageheaders' => 'rcmail_message_headers',
+ 'messagebody' => 'rcmail_message_body',
+ 'messageattachments' => 'rcmail_message_attachments',
+ 'blockedobjects' => 'rcmail_remote_objects_msg',
+ 'messagecontentframe' => 'rcmail_messagecontent_frame',
+ 'messagepartframe' => 'rcmail_message_part_frame',
+ 'messagepartcontrols' => 'rcmail_message_part_controls',
+ 'composeheaders' => 'rcmail_compose_headers',
+ 'composesubject' => 'rcmail_compose_subject',
+ 'composebody' => 'rcmail_compose_body',
+ 'composeattachmentlist' => 'rcmail_compose_attachment_list',
+ 'composeattachmentform' => 'rcmail_compose_attachment_form',
+ 'composeattachment' => 'rcmail_compose_attachment_field',
+ 'priorityselector' => 'rcmail_priority_selector',
+ 'charsetselector' => 'rcmail_charset_selector',
- else if ($object=='blockedobjects' && function_exists('rcmail_remote_objects_msg'))
- return rcmail_remote_objects_msg($attrib);
+ // ADDRESS BOOK
+ 'addresslist' => 'rcmail_contacts_list',
+ 'addressframe' => 'rcmail_contact_frame',
+ 'recordscountdisplay' => 'rcmail_rowcount_display',
+ 'contactdetails' => 'rcmail_contact_details',
+ 'contacteditform' => 'rcmail_contact_editform',
+ 'ldappublicsearch' => 'rcmail_ldap_public_search_form',
+ 'ldappublicaddresslist' => 'rcmail_ldap_public_list',
- else if ($object=='messagecontentframe' && function_exists('rcmail_messagecontent_frame'))
- return rcmail_messagecontent_frame($attrib);
+ // USER SETTINGS
+ 'userprefs' => 'rcmail_user_prefs_form',
+ 'itentitieslist' => 'rcmail_identities_list',
+ 'identityframe' => 'rcmail_identity_frame',
+ 'identityform' => 'rcube_identity_form',
+ 'foldersubscription' => 'rcube_subscription_form',
+ 'createfolder' => 'rcube_create_folder_form',
+ 'composebody' => 'rcmail_compose_body'
+ );
- else if ($object=='messagepartframe' && function_exists('rcmail_message_part_frame'))
- return rcmail_message_part_frame($attrib);
-
- else if ($object=='messagepartcontrols' && function_exists('rcmail_message_part_controls'))
- return rcmail_message_part_controls($attrib);
-
- else if ($object=='composeheaders' && function_exists('rcmail_compose_headers'))
- return rcmail_compose_headers($attrib);
-
- else if ($object=='composesubject' && function_exists('rcmail_compose_subject'))
- return rcmail_compose_subject($attrib);
-
- else if ($object=='composebody' && function_exists('rcmail_compose_body'))
- return rcmail_compose_body($attrib);
-
- else if ($object=='composeattachmentlist' && function_exists('rcmail_compose_attachment_list'))
- return rcmail_compose_attachment_list($attrib);
-
- else if ($object=='composeattachmentform' && function_exists('rcmail_compose_attachment_form'))
- return rcmail_compose_attachment_form($attrib);
-
- else if ($object=='composeattachment' && function_exists('rcmail_compose_attachment_field'))
- return rcmail_compose_attachment_field($attrib);
-
- else if ($object=='priorityselector' && function_exists('rcmail_priority_selector'))
- return rcmail_priority_selector($attrib);
-
- else if ($object=='priorityselector' && function_exists('rcmail_priority_selector'))
- return rcmail_priority_selector($attrib);
-
-
- // ADDRESS BOOK
- else if ($object=='addresslist' && function_exists('rcmail_contacts_list'))
- return rcmail_contacts_list($attrib);
-
- else if ($object=='addressframe' && function_exists('rcmail_contact_frame'))
- return rcmail_contact_frame($attrib);
-
- else if ($object=='recordscountdisplay' && function_exists('rcmail_rowcount_display'))
- return rcmail_rowcount_display($attrib);
-
- else if ($object=='contactdetails' && function_exists('rcmail_contact_details'))
- return rcmail_contact_details($attrib);
-
- else if ($object=='contacteditform' && function_exists('rcmail_contact_editform'))
- return rcmail_contact_editform($attrib);
-
-
- // USER SETTINGS
- else if ($object=='userprefs' && function_exists('rcmail_user_prefs_form'))
- return rcmail_user_prefs_form($attrib);
-
- else if ($object=='itentitieslist' && function_exists('rcmail_identities_list'))
- return rcmail_identities_list($attrib);
-
- else if ($object=='identityframe' && function_exists('rcmail_identity_frame'))
- return rcmail_identity_frame($attrib);
-
- else if ($object=='identityform' && function_exists('rcube_identity_form'))
- return rcube_identity_form($attrib);
-
- else if ($object=='foldersubscription' && function_exists('rcube_subscription_form'))
- return rcube_subscription_form($attrib);
-
- else if ($object=='createfolder' && function_exists('rcube_create_folder_form'))
- return rcube_create_folder_form($attrib);
-
+
+ // execute object handler function
+ if ($object_handlers[$object] && function_exists($object_handlers[$object]))
+ return call_user_func($object_handlers[$object], $attrib);
else if ($object=='pagetitle')
{
$task = $GLOBALS['_task'];
+ $title = !empty($CONFIG['product_name']) ? $CONFIG['product_name'].' :: ' : '';
+
if ($task=='mail' && isset($GLOBALS['MESSAGE']['subject']))
- return rep_specialchars_output("RoundCube|Mail :: ".$GLOBALS['MESSAGE']['subject']);
+ $title .= $GLOBALS['MESSAGE']['subject'];
else if (isset($GLOBALS['PAGE_TITLE']))
- return rep_specialchars_output("RoundCube|Mail :: ".$GLOBALS['PAGE_TITLE']);
+ $title .= $GLOBALS['PAGE_TITLE'];
else if ($task=='mail' && ($mbox_name = $IMAP->get_mailbox_name()))
- return "RoundCube|Mail :: $mbox_name";
+ $title .= rcube_charset_convert($mbox_name, 'UTF-7', 'UTF-8');
else
- return "RoundCube|Mail :: $task";
+ $title .= $task;
+
+ return rep_specialchars_output($title, 'html', 'all');
}
-
- else if ($object=='about')
- return '';
break;
}
@@ -639,7 +1149,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;
@@ -696,7 +1206,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'] = '';
@@ -732,7 +1249,7 @@
// generate image tag
if ($attrib['type']=='image')
{
- $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'width', 'height', 'border', 'hspace', 'vspace', 'alt'));
+ $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'width', 'height', 'border', 'hspace', 'vspace', 'align', 'alt'));
$img_tag = sprintf('<img src="%%s"%s />', $attrib_str);
$btn_content = sprintf($img_tag, $skin_path.$attrib['image']);
if ($attrib['label'])
@@ -775,7 +1292,7 @@
-function rcube_table_output($attrib, $sql_result, $a_show_cols, $id_col)
+function rcube_table_output($attrib, $table_data, $a_show_cols, $id_col)
{
global $DB;
@@ -788,26 +1305,49 @@
$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";
$c = 0;
- while ($sql_result && ($sql_arr = $DB->fetch_assoc($sql_result)))
+
+ if (!is_array($table_data))
{
- $zebra_class = $c%2 ? 'even' : 'odd';
-
- $table .= sprintf('<tr id="rcmrow%d" class="contact '.$zebra_class.'">'."\n", $sql_arr[$id_col]);
-
- // format each col
- foreach ($a_show_cols as $col)
+ while ($table_data && ($sql_arr = $DB->fetch_assoc($table_data)))
{
- $cont = rep_specialchars_output($sql_arr[$col]);
- $table .= '<td class="'.$col.'">' . $cont . "</td>\n";
- }
+ $zebra_class = $c%2 ? 'even' : 'odd';
- $table .= "</tr>\n";
- $c++;
+ $table .= sprintf('<tr id="rcmrow%d" class="contact '.$zebra_class.'">'."\n", $sql_arr[$id_col]);
+
+ // format each col
+ foreach ($a_show_cols as $col)
+ {
+ $cont = rep_specialchars_output($sql_arr[$col]);
+ $table .= '<td class="'.$col.'">' . $cont . "</td>\n";
+ }
+
+ $table .= "</tr>\n";
+ $c++;
+ }
+ }
+ else
+ {
+ foreach ($table_data as $row_data)
+ {
+ $zebra_class = $c%2 ? 'even' : 'odd';
+
+ $table .= sprintf('<tr id="rcmrow%d" class="contact '.$zebra_class.'">'."\n", $row_data[$id_col]);
+
+ // format each col
+ foreach ($a_show_cols as $col)
+ {
+ $cont = rep_specialchars_output($row_data[$col]);
+ $table .= '<td class="'.$col.'">' . $cont . "</td>\n";
+ }
+
+ $table .= "</tr>\n";
+ $c++;
+ }
}
// complete message table
@@ -837,7 +1377,7 @@
$input = new textfield($attrib);
// use value from post
- if ($_POST[$fname])
+ if (!empty($_POST[$fname]))
$value = $_POST[$fname];
$out = $input->show($value);
@@ -865,8 +1405,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);
@@ -875,15 +1417,18 @@
$now = time(); // local time
$now -= (int)date('Z'); // make GMT time
$now += ($CONFIG['timezone'] * 3600); // user's time
+ $now_date = getdate();
- $day_secs = 60*((int)date('H', $now)*60 + (int)date('i', $now));
- $week_secs = 60 * 60 * 24 * 7;
- $diff = $now - $timestamp;
+ //$day_secs = 60*((int)date('H', $now)*60 + (int)date('i', $now));
+ //$week_secs = 60 * 60 * 24 * 7;
+ //$diff = $now - $timestamp;
+ $today_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday'], $now_date['year']);
+ $week_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']);
// define date format depending on current time
- if ($CONFIG['prettydate'] && !$format && $diff < $day_secs)
+ if ($CONFIG['prettydate'] && !$format && $timestamp > $today_limit)
return sprintf('%s %s', rcube_label('today'), date('H:i', $timestamp));
- else if ($CONFIG['prettydate'] && !$format && $diff < $week_secs)
+ else if ($CONFIG['prettydate'] && !$format && $timestamp > $week_limit)
$format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i';
else if (!$format)
$format = $CONFIG['date_long'] ? $CONFIG['date_long'] : 'd.m.Y H:i';
@@ -941,6 +1486,38 @@
}
+// return the IMAP username of the current session
+function rcmail_current_username($attrib)
+ {
+ global $DB;
+ static $s_username;
+
+ // alread fetched
+ if (!empty($s_username))
+ return $s_username;
+
+ // get e-mail address form default identity
+ $sql_result = $DB->query("SELECT email AS mailto
+ FROM ".get_table_name('identities')."
+ WHERE user_id=?
+ AND standard=1
+ AND del<>1",
+ $_SESSION['user_id']);
+
+ if ($DB->num_rows($sql_result))
+ {
+ $sql_arr = $DB->fetch_assoc($sql_result);
+ $s_username = $sql_arr['mailto'];
+ }
+ else if (strstr($_SESSION['username'], '@'))
+ $s_username = $_SESSION['username'];
+ else
+ $s_username = $_SESSION['username'].'@'.$_SESSION['imap_host'];
+
+ return $s_username;
+ }
+
+
// return code for the webmail login form
function rcmail_login_form($attrib)
{
@@ -956,14 +1533,17 @@
$input_action = new hiddenfield(array('name' => '_action', 'value' => 'login'));
$fields = array();
- $fields['user'] = $input_user->show($_POST['_user']);
+ $fields['user'] = $input_user->show(get_input_value('_user', RCUBE_INPUT_POST));
$fields['pass'] = $input_pass->show();
$fields['action'] = $input_action->show();
if (is_array($CONFIG['default_host']))
{
$select_host = new select(array('name' => '_host'));
- $select_host->add($CONFIG['default_host']);
+
+ foreach ($CONFIG['default_host'] as $key => $value)
+ $select_host->add($value, (is_numeric($key) ? $value : $key));
+
$fields['host'] = $select_host->show($_POST['_host']);
}
else if (!strlen($CONFIG['default_host']))
@@ -1010,4 +1590,64 @@
}
-?>
\ No newline at end of file
+function rcmail_charset_selector($attrib)
+ {
+ global $OUTPUT;
+
+ // pass the following attributes to the form class
+ $field_attrib = array('name' => '_charset');
+ foreach ($attrib as $attr => $value)
+ if (in_array($attr, array('id', 'class', 'style', 'size', 'tabindex')))
+ $field_attrib[$attr] = $value;
+
+ $charsets = array(
+ 'US-ASCII' => 'ASCII (English)',
+ 'EUC-JP' => 'EUC-JP (Japanese)',
+ 'EUC-KR' => 'EUC-KR (Korean)',
+ 'BIG5' => 'BIG5 (Chinese)',
+ 'GB2312' => 'GB2312 (Chinese)',
+ 'ISO-2022-JP' => 'ISO-2022-JP (Japanese)',
+ 'ISO-8859-1' => 'ISO-8859-1 (Latin-1)',
+ 'ISO-8859-2' => 'ISO-8895-2 (Central European)',
+ 'ISO-8859-7' => 'ISO-8859-7 (Greek)',
+ 'ISO-8859-9' => 'ISO-8859-9 (Turkish)',
+ 'Windows-1251' => 'Windows-1251 (Cyrillic)',
+ 'Windows-1252' => 'Windows-1252 (Western)',
+ 'Windows-1255' => 'Windows-1255 (Hebrew)',
+ 'Windows-1256' => 'Windows-1256 (Arabic)',
+ 'Windows-1257' => 'Windows-1257 (Baltic)',
+ 'UTF-8' => 'UTF-8'
+ );
+
+ $select = new select($field_attrib);
+ $select->add(array_values($charsets), array_keys($charsets));
+
+ $set = $_POST['_charset'] ? $_POST['_charset'] : $OUTPUT->get_charset();
+ return $select->show($set);
+ }
+
+
+/****** debugging function ********/
+
+function rcube_timer()
+ {
+ list($usec, $sec) = explode(" ", microtime());
+ return ((float)$usec + (float)$sec);
+ }
+
+
+function rcube_print_time($timer, $label='Timer')
+ {
+ static $print_count = 0;
+
+ $print_count++;
+ $now = rcube_timer();
+ $diff = $now-$timer;
+
+ if (empty($label))
+ $label = 'Timer '.$print_count;
+
+ console(sprintf("%s: %0.4f sec", $label, $diff));
+ }
+
+?>
--
Gitblit v1.9.1