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 dde86224a3c716bf40a769f995c00ce31a26fb20..55e40d711404d04a0cec6c17150950e20e460388 100644 (file)
--- 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 d17b6d92da1ca6c570df74e77a5630684aa0e50d..92b33120b069b5a6a133d72be3b85a5a9bad7819 100644 (file)
--- 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 68715759660287eabd6f063d5df7b4884b6d826b..2936a6670d5964c7612882a29c2d4c3290331b94 100644 (file)
--- 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") {