Implemented kiosk path

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 98837ef31a7a2b6284ac8e5cbc83bb8f5b24f152..0232dd5b2f9aa73388c1c4ca09678e745386f071 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -7,7 +7,9 @@
                        <plugin acl="default" class="posixAccount" icon="posix.png"
                                path="plugins/personal/posix" />
                        <plugin acl="default" class="environment" icon="env.png"
-                               kioskpath="/var/spool/kiosk"
+{if $cv.optional.kioskpath_active}
+                               kioskpath="{$cv.optional.kioskpath}"
+{/if}
                                path="plugins/personal/environment" />
                        <plugin acl="default" class="mailAccount" icon="email.png"
                                path="plugins/personal/mail" />

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 1721d561a6b549bd05e662cec2c9b9e49bc546db..7eb549101daa9846cc95c2da450790cb8b8d1af6 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -44,6 +44,9 @@ class Step_Config3 extends setup_step
               "notifydir" => "",
               "notifydir_active" => FALSE,
 
+              "kioskpath" => "/var/spool/kiosk",
+              "kioskpath_active" => FALSE,
+
               "noprimarygroup"  => FALSE,
               "smbhash" => 'SMBHASH');
 
@@ -129,6 +132,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'])){

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index 56b6e8001d547107416685e662cdbe11f7a0f89c..c068fa987ef220549972bf1fff8cf4f27e201d0f 100644 (file)
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -170,6 +170,28 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Kiosk path{/t}
+        </div>
+        <div class='step4_value'>
+            {if $optional.kioskpath_active == FALSE}
+                <input type='checkbox' value='1' name='kioskpath_active'
+                    onClick='changeState("kioskpath");'>
+                <input style='width:90%' id='kioskpath' name='kioskpath' 
+                                       type='text' value='{$optional.kioskpath}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='kioskpath_active' checked>
+                <input style='width:90%' id='kioskpath' name='kioskpath' 
+                                       type='text' value='{$optional.kioskpath}'  >
+            {/if}
+        </div>
+        <div class='step4_status'>
+            {t}Infos in FAQ{/t}&nbsp;
+            <img class='center'  alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
+        </div>
+    </div>
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Smarty compile directory{/t}