X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fclass_setupStep6a.inc;h=ca875c41817b4905fa47b4c55057b9bba6b0009f;hb=badec362128db3214c4b738a81cf879a4c406e9b;hp=c2646799ff0976bdd7177ba40c3f38b78bdc4226;hpb=3536e72afaac8a39178a3927e34c5c47bf979a69;p=gosa.git

diff --git a/setup/class_setupStep6a.inc b/setup/class_setupStep6a.inc
index c2646799f..ca875c418 100644
--- a/setup/class_setupStep6a.inc
+++ b/setup/class_setupStep6a.inc
@@ -29,13 +29,22 @@ class setup_step_6a extends setup_step
               "warnssl" => false,
               "ppd_path" => "/var/spool/ppd/",
               "ppd_path_active" => FALSE,
-              "kde_applications_menu" => "",
-              "kde_applications_menu_active" => FALSE,
               "compile" =>  "/var/spool/gosa",
               "debuglevel" => 0,
               "session_lifetime" => 7200,
               "max_ldap_query_time" => "5.0",
               "max_ldap_query_time_active" => FALSE,
+
+              "mailQueueScriptPath" => "/usr/bin/sudo /usr/local/sbin/mailqueue %action %id %server",
+              "mailQueueScriptPath_active" => FALSE,
+
+              "auto_network_hook" => "/etc/gosa/net-resolv.sh",
+              "auto_network_hook_active" => FALSE,
+
+              "notifydir" => "",
+              "notifydir_active" => FALSE,
+
+              "noprimarygroup"  => FALSE,
               "smbhash" => 'SMBHASH');
 
 
@@ -93,7 +102,7 @@ class setup_step_6a extends setup_step
         }
       }
       
-      foreach(array("enableCopyPaste","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime","smbhash") as $name){
+      foreach(array("noprimarygroup","enableCopyPaste","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime","smbhash") as $name){
         if(isset($_POST[$name])){
           $this->optional[$name] = stripslashes($_POST[$name]);
         }
@@ -108,15 +117,6 @@ class setup_step_6a extends setup_step
         $this->optional['ppd_path_active'] = FALSE;
       }
 
-      if(isset($_POST['kde_applications_menu_active'])){
-        $this->optional['kde_applications_menu_active'] = TRUE;
-        if(isset($_POST['kde_applications_menu'])){
-          $this->optional['kde_applications_menu'] = $_POST['kde_applications_menu'];
-        }
-      }else{
-        $this->optional['kde_applications_menu_active'] = FALSE;
-      }
-
       if(isset($_POST['max_ldap_query_time_active'])){
         $this->optional['max_ldap_query_time_active'] = TRUE;
         if(isset($_POST['max_ldap_query_time'])){
@@ -126,6 +126,32 @@ class setup_step_6a extends setup_step
         $this->optional['max_ldap_query_time_active'] = FALSE;
       }
 
+      if(isset($_POST['mailQueueScriptPath_active'])){
+        $this->optional['mailQueueScriptPath_active'] = TRUE;
+        if(isset($_POST['mailQueueScriptPath'])){
+          $this->optional['mailQueueScriptPath'] = $_POST['mailQueueScriptPath'];
+        }
+      }else{
+        $this->optional['mailQueueScriptPath_active'] = FALSE;
+      }
+
+      if(isset($_POST['auto_network_hook_active'])){
+        $this->optional['auto_network_hook_active'] = TRUE;
+        if(isset($_POST['auto_network_hook'])){
+          $this->optional['auto_network_hook'] = $_POST['auto_network_hook'];
+        }
+      }else{
+        $this->optional['auto_network_hook_active'] = FALSE;
+      }
+
+      if(isset($_POST['notifydir_active'])){
+        $this->optional['notifydir_active'] = TRUE;
+        if(isset($_POST['notifydir'])){
+          $this->optional['notifydir'] = $_POST['notifydir'];
+        }
+      }else{
+        $this->optional['notifydir_active'] = FALSE;
+      }
     }
 
     $tmp = $this->check();