Fire-Devils/monitor-frontend
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

corrected autoupdate functions

Browse Source
This commit is contained in:
Manuel Weiser
2018-08-04 19:22:23 +02:00
parent 8cf053078a
commit a8f497f3c2
10 changed files with 40 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
get.php
View File

@ -41,7 +41,7 @@ require('config.inc.php');
}
if (!isset($_SESSION["lastupdate"])) $_SESSION["lastupdate"];
if (!isset($show_filter)) $show_filter;
if (!isset($show_filter)) $show_filter="";
if( $show_filter == 1 && $_SESSION["lastupdate"] == "" && !isset($_GET["clean"]) ) {
$show_filter = filter_zeit(1);
@ -55,7 +55,7 @@ elseif( $show_filter == 1 && $_SESSION["lastupdate"] != "" && isset($_GET["clean
$show_filter = " WHERE a.zeit > '$show_filter' ";
}
else { //if( $show_filter != 1 ) {
$show_filter = filter_zeit((isset($filter) ? $filter : 1));
$show_filter = filter_zeit((isset($filter)) ? $filter : 1);
$show_filter = " WHERE a.zeit > '$show_filter' ";
}
@ -81,7 +81,7 @@ else { //if( $show_filter != 1 ) {
//
// Daten f¸r Formatierung holen und in array->session schreiben
if( !isset($_SESSION["formatierung"]) && !isset($_GET["nooutput"]) )
if( (!isset($_SESSION["formatierung"]) || $_SESSION["formatierung"]=="") && (!isset($_GET["nooutput"]) || $_GET["nooutput"] == "") )
{
$result = mysqli_query($dbconn, "SELECT id, bg_farbe, text_farbe, text_format, text_groesse, text_groesse_text FROM formatierung ORDER BY id ASC") or die (mysqli_error($dbconn));
while($row = mysqli_fetch_array($result))
@ -129,7 +129,7 @@ else { //if( $show_filter != 1 ) {
//$nextday = '
$show[$tageswechsel] .= '
<tr>
<td colspan="5" bgcolor="black"><span style="color:white;font-size:16;font-weight:bold">&nbsp;Tageswechsel: '.get_date_long($row["zeit"]).'</span></td>
<td colspan="5" bgcolor="black"><span style="color:white;font-size:16px;font-weight:bold">&nbsp;Tageswechsel: '.get_date_long($row["zeit"]).'</span></td>
</tr>
';
}