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 --- installer/index.php | 149 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 96 insertions(+), 53 deletions(-) diff --git a/installer/index.php b/installer/index.php index c7f69e3..d310ede 100644 --- a/installer/index.php +++ b/installer/index.php @@ -1,42 +1,75 @@ <?php -ini_set('error_reporting', E_ALL&~E_NOTICE); + +/* + +-------------------------------------------------------------------------+ + | Roundcube Webmail setup tool | + | Version 1.1.5 | + | | + | 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 | + | for skins & plugins) as published by the Free Software Foundation, | + | either version 3 of the License, or (at your option) any later version. | + | | + | This file forms part of the Roundcube Webmail Software for which the | + | following exception is added: Plugins and Skins which merely make | + | function calls to the Roundcube Webmail Software, and for that purpose | + | include it by reference shall not be considered modifications of | + | the software. | + | | + | If you wish to use this file in another project or create a modified | + | version that will not be part of the Roundcube Webmail Software, you | + | may remove the exception above and use this source code under the | + | original version of the license. | + | | + | This program is distributed in the hope that it will be useful, | + | but WITHOUT ANY WARRANTY; without even the implied warranty of | + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | + | GNU General Public License for more details. | + | | + | You should have received a copy of the GNU General Public License | + | along with this program. If not, see http://www.gnu.org/licenses/. | + | | + +-------------------------------------------------------------------------+ + | Author: Thomas Bruederli <roundcube@gmail.com> | + +-------------------------------------------------------------------------+ +*/ + +ini_set('error_reporting', E_ALL &~ (E_NOTICE | E_STRICT)); ini_set('display_errors', 1); -define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/'); -define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); +define('INSTALL_PATH', realpath(__DIR__ . '/../').'/'); +define('RCUBE_INSTALL_PATH', INSTALL_PATH); +define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/'); $include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; -$include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR; $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; $include_path .= ini_get('include_path'); set_include_path($include_path); -session_start(); - -/** - * Use PHP5 autoload for dynamic class loading - * (copy from program/incllude/iniset.php) - */ -function __autoload($classname) -{ - $filename = preg_replace( - array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'), - array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'), - $classname - ); - include_once $filename. '.php'; +// include composer autoloader (if available) +if (@file_exists(INSTALL_PATH . 'vendor/autoload.php')) { + require INSTALL_PATH . 'vendor/autoload.php'; } -$RCI = rcube_install::get_instance(); +require_once 'Roundcube/bootstrap.php'; +// deprecated aliases (to be removed) +require_once 'bc.php'; + +if (function_exists('session_start')) + session_start(); + +$RCI = rcmail_install::get_instance(); $RCI->load_config(); -if (isset($_GET['_getfile']) && in_array($_GET['_getfile'], array('main', 'db'))) { - $filename = $_GET['_getfile'] . '.inc.php'; - if (!empty($_SESSION[$filename])) { +if (isset($_GET['_getconfig'])) { + $filename = 'config.inc.php'; + if (!empty($_SESSION['config'])) { header('Content-type: text/plain'); header('Content-Disposition: attachment; filename="'.$filename.'"'); - echo $_SESSION[$filename]; + echo $_SESSION['config']; exit; } else { @@ -46,20 +79,20 @@ } if ($RCI->configured && ($RCI->getprop('enable_installer') || $_SESSION['allowinstaller']) && - isset($_GET['_mergeconfig']) && in_array($_GET['_mergeconfig'], array('main', 'db'))) { - $filename = $_GET['_mergeconfig'] . '.inc.php'; + !empty($_GET['_mergeconfig'])) { + $filename = 'config.inc.php'; header('Content-type: text/plain'); header('Content-Disposition: attachment; filename="'.$filename.'"'); - + $RCI->merge_config(); - echo $RCI->create_config($_GET['_mergeconfig'], true); + echo $RCI->create_config(); exit; } -// go to 'test' step if we have a local configuration +// go to 'check env' step if we have a local configuration if ($RCI->configured && empty($_REQUEST['_step'])) { - header("Location: ./?_step=3"); + header("Location: ./?_step=1"); exit; } @@ -68,8 +101,9 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> -<title>RoundCube Webmail Installer</title> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> +<title>Roundcube Webmail Installer</title> +<meta name="Robots" content="noindex,nofollow" /> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" href="styles.css" /> <script type="text/javascript" src="client.js"></script> </head> @@ -77,14 +111,13 @@ <body> <div id="banner"> - <div id="header"> - <div class="banner-logo"><a href="http://www.roundcube.net"><img src="images/banner_logo.gif" width="200" height="56" border="0" alt="RoundCube Webmal Project" /></a></div> - <div class="banner-right"><img src="images/banner_right.gif" width="10" height="56" alt="" /></div> - </div> - <div id="topnav"> - <a href="http://trac.roundcube.net/wiki/Howto_Install">How-to Wiki</a> - </div> - </div> + <div class="banner-bg"></div> + <div class="banner-logo"><a href="http://roundcube.net"><img src="images/roundcube_logo.png" width="210" height="55" border="0" alt="Roundcube - open source webmail software" /></a></div> +</div> + +<div id="topnav"> + <a href="http://trac.roundcube.net/wiki/Howto_Install">How-to Wiki</a> +</div> <div id="content"> @@ -93,19 +126,36 @@ // exit if installation is complete if ($RCI->configured && !$RCI->getprop('enable_installer') && !$_SESSION['allowinstaller']) { // header("HTTP/1.0 404 Not Found"); - echo '<h2 class="error">The installer is disabled!</h2>'; - echo '<p>To enable it again, set <tt>$rcmail_config[\'enable_installer\'] = true;</tt> in RCMAIL_CONFIG_DIR/main.inc.php</p>'; + if ($RCI->configured && $RCI->legacy_config) { + echo '<h2 class="error">Your configuration needs to be migrated!</h2>'; + echo '<p>We changed the configuration files structure and your installation needs to be updated accordingly.</p>'; + echo '<p>Please run the <tt>bin/update.sh</tt> script from the command line or set <p> <tt>$rcube_config[\'enable_installer\'] = true;</tt></p>'; + echo ' in your RCUBE_CONFIG_DIR/main.inc.php to let the installer help you migrating it.</p>'; + } + else { + echo '<h2 class="error">The installer is disabled!</h2>'; + echo '<p>To enable it again, set <tt>$config[\'enable_installer\'] = true;</tt> in RCUBE_CONFIG_DIR/config.inc.php</p>'; + } echo '</div></body></html>'; exit; } - + ?> -<h1>RoundCube Webmail Installer</h1> +<h1>Roundcube Webmail Installer</h1> <ol id="progress"> <?php - + $include_steps = array( + 1 => './check.php', + 2 => './config.php', + 3 => './test.php', + ); + + if (!in_array($RCI->step, array_keys($include_steps))) { + $RCI->step = 1; + } + foreach (array('Check environment', 'Create config', 'Test config') as $i => $item) { $j = $i + 1; $link = ($RCI->step >= $j || $RCI->configured) ? '<a href="./index.php?_step='.$j.'">' . Q($item) . '</a>' : Q($item); @@ -115,21 +165,14 @@ </ol> <?php -$include_steps = array('welcome.html', 'check.php', 'config.php', 'test.php'); -if ($include_steps[$RCI->step]) { - include $include_steps[$RCI->step]; -} -else { - header("HTTP/1.0 404 Not Found"); - echo '<h2 class="error">Invalid step</h2>'; -} +include $include_steps[$RCI->step]; ?> </div> <div id="footer"> - Installer by the RoundCube Dev Team. Copyright © 2008 - Published under the GNU Public License; + Installer by the Roundcube Dev Team. Copyright © 2008-2012 – Published under the GNU Public License; Icons by <a href="http://famfamfam.com">famfamfam</a> </div> </body> -- Gitblit v1.9.1