From 68070e448c6c8cd09faa75fd70ff11bfea764cc1 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 27 Jun 2011 03:09:15 -0400
Subject: [PATCH] - Fix PHP warning in mailbox_info(), - Set namespace/delimiter in constructor (this way some methods could be used before connecting to IMAP server)
---
installer/index.php | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index 549b6f0..8df7ab0 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -13,8 +13,8 @@
set_include_path($include_path);
-require_once 'rcube_shared.inc';
require_once 'utils.php';
+require_once 'main.inc';
session_start();
@@ -41,15 +41,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 +58,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 +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">
@@ -92,7 +91,7 @@
?>
-<h1>RoundCube Webmail Installer</h1>
+<h1>Roundcube Webmail Installer</h1>
<ol id="progress">
<?php
@@ -120,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