From efb6de23788f67eae937a631e6587853a73b1913 Mon Sep 17 00:00:00 2001 From: Clemens Richter Date: Sun, 28 Oct 2018 13:50:23 +0100 Subject: [PATCH] added noopener param to external links, removed caching for admin pages, added feature-tracking-js --- .htaccess | 4 +-- user/config/system.yaml | 4 +-- user/pages/03.termine/sidebarpage.de.md | 6 ++-- user/pages/06.anfahrt/sidebarpage.de.md | 2 +- user/pages/09.links/sidebarpage.de.md | 6 ++-- user/themes/church/js/custom.js | 42 ++++++++++++++++++++++--- 6 files changed, 49 insertions(+), 15 deletions(-) diff --git a/.htaccess b/.htaccess index 0d73822..4122033 100644 --- a/.htaccess +++ b/.htaccess @@ -115,10 +115,10 @@ Header set Expect-CT "max-age=0, report-uri=https://csrichter.report-uri.com/r/d #problem: dynamic on-click handler on predigtaufnahmen page #cache static file for 1 month - + Header set Cache-Control "max-age=2628000, public" -Header set Pragma "cache" +#Header set Pragma "cache" # #Header set Cache-Control "must-revalidate, public" diff --git a/user/config/system.yaml b/user/config/system.yaml index 2b98db0..40ce47a 100644 --- a/user/config/system.yaml +++ b/user/config/system.yaml @@ -28,7 +28,7 @@ pages: list: count: 20 dateformat: - default: 'd-m-Y H:i' + default: 'Y-m-d H:i' short: 'jS M Y' long: 'F jS \a\t g:ia' publish_dates: true @@ -135,7 +135,7 @@ session: name: baptisten-hohenacker secure: true httponly: true - split: true + split: false gpm: releases: stable method: auto diff --git a/user/pages/03.termine/sidebarpage.de.md b/user/pages/03.termine/sidebarpage.de.md index 16d30dd..e4a1616 100644 --- a/user/pages/03.termine/sidebarpage.de.md +++ b/user/pages/03.termine/sidebarpage.de.md @@ -205,7 +205,7 @@ date (iso);time-string;category;param 2018-09-23;10.00 Uhr;godi; 2018-09-28;17.00 Uhr;text;„Jesus auf der Spur“ 2018-09-29; 9.00 Uhr;mägfit; -2018-09-30;10.00 Uhr;godi; +2018-09-30;10.00 Uhr;godi;Jürgen Vollmer 2018-10-02;15.00 Uhr;bibge; 2018-10-02;19.45 Uhr;text;Gemeindeleitungssitzung 2018-10-05;17.00 Uhr;text;„Jesus auf der Spur“ @@ -229,7 +229,9 @@ date (iso);time-string;category;param {{termine_csv}} {% endfilter %} -{% if config.plugins.login.enabled and grav.user.username %} + +{% if uri.query('format')=="all" %} +{{uri.query('format')}} {% filter pythonscript('termine_kirchenwn.py') %} {{termine_csv}} {% endfilter %} diff --git a/user/pages/06.anfahrt/sidebarpage.de.md b/user/pages/06.anfahrt/sidebarpage.de.md index 9385b42..c18a30d 100644 --- a/user/pages/06.anfahrt/sidebarpage.de.md +++ b/user/pages/06.anfahrt/sidebarpage.de.md @@ -14,5 +14,5 @@ Gässle 29 ## Karte -[Größere Karte anzeigen](https://www.openstreetmap.org/?lat=48.865095&lon=9.316365000000001&zoom=14&layers=M&mlat=48.86455&mlon=9.31426&target=_blank) +[Größere Karte anzeigen](https://www.openstreetmap.org/?lat=48.865095&lon=9.316365000000001&zoom=14&layers=M&mlat=48.86455&mlon=9.31426&target=_blank&rel=noopener) \ No newline at end of file diff --git a/user/pages/09.links/sidebarpage.de.md b/user/pages/09.links/sidebarpage.de.md index dc10e25..bde7009 100644 --- a/user/pages/09.links/sidebarpage.de.md +++ b/user/pages/09.links/sidebarpage.de.md @@ -4,7 +4,7 @@ title: Links ## Links zu anderen Seiten ### Onken Partnerprogramm: -[![Onken Partnerprogramm](PP-Logo_2.png?cropResize=400)](http://www.portal-oncken.de/index.php?partnerprogramm=MjEzXzE0ODY5MV82MzQ%3D&target=_blank) +[![Onken Partnerprogramm](PP-Logo_2.png?cropResize=400)](http://www.portal-oncken.de/index.php?partnerprogramm=MjEzXzE0ODY5MV82MzQ%3D&target=_blank&rel=noopener) ### Baptistengemeinden: #### **Backnang**
 @@ -13,7 +13,7 @@ Evangelisch- Freikirchliche Gemeinde Backnang Eugen- Bolz- Straße 24 71522 Backnang * **Webseite:** -[www.baptisten-backnang.de](https://www.baptisten-backnang.de/?target=_blank) +[www.baptisten-backnang.de](https://www.baptisten-backnang.de/?target=_blank&rel=noopener) #### **Waiblingen** * **Anschrift:** @@ -21,5 +21,5 @@ Evangelisch-Freikirchlichen Gemeinde Waiblingen Heerstraße 109 71332 Waiblingen * **Webseite:** -[www.baptistengemeinde-waiblingen.de](http://www.baptistengemeinde-waiblingen.de/?target=_blank) +[www.baptistengemeinde-waiblingen.de](http://www.baptistengemeinde-waiblingen.de/?target=_blank&rel=noopener) \ No newline at end of file diff --git a/user/themes/church/js/custom.js b/user/themes/church/js/custom.js index 075d2e6..b3fe39b 100644 --- a/user/themes/church/js/custom.js +++ b/user/themes/church/js/custom.js @@ -8,13 +8,45 @@ res="" return res; } +function isNative(fn) { + return (/\{\s*\[native code\]\s*\}/).test('' + fn); +} +function trackSupport(){ + if (window.sessionStorage.supportTracked !== "V2") + { + console.log("tracking") + window.sessionStorage.supportTracked = "V2"; + var payload = {}; + payload.type = "browserSupportInfo" + payload.dnt = (window.doNotTrack == 1 || navigator.doNotTrack == 1); + payload.arrayFrom = typeof(Array.from) !== 'undefined' && isNative(Array.from); + payload.fetch = typeof(fetch) !== 'undefined'; + payload.beacon = typeof(navigator.sendBeacon) !== 'undefined'; + payload.storage = typeof(Storage) !== 'undefined'; + var xhr = new XMLHttpRequest(); + xhr.open("POST", "/aufnahmen/track.php"); + xhr.send(JSON.stringify(payload)); + console.log(payload) + } +} + + function dokumentGeladen (e) { + trackSupport(); //alert("Das Ereignis " + e.type + " ist passiert.") -a=document.getElementsByClassName("mailto"); -for (val of a) { -instr=atob(val.getAttribute("href_crypt")); -val.href=xor_crypt(instr);} - + a=document.getElementsByClassName("mailto"); + Array.from(a).forEach(function(elem){ + var instr=atob(elem.getAttribute("href_crypt")); + elem.href=xor_crypt(instr); + }) + /*for (val of a) { + instr=atob(val.getAttribute("href_crypt")); + val.href=xor_crypt(instr); + }*/ } document.addEventListener("load", dokumentGeladen, false); document.addEventListener("DOMContentLoaded", dokumentGeladen, false); + + + +