removed application varnames strings

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

diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc
index 0da6070883cbf0801c0b21de26a18544dac8fbfa..4326f116bd06ff341d5d8c1e7d4f7afc0a145bb7 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacro.inc
+++ b/plugins/gofon/macro/class_gofonMacro.inc
@@ -10,7 +10,7 @@
 class macro extends plugin
 {
   /*! CLI vars */
-  var $cli_summary= "Handling of GOsa's application object";
+  var $cli_summary= "Handling of GOsa's macro object";
   /*! CLI vars */
   var $cli_description= "Some longer text\nfor help";
   /*! CLI vars */

diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index e6a852f906ef837af70f2c740bcde062fc9047b8..ba19f05af79b046d74363c5e9f8b078869aaa77c 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroManagement.inc
+++ b/plugins/gofon/macro/class_gofonMacroManagement.inc
@@ -66,9 +66,9 @@ class gofonMacro extends plugin
 
     /* Check sorting variable */
     if (!isset($this->macrotabs) &&
-        !isset($_POST['new_app']) &&
-        !isset($_POST['delete_app']) &&
-        !isset($_POST['select_app'])){
+        !isset($_POST['new_mac']) &&
+        !isset($_POST['delete_mac']) &&
+        !isset($_POST['select_mac'])){
       $this->reload();
     }
   
@@ -81,7 +81,7 @@ class gofonMacro extends plugin
     }
 
     /* New macro? */
-    if (isset($_POST['new_app'])){
+    if (isset($_POST['new_mac'])){
 
       /* By default we set 'dn' to 'new', all relevant plugins will
          react on this. */
@@ -100,7 +100,7 @@ class gofonMacro extends plugin
       unset ($_SESSION['objectinfo']);
     }
 
-    /* Finish apps edit is triggered by the tabulator dialog, so
+    /* Finish mac edit is triggered by the tabulator dialog, so
        the user wants to save edited data. Check and save at this
        point. */
     if (isset($_POST['edit_finish'])){
@@ -123,7 +123,7 @@ class gofonMacro extends plugin
           del_lock ($this->dn);
         }
 
-        /* There's no page reload so we have to read new apps at
+        /* There's no page reload so we have to read new mac at
            this point. */
         $this->reload ();
         unset ($this->macrotabs);
@@ -137,7 +137,7 @@ class gofonMacro extends plugin
     }
 
     /* User wants to edit data? */
-    if ((isset($_POST['select_app']) || (isset($_POST['edit_helper']) && $_POST['edit_helper'] == "1")) && isset($_POST['macrolists']) && $_POST['macrolists'] != ""){
+    if ((isset($_POST['select_mac']) || (isset($_POST['edit_helper']) && $_POST['edit_helper'] == "1")) && isset($_POST['macrolists']) && $_POST['macrolists'] != ""){
 
       /* Get 'dn' from posted 'macrolists', must be unique */
       $this->dn= trim($_POST['macrolists']);
@@ -163,7 +163,7 @@ class gofonMacro extends plugin
     }
 
     /* Remove user was requested */
-    if (isset($_POST['delete_app']) && isset($_POST['macrolists'])){
+    if (isset($_POST['delete_mac']) && isset($_POST['macrolists'])){
 
       /* Get 'dn' from posted 'uid' */
       $this->dn= trim($_POST['macrolists']);
@@ -194,7 +194,7 @@ class gofonMacro extends plugin
     }
 
     /* Confirmation for deletion has been passed. Group should be deleted. */
-    if (isset($_POST['delete_app_confirm'])){
+    if (isset($_POST['delete_macro_confirm'])){
 
       /* Some nice guy may send this as POST, so we've to check
          for the permissions again. */

diff --git a/plugins/gofon/macro/headpage.tpl b/plugins/gofon/macro/headpage.tpl
index 9662619d5e2e408511163fbb7ffeb38dbd9c044d..13660ad2ef2e2f1a63739f9f158edb8c4b1d161c 100755 (executable)
--- a/plugins/gofon/macro/headpage.tpl
+++ b/plugins/gofon/macro/headpage.tpl
@@ -13,9 +13,9 @@
                <option disabled>&nbsp;</option>
     </select>
     <br>
-    <input type=submit value="{t}New{/t}..." name="new_app">&nbsp;
-    <input type=submit value="{t}Edit{/t}" name="select_app">&nbsp;
-    <input type=submit value="{t}Delete{/t}" name="delete_app">&nbsp;
+    <input type=submit value="{t}New{/t}..." name="new_mac">&nbsp;
+    <input type=submit value="{t}Edit{/t}" name="select_mac">&nbsp;
+    <input type=submit value="{t}Delete{/t}" name="delete_mac">&nbsp;
     <input type=hidden name="edit_helper">
    </p>
   </div>

diff --git a/plugins/gofon/macro/remove.tpl b/plugins/gofon/macro/remove.tpl
index 6d3c769a3e63475817c966b04cd7ca966c8e0db4..c20ff3d8214bc6653e6dcf13ba7c6f2a9e168c81 100755 (executable)
--- a/plugins/gofon/macro/remove.tpl
+++ b/plugins/gofon/macro/remove.tpl
@@ -11,7 +11,7 @@
 </p>
 
 <p class="plugbottom">
- <input type=submit name="delete_app_confirm" value="{t}Delete{/t}">
+ <input type=submit name="delete_macro_confirm" value="{t}Delete{/t}">
  &nbsp;
  <input type=submit name="delete_cancel" value="{t}Cancel{/t}">
 </p>