There is a seperate button for each admin create method

[gosa.git] / setup / class_setupStep_Finish.inc

diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index 579ce622688083a4465bd8a7b6e8da1b23446777..3898c55c5bf4c50135207eb68a0b65aa5c3953e5 100644 (file)
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -60,8 +60,11 @@ class Step_Finish extends setup_step
      */
     $exists = file_exists(CONFIG_DIR."/".CONFIG_FILE); 
 
-    /* Redirect to GOsa login */
-    if(isset($_POST['next']) && $exists){
+    /* Redirect to GOsa login, if : 
+     *   - gosa.conf exists
+     *   - Permisssion are set correctly 
+     */ 
+    if(isset($_POST['next']) && $exists && !$this->is_world_readable(CONFIG_DIR."/".CONFIG_FILE)){
       session_destroy();
       header("Location: index.php");
       exit();
@@ -94,7 +97,9 @@ class Step_Finish extends setup_step
     $err_msg= "";
     
     if($exists && $this->is_world_readable(CONFIG_DIR."/".CONFIG_FILE)){
-      $err_msg = _("Your configuration file is currently world readable. This is a big security risk. Please updated the file permissions!");
+      $err_msg = _("Your configuration file is currently world readable. Please updated the file permissions!");
+    }elseif(!$exists){
+      $err_msg = _("The configuration is currently not readable or it does not exists.");
     }
 
     $smarty = get_smarty();