Mowie
/
Mowie
mirror of https://github.com/Mowie/Mowie
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed stream error

This commit is contained in:
kolaente 2017-10-04 17:26:50 +02:00
parent 3faa9d3c35
commit 2398fa28c0
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
admin/stream.php
View File

@ -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 '<p><b>'.date('d.m.Y H:i', $stream['time']).':</b> '.$message.'</p>';
echo '<p><b>' . date('d.m.Y H:i', $stream['time']) . ':</b> ' . $message . '</p>';
}
echo '</div>';