From 25bc871ee79a6d469822d999b09c9b5d73fccf1f Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Sun, 17 Apr 2016 12:22:20 -0400 Subject: [PATCH] Bump version to 1.1.5 --- program/include/iniset.php | 128 ++++++++++++++---------------------------- 1 files changed, 43 insertions(+), 85 deletions(-) diff --git a/program/include/iniset.php b/program/include/iniset.php old mode 100755 new mode 100644 index 4674146..534d5ca --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -5,40 +5,23 @@ | program/include/iniset.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2008-2011, Roundcube Dev, - Switzerland | - | Licensed under the GNU GPL | + | Copyright (C) 2008-2015, 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, -); -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.6-svn'); -define('RCMAIL_CHARSET', 'UTF-8'); -define('JS_OBJECT_NAME', 'rcmail'); +define('RCMAIL_VERSION', '1.1.5'); define('RCMAIL_START', microtime(true)); if (!defined('INSTALL_PATH')) { @@ -49,88 +32,63 @@ define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); } -// make sure path_separator is defined -if (!defined('PATH_SEPARATOR')) { - define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':'); +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 // instead the ones provided by RC -$include_path = INSTALL_PATH . PATH_SEPARATOR; -$include_path.= INSTALL_PATH . 'program' . PATH_SEPARATOR; -$include_path.= INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; -$include_path.= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; +$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; $include_path.= ini_get('include_path'); if (set_include_path($include_path) === false) { die("Fatal error: ini_set/set_include_path does not work."); } -ini_set('error_reporting', E_ALL&~E_NOTICE); - // 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); +// include composer autoloader (if available) +if (@file_exists(INSTALL_PATH . 'vendor/autoload.php')) { + require INSTALL_PATH . 'vendor/autoload.php'; +} +// include Roundcube Framework +require_once 'Roundcube/bootstrap.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'; + +// load the UTF-8 portability layers from Patchwork +// don't load mbstring layer as it conflicts with Roundcube Framework (#1490280) +if (!function_exists('iconv')) { + \Patchwork\Utf8\Bootup::initIconv(); +} +if (!function_exists('utf8_encode')) { + \Patchwork\Utf8\Bootup::initUtf8Encode(); +} /** - * Use PHP5 autoload for dynamic class loading - * - * @todo Make Zend, PEAR etc play with this - * @todo Make our classes conform to a more straight forward CS. + * PHP5 autoloader routine for dynamic class loading */ -function rcube_autoload($classname) +function rcmail_autoload($classname) { - $filename = preg_replace( - array( - '/MDB2_(.+)/', - '/Mail_(.+)/', - '/Net_(.+)/', - '/Auth_(.+)/', - '/^html_.+/', - '/^utf8$/', - ), - array( - 'MDB2/\\1', - 'Mail/\\1', - 'Net/\\1', - 'Auth/\\1', - 'html', - 'utf8.class', - ), - $classname - ); - - if ($fp = @fopen("$filename.php", 'r', true)) { - fclose($fp); - include_once("$filename.php"); - return true; + if (strpos($classname, 'rcmail') === 0) { + $filepath = INSTALL_PATH . "program/include/$classname.php"; + if (is_readable($filepath)) { + include_once $filepath; + return true; + } } return false; } - -spl_autoload_register('rcube_autoload'); - -/** - * Local callback function for PEAR errors - */ -function rcube_pear_error($err) -{ - error_log(sprintf("%s (%s): %s", - $err->getMessage(), - $err->getCode(), - $err->getUserinfo()), 0); -} - -// set PEAR error handling (will also load the PEAR main class) -PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error'); - -// include global functions -require_once 'include/main.inc'; -require_once 'include/rcube_shared.inc'; -- Gitblit v1.9.1