From 4da52fa7d987972d4c17b5d3232df0b8d967e06f Mon Sep 17 00:00:00 2001 From: Daniel Spittank Date: Wed, 17 Nov 2021 14:19:18 +0100 Subject: [PATCH] =?UTF-8?q?Kleinere=20Bugfixes=20(Datepicker,=20Darstellun?= =?UTF-8?q?g=20SE-Klassen)=20und=20Anzeige=20des=20Orts=20f=C3=BCr=20Pause?= =?UTF-8?q?nvertretungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.php | 68 ++++++++++++++++++++++++++++++ public/index.html | 2 +- src/components/AboutScreen.vue | 1 + src/components/Klasse.vue | 4 +- src/components/Vertretungsplan.vue | 52 +++++++++++++++++++++-- src/views/InfodisplayLehrer.vue | 1 + 6 files changed, 121 insertions(+), 7 deletions(-) create mode 100644 proxy.php diff --git a/proxy.php b/proxy.php new file mode 100644 index 0000000..6abc180 --- /dev/null +++ b/proxy.php @@ -0,0 +1,68 @@ +'; +$iserv_rsssul_url = 'https://iserv.de/iserv/public/news/rss/Lehrer%20und%20Sch%C3%BCler?pwd='; +$iserv_rsssus_url = 'https://iserv.de/iserv/public/news/rss/Sch%C3%BCler?pwd='; + + +$iserv_username = 'webexport.system'; +$iserv_password = ''; + +// Angefragte Datei auswerten +switch ($_GET["file"]) { + case "G001": + $iserv_url = $iserv_gpu001_url; + break; + case "G002": + $iserv_url = $iserv_gpu002_url; + break; + case "G005": + $iserv_url = $iserv_gpu005_url; + break; + case "G009": + $iserv_url = $iserv_gpu009_url; + break; + case "G014": + $iserv_url = $iserv_gpu014_url; + break; + case "G017": + $iserv_url = $iserv_gpu017_url; + break; + case "rsslul": + $iserv_url = $iserv_rsslul_url; + break; + case "rsssul": + $iserv_url = $iserv_rsssul_url; + break; + case "rsssus": + default: + $iserv_url = $iserv_rsssus_url; + break; +} + +// Daten via Curl aus IServ laden +$ch = curl_init(); +curl_setopt($ch, CURLOPT_URL, $iserv_url); +curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); +curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); +curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); +curl_setopt($ch, CURLOPT_USERPWD, "$iserv_username:$iserv_password"); +curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); + +$output = curl_exec($ch); + +curl_close($ch); + +// Datei ausgeben +echo $output; + +exit(); +?> + diff --git a/public/index.html b/public/index.html index 4123528..e82f7c8 100644 --- a/public/index.html +++ b/public/index.html @@ -1,5 +1,5 @@ - + diff --git a/src/components/AboutScreen.vue b/src/components/AboutScreen.vue index 0c9c49b..d8c0e5f 100644 --- a/src/components/AboutScreen.vue +++ b/src/components/AboutScreen.vue @@ -3,6 +3,7 @@

SISSy v0.5.1

Sedan Informations- und Stundenplansystem

+
2021 by Daniel Spittank
Lizensiert unter der AGPL 3.0 oder später
diff --git a/src/components/Klasse.vue b/src/components/Klasse.vue index 2aec85e..d95d063 100644 --- a/src/components/Klasse.vue +++ b/src/components/Klasse.vue @@ -4,13 +4,13 @@ :class="cssClass" v-if="id !== '' && typ === 'block'" > - {{ (oberstufe) ? '' : stufe }}{{ zug }} + {{ (oberstufe || zug === 'SE') ? '' : stufe }}{{ zug }} - {{ (oberstufe) ? '' : stufe }}{{ zug }} + {{ (oberstufe || zug === 'SE') ? '' : stufe }}{{ zug }} diff --git a/src/components/Vertretungsplan.vue b/src/components/Vertretungsplan.vue index 08996c0..03211c6 100644 --- a/src/components/Vertretungsplan.vue +++ b/src/components/Vertretungsplan.vue @@ -41,6 +41,10 @@ @@ -80,6 +84,15 @@ {{ vertretungsart(item.art_vertretung) }} + + + + +