From 843b7a003ccac424827c2327ae8412153715e098 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 23 Mar 2017 22:16:04 +0100 Subject: [PATCH] closed internal TODO, merged 2 if() to one + added spaces Signed-off-by: Roland Haeder --- boot.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/boot.php b/boot.php index 4101469dd5..5df8c6c4d9 100644 --- a/boot.php +++ b/boot.php @@ -1349,12 +1349,11 @@ class App { // This should prevent the forking of masses of workers. $cachekey = "app:proc_run:started"; $result = Cache::get($cachekey); - /// @TODO maybe merge these both into one if() ? - if (!is_null($result)) { - if ((time() - $result) < 10) { - return; - } + + if (!is_null($result) AND (time() - $result) < 10) { + return; } + // Set the timestamp of the last proc_run Cache::set($cachekey, time(), CACHE_MINUTE); @@ -1363,16 +1362,17 @@ class App { // add baseurl to args. cli scripts can't construct it $args[] = $this->get_baseurl(); + /// @TODO let's replace these with a foreach($key => $value) loop for ($x = 0; $x < count($args); $x ++) { $args[$x] = escapeshellarg($args[$x]); } - $cmdline = implode($args," "); + $cmdline = implode($args, " "); - if (get_config('system','proc_windows')) { - proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__))); + if (get_config('system', 'proc_windows')) { + proc_close(proc_open('cmd /c start /b ' . $cmdline, array(), $foo, dirname(__FILE__))); } else { - proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__))); + proc_close(proc_open($cmdline . " &", array(), $foo, dirname(__FILE__))); } }