STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

fix options

Browse Source
This commit is contained in:
James Collins
2023-02-03 20:20:52 +10:00
parent c5cc91b075
commit 5da4cca80f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Api/LogController.php
View File

@@ -31,11 +31,11 @@ class LogController extends ApiController
// $outputContents = '';
// $errorContents = '';
$logs = $request->get('logs');
if ($logs === null) {
$logs = ['output', 'error'];
$log = $request->get('log');
if ($log === null) {
$log = ['output', 'error'];
} else {
$logs = explode(',', strtolower($logs));
$log = explode(',', strtolower($log));
}
$lines = intval($request->get('lines', 50));
@@ -47,16 +47,16 @@ class LogController extends ApiController
$before = $request->get('before');
if ($before !== null) {
$before = preg_split("/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2}): /", $before, -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY));
if (count($before) < 6) {
$before = preg_split("/([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/", $before, -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY));
if (count($before) !== 6) {
$before = null;
}
}
$after = $request->get('after');
if ($after !== null) {
$after = preg_split("/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2}): /", $after, -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY));
if (count($after) < 6) {
$after = preg_split("/([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/", $after, -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY));
if (count($after) !== 6) {
$after = null;
}
}
@@ -72,7 +72,7 @@ class LogController extends ApiController
];
foreach ($logFiles as $logFile) {
if (in_array($logFile['name'], $logs) === true) {
if (in_array($logFile['name'], $log) === true) {
$logContent = '';
if (file_exists($logFile['path']) === true) {