From 8447bae77c19a2350bd48b0f0c5b3a56a35c7af9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 28 Jun 2015 06:27:48 -0400
Subject: [PATCH] Require Mbstring and OpenSSL extensions (#1490415) - remove redundant code
---
program/lib/Roundcube/bootstrap.php | 54 ++----------------------------------------------------
1 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 84d3787..2b7682b 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -1,6 +1,6 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| This file is part of the Roundcube PHP suite |
| Copyright (C) 2005-2015, The Roundcube Dev Team |
@@ -16,7 +16,6 @@
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
*/
-
/**
* Roundcube Framework Initialization
@@ -100,7 +99,7 @@
// set PEAR error handling (will also load the PEAR main class)
if (class_exists('PEAR')) {
- PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
+ @PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
}
@@ -123,7 +122,6 @@
return false;
}
-
/**
* Parse a human readable string for a number of bytes.
@@ -159,7 +157,6 @@
return floatval($bytes);
}
-
/**
* Make sure the string ends with a slash
*/
@@ -168,7 +165,6 @@
return unslashify($str).'/';
}
-
/**
* Remove slashes at the end of the string
*/
@@ -176,7 +172,6 @@
{
return preg_replace('/\/+$/', '', $str);
}
-
/**
* Returns number of seconds for a specified offset string.
@@ -210,7 +205,6 @@
return $amount;
}
-
/**
* Create a unix timestamp with a specified offset from now.
*
@@ -223,7 +217,6 @@
{
return time() + get_offset_sec($offset_str) * $factor;
}
-
/**
* Truncate string if it is longer than the allowed length.
@@ -255,7 +248,6 @@
return $str;
}
-
/**
* Get all keys from array (recursive).
*
@@ -279,7 +271,6 @@
return $keys;
}
-
/**
* Remove all non-ascii and non-word chars except ., -, _
*/
@@ -288,7 +279,6 @@
$allowed = 'a-z0-9\_\-' . (!$css_id ? '\.' : '');
return preg_replace("/[^$allowed]/i", $replace_with, $str);
}
-
/**
* Check if a string contains only ascii characters
@@ -303,7 +293,6 @@
$regexp = $control_chars ? '/[^\x00-\x7F]/' : '/[^\x20-\x7E]/';
return preg_match($regexp, $str) ? false : true;
}
-
/**
* Compose a valid representation of name and e-mail address
@@ -329,7 +318,6 @@
return $email;
}
-
/**
* Format e-mail address
*
@@ -352,7 +340,6 @@
return $email;
}
-
/**
* Fix version number so it can be used correctly in version_compare()
*
@@ -366,43 +353,6 @@
array('-stable', '-git'),
array('.0', '.99'),
$version);
-}
-
-
-/**
- * mbstring replacement functions
- */
-if (!extension_loaded('mbstring'))
-{
- 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);
- }
}
/**
--
Gitblit v1.9.1