From ed1d212ae2daea5e4bd043417610177093e99f19 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 16 Jan 2016 03:03:51 -0500
Subject: [PATCH] Improved SVG cleanup code
---
program/lib/Roundcube/rcube_config.php | 147 ++++++++++++++++++++++++-------------------------
1 files changed, 72 insertions(+), 75 deletions(-)
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index 9de192d..a58af37 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -1,9 +1,9 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2013, The Roundcube Dev Team |
+ | Copyright (C) 2008-2014, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -26,11 +26,12 @@
{
const DEFAULT_SKIN = 'larry';
- private $env = '';
- private $paths = array();
- private $prop = array();
- private $errors = array();
+ private $env = '';
+ private $paths = array();
+ private $prop = array();
+ private $errors = array();
private $userprefs = array();
+
/**
* Renamed options
@@ -47,7 +48,6 @@
'messages_cache_ttl' => 'message_cache_lifetime',
'redundant_attachments_cache_ttl' => 'redundant_attachments_memcache_ttl',
);
-
/**
* Object constructor
@@ -92,7 +92,6 @@
$this->set('contactlist_fields', array('name', 'firstname', 'surname', 'email'));
}
-
/**
* @brief Guess the type the string may fit into.
*
@@ -104,23 +103,22 @@
*/
private function guess_type($value)
{
- $_ = 'string';
+ $type = 'string';
// array requires hint to be passed.
if (preg_match('/^[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?$/', $value) !== false) {
- $_ = 'double';
+ $type = 'double';
}
else if (preg_match('/^\d+$/', $value) !== false) {
- $_ = 'integer';
+ $type = 'integer';
}
else if (preg_match('/(t(rue)?)|(f(alse)?)/i', $value) !== false) {
- $_ = 'boolean';
+ $type = 'boolean';
}
- return $_;
+ return $type;
}
-
/**
* @brief Parse environment variable into PHP type.
@@ -128,7 +126,7 @@
* Perform an appropriate parsing of the string to create the desired PHP type.
*
* @param $string String to parse into PHP type
- * @param $type Type of value to return
+ * @param $type Type of value to return
*
* @return Appropriately typed interpretation of $string.
*/
@@ -159,10 +157,9 @@
default:
$_ = $this->parse_env($_, $this->guess_type($_));
}
-
+
return $_;
}
-
/**
* @brief Get environment variable value.
@@ -170,29 +167,25 @@
* Retrieve an environment variable's value or if it's not found, return the
* provided default value.
*
- * @param $varname Environment variable name
+ * @param $varname Environment variable name
* @param $default_value Default value to return if necessary
- * @param $type Type of value to return
+ * @param $type Type of value to return
*
* @return Value of the environment variable or default if not found.
*/
private function getenv_default($varname, $default_value, $type = null)
{
- $_ = getenv($varname);
-
- if ($_ === false) {
- $_ = $default_value;
+ $value = getenv($varname);
+
+ if ($value === false) {
+ $value = $default_value;
}
else {
- if (is_null($type)) {
- $type = gettype($default_value);
- }
- $_ = $this->parse_env($_, $type);
+ $value = $this->parse_env($value, $type ?: gettype($default_value));
}
-
- return $_;
- }
+ return $value;
+ }
/**
* Load config from local config file
@@ -209,8 +202,7 @@
// load main config file
if (!$this->load_from_file('config.inc.php')) {
// Old configuration files
- if (!$this->load_from_file('main.inc.php') ||
- !$this->load_from_file('db.inc.php')) {
+ if (!$this->load_from_file('main.inc.php') || !$this->load_from_file('db.inc.php')) {
$this->errors[] = 'config.inc.php was not found.';
}
else if (rand(1,100) == 10) { // log warning on every 100th request (average)
@@ -232,16 +224,24 @@
}
// larry is the new default skin :-)
- if ($this->prop['skin'] == 'default')
+ 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'])) : RCUBE_INSTALL_PATH . 'logs';
- $this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : RCUBE_INSTALL_PATH . 'temp';
+ foreach (array('log_dir' => 'logs', 'temp_dir' => 'temp') as $key => $dir) {
+ foreach (array($this->prop[$key], '../' . $this->prop[$key], RCUBE_INSTALL_PATH . $dir) as $path) {
+ if ($path && ($realpath = realpath(unslashify($path)))) {
+ $this->prop[$key] = $realpath;
+ break;
+ }
+ }
+ }
// fix default imap folders encoding
- foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
+ foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder) {
$this->prop[$folder] = rcube_charset::convert($this->prop[$folder], RCUBE_CHARSET, 'UTF7-IMAP');
+ }
// set PHP error logging according to config
if ($this->prop['debug_level'] & 1) {
@@ -309,7 +309,7 @@
foreach ($this->resolve_paths($file) as $fpath) {
if ($fpath && is_file($fpath) && is_readable($fpath)) {
- // use output buffering, we don't need any output here
+ // use output buffering, we don't need any output here
ob_start();
include($fpath);
ob_end_clean();
@@ -348,8 +348,9 @@
// check if <file>-env.ini exists
if ($realpath && $use_env && !empty($this->env)) {
$envfile = preg_replace('/\.(inc.php)$/', '-' . $this->env . '.\\1', $realpath);
- if (is_file($envfile))
+ if (is_file($envfile)) {
$realpath = $envfile;
+ }
}
if ($realpath) {
@@ -382,8 +383,7 @@
}
$result = $this->getenv_default('ROUNDCUBE_' . strtoupper($name), $result);
-
- $rcube = rcube::get_instance();
+ $rcube = rcube::get_instance();
if ($name == 'timezone') {
if (empty($result) || $result == 'auto') {
@@ -391,10 +391,12 @@
}
}
else if ($name == 'client_mimetypes') {
- if ($result == null && $def == null)
+ if (!$result && !$def) {
$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))
+ }
+ if ($result && is_string($result)) {
$result = explode(',', $result);
+ }
}
$plugin = $rcube->plugins->exec_hook('config_get', array(
@@ -402,7 +404,6 @@
return $plugin['result'];
}
-
/**
* Setter for a config parameter
@@ -415,7 +416,6 @@
$this->prop[$name] = $value;
}
-
/**
* Override config options with the given values (eg. user prefs)
*
@@ -426,7 +426,6 @@
$prefs = $this->fix_legacy_props($prefs);
$this->prop = array_merge($this->prop, $prefs, $this->userprefs);
}
-
/**
* Merge the given prefs over the current config
@@ -455,7 +454,6 @@
$this->prop = array_merge($this->prop, $prefs);
}
-
/**
* Getter for all config options
*
@@ -465,8 +463,9 @@
{
$props = $this->prop;
- foreach ($props as $prop_name => $prop_value)
+ foreach ($props as $prop_name => $prop_value) {
$props[$prop_name] = $this->getenv_default('ROUNDCUBE_' . strtoupper($prop_name), $prop_value);
+ }
$rcube = rcube::get_instance();
$plugin = $rcube->plugins->exec_hook('config_get', array(
@@ -483,28 +482,29 @@
*/
public function get_timezone()
{
- if ($tz = $this->get('timezone')) {
- try {
- $tz = new DateTimeZone($tz);
- return $tz->getOffset(new DateTime('now')) / 3600;
+ if ($tz = $this->get('timezone')) {
+ try {
+ $tz = new DateTimeZone($tz);
+ return $tz->getOffset(new DateTime('now')) / 3600;
+ }
+ catch (Exception $e) {
+ }
}
- catch (Exception $e) {
- }
- }
- return 0;
+ return 0;
}
/**
* Return requested DES crypto key.
*
* @param string $key Crypto key name
+ *
* @return string Crypto key
*/
public function get_crypto_key($key)
{
// Bomb out if the requested key does not exist
- if (!array_key_exists($key, $this->prop)) {
+ if (!array_key_exists($key, $this->prop) || empty($this->prop[$key])) {
rcube::raise_error(array(
'code' => 500, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
@@ -512,20 +512,18 @@
), true, true);
}
- $key = $this->prop[$key];
-
- // Bomb out if the configured key is not exactly 24 bytes long
- if (strlen($key) != 24) {
- rcube::raise_error(array(
- 'code' => 500, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Configured crypto key '$key' is not exactly 24 bytes long"
- ), true, true);
- }
-
- return $key;
+ return $this->prop[$key];
}
+ /**
+ * Return configured crypto method.
+ *
+ * @return string Crypto method
+ */
+ public function get_crypto_method()
+ {
+ return $this->get('cipher_method') ?: 'DES-EDE3-CBC';
+ }
/**
* Try to autodetect operating system and find the correct line endings
@@ -537,14 +535,16 @@
// use the configured delimiter for headers
if (!empty($this->prop['mail_header_delimiter'])) {
$delim = $this->prop['mail_header_delimiter'];
- if ($delim == "\n" || $delim == "\r\n")
+ if ($delim == "\n" || $delim == "\r\n") {
return $delim;
- else
+ }
+ else {
rcube::raise_error(array(
'code' => 500, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Invalid mail_header_delimiter setting"
), true, false);
+ }
}
$php_os = strtolower(substr(PHP_OS, 0, 3));
@@ -558,7 +558,6 @@
return "\n";
}
-
/**
* Return the mail domain configured for the given host
*
@@ -571,8 +570,9 @@
$domain = $host;
if (is_array($this->prop['mail_domain'])) {
- if (isset($this->prop['mail_domain'][$host]))
+ if (isset($this->prop['mail_domain'][$host])) {
$domain = $this->prop['mail_domain'][$host];
+ }
}
else if (!empty($this->prop['mail_domain'])) {
$domain = rcube_utils::parse_host($this->prop['mail_domain']);
@@ -585,7 +585,6 @@
return $domain;
}
-
/**
* Getter for error state
*
@@ -595,7 +594,6 @@
{
return empty($this->errors) ? false : join("\n", $this->errors);
}
-
/**
* Internal getter for client's (browser) timezone identifier
@@ -684,7 +682,6 @@
'180' => "Europe/Moscow",
'210' => "Asia/Tehran",
'240' => "Asia/Dubai",
- '300' => "Asia/Karachi",
'270' => "Asia/Kabul",
'300' => "Asia/Karachi",
'330' => "Asia/Kolkata",
--
Gitblit v1.9.1