Updated setup to allow gosa-si settings.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13793 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index d09bf2ed7f872a67860c829586fba3bcd1025e1b..a5c03e542280965a279988801d72e4a0ae59980e 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -457,6 +457,13 @@
 {if $cv.optional.sudoou_active}
               sudoRDN="{$cv.optional.sudoou}"
 {/if}
+{if $cv.optional.gosaSupportURI_active}
+              gosaSupportURI="{$cv.optional.gosaSupportURI}"
+              gosaSupportTimeout="{$cv.optional.gosaSupportTimeout}"
+{else}
+              disabled_gosaSupportURI="gosa-si-secret@server:20081}"
+              disabled_gosaSupportTimeout="15"
+{/if}
 {if $cv.optional.login_attribute}
               loginAttribute="{$cv.optional.login_attribute}"
 {else}

diff --git a/gosa-core/setup/class_setupStep_Config3.inc b/gosa-core/setup/class_setupStep_Config3.inc
index 41da0586d497d24332ca72e06bda775df379ccf3..1592df8389192b065f85d7efd30ac2b9db5a7ede 100644 (file)
--- a/gosa-core/setup/class_setupStep_Config3.inc
+++ b/gosa-core/setup/class_setupStep_Config3.inc
@@ -53,6 +53,10 @@ 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,
 
@@ -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'])){

diff --git a/gosa-core/setup/setup_config3.tpl b/gosa-core/setup/setup_config3.tpl
index bfcaac07fdc218aa9af64133cc0b74ee3ca26889..1dfa10d27e05024308c36cc112e22ff339c67429 100644 (file)
--- a/gosa-core/setup/setup_config3.tpl
+++ b/gosa-core/setup/setup_config3.tpl
@@ -169,6 +169,41 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Gosa support daemon{/t}
+        </div>
+        <div class='step4_value'>
+            {if $optional.gosaSupportURI_active == FALSE}
+                <input type='checkbox' value='1' name='gosaSupportURI_active'
+                  onClick='changeState("gosaSupportURI");changeState("gosaSupportTimeout");'>
+                <input size=40 id='gosaSupportURI' name='gosaSupportURI' 
+                                               type='text' value='{$optional.gosaSupportURI}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='gosaSupportURI_active' checked 
+                                               onClick='changeState("gosaSupportURI");changeState("gosaSupportTimeout");'>
+                <input size=40 id='gosaSupportURI' name='gosaSupportURI' 
+                                               type='text' value='{$optional.gosaSupportURI}'  >
+            {/if}
+        </div>
+    </div>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Daemon timeout{/t}
+        </div>
+        <div class='step4_value'>
+            {if $optional.gosaSupportURI_active == FALSE}
+                <input size=40 id='gosaSupportTimeout' name='gosaSupportTimeout' 
+                                               type='text' value='{$optional.gosaSupportTimeout}' disabled>
+            {else}
+                <input size=40 id='gosaSupportTimeout' name='gosaSupportTimeout' 
+                                               type='text' value='{$optional.gosaSupportTimeout}'  >
+            {/if}
+        </div>
+    </div>
+
+
     <p><b>{t}Login and session{/t}</b></p>
     <div class='step4_container'>
         <div class='step4_name'>