From cde7a9eb74b6fd6315885c30c0763e0ee5332499 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Sun, 17 Apr 2016 12:39:57 -0400 Subject: [PATCH] Bump version to 1.0.9 --- program/include/iniset.php | 74 ++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 38 deletions(-) diff --git a/program/include/iniset.php b/program/include/iniset.php index 3715c21..29f267b 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -5,44 +5,23 @@ | program/include/iniset.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2008-2012, 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. | | 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> | | Thomas Bruederli <roundcube@gmail.com> | +-----------------------------------------------------------------------+ - - $Id$ - */ -// 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). -$crit_opts = array( - 'mbstring.func_overload' => 0, - 'suhosin.session.encrypt' => 0, - 'session.auto_start' => 0, - 'file_uploads' => 1, - 'magic_quotes_runtime' => 0, -); -foreach ($crit_opts as $optname => $optval) { - if ($optval != ini_get($optname)) { - die("ERROR: Wrong '$optname' option value. Read REQUIREMENTS section in INSTALL file or use Roundcube Installer, please!"); - } -} - // application constants -define('RCMAIL_VERSION', '0.9-svn'); -define('RCMAIL_CHARSET', 'UTF-8'); -define('JS_OBJECT_NAME', 'rcmail'); +define('RCMAIL_VERSION', '1.0.9'); define('RCMAIL_START', microtime(true)); if (!defined('INSTALL_PATH')) { @@ -52,6 +31,14 @@ if (!defined('RCMAIL_CONFIG_DIR')) { define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); } + +if (!defined('RCUBE_LOCALIZATION_DIR')) { + define('RCUBE_LOCALIZATION_DIR', INSTALL_PATH . 'program/localization/'); +} + +define('RCUBE_INSTALL_PATH', INSTALL_PATH); +define('RCUBE_CONFIG_DIR', RCMAIL_CONFIG_DIR.'/'); + // RC include folders MUST be included FIRST to avoid other // possible not compatible libraries (i.e PEAR) to be included @@ -63,26 +50,37 @@ die("Fatal error: ini_set/set_include_path does not work."); } -ini_set('error_reporting', E_ALL &~ (E_NOTICE | E_STRICT)); - // increase maximum execution time for php scripts // (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 composer autoloader (if available) +if (@file_exists('vendor/autoload.php')) { + require 'vendor/autoload.php'; } -// include global functions -require_once INSTALL_PATH . 'program/include/rcube_shared.inc'; +// include Roundcube Framework +require_once 'Roundcube/bootstrap.php'; -// 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'); +// register autoloader for rcmail app classes +spl_autoload_register('rcmail_autoload'); // backward compatybility (to be removed) -require_once INSTALL_PATH . 'program/include/main.inc'; +require_once INSTALL_PATH . 'program/include/bc.php'; + + +/** + * PHP5 autoloader routine for dynamic class loading + */ +function rcmail_autoload($classname) +{ + if (strpos($classname, 'rcmail') === 0) { + $filepath = INSTALL_PATH . "program/include/$classname.php"; + if (is_readable($filepath)) { + include_once $filepath; + return true; + } + } + + return false; +} -- Gitblit v1.9.1