summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
Diffstat (limited to 'program/include')
-rw-r--r--program/include/main.inc13
-rw-r--r--program/include/rcube_imap.inc16
2 files changed, 24 insertions, 5 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index 99eaa9128..3c078364e 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -71,7 +71,7 @@ function rcmail_startup($task='mail')
// we can use the database for storing session data
// session queries do not work with MDB2
- if ($CONFIG['db_backend']!='mdb2' && is_object($DB) /* && $DB->db_provider!='sqlite' */)
+ if ($CONFIG['db_backend']!='mdb2' && is_object($DB))
include_once('include/session.inc');
@@ -709,10 +709,12 @@ function rcube_charset_convert($str, $from, $to=NULL)
return $str;
// convert charset using iconv module
- if (function_exists('iconv') && $from!='UTF-7' && $to!='UTF-7') {
+ if (0 && 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');
@@ -720,7 +722,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
$str = utf8_encode($str);
else if ($from!='UTF-8')
{
- $conv = new utf8($from);
+ $conv->loadCharset($from);
$str = $conv->strToUtf8($str);
}
@@ -731,7 +733,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
return utf8_decode($str);
else if ($to!='UTF-8')
{
- $conv = new utf8($to);
+ $conv->loadCharset($to);
return $conv->utf8ToStr($str);
}
@@ -960,6 +962,7 @@ function rcube_xml_command($command, $str_attrib, $a_attrib=NULL)
'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',
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index fa13e02cf..cb6b409d9 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -1057,6 +1057,22 @@ class rcube_imap
}
+ /**
+ * Get quota
+ * added by Nuny
+ */
+ function get_quota()
+ {
+ if ($this->get_capability('QUOTA'))
+ {
+ $result = iil_C_GetQuota($this->conn);
+ return sprintf("%.2fMB / %.2fMB (%.0f%%)", $result["used"] / 1000.0, $result["total"] / 1000.0, $result["percent"]);
+ }
+ else
+ return 'unknown';
+ }
+
+
// subscribe to a specific mailbox(es)
function subscribe($mbox, $mode='subscribe')
{