From 4ca073001cf4fc408089caa5e4d99d379cd9dca0 Mon Sep 17 00:00:00 2001 From: marko Date: Mon, 23 Jul 2018 10:53:18 +0200 Subject: [PATCH] =?UTF-8?q?-=20gab=20mit=20dem=20bestehenden=20Ordner=20do?= =?UTF-8?q?wnloads=20Probleme=20=09renamed:=20=20=20=20md/downloads.md=20-?= =?UTF-8?q?>=20md/download.md=20=09renamed:=20=20=20=20yaml/downloads.subN?= =?UTF-8?q?av.yaml=20->=20yaml/download.subNav.yaml=20=09modified:=20=20?= =?UTF-8?q?=20yaml/extras.subNav.yaml=20-=20kleinere=20Rechtschreibekorrek?= =?UTF-8?q?tur=20=09modified:=20=20=20md/index.md=20-=20=C3=BCberfl=C3=BC?= =?UTF-8?q?=C3=9Fige=20Datei=20entfernt=20=09deleted:=20=20=20=20md/kontak?= =?UTF-8?q?t.md~=20-=20das=20Zitat=20wieder=20zur=C3=BCck=20in=20den=20Hea?= =?UTF-8?q?der=20geholt=20=09modified:=20=20=20pandocTemplate/cwsvJudo.htm?= =?UTF-8?q?l5.pandocTemplate=20-=20muss=20nocheinmal=20=C3=BCberpr=C3=BCft?= =?UTF-8?q?=20werden:=20warum=20funktioniert=20die=20Jahresansicht=20der?= =?UTF-8?q?=20News=20nicht=3F=20=09modified:=20=20=20phpLib/cwsvJudo/newsL?= =?UTF-8?q?ib.php=20=09modified:=20=20=20phpLib/cwsvJudo/newsTableHtml.php?= =?UTF-8?q?=20-=20=C3=9Cberwachen=20der=20alten=20Adressen=20f=C3=BCr=20ei?= =?UTF-8?q?ne=20korrekte=20Umleitung=20=09new=20file:=20=20=20redirecting/?= =?UTF-8?q?pagesDesktop/redirecter.php=20=09new=20file:=20=20=20redirectin?= =?UTF-8?q?g/pagesDesktop/redirects.json=20=09new=20file:=20=20=20redirect?= =?UTF-8?q?ing/pagesMobile/redirecter.php=20=09new=20file:=20=20=20redirec?= =?UTF-8?q?ting/pagesMobile/redirects.json=20-=20ein=20zu=20fr=C3=BChes=20?= =?UTF-8?q?melden=20im=20Wettkampfplaner=20verhindern!=20=09modified:=20?= =?UTF-8?q?=20=20wkParticipo/eventKalender.php=20=09modified:=20=20=20wkPa?= =?UTF-8?q?rticipo/lib/wkParticipoLib.inc.php=20=09modified:=20=20=20wkPar?= =?UTF-8?q?ticipo/showWkEvent.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../md/{downloads.md => download.md} | 0 .../markdownExperiment/md/index.md | 2 +- .../markdownExperiment/md/kontakt.md~ | 46 ----- .../cwsvJudo.html5.pandocTemplate | 18 +- .../phpLib/cwsvJudo/newsLib.php | 15 +- .../phpLib/cwsvJudo/newsTableHtml.php | 4 +- .../redirecting/pagesDesktop/redirecter.php | 59 +++++++ .../redirecting/pagesDesktop/redirects.json | 78 +++++++++ .../redirecting/pagesMobile/redirecter.php | 54 ++++++ .../redirecting/pagesMobile/redirects.json | 34 ++++ .../wkParticipo/eventKalender.php | 159 +++++++++--------- .../wkParticipo/lib/wkParticipoLib.inc.php | 16 +- .../wkParticipo/showWkEvent.php | 27 +-- ...loads.subNav.yaml => download.subNav.yaml} | 0 .../yaml/extras.subNav.yaml | 2 +- 15 files changed, 353 insertions(+), 161 deletions(-) rename homepage/redesign2018/markdownExperiment/md/{downloads.md => download.md} (100%) delete mode 100644 homepage/redesign2018/markdownExperiment/md/kontakt.md~ create mode 100644 homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php create mode 100644 homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json create mode 100644 homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php create mode 100644 homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json rename homepage/redesign2018/markdownExperiment/yaml/{downloads.subNav.yaml => download.subNav.yaml} (100%) diff --git a/homepage/redesign2018/markdownExperiment/md/downloads.md b/homepage/redesign2018/markdownExperiment/md/download.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/downloads.md rename to homepage/redesign2018/markdownExperiment/md/download.md diff --git a/homepage/redesign2018/markdownExperiment/md/index.md b/homepage/redesign2018/markdownExperiment/md/index.md index 7866892..1f0df98 100644 --- a/homepage/redesign2018/markdownExperiment/md/index.md +++ b/homepage/redesign2018/markdownExperiment/md/index.md @@ -14,7 +14,7 @@ jsonSdFiles: # Willkommen -auf der Website des Judo-Teams des [Chem­nitzer Frei­zeit- und Wohng­ebiets­sport­vereines e. V][cwsvHomepage] +auf der Website des Judo-Teams des [Chem­nitzer Frei­zeit- und Wohng­ebiets­sport­vereines e. V.][cwsvHomepage] Hier findet ihr Informationen zu unseren [Trainingszeiten][cwsvJudoTraining] und [Wettkampfterminen][cwsvJudoWettkampfKalender]. diff --git a/homepage/redesign2018/markdownExperiment/md/kontakt.md~ b/homepage/redesign2018/markdownExperiment/md/kontakt.md~ deleted file mode 100644 index efe4131..0000000 --- a/homepage/redesign2018/markdownExperiment/md/kontakt.md~ +++ /dev/null @@ -1,46 +0,0 @@ ---- -lang: de -title: Vereinsinformationen des CWSV -author: marko -keywords: - - Judo - - Chemnitz - - Chemnitzer Freizeit- und Wohngebietssportverein -mainNav: - - {caption: "Home", url: "http://cwsvjudo.bplaced.net", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.x256.png"} - - {caption: "Verein", url: "http://cwsvjudo.bplaced.net/verein", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvLogoWappen.x250.png"} -subNav: - - {caption: "Trainings­zeiten", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/clockIconFriendly.svg", title: "Trainingszeiten und -orte der Judoka des Chemnitzer WSV", url: "http://cwsvjudo.bplaced.net/training"} - - {caption: "Termine", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/calendarIcon.svg", url: "http://cwsvjudo.bplaced.net/wettkampfkalender"} -... -# Kontakt - -Hier findet Ihr [eMail-Adressen](#email), [Telephonnummern](#telephon) -und [Adressen](#adressen), um mit uns in Kontakt zu treten. - -## E-Mail - -- [eMail an den Chemnitzer Freizeit- und Wohngebietssportverein - e. V.(cwsv.sb@web.de)](mailto:cwsv.sb@web.de) -- Link zum [Kontaktformular][cwsvKontaktFormular] auf der Homepage -des Chemnitzer Freizeit- und Wohngebietssportvereines -- ![eMail](http://cwsvjudo.bplaced.net/ressourcen/graphiken/misc/abc123.png){.pngAddress - width="60" height="420"} - -## Adressen - -- CWSV - Verwaltung ([Karte][cwsvVerwaltungKarte]) - - Strasse Usti nad Labem 42 - - 09119 Chemnitz - - Mo 8:00-16:30, Di 10:00-17:00, Mi 8:00-17:00, Do 10:00-17:00 - -## Telephon - -- CWSV - Verwaltung - - Tel.: [0371 / 28 23 370](tel:+493712823370 "Telefonnummer der Verwaltung des Chemnitzer WSV") - - Fax.: 0371/ 22 91 79 - - Mo 8:00-16:30, Di 10:00-17:00, Mi 8:00-17:00, Do 10:00-17:00 - -[cwsvKontaktFormular]: http://www.cwsv-sport.de/Kontakt.htm "Karte der Verwaltung des Chemnitzer WSV" -[cwsvVerwaltungKarte]: http://www.openstreetmap.org/?mlat=50.807643&mlon=12.882060#map=17/50.807643/12.882060 - diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate index d975109..a95a6c7 100644 --- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate +++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate @@ -50,13 +50,18 @@ $if(phpTitleFunction)$ <?php $phpTitleFunction$();?> $else$ $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ +$endif$ +$if(css)$ + $endif$ $if(quotes)$ $endif$ $if(highlighting-css)$ @@ -64,9 +69,6 @@ $if(highlighting-css)$ $highlighting-css$ $endif$ -$for(css)$ - -$endfor$ $for(extraCss)$ $endfor$ @@ -109,8 +111,10 @@ $endfor$ title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Promo" src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/banner/bannerlogo.1.jpg" /> - Judo - + + Judo + + prepare( $query - //"SELECT * FROM nachrichten ORDER BY datum DESC, nr DESC LIMIT :limit;" ); } - $pdoStatementForQuerryingNews->bindParam(':limit', intval($optionsArray['limit']), PDO::PARAM_INT); -// $pdoStatementForQuerryingNews->bindParam(':jahr', intval($optionsArray['jahr']), PDO::PARAM_INT); + if( is_positive_integer($optionsArray['jahr']) ) + $pdoStatementForQuerryingNews->bindParam(':jahr', intval($optionsArray['jahr']), PDO::PARAM_INT); + else + $pdoStatementForQuerryingNews->bindParam(':limit', intval($optionsArray['limit']), PDO::PARAM_INT); $pdoStatementForQuerryingNews->execute(); $ret = $pdoStatementForQuerryingNews->fetchAll(PDO::FETCH_ASSOC); diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php index c3da907..c3ca961 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php @@ -27,8 +27,8 @@ $limit = is_positive_integer($someOptions['limit'])?$someOptions['limit']:1; // News abfragen // @todo: woher das limit nehmen? - $newsList = getNews($db_connection, array('limit'=>$limit)); -// $newsList = getNews($db_connection, $someOptions); +// $newsList = getNews($db_connection, array('limit'=>$limit)); + $newsList = getNews($db_connection, $someOptions); if( is_array( $newsList ) || is_object( $newsList ) ) foreach($newsList as $news) diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php b/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php new file mode 100644 index 0000000..a34b703 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php @@ -0,0 +1,59 @@ +prepare( + "INSERT INTO cwsvjudo.redirecter (jsonServer) VALUES (:jsonServerString);" + ); + $query->bindParam(':jsonServerString', json_encode($_SERVER) ); + $query->execute(); +// if( !$query->execute() ) +// echo("ERROR: ".$query->errorCode()); +// else echo("executed\n"); + } + catch(PDOException $db_error){ +// die( "Error!: " . $db_error->getMessage() ); + } + +} +catch(PDOException $db_error){ +// die( "Error!: " . $db_error->getMessage() ); + } + + +//header("Status: 503 Service Unavailable"); +header("Location: /", true, 302); +exit(); +?> diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json b/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json new file mode 100644 index 0000000..581d02c --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json @@ -0,0 +1,78 @@ +[ + { + "from":"\/pages\/desktop\/", + "to":"\/" + }, + { + "from":"\/pages\/desktop\/index.php", + "to":"\/" + }, + { + "from":"\/pages\/desktop\/kontakt.php", + "to":"\/kontakt" + }, + { + "from":"\/pages\/desktop\/kontakt.email.php", + "to":"\/kontakt#e-mail" + }, + { + "from":"\/pages\/desktop\/kontakt.telephon.php", + "to":"\/kontakt#telephon" + }, + { + "from":"\/pages\/desktop\/kontakt.adressen.php", + "to":"\/kontakt#adressen" + }, + { + "from":"\/pages\/desktop\/verein.galerien.php", + "to":"\/galerien" + }, + { + "from":"\/pages\/desktop\/verein.training.php", + "to":"\/trainingszeiten" + }, + { + "from":"\/pages\/desktop\/verein.php", + "to":"\/verein" + }, + { + "from":"\/pages\/desktop\/verein.wettkampf.php", + "to":"\/wkKalender" + }, + { + "from":"\/pages\/desktop\/verein.wettkampfkalender.php", + "to":"\/wkKalender" + }, + { + "from":"\/pages\/desktop\/news.php", + "to":"\/news" + }, + { + "from":"\/pages\/desktop\/verein.feiern.php", + "to":"\/galerien?veranstaltungsArt=Feier" + }, + { + "from":"\/pages\/desktop\/verein.zelten.php", + "to":"\/galerien?veranstaltungsArt=Zelten" + }, + { + "from":"\/pages\/desktop\/extras.php", + "to":"\/extras" + }, + { + "from":"\/pages\/desktop\/extras.downloads.php", + "to":"\/downloads" + }, + { + "from":"\/pages\/desktop\/extras.quiz.php", + "to":"\/quiz" + }, + { + "from":"\/pages\/desktop\/extras.links.php", + "to":"\/links" + }, + { + "from":"\/pages\/desktop\/wkparticipo", + "to":"\/pages\/desktop\/wkParticipo" + } +] diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php b/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php new file mode 100644 index 0000000..5b97ed1 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php @@ -0,0 +1,54 @@ +prepare( + "INSERT INTO cwsvjudo.redirecter (jsonServer) VALUES (:jsonServerString);" + ); + $query->bindParam(':jsonServerString', json_encode($_SERVER) ); + $query->execute(); +// if( !$query->execute() ) +// echo("ERROR: ".$query->errorCode()); +// else echo("executed\n"); + } + catch(PDOException $db_error){ +// die( "Error!: " . $db_error->getMessage() ); + } + +} +catch(PDOException $db_error){ +// die( "Error!: " . $db_error->getMessage() ); + } + + +header("Location: /", true, 302); +exit(); +?> diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json b/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json new file mode 100644 index 0000000..ed3fb03 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json @@ -0,0 +1,34 @@ +[ + { + "from":"\/pages\/mobile\/", + "to":"\/" + }, + { + "from":"\/pages\/mobile\/news.php", + "to":"\/news" + }, + { + "from":"\/pages\/mobile\/index.php", + "to":"\/" + }, + { + "from":"\/pages\/mobile\/verein.wettkampfgalerien.php", + "to":"\/galerien" + }, + { + "from":"\/pages\/mobile\/verein.wetkampfgalerien.php", + "to":"\/galerien" + }, + { + "from":"\/pages\/mobile\/verein.training.php", + "to":"\/trainingszeiten" + }, + { + "from":"\/pages\/mobile\/verein.wettkampfkalender.php", + "to":"\/wkKalender" + }, + { + "from":"\/pages\/mobile\/kontakt.php", + "to":"\/kontakt" + } +] diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php b/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php index b3a1ecc..e7c406f 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php @@ -1,79 +1,80 @@ -connect_error) { - $sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error; - } - - - -?> - - - - - - - - Wettkampfplanung der Judoka des CWSV - - - - - - -

