From 651da7934ed4c13e2cbc2e4a82caf2ebaba87373 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 14 Apr 2012 02:28:10 -0400
Subject: [PATCH] - Fix folder collapsing/expanding broken with framework merge (#1488430)
---
installer/index.php | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index 549b6f0..842b900 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -1,5 +1,44 @@
<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Roundcube Webmail setup tool |
+ | Version 0.8 |
+ | |
+ | Copyright (C) 2009-2012, 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> |
+ +-------------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
ini_set('error_reporting', E_ALL&~E_NOTICE);
ini_set('display_errors', 1);
@@ -13,8 +52,10 @@
set_include_path($include_path);
-require_once 'rcube_shared.inc';
require_once 'utils.php';
+require_once 'rcube_shared.inc';
+// deprecated aliases (to be removed)
+require_once 'main.inc';
session_start();
@@ -41,15 +82,15 @@
header('Content-type: text/plain');
header('Content-Disposition: attachment; filename="'.$filename.'"');
-
+
$RCI->merge_config();
echo $RCI->create_config($_GET['_mergeconfig'], true);
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;
}
@@ -58,7 +99,7 @@
"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>
+<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" />
@@ -68,14 +109,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">
@@ -92,7 +132,7 @@
?>
-<h1>RoundCube Webmail Installer</h1>
+<h1>Roundcube Webmail Installer</h1>
<ol id="progress">
<?php
@@ -106,7 +146,7 @@
</ol>
<?php
-$include_steps = array('./welcome.html', './check.php', './config.php', './test.php');
+$include_steps = array('', './check.php', './config.php', './test.php');
if ($include_steps[$RCI->step]) {
include $include_steps[$RCI->step];
@@ -120,7 +160,7 @@
</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