X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fclass_setupStep_Config3.inc;h=cd62785e3b9c751505cbdb0797a924b07612a27e;hb=c4d3493b6cc43ef013d8d9d1dd23db50c4d5d928;hp=eaa5368b1675414d929feabea7db604d65b7d880;hpb=7f7f21906eb6121c29823abbf96461733d642509;p=gosa.git

diff --git a/gosa-core/setup/class_setupStep_Config3.inc b/gosa-core/setup/class_setupStep_Config3.inc
index eaa5368b1..cd62785e3 100644
--- a/gosa-core/setup/class_setupStep_Config3.inc
+++ b/gosa-core/setup/class_setupStep_Config3.inc
@@ -50,9 +50,6 @@ class Step_Config3 extends setup_step
               "mailQueueScriptPath" => "/usr/bin/sudo /usr/local/sbin/mailqueue %action %id %server",
               "mailQueueScriptPath_active" => FALSE,
 
-              "auto_network_hook" => "/usr/bin/net-resolver.sh",
-              "auto_network_hook_active" => FALSE,
-
               "notifydir" => "",
               "notifydir_active" => FALSE,
 
@@ -62,8 +59,8 @@ class Step_Config3 extends setup_step
               "kioskpath" => "/var/spool/kiosk",
               "kioskpath_active" => FALSE,
 
-              "gotomasses_file"   => "/etc/gosa/gotomasses",
-              "gotomasses_active" => FALSE,
+              "sudoou"   => "ou=sudoers,%BASE%",
+              "sudoou_active" => FALSE,
 
               "noprimarygroup"  => FALSE);
 
@@ -85,10 +82,15 @@ class Step_Config3 extends setup_step
 
   function execute()
   {
+
+    $cv = $this->parent->captured_values;
+    $this->optional['sudoou'] = preg_replace("/%BASE%/",$cv['base'],$this->optional['sudoou']);
     $smarty = get_smarty();
     $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
     $smarty->assign("uniq_identifiers",array( "entryCNS" => "entryCSN",
                                               "contextCSN"=>"contextCSN" ));
+
+    
     $smarty->assign("optional", $this->optional);
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
@@ -151,22 +153,13 @@ class Step_Config3 extends setup_step
         $this->optional['kioskpath_active'] = FALSE;
       }
 
-      if(isset($_POST['gotomasses_active'])){
-        $this->optional['gotomasses_active'] = TRUE;
-        if(isset($_POST['gotomasses_file'])){
-          $this->optional['gotomasses_file'] = get_post('gotomasses_file');
-        }
-      }else{
-        $this->optional['gotomasses_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'] = get_post('auto_network_hook');
+      if(isset($_POST['sudoou_active'])){
+        $this->optional['sudoou_active'] = TRUE;
+        if(isset($_POST['sudoou'])){
+          $this->optional['sudoou'] = get_post('sudoou');
         }
       }else{
-        $this->optional['auto_network_hook_active'] = FALSE;
+        $this->optional['sudoou_active'] = FALSE;
       }
 
       if(isset($_POST['notifydir_active'])){
@@ -202,11 +195,11 @@ class Step_Config3 extends setup_step
     $message = array();
 
     if(!is_numeric( $this->optional['session_lifetime'])){
-      $message[] = _("Session lifetime must be a numeric value.");
+      $message[] = _("Session lifetime must be a numeric value!");
     }
 
     if(!is_numeric( $this->optional['max_ldap_query_time'])){
-      $message[] = _("Maximal ldap query time must be a numeric value. ");
+      $message[] = _("Maximum LDAP query time must be a numeric value!");
     }
   
     return($message);