Merge branch '2300-Eventos-de-respuesta-personalizada' into 'develop'

Fixed bug in ajax/events.php

See merge request artica/pandorafms!1561
This commit is contained in:
slerena 2018-06-25 19:00:58 +02:00
commit 17cb7337f5

View File

@ -148,7 +148,7 @@ if ($perform_event_response) {
break; break;
} }
echo system("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $timeout_bin . " 90 " . io_safe_output($command) . " 2>&1\"", $ret_val); system("ssh pandora_exec_proxy@" . $server_data['ip_address'] . " \"" . $timeout_bin . " 90 " . io_safe_output($command) . " 2>&1\"", $ret_val);
} }
} }
else { else {
@ -163,7 +163,7 @@ if ($perform_event_response) {
$timeout_bin = '/usr/bin/timeout'; $timeout_bin = '/usr/bin/timeout';
break; break;
} }
echo system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1'); system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1');
} }
} }
else { else {
@ -178,7 +178,7 @@ if ($perform_event_response) {
$timeout_bin = '/usr/bin/timeout'; $timeout_bin = '/usr/bin/timeout';
break; break;
} }
echo system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1'); system($timeout_bin . ' 90 '.io_safe_output($command).' 2>&1');
} }
return; return;