'Added acls to ogroup-phonequeue settings

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

diff --git a/plugins/admin/ogroups/class_mailogroup.inc b/plugins/admin/ogroups/class_mailogroup.inc
index 33aaf01207c67ced96cd1d3a6b4eac6a6a800cdf..aa11b64a9b7dacc665b8dde8b4f9b4cb47d233b2 100644 (file)
--- a/plugins/admin/ogroups/class_mailogroup.inc
+++ b/plugins/admin/ogroups/class_mailogroup.inc
@@ -26,12 +26,16 @@ class mailogroup extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-       plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     /* Do we need to flip is_account state? */
-    if (isset($_POST['modify_state'])){
-      $this->is_account= !$this->is_account;
+    if(isset($_POST['modify_state'])){
+      if($this->is_account && $this->acl_is_removeable()){
+        $this->is_account= FALSE;
+      }elseif(!$this->is_account && $this->acl_is_createable()){
+        $this->is_account= TRUE;
+      }
     }
 
     /* Show tab dialog headers */

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index 22f235db27b7cf2230bc8f12a62727f2f42ceded..e47ae9c61aa2671811af35c78eddbb1b1cd90229 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -10,12 +10,12 @@ class phonequeue extends plugin
   var $goFonTimeOut             ="20"; 
   var $goFonMaxLen              ="20"; // 
   var $goFonAnnounceFrequency   ="60"; // Annouce Frequency in seconds
-  var $goFonDialOption_t        ="";
-  var $goFonDialOption_T        ="";
-  var $goFonDialOption_h        ="";
-  var $goFonDialOption_r        ="";
+  var $goFonDialOptiont        ="";
+  var $goFonDialOptionT        ="";
+  var $goFonDialOptionh        ="";
+  var $goFonDialOptionr        ="";
   var $goFonQueueAnnounce       ="gonicus-berlin-welcome";
-  var $goFonDialOption_H        ="";
+  var $goFonDialOptionH        ="";
   var $goFonMusiconHold         ="default";
   var $goFonWelcomeMusic        ="gonicus-berlin-welcome";
   var $goFonQueueReportHold     ="yes";
@@ -41,9 +41,9 @@ class phonequeue extends plugin
   var $old_phone_numbers        =array();
 
   /* attribute list for save action */
-  var $attributes= array( "goFonTimeOut","goFonMaxLen","goFonAnnounceFrequency","goFonDialOption_t","goFonDialOption_T",
-      "goFonDialOption_h","goFonDialOption_r","cn",
-      "goFonDialOption_H","goFonMusiconHold","goFonWelcomeMusic","goFonQueueReportHold","goFonQueueYouAreNext",
+  var $attributes= array( "goFonTimeOut","goFonMaxLen","goFonAnnounceFrequency","goFonDialOptiont","goFonDialOptionT",
+      "goFonDialOptionh","goFonDialOptionr","cn",
+      "goFonDialOptionH","goFonMusiconHold","goFonWelcomeMusic","goFonQueueReportHold","goFonQueueYouAreNext",
       "goFonQueueThereAre","goFonQueueCallsWaiting","goFonQueueThankYou","goFonQueueMinutes","goFonQueueSeconds","goFonQueueLessThan",
       "telephoneNumber","goFonQueueLanguage","goFonQueueStrategy","goFonQueueAnnounceHoldtime","goFonQueueAnnounce","goFonDialOption","goFonQueueRetry");
   /* ObjectClass */
@@ -66,7 +66,7 @@ class phonequeue extends plugin
       }
 
       for($i = 0; $i < strlen($this->goFonDialOption); $i++){
-        $name = "goFonDialOption_".$this->goFonDialOption[$i];
+        $name = "goFonDialOption".$this->goFonDialOption[$i];
         $this->$name=$this->goFonDialOption[$i];
       }
     }
@@ -99,12 +99,16 @@ class phonequeue extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-       plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     /* Do we need to flip is_account state? */
-    if (isset($_POST['modify_state'])){
-      $this->is_account= !$this->is_account;
+    if(isset($_POST['modify_state'])){
+      if($this->is_account && $this->acl_is_removeable()){
+        $this->is_account= FALSE;
+      }elseif(!$this->is_account && $this->acl_is_createable()){
+        $this->is_account= TRUE;
+      }
     }
 
     /* Show tab dialog headers */
@@ -120,15 +124,19 @@ class phonequeue extends plugin
     }
 
     /* Add queue number */ 
