Application templates cleanup

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

diff --git a/TODO b/TODO
index df89a184c8061363a3eb8725dc3fd83d4897e6dc..93150577c653dc9f6d613f33e258e1a2e30396e7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,9 +9,6 @@ Things to fix before 2.4:
 
 * FAI management
   - Add package configuration dialog 
-  - Make script entries binary
-
-* Add function to get GOto application templates -> filled variables, etc. (small fix)
 
 * Removing of the last element of objectgroups causes an error
   -> simple solution: member should be defined as MAY in gosaGroupOfNames?

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index 5b5ed3b3c79af05219ec433b76179287bbf91e10..ad4d3f163d12a2ab4f854b0e4da17aa328e1f2bf 100644 (file)
--- a/plugins/admin/applications/class_applicationGeneric.inc
+++ b/plugins/admin/applications/class_applicationGeneric.inc
@@ -59,13 +59,7 @@ class application extends plugin
 
 
   function generateTempalte(){
-       $str= "# This code is part of GOsa (https://gosa.gonicus.de)\n".
-           "#\n".
-            "# This program is free software; you can redistribute it and/or modify\n".
-            "# it under the terms of the GNU General Public License as published by\n".
-            "# the Free Software Foundation; either version 2 of the License, or\n".
-            "# (at your option) any later version.\n".
-            "#\n";
+       $str= "# This code is part of GOsa (https://gosa.gonicus.de)\n#\n";
 
        $names = $this->parent->by_object['applicationParameters']->option_name;
        $values = $this->parent->by_object['applicationParameters']->option_value;
@@ -79,13 +73,13 @@ class application extends plugin
        foreach($names as $index => $name){
 
                // Fix length
-               for($i = strlen($name) ; $i < 30 ; $i ++){
+               for($i = strlen($name) ; $i < 30 ; $i++){
                        $name= $name." ";
                }
                if((isset($values[$index]))&&(!empty($values[$index]))){
                        $str.= "# ".$name."\t(e.g. '".$values[$index]."')\n";
                }else{
-                       $str.= "# ".$name."\t(e.g. '' (empty))\n";
+                       $str.= "# ".$name."\t("._("no example").")\n";
                }
        }
        $str .= "#\n".
@@ -104,7 +98,7 @@ class application extends plugin
                 return ($display);
        }
 
-       if(isset($_POST['ScriptTemplate'])){
+#      if(isset($_POST['ScriptTemplate'])){
                $head = $this->generateTempalte();
                $scr  = $this->gotoLogonScript; 
                
@@ -115,7 +109,7 @@ class application extends plugin
                }
 
                $this->gotoLogonScript = $head.$scr;
-       }
+#      }
        
        if((isset($_POST['upLoad']))&&(isset($_FILES['ScriptFile']))){
                $str = file_get_contents($_FILES['ScriptFile']['tmp_name']);

diff --git a/plugins/admin/applications/generic.tpl b/plugins/admin/applications/generic.tpl
index f5dc7a3c356d5d12bd3eba3fb845701fa61d7f76..4c9bca773db10ba0eebb6a99b90edc914d78f2dd 100644 (file)
--- a/plugins/admin/applications/generic.tpl
+++ b/plugins/admin/applications/generic.tpl
@@ -82,7 +82,6 @@
                        <textarea name="gotoLogonScript" style='width:99%;height:220px;'>{$gotoLogonScript}</textarea>
                        <input type="file" name="ScriptFile" value="{t}Import{/t}">
                        <input type="submit" name="upLoad" value="{t}Upload{/t}">
-                       <input type="submit" name="ScriptTemplate" value="{t}Create template{/t}">
                </td>
        </tr>
 </table>