Closes #274 - Tries to close this with last commit failed. I've forgotten to add...

[gosa.git] / setup / class_setupStep_Config3.inc

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index cc27eb870638c25e3a5da5b34acf5895e5b7767a..f0f30057c2e57cad7f5a8ce3fc5e9095446ac35a 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -24,17 +24,24 @@ class Step_Config3 extends setup_step
 {
   var $header_image= "images/ldapserver.png";
 
-  var $errorlvl   = FALSE;
+  var $errorlvl   = TRUE;
 
+  var $login_attributes = array("uid"       => "uid", 
+                                "mail"      => "mail",
+                                "uid,mail"  => "both");
   var $optional = array(
+              "login_attribute" => "uid",
               "strict_units" => false,
+              "list_summary" => false,
               "forceglobals" => true,
               "forcessl" => false,
               "ldapstats" => false,
               "warnssl" => true,
+              "user_filter_cookie" => true,
               "ppd_path" => "/var/spool/ppd/",
               "ppd_path_active" => FALSE,
               "compile" =>  "/var/spool/gosa",
+              "snmpcommunity" =>  "goto",
               "debuglevel" => 0,
               "session_lifetime" => 7200,
               "max_ldap_query_time" => "5.0",
@@ -52,6 +59,9 @@ class Step_Config3 extends setup_step
               "kioskpath" => "/var/spool/kiosk",
               "kioskpath_active" => FALSE,
 
+              "gotomasses_file"   => "/etc/gosa/gotomasses",
+              "gotomasses_active" => FALSE,
+
               "noprimarygroup"  => FALSE);
 
   var $attributes = array("errorlvl");
@@ -78,6 +88,7 @@ class Step_Config3 extends setup_step
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
     }
+    $smarty->assign("login_attributes",$this->login_attributes);
     return($smarty -> fetch (get_template_path("../setup/setup_config3.tpl")));
   }
 
@@ -93,7 +104,7 @@ class Step_Config3 extends setup_step
         }
       }
       
-      foreach(array("strict_units","noprimarygroup","forceglobals","forcessl","ldapstats","warnssl","compile","debuglevel","session_lifetime") as $name){
+      foreach(array("login_attribute","list_summary","strict_units","snmpcommunity","noprimarygroup","forceglobals","forcessl","ldapstats","user_filter_cookie","warnssl","compile","debuglevel","session_lifetime") as $name){
         if(isset($_POST[$name])){
           $this->optional[$name] = get_post($name);
         }
@@ -135,6 +146,15 @@ 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'])){