summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorHorus32016-12-02 19:46:09 +0100
committerHorus32016-12-02 19:46:09 +0100
commitea6c2daf95fbab4bfe491e2d1464ea641bfe67f8 (patch)
treeb7fffa86a19eea0287ce3f536b097c442a02c44d /intern
parent38d8646c4339b1b1ac9f13253c1076f3b6728435 (diff)
downloadgospeladlershof.de-ea6c2daf95fbab4bfe491e2d1464ea641bfe67f8.tar.gz
Fügt Chorbeschreibung als API-Endpunkt hinzu.
Diffstat (limited to 'intern')
-rw-r--r--intern/api/termine.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/api/termine.php b/intern/api/termine.php
index 3b0658d..20d96a1 100644
--- a/intern/api/termine.php
+++ b/intern/api/termine.php
@@ -15,11 +15,13 @@ $res = $db->query('select termin, uhrzeit from proben where date(STR_TO_DATE(ter
$proben = $res->fetchAll(PDO::FETCH_ASSOC);
$res = $db->query('select termin,uhrzeit,beschreibung,anfahrt from konzert order by id desc limit 1;');
$konzert = $res->fetchAll(PDO::FETCH_ASSOC);
+$res = $db->query('select nachricht as chorbeschreibung from chor order by id desc limit 1;');
+$chorbeschreibung = $res->fetch(PDO::FETCH_ASSOC);
$konzert[0]["beschreibung"] = str_replace("<strong>", "**", str_replace("</strong>", "**", $konzert[0]["beschreibung"]));
#$output = array("konzert" => $konzert, "proben" => $proben, "build" => date("d.m.Y H:i:s"));
-$output = array("konzert" => $konzert, "proben" => $proben, "build" => date("Y-m-d H:i:s"));
+$output = array("konzert" => $konzert, "proben" => $proben, "chorbeschreibung" => $chorbeschreibung["chorbeschreibung"], "build" => date("Y-m-d H:i:s"));
$data = json_encode($output, JSON_PRETTY_PRINT);
file_put_contents($json_file, $data); // speichert die JSON Datei für den Fall, dass es später Fehler gibt