From 48203dc9350df57b9bff4f6286a0686026875e53 Mon Sep 17 00:00:00 2001
From: marko <cwsvjudo@arcor.de>
Date: Wed, 21 Nov 2018 11:18:15 +0100
Subject: [PATCH 1/3] =?UTF-8?q?-=20Upload=20zu=20square7=20entfernt=20=09g?=
 =?UTF-8?q?e=C3=A4ndert:=20=20=20=20=20=20=20homepage/redesign2018/markdow?=
 =?UTF-8?q?nExperiment/src/Makefiles/Makefile.vp9=20-=20config.inc.php=20k?=
 =?UTF-8?q?orrigiert=20=09ge=C3=A4ndert:=20=20=20=20=20=20=20homepage/rede?=
 =?UTF-8?q?sign2018/markdownExperiment/src/galleryHelper/vidGal.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Makefiles/Makefile.vp9                   | 16 ++++++++++------
 .../src/galleryHelper/vidGal.php                 |  2 +-
 homepage/redesign2018/markdownExperiment/zopfli  |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9 b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
index 2511401..3fa746f 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
@@ -3,11 +3,11 @@ include Makefile.cfg
 # Standardwerte
 
 # Für eine schnelle Komprimierung
-DEFAULT_VID_CODEC = libvpx 
+#DEFAULT_VID_CODEC = libvpx 
 DEFAULT_VID_CODEC_BITRATE = 500k
 DEFAULT_VID_CODEC_HEIGHT = 320
 #DEFAULT_VID_CODEC_BITRATE = 250k
-#DEFAULT_VID_CODEC = libvpx-vp9
+DEFAULT_VID_CODEC = libvpx-vp9
 
 
 # Standardwerte auf die benutzen Variablen schreiben, falls diese noch 
@@ -62,7 +62,8 @@ TEST:
 videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 	mkdir -p videos/webm
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360 \
 		-codec:v $(VID_CODEC) \
 		-pass 1 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -73,7 +74,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 		-y \
 	/dev/null
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360 \
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -97,7 +99,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
 	mkdir -p videos/webm
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
 		-codec:v $(VID_CODEC) \
 		-pass 1 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -108,7 +111,8 @@ videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
 		-y \
 	/dev/null
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-b:v $(VID_CODEC_BITRATE) \
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
index f88279e..5342530 100644
--- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
+++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
@@ -1,7 +1,7 @@
 <?php
+$basePath = "/users/cwsvjudo/www";
 include_once("config.inc.php");
 
-	$basePath = "/users/cwsvjudo/www";
 
 	require_once($basePath."/config/cwsvJudo.config.php");
 
diff --git a/homepage/redesign2018/markdownExperiment/zopfli b/homepage/redesign2018/markdownExperiment/zopfli
index f0010d0..ae43a8b 160000
--- a/homepage/redesign2018/markdownExperiment/zopfli
+++ b/homepage/redesign2018/markdownExperiment/zopfli
@@ -1 +1 @@
-Subproject commit f0010d0c13a71ee44f48bb9d2eb3160aee5ed458
+Subproject commit ae43a8b73827577c4b19b005b6eed81f5cf9bbac

From 10f98eac614fde272d56bf103e2c1c7267806421 Mon Sep 17 00:00:00 2001
From: marko <cwsvjudo@arcor.de>
Date: Mon, 3 Dec 2018 17:35:18 +0100
Subject: [PATCH 2/3] Korrekturen der Einbindung von wettkampfkalenderlosen
 Events
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

zum Commit vorgemerkte Änderungen:
	geändert:       wkParticipo/admin/adminAddStarter.php
	geändert:       wkParticipo/admin/listEvents.php
	geändert:       wkParticipo/admin/newsLetter.php
	geändert:       wkParticipo/admin/showEvent.php
	geändert:       wkParticipo/admin/showFahrt.php
	geändert:       wkParticipo/index.php
	geändert:       wkParticipo/lib/wkParticipoLib.inc.php
