Removed kde_applications_menu from setup

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 6ebd81c10b40e650fee3cc29c8016b2176f335f9..e79bf76848ff7c5f210b6db9f8b585df2ffb679d 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -288,9 +288,6 @@
 {if $cv.optional.ppd_path_active}
                ppd_path="{$cv.optional.ppd_path}"
 {/if}
-{if $cv.optional.kde_applications_menu_active}
-               kde_applications_menu="{$cv.optional.kde_applications_menu}"
-{/if}
 {if $cv.optional.max_ldap_query_time_active}   
                max_ldap_query_time="{$cv.optional.max_ldap_query_time}"
 {/if}

diff --git a/setup/class_setupStep6a.inc b/setup/class_setupStep6a.inc
index 523d9d1eb91874735ea3494ded0cf2fbb738de49..9b1fd99b769c079b73f52795b3e9419996a1130c 100644 (file)
--- a/setup/class_setupStep6a.inc
+++ b/setup/class_setupStep6a.inc
@@ -29,8 +29,6 @@ class setup_step_6a extends setup_step
               "warnssl" => false,
               "ppd_path" => "/var/spool/ppd/",
               "ppd_path_active" => FALSE,
-              "kde_applications_menu" => "",
-              "kde_applications_menu_active" => FALSE,
               "compile" =>  "/var/spool/gosa",
               "debuglevel" => 0,
               "session_lifetime" => 7200,
@@ -119,15 +117,6 @@ class setup_step_6a extends setup_step
         $this->optional['ppd_path_active'] = FALSE;
       }
 
-      if(isset($_POST['kde_applications_menu_active'])){
-        $this->optional['kde_applications_menu_active'] = TRUE;
-        if(isset($_POST['kde_applications_menu'])){
-          $this->optional['kde_applications_menu'] = $_POST['kde_applications_menu'];
-        }
-      }else{
-        $this->optional['kde_applications_menu_active'] = FALSE;
-      }
-
       if(isset($_POST['max_ldap_query_time_active'])){
         $this->optional['max_ldap_query_time_active'] = TRUE;
         if(isset($_POST['max_ldap_query_time'])){

diff --git a/setup/setup_step6a.tpl b/setup/setup_step6a.tpl
index fbd365fad38c837afd07906d2c4c0926202ab722..7a218f9ef669dd970cef6e1d4892e0de1cb0898f 100644 (file)
--- a/setup/setup_step6a.tpl
+++ b/setup/setup_step6a.tpl
@@ -178,28 +178,6 @@
         </div>
     </div>
 
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Kde applications menu{/t}
-        </div>
-        <div class='step4_value'>
-            {if $optional.kde_applications_menu_active == FALSE}
-                <input type='checkbox' value='1' name='kde_applications_menu_active'
-                    onClick='changeState("kde_applications_menu");'>
-                <input style='width:90%' id='kde_applications_menu' name='kde_applications_menu' 
-                                       type='text' value='{$optional.kde_applications_menu}' disabled>
-            {else}
-                <input type='checkbox' value='1' name='kde_applications_menu_active' checked>
-                <input style='width:90%' id='kde_applications_menu' name='kde_applications_menu' 
-                                       type='text' value='{$optional.kde_applications_menu}'  >
-            {/if}
-        </div>
-        <div class='step4_status'>
-            {t}Infos in FAQ{/t}&nbsp;
-            <img class='center' 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}