removed unused samrty assign in phoneaccount

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

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 3b3a00f818c05996a80dac85fe2a83d7ec66ff4a..b131b2b98073baf90ec4af893a31164d9a7877e7 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -234,7 +234,7 @@ class phoneAccount extends plugin
 
         /* in case of a combo box display a combobox with selected attr */
         if($type == "combo"){
-          $str="<select name='".$var."' >";
+          $str="<select name='".$var."' ".chkacl($this->acl, "goFonMacro").">";
           foreach(split(":",$default) as $choice){
             if($choosen==$choice){
               $str.="\n<option name='".$var."' value='".$choice."' selected>".$choice."</option>";
@@ -248,7 +248,7 @@ class phoneAccount extends plugin
         /* Display switch for true false*/
         if($type == "bool"){
 
-          $str="<select name='".$var."'>";
+          $str="<select name='".$var."' ".chkacl($this->acl, "goFonMacro").">";
 
           if($choosen){
             $str.="<option name='".$var."' value='0'>"._("false")."</option>";
@@ -262,7 +262,7 @@ class phoneAccount extends plugin
 
         /* display simple textfield */ 
         if($type=="string"){
-          $str="<input name='".$var."' value='".$choosen."'>";
+          $str="<input name='".$var."' value='".$choosen."' ".chkacl($this->acl, "goFonMacro").">";
         }
 
         /* create table entry*/
@@ -382,7 +382,7 @@ class phoneAccount extends plugin
 
 
 
-    /* Check box */
+    /* Check box * /
     if ($this->parent->by_object['mailAccount'] &&
         $this->parent->by_object['mailAccount']->is_account &&
         preg_match("/M/i", $this->goFonDeliveryMode)){
@@ -390,7 +390,8 @@ class phoneAccount extends plugin
     } else {
       $smarty->assign("fon_to_mail", "");
     }
-
+    
+   
     if (!isset($this->parent->by_object['mailAccount'])) {
       $smarty->assign("has_mailaccount", "false");
       $this->has_mailAccount= false;
@@ -400,7 +401,7 @@ class phoneAccount extends plugin
     } else {
       $smarty->assign("has_mailaccount", "true");
     }
-
+    */
     /* Show main page */
     $display.= $smarty->fetch(get_template_path('generic.tpl', TRUE, dirname(__FILE__)));
     return($display);
@@ -436,12 +437,13 @@ class phoneAccount extends plugin
         }
       }
 
+
       /* Check if mail account is active and correct the internal
-         reference to represent the current status. */
+         reference to represent the current status. * /
       if ($this->parent->by_object['mailAccount']->is_account){
         $this->has_mailAccount= TRUE;
       }
-
+      */
       /* Every macro in the select box are available */
       if((isset($_POST['macro']))){
         $this->macrostillavailable=true;
@@ -505,13 +507,13 @@ class phoneAccount extends plugin
   {
     plugin::save();
 
-    /* goFonAccount has "mail" as must! Block if no mailaddress is specified... */
+    /* goFonAccount has "mail" as must! Block if no mailaddress is specified... * /
     if (isset($this->parent->by_object['mailAccount']) &&
         !$this->parent->by_object['mailAccount']->is_account) {
 
       $this->goFonDeliveryMode= preg_replace("/M/i", "", $this->goFonDeliveryMode);
     }
-
+    */
     /* Save arrays */
     $this->attrs['telephoneNumber']= array();
     foreach ($this->phoneNumbers as $number){

diff --git a/plugins/gofon/phoneaccount/generic.tpl b/plugins/gofon/phoneaccount/generic.tpl
index 987980a51a8c8a741248c35a808791636dc65dd5..589534ff4b9d6ffd9468ed5f89806425346ef27a 100644 (file)
--- a/plugins/gofon/phoneaccount/generic.tpl
+++ b/plugins/gofon/phoneaccount/generic.tpl
@@ -59,10 +59,10 @@
                                        </td>
                                        <td>
                                                <img src="images/select_phone.png">
-                                                <select name="macro" onchange="document.mainform.submit()">
+                                                <select name="macro" onchange="document.mainform.submit()" {$telephoneNumberACL}>
                                               {html_options options=$macros selected=$macro}
                                             </select>
-                                                <input type="submit" name="refresh" value="{t}refresh{/t}">
+                                                <input type="submit" name="refresh" value="{t}refresh{/t}" {$goFonMacroACL}>
                                        </td>
                                </tr>
                        </table>