From e70d6ea64e711096af36b1234f8545b870ea5f45 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 05 Apr 2008 08:49:21 -0400
Subject: [PATCH] Apply changes from trunk to 0.1-stable
---
installer/index.php | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index 264cefc..69e33f8 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -22,12 +22,11 @@
<div id="content">
-<h1>RoundCube Webmail Installer</h1>
-
<?php
-
ini_set('error_reporting', E_ALL&~E_NOTICE);
ini_set('display_errors', 1);
+
+ session_start();
$docroot = realpath(dirname(__FILE__) . '/../');
$include_path = $docroot . '/program/lib' . PATH_SEPARATOR . $docroot . '/program' . PATH_SEPARATOR . ini_get('include_path');
@@ -36,8 +35,19 @@
require_once 'rcube_install.php';
$RCI = rcube_install::get_instance();
$RCI->load_config();
+
+ // 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 config/main.inc.php</p>';
+ echo '</div></body></html>';
+ exit;
+ }
?>
+
+<h1>RoundCube Webmail Installer</h1>
<ol id="progress">
<?php
@@ -51,7 +61,6 @@
</ol>
<?php
-
$include_steps = array('welcome.html', 'check.php', 'config.php', 'test.php');
if ($include_steps[$RCI->step]) {
--
Gitblit v1.9.1