From 5fed074a45cb9f3a7e4ade86166a0f04d05243b7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 22 May 2012 02:38:43 -0400
Subject: [PATCH] Always use 1 step as a fallback (#1488490)
---
installer/index.php | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index e46ef19..b5b9e4a 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -130,14 +130,23 @@
echo '</div></body></html>';
exit;
}
-
+
?>
<h1>Roundcube Webmail Installer</h1>
<ol id="progress">
<?php
-
+ $include_steps = array(
+ 1 => './check.php',
+ 2 => './config.php',
+ 3 => './test.php',
+ );
+
+ if (!in_array($RCI->step, array_keys($include_steps))) {
+ $RCI->step = 1;
+ }
+
foreach (array('Check environment', 'Create config', 'Test config') as $i => $item) {
$j = $i + 1;
$link = ($RCI->step >= $j || $RCI->configured) ? '<a href="./index.php?_step='.$j.'">' . Q($item) . '</a>' : Q($item);
@@ -147,15 +156,8 @@
</ol>
<?php
-$include_steps = array('', './check.php', './config.php', './test.php');
-if ($include_steps[$RCI->step]) {
- include $include_steps[$RCI->step];
-}
-else {
- header("HTTP/1.0 404 Not Found");
- echo '<h2 class="error">Invalid step</h2>';
-}
+include $include_steps[$RCI->step];
?>
</div>
--
Gitblit v1.9.1