Create Roundcube Framework initialization script (bootstrap)

1 files changed, 4 insertions, 26 deletions

diff --git a/program/include/iniset.php b/program/include/iniset.php
index 82278c9f8..d01376bb1 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -12,7 +12,7 @@
  | See the README file for a full license statement.                     |
  |                                                                       |
  | PURPOSE:                                                              |
- |   Setup the application envoronment required to process               |
+ |   Setup the application environment required to process               |
  |   any request.                                                        |
  +-----------------------------------------------------------------------+
  | Author: Till Klampaeckel <till@php.net>                               |
@@ -21,30 +21,20 @@
 */
 
 $config = array(
-    '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
 );
 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).\n"
-            ."Read REQUIREMENTS section in INSTALL file or use Roundcube Installer!");
+            ."Check your PHP configuration (including php_admin_flag).");
     }
 }
 
-// application constants
-define('RCMAIL_VERSION', '0.9-git');
-define('RCMAIL_CHARSET', 'UTF-8');
-define('RCMAIL_START', microtime(true));
-
 if (!defined('INSTALL_PATH')) {
     define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
 }
@@ -67,20 +57,8 @@ if (set_include_path($include_path) === false) {
 // (does not work in safe mode)
 @set_time_limit(120);
 
-// set internal encoding for mbstring extension
-if (extension_loaded('mbstring')) {
-    mb_internal_encoding(RCMAIL_CHARSET);
-    @mb_regex_encoding(RCMAIL_CHARSET);
-}
-
-// include global functions
-require_once INSTALL_PATH . 'program/include/rcube_shared.inc';
-
-// 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');
+// include Roundcube Framework
+require_once INSTALL_PATH . 'program/include/bootstrap.php';
 
 // backward compatybility (to be removed)
 require_once INSTALL_PATH . 'program/include/rcube_bc.inc';