From 96e24fab880754858dfe9d3864d400102209918f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 27 Jun 2011 05:30:01 -0400
Subject: [PATCH] - Fix parsing URLs containing commas (#1487970)
---
installer/index.php | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index d14e6ff..8df7ab0 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -1,4 +1,5 @@
<?php
+
ini_set('error_reporting', E_ALL&~E_NOTICE);
ini_set('display_errors', 1);
@@ -12,21 +13,10 @@
set_include_path($include_path);
-session_start();
+require_once 'utils.php';
+require_once 'main.inc';
-/**
- * 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';
-}
+session_start();
$RCI = rcube_install::get_instance();
$RCI->load_config();
@@ -45,13 +35,32 @@
}
}
+if ($RCI->configured && ($RCI->getprop('enable_installer') || $_SESSION['allowinstaller']) &&
+ isset($_GET['_mergeconfig']) && in_array($_GET['_mergeconfig'], array('main', 'db'))) {
+ $filename = $_GET['_mergeconfig'] . '.inc.php';
+
+ header('Content-type: text/plain');
+ header('Content-Disposition: attachment; filename="'.$filename.'"');
+
+ $RCI->merge_config();
+ echo $RCI->create_config($_GET['_mergeconfig'], true);
+ exit;
+}
+
+// go to 'check env' step if we have a local configuration
+if ($RCI->configured && empty($_REQUEST['_step'])) {
+ header("Location: ./?_step=1");
+ exit;
+}
+
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"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>
@@ -59,14 +68,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/rcube_logo.gif" width="210" height="55" border="0" alt="Roundcube - Open source webmail project" /></a></div>
+</div>
+
+<div id="topnav">
+ <a href="http://trac.roundcube.net/wiki/Howto_Install">How-to Wiki</a>
+</div>
<div id="content">
@@ -76,14 +84,14 @@
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>';
+ echo '<p>To enable it again, set <tt>$rcmail_config[\'enable_installer\'] = true;</tt> in RCMAIL_CONFIG_DIR/main.inc.php</p>';
echo '</div></body></html>';
exit;
}
?>
-<h1>RoundCube Webmail Installer</h1>
+<h1>Roundcube Webmail Installer</h1>
<ol id="progress">
<?php
@@ -97,7 +105,7 @@
</ol>
<?php
-$include_steps = array('welcome.html', 'check.php', 'config.php', 'test.php');
+$include_steps = array('./welcome.html', './check.php', './config.php', './test.php');
if ($include_steps[$RCI->step]) {
include $include_steps[$RCI->step];
@@ -111,7 +119,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-2011 - Published under the GNU Public License;
Icons by <a href="http://famfamfam.com">famfamfam</a>
</div>
</body>
--
Gitblit v1.9.1