Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-09 13:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor code fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-07-14 14:09:41 +02:00
parent cb76bea3e7
commit 7d8a68b589
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Utils/Git/Repository.php
View File

@ -191,8 +191,8 @@ class Repository
throw new \Exception(); throw new \Exception();
} }
$stdout = \stream_get_contents($pipes[1]); $stdout = \stream_get_contents($pipes[1]);
$stderr = \stream_get_contents($pipes[2]); $stderr = \stream_get_contents($pipes[2]);
foreach ($pipes as $pipe) { foreach ($pipes as $pipe) {
\fclose($pipe); \fclose($pipe);

30
Utils/TaskSchedule/TaskScheduler.php
View File

@ -38,7 +38,7 @@ class TaskScheduler extends SchedulerAbstract
*/ */
private function run(string $cmd) : string private function run(string $cmd) : string
{ {
$cmd = 'cd ' . escapeshellarg(\dirname(self::$bin)) . ' && ' . basename(self::$bin) . ' ' . $cmd; $cmd = 'cd ' . \escapeshellarg(\dirname(self::$bin)) . ' && ' . \basename(self::$bin) . ' ' . $cmd;
$pipes = []; $pipes = [];
$desc = [ $desc = [
@ -46,15 +46,19 @@ class TaskScheduler extends SchedulerAbstract
2 => ['pipe', 'w'], 2 => ['pipe', 'w'],
]; ];
$resource = proc_open($cmd, $desc, $pipes, __DIR__, null); $resource = \proc_open($cmd, $desc, $pipes, __DIR__, null);
$stdout = stream_get_contents($pipes[1]); if ($resource === false) {
$stderr = stream_get_contents($pipes[2]); return '';
foreach ($pipes as $pipe) {
fclose($pipe);
} }
$status = trim((string) proc_close($resource)); $stdout = \stream_get_contents($pipes[1]);
$stderr = \stream_get_contents($pipes[2]);
foreach ($pipes as $pipe) {
\fclose($pipe);
}
$status = \proc_close($resource);
if ($status == -1) { if ($status == -1) {
throw new \Exception($stderr); throw new \Exception($stderr);
@ -87,7 +91,7 @@ class TaskScheduler extends SchedulerAbstract
$jobs = []; $jobs = [];
foreach ($lines as $line) { foreach ($lines as $line) {
$jobs[] = Schedule::createWith(str_getcsv($line)); $jobs[] = Schedule::createWith(\str_getcsv($line));
} }
return $jobs; return $jobs;
@ -99,12 +103,12 @@ class TaskScheduler extends SchedulerAbstract
public function getAllByName(string $name, bool $exact = true) : array public function getAllByName(string $name, bool $exact = true) : array
{ {
if ($exact) { if ($exact) {
$lines = \explode("\n", $this->normalize($this->run('/query /v /fo CSV /tn ' . escapeshellarg($name)))); $lines = \explode("\n", $this->normalize($this->run('/query /v /fo CSV /tn ' . \escapeshellarg($name))));
unset($lines[0]); unset($lines[0]);
$jobs = []; $jobs = [];
foreach ($lines as $line) { foreach ($lines as $line) {
$jobs[] = Schedule::createWith(str_getcsv($line)); $jobs[] = Schedule::createWith(\str_getcsv($line));
} }
} else { } else {
$lines = \explode("\n", $this->normalize($this->run('/query /v /fo CSV'))); $lines = \explode("\n", $this->normalize($this->run('/query /v /fo CSV')));
@ -112,9 +116,9 @@ class TaskScheduler extends SchedulerAbstract
$jobs = []; $jobs = [];
foreach ($lines as $key => $line) { foreach ($lines as $key => $line) {
$line = str_getcsv($line); $line = \str_getcsv($line);
if (stripos($line[1], $name) !== false) { if (\stripos($line[1], $name) !== false) {
$jobs[] = Schedule::createWith($line); $jobs[] = Schedule::createWith($line);
} }
} }