Compare commits

..

4 Commits

Author SHA1 Message Date
ostertun
9ff0b96837 Merge branch 'release/v_1.10.2' 2020-10-05 20:32:21 +02:00
ostertun
72ff731694 Release v_1.10.2 2020-10-05 20:32:10 +02:00
ostertun
3959b208b5 Added go2url site 2020-10-05 20:19:57 +02:00
ostertun
5c8c9db1de Merge branch 'release/v_1.10' into develop 2020-10-05 17:45:02 +02:00
4 changed files with 27 additions and 1 deletions

13
server/content/go2url.php Normal file
View File

@@ -0,0 +1,13 @@
<?php
$sp['title'] = 'Umleitung - Regatten.net ' . $_CLASS['name'];
// Title
$content = '<h1>Umleitung</h1>';
$content .= '<p>Wir leiten Dich in K&uuml;rze zur gew&uuml;nschten Website weiter</p>';
$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-title']);
$sp['scripts'] .= $scripts->load('go2url');
?>

12
server/scripts/go2url.js Normal file
View File

@@ -0,0 +1,12 @@
var siteScript = function() {
hideLoader();
setTimeout(function() {
var url = findGetParameter('url');
if (url === null) {
$('#card-title').find('p').html('Wir konnten Dich leider nicht umleiten.<br><a href="' + LINK_PRE + 'index">Hier kommst Du zur&uuml;ck zur Startseite</a>');
} else {
showLoader();
location.href = url;
}
}, 2000);
}

View File

@@ -1,5 +1,5 @@
<?php
define('PWA_VERSION', '1.10');
define('PWA_VERSION', '1.10.2');
?>

View File

@@ -229,6 +229,7 @@ self.addEventListener('push', async function(event) {
case 'meldeschluss':
if (await dbSettingsGet('notify_channel_<?php echo BOATCLASS; ?>_meldeschluss')) {
if (await isMyRegatta(getEntry(data, 'id', ''))) okay = true;
// TODO: only if not already registered
}
break;
default: