- gab mit dem bestehenden Ordner downloads Probleme

renamed: md/downloads.md -> md/download.md renamed: yaml/downloads.subNav.yaml -> yaml/download.subNav.yaml modified: yaml/extras.subNav.yaml - kleinere Rechtschreibekorrektur modified: md/index.md - überflüßige Datei entfernt deleted: md/kontakt.md~ - das Zitat wieder zurück in den Header geholt modified: pandocTemplate/cwsvJudo.html5.pandocTemplate - muss nocheinmal überprüft werden: warum funktioniert die Jahresansicht der News nicht? modified: phpLib/cwsvJudo/newsLib.php modified: phpLib/cwsvJudo/newsTableHtml.php - Überwachen der alten Adressen für eine korrekte Umleitung new file: redirecting/pagesDesktop/redirecter.php new file: redirecting/pagesDesktop/redirects.json new file: redirecting/pagesMobile/redirecter.php new file: redirecting/pagesMobile/redirects.json - ein zu frühes melden im Wettkampfplaner verhindern! modified: wkParticipo/eventKalender.php modified: wkParticipo/lib/wkParticipoLib.inc.php modified: wkParticipo/showWkEvent.php
2018-07-23 10:53:18 +02:00
parent 93ad33a7bd
commit 4ca073001c
15 changed files with 353 additions and 161 deletions
--- a/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php
+++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php
@@ -0,0 +1,59 @@
+<?php
+function Redirect($url, $permanent = false){
+	header('Location: ' . $url, true, $permanent ? 301 : 302);
+	exit();
+}
+
+#$redirectTarget['protocol'] = "http";
+#$redirectTarget['serverName'] = "cwsvjudo.square7.net";
+
+$redirects = 
+	json_decode(
+		file_get_contents('redirects.json'),
+		 true
+	);
+
+foreach($redirects as $redirect){
+	if(
+		(strtok($_SERVER["REQUEST_URI"],'?') == $redirect['from'])
+		||
+		(strtok($_SERVER["REQUEST_URI"],'&') == $redirect['from']) // DotBot z.B. fügt query mit & beginnend an...
+	){
+		header("Status: 301 Moved Permanently");
+		header("Location: ".$redirect['to'].(!empty($_SERVER['QUERY_STRING'])?("?".$_SERVER['QUERY_STRING']):"") );
+		exit();
+	}
+}
+
+try{
+	$db_connection = new PDO(
+		'mysql:host=localhost;dbname=cwsvjudo', 
+		'cwsvjudo', 
+		'***REMOVED***'
+	);
+	
+	try{
+		
+		$query = $db_connection->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();
+?>
--- a/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json
+++ 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"
+	}
+]
--- a/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php
+++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php
@@ -0,0 +1,54 @@
+<?php
+function Redirect($url, $permanent = false){
+	header('Location: ' . $url, true, $permanent ? 301 : 302);
+	exit();
+}
+
+#$redirectTarget['protocol'] = "http";
+#$redirectTarget['serverName'] = "cwsvjudo.square7.net";
+
+$redirects = 
+	json_decode(
+		file_get_contents('redirects.json'),
+		 true
+	);
+
+foreach($redirects as $redirect){
+	if(strtok($_SERVER["REQUEST_URI"],'?') == $redirect['from']){
+		header("Status: 301 Moved Permanently");
+		header("Location: ".$redirect['to'].(!empty($_SERVER['QUERY_STRING'])?("?".$_SERVER['QUERY_STRING']):"") );
+		exit();
+	}
+}
+
+try{
+	$db_connection = new PDO(
+		'mysql:host=localhost;dbname=cwsvjudo', 
+		'cwsvjudo', 
+		'***REMOVED***'
+	);
+	
+	try{
+		
+		$query = $db_connection->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();
+?>
--- a/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json
+++ 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"
+	}
+]