X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fclass_setup.inc;h=700ea7761d84047d0aa46178782eedcf07b323e6;hb=68503ecbb4d310b61ef8f1f32003fc739bacb237;hp=2ec1fd83b6ff953de3946c1beb0fd07d6181dc00;hpb=64b1c82f29b4fb883c98b7642bd15fe91900702e;p=gosa.git diff --git a/setup/class_setup.inc b/setup/class_setup.inc index 2ec1fd83b..700ea7761 100644 --- a/setup/class_setup.inc +++ b/setup/class_setup.inc @@ -22,7 +22,7 @@ require_once("class_setupStep.inc"); class setup { - var $i_steps = 8; // Number of setup steps + var $i_steps = 9; // Number of setup steps var $i_current= 1; // Current step var $i_last = 1; // Last setup step; var $o_steps = array(); @@ -30,16 +30,27 @@ class setup function setup() { + $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)){ + session_destroy(); + header("Location: index.php") ; + exit(); + } - $this->o_steps[1] = new setup_step_1(); - $this->o_steps[2] = new setup_step_2(); - $this->o_steps[3] = new setup_step_3(); - $this->o_steps[4] = new setup_step_4(); - $this->o_steps[5] = new setup_step_5(); - $this->o_steps[6] = new setup_step_6(); - $this->o_steps[7] = new setup_step_7(); - $this->o_steps[8] = new setup_step_8(); - foreach($this->o_steps as $key => $step){ $this->o_steps[$key]->parent = $this; } @@ -48,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(); @@ -84,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 */ @@ -98,9 +114,21 @@ 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'])){ + $step= $_POST['setup_goto_step']; + } + if(isset($_GET['step'])){ $step = $_GET['step']; }elseif(isset($_POST['next'])){ @@ -109,10 +137,6 @@ class setup $step = $this->i_current - 1; } - if(isset($_POST['setup_goto_step'])){ - $step= $_POST['setup_goto_step']; - } - $once = true; foreach($_POST as $name => $value){ if(preg_match("/^step_[0-9]*$/",$name) && $once ){ @@ -149,31 +173,39 @@ class setup $str = ""; foreach($this->o_steps as $key => $step){ + $step -> update_strings(); + $s_title = $step -> get_title(); $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 = ""._("Completed")." "; + }else{ + $s = "  "; + } if($_SESSION['js']){ $str .="
"; + if($b_enabled){ if($b_active){ $str .= ""; }else{ $str .= ""; $str .= "
"; } }else{ $str .= ""; } $str .= "" ; @@ -183,7 +215,7 @@ class setup if($b_active){ $str .= ""; }else{ $str .= "