diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index af70d9b8d429e7ac29cdf097f783aee2cb8578fa..83311ed2f9dec5e12d61ae8a6a58242b77112090 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.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();
$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();
-
+ $this->o_steps[7] = new setup_step_6a();
+ $this->o_steps[8] = new setup_step_7();
+ $this->o_steps[9] = new setup_step_8();
+
+ /* 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();
+ }
+
foreach($this->o_steps as $key => $step){
$this->o_steps[$key]->parent = $this;
}
}
/* Check if step was selected */
- if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last'])){
+ if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last']) || isset($_POST['setup_goto_step'])){
/* check if current setup step is completed now
and activate the next step if possible */
$this->disable_steps_from($i+1);
}
}
+ }
+
+ $step = -1;
- if(isset($_GET['step'])){
- $step = $_GET['step'];
- }elseif(isset($_POST['next'])){
- $step = $this->i_current + 1;
- }elseif(isset($_POST['last'])){
- $step = $this->i_current - 1;
- }
+ if(isset($_POST['setup_goto_step'])){
+ $step= $_POST['setup_goto_step'];
+ }
- if($this->selectable_step($step)){
- $this->i_last = $this->i_current;
- $this->i_current = $step;
+ if(isset($_GET['step'])){
+ $step = $_GET['step'];
+ }elseif(isset($_POST['next'])){
+ $step = $this->i_current + 1;
+ }elseif(isset($_POST['last'])){
+ $step = $this->i_current - 1;
+ }
+
+ $once = true;
+ foreach($_POST as $name => $value){
+ if(preg_match("/^step_[0-9]*$/",$name) && $once ){
+ $step = preg_replace("/^step_/","",$name);
}
}
+
+ if($this->selectable_step($step)){
+ $this->i_last = $this->i_current;
+ $this->i_current = $step;
+ }
}
}
if($found){
- echo $key." ";
$this->o_steps[$key]->set_enabled(false);
$this->o_steps[$key]->set_completed(false);
}
$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();
- $str .="<div >";
- if($b_enabled){
- if($b_active){
- $str .= "<a href='?step=".$key."' class='navigation_element_active'>";
- $str .= "<div class='navigation_title_active'>".$s_title."</div>";
- $str .= "<div class='navigation_info'>".$s_info."</div>";
- $str .= "</a><br>\n";
+ if($_SESSION['js']){
+
+ $str .="<div >";
+ if($b_enabled){
+ if($b_active){
+ $str .= "<div class='navigation_element_active'>";
+ $str .= "<div onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
+ class='navigation_title_active'>".$s_title."</div>";
+ $str .= "<div onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
+ class='navigation_info'>".$s_info."</div>";
+ $str .= "</div>";
+ }else{
+ $str .= "<div class='navigation_element'>";
+ $str .= "<div onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
+ class='navigation_title_inactive'>".$s_title."</div>";
+ $str .= "</div>";
+ }
}else{
- $str .= "<a href='?step=".$key."' class='navigation_element'>";
- $str .= "<div class='navigation_title_inactive'>".$s_title."</div>";
- $str .= "</a><br>\n";
+ $str .= "<div class='navigation_element'>";
+ $str .= "<div class='navigation_title_disabled'>".$s_title."</div>";
+ $str .= "</div>";
}
+ $str .= "</div>" ;
}else{
- $str .= "<div class='navigation_element'>";
- $str .= "<div class='navigation_title_disabled'>".$s_title."</div>";
- $str .= "</div>";
+ $str .="<div >";
+ if($b_enabled){
+ if($b_active){
+ $str .= "<div class='navigation_element_active'>";
+ $str .= "<input style='text-align: left; color: #00008F; font-weight: bold; width:100%;'
+ type='submit' value='".$s_title."' name='step_".$key."'>";
+ $str .= "</div>";
+ }else{
+ $str .= "<div class='navigation_element'>";
+ $str .= "<input style='text-align: left; color: #00008F; font-weight: bold; width:100%;'
+ type='submit' value='".$s_title."' name='step_".$key."'>";
+ $str .= "</div>";
+ }
+ }else{
+ $str .= "<div class='navigation_element'>";
+ $str .= "<div class='navigation_title_disabled'>".$s_title."</div>";
+ $str .= "</div>";
+ }
+ $str .= "</div>" ;
}
- $str .= "</div>" ;
}
return($str);
}