From: cajus Date: Mon, 11 Feb 2008 08:35:51 +0000 (+0000) Subject: Switched order of action command line parameters X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1a99630f693dec5a89069495e2574eb9267c5d67;p=gosa.git Switched order of action command line parameters git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@8804 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/ogroups/class_termgroup.inc b/plugins/admin/ogroups/class_termgroup.inc index dde86224a..55e40d711 100644 --- a/plugins/admin/ogroups/class_termgroup.inc +++ b/plugins/admin/ogroups/class_termgroup.inc @@ -211,7 +211,7 @@ class termgroup extends plugin if ($cmd == ""){ print_red(_("No ACTIONCMD definition found in your gosa.conf")); } else { - exec ($cmd." ".$macaddresses." ".escapeshellarg($_POST['saction']), $dummy, $retval); + exec ($cmd." ".escapeshellarg($_POST['saction'])." ".$macaddresses, $dummy, $retval); if ($retval != 0){ print_red(sprintf(_("Execution of '%s' failed!"), $cmd)); } else { diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc index d17b6d92d..92b33120b 100644 --- a/plugins/admin/systems/class_servGeneric.inc +++ b/plugins/admin/systems/class_servGeneric.inc @@ -81,7 +81,7 @@ class servgeneric extends plugin print_red(_("No ACTIONCMD definition found in your gosa.conf")); } else { - exec ($cmd." ".$this->netConfigDNS->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval); + exec ($cmd." ".escapeshellarg($_POST['saction'])." ".$this->netConfigDNS->macAddress, $dummy, $retval); if ($retval != 0){ print_red(sprintf(_("Execution of '%s' failed!"), $cmd)); } else { diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc index 687157596..2936a6670 100644 --- a/plugins/admin/systems/class_workstationGeneric.inc +++ b/plugins/admin/systems/class_workstationGeneric.inc @@ -162,7 +162,7 @@ class workgeneric extends plugin if ($cmd == ""){ print_red(_("No ACTIONCMD definition found in your gosa.conf")); } else { - exec ($cmd." ".$this->netConfigDNS->macAddress." ".escapeshellarg($_POST['saction']), $dummy, $retval); + exec ($cmd." ".escapeshellarg($_POST['saction'])." ".$this->netConfigDNS->macAddress, $dummy, $retval); if ($retval != 0){ print_red(sprintf(_("Execution of '%s' failed!"), $cmd)); } elseif ($_POST['saction'] != "wake") {