Updated phoneAccount

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

diff --git a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc
index 403057da9e69560e0a0759359efb2e5821464b4a..7d5ad29e616bb607626b19269d8096ec2ceef2b9 100644 (file)
--- a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc
+++ b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc
@@ -1340,8 +1340,8 @@ class phoneAccount extends plugin
 
 
       /* Every macro in the select box are available */
-      if((isset($_POST['macro']))){
-        $this->macro = $_POST['macro'];
+      if((isset($_POST['selectedMacro']))){
+        $this->macro = get_post('selectedMacro');
         $this->macrostillavailable=true;
       }
 

diff --git a/gosa-plugins/gofon/gofon/phoneaccount/generic.tpl b/gosa-plugins/gofon/gofon/phoneaccount/generic.tpl
index 664eb17113da0cb7cf70c5c012a456c8f16c516a..c3befe26d1a9c76de717624eee34c3e17b46898a 100644 (file)
--- a/gosa-plugins/gofon/gofon/phoneaccount/generic.tpl
+++ b/gosa-plugins/gofon/gofon/phoneaccount/generic.tpl
@@ -1,11 +1,7 @@
 <table summary="{t}Phone numbers{/t}" style="width:100%">
  <tr>
   <td class='right-border'>
-   <h3>
-    {image path="plugins/gofon/images/banana.png"}
-
-    &nbsp;{t}Phone numbers{/t}
-   </h3>
+   <h3>{t}Phone numbers{/t}</h3>
 
 {if $multiple_support}
 
@@ -119,16 +115,14 @@
  <tr>
  <td style='width:50%'></td>
  </tr>
- <tr> <td style='width:50%'>  <h3>
-   {image path="plugins/gofon/images/select_macro.png"}
-
-   &nbsp;{t}Phone macro{/t}
-  </h3>
+ <tr> 
+  <td style='width:50%'>  
+  <h3>&nbsp;{t}Phone macro{/t}</h3>
   <table summary="{t}Phone macro{/t}">
    <tr>
     <td colspan=2>
 {render acl=$goFonMacroACL  checkbox=$multiple_support checked=$use_macro}
-     <select id="macro" name="macro" onchange="document.mainform.submit()" size=1>
+     <select id="macro" name="selectedMacro" onchange="document.mainform.submit()" size=1>
       {html_options options=$macros selected=$macro}
       <option disabled>&nbsp;</option>
      </select>