Updated layout

[gosa.git] / setup / class_setupStep_Config1.inc

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 91bf20f8d938b54cc84e27e9e6f8c0e4e395182a..5d4fbc3dc48b0ffdc532853b7e7cc6179099ee25 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -27,8 +27,11 @@ class Step_Config1 extends setup_step
   var $groupou    =  "ou=groups";
   var $peopledn   = "cn";
   var $uidbase    = 1000;
-  var $header_image = "images/ldapserver.png";
 
+  var $strict     = TRUE;
+
+  var $header_image = "images/ldapserver.png";
+  var $account_expiration  =FALSE;
   var $base_hook         = "/usr/bin/sudo myscript"; 
   var $base_hook_active  = FALSE; 
 
@@ -36,6 +39,9 @@ class Step_Config1 extends setup_step
   var $theme      = "default"; 
   var $errorlvl   = FALSE;
 
+  var $include_personal_title = FALSE;
+  var $rfc2307bis             = FALSE;
+
   var $pwd_rules  = array("pwminlen" => 6, 
                           "pwminlen_active" => FALSE,
                           "pwdiffer" => 5,
@@ -43,10 +49,15 @@ class Step_Config1 extends setup_step
                           "externalpwdhook" => "/path/to/your/script username oldpassword newpassword",
                           "externalpwdhook_active" => FALSE);
 
+  var $id_settings = array(       "idgen"         => "{%sn}-{%givenName[2-4]}",
+                                  "idgen_active"  => FALSE,
+                                  "minid"         => "100",
+                                  "minid_active"  => FALSE);
+
   var $crypt_methods  = array();
 
-  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl",
-                          "base_hook","base_hook_active");
+  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl","rfc2307bis",
+                          "base_hook","base_hook_active","account_expiration","strict","include_personal_title");
 
   function Step_Config1()
   {
@@ -71,6 +82,7 @@ class Step_Config1 extends setup_step
   {
     $smarty = get_smarty();
     $smarty->assign("peopledns",array("uid","cn"));
+    $smarty->assign("id_settings",$this->id_settings);
     $smarty->assign("crypt_methods",$this->crypt_methods);
     $smarty->assign("themes",$this->get_themes());
     $smarty->assign("pwd_rules",$this->pwd_rules);
@@ -98,6 +110,10 @@ class Step_Config1 extends setup_step
   {
     $message = array();
 
+    if(isset($this->id_settings['minid_active']) && !is_numeric($this->id_settings['minid'])){
+      $message[] = sprintf(_("The specified value for '%s' must be a numeric value"),_("GID / UID min id"));
+    }
+
     if(preg_match("/,$/",$this->peopleou)){
       $message[] =sprintf(_("Don't add a trailing comma to '%s'."),_("People storage ou"));
     }
@@ -130,6 +146,25 @@ class Step_Config1 extends setup_step
         }
       }
 
+      if(isset($_POST['minid_active'])){
+        $this->id_settings['minid_active'] = TRUE;
+        if(isset($_POST['minid'])){
+          $this->id_settings['minid'] = $_POST['minid'];
+        }
+      }else{
+        $this->id_settings['minid_active'] = FALSE;
+      }
+
+      /* Generic settings */
+      if(isset($_POST['idgen_active'])){
+        $this->id_settings['idgen_active'] = TRUE;
+        if(isset($_POST['idgen'])){
+          $this->id_settings['idgen'] = $_POST['idgen'];
+        }
+      }else{
+        $this->id_settings['idgen_active'] = FALSE;
+      }
+
       /* Get password settings */ 
       if(isset($_POST['pwdiffer_active'])){
         $this->pwd_rules['pwdiffer_active'] = TRUE;
@@ -184,7 +219,7 @@ class Step_Config1 extends setup_step
   function get_attributes()
   {
     $tmp = setup_step::get_attributes();
-    foreach(array("pwd_rules") as $attr){
+    foreach(array("pwd_rules","id_settings") as $attr){
       $tmp[$attr]= $this->$attr;
     }
     return($tmp);