webcron
/
webcron
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 6 Wiki Activity

Merge branch 'task/reboot-no-encode' into task/config-reboot-cmd

This commit is contained in:
Jeroen De Meerleer 2019-04-26 17:03:53 +02:00
parent 619d0705ba fab6ef63e3
commit b1fca376d3
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webcron.php
View File

@ -42,7 +42,12 @@ if (file_exists("cache/get-services.trigger")) {
foreach($rebootjobs as $job) {
$services = array();
parse_str(str_replace("reboot ", "", $job['url']), $rebootcommands);
$rebooter = preg_replace("/reboot /", "", $job['url'], 1);
$rebooter = urlencode($rebooter);
$rebooter = str_replace("cmd%3D", "cmd=", $rebooter);
$rebooter = str_replace("services%3D", "services=", $rebooter);
$rebooter = str_replace("%26", "&", $rebooter);
parse_str($rebooter, $rebootcommands);
$cmd = $rebootcommands['services'];
if ($cmd == '') {
@ -128,7 +133,12 @@ if(file_exists("cache/reboot.trigger")) {
file_put_contents("cache/reboot-time.trigger", time() + ((get_configvalue('jobs.reboottime') + get_configvalue('jobs.rebootwait')) * 60));
$rebooted_hosts = array();
foreach($rebootjobs as $job) {
parse_str(str_replace("reboot ", "", $job['url']), $rebootcommands);
$rebooter = preg_replace("/reboot /", "", $job['url'], 1);
$rebooter = urlencode($rebooter);
$rebooter = str_replace("cmd%3D", "cmd=", $rebooter);
$rebooter = str_replace("services%3D", "services=", $rebooter);
$rebooter = str_replace("%26", "&", $rebooter);
parse_str($rebooter, $rebootcommands);
$cmd = $rebootcommands['cmd'];
if ($cmd == '') {
@ -136,7 +146,7 @@ if(file_exists("cache/reboot.trigger")) {
}
$cmd = str_replace("{}+", get_configvalue('jobs.rebootwait'), $cmd);
$url = "ssh " . $job['host'] . " '" . $cmd . "'";
$url = "ssh " . $job['host'] . " '" . $cmd . " &'";
exec($url);
$cmd = '';
}