friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

closed internal TODO, merged 2 if() to one + added spaces 

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-03-23 22:16:04 +01:00
parent 11d3fd163a
commit 843b7a003c
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
boot.php
View File

@ -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__)));
}
}