From 851213165bd125bf1c74903fd41b4323b9a5ebf7 Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 14 Aug 2018 11:33:26 +0200 Subject: [PATCH] =?UTF-8?q?Changes=20to=20be=20committed:=20-=20hotfix=20f?= =?UTF-8?q?=C3=BCr=20einzelansicht=20der=20news=20=09modified:=20=20=20hta?= =?UTF-8?q?ccess/cwsvjudo.bplaced.net/.htaccess=20=09new=20file:=20=20=20h?= =?UTF-8?q?taccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14=20-=20H?= =?UTF-8?q?ilfssfunktion=20f=C3=BCr=20saubere=20Url=20=09modified:=20=20?= =?UTF-8?q?=20phpLib/cwsvJudo/miscAssis.php=20-=20news=20jetzt=20mit=20str?= =?UTF-8?q?uturierten=20daten=20(article)=20=09modified:=20=20=20phpLib/cw?= =?UTF-8?q?svJudo/newsLib.php=20=09modified:=20=20=20phpLib/cwsvJudo/newsT?= =?UTF-8?q?ableHtml.php=20-=20kleinere=20korrekturen=20und=20erweiterungen?= =?UTF-8?q?:=20=09modified:=20=20=20phpLib/cwsvJudo/wkKalender.php=20=09mo?= =?UTF-8?q?dified:=20=20=20src/css/cwsvJudo-2018-layout.css=20=09modified:?= =?UTF-8?q?=20=20=20src/md/news.md=20=09modified:=20=20=20src/md/verein.md?= =?UTF-8?q?=20=09modified:=20=20=20wkParticipo/admin/newsLetter.php=20=09m?= =?UTF-8?q?odified:=20=20=20wkParticipo/showWkEvent.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htaccess/cwsvjudo.bplaced.net/.htaccess | 2 + .../.htaccess-backup2018-08-14 | 113 ++++++++++++++++++ .../phpLib/cwsvJudo/miscAssis.php | 18 ++- .../phpLib/cwsvJudo/newsLib.php | 33 +++++ .../phpLib/cwsvJudo/newsTableHtml.php | 8 +- .../phpLib/cwsvJudo/wkKalender.php | 21 +++- .../src/css/cwsvJudo-2018-layout.css | 1 + .../markdownExperiment/src/md/news.md | 4 +- .../markdownExperiment/src/md/verein.md | 2 +- .../wkParticipo/admin/newsLetter.php | 10 +- .../wkParticipo/showWkEvent.php | 1 + 11 files changed, 200 insertions(+), 13 deletions(-) create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14 diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess b/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess index 24bdf38..e9bdf08 100644 --- a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess +++ b/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess @@ -19,6 +19,8 @@ ExpiresDefault "access 1 month" # Weiterleitungen ### +## Hotfixes + ## www auf nichtwww umleiten RewriteEngine On diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14 b/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14 new file mode 100644 index 0000000..24bdf38 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess-backup2018-08-14 @@ -0,0 +1,113 @@ +## EXPIRES CACHING ## + +ExpiresActive On +ExpiresByType image/jpg "access 1 year" +ExpiresByType image/jpeg "access 1 year" +ExpiresByType image/gif "access 1 year" +ExpiresByType image/png "access 1 year" +ExpiresByType text/css "access 1 month" +ExpiresByType text/html "access 1 month" +ExpiresByType application/pdf "access 1 month" +ExpiresByType text/x-javascript "access 1 month" +ExpiresByType application/x-shockwave-flash "access 1 month" +ExpiresByType image/x-icon "access 1 year" +ExpiresDefault "access 1 month" + +## EXPIRES CACHING ## + +### +# Weiterleitungen +### + +## www auf nichtwww umleiten + +RewriteEngine On +RewriteBase / +RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] +RewriteRule ^(.*)$ http://%1/$1 [R=301,L] + +RewriteRule ^wk/([0-9]+)$ pages/desktop/verein.wettkampf.php?wkId=$1 + +RewriteRule ^gallery/([0-9]+)$ ?galId=$1 [L] +RewriteRule ^gallery/([0-9]+)/.*$ ?galId=$1 [L] + +RewriteRule ^galerie/([0-9]+)$ ?galId=$1 [L] +RewriteRule ^galerie/([0-9]+)/.*$ ?galId=$1 [L] + + + +Header set Content-Security-Policy "script-src 'self'" + + +Header always set X-FRAME-OPTIONS "DENY" + + + +# Auf die Fontdatei wird von der Subdomain aus zugegriffen +# - das gesamte ressourcenVerzeichnis wird auf die Maindomain umgeleitet +# - die mainDomain erlaubt aber anscheinend nicht, das fremde domains bei ihr anfragen startet +# - deshalb zumindest für das otf-File den cross domain zugriff erlauben +# (seltsam, dass der Zugriff auf die Bilder unter Photoalben aber erlaubt wird...) + + + Header set Access-Control-Allow-Origin "*" + + + + +### +# redesign2018 Test +### + + +# Url-Rewriting aktivieren +RewriteEngine on +# Das Request ist für diese Domain +# Für uns eigentlich irrelevant, da alle Domains (mit/ohne +# www/ch/de/net) auf das Unterverzeichnis geleitet werden soll, aber +# interessant zu wissen +# Und jetzt nützlich: Ich kann es unter der .de-Domain testen! +#RewriteCond %{HTTP_HOST} ^(www.)?cwsvjudo.bplaced.de$ [NC] + +# einige hotfixes +RewriteRule ^pages/desktop/verein.wettkampfkalender.php$ pages/responsive/wkKalender.php [L] +RewriteRule ^ressourcen/(.*)$ ressourcen/$1 [L] +RewriteRule ^photoalben/(.*)$ photoalben/$1 [L] +RewriteRule ^videoalben/(.*)$ videoalben/$1 [L] +RewriteRule ^downloads/(.*)$ downloads/$1 [L] +RewriteRule ^temp/(.*)$ temp/$1 [L] +RewriteRule ^admin/(.*)$ admin/$1 [L] + + +RewriteCond %{REQUEST_URI} ^/$ +RewriteCond %{QUERY_STRING} ^wkId=([0-9]+)$ +RewriteRule ^(.*)$ /pages/responsive/wkKalender.php [L] + + +# Die angeforderte Ressource ist nicht bereits in dem Zielverzeichnis: +RewriteCond %{REQUEST_URI} !^/pages/responsive/ + +# Die angeforderte Ressource (als Datei) ist nicht im Rootverzeichnis +RewriteCond %{REQUEST_FILENAME} !-f + +# Die angeforderte Ressource (als Verzeichnis) ist nicht im +# Rootverzeichnis +RewriteCond %{REQUEST_FILENAME} !-d + +# An die angeforderte Ressource das Zielverzeichnis präfixen +RewriteRule ^(.*)$ /pages/responsive/$1 + +RewriteRule ^(.*)wkKalender/([0-9]+)(.*)$ $1/wkKalender?wkId=$2 +#RewriteCond %{HTTP_HOST} ^(www.)?cwsvjudo.bplaced.de$ [NC] +RewriteRule ^gallery/([0-9]+)$ ?galId=$1 [L] +RewriteRule ^galerie/([0-9]+)$ ?galId=$1 [L] + + +# Ein Request für die Root-Ressource auf die index.php im +# Zielverzeichnis umleiten + +#RewriteCond %{HTTP_HOST} ^(www.)?cwsvjudo.bplaced.de$ [NC] +RewriteRule ^(/)?$ pages/responsive/index.php [L] + + +# Ende redesign2018-Test diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php index 638898c..9de7524 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php @@ -20,7 +20,6 @@ global $cwsvJudoConfig; return $db_connection; } - /// Gibt entweder das erste, nichtleere Element zurück, oder null function firstNonEmptyOf($somePossibleEmptyStuff){ if (is_array($somePossibleEmptyStuff) || $somePossibleEmptyStuff instanceof Traversable){ @@ -93,7 +92,6 @@ if( empty($optionsArray['outCharset']) ) $optionsArray['outCharset'] = "UTF-8"; return $retZitat; } - /// filtert aus einem Array einträge in der gegebenen Reihenfolge function arrayKeyFilter($anArray, $someKeys){ // var_dump($anArray, $someKeys); @@ -126,11 +124,27 @@ return arrayKeyFilter( function echoThisOrThat($This, $that){ echo( !empty($This) ? $This : $that ); } + function echoThisWhenThat($This, $that){ if( !empty($that) ) echo( $This ); } + function thisWhenThat($This, $that){ if( empty($that) ) return ""; return $This; } + +setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); +function toAscii($str, $replace=array(), $delimiter='-') { + if( !empty($replace) ) { + $str = str_replace((array)$replace, ' ', $str); + } + + $clean = iconv('UTF-8', 'ASCII//TRANSLIT', $str); + $clean = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $clean); + $clean = strtolower(trim($clean, '-')); + $clean = preg_replace("/[\/_|+ -]+/", $delimiter, $clean); + + return $clean; +} ?> diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php index 0876b89..3a57436 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php @@ -84,6 +84,7 @@ $options = getKeyValueArray($someOptions); $retHtml = ""; $retHtml .= "
"; + $retHtml .= ""; $retHtml .= "
"; $retHtml .= "
"; $retHtml .= "
" . $aNews['betreff'] . "
"; @@ -147,4 +148,36 @@ $options = getKeyValueArray($someOptions); $retHtml .= "
"; return $retHtml; } + +function news2jsonSdArticle($aNews){ +return json_encode( + array( + '@context'=>"http://schema.org", + '@type'=>"NewsArticle", + 'mainEntityOfPage'=>array( + '@type'=>"WebPage", + '@id'=>"https://cwsvjudo.bplaced.net/news/".$aNews['nr']."/".toAscii($aNews['datum']."-".$aNews['betreff']) + ), + 'headline'=>"Article headline", + 'image'=>array( + "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png" + ), + 'datePublished'=>$aNews['datum'], + 'dateModified'=>$aNews['datum'], + 'author'=>array( + '@type'=>"Person", + 'name'=>$aNews['autor'] + ), + 'publisher'=>array( + '@type'=>"Organization", + 'name'=>"cwsvJudo", + 'logo'=>array( + '@type'=>"ImageObject", + 'url'=>"http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png" + ) + ), + 'description'=>$aNews['betreff'] + ) +); +} ?> diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php index c3ca961..3e6f675 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php @@ -7,8 +7,6 @@ global $basePath; // Sammlung von Fehlermeldungen o.ä. $message = array(); -//require_once($basePath."/bonus/db.inc"); -//include_once($basePath."/config/db.inc"); $limit = is_positive_integer($someOptions['limit'])?$someOptions['limit']:1; @@ -30,6 +28,12 @@ $limit = is_positive_integer($someOptions['limit'])?$someOptions['limit']:1; // $newsList = getNews($db_connection, array('limit'=>$limit)); $newsList = getNews($db_connection, $someOptions); + $newsHeading = "Aktuelle Meldungen"; +//var_dump($options); + if($someOptions['newsId']) $newsHeading=$newsList[0]['betreff']; + if($someOptions['jahr']) $newsHeading="Nachrichten des Jahres ".$someOptions['jahr']; + + echo("

".$newsHeading."

"); if( is_array( $newsList ) || is_object( $newsList ) ) foreach($newsList as $news) echo( getHtmlNews($news, "headingLevel=2")."
" ); diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php index 70f2a67..b5eb56c 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php @@ -178,6 +178,8 @@ $htmlWkTableString = ""; $htmlWkTableString .= "".$lastMonthName.""; } + $wkJsonSd = wkArray2jsonSdEvent($wk); + // schlechter Hack solange die Browser nicht von selbst ordentlich trennen $wk['Veranstaltung'] = str_replace("meisterschaft", "­meisterschaft", $wk['Veranstaltung']); @@ -192,7 +194,7 @@ $htmlWkTableString = ""; $htmlWkTableString .= "". - "". + "". "". "