Updated new Config Management

[gosa.git] / gosa-core / setup / class_setupStep_Finish.inc

diff --git a/gosa-core/setup/class_setupStep_Finish.inc b/gosa-core/setup/class_setupStep_Finish.inc
index bb69bce6c7c370ecbf0f61787b60bae0fa02fd22..27749c6259b1645702d7f7afc9a4447b203caf7f 100644 (file)
--- a/gosa-core/setup/class_setupStep_Finish.inc
+++ b/gosa-core/setup/class_setupStep_Finish.inc
@@ -24,7 +24,9 @@ class Step_Finish extends setup_step
 {
   var $gosa_conf_contrib   = "/gosa.conf";
   var $cfg_file_written = FALSE;
-  var $header_image= 'images/ldapserver.png';
+  var $header_image = "images/setup/server.png";
+
+  var $b_displayCheckbutton = TRUE;
 
   function Step_Finish()
   {
@@ -44,7 +46,7 @@ class Step_Finish extends setup_step
   {
     $smarty = get_smarty();
     $smarty->assign("cv",xmlentities($this->parent->captured_values));
-    $smarty->assign("get_gosa_version",get_gosa_version());
+    $smarty->assign("config_checksum", md5(file_get_contents(CONFIG_TEMPLATE_DIR.$this->gosa_conf_contrib)));
     $str =  $smarty->fetch(CONFIG_TEMPLATE_DIR.$this->gosa_conf_contrib);
     return($str);
   }  
@@ -53,10 +55,13 @@ class Step_Finish extends setup_step
   function execute()
   {
 
-    $info= posix_getgrgid(posix_getgid());
-    $webgroup = $info['name'];
-      
-    
+    if(!function_exists("posix_getgrgid")){
+      $webgroup = "";
+    }else{
+      $info= posix_getgrgid(posix_getgid());
+      $webgroup = $info['name'];
+    }
+
     /* Check if there is currently an active gosa.conf 
      */
     $exists = file_exists(CONFIG_DIR."/".CONFIG_FILE); 
@@ -109,7 +114,7 @@ class Step_Finish extends setup_step
     $smarty->assign("CONFIG_DIR",CONFIG_DIR);
     $smarty->assign("CONFIG_FILE" , CONFIG_FILE);
 
-    $smarty->assign("msg2", sprintf(_("After downloading and placing the file under %s, please make sure that the user the webserver is running with is able to read %s, while other users shouldn't. You may want to execute these commands to achieve this requirement:"),CONFIG_DIR,CONFIG_FILE));
+    $smarty->assign("msg2", sprintf(_("After downloading and placing the file under %s, please make sure that the user the web server is running with is able to read %s, while other users shouldn't. You may want to execute these commands to achieve this requirement:"),CONFIG_DIR,CONFIG_FILE));
 
     $smarty->assign("cv",$this->parent->captured_values);
     return($smarty -> fetch (get_template_path("../setup/setup_finish.tpl")));
@@ -133,7 +138,7 @@ class Step_Finish extends setup_step
       /* Get attributes */
       foreach($this->attributes as $attr){
         if(isset($_POST[$attr])){
-          $this->$attr = validate($_POST[$attr]);
+          $this->$attr = get_post($attr);
         }
       }
     }