X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fclass_setup.inc;h=700ea7761d84047d0aa46178782eedcf07b323e6;hb=68503ecbb4d310b61ef8f1f32003fc739bacb237;hp=c99eb17e81581b60964152afc9aedd33e7281e3e;hpb=2eba5d4da490a3922cd70ddfa6d5642564a624b9;p=gosa.git
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index c99eb17e8..700ea7761 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -30,16 +30,19 @@ class setup
function setup()
{
-
- $this->o_steps[1] = new Step_Language();
- $this->o_steps[2] = new Step_Checks();
- $this->o_steps[3] = new Step_License();
- $this->o_steps[4] = new Step_Ldap();
- $this->o_steps[5] = new Step_Schema();
- $this->o_steps[6] = new Step_Config1();
- $this->o_steps[7] = new Step_Config2();
- $this->o_steps[8] = new Step_Config3();
- $this->o_steps[9] = new Step_Finish();
+ $i = 1;
+ $this->o_steps[$i++] = new Step_Welcome();
+ $this->o_steps[$i++] = new Step_Language();
+ $this->o_steps[$i++] = new Step_Checks();
+ $this->o_steps[$i++] = new Step_License();
+ $this->o_steps[$i++] = new Step_Ldap();
+ $this->o_steps[$i++] = new Step_Schema();
+ $this->o_steps[$i++] = new Step_Config1();
+ $this->o_steps[$i++] = new Step_Config2();
+ $this->o_steps[$i++] = new Step_Config3();
+ $this->o_steps[$i++] = new Step_Migrate();
+ $this->o_steps[$i++] = new Step_Finish();
+ $this->i_steps = $i-1;
/* Ensure that setup is not reachable if gosa.conf (CONFIG_FILE) */
if(file_exists(CONFIG_DIR."/".CONFIG_FILE)){
@@ -56,7 +59,12 @@ class setup
function execute()
{
- $smarty = get_smarty();
+ /* display step error msgs */
+ $msgs = $this->o_steps[$this->i_current]->check();
+ foreach($msgs as $msg){
+ print_red($msg);
+ }
+
$this->o_steps[$this->i_last]->set_active(FALSE);
$this->o_steps[$this->i_current]->set_active();
$content = $this->o_steps[$this->i_current]->execute();
@@ -92,7 +100,7 @@ class setup
}
/* Check if step was selected */
- if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last']) || isset($_POST['setup_goto_step'])){
+ if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last'])){
/* check if current setup step is completed now
and activate the next step if possible */
@@ -106,7 +114,15 @@ class setup
}
}
}
-
+
+ /* Disable all following steps, if one step isn't compelted right now .*/
+ for($i = 1 ; $i <= $this->i_steps ; $i ++ ){
+ if($this->o_steps[$i]->is_completed()){
+ }else{
+ $this->disable_steps_from($i+1);
+ }
+ }
+
$step = -1;
if(isset($_POST['setup_goto_step'])){
@@ -163,27 +179,33 @@ class setup
$s_info = $step -> get_small_info();
$b_active = $step -> is_active();
$b_enabled = $step -> is_enabled();
+ $b_completed= $step -> is_completed();
+
+ if($b_completed){
+ $s = " ";
+ }else{
+ $s = "
";
+ }
if($_SESSION['js']){
$str .="