From 0c259682f65eaaf23ea4ccb56a706d6baf3007e4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 13 Apr 2012 04:52:02 -0400
Subject: [PATCH] - Merge devel-framework branch, resolved conflicts
---
program/include/rcube_config.php | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 46906dd..e14dcb8 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -85,11 +85,11 @@
// fix default imap folders encoding
foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
- $this->prop[$folder] = rcube_charset_convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF7-IMAP');
+ $this->prop[$folder] = rcube_charset::convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF7-IMAP');
if (!empty($this->prop['default_folders']))
foreach ($this->prop['default_folders'] as $n => $folder)
- $this->prop['default_folders'][$n] = rcube_charset_convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
+ $this->prop['default_folders'][$n] = rcube_charset::convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
// set PHP error logging according to config
if ($this->prop['debug_level'] & 1) {
@@ -186,7 +186,7 @@
$result = $def;
}
- $rcmail = rcmail::get_instance();
+ $rcmail = rcube::get_instance();
if ($name == 'timezone' && isset($this->prop['_timezone_value']))
$result = $this->prop['_timezone_value'];
@@ -300,7 +300,7 @@
{
// Bomb out if the requested key does not exist
if (!array_key_exists($key, $this->prop)) {
- raise_error(array(
+ rcube::raise_error(array(
'code' => 500, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Request for unconfigured crypto key \"$key\""
@@ -311,7 +311,7 @@
// Bomb out if the configured key is not exactly 24 bytes long
if (strlen($key) != 24) {
- raise_error(array(
+ rcube::raise_error(array(
'code' => 500, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Configured crypto key '$key' is not exactly 24 bytes long"
@@ -335,7 +335,7 @@
if ($delim == "\n" || $delim == "\r\n")
return $delim;
else
- raise_error(array(
+ rcube::raise_error(array(
'code' => 500, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Invalid mail_header_delimiter setting"
@@ -370,7 +370,7 @@
$domain = $this->prop['mail_domain'][$host];
}
else if (!empty($this->prop['mail_domain']))
- $domain = rcube_parse_host($this->prop['mail_domain']);
+ $domain = rcmail::parse_host($this->prop['mail_domain']);
if ($encode)
$domain = rcube_idn_to_ascii($domain);
--
Gitblit v1.9.1