diff --git a/feiern/redeEiserner.md b/feiern/redeEiserner.md new file mode 100644 index 0000000..4f39070 --- /dev/null +++ b/feiern/redeEiserner.md @@ -0,0 +1,13 @@ + +*Eisernen in die Hand nehmen.* Darum möchte ich Euch allen den Rat und +die Mahnung geben: Seid eisern *Eisernen auf den Tisch knallen* in +Euren Bestrebungen. Seid formbar, wo Ihr Euch verbessern könnt. Ertragt +die Scharten *auf Scharte zeigen* die Euch geschlagen werden. Schleift +sie weg, um mit Euren Leistungen zu glänzen *auf polierte Stelle +zeigen*. Und passt auf, dass Ihr mit dem Rohstoff, der Euch gegeben +wurde etwas schafft, das es wert ist darauf stolz zu sein. + +Und der beste Anfang, den man dafür machen kann ist eine häufige +Teilnahme am Training. Deshalb geht der Wanderpokal jedes Halbjahr an +denjenigen, der am meisten dafür getan hat und die meiste Anwesenheit +im Training aufweisen kann. diff --git a/findBiggies.sh b/findBiggies.sh new file mode 100644 index 0000000..9b7214a --- /dev/null +++ b/findBiggies.sh @@ -0,0 +1,34 @@ +#!/bin/bash +#set -x + +# Shows you the largest objects in your repo's pack file. +# Written for osx. +# +# @see https://stubbisms.wordpress.com/2009/07/10/git-script-to-show-largest-pack-objects-and-trim-your-waist-line/ +# @author Antony Stubbs + +# set the internal field spereator to line break, so that we can iterate easily over the verify-pack output +IFS=$'\n'; + +# list all objects including their size, sort by size, take top 10 +objects=`git verify-pack -v .git/objects/pack/pack-*.idx | grep -v chain | sort -k3nr | head` + +echo "All sizes are in kB's. The pack column is the size of the object, compressed, inside the pack file." + +output="size,pack,SHA,location" +allObjects=`git rev-list --all --objects` +for y in $objects +do + # extract the size in bytes + size=$((`echo $y | cut -f 5 -d ' '`/1024)) + # extract the compressed size in bytes + compressedSize=$((`echo $y | cut -f 6 -d ' '`/1024)) + # extract the SHA + sha=`echo $y | cut -f 1 -d ' '` + # find the objects location in the repository tree + other=`echo "${allObjects}" | grep $sha` + #lineBreak=`echo -e "\n"` + output="${output}\n${size},${compressedSize},${other}" +done + +echo -e $output | column -t -s ', ' diff --git a/homepage/redesign2018/.gitignore b/homepage/redesign2018/.gitignore index 12994a4..36c9582 100644 --- a/homepage/redesign2018/.gitignore +++ b/homepage/redesign2018/.gitignore @@ -1,2 +1,2 @@ markdownExperiment/build/* - +temp/* diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index 036456a..b6e4d3d 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -45,10 +45,10 @@ ampTest: $(ampFiles) build/css/cwsvJudo.css: $(cssFiles) mkdir -p $(dir $@) - cat $^ > $@ +# cat $^ > $@ # cat $(cssFiles) | cleancss -o $@ # cat $^ | ./node_modules/.bin/csso -o $@ -# cat $^ | csso -o $@ + cat $^ | csso -o $@ build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate mkdir -p build @@ -82,11 +82,11 @@ upload: $(uploadMarker) build/.uploadMarker/%.php: build/%.php mkdir -p build/.uploadMarker - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \ - --ftp-create-dirs +# curl \ +# --upload-file $^ \ +# --user cwsvjudo:Dee4oquu \ +# ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \ +# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -97,11 +97,11 @@ build/.uploadMarker/%.php: build/%.php build/.uploadMarker/amp/%.php: build/amp/%.php mkdir -p build/.uploadMarker/amp - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ - --ftp-create-dirs +# curl \ +# --upload-file $^ \ +# --user cwsvjudo:Dee4oquu \ +# ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ +# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -113,11 +113,11 @@ build/.uploadMarker/amp/%.php: build/amp/%.php build/.uploadMarker/phpLib/%.php: phpLib/%.php mkdir -p build/.uploadMarker/phpLib/cwsvJudo mkdir -p build/.uploadMarker/phpLib/phpcount - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%.php,%.php,$^) \ - --ftp-create-dirs +# curl \ +# --upload-file $^ \ +# --user cwsvjudo:Dee4oquu \ +# ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%.php,%.php,$^) \ +# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -127,11 +127,11 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php build/.uploadMarker/css/%.css: build/css/%.css mkdir -p build/.uploadMarker/css - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \ - --ftp-create-dirs +# curl \ +# --upload-file $^ \ +# --user cwsvjudo:Dee4oquu \ +# ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \ +# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ diff --git a/homepage/redesign2018/markdownExperiment/admin/ak2jg.php b/homepage/redesign2018/markdownExperiment/admin/ak2jg.php new file mode 100644 index 0000000..0cced4a --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/admin/ak2jg.php @@ -0,0 +1,58 @@ +setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + $akQuery = + $cwsvJudoDbConnection->prepare( + "SELECT lfdeNr, Datum, Veranstaltung, Altersklassen FROM cwsvjudo.`wettkampfkalender` WHERE DATUM > CURRENT_DATE() ORDER BY Datum ASC, lfdeNr ASC LIMIT 24;" + ); + + $akQuery->execute(); + $wkList = $akQuery->fetchAll(PDO::FETCH_ASSOC); + + // Zeichensatzkonvertierung + $someOptions = array(); + if( empty($someOptions['dbCharset']) ) + $someOptions['dbCharset'] = "ISO-8859-1"; + if( empty($someOptions['outCharset']) ) + $someOptions['outCharset'] = "UTF-8"; + + foreach($wkList as &$entry){ + array_walk( + $entry, + function (&$value, $key, $someOptions) { + $value = iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value); + }, + $someOptions + ); + } + +?> + + + + + + + +"); + } +?> +
".$wk['lfdeNr']."".$wk['Datum']."".$wk['Veranstaltung']."".$wk['Altersklassen']."".json_encode($jg)."
+ + diff --git a/homepage/redesign2018/markdownExperiment/admin/phpcount/phpcountLog.php b/homepage/redesign2018/markdownExperiment/admin/phpcount/phpcountLog.php index d2c816c..e24cce6 100644 --- a/homepage/redesign2018/markdownExperiment/admin/phpcount/phpcountLog.php +++ b/homepage/redesign2018/markdownExperiment/admin/phpcount/phpcountLog.php @@ -13,47 +13,65 @@ try{ $cwsvJudoConfig["db"]["password"] ); - $nodupesQuery = $dbConnection->prepare( - "SELECT COUNT(*) AS anz, DATE(FROM_UNIXTIME( time )) as date FROM `phpcount_nodupes` GROUP BY date ORDER BY date DESC" + $dailyHitsQuery = $dbConnection->prepare( + "SELECT COUNT(*) AS anz, DATE(timeStamp) as date FROM `phpcount_pageHits` GROUP BY date ORDER BY date DESC;" ); - $nodupesQuery->execute(); - $nodupesList = $nodupesQuery->fetchAll(PDO::FETCH_ASSOC); - - $uniqueHitsQuery = $dbConnection->prepare( - "SELECT pageid, hitcount FROM `phpcount_hits` WHERE isunique=1 ORDER BY hitcount DESC" - ); - $uniqueHitsQuery->execute(); - $uniqueHitsList = $uniqueHitsQuery->fetchAll(PDO::FETCH_ASSOC); - + $dailyHitsQuery->execute(); + $dailyHitsList = $dailyHitsQuery->fetchAll(PDO::FETCH_ASSOC); + + $whereClauses=array(); + if($_GET['userHash']) + $whereClauses[]="userHash='".$_GET['userHash']."'"; + if($_GET['date']) + $whereClauses[]="DATE(timestamp)='".$_GET['date']."'"; + if($_GET['pageId']) + $whereClauses[]="pageId='".urldecode($_GET['pageId'])."'"; + + $whereClause = join(" AND ", $whereClauses); + $pagehitsQuery = $dbConnection->prepare( - "SELECT timeStamp, pageId, userHash FROM `phpcount_pageHits` ORDER BY timeStamp DESC;" + "SELECT DATE(timeStamp) as date, TIME(timestamp) as time, pageId, userHash, userAgentString FROM `phpcount_pageHits` ". + ($whereClause?"WHERE ".$whereClause." ":""). + "ORDER BY timeStamp DESC;" ); $pagehitsQuery->execute(); $pagehitsList = $pagehitsQuery->fetchAll(PDO::FETCH_ASSOC); + +// var_dump($_GET); + if($_GET['action']=="deleteHitter"){ + //var_dump($_GET['action']); + $deleteHitterQuery = $dbConnection->prepare( + "DELETE FROM `phpcount_pageHits` WHERE userHash=:userHash;" + ); + $deleteHitterQuery->bindParam(':userHash', $_GET['userHash']); + if($deleteHitterQuery->execute()); + else echo("FEHLER\n"); + } } catch(PDOException $db_error){ die( "Error!: " . $db_error->getMessage() ); } +//var_dump($dailyHitsList); ?> + RESET +
- -" ); -?> + +
datetimes
".$nodupesEntry['date']."".$nodupesEntry['anz']."
", array_column($dailyHitsList, 'date') ) );?>
", array_column($dailyHitsList, 'anz') ) );?>
+
- -" ); -?> -
Seitetimes
".$uniqueHitsEntry['pageid']."".$uniqueHitsEntry['hitcount']."
- - + " ); + echo( "\t\t\t\t". + "". + "". + "". + ""; ?>
timeStamppageIduserHash
datetimepageIduserHashuserAgentString
".$pagehitsEntry['timeStamp']."".$pagehitsEntry['pageId']."".substr($pagehitsEntry['userHash'], 0, 5)."...
".$pagehitsEntry['date']."".$pagehitsEntry['time']."".urldecode($pagehitsEntry['pageId'])."".substr($pagehitsEntry['userHash'], 0, 5)."..." ). + "".$pagehitsEntry['userAgentString']."
diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/.htaccess b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/.htaccess new file mode 100644 index 0000000..2105dd1 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/.htaccess @@ -0,0 +1,14 @@ +RewriteEngine on +RewriteRule ^photoalben/(.*) http://cwsvjudo\.bplaced\.net/photoalben/$1 +RewriteRule ^ressourcen/(.*)$ http://cwsvjudo\.bplaced\.net/ressourcen/$1 +RewriteRule ^/ressourcen/(.*)$ http://cwsvjudo\.bplaced\.net/ressourcen/$1 + +RewriteCond %{HTTP_HOST} cwsvjudo.bplaced.net +RewriteRule ^news$ news\.php [L] +RewriteCond %{HTTP_HOST} cwsvjudo.bplaced.net +RewriteRule ^news/([0-9]+)$ news\.php?newsId=$1 + +RewriteCond %{HTTP_HOST} amp.cwsvjudo.bplaced.net +RewriteRule ^news$ news\.php [L] +RewriteCond %{HTTP_HOST} amp.cwsvjudo.bplaced.net +RewriteRule ^news/([0-9]+)$ news\.php?newsId=$1 [L] diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/config.inc.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/config.inc.php new file mode 100644 index 0000000..16ec268 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/config.inc.php @@ -0,0 +1,20 @@ + diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css new file mode 100644 index 0000000..451e014 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css @@ -0,0 +1,233 @@ +/* +@font-face { + font-family: Orbitron-Medium; + src: url(/ressourcen/fonts/Orbitron-Medium.otf); +} +*/ +html{ + background: #FFAE00; + box-sizing: border-box; +} +*, ::before, ::after { + box-sizing: inherit; +} + +body{ + font-size: 4.5vmin; + font-family: arial, helvetica, sans-serif; + background: #FFAE00; +} + + +.newsTable{ + border: solid 1px #000000; + width:100%; + padding: 1%; +} + +.newsTableHeader{ + background: #FF8100; +} +.newsTableFooter{ + clear: both; + background: #FF8100; +} + +.bigPicture{ + width: 100%; + height: auto; +} + +.centeredText{ + text-align: center; +} + +.orbitronFont{ + font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif; + padding-top: .16em; +} + +.Inhaltsverzeichnis{ + padding: 1%; + width: 100%; + background-color: + #FF8100; + font-variant: + small-caps; + font-size: + larger; + font-weight: + bolder; +} +.Inhaltsverzeichnis a{ + color: inherit; +} +.Inhaltsverzeichnis div a:hover{ + text-decoration: + none; + color: + #993300; +} + +.navButton{ + border-color: white; + border-style: outset; + border-radius: 1em; + text-align: center; + text-decoration: none; + cursor: pointer; + display: inline-block; + padding-left: .5em; + padding-right: .5em; +} + +.messageBox{ + width: 100%; + border:solid 1px #000000; + background-color:#FF8100; + font-size:smaller; +} + +.fullWidth{ + width:100%; +} + +.noMargin{ + margin: 0; +} + +.rightFloat{ + float:right; +} + +.leftFloat{ + float:left; +} + +.clearBoth{ + clear: both; +} + +/*--- + * Formatierung der News in Amp + */ +.ampNewsBox{ + clear: both; + border: solid 1px #000000; + width:100%; + padding: 1%; +} +.ampNewsBoxHeader{ + background: #FF8100; +} +.ampNewsBoxFooter{ + clear: both; + background: #FF8100; +} +/*--- + * Formatierung der subNav in Amp + */ +.ampSubNav{ + display: flex; + justify-content: space-between; +} + +/*--- + * touchable Links +*/ +.touchLink{ + display: inline-block; + padding: 0.25em 0 0.25em 0; + margin: 0.25em 0 0.25em 0; + background-color: #FF8100; + border-radius: .5em; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); +} + +/*--- + * Eine kleine NachrichtenBox + */ +.messageBox{ + width: 100%; + border:solid 1px #000000; + background-color:#FF8100; + font-size:smaller; +} + +/* + * Unterauswahl-Navigationsleiste + */ + +/* der SubNavContainer*/ +.subNav{ + display: flex; +/* flex-direction: column;*/ + align-items: stretch; + justify-content: space-between; +} +.subNav a{ + color: inherit; +} +.subNavElement{ + /*width: 100%;*/ + background: #FF8100; + padding-top:.125em; + padding-left:.125em; + padding-right:.125em; + border-style: outset; + border-radius: 1em; + font-size: 1.125em; + text-decoration: none; + flex-basis: 20%; + border-style: outset; + display: flex; + justify-content: center; + align-items: center; + text-align: center; +} +.subNavElementIcon{ + text-align: center; + max-width: 2.5em; + height: auto; + padding: .125em; +} +.subNavElementCaption{ + display: none; +} + +.activeNav { + border-color: #A80101; + border-style: inset; +} +.pngAddress{ + width: 20em; + height: auto; + vertical-align: middle; +} + + +/* + * Tabelle mit den GalerieLinks +*/ +.galTable{ + width: 100%; +} +.galTable tr, th, td { + width: auto; + vertical-align: middle; +} + +.galTable tr:nth-child(odd){ + background-color: #FF8100; +} + +.galTable tr td img{ + display: inline; + vertical-align: middle; +} + +.galTable tr td a img{ + display: inline; + vertical-align: middle; +} + diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php new file mode 100644 index 0000000..37e3a13 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + <?php echo( !empty($siteData['title']) ? $siteData['title'] : "Judo im Chemnitzer WSV" );?> + + +
+ Dies ist die "mobile" Version für Smartphones etc.
+ Hier gibt es die Desktop-Variante +
+ ".$messages['error']."");?> +
+

+ +

+
+ +
+ +
+ + +
+ +
+ +
+
+ news.php" + > +
Bekanntmachungen
+ + trainingszeiten.php" + > +
Trainingszeiten
+ + + +
Wettkampfkalender
+ + +
Wettkampfplaner
+ + +
Wettkampfgalerien
+ + kontakt.php" + > +
Kontaktdaten
+ +
+
+ + + diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/expCounter/counter.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/expCounter/counter.php new file mode 100644 index 0000000..d2dc662 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/expCounter/counter.php @@ -0,0 +1,3 @@ + diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/galerien.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/galerien.php new file mode 100644 index 0000000..a8c27b1 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/galerien.php @@ -0,0 +1,202 @@ +connect_error){ + $messages['error'] += "Datenbankverbindung fehlgeschlagen: " . $mysqlConn->connect_error . "
"; + } + else{ +// mögliche Werte für das Jahr herausfinden + $galJahresListe = array(); + + $queryJahresListe = " + SELECT DISTINCT DATE_FORMAT( datum, '%Y') + AS jahr + FROM cwsvjudo.wkGalerien + WHERE 1 + ORDER BY DATE_FORMAT( datum, '%Y' ) DESC; + "; + + $mysqlResults = $mysqlConn->query($queryJahresListe); + if( !$mysqlResults ){ + $messages['error'] += "Fehler bei Datenbankabfrage '".$queryJahresListe."'
"; + } + else{ + while( $mysqlResult = $mysqlResults->fetch_assoc() ){ + array_push( $galJahresListe, $mysqlResult['jahr']); + } + } + + // standardmäßig frage die letzten 12 Galerien ab + $queryGals = " + SELECT id,datum,name,url,typ,teaserBildUrl + FROM cwsvjudo.wkGalerien + WHERE 1 + ORDER BY datum DESC LIMIT 12 + "; + // Falls ein Konkretes Jahr angegebe wurde, fragen wir dies ab + if($galJahr != ""){ + $minDate = $galJahr."-01-01"; + $maxDate = $galJahr."-12-31"; + $queryGals = sprintf(" + SELECT id,datum,name,url,typ,teaserBildUrl + FROM cwsvjudo.wkGalerien + WHERE datum >= '%s' AND datum <= '%s' ORDER BY datum ASC;", + $mysqlConn->real_escape_string($minDate), + $mysqlConn->real_escape_string($maxDate) + ); + } + + $galListe = array(); + $mysqlResults = $mysqlConn->query($queryGals); + if( !$mysqlResults ){ + $messages['error'] += "Fehler bei Datenbankabfrage '".$queryGals."'
"; + } + else{ + while( $mysqlResult = $mysqlResults->fetch_assoc() ){ + array_push( $galListe, $mysqlResult); + } + } + } + + //$siteData['jsonDataHeader'] = ""; + +// Modellierung: +// - der Content ist eine Menge von Sections +// - eine Section ist eine Folge von Articles + $siteData['content'] = array(); + +// $newsSection = array(); + + $siteData['title'] = "Galerien mit Bildern der Judoka des Chemnitzer WSV"; + + $siteData['ampSubNav'] = array( + array( + 'caption' => "Trainings­zeiten", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/clockIconFriendly.svg", + 'title' => "Trainingszeiten und -orte der Judoka des Chemnitzer WSV", + 'href' => $canonicalBaseUrl."/trainingszeiten.php" + ), + array( + 'caption' => "Termine", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/calendarIcon.svg", + 'title' => "Kalender mit Terminen für Wettkämpfe", + 'href' => $baseUrl."/pages/desktop/verein.wettkampfkalender.php" + ), + array( + 'isActive' => 'true', + 'caption' => "Galerien", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/gallery.svg", + 'title' => "Bilder und Videos von unseren Wettkämpfen und sonstigen Veranstaltungen", + 'href' => $canonicalBaseUrl."/galerien.php" + ), + array( + 'caption' => "JudoWiki", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/wikipediaW.svg", + 'title' => "Ein kleines Nachschlagewerk über Judo", + 'href' => $baseUrl."/JudoWiki" + ), + array( + 'caption' => "Kontakt", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/contact4Ways.svg", + 'title' => "Möglichkeiten mit dem Chemnitzer Freizeit- und Wohngebietssportverein in Kontakt zu treten", + 'href' => $canonicalBaseUrl."/kontakt.php" + ), + ); + + $siteData['subNav'] = ""; + + $siteData['content'] = array(); + +// $jahresSelector = ""; +// $jahresSelector .= +// ""; + +// array_push( +// $siteData['content'], +// array( +// $jahresSelector +// ) +// ); + + $galTable = ""; + $galTable .= + "". + "". + ""; +// Jede Galerie ausgeben + foreach($galListe as $gal){ + $galTable .= + "". + "". + "". + ""; + } + $galTable .= + "". + "
DatumLink zur Galerie
". + "". + "". + ""; + if( $gal['teaserBildUrl'] != "" ){ + $galTable .= + "
". + "". + "". + "
"; + } + $galTable .= + "
".mb_convert_encoding($gal['name'], 'UTF-8', 'ISO-8859-1')." (".mb_convert_encoding($gal['typ'], 'UTF-8', 'ISO-8859-1').")
". + "". + "
"; + array_push( + $siteData['content'], + array( + $galTable + ) + ); + + + require_once('./cwsvJudo.ampTemplate.inc.php'); + + $chCounter_page_title = "Galerien (ampVersion)"; + $chCounter_visible=0; + $chCounter_mode='noscript'; + include($basePath."/expCounter/counter.php"); +// require_once( "/users/cwsvjudo/www/expCounter/counter.php" ); +?> diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/googlef3ad27a876479282.html b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/googlef3ad27a876479282.html new file mode 100644 index 0000000..7717ce9 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/googlef3ad27a876479282.html @@ -0,0 +1 @@ +google-site-verification: googlef3ad27a876479282.html \ No newline at end of file diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/index.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/index.php new file mode 100644 index 0000000..ca7d717 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/index.php @@ -0,0 +1,127 @@ +query($query); + $galleryLink = $ergebnis->fetchAll(); + header("Location: http://".$baseDomain.$galleryLink[0]['url']); + //die("Location(".$_GET['galId']."): ".$galleryLink[0]['url']); + } + $db_connection = NULL; + } + catch(PDOException $db_error){ + print "Error!: " . $db_error->getMessage() . "
"; + die(); + } + } + + + + + $siteData['canonicalLink'] = $baseUrl; + $siteData['headline'] = "Judo im CWSV"; + + $messages['error'] = ""; + +// Datenbankverbindung bereitstellen + $mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name); + if($mysqlConn->connect_error){ + $messages['error'] += "Datenbankverbindung fehlgeschlagen: " . $mysqlConn->connect_error . "
"; + } + else{ + $newsList = getNewsListById($mysqlConn, $newsId, ["limit" => 6]); +// print_r($newsList); + $prevNewsId = getPrevNewsId($mysqlConn, $newsList[0]); + $nextNewsId = getNextNewsId($mysqlConn, end(array_values($newsList))); + } + + $siteData['jsonDataHeader'] = ""; + +// Modellierung: +// - der Content ist eine Menge von Sections +// - eine Section ist eine Folge von Articles + $siteData['content'] = array(); + + $newsSection = array(); + + $siteData['title'] = "Judo im Chemnitzer WSV - Kinder- und Erwachsenentraining"; + + $siteData['ampSubNav'] = array( + array( + 'caption' => "Trainings­zeiten", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/clockIconFriendly.svg", + 'title' => "Trainingszeiten und -orte der Judoka des Chemnitzer WSV", + 'href' => $canonicalBaseUrl."/trainingszeiten.php" + ), + array( + 'caption' => "Termine", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/calendarIcon.svg", + 'title' => "Kalender mit Terminen für Wettkämpfe", + 'href' => $baseUrl."/pages/desktop/verein.wettkampfkalender.php" + ), + array( + 'caption' => "Gallerien", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/gallery.svg", + 'title' => "Bilder und Videos von unseren Wettkämpfen und sonstigen Veranstaltungen", + 'href' => $baseUrl."/pages/desktop/verein.galerien.php" + ), + array( + 'caption' => "JudoWiki", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/wikipediaW.svg", + 'title' => "Ein kleines Nachschlagewerk über Judo", + 'href' => $baseUrl."/JudoWiki" + ), + array( + 'caption' => "Kontakt", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/contact4Ways.svg", + 'title' => "Möglichkeiten mit dem Chemnitzer Freizeit- und Wohngebietssportverein in Kontakt zu treten", + 'href' => $canonicalBaseUrl."/kontakt.php" + ), + ); + + $siteData['subNav'] = ""; + + foreach( $newsList as $news) + array_push( $newsSection, "
".getAmpNews($news)."
" ); + + array_push($siteData['content'], $newsSection); + array_push( $siteData['content'], array (empty($prevNewsId) ? "" : "weitere Neuigkeiten") ); + + require_once('./cwsvJudo.ampTemplate.inc.php'); + + $chCounter_page_title = "Startseite (ampVersion)"; + $chCounter_visible=0; + $chCounter_mode='noscript'; + include($basePath."/expCounter/counter.php"); +// require_once( "/users/cwsvjudo/www/expCounter/counter.php" ); +?> diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/kontakt.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/kontakt.php new file mode 100644 index 0000000..057ce56 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/kontakt.php @@ -0,0 +1,150 @@ +connect_error){ + $messages['error'] += "Datenbankverbindung fehlgeschlagen: " . $mysqlConn->connect_error . "
"; + } + else{ + $news = getNewsById($mysqlConn, $newsId); + $prevNewsId = getPrevNewsId($mysqlConn, $news); + $nextNewsId = getNextNewsId($mysqlConn, $news); + } +*/ + +// Modellierung: +// - der Content ist eine Menge von Sections +// - eine Section ist eine Folge von Articles + $siteData['content'] = array(); + + $newsSection = array(); + + $siteData['title'] = "Kontaktmöglichkeiten mit dem Chemnitzer WSV und seiner Abteilung Judo"; + + $siteData['ampSubNav'] = array( + array( + 'caption' => "Trainings­zeiten", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/clockIconFriendly.svg", + 'title' => "Trainingszeiten und -orte der Judoka des Chemnitzer WSV", + 'href' => $canonicalBaseUrl."/trainingszeiten.php" + ), + array( + 'caption' => "Termine", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/calendarIcon.svg", + 'title' => "Kalender mit Terminen für Wettkämpfe", + 'href' => $baseUrl."/pages/desktop/verein.wettkampfkalender.php" + ), + array( + 'caption' => "Galerien", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/gallery.svg", + 'title' => "Bilder und Videos von unseren Wettkämpfen und sonstigen Veranstaltungen", +// 'href' => $baseUrl."/pages/desktop/verein.galerien.php" + 'href' => $canonicalBaseUrl."/galerien.php" + ), + array( + 'caption' => "JudoWiki", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/wikipediaW.svg", + 'title' => "Ein kleines Nachschlagewerk über Judo", + 'href' => $baseUrl."/JudoWiki" + ), + array( + 'caption' => "Kontakt", + 'icon' => $baseUrl."/ressourcen/graphiken/icons/contact4Ways.svg", + 'title' => "Möglichkeiten mit dem Chemnitzer Freizeit- und Wohngebietssportverein in Kontakt zu treten", + 'href' => $canonicalBaseUrl."/kontakt.php", + 'isActive' => 'true', + ), + ); + + $siteData['subNav'] = ""; + + $siteData['main'] = ""; + + $siteData['main'] .= + "

E-Mail

". + "". + ""; + + $siteData['main'] .= + "

Adressen

". + + ""; + + $siteData['main'] .= + "

Telephon

". + "". + ""; + + array_push( $newsSection, $siteData['main'] ); + array_push($siteData['content'], $newsSection); +/* array_push( + $siteData['content'], + array ( "weitere Neuigkeiten") ) + ); +*/ + require_once('./cwsvJudo.ampTemplate.inc.php'); + + $chCounter_page_title = "Kontaktseite (ampVersion)"; + $chCounter_visible=0; + $chCounter_mode='noscript'; + include($basePath."/expCounter/counter.php"); +// require_once( "/users/cwsvjudo/www/expCounter/counter.php" ); +?> diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/news.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/news.php new file mode 100644 index 0000000..7e17f3c --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/news.php @@ -0,0 +1,60 @@ +connect_error){ + $messages['error'] += "Datenbankverbindung fehlgeschlagen: " . $mysqlConn->connect_error . "
"; + } + else{ + $news = getNewsById($mysqlConn, $newsId); + $prevNewsId = getPrevNewsId($mysqlConn, $news); + $nextNewsId = getNextNewsId($mysqlConn, $news); + } + +// Modellierung: +// - der Content ist eine Menge von Sections +// - eine Section ist eine Folge von Articles + $siteData['content'] = array(); + + $newsSection = array(); + + $siteData['title'] = empty($news['betreff'])?"Neuigkeiten der Abteilung Judo des Chemnnitzer WSV":($news['betreff']." - Judo im CWSV"); + $siteData['jsonDataHeader'] = ""; + +// echo( "News: "); print_r($news); + $siteData['subNav'] = ""; + $siteData['subNav'] .= ""; + + array_push( $newsSection, "
".getAmpNews($news)."
" ); + array_push($siteData['content'], $newsSection); + + require_once('./cwsvJudo.ampTemplate.inc.php'); +// $chCounter_page_title = "News".( $newsId != "" ? " Id ".$newsId : "" )." (ampVersion)"; +// $chCounter_visible=0; + //include($_SERVER['DOCUMENT_ROOT']."/expCounter/counter.php"); +// require_once( "/users/cwsvjudo/www/expCounter/counter.php" ); +?> diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/newsDev.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/newsDev.php new file mode 100644 index 0000000..30aad7c --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/newsDev.php @@ -0,0 +1,65 @@ +getMessage() . "
"; + $mysqlConn = NULL; + } + +// echo("newsId: ".$newsId); die(); + $news = getNewsById($mysqlConn, $newsId); +// echo("News: "); print_r($news); die(); + $prevNewsId = getPrevNewsId($mysqlConn, $newsId); + $nextNewsId = getNextNewsId($mysqlConn, $newsId); + +// Modellierung: +// - der Content ist eine Menge von Sections +// - eine Section ist eine Folge von Articles + $siteData['content'] = array(); + + $newsSection = array(); + + $siteData['title'] = empty($news['betreff'])?"Neuigkeiten der Abteilung Judo des Chemnnitzer WSV":($news['betreff']." - Judo im CWSV"); + $siteData['jsonDataHeader'] = ""; + +// echo( "News: "); print_r($news); + $siteData['subNav'] = ""; + $siteData['subNav'] .= ""; + +// echo(getAmpNews($news)); die(); + foreach( $news as $newsEntry) + array_push( $newsSection, "
".getAmpNews($newsEntry)."
" ); + array_push($siteData['content'], $newsSection); + + require_once('./cwsvJudo.ampTemplateDev.inc.php'); + $chCounter_page_title = "News".( $newsId != "" ? " Id ".$newsId : "" )." (ampVersion)"; + $chCounter_visible=0; +// include($_SERVER['DOCUMENT_ROOT']."/expCounter/counter.php"); + require_once( "/users/cwsvjudo/www/expCounter/counter.php" ); +?> diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/pages/desktop/verein.galerien.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/pages/desktop/verein.galerien.php new file mode 100644 index 0000000..219ae60 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/pages/desktop/verein.galerien.php @@ -0,0 +1,4 @@ + diff --git a/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/phpLib/ampify.php b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/phpLib/ampify.php new file mode 100644 index 0000000..8caf39e --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/backup/ampPages-backup-2018-06-11-06-49/phpLib/ampify.php @@ -0,0 +1,31 @@ +loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD); + foreach ($dom->getElementsByTagName('img') as $img) { +// list($width, $height) = getimagesize( $_SERVER['DOCUMENT_ROOT'].urldecode($img->getAttribute('src'))); + list($width, $height) = getimagesize( "/users/cwsvjudo/www/".urldecode($img->getAttribute('src'))); + $img->setAttribute('width', $width); + $img->setAttribute('height', $height); + } +return $dom->saveXML(); +} + +# Licensed under a CC0 1.0 Universal (CC0 1.0) Public Domain Dedication +# http://creativecommons.org/publicdomain/zero/1.0/ +function ampify($html='') { +// $html = addImgSize($html); + # Replace img, audio, and video elements with amp custom elements + $html = str_ireplace( + ['',''], + ['',''], + $html + ); + # Add closing tags to amp-img custom element + $html = preg_replace('//', '',$html); + # Whitelist of HTML tags allowed by AMP + $html = strip_tags($html,'

". ""; // $message['notice'] .= "eventWkDatum: ".$eventWkResult['Datum']."
"; + $date=$eventWkResult['Datum']; $meldefrist = date( "Y-m-d", strtotime( @@ -93,12 +95,13 @@ } else{ $query = sprintf( - "INSERT INTO wkParticipo_Events (wkId, meldefrist) - SELECT * FROM (SELECT '%s', '%s') as new_event + "INSERT INTO wkParticipo_Events (wkId, date, meldefrist) + SELECT * FROM (SELECT '%s', '%s', '%s') as new_event WHERE NOT EXISTS ( SELECT wkId FROM wkParticipo_Events WHERE wkId = '%s' ) LIMIT 1;", $mysqli->real_escape_string($_POST['f']['wkId']), + $mysqli->real_escape_string($_POST['f']['date']), $mysqli->real_escape_string($_POST['f']['meldefrist']), $mysqli->real_escape_string($_POST['f']['wkId']) ); @@ -148,6 +151,10 @@
Eventdaten
/>
+
+ + /> +
/> diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php index f2f98c7..26157c9 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php @@ -22,7 +22,7 @@ $message['error'] .= "Datenbankverbindung fehlgeschlagen: ".$mysqlConn->connect_error."
$wkEventData['meldefrist']){ $message['error'] .= "Die Meldefrist ist bereits abgelaufen!
"; diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php index 07460b5..5c370a9 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php @@ -27,14 +27,16 @@ $eventList = getAllEvents($mysqli); foreach($eventList as $event){ - $wkData = getWkData($mysqli, $event['wkId']); +// $wkData = getWkData($mysqli, $event['wkId']); + $wkData = getWkEventData($mysqli, $event['id']); +// var_dump($wkData); ?>
- [] -- + [] --
  • Meldefrist:
  • Datum:
    • -
  • Altersklassen:
    • +
  • Altersklassen:
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php index 2cff8ff..0c778ed 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php @@ -18,41 +18,72 @@ // print_r($eMailAdresses);die(); $queryForEinschreibefristen = - "SELECT cwsvjudo.wettkampfkalender.lfdeNr, ". - "cwsvjudo.wettkampfkalender.Datum, ". - "cwsvjudo.wettkampfkalender.Veranstaltung, ". - "cwsvjudo.wettkampfkalender.Altersklassen, ". - "cwsvjudo.wkParticipo_Events.id, ". - "cwsvjudo.wkParticipo_Events.meldefrist, ". - "cwsvjudo.wkParticipo_Events.wkId, ". - "cwsvjudo.wkParticipo_Events.bemerkungen ". - "FROM cwsvjudo.wettkampfkalender JOIN cwsvjudo.wkParticipo_Events ". - "ON cwsvjudo.wettkampfkalender.lfdeNr = cwsvjudo.wkParticipo_Events.wkId ". - "WHERE cwsvjudo.wkParticipo_Events.meldefrist > CURDATE() AND cwsvjudo.wkParticipo_Events.meldefrist <= DATE_ADD(CURDATE(), INTERVAL 1 WEEK) ". -// "WHERE cwsvjudo.wkParticipo_Events.meldefrist > DATE_ADD(CURDATE(), INTERVAL 1 WEEK) AND cwsvjudo.wkParticipo_Events.meldefrist <= DATE_ADD(CURDATE(), INTERVAL 4 WEEK) ". -// "WHERE wkParticipo_Events.meldefrist <= DATE_ADD(CURDATE(), INTERVAL 1 WEEK) AND wkParticipo_Events.meldefrist >= CURDATE() ". - "ORDER BY wkParticipo_Events.meldefrist;"; + "SELECT ". + "cwsvjudo.wkParticipo_Events.id, ". + "cwsvjudo.wkParticipo_Events.date, ". + "cwsvjudo.wkParticipo_Events.meldefrist, ". + "cwsvjudo.wkParticipo_Events.wkId, ". + "cwsvjudo.wkParticipo_Events.bemerkungen, ". + "cwsvjudo.wettkampfkalender.lfdeNr, ". + "cwsvjudo.wettkampfkalender.Datum, ". + "cwsvjudo.wettkampfkalender.Veranstaltung, ". + "cwsvjudo.wettkampfkalender.Altersklassen ". + "FROM ". + "cwsvjudo.wkParticipo_Events LEFT JOIN cwsvjudo.wettkampfkalender ". + "ON cwsvjudo.wkParticipo_Events.wkId = cwsvjudo.wettkampfkalender.lfdeNr ". + "WHERE cwsvjudo.wkParticipo_Events.meldefrist > CURDATE() AND cwsvjudo.wkParticipo_Events.meldefrist <= DATE_ADD(CURDATE(), INTERVAL 1 WEEK) ". + "ORDER BY wkParticipo_Events.meldefrist;"; $ergebnisEinschreibefristen = $mysqlConn->query( $queryForEinschreibefristen ); - - $dringendeEinschreibeFristen = $ergebnisEinschreibefristen->fetchAll(); + $someOptions=array(); + if( empty($someOptions['dbCharset']) ) $someOptions['dbCharset'] = "ISO-8859-1"; + //if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8";// das spätere, gewünschte Verhalten + if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "ISO-8859-1"; + $dringendeEinschreibeFristen = array(); + if( !empty($ergebnisEinschreibefristen) ){ + while( $result = $ergebnisEinschreibefristen->fetch() ){ + array_walk( + $result, + function (&$value, $key, $someOptions) { + $value = iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value); + }, + $someOptions + ); + array_push( $dringendeEinschreibeFristen, $result); + } + } + $queryForEinschreibefristen = - "SELECT cwsvjudo.wettkampfkalender.lfdeNr, ". - "cwsvjudo.wettkampfkalender.Datum, ". - "cwsvjudo.wettkampfkalender.Veranstaltung, ". - "cwsvjudo.wettkampfkalender.Altersklassen, ". - "cwsvjudo.wkParticipo_Events.id, ". - "cwsvjudo.wkParticipo_Events.meldefrist, ". - "cwsvjudo.wkParticipo_Events.wkId, ". - "cwsvjudo.wkParticipo_Events.bemerkungen ". - "FROM cwsvjudo.wettkampfkalender JOIN cwsvjudo.wkParticipo_Events ". - "ON cwsvjudo.wettkampfkalender.lfdeNr = cwsvjudo.wkParticipo_Events.wkId ". -// "WHERE cwsvjudo.wkParticipo_Events.meldefrist > CURDATE() AND cwsvjudo.wkParticipo_Events.meldefrist <= DATE_ADD(CURDATE(), INTERVAL 1 WEEK) ". - "WHERE cwsvjudo.wkParticipo_Events.meldefrist > DATE_ADD(CURDATE(), INTERVAL 1 WEEK) AND cwsvjudo.wkParticipo_Events.meldefrist <= DATE_ADD(CURDATE(), INTERVAL 4 WEEK) ". - "ORDER BY wkParticipo_Events.meldefrist;"; + "SELECT ". + "cwsvjudo.wkParticipo_Events.id, ". + "cwsvjudo.wkParticipo_Events.date, ". + "cwsvjudo.wkParticipo_Events.meldefrist, ". + "cwsvjudo.wkParticipo_Events.wkId, ". + "cwsvjudo.wkParticipo_Events.bemerkungen, ". + "cwsvjudo.wettkampfkalender.lfdeNr, ". + "cwsvjudo.wettkampfkalender.Datum, ". + "cwsvjudo.wettkampfkalender.Veranstaltung, ". + "cwsvjudo.wettkampfkalender.Altersklassen ". + "FROM ". + "cwsvjudo.wkParticipo_Events LEFT JOIN cwsvjudo.wettkampfkalender ". + "ON cwsvjudo.wkParticipo_Events.wkId = cwsvjudo.wettkampfkalender.lfdeNr ". + "WHERE cwsvjudo.wkParticipo_Events.meldefrist > CURDATE() AND cwsvjudo.wkParticipo_Events.meldefrist <= DATE_ADD(CURDATE(), INTERVAL 4 WEEK) ". + "ORDER BY wkParticipo_Events.meldefrist;"; $ergebnisEinschreibefristen = $mysqlConn->query( $queryForEinschreibefristen ); - $weitereEinschreibefristen = $ergebnisEinschreibefristen->fetchAll(); + $weitereEinschreibefristen = array(); + if( !empty($ergebnisEinschreibefristen) ){ + while( $result = $ergebnisEinschreibefristen->fetch() ){ + array_walk( + $result, + function (&$value, $key, $someOptions) { + $value = iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value); + }, + $someOptions + ); + array_push( $weitereEinschreibefristen, $result); + } + } $mysqlConn = NULL; } @@ -82,13 +113,24 @@ $newsletter['message'] .= "Keine!\r\n"; foreach( $dringendeEinschreibeFristen as $event ){ - $newsletter['message'] .= "\tDatum: ".mb_convert_encoding($event['Datum'], 'UTF-8', 'ISO-8859-1')."\r\n"; - $newsletter['message'] .= "\tWettkampf: ".html_entity_decode(mb_convert_encoding($event['Veranstaltung'], 'UTF-8', 'ISO-8859-1'))."\r\n"; - $newsletter['message'] .= "\tAltersklassen: ".mb_convert_encoding($event['Altersklassen'], 'UTF-8', 'ISO-8859-1')."\r\n"; - $newsletter['message'] .= "\tMeldefrist: ".mb_convert_encoding($event['meldefrist'], 'UTF-8', 'ISO-8859-1')."\r\n"; +// var_dump($event); + if(!empty($event['bemerkungen'])){ + $tmpJson = json_decode( mb_convert_encoding($event['bemerkungen'], 'UTF-8', 'ISO-8859-1'), true); + if($tmpJson){ + $event['Datum'] = $tmpJson['Datum']; + $event['Veranstaltung'] = $tmpJson['Veranstaltung']; + $event['Altersklassen'] = $tmpJson['Altersklassen']; + $event['bemerkungen'] = $tmpJson['bemerkungen']; + } + } + + $newsletter['message'] .= "\tDatum: ".$event['Datum']."\r\n"; + $newsletter['message'] .= "\tWettkampf: ".html_entity_decode( $event['Veranstaltung'] )."\r\n"; + $newsletter['message'] .= "\tAltersklassen: ".$event['Altersklassen']."\r\n"; + $newsletter['message'] .= "\tMeldefrist: ".$event['meldefrist']."\r\n"; $newsletter['message'] .= "\tLink: http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo/showWkEvent.php?eventId=".$event['id']."\r\n"; - if(!empty($event['bemerkungen'])) - $newsletter['message'] .= "\tBemerkungen: ".$event['bemerkungen']."\r\n"; + if( !empty($event['bemerkungen']) ) + $newsletter['message'] .= "\tBemerkungen: ".$event['bemerkungen']."\r\n"; $newsletter['message'] .= "\t\r\n"; } @@ -97,10 +139,21 @@ $newsletter['message'] .= "Erstmal Keine\r\n"; foreach( $weitereEinschreibefristen as $event ){ - $newsletter['message'] .= "\tDatum: ".mb_convert_encoding($event['Datum'], 'UTF-8', 'ISO-8859-1')."\r\n"; - $newsletter['message'] .= "\tWettkampf: ".html_entity_decode(mb_convert_encoding($event['Veranstaltung'], 'UTF-8', 'ISO-8859-1'))."\r\n"; - $newsletter['message'] .= "\tAltersklassen: ".mb_convert_encoding($event['Altersklassen'], 'UTF-8', 'ISO-8859-1')."\r\n"; - $newsletter['message'] .= "\tMeldefrist: ".mb_convert_encoding($event['meldefrist'], 'UTF-8', 'ISO-8859-1')."\r\n"; +// var_dump($event); + if(!empty($event['bemerkungen'])){ + $tmpJson = json_decode( mb_convert_encoding($event['bemerkungen'], 'UTF-8', 'ISO-8859-1'), true); +// var_dump( $tmpJson, json_decode( $event['bemerkungen'], true) ); + if($tmpJson){ + $event['Datum'] = $tmpJson['Datum']; + $event['Veranstaltung'] = $tmpJson['Veranstaltung']; + $event['Altersklassen'] = $tmpJson['Altersklassen']; + $event['bemerkungen'] = $tmpJson['bemerkungen']; + } + } + $newsletter['message'] .= "\tDatum: ".$event['Datum']."\r\n"; + $newsletter['message'] .= "\tWettkampf: ".html_entity_decode( $event['Veranstaltung'] )."\r\n"; + $newsletter['message'] .= "\tAltersklassen: ".$event['Altersklassen']."\r\n"; + $newsletter['message'] .= "\tMeldefrist: ".$event['meldefrist']."\r\n"; $newsletter['message'] .= "\tLink: http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo/showWkEvent.php?eventId=".$event['id']."\r\n"; if(!empty($event['bemerkungen'])) $newsletter['message'] .= "\tBemerkungen: ".$event['bemerkungen']."\r\n"; diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php index 150a3c2..4a55cca 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php @@ -1,4 +1,11 @@ connect_error) { - $message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error; + $mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name); + if ($mysqlConn->connect_error) { + $sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error; } else{ // Abfrage der Eventdaten - $eventData = getEventData($mysqli, $_POST['f']['eventId']); + $eventData = getWkEventData($mysqlConn, $_POST['f']['eventId'], array('outCharset'=>"UTF-8")); if( empty($eventData) ) $message['error'] = 'Fehler: keine Eventdaten zurückgeliefert!'; else{ - // Abfrage der Starterdaten des Events - $starterData = getStarterForEvent($mysqli, $eventData['id']); - // Abfrage der Fahrtdaten des Events - $fahrten = getFahrtenForEvent($mysqli, $eventData['id']); + // Abfrage der Starterdaten des Events + $starterData = getStarterForEvent($mysqlConn, $eventData['id']); + // Abfrage der Fahrtdaten des Events + $fahrten = getFahrtenForEvent($mysqlConn, $eventData['id']); } } } - else $message['error'] = "Fehler: eventId ist kein Int (".$_POST['f']['eventId'].")"; + + //var_dump($_POST); + if( $_POST['action'] == "deleteStarter" ){ + try{ + $dbConnection = new PDO( + 'mysql:host='.$cwsvJudoConfig["db"]["host"].';dbname='.$cwsvJudoConfig["db"]["name"], + $cwsvJudoConfig["db"]["user"], + $cwsvJudoConfig["db"]["password"] + ); + if($_POST['action']=="deleteStarter"){ + echo("DELETE FROM `wkParticipo_Starter` WHERE id=:starterId;"); + $deleteStarterQuery = $dbConnection->prepare( + "DELETE FROM `wkParticipo_Starter` WHERE id=:starterId;" + ); + $deleteStarterQuery->bindParam(':starterId', $_POST['starterId'], PDO::PARAM_INT); + if($deleteStarterQuery->execute()); + else echo("FEHLER\n"); + } + } + catch(PDOException $db_error){ + die( "Error!: " . $db_error->getMessage() ); + } + } + else echo("NoActionDeleteStarter\n"); } } ?> @@ -131,6 +161,9 @@
  • type:
  • fahrtId:
  • +
    • + +
  • "); + echo("NameVornameMassePlatzstarterIdfahrtId"); + + foreach( $starterData as $starter ){ + if( empty($starter) ){ + echo("Keine ".$typeKey." für dieses Event!"); + continue; + } + + if($starter['type'] != $typeKey) continue; + echo(""); + $userData = getUserData($mysqli, $starter['userId']); + echo("".mb_convert_encoding($userData['name'], 'UTF-8', 'ISO-8859-1').""); + echo("".mb_convert_encoding($userData['vorname'], 'UTF-8', 'ISO-8859-1').""); + echo("".$starter['masse'].""); + echo("".$starter['platz'].""); + echo("".$starter['id'].""); + echo("".$starter['fahrtId'].""); + echo(""); + } + echo(""); } -?> - -"; } else{ - $event = getEventData($mysqli, $fahrt['eventId']); + $event = getWkEventData($mysqli, $fahrt['eventId']); if( empty($event) ){ $message['error'] .= "eventId \"".$fahrt['eventId']."\" nicht gefunden
    "; } @@ -58,7 +58,7 @@ $message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error; } else{ - $eventData = getEventData($mysqli, $_POST['f']['eventId']); + $eventData = getWkEventData($mysqli, $_POST['f']['eventId']); if( empty($eventData) ) $message['error'] = 'Fehler: keine Eventdaten zurückgeliefert!'; } } diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/auth.php b/homepage/redesign2018/markdownExperiment/wkParticipo/auth.php index d6b7056..93206fa 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/auth.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/auth.php @@ -1,5 +1,7 @@ 86400, // 86400s sind 24h + ]); session_regenerate_id(); // Falls der serverseitige Logincookie nicht gesetzt ist, leite zur if (empty($_SESSION['login'])) { @@ -12,6 +14,5 @@ "Sie sind als ".htmlspecialchars($_SESSION['user']['username'])." angemeldet.
    ". "Sitzung beenden". "
    • "; - //
    ".var_export($_SESSION, true)."
    "; } ?> diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/authLogin.php b/homepage/redesign2018/markdownExperiment/wkParticipo/authLogin.php index c1bdb81..76073ae 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/authLogin.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/authLogin.php @@ -1,5 +1,7 @@ 86400, // 86400s sind 24h + ]); session_regenerate_id(); // Falls der serverseitige Logincookie nicht gesetzt ist, leite zur if (empty($_SESSION['login'])){ diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/index.php b/homepage/redesign2018/markdownExperiment/wkParticipo/index.php index 0ebb60d..98a761d 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/index.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/index.php @@ -98,20 +98,21 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); } else{ foreach($wkEventData as $wkEvent){ +// var_dump($wkEvent); ?>
    -