X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fclass_setupStep_Config3.inc;h=ab31a3f3f3e2c72bf006c2069d0b7a0922eda0ea;hb=68503ecbb4d310b61ef8f1f32003fc739bacb237;hp=1c21c6a97aaa2c32728b9742d230fbbe036d5ef1;hpb=2eba5d4da490a3922cd70ddfa6d5642564a624b9;p=gosa.git

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 1c21c6a97..ab31a3f3f 100644
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -22,10 +22,12 @@
 
 class Step_Config3 extends setup_step
 {
+  var $header_image= "images/ldapserver.png";
   var $optional = array(
-              "enableCopyPaste" => false,
+              "strict_units" => false,
               "forceglobals" => true,
               "forcessl" => false,
+              "ldapstats" => false,
               "warnssl" => true,
               "ppd_path" => "/var/spool/ppd/",
               "ppd_path_active" => FALSE,
@@ -44,32 +46,23 @@ class Step_Config3 extends setup_step
               "notifydir" => "",
               "notifydir_active" => FALSE,
 
-              "noprimarygroup"  => FALSE,
-              "smbhash" => 'SMBHASH');
+              "kioskpath" => "/var/spool/kiosk",
+              "kioskpath_active" => FALSE,
+
+              "noprimarygroup"  => FALSE);
 
 
   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");
   }
   
 
@@ -77,17 +70,11 @@ class Step_Config3 extends setup_step
   {
     $smarty = get_smarty();
     $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
-
     $smarty->assign("optional", $this->optional);
-
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
     }
-
-    $smarty->assign("warnings" ,$this->check());
-    $smarty->assign("warnings_cnt" ,count($this->check()));
-
-    return($smarty -> fetch (get_template_path("../setup/setup_step6a.tpl")));
+    return($smarty -> fetch (get_template_path("../setup/setup_config3.tpl")));
   }
 
 
@@ -102,7 +89,7 @@ class Step_Config3 extends setup_step
         }
       }
       
-      foreach(array("noprimarygroup","enableCopyPaste","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]);
         }
@@ -135,6 +122,15 @@ class Step_Config3 extends setup_step
         $this->optional['mailQueueScriptPath_active'] = FALSE;
       }
 
+      if(isset($_POST['kioskpath_active'])){
+        $this->optional['kioskpath_active'] = TRUE;
+        if(isset($_POST['kioskpath'])){
+          $this->optional['kioskpath'] = $_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'])){