extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 05:49:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Scurtinizer bug by explicitly returning $other_cronlines instead of not declared class var

Browse Source
This commit is contained in:
Ralf Becker 2016-08-28 10:55:17 +02:00
parent 87f54ac14f
commit b400f38b75
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/src/Asyncservice.php
View File

@ -632,10 +632,15 @@ class Asyncservice
/** /**
* checks if phpgwapi/cron/asyncservices.php is installed as cron-job * checks if phpgwapi/cron/asyncservices.php is installed as cron-job
* *
* @param array& $other_cronlines =array() on return other cronlines found
* @return array the times asyncservices are run (normaly 'min'=>'* /5') or False if not installed or 0 if crontab not found * @return array the times asyncservices are run (normaly 'min'=>'* /5') or False if not installed or 0 if crontab not found
* Not implemented for Windows at the moment, always returns 0 * Not implemented for Windows at the moment, always returns 0
*/ */
function installed() /**
*
* @return int
*/
function installed(array &$other_cronlines=array())
{ {
if ($this->only_fallback) { if ($this->only_fallback) {
return 0; return 0;
@ -648,7 +653,7 @@ class Asyncservice
return 0; return 0;
} }
$times = False; $times = False;
$this->other_cronlines = array(); $other_cronlines = array();
if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1','r')) !== False) if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1','r')) !== False)
{ {
$n = 0; $n = 0;
@ -678,7 +683,7 @@ class Asyncservice
} }
else else
{ {
$this->other_cronlines[] = $line; $other_cronlines[] = $line;
} }
} }
@pclose($crontab); @pclose($crontab);
@ -701,16 +706,14 @@ class Asyncservice
if ($this->only_fallback && $times !== False) { if ($this->only_fallback && $times !== False) {
return 0; return 0;
} }
$this->installed(); // find other installed cronlines $other_cronlines = array();
$this->installed($other_cronlines); // find other installed cronlines
if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1','w')) !== False) if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1','w')) !== False)
{ {
if (is_array($this->other_cronlines)) foreach ($other_cronlines as $cronline)
{ {
foreach ($this->other_cronlines as $cronline) fwrite($crontab,$cronline); // preserv the other lines on install
{
fwrite($crontab,$cronline); // preserv the other lines on install
}
} }
if ($times !== False) if ($times !== False)
{ {