From 7b363ade2c348318152f43cb94484441a3ccdaac Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 22 Sep 2006 06:13:26 +0000 Subject: [PATCH] Added acls to ntp service git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4762 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_goNtpServer.inc | 127 ++------------------ plugins/admin/systems/goNtpServer.tpl | 14 ++- 2 files changed, 18 insertions(+), 123 deletions(-) diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc index 6ab88fe17..eaa885a7b 100644 --- a/plugins/admin/systems/class_goNtpServer.inc +++ b/plugins/admin/systems/class_goNtpServer.inc @@ -1,6 +1,8 @@ acl_is_writeable("goTimeSource")) { $this->goTimeSource[$_POST['NewNTPExport']]= $_POST['NewNTPExport']; asort($this->goTimeSource); } /* Deleting an Entry, is a bit more complicated than adding one*/ - if((isset($_POST['DelNTPEnt'])) && (isset($_POST['goTimeSource']))) { + if((isset($_POST['DelNTPEnt'])) && (isset($_POST['goTimeSource'])) && $this->acl_is_writeable("goTimeSource")) { foreach ($_POST['goTimeSource'] as $entry){ if (isset($this->goTimeSource[$entry])){ unset($this->goTimeSource[$entry]); @@ -56,7 +58,7 @@ class goNtpServer extends plugin{ } } - $smarty->assign("goNtpServerACL",chkacl($this->acl,"goNtpServer")) ; + $smarty->assign("goNtpServerACL", $this->getacl("goNtpServer")) ; $smarty->assign("goTimeSource" , $this->goTimeSource); return($smarty->fetch(get_template_path("goNtpServer.tpl",TRUE,dirname(__FILE__)))); } @@ -64,44 +66,13 @@ class goNtpServer extends plugin{ function getListEntry() { - $this->updateStatusState(); - $flag = $this->StatusFlag; - $fields['Status'] = $this->$flag; + $fields = goService::getListEntry(); $fields['Message'] = _("NTP service"); - $fields['AllowStart'] = true; - $fields['AllowStop'] = true; - $fields['AllowRestart'] = true; - $fields['AllowRemove']= true; $fields['AllowEdit'] = true; return($fields); } - function remove_from_parent() - { - plugin::remove_from_parent(); - - /* Remove status flag, it is not a memeber of - this->attributes, so ensure that it is deleted too */ - if(!empty($this->StatusFlag)){ - $this->attrs[$this->StatusFlag] = array(); - } - - /* Check if this is a new entry ... add/modify */ - $ldap = $this->config->get_ldap_link(); - $ldap->cat($this->dn,array("objectClass")); - if($ldap->count()){ - $ldap->cd($this->dn); - $ldap->modify($this->attrs); - }else{ - $ldap->cd($this->dn); - $ldap->add($this->attrs); - } - show_ldap_error($ldap->get_error(), sprintf(_("Removing server services/goNtpServer with dn '%s' failed."),$this->dn)); - $this->handle_post_events("remove"); - } - - function save() { plugin::save(); @@ -128,90 +99,6 @@ class goNtpServer extends plugin{ } - /* Directly save new status flag */ - function setStatus($value) - { - if($value == "none") return; - if(!$this->initially_was_account) return; - $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->dn); - $ldap->cat($this->dn,array("objectClass")); - if($ldap->count()){ - - $tmp = $ldap->fetch(); - for($i = 0; $i < $tmp['objectClass']['count']; $i ++){ - $attrs['objectClass'][] = $tmp['objectClass'][$i]; - } - $flag = $this->StatusFlag; - $attrs[$flag] = $value; - $this->$flag = $value; - $ldap->modify($attrs); - show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for server services/goNtpServer with dn '%s' failed."),$this->dn)); - $this->action_hook(); - } - } - - function action_hook($add_attrs= array()) - { - /* Find postcreate entries for this class */ - $command= search_config($this->config->data['MENU'], get_class($this), "ACTION_HOOK"); - if ($command == "" && isset($this->config->data['TABS'])){ - $command= search_config($this->config->data['TABS'], get_class($this), "ACTION_HOOK"); - } - if ($command != ""){ - /* Walk through attribute list */ - foreach ($this->attributes as $attr){ - if (!is_array($this->$attr)){ - $command= preg_replace("/%$attr/", $this->$attr, $command); - } - } - $command= preg_replace("/%dn/", $this->dn, $command); - /* Additional attributes */ - foreach ($add_attrs as $name => $value){ - $command= preg_replace("/%$name/", $value, $command); - } - - /* If there are still some %.. in our command, try to fill these with some other class vars */ - if(preg_match("/%/",$command)){ - $attrs = get_object_vars($this); - foreach($attrs as $name => $value){ - if(!is_string($value)) continue; - $command= preg_replace("/%$name/", $value, $command); - } - } - - if (check_command($command)){ - @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, - $command, "Execute"); - - exec($command); - } else { - $message= sprintf(_("Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."), $command, get_class($this)); - print_red ($message); - } - } - } - - - /* Get updates for status flag */ - function updateStatusState() - { - if(empty($this->StatusFlag)) return; - - $attrs = array(); - $flag = $this->StatusFlag; - $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->cn); - $ldap->cat($this->dn,array($flag)); - if($ldap->count()){ - $attrs = $ldap->fetch(); - } - if(isset($attrs[$flag][0])){ - $this->$flag = $attrs[$flag][0]; - } - } - - /* Return plugin informations for acl handling */ function plInfo() { diff --git a/plugins/admin/systems/goNtpServer.tpl b/plugins/admin/systems/goNtpServer.tpl index b662f5d1a..c6515939d 100644 --- a/plugins/admin/systems/goNtpServer.tpl +++ b/plugins/admin/systems/goNtpServer.tpl @@ -4,14 +4,22 @@
- {html_options values=$goTimeSource output=$goTimeSource} +{/render}
+{render acl=$goNtpServerACL} - - +{/render} +{render acl=$goNtpServerACL} + +{/render} +{render acl=$goNtpServerACL} + +{/render}
-- 2.30.2