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/bootstrap.php | 224 +++++++++++++++++++++++++-------------------------------
1 files changed, 100 insertions(+), 124 deletions(-)
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 018701d..94e628b 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -1,11 +1,9 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
- | program/include/bootstrap.php |
- | |
| This file is part of the Roundcube PHP suite |
- | Copyright (C) 2005-2012, The Roundcube Dev Team |
+ | Copyright (C) 2005-2015, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -13,13 +11,11 @@
| |
| CONTENTS: |
| Roundcube Framework Initialization |
- | |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
*/
-
/**
* Roundcube Framework Initialization
@@ -29,31 +25,41 @@
*/
$config = array(
- 'error_reporting' => E_ALL &~ (E_NOTICE | E_STRICT),
+ 'error_reporting' => E_ALL & ~E_NOTICE & ~E_STRICT,
// Some users are not using Installer, so we'll check some
// critical PHP settings here. Only these, which doesn't provide
// an error/warning in the logs later. See (#1486307).
'mbstring.func_overload' => 0,
- 'suhosin.session.encrypt' => 0,
- 'session.auto_start' => 0,
- 'file_uploads' => 1,
- 'magic_quotes_runtime' => 0,
- 'magic_quotes_sybase' => 0, // #1488506
+ 'magic_quotes_runtime' => false,
+ 'magic_quotes_sybase' => false, // #1488506
);
+
+// check these additional ini settings if not called via CLI
+if (php_sapi_name() != 'cli') {
+ $config += array(
+ 'suhosin.session.encrypt' => false,
+ 'file_uploads' => true,
+ );
+}
+
foreach ($config as $optname => $optval) {
- if ($optval != ini_get($optname) && @ini_set($optname, $optval) === false) {
- die("ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n"
- ."Check your PHP configuration (including php_admin_flag).");
+ $ini_optval = filter_var(ini_get($optname), is_bool($optval) ? FILTER_VALIDATE_BOOLEAN : FILTER_VALIDATE_INT);
+ if ($optval != $ini_optval && @ini_set($optname, $optval) === false) {
+ $optval = !is_bool($optval) ? $optval : ($optval ? 'On' : 'Off');
+ $error = "ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n"
+ . "Check your PHP configuration (including php_admin_flag).";
+
+ if (defined('STDERR')) fwrite(STDERR, $error); else echo $error;
+ exit(1);
}
}
-// application constants
-define('RCMAIL_VERSION', '0.9-git');
-define('RCMAIL_CHARSET', 'UTF-8');
-define('RCMAIL_START', microtime(true));
+// framework constants
+define('RCUBE_VERSION', '1.2-git');
+define('RCUBE_CHARSET', 'UTF-8');
if (!defined('RCUBE_LIB_DIR')) {
- define('RCUBE_LIB_DIR', dirname(__FILE__).'/');
+ define('RCUBE_LIB_DIR', __DIR__ . '/');
}
if (!defined('RCUBE_INSTALL_PATH')) {
@@ -61,7 +67,7 @@
}
if (!defined('RCUBE_CONFIG_DIR')) {
- define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config');
+ define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config/');
}
if (!defined('RCUBE_PLUGINS_DIR')) {
@@ -73,44 +79,66 @@
}
// set internal encoding for mbstring extension
-if (extension_loaded('mbstring')) {
- mb_internal_encoding(RCMAIL_CHARSET);
- @mb_regex_encoding(RCMAIL_CHARSET);
+if (function_exists('mb_internal_encoding')) {
+ mb_internal_encoding(RCUBE_CHARSET);
+}
+if (function_exists('mb_regex_encoding')) {
+ mb_regex_encoding(RCUBE_CHARSET);
+}
+
+// make sure the Roundcube lib directory is in the include_path
+$rcube_path = realpath(RCUBE_LIB_DIR . '..');
+$sep = PATH_SEPARATOR;
+$regexp = "!(^|$sep)" . preg_quote($rcube_path, '!') . "($sep|\$)!";
+$path = ini_get('include_path');
+
+if (!preg_match($regexp, $path)) {
+ set_include_path($path . PATH_SEPARATOR . $rcube_path);
}
// Register autoloader
spl_autoload_register('rcube_autoload');
// set PEAR error handling (will also load the PEAR main class)
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
-
+if (class_exists('PEAR')) {
+ @PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
+}
/**
- * Similar function as in_array() but case-insensitive
+ * Similar function as in_array() but case-insensitive with multibyte support.
*
- * @param string $needle Needle value
- * @param array $heystack Array to search in
+ * @param string $needle Needle value
+ * @param array $heystack Array to search in
*
* @return boolean True if found, False if not
*/
function in_array_nocase($needle, $haystack)
{
- $needle = mb_strtolower($needle);
- foreach ((array)$haystack as $value) {
- if ($needle === mb_strtolower($value)) {
- return true;
+ // use much faster method for ascii
+ if (is_ascii($needle)) {
+ foreach ((array) $haystack as $value) {
+ if (strcasecmp($value, $needle) === 0) {
+ return true;
+ }
+ }
+ }
+ else {
+ $needle = mb_strtolower($needle);
+ foreach ((array) $haystack as $value) {
+ if ($needle === mb_strtolower($value)) {
+ return true;
+ }
}
}
return false;
}
-
/**
* Parse a human readable string for a number of bytes.
*
- * @param string $str Input string
+ * @param string $str Input string
*
* @return float Number of bytes
*/
@@ -141,7 +169,6 @@
return floatval($bytes);
}
-
/**
* Make sure the string ends with a slash
*/
@@ -149,7 +176,6 @@
{
return unslashify($str).'/';
}
-
/**
* Remove slashes at the end of the string
@@ -159,11 +185,10 @@
return preg_replace('/\/+$/', '', $str);
}
-
/**
* Returns number of seconds for a specified offset string.
*
- * @param string $str String representation of the offset (e.g. 20min, 5h, 2days, 1week)
+ * @param string $str String representation of the offset (e.g. 20min, 5h, 2days, 1week)
*
* @return int Number of seconds
*/
@@ -192,20 +217,18 @@
return $amount;
}
-
/**
* Create a unix timestamp with a specified offset from now.
*
- * @param string $offset_str String representation of the offset (e.g. 20min, 5h, 2days)
- * @param int $factor Factor to multiply with the offset
+ * @param string $offset_str String representation of the offset (e.g. 20min, 5h, 2days)
+ * @param int $factor Factor to multiply with the offset
*
* @return int Unix timestamp
*/
-function get_offset_time($offset_str, $factor=1)
+function get_offset_time($offset_str, $factor = 1)
{
return time() + get_offset_sec($offset_str) * $factor;
}
-
/**
* Truncate string if it is longer than the allowed length.
@@ -218,7 +241,7 @@
*
* @return string Abbreviated string
*/
-function abbreviate_string($str, $maxlength, $placeholder='...', $ending=false)
+function abbreviate_string($str, $maxlength, $placeholder = '...', $ending = false)
{
$length = mb_strlen($str);
@@ -231,17 +254,18 @@
$first_part_length = floor(($maxlength - $placeholder_length)/2);
$second_starting_location = $length - $maxlength + $first_part_length + $placeholder_length;
- $str = mb_substr($str, 0, $first_part_length) . $placeholder . mb_substr($str, $second_starting_location);
+ $prefix = mb_substr($str, 0, $first_part_length);
+ $suffix = mb_substr($str, $second_starting_location);
+ $str = $prefix . $placeholder . $suffix;
}
return $str;
}
-
/**
* Get all keys from array (recursive).
*
- * @param array $array Input array
+ * @param array $array Input array
*
* @return array List of array keys
*/
@@ -261,7 +285,6 @@
return $keys;
}
-
/**
* Remove all non-ascii and non-word chars except ., -, _
*/
@@ -270,7 +293,6 @@
$allowed = 'a-z0-9\_\-' . (!$css_id ? '\.' : '');
return preg_replace("/[^$allowed]/i", $replace_with, $str);
}
-
/**
* Check if a string contains only ascii characters
@@ -286,38 +308,11 @@
return preg_match($regexp, $str) ? false : true;
}
-
-/**
- * Remove single and double quotes from a given string
- *
- * @param string Input value
- *
- * @return string Dequoted string
- */
-function strip_quotes($str)
-{
- return str_replace(array("'", '"'), '', $str);
-}
-
-
-/**
- * Remove new lines characters from given string
- *
- * @param string $str Input value
- *
- * @return string Stripped string
- */
-function strip_newlines($str)
-{
- return preg_replace('/[\r\n]/', '', $str);
-}
-
-
/**
* Compose a valid representation of name and e-mail address
*
- * @param string $email E-mail address
- * @param string $name Person name
+ * @param string $email E-mail address
+ * @param string $name Person name
*
* @return string Formatted string
*/
@@ -336,7 +331,6 @@
return $email;
}
-
/**
* Format e-mail address
@@ -360,41 +354,20 @@
return $email;
}
-
/**
- * mbstring replacement functions
+ * Fix version number so it can be used correctly in version_compare()
+ *
+ * @param string $version Version number string
+ *
+ * @param return Version number string
*/
-if (!extension_loaded('mbstring'))
+function version_parse($version)
{
- function mb_strlen($str)
- {
- return strlen($str);
- }
-
- function mb_strtolower($str)
- {
- return strtolower($str);
- }
-
- function mb_strtoupper($str)
- {
- return strtoupper($str);
- }
-
- function mb_substr($str, $start, $len=null)
- {
- return substr($str, $start, $len);
- }
-
- function mb_strpos($haystack, $needle, $offset=0)
- {
- return strpos($haystack, $needle, $offset);
- }
-
- function mb_strrpos($haystack, $needle, $offset=0)
- {
- return strrpos($haystack, $needle, $offset);
- }
+ return str_replace(
+ array('-stable', '-git'),
+ array('.0', '.99'),
+ $version
+ );
}
/**
@@ -403,12 +376,12 @@
if (!function_exists('idn_to_utf8'))
{
- function idn_to_utf8($domain, $flags=null)
+ function idn_to_utf8($domain)
{
static $idn, $loaded;
if (!$loaded) {
- $idn = new Net_IDNA2();
+ $idn = new Net_IDNA2();
$loaded = true;
}
@@ -419,18 +392,19 @@
catch (Exception $e) {
}
}
+
return $domain;
}
}
if (!function_exists('idn_to_ascii'))
{
- function idn_to_ascii($domain, $flags=null)
+ function idn_to_ascii($domain)
{
static $idn, $loaded;
if (!$loaded) {
- $idn = new Net_IDNA2();
+ $idn = new Net_IDNA2();
$loaded = true;
}
@@ -441,6 +415,7 @@
catch (Exception $e) {
}
}
+
return $domain;
}
}
@@ -459,16 +434,14 @@
'/Net_(.+)/',
'/Auth_(.+)/',
'/^html_.+/',
- '/^rcube(.*)/',
- '/^utf8$/',
+ '/^rcube(.*)/'
),
array(
'Mail/\\1',
'Net/\\1',
'Auth/\\1',
'Roundcube/html',
- 'Roundcube/rcube\\1',
- 'utf8.class',
+ 'Roundcube/rcube\\1'
),
$classname
);
@@ -487,8 +460,11 @@
*/
function rcube_pear_error($err)
{
- error_log(sprintf("%s (%s): %s",
- $err->getMessage(),
- $err->getCode(),
- $err->getUserinfo()), 0);
+ $msg = sprintf("ERROR: %s (%s)", $err->getMessage(), $err->getCode());
+
+ if ($info = $err->getUserinfo()) {
+ $msg .= ': ' . $info;
+ }
+
+ error_log($msg, 0);
}
--
Gitblit v1.9.1