---
 .../wkParticipo/admin/adminAddStarter.php     |   2 +-
 .../wkParticipo/admin/listEvents.php          |   8 +-
 .../wkParticipo/admin/newsLetter.php          | 133 ++++++++++++------
 .../wkParticipo/admin/showEvent.php           |   7 +-
 .../wkParticipo/admin/showFahrt.php           |   4 +-
 .../markdownExperiment/wkParticipo/index.php  |  16 ++-
 .../wkParticipo/lib/wkParticipoLib.inc.php    |  52 +++++--
 7 files changed, 159 insertions(+), 63 deletions(-)

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."<br /";
 				}
 				else{
-					$wkEventData = getEventData($mysqlConn, $_POST['f']['eventId']);
+					$wkEventData = getWkEventData($mysqlConn, $_POST['f']['eventId']);
 					
 					if( date("Y-m-d") > $wkEventData['meldefrist']){
 						$message['error'] .= "Die Meldefrist ist bereits abgelaufen!<br />";
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);
 ?>
 		<div class="wkBox">
-			[<?php echo $event['id']?>] -- <?php echo mb_convert_encoding($wkData['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?>
+			[<?php echo $event['id']?>] -- <?php echo $wkData['Veranstaltung'];?>
 				<ul>
 					<li>Meldefrist: <?php echo $event['meldefrist'];?></li>
 					<li>Datum: <?php echo $wkData['Datum'];?></li>
-					<li>Altersklassen: <?php echo mb_convert_encoding($wkData['Altersklassen'],'UTF-8');?></li>
+					<li>Altersklassen: <?php echo $wkData['Altersklassen'];?></li>
 					<li><?php echo $event['wkId'];?></li>
 				</ul>
 				<form action="./showEvent.php" method="post">
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 37c2f19..0f9ef97 100644
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
@@ -22,7 +22,7 @@
 				}
 				else{
 				// Abfrage der Eventdaten
-					$eventData = getEventData($mysqli, $_POST['f']['eventId']);
+					$eventData = getWkEventData($mysqli, $_POST['f']['eventId']);
 					if( empty($eventData) ) $message['error'] = 'Fehler: keine Eventdaten zurückgeliefert!';
 					else{
 				// Abfrage der Starterdaten des Events
@@ -174,6 +174,11 @@
 					echo("<tr><th>Name</th><th>Vorname</th><th>Masse</th><th>Platz</th><th>starterId</th><th>fahrtId</th></tr>");
 
 					foreach( $starterData as $starter ){
+						if( empty($starter) ){
+							echo("Keine ".$typeKey." für dieses Event!");
+							continue;
+						}
+						
 						if($starter['type'] != $typeKey) continue;
 						echo("<tr>");
 							$userData = getUserData($mysqli, $starter['userId']);
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php
index 8b13169..e956c27 100644
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php
@@ -21,7 +21,7 @@
 				$message['error'] .= "fahrtId \"".$_POST['f']['fahrtId']."\" nicht gefunden <br />";
 			}
 			else{
-				$event = getEventData($mysqli, $fahrt['eventId']);
+				$event = getWkEventData($mysqli, $fahrt['eventId']);
 				if( empty($event) ){
 					$message['error'] .= "eventId \"".$fahrt['eventId']."\" nicht gefunden <br />";
 				}
@@ -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/index.php b/homepage/redesign2018/markdownExperiment/wkParticipo/index.php
index 0ebb60d..9364e58 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);
 ?>
 						<div class="wkInfoCard">
-							<time class="wkInfoCardDate" datetime="<?php echo( $wkEvent['Datum'] );?>">
+							<time class="wkInfoCardDate" datetime="<?php echo( $wkEvent['date'] );?>">
 								<span class="wkInfoCardDateWeekday">
-									<?php echo( strftime("%a", strtotime($wkEvent['Datum'])));?>
+									<?php echo( strftime("%a", strtotime($wkEvent['date'])));?>
 								</span>
 								<span class="wkInfoCardDateDay">
-									<?php echo( strftime("%d", strtotime($wkEvent['Datum'])));?>
+									<?php echo( strftime("%d", strtotime($wkEvent['date'])));?>
 								</span>
 								<span class="wkInfoCardDateMonth">
-									<?php echo( strftime("%b", strtotime($wkEvent['Datum'])));?>
+									<?php echo( strftime("%b", strtotime($wkEvent['date'])));?>
 								</span>
 								<span class="wkInfoCardDateYear">
-									<?php echo( strftime("%Y", strtotime($wkEvent['Datum'])));?>
+									<?php echo( strftime("%Y", strtotime($wkEvent['date'])));?>
 								</span>
 							</time>
 
@@ -119,7 +120,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 								<div class="wkInfoCardWkInfo">
 									<h4 class="fontWeightLighter" ><?php echo( $wkEvent['Veranstaltung'] );?></h4>
 									<dl>
-										<dt>Datum</dt><dd><time datetime="<?php echo( $wkEvent['Datum'] );?>"><?php echo( $wkEvent['Datum'] );?></time></dd>
+										<dt>Datum</dt><dd><time datetime="<?php echo( $wkEvent['date'] );?>"><?php echo( $wkEvent['date'] );?></time></dd>
 										<dt>Altersklassen</dt><dd><?php echo( $wkEvent['Altersklassen'] );?></dd>
 										<dt>Eingeschrieben als</dt><dd><?php echo( $startTyp[$wkEvent['type']] );?></dd>
 									</dl>
@@ -132,7 +133,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 									<a href ="/ressourcen/phpLib/calendar.php?wkID=<?php echo $wkEvent['lfdeNr']?>" class="wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised">
 										Termin als iCal
 									</a>
-									<a href ="<?php echo( addToGcalUrl( $wkEvent['Veranstaltung'], $wkEvent['Datum'] ) );?>" class="wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised">
+									<a href ="<?php echo( addToGcalUrl( $wkEvent['Veranstaltung'], $wkEvent['date'] ) );?>" class="wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised">
 										In den Google Calendar
 									</a>
 								</div>
@@ -210,6 +211,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 ?>
 				<h3><?php echo( $wkEvent['Veranstaltung'] );?></h3>
 				<?php
+					//var_dump($wkEvent);
 					echo( 
 						htmlWkEvent(
 							$wkEvent, 
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
index 1388387..f586215 100644
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
@@ -269,6 +269,7 @@ function getFahrtData($anMysqlConn, $anFahrtId){
 return $ret;
 }
 
+/*
 function getEventData($anMysqlConn, $anEventId){
 $ret = array();
 if( (string)(int)$anEventId != $anEventId ) return $ret;
@@ -276,6 +277,7 @@ if( (string)(int)$anEventId != $anEventId ) return $ret;
 	$query = sprintf(
 		"SELECT ".
 			"wkParticipo_Events.id, ".
+			"wkParticipo_Events.date, ".
 			"wkParticipo_Events.wkId, ".
 			"wkParticipo_Events.meldefrist, ".
 			"wkParticipo_Events.bemerkungen, ".
@@ -286,7 +288,8 @@ if( (string)(int)$anEventId != $anEventId ) return $ret;
 			"wettkampfkalender.Ausschreibung, ".
 			"wettkampfkalender.Routenplaner ".
 		"FROM wkParticipo_Events ".
-		"JOIN wettkampfkalender ON wettkampfkalender.lfdeNr = wkParticipo_Events.wkId ".
+		"LEFT JOIN wettkampfkalender ".
+		"ON wkParticipo_Events.wkId = wettkampfkalender.lfdeNr ".
 		"WHERE wkParticipo_Events.id = '%s';",
 		$anMysqlConn->real_escape_string($anEventId) );
 	$results = $anMysqlConn->query($query);
@@ -294,7 +297,7 @@ if( (string)(int)$anEventId != $anEventId ) return $ret;
 	/// @ToDo: Anzahl Ergebnise auf ==1 testen
 	$ret = $results->fetch_assoc();
 return $ret;
-}
+}*/
 
 /// Daten eines einzelnen wkEvents via eventId abfragen
 ///
@@ -306,6 +309,8 @@ return $ret;
 /// 
 function getWkEventData($anMysqlConn, $anEventId, $someOptions = array()){
 
+//var_dump($anMysqlConn, $anEventId, $someOptions);
+
 if( empty($someOptions['dbCharset'])  ) $someOptions['dbCharset'] = "ISO-8859-1";
 if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8";
 
@@ -326,7 +331,7 @@ if( (string)(int)$anEventId != $anEventId ) return $ret;
 			"wettkampfkalender.Ausschreibung, ".
 			"wettkampfkalender.Routenplaner ".
 		"FROM wkParticipo_Events ".
-		"JOIN wettkampfkalender ON wettkampfkalender.lfdeNr = wkParticipo_Events.wkId ".
+		"LEFT JOIN wettkampfkalender ON wettkampfkalender.lfdeNr = wkParticipo_Events.wkId ".
 		"WHERE wkParticipo_Events.id = '%s';",
 		$anMysqlConn->real_escape_string($anEventId)
 	);
@@ -338,6 +343,21 @@ if( (string)(int)$anEventId != $anEventId ) return $ret;
 	// Bei einem leeren Ergebnis (NULL oder leeres Array) soll ein leeres Array zurückgeliefert werden
 	if( empty($ret) ) return array();
 
+// @todo: nur temporär: fehlende Wettkampdaten aus den Metadaten ergänzen
+if( empty($ret['wkId']) ){
+	$tmpWkEvent = json_decode($ret['bemerkungen'], true);
+	if(!empty($tmpWkEvent)){
+//	var_dump( $tmpWkEvent );
+//	var_dump( json_decode($aWkEvent['bemerkungen'], true) );
+		$ret['Datum'] = $tmpWkEvent['Datum'];
+		$ret['Veranstaltung'] = $tmpWkEvent['Veranstaltung'];
+		$ret['Altersklassen'] = $tmpWkEvent['Altersklassen'];
+		$ret['bemerkungen'] = $tmpWkEvent['bemerkungen'];
+	}
+}
+
+
+
 // Zeichensatzkonvertierung
 	array_walk(
 		$ret,
@@ -347,6 +367,7 @@ if( (string)(int)$anEventId != $anEventId ) return $ret;
 		$someOptions
 	);
 
+
 return $ret;
 }
 
@@ -375,6 +396,7 @@ $ret = array();
 	$query = sprintf(
 		"SELECT ".
 			"wkParticipo_Events.id, ".
+			"wkParticipo_Events.date, ".
 			"wkParticipo_Events.wkId, ".
 			"wkParticipo_Events.meldefrist, ".
 			"wkParticipo_Events.bemerkungen, ".
@@ -386,10 +408,11 @@ $ret = array();
 			"wettkampfkalender.Ausschreibung, ".
 			"wettkampfkalender.Routenplaner ".
 		"FROM wkParticipo_Events ".
-		"JOIN wettkampfkalender ".
+		"LEFT JOIN wettkampfkalender ".
 		"ON wettkampfkalender.lfdeNr = wkParticipo_Events.wkId ".
-		"WHERE wettkampfkalender.Datum >= CURDATE() ".
-		"ORDER BY wettkampfkalender.Datum;"
+		"WHERE wettkampfkalender.Datum IS NULL OR wettkampfkalender.Datum >= CURDATE() ".
+//		"ORDER BY wettkampfkalender.Datum;"
+		"ORDER BY wkParticipo_Events.date;"
 	);
 //	echo($query);die();
 	$results = $anMysqlConn->query($query);
@@ -412,7 +435,6 @@ $ret = array();
 		);
 		array_push( $ret, $result);
 	}
-
 return $ret;
 }
 
@@ -479,6 +501,8 @@ return $ret;
 
 
 /// Zukünftige Wettkämpfe abfragen
+///
+/// - Fragt in der Zukunft liegende Wettkämpfe aus dem Wettkampfkalender ab
 function getCommingWk($anMysqlConn){
 $ret = array();
 	$anMysqlConn->query("USE cwsvjudo;");
@@ -927,7 +951,7 @@ $retMessage = array();
 		return $retMessage;
 	}
 	
-	$event = getEventData($anMysqlConn, $anEventId);
+	$event = getWkEventData($anMysqlConn, $anEventId);
 	if( empty($event) ){
 		$retMessage['error'] .= "eventId ".$anEventId." nicht gefunden<br />";
 		return $retMessage;
@@ -969,7 +993,7 @@ $retMessage = array();
 		return $retMessage;
 	}
 	
-	$event = getEventData($anMysqlConn, $anEventId);
+	$event = getWkEventData($anMysqlConn, $anEventId);
 	if( empty($event) ){
 		$retMessage['error'] .= "eventId ".$anEventId." nicht gefunden<br />";
 		return $retMessage;
@@ -1204,6 +1228,16 @@ function htmlWkEvent($aWkEvent, $starters, $fahrten){
 
 $retHtml = "";
 
+if( empty($aWkEvent['wkId']) ){
+	$tmpWkEvent = json_decode($aWkEvent['bemerkungen'], true);
+//	var_dump( $tmpWkEvent );
+//	var_dump( json_decode($aWkEvent['bemerkungen'], true) );
+	$aWkEvent['Datum'] = $tmpWkEvent['Datum'];
+	$aWkEvent['Veranstaltung'] = $tmpWkEvent['Veranstaltung'];
+	$aWkEvent['Altersklassen'] = $tmpWkEvent['Altersklassen'];
+	$aWkEvent['bemerkungen'] = $tmpWkEvent['bemerkungen'];
+}
+
 	if( empty($aWkEvent['Datum']) )
 		$aWkEvent['Datum'] = "0000-00-00";
 	$anzPlätze = 0;

From ce978f05fd0869a364648026fac92c6a66791246 Mon Sep 17 00:00:00 2001
From: marko <cwsvjudo@arcor.de>
Date: Mon, 3 Dec 2018 17:36:51 +0100
Subject: [PATCH 3/3] =?UTF-8?q?-=20Umstellung=20auf=20Andrea=20=09ge=C3=A4?=
 =?UTF-8?q?ndert:=20=20=20=20=20=20=20src/Makefiles/Makefile.ftpUpload=20?=
 =?UTF-8?q?=09ge=C3=A4ndert:=20=20=20=20=20=20=20src/Makefiles/Makefile.vi?=
 =?UTF-8?q?dstabTest=20-=20kleinere=20Korrekturen=20=09ge=C3=A4ndert:=20?=
 =?UTF-8?q?=20=20=20=20=20=20src/galleryHelper/getVideoDurationJson.py=20?=
 =?UTF-8?q?=09ge=C3=A4ndert:=20=20=20=20=20=20=20src/galleryHelper/vidGalI?=
 =?UTF-8?q?nsert.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Makefiles/Makefile.ftpUpload          | 23 +++++++++++++------
 .../src/Makefiles/Makefile.vidstabTest        | 22 +++++++++++-------
 .../src/galleryHelper/getVideoDurationJson.py |  4 ++--
 .../src/galleryHelper/vidGalInsert.py         |  0
 4 files changed, 32 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
 mode change 100644 => 100755 homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py

diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
index 9fe7b08..21cb1cd 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
@@ -1,17 +1,26 @@
 include Makefile.cfg
 
-ftpServer = ftpupload.net
-ftpUser = unaux_22935783
-ftpPassword = eeloor0D
+#ftpServer = ftpupload.net
+#ftpUser = unaux_22935783
+#ftpPassword = eeloor0D
 
-ftpPathBase = /htdocs
+#ftpPathBase = /htdocs
+#ftpFilePath = videoalben/videoalben.2018
+
+ftpServer = cwsvjudo.bplaced.net
+ftpUser = cwsvjudo
+ftpPassword = ***REMOVED***
+
+ftpPathBase = /www
 ftpFilePath = videoalben/videoalben.2018
 
-vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
+vidGalIndexPhp = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
 dryRun = --dry-run
 timeHandling= --only-newer
+lftpNetLimitRate = 0
 
-vidGalInsertScript = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
+
+vidGalInsertScript = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
 
 
 
@@ -20,7 +29,7 @@ all:
 
 .PHONY: ftpUpload
 ftpUpload:
-	lftp -e 'set net:limit-rate 25600; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
+	lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
 		-u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
 	
 	for file in videos/webm/*; do \
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
index 16dd26b..38abfb0 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
@@ -1,5 +1,7 @@
-FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
-GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
+#FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
+FFMPEG = ffmpeg
+#GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
+GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli
 
 #DEFAULT_FFMPEG = ffmpeg
 DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
@@ -18,6 +20,9 @@ VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_C
 VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODEC_WIDTH))
 VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC))
 
+#VID_CODEC_DEADLINE := -deadline best
+VID_CODEC_DEADLINE := -deadline realtime
+
 targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
 targetSourceDir = videos/aufnahmen/
 sourceVideos = $(wildcard videos/.forCompressing/*.video)
@@ -89,7 +94,7 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide
 #		-b:v $(VID_CODEC_BITRATE) \
 # First Pass
 	$(FFMPEG) -i $< \
-		-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
+		-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
 		-codec:v $(VID_CODEC) \
 		-pass 1 \
 		-passlogfile "$(basename $<).firstPassLog" \
@@ -110,16 +115,16 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide
 # Die erste Abhängigkeit muss das quellVideo sein!
 videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log
 	mkdir -p videos/webm
-
+	~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<
 #		-b:v $(VID_CODEC_BITRATE) \
 # Second Pass
 	$(FFMPEG) -i $< \
-		-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
+		-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-passlogfile "$(basename $<).firstPassLog" \
-		-deadline best \
-		-b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
+		$(VID_CODEC_DEADLINE) \
+		-b:v $(shell ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
 		-aspect 16:9 \
 		-threads 1 \
 		-speed 0 \
@@ -139,5 +144,6 @@ videos/thumbnails/%.png: videos/.forCompressing/%.video
 	$(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
 
 videos/thumbnails/%.jpg: videos/thumbnails/%.png
-	$(GUETZLI) --quality 90 "$<" "$@"
+#	$(GUETZLI) --quality 90 "$<" "$@"
+	convert "$<" "$@"
 
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py b/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
old mode 100644
new mode 100755
index c529732..bcd76ee
--- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
+++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
@@ -21,7 +21,7 @@ def probe(vid_file_path):
     @vid_file_path : The absolute (full) path of the video file, string.
     '''
     if type(vid_file_path) != str:
-        raise Exception('Gvie ffprobe a full file path of the video')
+        raise Exception('Give ffprobe a full file path of the video')
         return
 
     command = ["ffprobe",
@@ -34,7 +34,7 @@ def probe(vid_file_path):
 
     pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.STDOUT)
     out, err = pipe.communicate()
-    return json.loads(out)
+    return json.loads(out.decode('utf-8'))
 
 
 def duration(vid_file_path):
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
old mode 100644
new mode 100755