From 2398fa28c09e67574b4830a598eadc617e842804 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 4 Oct 2017 17:26:50 +0200 Subject: [PATCH] Fixed stream error --- admin/stream.php | 49 +++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/admin/stream.php b/admin/stream.php index 629711c..25fa47d 100755 --- a/admin/stream.php +++ b/admin/stream.php @@ -5,7 +5,7 @@ require_once '../inc/autoload_adm.php'; //Get Langstrings foreach ($apps->getApps() as $appname => $appdetail) { - $path = '../apps/'.$appdetail['app_path']. '/lang/'; + $path = '../apps/' . $appdetail['app_path'] . '/lang/'; if (file_exists($path) && is_dir($path)) { $lang->setLangFolder($path); @@ -13,36 +13,39 @@ foreach ($apps->getApps() as $appname => $appdetail) } //Get Stream as JSON -if(isset($_GET['getStream']) && is_loggedin()) +if (isset($_GET['getStream']) && is_loggedin()) { $db->setCol('system_show_stream'); $db->data['user'] = $_SESSION['userid']; $db->get(); - $loglevel = json_decode($db->data[0]['level']); - - $streamData = []; - $db->setCol('system_stream'); - $db->get(null, null, 'id', 'DESC', 10); - foreach($db->data as $stream) + if (isset($db->data[0])) { - if(in_array($stream['lvl'], $loglevel)) + $loglevel = json_decode($db->data[0]['level']); + + $streamData = []; + $db->setCol('system_stream'); + $db->get(null, null, 'id', 'DESC', 10); + foreach ($db->data as $stream) { - $message = str_replace('{user}', getUserByID($stream['user']), $lang->get($stream['message'])); - $message = str_replace('{extra}', $stream['extra'], $message); + if (in_array($stream['lvl'], $loglevel)) + { + $message = str_replace('{user}', getUserByID($stream['user']), $lang->get($stream['message'])); + $message = str_replace('{extra}', $stream['extra'], $message); - $streamData[] = [ - 'id' => $stream['id'], - 'time' => $stream['time'], - 'user' => $stream['user'], - 'message' => $message - ]; + $streamData[] = [ + 'id' => $stream['id'], + 'time' => $stream['time'], + 'user' => $stream['user'], + 'message' => $message + ]; + } } - } - header('Charset: utf-8'); - header('Content-type: application/json'); - echo json_encode( $streamData ); - exit; + header('Charset: utf-8'); + header('Content-type: application/json'); + echo json_encode($streamData); + exit; + } } //Show Stream @@ -57,7 +60,7 @@ foreach ($db->data as $stream) { $message = str_replace('{user}', getUserByID($stream['user']), $lang->get($stream['message'])); $message = str_replace('{extra}', $stream['extra'], $message); - echo '

'.date('d.m.Y H:i', $stream['time']).': '.$message.'

'; + echo '

' . date('d.m.Y H:i', $stream['time']) . ': ' . $message . '

'; } echo '';