X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fclass_setupStep_Config3.inc;h=6140cd22a4bd78f4a55983200d014e3d29feeafb;hb=bec4604aac70497f5936d2a69706bb477086ba1a;hp=1721d561a6b549bd05e662cec2c9b9e49bc546db;hpb=65d8680e8c4daee4ce2cb13b0bcf4313bde004db;p=gosa.git

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 1721d561a..6140cd22a 100644
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -22,10 +22,15 @@
 
 class Step_Config3 extends setup_step
 {
+  var $header_image= "images/ldapserver.png";
+
+  var $errorlvl   = FALSE;
+
   var $optional = array(
               "strict_units" => false,
               "forceglobals" => true,
               "forcessl" => false,
+              "ldapstats" => false,
               "warnssl" => true,
               "ppd_path" => "/var/spool/ppd/",
               "ppd_path_active" => FALSE,
@@ -44,32 +49,24 @@ class Step_Config3 extends setup_step
               "notifydir" => "",
               "notifydir_active" => FALSE,
 
-              "noprimarygroup"  => FALSE,
-              "smbhash" => 'SMBHASH');
+              "kioskpath" => "/var/spool/kiosk",
+              "kioskpath_active" => FALSE,
+
+              "noprimarygroup"  => FALSE);
 
+  var $attributes = array("errorlvl");
 
   function Step_Config3()
   {
     $this->update_strings();
-
-    /* Look for samba password generation method */
-    if(file_exists("/usr/bin/mkntpasswd")){
-      $pwdhash  = "/usr/bin/mkntpasswd";
-    } elseif (preg_match("/^Usage: mkntpwd /", shell_exec ("mkntpwd 2>&1"))){
-      $pwdhash= "mkntpwd";
-    } else {
-      $pwdhash= 'perl -MCrypt::SmbHash -e "print join(q[:], ntlmgen \$ARGV[0]), $/;"';
-    }
-
-    $this->optional['smbhash'] = $pwdhash;
   }
 
 
   function update_strings()
   {
     $this->s_title      = _("GOsa settings 3/3");
-    $this->s_title_long = _("GOsa generic settings, page 3/3");
-    $this->s_info       = _("This dialog allows you to setup GOsa behaviour");
+    $this->s_title_long = _("GOsa settings 3/3");
+    $this->s_info       = _("Tweak some GOsa core behaviour");
   }
   
 
@@ -92,20 +89,20 @@ class Step_Config3 extends setup_step
       /* Get attributes */
       foreach($this->attributes as $attr){
         if(isset($_POST[$attr])){
-          $this->$attr = validate($_POST[$attr]);
+          $this->$attr = validate(get_post($attr));
         }
       }
       
-      foreach(array("strict_units","noprimarygroup","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime","smbhash") as $name){
+      foreach(array("strict_units","noprimarygroup","forceglobals","forcessl","ldapstats","warnssl","compile","debuglevel","session_lifetime") as $name){
         if(isset($_POST[$name])){
-          $this->optional[$name] = stripslashes($_POST[$name]);
+          $this->optional[$name] = get_post($name);
         }
       } 
 
       if(isset($_POST['ppd_path_active'])){
         $this->optional['ppd_path_active'] = TRUE;
         if(isset($_POST['ppd_path'])){
-          $this->optional['ppd_path'] = $_POST['ppd_path'];
+          $this->optional['ppd_path'] = get_post('ppd_path');
         }
       }else{
         $this->optional['ppd_path_active'] = FALSE;
@@ -114,7 +111,7 @@ class Step_Config3 extends setup_step
       if(isset($_POST['max_ldap_query_time_active'])){
         $this->optional['max_ldap_query_time_active'] = TRUE;
         if(isset($_POST['max_ldap_query_time'])){
-          $this->optional['max_ldap_query_time'] = $_POST['max_ldap_query_time'];
+          $this->optional['max_ldap_query_time'] = get_post('max_ldap_query_time');
         }
       }else{
         $this->optional['max_ldap_query_time_active'] = FALSE;
@@ -123,16 +120,25 @@ class Step_Config3 extends setup_step
       if(isset($_POST['mailQueueScriptPath_active'])){
         $this->optional['mailQueueScriptPath_active'] = TRUE;
         if(isset($_POST['mailQueueScriptPath'])){
-          $this->optional['mailQueueScriptPath'] = $_POST['mailQueueScriptPath'];
+          $this->optional['mailQueueScriptPath'] = get_post('mailQueueScriptPath');
         }
       }else{
         $this->optional['mailQueueScriptPath_active'] = FALSE;
       }
 
+      if(isset($_POST['kioskpath_active'])){
+        $this->optional['kioskpath_active'] = TRUE;
+        if(isset($_POST['kioskpath'])){
+          $this->optional['kioskpath'] = get_post('kioskpath');
+        }
+      }else{
+        $this->optional['kioskpath_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'];
+          $this->optional['auto_network_hook'] = get_post('auto_network_hook');
         }
       }else{
         $this->optional['auto_network_hook_active'] = FALSE;
@@ -141,7 +147,7 @@ class Step_Config3 extends setup_step
       if(isset($_POST['notifydir_active'])){
         $this->optional['notifydir_active'] = TRUE;
         if(isset($_POST['notifydir'])){
-          $this->optional['notifydir'] = $_POST['notifydir'];
+          $this->optional['notifydir'] = get_post('notifydir');
         }
       }else{
         $this->optional['notifydir_active'] = FALSE;