aschwarz/Leitgedanken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Korrekturen PHP8

Browse Source
This commit is contained in:
aschwarz
2023-02-01 08:16:28 +01:00
parent a6523903eb
commit 4adf236c1a
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
menuframe.php
View File

@ -43,7 +43,7 @@ $row4 = $result4->fetch_array();
$smarty->assign('b_bereich', "$row4[0]");
# Publikationen
# Lehre / Erkenntnis
$result3 = $db->query("SELECT DISTINCT 1
FROM admin_rolle a, admin b, admin_rechte c, admin_rollen_user_zuord d, admin_rollen_rechte_zuord e
WHERE a.rid = d.rid
@ -117,7 +117,7 @@ $row2 = $result2->fetch_array();
$smarty->assign('s_bereich', "$row2[0]");
# Oben
@ -177,7 +177,7 @@ while ($row7 = $result7->fetch_array())
}
$smarty->assign('table_data2', $value7);
# Publikationen
# Lehre / Erkenntnis
$query8 = "SELECT DISTINCT Beschreibung, dateiname, target
FROM admin_rolle a, admin b, admin_rechte c, admin_rollen_user_zuord d, admin_rollen_rechte_zuord e
WHERE a.rid = d.rid
@ -243,7 +243,7 @@ $query9 = "SELECT DISTINCT Beschreibung, dateiname, target
AND c.admin_rolle = e.admin_rolle
AND b.user = '$user_admin'
AND c.bereich = 'a'
ORDER BY sort_order ASC
ORDER BY sort_order ASC
";
$result9 = $db->query( $query9);
while ($row9 = $result9->fetch_array())
@ -261,7 +261,7 @@ $query10 = "SELECT DISTINCT Beschreibung, dateiname, target
AND c.admin_rolle = e.admin_rolle
AND b.user = '$user_admin'
AND c.bereich = 's'
ORDER BY sort_order ASC
ORDER BY sort_order ASC
";
$result10 = $db->query( $query10);
while ($row10 = $result10->fetch_array())
@ -272,7 +272,7 @@ $smarty->assign('table_data5', $value10);
####################Kalender###################################################
@ -291,7 +291,7 @@ if($row_outl[0] == '1'){
$smarty->assign('recht', "1");
}else{
$smarty->assign('recht', "0");
}
}
$result_gd = $db->query( "SELECT wgd FROM profil WHERE user = '$user_admin'" );
@ -322,7 +322,7 @@ $query = "SELECT datum, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') m
AND ( ukid=1 OR ukid=2 OR ukid=6 OR ukid=13 OR ukid=14 OR ukid=15 OR ukid=17 OR ukid=22 OR ukid=25 OR ukid=26 OR ukid=30 OR ukid=68)
ORDER BY datum DESC
";
$result = $db->query( $query);
$range ="";
@ -331,10 +331,10 @@ while ($row = $result->fetch_array()){
# Die Donnerstagsgemeinden sollen im Kalender Donnerstag angzeigt bekommen,
# außer der Mittwoch ist ein Buß-Bettag Weihnachten, Neujahr, Jahresabschluss. Dann haben die Gemeinden trotzdem am Mittwoch
if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] != "25" AND $row['ukid'] != "26" AND $row['ukid'] != "22" )){
#$datum="$row[jahr]-$row[monat]-$row[tag]";
if($row[datum]==getBETTAG($row['jahr']) AND $row1[kal_bettag] == 1){ // Buß und Bettag bei Donnerstagsgemeinden auf Mittwoch legen, falls gewünscht
if($row['datum']==getBETTAG($row['jahr']) AND $row1['kal_bettag'] == 1){ // Buß und Bettag bei Donnerstagsgemeinden auf Mittwoch legen, falls gewünscht
$range .= "$row[datum]|";
}else{
$range .= date("Y-m-d", mktime(0,0,0,$row['monat'],$row['tag']+1,$row['jahr']))."|";
@ -348,7 +348,7 @@ $smarty->assign('range', "$range");
$result_max = $db->query( "SELECT date_format(max(datum), '%Y') jahr, date_format(max(datum), '%m') monat, date_format(max(datum), '%d') tag
FROM quelle
WHERE kid=1
WHERE kid=1
AND ( ukid=1 OR ukid=2 OR ukid=6 OR ukid=13 OR ukid=14 OR ukid=15 OR ukid=17 OR ukid=22 OR ukid=25 OR ukid=26 OR ukid=30 OR ukid=68)
" );
$rowmax = $result_max->fetch_array();