diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index a28ed75b7143a9f1e2cfab8db4d832f859bdf5e0..1a4cc14f29f5293127fa1e40d06d0c3306833770 100644 (file)
var $l= "";
var $description= "";
var $orig_dn= "";
+ var $didAction= FALSE;
/* attribute list for save action */
var $attributes= array("cn", "description","gotoMode");
function execute()
{
- /* Call parent execute */
- plugin::execute();
+ /* Call parent execute */
+ plugin::execute();
/* Do we represent a valid server? */
if (!$this->is_account && $this->parent == NULL){
/* Check for action */
if (isset($_POST['action'])){
- switch($_POST['action']){
- case 'wake':
- $cmd= search_config($this->config->data['TABS'], "servgeneric", "WAKECMD");
- if ($cmd == ""){
- print_red(_("No WAKECMD definition found in your gosa.conf"));
- } else {
- exec ($cmd." ".$this->netConfigDNS->macAddress, $dummy, $retval);
- if ($retval != 0){
- print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
- }
- }
- break;
-
- case 'reboot':
- $cmd= search_config($this->config->data['TABS'], "servgeneric", "REBOOTCMD");
- if ($cmd == ""){
- print_red(_("No REBOOTCMD definition found in your gosa.conf"));
- } else {
- exec ($cmd." ".$this->cn, $dummy, $retval);
- if ($retval != 0){
- print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
- }
- }
- break;
-
- case 'halt':
- $cmd= search_config($this->config->data['TABS'], "servgeneric", "HALTCMD");
- if ($cmd == ""){
- print_red(_("No HALTCMD definition found in your gosa.conf"));
- } else {
- exec ($cmd." ".$this->cn, $dummy, $retval);
- if ($retval != 0){
- print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
- }
- }
- break;
+ $cmd= search_config($this->config->data['TABS'], "workgeneric", "ACTIONCMD");
+ if ($cmd == ""){
+ print_red(_("No ACTIONCMD definition found in your gosa.conf"));
+ } else {
+ exec ($cmd." ".$this->netConfigDNS->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval);
+ if ($retval != 0){
+ print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
+ } else {
+ $this->didAction= TRUE;
+ }
}
}
$mode= "modify";
}
+ show_ldap_error($ldap->get_error(), _("Saving server failed"));
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->save($this->dn);
- show_ldap_error($ldap->get_error(), _("Saving server failed"));
/* Optionally execute a command after we're done */
- $this->handle_post_events($mode);
+ if(!$this->didAction){
+ $this->handle_post_events($mode);
+ }
}
}