X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fclass_setupStep_Config3.inc;h=22cf4ad54d4941aa704dec4722f257abd9cbb116;hb=a2fa0591b053f7dc2e2d3a36eab9d991f350b700;hp=cd62785e3b9c751505cbdb0797a924b07612a27e;hpb=aee4003e15f93513b24b2be0fc6352716249054d;p=gosa.git

diff --git a/gosa-core/setup/class_setupStep_Config3.inc b/gosa-core/setup/class_setupStep_Config3.inc
index cd62785e3..22cf4ad54 100644
--- a/gosa-core/setup/class_setupStep_Config3.inc
+++ b/gosa-core/setup/class_setupStep_Config3.inc
@@ -22,9 +22,9 @@
 
 class Step_Config3 extends setup_step
 {
-  var $header_image= "images/ldapserver.png";
+  var $header_image = "images/setup/server.png";
 
-  var $errorlvl   = TRUE;
+  var $errorlvl   = false;
 
   var $login_attributes = array("uid"       => "uid", 
                                 "mail"      => "mail",
@@ -32,7 +32,7 @@ class Step_Config3 extends setup_step
   var $optional = array(
               "login_attribute" => "uid",
               "strict_units" => false,
-              "list_summary" => false,
+              "list_summary" => true,
               "forceglobals" => true,
               "forcessl" => false,
               "ldapstats" => false,
@@ -53,13 +53,17 @@ class Step_Config3 extends setup_step
               "notifydir" => "",
               "notifydir_active" => FALSE,
 
+              "gosaSupportURI" => "gosa-si-secret@server:20081",
+              "gosaSupportTimeout" => 15,
+              "gosaSupportURI_active" => FALSE,
+
               "uniq_identifier" => "entryCSN",
               "uniq_identifier_active" => TRUE,
 
               "kioskpath" => "/var/spool/kiosk",
               "kioskpath_active" => FALSE,
 
-              "sudoou"   => "ou=sudoers,%BASE%",
+              "sudoou"   => "ou=sudoers",
               "sudoou_active" => FALSE,
 
               "noprimarygroup"  => FALSE);
@@ -87,13 +91,13 @@ class Step_Config3 extends setup_step
     $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",
+    $smarty->assign("uniq_identifiers",array( "entryCSN" => "entryCSN",
                                               "contextCSN"=>"contextCSN" ));
 
     
-    $smarty->assign("optional", $this->optional);
+    $smarty->assign("optional", reverse_html_entities($this->optional));
     foreach($this->attributes as $attr){
-      $smarty->assign($attr,$this->$attr);
+      $smarty->assign($attr,reverse_html_entities($this->$attr));
     }
     $smarty->assign("login_attributes",$this->login_attributes);
     return($smarty -> fetch (get_template_path("../setup/setup_config3.tpl")));
@@ -171,6 +175,16 @@ class Step_Config3 extends setup_step
         $this->optional['notifydir_active'] = FALSE;
       }
 
+      if(isset($_POST['gosaSupportURI_active'])){
+        $this->optional['gosaSupportURI_active'] = TRUE;
+        if(isset($_POST['gosaSupportURI'])){
+          $this->optional['gosaSupportURI'] = get_post('gosaSupportURI');
+          $this->optional['gosaSupportTimeout'] = get_post('gosaSupportTimeout');
+        }
+      }else{
+        $this->optional['gosaSupportURI_active'] = FALSE;
+      }
+
       if(isset($_POST['uniq_identifier_active'])){
         $this->optional['uniq_identifier_active'] = TRUE;
         if(isset($_POST['uniq_identifier'])){