Updated acl handling for dns attributes

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

diff --git a/plugins/admin/systems/class_servDNSeditZone.inc b/plugins/admin/systems/class_servDNSeditZone.inc
index 615ede4bcef337a0896fc2cc34e54da61238fb2b..1605df4b399a5a05f077c1bdaae8d9f58e8738ed 100644 (file)
--- a/plugins/admin/systems/class_servDNSeditZone.inc
+++ b/plugins/admin/systems/class_servDNSeditZone.inc
@@ -205,7 +205,8 @@ class servdnseditZone extends plugin
     /* Fill templating stuff */
     $smarty= get_smarty();
     $ui = get_userinfo();
-    $smarty->assign("ACLs",$ui->get_permissions($this->dn,"server/servdns"));
+
+    $smarty->assign("ACLs",$this->parent->getacl(""));
     $display= "";
 
     /* Open Zone Entry Edit Dialog

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index b816a40b3c2fb69a5011e26952c74ad39ea965b3..db458e56328c9519429e6bb1d8d63b715c60afda 100644 (file)
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -745,7 +745,6 @@ class termDNS extends plugin
 
     /* Hide all dns specific code, if dns is not available
      */
-    $DNSenabled = false;
     foreach($_SESSION['config']->data['TABS']['SERVERSERVICE'] as $tab){
       if(preg_match("/^servdns$/",$tab['CLASS'])){
         $tmp['plProvidedAcls']["Records"]        = _("DNS records");

diff --git a/plugins/admin/systems/network.tpl b/plugins/admin/systems/network.tpl
index a6c88361943fc20ae13cc75e6cb322eb16d4f05f..ec5d17c93bd89dd360a3e1426a7fce66c7374d9e 100644 (file)
--- a/plugins/admin/systems/network.tpl
+++ b/plugins/admin/systems/network.tpl
@@ -7,12 +7,18 @@
                        <table  summary="">
                                <tr>
                                        <td><LABEL      for="ipHostNumber">{t}IP-address{/t}{if $IPisMust}{$staticAddress}{/if}</LABEL></td>
-                                       <td><input      id="ipHostNumber"       name="ipHostNumber"     size=25 maxlength=80    value="{$ipHostNumber}" {$ipHostNumberACL}></td>
+                                       <td>
+{render acl=$ipHostNumberACL}
+            <input     id="ipHostNumber"       name="ipHostNumber"     size=25 maxlength=80    value="{$ipHostNumber}">
+{/render}
+          </td>
                                </tr>
                                <tr>
                                        <td><LABEL      for="macAddress">{t}MAC-address{/t}</LABEL>{$staticAddress}</td>
                                        <td>
-            <input     name="macAddress"       id="macAddress" size=25 maxlength=80    value="{$macAddress}" {$macAddressACL}>
+{render acl=$macAddressACL}
+            <input     name="macAddress"       id="macAddress" size=25 maxlength=80    value="{$macAddress}">
+{/render}
             {if $autonet==true}
                                            <input type="submit" name="autonet" value="{t}Autodetect{/t}" 
                 {if ($ipHostNumberACL !="" || $macAddressACL!= "")} disabled {/if}>
@@ -54,23 +60,24 @@
     </td>
     {if $DNS_is_account==true}
                <td     style="width:50%;vertical-align:top;border-left:1px solid #b0b0b0;" valign="top">
+      {if $DNSAccount == true}
       <input type="checkbox" name="DNS_is_account" value="1"  
-        {if $DNSAccount == true}checked="checked"
+        checked="checked"
         onclick="toggle('test2');
           changeState('zoneName');
           changeState('dNSTTL');
           changeState('AddNewRecord');
-          {$changeStateForRecords}
-      "/>
+          {$changeStateForRecords}"/>
         {else}
+      <input type="checkbox" name="DNS_is_account" value="1"  
         onclick="toggle('test2');
           changeState('zoneName');
           changeState('dNSTTL');
-          changeState('AddNewRecord');
-      "/>
+          changeState('AddNewRecord');"/>
         {/if}
+
       {t}Enable DNS for this device{/t}
-      <input type='image' src='images/list_reload.png' class='center' name="reloadThisDNSStuff" />
+      <input type='image' src='images/list_reload.png' class='center' name="reloadThisDNSStuff" >
       {if $DNSAccount == true}
       <div style="padding-left:20px;visibility:visible;" id="test2">
       {else}
@@ -81,7 +88,7 @@
                                        <td><LABEL      for="zoneName">{t}Zone{/t}</LABEL></td>
                                        <td>
 {render acl=$zoneNameACL}
-              <select name="zoneName" id="zoneName" {if $DNS_is_account == false} disabled='disabled' {/if}>
+              <select name="zoneName" id="zoneName" {if $DNSAccount == false} disabled {/if}>
                 {html_options values=$ZoneKeys output=$Zones selected=$zoneName}
               </select>
 {/render}
@@ -91,7 +98,7 @@
           <td>{t}TTL{/t}</td>
           <td>
 {render acl=$dNSTTLACL}
-            <input type="text" name="dNSTTL" value="{$dNSTTL}" id="dNSTTL" {if $DNS_is_account == false} disabled {/if}>
+            <input type="text" name="dNSTTL" value="{$dNSTTL}" id="dNSTTL" {if $DNSAccount == false} disabled {/if}>
 {/render}
           </td>
         </tr>