From 306deffa78db932a63bc986c324b6b7dd170f1b2 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 20 Sep 2006 04:22:00 +0000 Subject: [PATCH] Updated goLogDbService. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4733 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_goLogDBServer.inc | 150 +----------------- plugins/admin/systems/class_goService.inc | 7 +- 2 files changed, 11 insertions(+), 146 deletions(-) diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc index b3bb37a9f..dd10fa363 100644 --- a/plugins/admin/systems/class_goLogDBServer.inc +++ b/plugins/admin/systems/class_goLogDBServer.inc @@ -1,6 +1,7 @@ updateStatusState(); - $flag = $this->StatusFlag; - $fields['Status'] = $this->$flag; - $fields['Message'] = _("Logging database"); - $fields['AllowStart'] = true; - $fields['AllowStop'] = true; - $fields['AllowRestart'] = true; - $fields['AllowRemove']= true; - $fields['AllowEdit'] = true; + $fields = goService::getListEntry(); + $fields['Message'] = _("Logging database"); + $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/goLogDB with dn '%s' failed."),$this->dn)); - $this->handle_post_events("remove"); - } - - - function save() - { - plugin::save(); - /* 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(_("Saving server services/goLogDB with dn '%s' failed."),$this->dn)); - if($this->initially_was_account){ - $this->handle_post_events("modify"); - }else{ - $this->handle_post_events("add"); - } - } - - - /* 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/goLogDB with dn '%s' failed."),$this->dn)); - $this->action_hook(); - } - } - - function check() { $message = plugin::check(); @@ -147,67 +71,6 @@ class goLogDBServer extends plugin{ } } - 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() { @@ -221,6 +84,9 @@ class goLogDBServer extends plugin{ "plCategory" => array("server"), "plProvidedAcls"=> array( + "start" => _("Start"), + "stop" => _("Stop"), + "restart" => _("Restart"), "goLogAdmin" => _("Admin"), "goLogPassword" => _("Password")) )); diff --git a/plugins/admin/systems/class_goService.inc b/plugins/admin/systems/class_goService.inc index 9a88d7fdf..e4f629f85 100644 --- a/plugins/admin/systems/class_goService.inc +++ b/plugins/admin/systems/class_goService.inc @@ -89,7 +89,7 @@ class goService extends plugin{ $ldap->cd($this->dn); $ldap->add($this->attrs); } - show_ldap_error($ldap->get_error(), sprintf(_("Removing of server services/".$this->DisplayName." with dn '%s' failed."),$this->dn)); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of server services/".get_class($this)." - (".$this->DisplayName.") with dn '%s' failed."),$this->dn)); $this->handle_post_events("remove"); } @@ -113,8 +113,7 @@ class goService extends plugin{ }else{ $this->handle_post_events("add"); } - - show_ldap_error($ldap->get_error(), sprintf(_("Saving of server services/".$this->DisplayName." with dn '%s' failed."),$this->dn)); + show_ldap_error($ldap->get_error(), sprintf(_("Saving of server services/".get_class($this)." - (".$this->DisplayName.") with dn '%s' failed."),$this->dn)); } @@ -145,7 +144,7 @@ class goService extends plugin{ $attrs[$flag] = $value; $this->$flag = $value; $ldap->modify($attrs); - show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for server services/".$this->DisplayName." with dn '%s' failed."),$this->dn)); + show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for server services/".get_class($this)." - (".$this->DisplayName.") with dn '%s' failed."),$this->dn)); $this->action_hook(); } } -- 2.30.2