Wettkampfplanung - Kalender

- - -
- -
Zur Übersicht zurück
- - -
die geplanten Wettkämpfe als iCal
- - -
alle geplanten Wettkämpfe in den Google Kalender übernehmen
- -
- -

Anstehende Wettkämpfe

- -

Momentan befinden sich anscheinend keine Wettkämpfe in Planung!

- -
- - - - - - +connect_error) { + $sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error; + } + + + +?> + + + + + + + + Wettkampfplanung der Judoka des CWSV + + + + + + + +

Wettkampfplanung - Kalender

+ + +
+ +
Zur Übersicht zurück
+ + +
die geplanten Wettkämpfe als iCal
+ + +
alle geplanten Wettkämpfe in den Google Kalender übernehmen
+ +
+ +

Anstehende Wettkämpfe

+ +

Momentan befinden sich anscheinend keine Wettkämpfe in Planung!

+ +
+ + + + + + diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php index 931f10d..696d37e 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php @@ -1209,6 +1209,9 @@ $retHtml = ""; foreach($fahrten as $fahrt) $anzPlätze += $fahrt['plaetze']; + $heuteDateTime = DateTime::createFromFormat("Y-m-d", date("Y-m-d")); + $einschreibeDateTime = DateTime::createFromFormat("Y-m-d", $aWkEvent['meldefrist']); + $retHtml = "
". "
". "
". - "Detailansicht". + "Detailansicht". "Termin als iCal". "In den Google Calendar". "
". diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php index 1557d9e..e940971 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php @@ -61,7 +61,7 @@ @@ -165,19 +165,22 @@ echo("
Bereits eingeschrieben!
"); } else{ - if( date("Y-m-d") > $eventData['meldefrist']){ - echo ""; - - if (!empty($_SESSION['login'])){ - echo( "

