From 9ec54590de2cb3766cad824e59e36e385a132e1b Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 22 Jul 2008 11:03:44 +0000 Subject: [PATCH] Updated dns acls. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11746 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../dns/admin/systems/services/dns/class_servDNS.inc | 2 +- .../admin/systems/services/dns/class_servDNSeditZone.inc | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc index a96de276d..8d4f645af 100644 --- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc +++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc @@ -111,7 +111,7 @@ class servdns extends goService */ $smarty= get_smarty(); $smarty->assign("dns_take_over",FALSE); - $smarty->assign("is_createable",$this->acl_is_writeable("")); + $smarty->assign("is_createable",$this->acl_is_createable()); $display= ""; diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc index 2a57dd2f5..160790fab 100644 --- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc +++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc @@ -311,7 +311,7 @@ class servdnseditZone extends plugin } } - if($this->acl_is_writeable("mXRecord")){ + if($this->parent->acl_is_writeable("mXRecord")){ if((isset($_POST['AddMXRecord'])) && (!empty($_POST['StrMXRecord']))){ $this->mXRecords[] = array("type"=>"mXRecord","value"=>trim($_POST['StrMXRecord'])); } @@ -380,7 +380,9 @@ class servdnseditZone extends plugin { plugin::save_object(); - if($this->acl_is_writeable("zoneRecords")){ + if(!is_object($this->parent)) return; + + if($this->parent->acl_is_writeable("zoneRecords")){ foreach($this->Records as $id => $value){ if(isset($_POST['RecordTypeSelectedFor_'.$id])){ $this->Records[$id]['type'] = $_POST['RecordTypeSelectedFor_'.$id]; @@ -390,7 +392,7 @@ class servdnseditZone extends plugin } } } - if(isset($_POST['NetworkClass']) && !$this->Zone_is_used && $this->acl_is_writeable("NetworkClass")){ + if(isset($_POST['NetworkClass']) && !$this->Zone_is_used && $this->parent->acl_is_writeable("NetworkClass")){ $this->NetworkClass = $_POST['NetworkClass']; } } -- 2.30.2