diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 0b45f4231d2bdec54eb6e91dc5423146f15bea9b..fabac97a9ef526c2198f9767d737ab23e6794079 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
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)){
function execute()
{
+ /* 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();
if($this->o_steps[$this->i_current]->dialog){
$str ="";
}else{
- $str ="";
+ $str ="<p class='seperator' style='margin-bottom:10px;'> </p>";
$str.=" <div style='text-align:right;float:top;'>";
if(isset($this->o_steps[$this->i_current -1]) && $this->o_steps[$this->i_current -1]->is_enabled()){
$str .= "<input type='submit' name='last' value='"._("Back")."'>";