Frist für das Einschreiben verpasst? Für ein nachträgliches Eintragen mit dem Admin verständigen (Email an cwsvjudo@arcor.de).

" ); - } - - - - + $heuteDateTime = DateTime::createFromFormat("Y-m-d", date("Y-m-d")); + $einschreibeDateTime = DateTime::createFromFormat("Y-m-d", $eventData['meldefrist']); + if($heuteDateTime->modify( "+ 4 weeks") < $einschreibeDateTime){ + echo(""); } else{ - echo ""; + if( date("Y-m-d") > $eventData['meldefrist']){ + echo ""; + + if (!empty($_SESSION['login'])){ + echo( "

Frist für das Einschreiben verpasst? Für ein nachträgliches Eintragen mit dem Admin verständigen (Email an cwsvjudo@arcor.de).

" ); + } + } + else{ + echo ""; + } } } ?> diff --git a/homepage/redesign2018/markdownExperiment/yaml/downloads.subNav.yaml b/homepage/redesign2018/markdownExperiment/yaml/download.subNav.yaml similarity index 100% rename from homepage/redesign2018/markdownExperiment/yaml/downloads.subNav.yaml rename to homepage/redesign2018/markdownExperiment/yaml/download.subNav.yaml diff --git a/homepage/redesign2018/markdownExperiment/yaml/extras.subNav.yaml b/homepage/redesign2018/markdownExperiment/yaml/extras.subNav.yaml index 397e1e8..72f4e94 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/extras.subNav.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/extras.subNav.yaml @@ -2,7 +2,7 @@ subNav: - *home - {url: "/links", caption: "Links"} - - {url: "/downloads", caption: "Downloads"} + - {url: "/download", caption: "Downloads"} - {url: "/hilfsmittel", caption: "Hilfsmittel"} - *quiz ...