From acbf6eede613a5496cabccbdbfcb2f4e2cbd60d2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 15 Oct 2013 12:53:09 -0400
Subject: [PATCH] Fix address matching in Return-Path header on identity selection (#1489374)
---
installer/index.php | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index 5e7d318..0e80b1c 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -40,20 +40,19 @@
ini_set('display_errors', 1);
define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
-define('RCMAIL_CHARSET', 'UTF-8');
+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);
-require_once 'utils.php';
-require_once 'rcube_shared.inc';
+require_once 'Roundcube/bootstrap.php';
+require_once 'rcube_install.php';
// deprecated aliases (to be removed)
-require_once 'rcube_bc.inc';
+require_once 'bc.php';
session_start();
@@ -123,7 +122,7 @@
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 RCUBE_CONFIG_DIR/main.inc.php</p>';
echo '</div></body></html>';
exit;
}
--
Gitblit v1.9.1