From fda695f29732f5e5bcaa55e7e7abd090d2359927 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 01 Sep 2006 13:14:51 -0400
Subject: [PATCH] Finalized quota image
---
program/include/main.inc | 88 +++++++++++++++++++-------------------------
1 files changed, 38 insertions(+), 50 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index c52b671..9214948 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -377,38 +377,14 @@
// set localization charset based on the given language
function rcmail_set_locale($lang)
{
- global $OUTPUT, $MBSTRING, $MBSTRING_ENCODING;
+ global $OUTPUT, $MBSTRING;
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
- }
+ if (is_null($s_mbstring_loaded))
+ $MBSTRING = $s_mbstring_loaded = extension_loaded("mbstring");
+ else
+ $MBSTRING = $s_mbstring_loaded = FALSE;
$OUTPUT->set_charset(rcube_language_prop($lang, 'charset'));
}
@@ -439,12 +415,12 @@
Inspired by Marco <P0L0_notspam_binware.org>
*/
// Check if we need to add domain
- if ($CONFIG['username_domain'] && !strstr($user, '@'))
+ if (!empty($CONFIG['username_domain']) && !strstr($user, '@'))
{
if (is_array($CONFIG['username_domain']) && isset($CONFIG['username_domain'][$host]))
$user .= '@'.$CONFIG['username_domain'][$host];
- else if (!empty($CONFIG['username_domain']))
- $user .= '@'.$CONFIG['username_domain'];
+ else if (is_string($CONFIG['username_domain']))
+ $user .= '@'.$CONFIG['username_domain'];
}
@@ -490,7 +466,7 @@
// update user's record
$DB->query("UPDATE ".get_table_name('users')."
- SET last_login=now()
+ SET last_login=".$DB->now()."
WHERE user_id=?",
$user_id);
}
@@ -535,7 +511,7 @@
$DB->query("INSERT INTO ".get_table_name('users')."
(created, last_login, username, mail_host, alias, language)
- VALUES (now(), now(), ?, ?, ?, ?)",
+ VALUES (".$DB->now().", ".$DB->now().", ?, ?, ?, ?)",
$user,
$host,
$user_email,
@@ -543,14 +519,7 @@
if ($user_id = $DB->insert_id(get_sequence_name('users')))
{
- $mail_domain = $host;
- if (is_array($CONFIG['mail_domain']))
- {
- if (isset($CONFIG['mail_domain'][$host]))
- $mail_domain = $CONFIG['mail_domain'][$host];
- }
- else if (!empty($CONFIG['mail_domain']))
- $mail_domain = $CONFIG['mail_domain'];
+ $mail_domain = rcmail_mail_domain($host);
if ($user_email=='')
$user_email = strstr($user, '@') ? $user : sprintf('%s@%s', $user, $mail_domain);
@@ -868,22 +837,23 @@
// this function is not complete and not tested well
function rcube_charset_convert($str, $from, $to=NULL)
{
- global $MBSTRING, $MBSTRING_ENCODING;
+ global $MBSTRING;
$from = strtoupper($from);
$to = $to==NULL ? strtoupper($GLOBALS['CHARSET']) : strtoupper($to);
- if ($from==$to)
+ if ($from==$to || $str=='')
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);
+
+ // return if convert succeeded
+ if (($out = mb_convert_encoding($str, $to, $from)) != '')
+ return $out;
}
// convert charset using iconv module
@@ -944,7 +914,6 @@
{
$html_encode_arr = get_html_translation_table(HTML_SPECIALCHARS);
unset($html_encode_arr['?']);
- unset($html_encode_arr['&']);
}
$ltpos = strpos($str, '<');
@@ -956,6 +925,7 @@
unset($encode_arr['"']);
unset($encode_arr['<']);
unset($encode_arr['>']);
+ unset($encode_arr['&']);
}
else if ($mode=='remove')
$str = strip_tags($str);
@@ -1669,6 +1639,24 @@
}
+// return the mail domain configured for the given host
+function rcmail_mail_domain($host)
+ {
+ global $CONFIG;
+
+ $domain = $host;
+ if (is_array($CONFIG['mail_domain']))
+ {
+ if (isset($CONFIG['mail_domain'][$host]))
+ $domain = $CONFIG['mail_domain'][$host];
+ }
+ else if (!empty($CONFIG['mail_domain']))
+ $domain = $CONFIG['mail_domain'];
+
+ return $domain;
+ }
+
+
// return code for the webmail login form
function rcmail_login_form($attrib)
{
@@ -1788,7 +1776,7 @@
*/
function console($msg)
{
- if (is_string($msg))
+ if (!is_string($msg))
$msg = var_export($msg, true);
if (!($GLOBALS['CONFIG']['debug_level'] & 4))
--
Gitblit v1.9.1