w3c / acl

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

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 7c0f6e83945261da891f9a76dd66d250f9f6578d..7cb3aabf996eb7b35c9fe59128349f565c58843e 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -707,7 +707,7 @@ class phoneAccount extends plugin
         switch ($type){
 
           case "combo":
-            $str= "<select name='".$var."' ".chkacl($this->acl, "goFonMacro")." ".$dis.">";
+            $str= "<select name='".$var."' ".$dis.">";
           foreach(split(":",$default) as $choice){
             if($choosen==$choice){
               $str.= "\n<option value='".$choice."' selected>".$choice."&nbsp;</option>";
@@ -721,15 +721,15 @@ class phoneAccount extends plugin
 
           case "bool":
             if(!$choosen){
-              $str="\n<input type='checkbox' name='".$var."' value='1' ".chkacl($this->acl, "goFonMacro")." ".$dis.">";
+              $str="\n<input type='checkbox' name='".$var."' value='1' ".$dis.">";
             }else{
-              $str="\n<input type='checkbox' name='".$var."' value='1' checked  ".chkacl($this->acl, "goFonMacro")." ".$dis.">";
+              $str="\n<input type='checkbox' name='".$var."' value='1' checked  ".$dis.">";
             }
           $macrotab.= "<td colspan='2'>$str&nbsp;".base64_decode($name)."";
           break;
 
           case "string":
-            $str="<input name='".$var."' value='".$choosen."' ".chkacl($this->acl, "goFonMacro")." style='width:340px;' ".$dis.">";
+            $str="<input name='".$var."' value='".$choosen."' style='width:340px;' ".$dis.">";
           $macrotab.= "<td>".base64_decode($name)."</td><td>$str";
           break;
 
@@ -813,7 +813,7 @@ class phoneAccount extends plugin
       $dis= " disabled ";
     }
     $hl= "<select size=\"1\" name=\"goFonHardware\" ".$dis." title=\"".
-      _("Choose your private phone")." >\n";
+      _("Choose your private phone")."\">\n";
     foreach ($this->hardware_list as $cn => $description){
 
       if ($cn == $this->goFonHardware){

diff --git a/plugins/personal/nagios/nagios.tpl b/plugins/personal/nagios/nagios.tpl
index 555a228b9fedda18741ae050aaf3fdee10d1c873..c28c4d093dfd7f949ef6e06027fe4836dbf91d1f 100644 (file)
--- a/plugins/personal/nagios/nagios.tpl
+++ b/plugins/personal/nagios/nagios.tpl
@@ -118,8 +118,7 @@
     <tr>
      <td>
 {render acl=$AuthorizedSystemInformationACL}
-      <input type="checkbox" name="AuthorizedSystemInformation" value="1" {$AuthorizedSystemInformationACL}  
-       $AuthorizedSystemInformationCHK}>{t}view system informations{/t}
+      <input type="checkbox" name="AuthorizedSystemInformation" value="1" {$AuthorizedSystemInformationCHK}>{t}view system informations{/t}
 {/render}
      </td>
     </tr>
@@ -127,7 +126,7 @@
     <tr>
      <td>
 {render acl=$AuthorizedConfigurationInformationACL}
-      <input type="checkbox" name="AuthorizedConfigurationInformation" {$AuthorizedConfigurationInformationACL} value="1" 
+      <input type="checkbox" name="AuthorizedConfigurationInformation" value="1" 
        {$AuthorizedConfigurationInformationCHK}>{t}view configuration information{/t}
 {/render}
      </td>
@@ -136,7 +135,7 @@
     <tr>
      <td>
 {render acl=$AuthorizedSystemCommandsACL}
-      <input type="checkbox" name="AuthorizedSystemCommands" {$AuthorizedSystemCommandsACL} value="1" 
+      <input type="checkbox" name="AuthorizedSystemCommands" value="1" 
        {$AuthorizedSystemCommandsCHK}>{t}trigger system commands{/t}
 {/render}
      </td>