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 | 45 ++++++++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 19 deletions(-) diff --git a/program/include/iniset.php b/program/include/iniset.php index 25ae018..29f267b 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -5,7 +5,7 @@ | 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. | @@ -21,23 +21,8 @@ */ // application constants -define('RCMAIL_VERSION', '0.9-git'); +define('RCMAIL_VERSION', '1.0.9'); define('RCMAIL_START', microtime(true)); - -$config = array( - // 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). - 'suhosin.session.encrypt' => 0, - 'session.auto_start' => 0, - 'file_uploads' => 1, -); -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)."); - } -} if (!defined('INSTALL_PATH')) { define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/'); @@ -69,11 +54,33 @@ // (does not work in safe mode) @set_time_limit(120); +// include composer autoloader (if available) +if (@file_exists('vendor/autoload.php')) { + require 'vendor/autoload.php'; +} + // include Roundcube Framework require_once 'Roundcube/bootstrap.php'; -// backward compatybility (to be removed) -require_once INSTALL_PATH . 'program/include/rcmail.php'; +// register autoloader for rcmail app classes +spl_autoload_register('rcmail_autoload'); // backward compatybility (to be removed) 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