-    if(isset($_POST['add_phonenumber'])&&(isset($_POST['phonenumber']))&&(!empty($_POST['phonenumber']))){
-      if((!in_array($_POST['phonenumber'],$this->telephoneNumber))&&(is_numeric($_POST['phonenumber']))){
-        $this->telephoneNumber[]=$_POST['phonenumber'];
+    if($this->acl_is_writeable("telephoneNumber")){
+      if(isset($_POST['add_phonenumber'])&&(isset($_POST['phonenumber']))&&(!empty($_POST['phonenumber']))){
+        if((!in_array($_POST['phonenumber'],$this->telephoneNumber))&&(is_numeric($_POST['phonenumber']))){
+          $this->telephoneNumber[]=$_POST['phonenumber'];
+        }
       }
     }
 
     /* Delete queue number */ 
-    if(isset($_POST['delete_phonenumber'])&&(isset($_POST['goFonQueueNumber_List']))){
-      unset($this->telephoneNumber[$_POST['goFonQueueNumber_List']]);
+    if($this->acl_is_writeable("telephoneNumber")){
+      if(isset($_POST['delete_phonenumber'])&&(isset($_POST['goFonQueueNumber_List']))){
+        unset($this->telephoneNumber[$_POST['goFonQueueNumber_List']]);
+      }
     }
   
     $tmp = array();
@@ -140,27 +148,35 @@ class phonequeue extends plugin
     $this->telephoneNumber=$tmp;
 
     /* queue number up */ 
-    if(isset($_POST['up_phonenumber'])&&(isset($_POST['goFonQueueNumber_List']))){
-      if($_POST['goFonQueueNumber_List']>0){
-        $up   = $this->telephoneNumber[$_POST['goFonQueueNumber_List']];
-        $down = $this->telephoneNumber[$_POST['goFonQueueNumber_List']-1];
-        $this->telephoneNumber[$_POST['goFonQueueNumber_List']]    = $down; 
-        $this->telephoneNumber[$_POST['goFonQueueNumber_List']-1]  = $up;
+    if($this->acl_is_writeable("telephoneNumber")){
+      if(isset($_POST['up_phonenumber'])&&(isset($_POST['goFonQueueNumber_List']))){
+        if($_POST['goFonQueueNumber_List']>0){
+          $up   = $this->telephoneNumber[$_POST['goFonQueueNumber_List']];
+          $down = $this->telephoneNumber[$_POST['goFonQueueNumber_List']-1];
+          $this->telephoneNumber[$_POST['goFonQueueNumber_List']]    = $down; 
+          $this->telephoneNumber[$_POST['goFonQueueNumber_List']-1]  = $up;
+        }
       }
-    }
 
-    /* Queuenumber down */ 
-    if(isset($_POST['down_phonenumber'])&&(isset($_POST['goFonQueueNumber_List']))){
-      if(isset($this->telephoneNumber[($_POST['goFonQueueNumber_List']+1)])){
-        $up   = $this->telephoneNumber[$_POST['goFonQueueNumber_List']+1];
-        $down = $this->telephoneNumber[$_POST['goFonQueueNumber_List']];
-        $this->telephoneNumber[$_POST['goFonQueueNumber_List']+1]    = $down; 
-        $this->telephoneNumber[$_POST['goFonQueueNumber_List']]  = $up;
+      /* Queuenumber down */ 
+      if(isset($_POST['down_phonenumber'])&&(isset($_POST['goFonQueueNumber_List']))){
+        if(isset($this->telephoneNumber[($_POST['goFonQueueNumber_List']+1)])){
+          $up   = $this->telephoneNumber[$_POST['goFonQueueNumber_List']+1];
+          $down = $this->telephoneNumber[$_POST['goFonQueueNumber_List']];
+          $this->telephoneNumber[$_POST['goFonQueueNumber_List']+1]    = $down; 
+          $this->telephoneNumber[$_POST['goFonQueueNumber_List']]  = $up;
+        }
       }
     }
 
     $smarty= get_smarty();
 
+    /* Set acls */
+    $tmp = $this->plInfo();
+    foreach($tmp['plProvidedAcls'] as $name => $translated){
+      $smarty->assign($name."ACL",$this->getacl($name));
+    }
+
     $smarty->assign("goFonQueueLanguageOptions",array('de'=>_('German')));
     $smarty->assign("goFonQueueStrategyOptions", $this->goFonQueueStrategyOptions);
 
@@ -172,12 +188,6 @@ class phonequeue extends plugin
       }else{
         $smarty->assign($val."CHK"," checked ");
       }
-
-      if(chkacl($this->acl,$key)==""){
-        $smarty->assign($val."ACL","");
-      }else{
-        $smarty->assign($val."ACL"," disabled ");
-      }
     }
     return ($display.$smarty->fetch (get_template_path('phonequeue.tpl', TRUE)));
   }
@@ -410,11 +420,11 @@ class phonequeue extends plugin
           $a_ext[$i]['app']      = "Queue";
           $a_ext[$i]['appdata']  =  $this->attrs['cn'][0].
             "|".
-            $this->goFonDialOption_t.
-            $this->goFonDialOption_T.
-            $this->goFonDialOption_h.
-            $this->goFonDialOption_H.
-            $this->goFonDialOption_r;
+            $this->goFonDialOptiont.
+            $this->goFonDialOptionT.
+            $this->goFonDialOptionh.
+            $this->goFonDialOptionH.
+            $this->goFonDialOptionr;
         }
 
         if($this->goFonQueueAnnounceHoldtime != false) {
@@ -538,7 +548,7 @@ class phonequeue extends plugin
   {
     plugin::save_object();  
     if(isset($_POST['phonenumber'])){
-      foreach(array("goFonDialOption_t","goFonDialOption_T","goFonDialOption_h","goFonDialOption_r","goFonDialOption_H","goFonMusiconHold") as $val){
+      foreach(array("goFonDialOptiont","goFonDialOptionT","goFonDialOptionh","goFonDialOptionr","goFonDialOptionH","goFonMusiconHold") as $val){
         if(isset($_POST[$val])){
           $this->$val = $_POST[$val];
         }else{
@@ -565,7 +575,7 @@ class phonequeue extends plugin
 
     plugin::save();
     $this->attrs['goFonDialOption'] = "";
-    foreach(array("goFonDialOption_t","goFonDialOption_T","goFonDialOption_r","goFonDialOption_h","goFonDialOption_H","cn") as $val){
+    foreach(array("goFonDialOptiont","goFonDialOptionT","goFonDialOptionr","goFonDialOptionh","goFonDialOptionH","cn") as $val){
       $this->attrs['goFonDialOption'].=$this->$val; 
       unset($this->attrs[$val]); 
     }
@@ -627,7 +637,7 @@ class phonequeue extends plugin
 
     /* Remove all temporary attributes */
     $tmp = array_flip($this->attributes);
-    foreach(array("goFonDialOption_t","goFonDialOption_T","goFonDialOption_r","goFonDialOption_h","goFonDialOption_H","cn") as $val){
+    foreach(array("goFonDialOptiont","goFonDialOptionT","goFonDialOptionr","goFonDialOptionh","goFonDialOptionH","cn") as $val){
       unset($this->$val);
       unset($this->attrs[$val]);
       unset($tmp[$val]);
@@ -717,11 +727,11 @@ class phonequeue extends plugin
             "goFonTimeOut"              => _("Timeout"),
             "goFonMaxLen"               => _("Max queue length"),
             "goFonAnnounceFrequency"    => _("Announce frequency"),
-            "goFonDialOption_t"         => _("Allow the called user to transfer his call"),
-            "goFonDialOption_T"         => _("Allows calling user to transfer call"),
-            "goFonDialOption_h"         => _("Allow the called to hangup by pressing *"),
-            "goFonDialOption_r"         => _("Ring instead of playing background music"),
-            "goFonDialOption_H"         => _("Allows calling to hangup by pressing *"),
+            "goFonDialOptiont"         => _("Allow the called user to transfer his call"),
+            "goFonDialOptionT"         => _("Allows calling user to transfer call"),
+            "goFonDialOptionh"         => _("Allow the called to hangup by pressing *"),
+            "goFonDialOptionr"         => _("Ring instead of playing background music"),
+            "goFonDialOptionH"         => _("Allows calling to hangup by pressing *"),
 
             "goFonMusiconHold"          => _("Music on hold"),
             "goFonWelcomeMusic"         => _("Welcome music"),

diff --git a/plugins/admin/ogroups/phonequeue.tpl b/plugins/admin/ogroups/phonequeue.tpl
index 95f7b52e49b278e362e3ca6defdb1476daa86b8d..9a2ea4046e900515ec2ca6671fa042befb999a34 100644 (file)
--- a/plugins/admin/ogroups/phonequeue.tpl
+++ b/plugins/admin/ogroups/phonequeue.tpl
@@ -8,21 +8,33 @@
                  <table summary="{t}Generic queue Settings{/t}">
                   <tr>
                    <td>
-                       <select style="width:300px; height:60px;" name="goFonQueueNumber_List" size=6 {$telephoneNumberACL}>
+{render acl=$telephoneNumberACL}
+                       <select style="width:300px; height:60px;" name="goFonQueueNumber_List" size=6>
                        {html_options options=$telephoneNumber}
                        <option disabled>&nbsp;</option>
                        </select>
+{/render}
                </td>
                <td style="vertical-align:center">
-                       <input type="submit" value="{t}Up{/t}"          name="up_phonenumber"           {$telephoneNumberACL}><br>
-                       <input type="submit" value="{t}Down{/t}"        name="down_phonenumber"         {$telephoneNumberACL}>
+{render acl=$telephoneNumberACL}
+                       <input type="submit" value="{t}Up{/t}"          name="up_phonenumber"><br>
+{/render}
+{render acl=$telephoneNumberACL}
+                       <input type="submit" value="{t}Down{/t}"        name="down_phonenumber">
+{/render}
                </td>
                </tr>
                <tr>
                 <td colspan=2>
-                       <input name="phonenumber" size=20 align=middle maxlength=60                     {$telephoneNumberACL} value="">
-                       <input type="submit" value="{t}Add{/t}"         name="add_phonenumber"          {$telephoneNumberACL}>&nbsp;
-                       <input type="submit" value="{t}Delete{/t}"      name="delete_phonenumber"       {$telephoneNumberACL}>
+{render acl=$telephoneNumberACL}
+                       <input name="phonenumber" size=20 align=middle maxlength=60 value="">
+{/render}
+{render acl=$telephoneNumberACL}
+                       <input type="submit" value="{t}Add{/t}"         name="add_phonenumber" >&nbsp;
+{/render}
+{render acl=$telephoneNumberACL}
+                       <input type="submit" value="{t}Delete{/t}"      name="delete_phonenumber" >
+{/render}
             </td>
                </tr>
                </table>
@@ -35,10 +47,12 @@
                        {t}Language{/t} 
                </td>
                <td>
-                       <select name="goFonQueueLanguage" {$goFonQueueLanguageACL}>
+{render acl=$goFonQueueLanguageACL}
+                       <select name="goFonQueueLanguage">
                        {html_options options=$goFonQueueLanguageOptions selected=$goFonQueueLanguage}
                        <option disabled>&nbsp;</option>
                        </select>
+{/render}
                </td>
                </tr>
                <tr>
@@ -46,7 +60,9 @@
                        {t}Timeout{/t}
                </td>
                <td>
-                       <input name='goFonTimeOut' value='{$goFonTimeOut}' {$goFonTimeOutACL}>
+{render acl=$goFonTimeOutACL}
+                       <input name='goFonTimeOut' value='{$goFonTimeOut}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -54,7 +70,9 @@
                        {t}Retry{/t}
                </td>
                <td>
-                       <input name='goFonQueueRetry' value='{$goFonQueueRetry}' {$goFonQueueRetryACL}>
+{render acl=$goFonQueueRetryACL}
+                       <input name='goFonQueueRetry' value='{$goFonQueueRetry}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -62,10 +80,12 @@
                        {t}Strategy{/t} 
                </td>
                <td>
-                       <select name="goFonQueueStrategy" {$goFonQueueStrategyACL}>
+{render acl=$goFonQueueStrategyACL}
+                       <select name="goFonQueueStrategy">
             {html_options options=$goFonQueueStrategyOptions selected=$goFonQueueStrategy}
             <option disabled>&nbsp;</option>
             </select>
+{/render}
        
                </td>
                </tr>
@@ -74,7 +94,9 @@
                        {t}Max queue length{/t}
                </td>
                <td>
-                       <input name='goFonMaxLen' value='{$goFonMaxLen}' {$goFonMaxLenACL}>     
+{render acl=$goFonMaxLenACL}
+                       <input name='goFonMaxLen' value='{$goFonMaxLen}'>       
+{/render}
                </td>
                </tr>
                <tr>
@@ -82,7 +104,9 @@
                        {t}Announce frequency{/t}
                </td>
                <td>
-                       <input name='goFonAnnounceFrequency' value='{$goFonAnnounceFrequency}' {$goFonAnnounceFrequencyACL}>
+{render acl=$goFonAnnounceFrequencyACL}
+                       <input name='goFonAnnounceFrequency' value='{$goFonAnnounceFrequency}'>
+{/render}
                        {t}(in seconds){/t}     
                </td>
                </tr>
@@ -99,7 +123,9 @@
                        {t}Use music on hold instead of ringing{/t}
                </td>
                <td>
-                       <input type="checkbox" name='goFonMusiconHold' value='1' {$goFonMusiconHoldCHK} {$goFonMusiconHoldACL}>
+{render acl=goFonMusiconHoldACL}
+                       <input type="checkbox" name='goFonMusiconHold' value='1' {$goFonMusiconHoldCHK}>
+{/render}
                </td>
                </tr>
                -->
@@ -108,7 +134,9 @@
                        {t}Music on hold{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonMusiconHold' value='{$goFonMusiconHold}' {$goFonMusiconHoldACL}>
+{render acl=$goFonMusiconHoldACL}
+                       <input type="text" style='width:250px;' name='goFonMusiconHold' value='{$goFonMusiconHold}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -116,7 +144,9 @@
                        {t}Welcome sound file{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonWelcomeMusic' value='{$goFonWelcomeMusic}' {$goFonWelcomeMusicACL}>
+{render acl=$goFonWelcomeMusicACL}
+                       <input type="text" style='width:250px;' name='goFonWelcomeMusic' value='{$goFonWelcomeMusic}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -124,7 +154,9 @@
                        {t}Announce message{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonQueueAnnounce' value='{$goFonQueueAnnounce}' {$goFonQueueAnnounceACL}>
+{render acl=$goFonQueueAnnounceACL}
+                       <input type="text" style='width:250px;' name='goFonQueueAnnounce' value='{$goFonQueueAnnounce}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -132,7 +164,9 @@
                        {t}Sound file for 'You are next ...'{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonQueueYouAreNext' value='{$goFonQueueYouAreNext}' {$goFonQueueYouAreNextACL}>
+{render acl=$goFonQueueYouAreNextACL}
+                       <input type="text" style='width:250px;' name='goFonQueueYouAreNext' value='{$goFonQueueYouAreNext}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -140,7 +174,9 @@
                        {t}'There are ...'{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonQueueThereAre' value='{$goFonQueueThereAre}' {$goFonQueueThereAreACL}>
+{render acl=$goFonQueueThereAreACL}
+                       <input type="text" style='width:250px;' name='goFonQueueThereAre' value='{$goFonQueueThereAre}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -148,7 +184,9 @@
                        {t}'... calls waiting'{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonQueueCallsWaiting' value='{$goFonQueueCallsWaiting}' {$goFonQueueCallsWaitingACL}>
+{render acl=$goFonQueueCallsWaitingACL}
+                       <input type="text" style='width:250px;' name='goFonQueueCallsWaiting' value='{$goFonQueueCallsWaiting}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -156,7 +194,9 @@
                        {t}'Thank you' message{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonQueueThankYou' value='{$goFonQueueThankYou}' {$goFonQueueThankYouACL}>
+{render acl=$goFonQueueThankYouACL}
+                       <input type="text" style='width:250px;' name='goFonQueueThankYou' value='{$goFonQueueThankYou}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -164,7 +204,9 @@
                        {t}'minutes' sound file{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonQueueMinutes' value='{$goFonQueueMinutes}' {$goFonQueueMinutesACL}>
+{render acl=$goFonQueueMinutesACL}
+                       <input type="text" style='width:250px;' name='goFonQueueMinutes' value='{$goFonQueueMinutes}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -172,7 +214,9 @@
                        {t}'seconds' sound file{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonQueueSeconds' value='{$goFonQueueSeconds}' {$goFonQueueSecondsACL}>
+{render acl=$goFonQueueSecondsACL}
+                       <input type="text" style='width:250px;' name='goFonQueueSeconds' value='{$goFonQueueSeconds}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -180,7 +224,9 @@
                        {t}Hold sound file{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonQueueReportHold' value='{$goFonQueueReportHold}' {$goFonQueueReportHoldACL}>
+{render acl=$goFonQueueReportHoldACL}
+                       <input type="text" style='width:250px;' name='goFonQueueReportHold' value='{$goFonQueueReportHold}'>
+{/render}
                </td>
                </tr>
                <tr>
@@ -188,7 +234,9 @@
                        {t}Less Than sound file{/t}
                </td>
                <td>
-                       <input type="text" style='width:250px;' name='goFonQueueLessThan' value='{$goFonQueueLessThan}' {$goFonQueueLessThanACL}>
+{render acl=$goFonQueueLessThanACL}
+                       <input type="text" style='width:250px;' name='goFonQueueLessThan' value='{$goFonQueueLessThan}'>
+{/render}
                </td>
                </tr>
 
@@ -208,19 +256,25 @@
                <table summary="" style="width: 100%; vertical-align: top; text-align: left;" border="0" cellpadding="0">
         <tr>
         <td colspan=2>
-            <input type="checkbox" name='goFonQueueAnnounceHoldtime' value='yes'  {$goFonQueueAnnounceHoldtimeCHK} {$goFonQueueAnnounceHoldtimeACL}>
+{render acl=$goFonQueueAnnounceHoldtimeACL}
+            <input type="checkbox" name='goFonQueueAnnounceHoldtime' value='yes'  {$goFonQueueAnnounceHoldtimeCHK}{$goFonQueueAnnounceHoldtimeACL}>
+{/render}
             {t}Announce holdtime{/t}
         </td>
         </tr>
         <tr>
         <td colspan=2>
-            <input type="checkbox" name='goFonDialOption_t' value='t'  {$goFonDialOption_tCHK} {$goFonDialOption_tACL}>
+{render acl=$goFonDialOptiontACL}
+            <input type="checkbox" name='goFonDialOptiont' value='t'  {$goFonDialOptiontCHK}>
+{/render}
             {t}Allow the called user to transfer his call{/t}
         </td>
         </tr>
         <tr>
         <td colspan=2>
-            <input type="checkbox" name='goFonDialOption_T' value='T' {$goFonDialOption_TCHK} {$goFonDialOption_TACL}>
+{render acl=$goFonDialOptionTACL}
+            <input type="checkbox" name='goFonDialOptionT' value='T' {$goFonDialOptionTCHK}>
+{/render}
             {t}Allows calling user to transfer call{/t}
         </td>
         </table>
@@ -230,19 +284,25 @@
                <table summary=""  style="width: 100%; vertical-align: top; text-align: left;" border="0" cellpadding="0">
         <tr>
         <td colspan=2>
-            <input type="checkbox" name='goFonDialOption_h' value='h' {$goFonDialOption_hCHK} {$goFonDialOption_hACL}>
+{render acl=$goFonDialOptionhACL}
+            <input type="checkbox" name='goFonDialOptionh' value='h' {$goFonDialOptionhCHK}>
+{/render}
             {t}Allow the called to hangup by pressing *{/t}
         </td>
         </tr>
         <tr>
         <td colspan=2>
-            <input type="checkbox" name='goFonDialOption_H' value='H' {$goFonDialOption_HCHK} {$goFonDialOption_HACL}>
+{render acl=$goFonDialOptionHACL}
+            <input type="checkbox" name='goFonDialOptionH' value='H' {$goFonDialOptionHCHK}>
+{/render}
             {t}Allows calling to hangup by pressing *{/t}
         </td>
         </tr>
         <tr>
         <td colspan=2>
-            <input type="checkbox" name='goFonDialOption_r' value='r' {$goFonDialOption_rCHK} {$goFonDialOption_rACL}>
+{render acl=$goFonDialOptionrACL}
+            <input type="checkbox" name='goFonDialOptionr' value='r' {$goFonDialOptionrCHK}>
+{/render}
             {t}Ring instead of playing background music{/t}
         </td>
         </tr>