From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Fri, 17 Apr 2015 06:28:40 -0400 Subject: [PATCH] Allow preference sections to define CSS class names --- installer/index.php | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/installer/index.php b/installer/index.php index d90c4f9..4443d76 100644 --- a/installer/index.php +++ b/installer/index.php @@ -3,9 +3,9 @@ /* +-------------------------------------------------------------------------+ | Roundcube Webmail setup tool | - | Version 0.9-git | + | Version 1.2-git | | | - | Copyright (C) 2009-2013, The Roundcube Dev Team | + | Copyright (C) 2009-2015, The Roundcube Dev Team | | | | This program is free software: you can redistribute it and/or modify | | it under the terms of the GNU General Public License (with exceptions | @@ -39,7 +39,7 @@ ini_set('error_reporting', E_ALL &~ (E_NOTICE | E_STRICT)); ini_set('display_errors', 1); -define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); +define('INSTALL_PATH', realpath(__DIR__ . '/../').'/'); define('RCUBE_INSTALL_PATH', INSTALL_PATH); define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/'); @@ -49,15 +49,19 @@ set_include_path($include_path); +// include composer autoloader (if available) +if (@file_exists(INSTALL_PATH . 'vendor/autoload.php')) { + require INSTALL_PATH . 'vendor/autoload.php'; +} + require_once 'Roundcube/bootstrap.php'; -require_once 'rcube_install.php'; // deprecated aliases (to be removed) require_once 'bc.php'; if (function_exists('session_start')) session_start(); -$RCI = rcube_install::get_instance(); +$RCI = rcmail_install::get_instance(); $RCI->load_config(); if (isset($_GET['_getconfig'])) { -- Gitblit v1.9.1