From 28a907d9f00d28cbb058ac1ac319b1b22cff33ea Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 12 Jan 2007 05:04:19 +0000 Subject: [PATCH] Updated system acls git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5547 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_componentGeneric.inc | 10 ++++++++-- plugins/admin/systems/class_phoneGeneric.inc | 9 +++++++-- plugins/admin/systems/class_printGeneric.inc | 7 +++++++ plugins/admin/systems/class_servGeneric.inc | 4 ++++ plugins/admin/systems/class_winGeneric.inc | 10 ++++++++-- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc index b0bb33486..d5985f1fc 100644 --- a/plugins/admin/systems/class_componentGeneric.inc +++ b/plugins/admin/systems/class_componentGeneric.inc @@ -35,14 +35,18 @@ class componentGeneric extends plugin $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn); } $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true); + $this->netConfigDNS->acl = $this->acl; + /* Save dn for later references */ $this->orig_dn= $this->dn; } function execute() { - /* Call parent execute */ - plugin::execute(); + $this->netConfigDNS->acl = $this->acl; + + /* Call parent execute */ + plugin::execute(); /* Do we represent a valid phone? */ if (!$this->is_account && $this->parent == NULL){ @@ -96,6 +100,7 @@ class componentGeneric extends plugin function remove_from_parent() { + $this->netConfigDNS->acl = $this->acl; $ldap= $this->config->get_ldap_link(); $this->netConfigDNS->remove_from_parent(); $ldap->rmdir($this->dn); @@ -177,6 +182,7 @@ class componentGeneric extends plugin /* Save to LDAP */ function save() { + $this->netConfigDNS->acl = $this->acl; plugin::save(); /* Remove all empty values */ diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc index 3fc6e9fc0..552f4d1f4 100644 --- a/plugins/admin/systems/class_phoneGeneric.inc +++ b/plugins/admin/systems/class_phoneGeneric.inc @@ -57,6 +57,7 @@ class phoneGeneric extends plugin { plugin::plugin ($config, $dn, $parent); $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true); + $this->netConfigDNS->acl = $this->acl; /* Set base */ if ($this->dn == "new"){ @@ -96,8 +97,10 @@ class phoneGeneric extends plugin function execute() { - /* Call parent execute */ - plugin::execute(); + $this->netConfigDNS->acl = $this->acl; + + /* Call parent execute */ + plugin::execute(); /* Do we represent a valid phone? */ if (!$this->is_account && $this->parent == NULL){ @@ -233,6 +236,7 @@ class phoneGeneric extends plugin function remove_from_parent() { + $this->netConfigDNS->acl = $this->acl; $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); @@ -324,6 +328,7 @@ class phoneGeneric extends plugin /* Save to LDAP */ function save() { + $this->netConfigDNS->acl = $this->acl; plugin::save(); diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index d0f2cebf5..dc3d3ba2c 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -91,6 +91,7 @@ class printgeneric extends plugin /* create dns object */ $this->netConfigDNS = new termDNS($this->config, $this->dn,$this->objectclasses); + $this->netConfigDNS->acl = $this->acl; /* Set base */ if ($this->dn == "new"){ @@ -243,6 +244,8 @@ class printgeneric extends plugin function execute() { + $this->netConfigDNS->acl = $this->acl; + /* Call parent execute */ plugin::execute(); @@ -543,6 +546,8 @@ class printgeneric extends plugin function remove_from_parent() { + $this->netConfigDNS->acl = $this->acl; + /* Only remove if there was initially an account */ if($this->initially_was_account){ @@ -670,6 +675,8 @@ class printgeneric extends plugin /* Save to LDAP */ function save() { + $this->netConfigDNS->acl = $this->acl; + /* Update dn, to ensure storing as printer instead of WS / terminal */ if($this->BelongsTo == "Terminal"){ diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc index 30ee0acac..93a05695b 100644 --- a/plugins/admin/systems/class_servGeneric.inc +++ b/plugins/admin/systems/class_servGeneric.inc @@ -60,6 +60,7 @@ class servgeneric extends plugin $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn); } $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses); + $this->netConfigDNS->acl = $this->acl; /* Save dn for later references */ $this->orig_dn= $this->dn; } @@ -67,6 +68,7 @@ class servgeneric extends plugin function execute() { /* Call parent execute */ + $this->netConfigDNS->acl = $this->acl; plugin::execute(); /* Do we represent a valid server? */ @@ -195,6 +197,7 @@ class servgeneric extends plugin function remove_from_parent() { + $this->netConfigDNS->acl = $this->acl; $this->netConfigDNS->remove_from_parent(); $ldap= $this->config->get_ldap_link(); $ldap->rmdir($this->dn); @@ -267,6 +270,7 @@ class servgeneric extends plugin /* Save to LDAP */ function save() { + $this->netConfigDNS->acl = $this->acl; plugin::save(); /* Remove all empty values */ diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc index e297a4c73..177c4e5a4 100644 --- a/plugins/admin/systems/class_winGeneric.inc +++ b/plugins/admin/systems/class_winGeneric.inc @@ -49,6 +49,8 @@ class wingeneric extends plugin { plugin::plugin ($config, $dn, $parent); $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses); + $this->netConfigDNS->acl = $this->acl; + /* Set base */ if ($this->dn == "new"){ $ui= get_userinfo(); @@ -64,8 +66,10 @@ class wingeneric extends plugin function execute() { - /* Call parent execute */ - plugin::execute(); + $this->netConfigDNS->acl = $this->acl; + + /* Call parent execute */ + plugin::execute(); /* Do we represent a valid phone? */ if (!$this->is_account && $this->parent == NULL){ @@ -121,6 +125,7 @@ class wingeneric extends plugin function remove_from_parent() { + $this->netConfigDNS->acl = $this->acl; $this->netConfigDNS->remove_from_parent(); $ldap= $this->config->get_ldap_link(); $ldap->rmdir($this->dn); @@ -186,6 +191,7 @@ class wingeneric extends plugin /* Save to LDAP */ function save() { + $this->netConfigDNS->acl = $this->acl; plugin::save(); /* Remove all empty values */ -- 2.30.2