From 5e9a5661011e64423e1978599c56d47f8b0cfa37 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 02 Mar 2010 02:54:11 -0500
Subject: [PATCH] Fix checking for new mail (#1485794)
---
installer/index.php | 65 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index 446b6a4..d1c55e4 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -3,7 +3,55 @@
ini_set('error_reporting', E_ALL&~E_NOTICE);
ini_set('display_errors', 1);
+define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
+define('RCMAIL_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);
+
+require_once 'utils.php';
+require_once 'main.inc';
+
session_start();
+
+$RCI = rcube_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])) {
+ header('Content-type: text/plain');
+ header('Content-Disposition: attachment; filename="'.$filename.'"');
+ echo $_SESSION[$filename];
+ exit;
+ }
+ else {
+ header('HTTP/1.0 404 Not found');
+ die("The requested configuration was not found. Please run the installer from the beginning.");
+ }
+}
+
+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"
@@ -11,7 +59,8 @@
<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"/>
+<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>
@@ -32,19 +81,11 @@
<?php
- $docroot = realpath(dirname(__FILE__) . '/../');
- $include_path = $docroot . '/program/lib' . PATH_SEPARATOR . $docroot . '/program' . PATH_SEPARATOR . ini_get('include_path');
- set_include_path($include_path);
-
- 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");
+ // 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 '<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;
}
@@ -65,7 +106,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];
--
Gitblit v1.9.1