From f33b1b19486e86413148a323d2c41cb4626de403 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 20 Sep 2006 10:55:47 +0000 Subject: [PATCH] added gofon acls. Fixed repository service git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4745 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_goFonServer.inc | 157 ++---------------- .../admin/systems/class_servRepository.inc | 1 + plugins/admin/systems/goFonServer.tpl | 24 ++- 3 files changed, 36 insertions(+), 146 deletions(-) diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc index 94e864f6b..7a0920bcc 100644 --- a/plugins/admin/systems/class_goFonServer.inc +++ b/plugins/admin/systems/class_goFonServer.inc @@ -1,6 +1,8 @@ attributes as $attr){ $smarty->assign($attr,$this->$attr); - $smarty->assign($attr."ACL",chkacl($this->acl,$attr)); } + + /* Assign acls */ + $tmp = $this->plInfo(); + foreach($tmp['plProvidedAcls'] as $name => $translation){ + $smarty->assign($name."ACL",$this->getacl($name)); + } + return($smarty->fetch(get_template_path("goFonServer.tpl",TRUE,dirname(__FILE__)))); } function getListEntry() { - $this->updateStatusState(); - $flag = $this->StatusFlag; - $fields['Status'] = $this->$flag; + $fields = goService::getListEntry(); $fields['Message'] = _("Asterisk management"); - $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/gofon 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/gofon 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/gofon with dn '%s' failed."),$this->dn)); - $this->action_hook(); - } - } - - function check() { $message = plugin::check(); @@ -155,67 +85,6 @@ class goFonServer extends plugin{ plugin::save_object(); } } - - - 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() @@ -230,6 +99,10 @@ class goFonServer extends plugin{ "plCategory" => array("server"), "plProvidedAcls"=> array( + "start" => _("Start"), + "stop" => _("Stop"), + "restart" => _("Restart"), + "goFonAdmin" => _("Admin"), "goFonPassword" => _("Password"), "goFonAreaCode" => _("Area code"), diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc index 775f49b8d..d6006348d 100644 --- a/plugins/admin/systems/class_servRepository.inc +++ b/plugins/admin/systems/class_servRepository.inc @@ -338,6 +338,7 @@ class servrepository extends goService $fields = goService::getListEntry(); $fields['Message'] = _("Repository service"); $fields['AllowEdit'] = true; + $fields['AllowStart'] = $fields['AllowStop'] = $fields['AllowRestart'] = false; return($fields); } diff --git a/plugins/admin/systems/goFonServer.tpl b/plugins/admin/systems/goFonServer.tpl index c9c11188d..84a2571f0 100644 --- a/plugins/admin/systems/goFonServer.tpl +++ b/plugins/admin/systems/goFonServer.tpl @@ -2,19 +2,35 @@ - + - + - + - +
{t}Asterisk DB user{/t}{$must} +{render acl=$goFonAdminACL} + +{/render} +
{t}Password{/t}{$must} +{render acl=$goFonPasswordACL} + +{/render} +
{t}Country dial prefix{/t}{$must} +{render acl=$goFonCountryCodeACL} + +{/render} +
{t}Local dial prefix{/t}{$must} +{render acl=$goFonAreaCodeACL} + +{/render} +
-- 2.30.2