Merge branch 'release/v_1.10.2'
This commit is contained in:
13
server/content/go2url.php
Normal file
13
server/content/go2url.php
Normal 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ürze zur gewü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
12
server/scripts/go2url.js
Normal 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ück zur Startseite</a>');
|
||||
} else {
|
||||
showLoader();
|
||||
location.href = url;
|
||||
}
|
||||
}, 2000);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
|
||||
define('PWA_VERSION', '1.10');
|
||||
define('PWA_VERSION', '1.10.2');
|
||||
|
||||
?>
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user