webcron
/
webcron
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 6 Wiki Activity

Resolved some warning and errors

This commit is contained in:
Jeroen De Meerleer 2021-05-29 15:50:19 +02:00
parent 5575e93fd4
commit 784d60e368
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Repository/Job.php
View File

@ -108,14 +108,14 @@ class Job extends Repository
if(!empty($job['data']['vars'])) {
foreach($job['data']['vars'] as $key => $var) {
$job['data']['basicauth-username'] = str_replace('{' . $key . '}', $var['value'], $job['data']['basicauth-username']);
if (isset($job['data']['basicauth-username'])) $job['data']['basicauth-username'] = str_replace('{' . $key . '}', $var['value'], $job['data']['basicauth-username']);
$job['data']['url'] = str_replace('{' . $key . '}', $var['value'], $job['data']['url']);
}
}
$url = $job['data']['url'];
$options['http_errors'] = false;
$options['auth'] = [$job['data']['basicauth-username'], $job['data']['basicauth-password']];
$options['auth'] = isset($job['data']['basicauth-username']) ? [$job['data']['basicauth-username'], $job['data']['basicauth-password']] : NULL;
$res = $client->request('GET', $url, $options);
$return['exitcode'] = $res->getStatusCode();
@ -172,11 +172,9 @@ class Job extends Repository
$return['exitcode'] = 255;
return $return;
}
$command .= ';echo "[return_code:$?]"';
$output = $ssh->exec($command);
preg_match( '/\[return_code:(.*?)\]/', $output, $match );
$return['output'] = str_replace($match[0] . "\n", '', $output);
$return['exitcode'] = $match[1];
$return['output'] = $ssh->exec($command);
$return['exitcode'] = $ssh->getExitStatus();
$return['exitcode'] = (empty($return['exitcode'])) ? 0 : $return['exitcode'];
return $return;
}