X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=installer%2Findex.php;h=7ed52240ba9a631d3c6e061f09d3a085f232d752;hb=9d358bb749203c1c4cb278a01e51f79754aa643a;hp=f7a5cea4bdabf99de333fba02c985664de33a1b6;hpb=8d00e7f2ca613449885c5b9613a234c387825907;p=roundcube.git diff --git a/installer/index.php b/installer/index.php index f7a5cea..7ed5224 100644 --- a/installer/index.php +++ b/installer/index.php @@ -1,5 +1,33 @@ | + +-------------------------------------------------------------------------+ + + $Id$ + +*/ + ini_set('error_reporting', E_ALL&~E_NOTICE); ini_set('display_errors', 1); @@ -14,6 +42,7 @@ $include_path .= ini_get('include_path'); set_include_path($include_path); require_once 'utils.php'; +require_once 'main.inc'; session_start(); @@ -40,15 +69,15 @@ if ($RCI->configured && ($RCI->getprop('enable_installer') || $_SESSION['allowin 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; } @@ -57,7 +86,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) { "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -RoundCube Webmail Installer +Roundcube Webmail Installer @@ -67,14 +96,13 @@ if ($RCI->configured && empty($_REQUEST['_step'])) { + + + + +

+ How-to Wiki +

@@ -91,7 +119,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) { ?> -

RoundCube Webmail Installer

Roundcube Webmail Installer

configured && empty($_REQUEST['_step'])) { step]) { include $include_steps[$RCI->step]; @@ -119,7 +147,7 @@ else {