From be9aacaa5296dfca63fb3a01c2dc52538d1546aa Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 17 Nov 2012 12:31:31 -0500
Subject: [PATCH] Bring back lost localization for the about page
---
program/include/rcube_config.php | 114 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 37 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 46906dd..7d206ff 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -17,18 +17,18 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
/**
* Configuration class for Roundcube
*
- * @package Core
+ * @package Framework
+ * @subpackage Core
*/
class rcube_config
{
+ const DEFAULT_SKIN = 'larry';
+
private $prop = array();
private $errors = array();
private $userprefs = array();
@@ -43,6 +43,9 @@
'default_folders' => 'default_imap_folders',
'mail_pagesize' => 'pagesize',
'addressbook_pagesize' => 'pagesize',
+ 'reply_mode' => 'top_posting',
+ 'refresh_interval' => 'keep_alive',
+ 'min_refresh_interval' => 'min_keep_alive',
);
@@ -52,6 +55,11 @@
public function __construct()
{
$this->load();
+
+ // Defaults, that we do not require you to configure,
+ // but contain information that is used in various
+ // locations in the code:
+ $this->set('contactlist_fields', array('name', 'firstname', 'surname', 'email'));
}
@@ -74,10 +82,18 @@
$this->load_host_config();
// set skin (with fallback to old 'skin_path' property)
- if (empty($this->prop['skin']) && !empty($this->prop['skin_path']))
- $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
- else if (empty($this->prop['skin']))
- $this->prop['skin'] = 'default';
+ if (empty($this->prop['skin'])) {
+ if (!empty($this->prop['skin_path'])) {
+ $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
+ }
+ else {
+ $this->prop['skin'] = self::DEFAULT_SKIN;
+ }
+ }
+
+ // larry is the new default skin :-)
+ if ($this->prop['skin'] == 'default')
+ $this->prop['skin'] = self::DEFAULT_SKIN;
// fix paths
$this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
@@ -85,11 +101,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) {
@@ -110,8 +126,11 @@
if ($this->prop['timezone'] == 'auto') {
$this->prop['_timezone_value'] = $this->client_timezone();
}
- else if (is_numeric($this->prop['timezone'])) {
- $this->prop['timezone'] = timezone_name_from_abbr("", $this->prop['timezone'] * 3600, 0);
+ else if (is_numeric($this->prop['timezone']) && ($tz = timezone_name_from_abbr("", $this->prop['timezone'] * 3600, 0))) {
+ $this->prop['timezone'] = $tz;
+ }
+ else if (empty($this->prop['timezone'])) {
+ $this->prop['timezone'] = 'UTC';
}
// remove deprecated properties
@@ -186,19 +205,22 @@
$result = $def;
}
- $rcmail = rcmail::get_instance();
+ $rcube = rcube::get_instance();
- if ($name == 'timezone' && isset($this->prop['_timezone_value']))
+ if ($name == 'timezone' && isset($this->prop['_timezone_value'])) {
$result = $this->prop['_timezone_value'];
-
- if (is_object($rcmail->plugins)) {
- $plugin = $rcmail->plugins->exec_hook('config_get', array(
- 'name' => $name, 'default' => $def, 'result' => $result));
-
- return $plugin['result'];
+ }
+ else if ($name == 'client_mimetypes') {
+ if ($result == null && $def == null)
+ $result = 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,image/bmp,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash';
+ if ($result && is_string($result))
+ $result = explode(',', $result);
}
- return $result;
+ $plugin = $rcube->plugins->exec_hook('config_get', array(
+ 'name' => $name, 'default' => $def, 'result' => $result));
+
+ return $plugin['result'];
}
@@ -236,16 +258,19 @@
// Honor the dont_override setting for any existing user preferences
$dont_override = $this->get('dont_override');
if (is_array($dont_override) && !empty($dont_override)) {
- foreach ($prefs as $key => $pref) {
- if (in_array($key, $dont_override)) {
- unset($prefs[$key]);
- }
+ foreach ($dont_override as $key) {
+ unset($prefs[$key]);
}
}
// convert user's timezone into the new format
- if (is_numeric($prefs['timezone'])) {
- $prefs['timezone'] = timezone_name_from_abbr('', $prefs['timezone'] * 3600, 0);
+ if (is_numeric($prefs['timezone']) && ($tz = timezone_name_from_abbr('', $prefs['timezone'] * 3600, 0))) {
+ $prefs['timezone'] = $tz;
+ }
+
+ // larry is the new default skin :-)
+ if ($prefs['skin'] == 'default') {
+ $prefs['skin'] = self::DEFAULT_SKIN;
}
$this->userprefs = $prefs;
@@ -300,7 +325,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,9 +336,9 @@
// 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__,
+ 'file' => __FILE__, 'line' => __LINE__,
'message' => "Configured crypto key '$key' is not exactly 24 bytes long"
), true, true);
}
@@ -335,9 +360,9 @@
if ($delim == "\n" || $delim == "\r\n")
return $delim;
else
- raise_error(array(
+ rcube::raise_error(array(
'code' => 500, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
+ 'file' => __FILE__, 'line' => __LINE__,
'message' => "Invalid mail_header_delimiter setting"
), true, false);
}
@@ -369,11 +394,13 @@
if (isset($this->prop['mail_domain'][$host]))
$domain = $this->prop['mail_domain'][$host];
}
- else if (!empty($this->prop['mail_domain']))
- $domain = rcube_parse_host($this->prop['mail_domain']);
+ else if (!empty($this->prop['mail_domain'])) {
+ $domain = rcube_utils::parse_host($this->prop['mail_domain']);
+ }
- if ($encode)
- $domain = rcube_idn_to_ascii($domain);
+ if ($encode) {
+ $domain = rcube_utils::idn_to_ascii($domain);
+ }
return $domain;
}
@@ -395,7 +422,20 @@
*/
private function client_timezone()
{
- return isset($_SESSION['timezone']) ? timezone_name_from_abbr("", $_SESSION['timezone'] * 3600, 0) : date_default_timezone_get();
+ if (isset($_SESSION['timezone']) && is_numeric($_SESSION['timezone'])
+ && ($ctz = timezone_name_from_abbr("", $_SESSION['timezone'] * 3600, 0))) {
+ return $ctz;
+ }
+ else if (!empty($_SESSION['timezone'])) {
+ try {
+ $tz = timezone_open($_SESSION['timezone']);
+ return $tz->getName();
+ }
+ catch (Exception $e) { /* gracefully ignore */ }
+ }
+
+ // fallback to server's timezone
+ return date_default_timezone_get();
}
}
--
Gitblit v1.9.1