X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=installer%2Findex.php;h=1c157da7f1e602b446829d76cc2120a9bdb84477;hb=3c6b2d3d53943671350cdacec5261affaff31459;hp=f7a5cea4bdabf99de333fba02c985664de33a1b6;hpb=649963776e4a8207ae7926a4f912c4f478a8c025;p=roundcube.git

diff --git a/installer/index.php b/installer/index.php
index f7a5cea..1c157da 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -14,6 +14,7 @@ $include_path .= ini_get('include_path');
 set_include_path($include_path);
 
 require_once 'utils.php';
+require_once 'main.inc';
 
 session_start();
 
@@ -46,9 +47,9 @@ if ($RCI->configured && ($RCI->getprop('enable_installer') || $_SESSION['allowin
   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;
 }
 
@@ -57,7 +58,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {
 	"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,7 +69,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {
 
 <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-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">
@@ -91,7 +92,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {
   
 ?>
 
-<h1>RoundCube Webmail Installer</h1>
+<h1>Roundcube Webmail Installer</h1>
 
 <ol id="progress">
 <?php
@@ -105,7 +106,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {
 </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];
@@ -119,7 +120,7 @@ else {
 </div>
 
 <div id="footer">
-  Installer by the RoundCube Dev Team. Copyright &copy; 2008 - Published under the GNU Public License;&nbsp;
+  Installer by the Roundcube Dev Team. Copyright &copy; 2008 - Published under the GNU Public License;&nbsp;
   Icons by <a href="http://famfamfam.com">famfamfam</a>
 </div>
 </body>
