check for function availability before trying to restart

This commit is contained in:
Steffen Schröder
2014-06-15 01:02:59 +02:00
parent 609d451895
commit 6319a6a58a
2 changed files with 30 additions and 1 deletions

View File

@ -246,11 +246,20 @@ class ManiaControl implements CommandListener, TimerListener {
$this->log('Restarting ManiaControl!');
// Execute start script in background
// TODO: restart the .php script itself ($_SERVER['scriptname'] or something + $argv)
if (SystemUtil::isUnix()) {
// Unix
if (!SystemUtil::checkFunctionAvailability('exec')) {
$this->log("Can't restart ManiaControl because the function 'exec' is disabled!");
return;
}
$command = 'sh ' . escapeshellarg(ManiaControlDir . 'ManiaControl.sh') . ' > /dev/null &';
exec($command);
} else {
// Windows
if (!SystemUtil::checkFunctionAvailability('system')) {
$this->log("Can't restart ManiaControl because the function 'system' is disabled!");
return;
}
$command = escapeshellarg(ManiaControlDir . "ManiaControl.bat");
system($command); // TODO: windows gets stuck here as long controller is running
}