Merge pull request #5481 from annando/issue-5467

Issue 5467: Fix worker and daemon

bin/daemon.php

@@ -13,9 +13,8 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 
 // Get options
-$shortopts  = '';
+$shortopts = 'f';
-$shortopts .= 'f';
+$longopts = ['foreground'];
-$longopts = [ 'foreground' ];
 $options = getopt($shortopts, $longopts);
 
 // Ensure that daemon.php is executed from the base path of the installation

bin/worker.php

@@ -11,9 +11,8 @@ use Friendica\Core\Config;
 use Friendica\Core\Worker;
 
 // Get options
-$shortopts  = '';
+$shortopts = 'sc';
-$shortopts .= 'sc';
+$longopts = ['spawn', 'cron'];
-$longopts = [ 'spawn', 'cron' ];
 $options = getopt($shortopts, $longopts);
 
 // Ensure that worker.php is executed from the base path of the installation

src/App.php

@@ -1127,7 +1127,7 @@ class App
 			return;
 		}
 
-		$cmdline = $this->getConfigValue('config', 'php_path', 'php') . ' ' . $command;
+		$cmdline = $this->getConfigValue('config', 'php_path', 'php') . ' ' . escapeshellarg($command);
 
 		foreach ($args as $key => $value) {
 			if (!is_null($value) && is_bool($value) && !$value) {
@@ -1140,8 +1140,6 @@ class App
 			}
 		}
 
-		$cmdline = escapeshellarg($cmdline);
-
 		if ($this->min_memory_reached()) {
 			return;
 		}