Merge branch 'hotfix/ios_problems'

client/scripts/datetime.js

@@ -38,6 +38,16 @@ function parseDate(string) {
 	return date;
 }
 
+function parseDbTimestamp(string) {
+	var year = string.substr(0, 4);
+	var month = string.substr(5, 2);
+	var day = string.substr(8, 2);
+	var hour = string.substr(11, 2);
+	var minute = string.substr(14, 2);
+	var second = string.substr(17, 2);
+	return new Date(year, month - 1, day, hour, minute, second);
+}
+
 function getToday() {
 	var date = new Date();
 	date = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));

client/scripts/pwa.js.php

@@ -95,12 +95,11 @@ $(document).ready(function(){
             log('[pwa] iOS Detected');
             if($('#menu-install-pwa-ios, .add-to-home').length){
                 if (!readCookie('Sticky_pwa_rejected_install')) {
+					setTimeout(function(){
 						function triggerPwaInstallIos() {
 		                    log('[pwa] Triggering PWA / Add to Home Screen Menu for iOS');
-	                    setTimeout(function(){
 	                        $('.add-to-home').addClass('add-to-home-visible add-to-home-ios');
 	                        $('#menu-install-pwa-ios, .menu-hider').addClass('menu-active');
-	                    },3000);
 						}
 						var welcomActive = $('#menu-welcome').hasClass('menu-active');
 						if (welcomActive) {
@@ -108,6 +107,7 @@ $(document).ready(function(){
 						} else {
 							triggerPwaInstallIos();
 						}
+					},3000);
                 };
             }
         }

client/scripts/regatten.js.php

@@ -471,7 +471,7 @@ async function updateNewsBadge() {
 	var sum = 0;
 	for (var n in news) {
 		var newsEntry = news[n];
-		newsEntry.date = new Date(Date.parse(newsEntry.date));
+		newsEntry.date = parseDbTimestamp(newsEntry.date);
 		if (newsEntry.date > now) continue;
 		if (newsEntry.date < newsRead) continue;
 		sum ++;
@@ -508,7 +508,7 @@ var initRegatten = function() {
 
 var onServiceWorkerLoaded = function() {
 	log('[app] sW loaded');
-	if ((swRegistration !== null) && canUseLocalDB) {
+	if ((swRegistration !== null) && (swRegistration.pushManager) && canUseLocalDB) {
 		pushesPossible = true;
 		updatePushBadge();
 	} else {

server/scripts/news.js

@@ -66,7 +66,7 @@ var siteScript = async function() {
 	lastYear.setFullYear(lastYear.getFullYear() - 1);
 	for (var n in news) {
 		var newsEntry = news[n];
-		newsEntry.date = new Date(Date.parse(newsEntry.date));
+		newsEntry.date = parseDbTimestamp(newsEntry.date);
 		if (newsEntry.date > now) continue;
 		if (newsEntry.date < lastYear) break;
 		newsEntry.unread = (newsEntry.date > newsRead);

server/version.php

@@ -1,5 +1,5 @@
 <?php
 
-	define('PWA_VERSION', '1.11h2');
+	define('PWA_VERSION', '1.11h3');
 
 ?>