Merge branch 'release/v_1.8'

Prepare github repo
small fixes

.github/ISSUE_TEMPLATE/-de--feature-anfrage.md

@@ -0,0 +1,20 @@
+---
+name: "[DE] Feature-Anfrage"
+about: Schlage eine Idee für dieses Projekt vor
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Bezieht sich Deine Feature-Anfrage auf ein Problem? Bitte beschreiben.**
+Eine klare und präzise Beschreibung des Problems. Z.B. Ich bin immer frustriert, wenn [...]
+
+**Beschreibe die gewünschte Lösung**
+Eine klare und präzise Beschreibung dessen, was passieren soll.
+
+**Beschreibe Alternativen, die Du in Betracht gezogen hast**
+Eine klare und präzise Beschreibung aller alternativen Lösungen oder Funktionen, die Du in Betracht gezogen hast.
+
+**Zusätzlicher Kontext**
+Füge hier weitere Kontexte oder Screenshots zur Feature-Anfrage hinzu.

.github/ISSUE_TEMPLATE/-de--fehlerbericht.md

@@ -0,0 +1,38 @@
+---
+name: "[DE] Fehlerbericht"
+about: Erstelle einen Bericht, um uns zu helfen, die App zu verbessern
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Beschreibe den Fehler**
+Eine klare und präzise Beschreibung des Fehlers.
+
+**Reproduzierung**
+Schritte zum Reproduzieren des Fehlers:
+1. Gehe zu '...'
+2. Klicke auf '....'
+3. Scrolle nach unten zu '....'
+4. Sieh den Fehler
+
+**Erwartetes Verhalten**
+Eine klare und präzise Beschreibung dessen, was Du erwartet hattest.
+
+**Screenshots**
+Füge gegebenenfalls Screenshots hinzu, um Dein Problem zu erklären.
+
+**Desktop (bitte verfolständige die folgenden Informationen):**
+ - Betriebssystem: [z.B. Windows 10]
+ - Browser [z.B. chrome, safari]
+ - Version [z.B. 2.14]
+
+**Smartphone (bitte verfolständige die folgenden Informationen):**
+ - Gerät: [z.B. iPhone 6]
+ - Betriebssystem: [z.B. iOS 8.1]
+ - Browser [z.B. stock browser, safari]
+ - Version [z.B. 2.14]
+
+**Zusätzlicher Kontext**
+Füge hier einen anderen Kontext zum Problem hinzu.

.github/ISSUE_TEMPLATE/-en--bug-report.md

@@ -0,0 +1,38 @@
+---
+name: "[EN] Bug report"
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows 10]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 2.14]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone 6]
+ - OS: [e.g. iOS 8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 2.14]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/-en--feature-request.md

@@ -0,0 +1,20 @@
+---
+name: "[EN] Feature request"
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.htaccess_example

@@ -12,7 +12,7 @@ RewriteRule ^(.*)server(.*)$ / [R=301,L,NC]
 ### CONTENT LOADER
 
 # Keep this subfolders untouched
-RewriteRule ^(api)($|/) - [L]
+#RewriteRule ^(api)($|/) - [L]
 
 # Show site
 RewriteRule ^([^\.]*)$ index.php?request=$1 [QSA]

README.md

@@ -0,0 +1,11 @@
+# Regatten.net App
+
+Willkommen im GitHub-Repository unserer neuen Regatten.net App.
+
+Falls sich jemand dafür interessiert, ist hier der gesamte Quellcode unserer neuen App zu finden.  
+Bitte beachtet, dass diese App einschließlich dem gesamten Quellcode exklusivem Urheberrecht unterliegt. Sie darf also nicht kopiert, verteilt oder verändert werden.  
+Sollte Interesse an einer Anbindung an unser System bestehen, kontaktiere uns bitte einfach (https://regatten.net/contact)
+
+Der Hauptzweck dieses Repository besteht jedoch darin, Feedback von Euch zu unserer neuen App zu bekommen.  
+Selbstverständlich könnt Ihr uns auch weiterhin auf anderen Kanälen erreichen, doch für Problem-Meldungen und Verbesserungsvorschläge ist GitHub am besten geeignet.  
+Wie Du Teil unseres BETA-Programmes wirst, die App installierst und Feedback gibst, erfährst Du in unserem [Wiki](https://github.com/ostertun/RegattenApp/wiki).

api/.htaccess_example

@@ -1,8 +0,0 @@
-RewriteEngine on
-# root directory:
-RewriteBase /projects/RegattenApp/api/
-
-
-
-# Show site
-RewriteRule ^(.*)$ index.php?request=$1 [QSA]

api/config_example.php

@@ -1,37 +0,0 @@
-<?php
-	
-	// DATABASE Credentials
-	define('DB_USER', 'regattenwebsite');
-	define('DB_PASS', 'RBpOv4YYtZKWIGcN');
-	define('DB_HOST', 'localhost');
-	define('DB_DATABASE', 'regattenwebsite');
-	
-	define('DB_CHANGE_TIME', true);
-	define('DB_USE_UTF8', true);  // use utf-8 in DB requests
-	
-	// DATABASE Table names
-	define('DB_TABLE_USERS', 'users');
-	define('DB_TABLE_LOGINS', 'logins');
-	define('DB_TABLE_KEEPLOGGEDIN', 'keeploggedin');
-	define('DB_TABLE_RESET', 'rstpw');
-	
-	define('DB_TABLE_CLUBS', 'regatta_clubs');
-	define('DB_TABLE_SUFFIX_BOATS', '_boats');
-	define('DB_TABLE_SUFFIX_SAILORS', '_sailors');
-	define('DB_TABLE_SUFFIX_PLANNING', '_planning');
-	define('DB_TABLE_SUFFIX_REGATTAS', '_regattas');
-	define('DB_TABLE_SUFFIX_RESULTS', '_results');
-	define('DB_TABLE_TRIM_BOATS', 'trim_boats');
-	define('DB_TABLE_TRIM_USERS', 'trim_users');
-	define('DB_TABLE_TRIM_TRIMS', 'trim_trims');
-	define('DB_TABLE_NEWS', 'news');
-	define('DB_TABLE_UPDATETIMES', '_updatetimes');
-	
-	// OUTGOING MAILS - Credentials for outgoing mails
-	define('MAIL_SMTP_HOST', 'ssl://ostertun.net');               // SMTP Server address
-	define('MAIL_SMTP_PORT', 465);                       // port to use
-	define('MAIL_FROM_ADDRESS', 'no-reply@regatten.net');  // address to send mails from
-	define('MAIL_USERNAME', MAIL_FROM_ADDRESS);             // if true: username
-	define('MAIL_PASSWORD', 'pVc05j_3');                    //  & password
-	
-?>

api/database.php

@@ -1,157 +0,0 @@
-<?php
-	
-	/*
-		
-		Mysql Database Support
-		----------------------
-		
-		Required defines:
-		- DB_HOST (STRING)
-		- DB_USER (STRING)
-		- DB_PASS (STRING)
-		- DB_DATABASE (STRING)
-		- DB_USE_UTF8 (BOOL)
-		- DB_CHANGE_TIME (BOOL)
-		
-		Required functions:
-		- logE (in /_global/log.php)
-		
-	*/
-	
-	$mysqli = mysqli_connect(DB_HOST, DB_USER, DB_PASS);
-	
-	if ($mysqli === false) {
-		logE("database", "Could not connect to database\n" . mysqli_connect_error);
-		die('Error: Could not connect to database');
-	}
-	
-	mysqli_select_db($mysqli, DB_DATABASE);
-	if (DB_USE_UTF8) {
-		mysqli_set_charset($mysqli, 'utf8');
-	}
-	
-	function db_get_data($mysqli, $table, $fields = '*', $where = false, $limit = false) {
-		$rest = '';
-		if ($where != false) {
-			$rest .= ' WHERE ' . $where;
-		}
-		if ($limit != false) {
-			$rest .= sprintf(' LIMIT %d', $limit);
-		}
-		$query = 'SELECT ' . $fields . ' FROM ' . mysqli_real_escape_string($mysqli, $table) . $rest . ';';
-		$response = mysqli_query($mysqli, $query);
-		
-		if ($response !== false) {
-			$result = array();
-			if ($response->num_rows > 0) {
-				$i = 0;
-				while ($row = $response->fetch_assoc()) {
-					if (isset($row['id'])) {
-						$id = $row['id'];
-					} else {
-						$id = $i;
-						$i ++;
-					}
-					foreach ($row as $key => $value) {
-						$result[$id][$key] = $value;
-					}
-				}
-			}
-			return $result;
-		} else {
-			logE("database", "get_data\nInvalid request\n" . $query . "\n" . mysqli_error($mysqli));
-			return false;
-		}
-	}
-	
-	function db_update_data($mysqli, $table, $data, $where, $limit = false) {
-		$rest = '';
-		if ($where != false) {
-			$rest .= ' WHERE ' . $where;
-		}
-		if ($limit != false) {
-			$rest .= sprintf(' LIMIT %d', $limit);
-		}
-		$set = '';
-		$first = true;
-		foreach ($data as $key => $value) {
-			if ($first) {
-				$first = false;
-			} else {
-				$set .= ', ';
-			}
-			if ($value === null) {
-				$set .= '`' . mysqli_real_escape_string($mysqli, $key) . '`=NULL';
-			} else {
-				$set .= '`' . mysqli_real_escape_string($mysqli, $key) . '`="' . mysqli_real_escape_string($mysqli, $value) . '"';
-			}
-		}
-		if (defined('DB_CHANGE_TIME')) $set .= ', `changed`=NOW()';
-		$query = 'UPDATE ' . mysqli_real_escape_string($mysqli, $table) . ' SET ' . $set . $rest . ';';
-		$response = mysqli_query($mysqli, $query);
-		
-		if ($response === false) {
-			logE("database", "update_data\nInvalid request\n" . $query . "\n" . mysqli_error($mysqli));
-		} elseif (defined('DB_CHANGE_TIME')) {
-			mysqli_query($mysqli, 'UPDATE `_updatetimes` SET `update`=NOW() WHERE `table`="' . mysqli_real_escape_string($mysqli, $table) . '";');
-		}
-		
-		return $response;
-	}
-	
-	function db_insert_data($mysqli, $table, $data) {
-		$fields = '';
-		$values = '';
-		$first = true;
-		foreach ($data as $key => $value) {
-			if ($first) {
-				$first = false;
-			} else {
-				$fields .= ', ';
-				$values .= ', ';
-			}
-			$fields .= '`' . mysqli_real_escape_string($mysqli, $key) . '`';
-			if ($value === null) {
-				$values .= 'NULL';
-			} else {
-				$values .= '"' . mysqli_real_escape_string($mysqli, $value) . '"';
-			}
-		}
-		if (defined('DB_CHANGE_TIME')) {
-			$fields .= ', `changed`';
-			$values .= ', NOW()';
-		}
-		$query = 'INSERT INTO `' . mysqli_real_escape_string($mysqli, $table) . '` (' . $fields . ') VALUES (' . $values . ');';
-		$response = mysqli_query($mysqli, $query);
-		if ($response === false) {
-			logE("database", "insert_data\nInvalid request\n" . $query . "\n" . mysqli_error($mysqli));
-		} else {
-			$response = mysqli_insert_id($mysqli);
-			if (defined('DB_CHANGE_TIME')) {
-				mysqli_query($mysqli, 'UPDATE `_updatetimes` SET `update`=NOW() WHERE `table`="' . mysqli_real_escape_string($mysqli, $table) . '";');
-			}
-		}
-		
-		return $response;
-	}
-	
-	function db_delete_data($mysqli, $table, $where, $limit = false) {
-		$rest = '';
-		if ($where != false) {
-			$rest .= ' WHERE ' . $where;
-		}
-		if ($limit != false) {
-			$rest .= sprintf(' LIMIT %d', $limit);
-		}
-		$query = 'DELETE FROM `' . mysqli_real_escape_string($mysqli, $table) . '`' . $rest . ';';
-		$response = mysqli_query($mysqli, $query);
-		if ($response === false) {
-			logE("database", "delete_data\nInvalid request\n" . $query . "\n" . mysqli_error($mysqli));
-		} elseif (defined('DB_CHANGE_TIME')) {
-			mysqli_query($mysqli, 'UPDATE `_updatetimes` SET `update`=NOW() WHERE `table`="' . mysqli_real_escape_string($mysqli, $table) . '";');
-		}
-		
-		return $response;
-	}
-	
-?>

api/functions.php

@@ -1,450 +0,0 @@
-<?php
-	
-	function get_db_entry($mysqli, $table, $id = false, $order = false) {
-		if ($id === false) {
-			return db_get_data($mysqli, $table, '*', ($order !== false ? ('1=1 ORDER BY ' . $order) : false));
-		} else {
-			$result = db_get_data($mysqli, $table, '*', '`id` = "' . mysqli_real_escape_string($mysqli, $id) . '"', 1);
-			if (($result === false) or (count($result) != 1))
-				return false;
-			else
-				return array_values($result)[0];
-		}
-	}
-	
-	function get_club($mysqli, $id = false) {
-		return get_db_entry($mysqli, DB_TABLE_CLUBS, $id, '`kurz` ASC');
-	}
-	
-	function get_boat($mysqli, $id = false) {
-		return get_db_entry($mysqli, BOATCLASS . DB_TABLE_SUFFIX_BOATS, $id, '`sailnumber` ASC');
-	}
-	
-	function get_sailor($mysqli, $id = false) {
-		return get_db_entry($mysqli, BOATCLASS . DB_TABLE_SUFFIX_SAILORS, $id, '`name` ASC');
-	}
-	
-	function get_planning($mysqli, $userId = false, $regattaId = false) {
-		$where = '';
-		$limit = false;
-		if ($userId !== false) {
-			$where .= '(`user`="' . mysqli_real_escape_string($mysqli, $userId) . '")';
-		}
-		if (($userId !== false) and ($regattaId !== false)) {
-			$where .= ' AND ';
-			$limit = 1;
-		}
-		if ($regattaId !== false) {
-			$where .= '(`regatta`="' . mysqli_real_escape_string($mysqli, $regattaId) . '")';
-		}
-		if ($where == '') $where = false;
-		if ($limit === false) {
-			return db_get_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_PLANNING, '*', $where);
-		} else {
-			$result = db_get_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_PLANNING, '*', $where, 1);
-			if (($result === false) or (count($result) != 1))
-				return false;
-			else
-				return array_values($result)[0];
-		}
-	}
-	
-	function get_regatta($mysqli, $id = false) {
-		return get_db_entry($mysqli, BOATCLASS . DB_TABLE_SUFFIX_REGATTAS, $id, '`date` ASC');
-	}
-	
-	function get_result($mysqli, $regattaId = false) {
-		if ($regattaId === false) {
-			return db_get_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_RESULTS);
-		} else {
-			return db_get_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_RESULTS, '*', '`regatta` = "' . mysqli_real_escape_string($mysqli, $regattaId) . '"');
-		}
-	
-	}
-	
-	function get_regattas_range($mysqli, $from, $to) {
-		return db_get_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_REGATTAS, '*', '(`date` >= "' . date('Y-m-d', $from) . '") AND (`date` <= "' . date('Y-m-d', $to) . '") ORDER BY `date`');
-	}
-	
-	function get_regatta_years($mysqli) {
-		$query = 'SELECT DISTINCT(YEAR(`date`)) as year FROM ' . BOATCLASS . DB_TABLE_SUFFIX_REGATTAS . ' ORDER BY `date`;';
-		$response = mysqli_query($mysqli, $query);
-		
-		if ($response !== false) {
-			$result = array();
-			if ($response->num_rows > 0) {
-				while ($row = $response->fetch_assoc()) {
-					$result[] = $row['year'];
-				}
-			}
-			return $result;
-		} else {
-			logE("functions", "get_data\nInvalid request\n" . $query . "\n" . mysqli_error($mysqli));
-			return false;
-		}
-	}
-	
-	function get_result_calculated($mysqli, $regatta_id) {
-		$regatta = get_regatta($mysqli, $regatta_id);
-		if ($regatta === false) {
-			return false;
-		}
-		$results = get_result($mysqli, $regatta_id);
-		if ($results !== false) {
-			
-			// *** Replace , with .
-			foreach ($results as $key => $value) {
-				for ($i = 1; $i <= $regatta['races']; $i ++) {
-					$results[$key]['race' . $i] = str_replace(',', '.', $results[$key]['race' . $i]);
-				}
-			}
-			
-			// *** Calculation ***
-			$gemeldet = count($results);
-			
-			$sortarray = array();
-			foreach ($results as $key => $value) {
-				$results[$key]['finished'] = false;
-				$results[$key]['values'] = array();
-				$results[$key]['values_all'] = array();
-				$results[$key]['texts'] = array();
-				$copy = array();
-				for ($i = 1; $i <= $regatta['races']; $i ++) {
-					if (is_numeric($value['race' . $i])) {
-						$results[$key]['values'][$i] = $value['race' . $i];
-						$results[$key]['texts'][$i] = $value['race' . $i];
-						$copy[$i] = $value['race' . $i];
-						$results[$key]['finished'] = true;
-					} else {
-						switch ($value['race' . $i]) {
-							// Nicht gestartet
-							case 'DNC': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; break; // Did not come
-							case 'DNS': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; break; // Did not started
-							// Startfehler
-							case 'OCS': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; /*$results[$key]['finished'] = true;*/ break; // On course site
-//	Muss v. Hand						case 'ZFP': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; $results[$key]['finished'] = true; break; // Z-Flag penalty (20% nach 30.2)
-							case 'UFD': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; /*$results[$key]['finished'] = true;*/ break; // Uniform Flag Disqualified (disqu. nach 30.3)
-							case 'BFD': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; /*$results[$key]['finished'] = true;*/ break; // Black Flag Disqualified (disqu. nach 30.4)
-							// Nicht durch Ziel gegangen
-							case 'DNF': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; break; // Did not finish
-							case 'RET': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; break; // Retired (Aufgegeben)
-							case 'RAF': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; /*$results[$key]['finished'] = true;*/ break; // Retired after finish
-							// Disqualifizierun
-							case 'DSQ': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; /*$results[$key]['finished'] = true;*/ break; // Disqualified
-							case 'DNE': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = -1; /*$results[$key]['finished'] = true;*/ break; // Disqualified, not excludable (disqu. kann nach 90.3(b) nicht gestrichen werden)
-							case 'DGM': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = -2; /*$results[$key]['finished'] = true;*/ break; // Disqualification Gross Missconduct (kann nach 69.1(b)(2) nicht gestr. werden, grobes Fehlverhalten)
-							// Wiedergutmachung
-//	Muss v. Hand						case 'RDG': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; $results[$key]['finished'] = true; break; // Redress given (Wiedergutmachung gewährt)
-							// Strafen
-//	Muss v. Hand						case 'SCP': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; $results[$key]['finished'] = true; break; // Wertungsstrafe nach 44.3(a) (20%)
-//	Muss v. Hand						case 'DPI': $results[$key]['values'][$i] = $gemeldet + 1; $copy[$i] = $gemeldet + 1; $results[$key]['finished'] = true; break; // Punktstrafe nach Ermessen der Jury
-							// Unbekannt
-							default: $results[$key]['values'][$i] = 0; $copy[$i] = 0; break;
-						}
-						
-						if ($results[$key]['values'][$i] != 0) {
-							$results[$key]['texts'][$i] = $value['race' . $i] . ' (' . $results[$key]['values'][$i] . ')';
-						} else {
-							$results[$key]['texts'][$i] = $value['race' . $i] . ' (Unknown - 0)';
-						}
-					}
-				}
-				$results[$key]['values_all'] = $results[$key]['values'];
-				for ($s = 0; $s < $regatta['streicher']; $s ++) {
-					$max = max($copy);
-					for ($i = 1; $i <= $regatta['races']; $i ++) {
-						if ($copy[$i] == $max) {
-							$copy[$i] = 0;
-							break;
-						}
-					}
-				}
-				$brutto = $netto = 0;
-				for ($i = 1; $i <= $regatta['races']; $i ++) {
-					$brutto += $results[$key]['values_all'][$i];
-					if     ($copy[$i] == -1) { $results[$key]['values'][$i] = $gemeldet + 1; }
-					elseif ($copy[$i] == -2) { $results[$key]['values'][$i] = $gemeldet + 1; }
-					else                     { $results[$key]['values'][$i] = $copy[$i]; }
-					if ($results[$key]['values'][$i] == 0) {
-						$results[$key]['texts'][$i] = '[' . $results[$key]['texts'][$i] . ']';
-					}
-					$netto += $results[$key]['values'][$i];
-				}
-				$results[$key]['brutto'] = $brutto;
-				$results[$key]['netto'] = $netto;
-				
-				if ($results[$key]['finished']) {
-					$sortarray[$key] = 0;
-				} else {
-					$sortarray[$key] = 1;
-				}
-				$sortarray[$key] /*.*/= sprintf("%08.2f", $netto);
-				$temp = $results[$key]['values'];
-				sort($temp);
-				$i = 0;
-				foreach ($temp as $val) {
-					if ($i < $regatta['races']) {
-						$sortarray[$key] .= sprintf("%07.2f", $val);
-					}
-					$i ++;
-				}
-				for ($i = $regatta['races']; $i > 0; $i --) {
-					$sortarray[$key] .= sprintf("%07.2f", $results[$key]['values_all'][$i]);
-				}
-				$results[$key]['sortvalue'] = $sortarray[$key];
-			}
-			array_multisort($sortarray, $results);
-			$i = 1;
-			foreach ($results as $key => $value) {
-				if (($i > 1) and ($sortarray[$key] == $sortarray[$lastkey])) {
-					$results[$key]['place'] = $results[$lastkey]['place'];
-				} else {
-					$results[$key]['place'] = $i;
-				}
-				$i ++;
-				$lastkey = $key;
-			}
-			unset ($sortarray);
-			
-			return $results;
-		} else {
-			return false;
-		}
-	}
-	
-	function update_result_cache($mysqli, $regatta_id) {
-		$regatta = get_regatta($mysqli, $regatta_id);
-		if ($regatta === false) return;
-		$results = get_result_calculated($mysqli, $regatta['id']);
-		if ($results === false) return;
-		
-		// count finished boats
-		$fb = 0;
-		foreach ($results as $result) {
-			if ($result['finished']) {
-				$fb ++;
-			}
-		}
-		
-		db_update_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_REGATTAS, ['finishedBoats' => $fb], '`id`="' . $regatta['id'] . '"', 1);
-		
-		foreach ($results as $result) {
-			if ($fb == 0) {
-				$rlp = 0;
-			} else {
-				$rlp = 100 * $regatta['rlf'] * (($fb + 1 - $result['place']) / $fb);
-			}
-			db_update_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_RESULTS, ['place' => $result['place'], 'rlp' => $rlp], '`id`="' . $result['id'] . '"', 1);
-		}
-	}
-	
-	function get_ranking($mysqli, $from, $to, $jugend = false, $jugstrict = false) {
-		global $rankNoResults, $_CLASSES;
-		$rankNoResults = array();
-		
-		$sailors = get_sailor($mysqli);
-		$regattas = get_regattas_range($mysqli, $from, $to);
-		
-		if (($sailors !== false) and ($regattas !== false)) {
-			foreach ($sailors as $key => $sailor) {
-				$sailors[$key]['regattas'] = array();
-				$sailors[$key]['tmp_rlp'] = array();
-			}
-			
-			foreach ($regattas as $regatta) {
-				$date = strtotime($regatta['date']);
-				
-				// regatta has to be min. 2 days to be ranking-regatta
-				if ($regatta['length'] < 2) {
-					continue;
-				}
-				
-				$results = get_result($mysqli, $regatta['id']);
-				if ($results === false) {
-					continue;
-				}
-				
-				if (count($results) <= 0) {
-					if (strtotime('+' . ($regatta['length']-1) . ' days', $date) <= time()) {
-						if (!$regatta['canceled']) {
-							$rankNoResults[] = $regatta;
-						}
-					}
-					continue;
-				}
-				
-				// in one race there must be at least 10 boats started
-				$ok = false;
-				for ($i = 1; $i <= $regatta['races']; $i ++) {
-					$temp = 0;
-					foreach ($results as $result) {
-						if (($result['race' . $i] != 'DNC') and ($result['race' . $i] != 'DNS')) {
-							$temp ++;
-						}
-					}
-					if ($temp >= 10) {
-						$ok = true;
-						break;
-					}
-				}
-				if (!$ok) {
-					continue;
-				}
-				
-				$fb = $regatta['finishedBoats'];
-				
-				// add regatta to each sailor
-				foreach ($results as $result) {
-					if ($result['rlp'] == 0) {
-						continue;
-					}
-					// check if crew is youth
-					//if ($jugend) {
-					//	$crew = explode(',', $result['crew']);
-					//	$okay = true;
-					//	foreach ($crew as $sailor) {
-					//		if (($sailor == '') or !isset($sailors[$sailor])) continue;
-					//		$sailor = $sailors[$sailor];
-					//		if ((($sailor['year'] !== null) and ($sailor['year'] < (date('Y', $date) - $_CLASSES[BOATCLASS]['youth-age']))) or 
-					//			(($sailor['year'] === null) and ($jugstrict))) {
-					//				$okay = false;
-					//				break;
-					//		}
-					//	}
-					//	if (!$okay) continue;
-					//}
-					// calc m
-					if ($regatta['m'] > 0) {
-						$m = $regatta['m'];
-					} elseif ($regatta['races'] <= 4) {
-						$m = $regatta['races'];
-					} else {
-						if (($regatta['length'] > 2) and ($regatta['races'] >= 6)) {
-							$m = 5;
-						} else {
-							$m = 4;
-						}
-					}
-					$rlp = $result['rlp'];
-					$sailors[$result['steuermann']]['regattas'][$regatta['id']] = array(
-						'regatta' => $regatta['id'],
-						'boat' => $result['boat'],
-						'crew' => $result['crew'],
-						'place' => $result['place'],
-						'fb' => $fb,
-						'rlp' => $rlp,
-						'used' => 0,
-						'm' => $m
-					);
-					for ($i = 0; $i < $m; $i ++) {
-						array_push($sailors[$result['steuermann']]['tmp_rlp'], array($regatta['id'], $rlp));
-					}
-				}
-			}
-			
-			foreach ($sailors as $key => $sailor) {
-				if ($sailor['german'] == 0) {
-					unset($sailors[$key]);
-				} elseif ($jugend) {
-					if ((($sailor['year'] !== null) and ($sailor['year'] < (date('Y', $to) - $_CLASSES[BOATCLASS]['youth-age']))) or 
-						(($sailor['year'] === null) and ($jugstrict))) {
-							unset($sailors[$key]);
-					}
-				}
-			}
-			
-			$sortarray = array();
-			
-			foreach ($sailors as $key => $sailor) {
-				// sort rlps desc
-				$sort = array();
-				foreach ($sailor['tmp_rlp'] as $key2 => $value) {
-					$sort[$key2] = $value[1];
-				}
-				array_multisort($sort, SORT_DESC, $sailors[$key]['tmp_rlp']);
-				// calc mean. rlp
-				$sum = 0;
-				$cnt = 0;
-				foreach ($sailors[$key]['tmp_rlp'] as $value) {
-					$sum += $value[1];
-					$sailors[$key]['regattas'][$value[0]]['used'] ++;
-					$cnt ++;
-					if ($cnt >= 9) {
-						break;
-					}
-				}
-				unset($sailors[$key]['tmp_rlp']);
-				if ($cnt > 0) {
-					$rlp = $sum / $cnt;
-					$sailors[$key]['rlp'] = $rlp;
-					$sailors[$key]['m'] = $cnt;
-				} else {
-					unset($sailors[$key]);
-					continue;
-				}
-				
-				if ($rlp == 0) {
-					$sortarray[$key] = $cnt;
-				} else {
-					$sortarray[$key] = $cnt * 1000 + $rlp;
-				}
-			}
-			array_multisort($sortarray, SORT_DESC, $sailors);
-			unset($sortarray);
-			
-			$i = 1;
-			foreach ($sailors as $key => $sailor) {
-				$sailors[$key]['rank'] = $i;
-				$i ++;
-			}
-			
-			return $sailors;
-		} else {
-			return false;
-		}
-	}
-	
-	function get_trim_boat($mysqli, $id = false) {
-		return get_db_entry($mysqli, DB_TABLE_TRIM_BOATS, $id);
-	}
-	
-	function get_trim_boat_users($mysqli, $id) {
-		$result = db_get_data($mysqli, DB_TABLE_TRIM_USERS, '*', '`boat` = "' . mysqli_real_escape_string($mysqli, $id) . '"');
-		if ($result === false)
-			return false;
-		else
-			return $result;
-	}
-	
-	function get_trim_user_boats($mysqli, $id) {
-		$boats = db_get_data($mysqli, DB_TABLE_TRIM_USERS, '*', '`user` = "' . mysqli_real_escape_string($mysqli, $id) . '"');
-		if ($boats === false) {
-			return false;
-		} else {
-			$result = [];
-			foreach ($boats as $value) {
-				$result[$value['boat']] = get_trim_boat($mysqli, $value['boat']);
-			}
-			return $result;
-		}
-	}
-	
-	function trim_is_boat_user($mysqli, $user, $boat) {
-		$res = db_get_data($mysqli, DB_TABLE_TRIM_USERS, '*', '`user` = "' . mysqli_real_escape_string($mysqli, $user) . '" AND `boat` = "' . mysqli_real_escape_string($mysqli, $boat) . '"');
-		return ($res !== false) and (count($res) == 1);
-	}
-	
-	function get_trim_trim($mysqli, $id = false) {
-		return get_db_entry($mysqli, DB_TABLE_TRIM_TRIMS, $id);
-	}
-	
-	function get_trim_boat_trims($mysqli, $id) {
-		$result = db_get_data($mysqli, DB_TABLE_TRIM_TRIMS, '*', '`boat` = "' . mysqli_real_escape_string($mysqli, $id) . '"');
-		if ($result === false) {
-			return false;
-		} else {
-			return $result;
-		}
-	}
-	
-?>

api/index.php

@@ -1,466 +0,0 @@
-<?php
-	
-	require_once(__DIR__ . '/../server/config.php');
-	require_once(__DIR__ . '/config.php');
-	require_once(__DIR__ . '/../server/log.php');
-	require_once(__DIR__ . '/database.php');
-	require_once(__DIR__ . '/login.php');
-	require_once(__DIR__ . '/functions.php');
-	
-	$request = false;
-	if (isset($_GET['request'])) {
-		$request = explode('/', $_GET['request']);
-	}
-	if ($request === false) {
-		$request = array();
-	}
-	if (count($request) >= 1) {
-		$action = array_shift($request);
-	} else {
-		$action = '';
-	}
-	
-	define('DONE_OKAY', 0);
-	define('DONE_EMPTY', 1);
-	define('DONE_DATABASE', 2);
-	define('DONE_UNAUTHORIZED', 3);
-	define('DONE_BAD_REQUEST', 4);
-	define('DONE_CONFLICT', 5);
-	define('DONE_SERVER_ERROR', 6);
-	function done($donecode, $content = null) {
-		switch ($donecode) {
-			case DONE_OKAY:
-				header('HTTP/1.0 200 OK');
-				break;
-			case DONE_EMPTY:
-				header('HTTP/1.0 204 No Content');
-				break;
-			case DONE_DATABASE:
-				header('HTTP/1.0 500 Internal Server Error');
-				if ($content === null) {
-					$content = array('error' => 'database error');
-				}
-				break;
-			case DONE_UNAUTHORIZED:
-				header('HTTP/1.0 401 Unauthorized');
-				if ($content === null) {
-					$content = array('error' => 'unauthorized');
-				}
-				break;
-			case DONE_BAD_REQUEST:
-				header('HTTP/1.0 400 Bad Request');
-				if ($content === null) {
-					$content = array('error' => 'bad request');
-				}
-				break;
-			case DONE_CONFLICT:
-				header('HTTP/1.0 409 Conflict');
-				break;
-			case DONE_SERVER_ERROR:
-				header('HTTP/1.0 500 Internal Server Error');
-				break;
-			default:
-				header('HTTP/1.0 500 Internal Server Error');
-				break;
-		}
-		header('Content-Type: application/json');
-		if ($content !== null) {
-			echo json_encode($content);
-		} else {
-			echo '{  }';
-		}
-		exit;
-	}
-	
-	if (isset($_REQUEST['auth']['id'], $_REQUEST['auth']['hash'])) {
-		$user_id = auth_check($mysqli, $_REQUEST['auth']['id'], $_REQUEST['auth']['hash']);
-	} else {
-		$user_id = false;
-	}
-	
-	function isLoggedIn() {
-		global $user_id;
-		return $user_id !== false;
-	}
-	
-	function checkLoggedIn() {
-		if (!isLoggedIn()) done(DONE_UNAUTHORIZED, ['error' => 'permission denied']);
-	}
-	
-	function checkRequest($param) {
-		if (!isset($_REQUEST[$param])) done(DONE_BAD_REQUEST, ['error' => 'missing parameter: ' . $param]);
-	}
-	
-	function replaceChanged($array) {
-		return array_map(function ($entry) {
-			unset($entry['changed']);
-			return $entry;
-		}, $array);
-	}
-	
-	$whereString = false;
-	if (isset($_REQUEST['index'], $_REQUEST['value'])) {
-		$whereString = '`' . mysqli_real_escape_string($mysqli, $_REQUEST['index']) . '`="' . mysqli_real_escape_string($mysqli, $_REQUEST['value']) . '"';
-	}
-	
-	function sendEntries($table) {
-		global $mysqli, $whereString;
-		$response = db_get_data($mysqli, $table, '*', $whereString);
-		if ($response === false) done(DONE_DATABASE);
-		$keys = array_keys($response);
-		if (isset($_REQUEST['changed-after'])) {
-			$response = db_get_data($mysqli, $table, '*', '`changed` > "' . mysqli_real_escape_string($mysqli, date('Y-m-d H:i:s', $_REQUEST['changed-after'])) . '"' . ($whereString ? (' AND ' . $whereString) : ''));
-			if ($response === false) done(DONE_DATABASE);
-		}
-		$response = array_values($response);
-		done(DONE_OKAY, array('data' => replaceChanged($response), 'keys' => $keys));
-	}
-	
-	function sendEntry($table) {
-		global $mysqli;
-		checkRequest('id');
-		$response = db_get_data($mysqli, $table, '*', '`id` = "' . mysqli_real_escape_string($mysqli, $_REQUEST['id']) . '"');
-		if ($response === false) done(DONE_DATABASE);
-		if (count($response) != 1) done(DONE_BAD_REQUEST, ['error' => 'id not found']);
-		$response = array_values($response)[0];
-		unset($response['changed']);
-		done(DONE_OKAY, ['data' => $response]);
-	}
-	
-	switch ($action) {
-		
-		case 'login':
-			checkRequest('username');
-			checkRequest('password');
-			checkRequest('device');
-			$auth = auth_login($mysqli, $_REQUEST['username'], $_REQUEST['password'], $_REQUEST['device']);
-			if ($auth === false) done(DONE_UNAUTHORIZED);
-			done(DONE_OKAY, $auth);
-			break;
-		
-		case 'logout':
-			checkLoggedIn();
-			auth_logout($mysqli, $_REQUEST['auth']['id']);
-			done(DONE_OKAY);
-			break;
-		
-		case 'get_update_time':
-			$times = array();
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . DB_TABLE_CLUBS . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['clubs'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . BOATCLASS . DB_TABLE_SUFFIX_BOATS . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['boats'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . BOATCLASS . DB_TABLE_SUFFIX_SAILORS . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['sailors'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . BOATCLASS . DB_TABLE_SUFFIX_REGATTAS . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['regattas'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . BOATCLASS . DB_TABLE_SUFFIX_RESULTS . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['results'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . BOATCLASS . DB_TABLE_SUFFIX_PLANNING . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['plannings'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . DB_TABLE_TRIM_BOATS . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['trim_boats'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . DB_TABLE_TRIM_USERS . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['trim_users'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . DB_TABLE_TRIM_TRIMS . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['trim_trims'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			$response = db_get_data($mysqli, DB_TABLE_UPDATETIMES, '`update`', '`table` = "' . DB_TABLE_USERS . '"', 1);
-			if (($response !== false) and (count($response) > 0)) {
-				$times['users'] = strtotime(array_values($response)[0]['update']);
-			} else {
-				done(DONE_DATABASE);
-			}
-			done(DONE_OKAY, $times);
-			break;
-		
-		case 'get_clubs':
-			sendEntries(DB_TABLE_CLUBS);
-			break;
-		
-		case 'get_club':
-			sendEntry(DB_TABLE_CLUBS);
-			break;
-		
-		case 'get_boats':
-			sendEntries(BOATCLASS . DB_TABLE_SUFFIX_BOATS);
-			break;
-		
-		case 'get_boat':
-			sendEntry(BOATCLASS . DB_TABLE_SUFFIX_BOATS);
-			break;
-		
-		case 'get_sailors':
-			sendEntries(BOATCLASS . DB_TABLE_SUFFIX_SAILORS);
-			break;
-		
-		case 'get_sailor':
-			sendEntry(BOATCLASS . DB_TABLE_SUFFIX_SAILORS);
-			break;
-		
-		case 'get_years':
-			$response = get_regatta_years($mysqli);
-			if ($response === false) done(DONE_DATABASE);
-			foreach ($response as $key => $value)
-				$response[$key] = ['year' => $value];
-			done(DONE_OKAY, ['data' => $response]);
-			break;
-		
-		case 'get_regattas':
-			sendEntries(BOATCLASS . DB_TABLE_SUFFIX_REGATTAS);
-			break;
-		
-		case 'get_regatta':
-			sendEntry(BOATCLASS . DB_TABLE_SUFFIX_REGATTAS);
-			break;
-		
-		case 'get_results':
-			sendEntries(BOATCLASS . DB_TABLE_SUFFIX_RESULTS);
-			break;
-		
-		case 'get_result':
-			sendEntry(BOATCLASS . DB_TABLE_SUFFIX_RESULTS);
-			break;
-		
-		case 'get_plannings':
-			$response = db_get_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_PLANNING, '*', $whereString);
-			if ($response === false) done(DONE_DATABASE);
-			$keys = array_keys($response);
-			if (isset($_REQUEST['changed-after'])) {
-				$response = db_get_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_PLANNING, '*', '`changed` > "' . mysqli_real_escape_string($mysqli, date('Y-m-d H:i:s', $_REQUEST['changed-after'])) . '"' . ($whereString ? (' AND ' . $whereString) : ''));
-				if ($response === false) done(DONE_DATABASE);
-			}
-			$response = array_map(function ($entry) {
-				global $user_id;
-				if (($user_id === false) or ($entry['user'] != $user_id)) {
-					unset($entry['gemeldet'], $entry['bezahlt']);
-				}
-				return $entry;
-			}, $response);
-			$response = array_values($response);
-			done(DONE_OKAY, array('data' => replaceChanged($response), 'keys' => $keys));
-			break;
-		
-		case 'get_planning':
-			checkRequest('id');
-			$response = db_get_data($mysqli, BOATCLASS . DB_TABLE_SUFFIX_PLANNING, '*', '`id` = "' . mysqli_real_escape_string($mysqli, $_REQUEST['id']) . '"');
-			if ($response === false) done(DONE_DATABASE);
-			if (count($response) != 1) done(DONE_BAD_REQUEST, ['error' => 'id not found']);
-			$response = array_values($response)[0];
-			if (($user_id === false) or ($response['user'] != $user_id)) {
-				unset($response['gemeldet'], $response['bezahlt']);
-			}
-			unset($response['changed']);
-			done(DONE_OKAY, ['data' => $response]);
-			break;
-		
-		case 'get_trim_boats':
-			checkLoggedIn();
-			$users = db_get_data($mysqli, DB_TABLE_TRIM_USERS, 'boat', '`user`="' . $user_id . '"');
-			$boats = implode(',', array_column($users, 'boat'));
-			if ($boats == '') {
-				done(DONE_OKAY, array('data' => [], 'keys' => []));
-			}
-			$response = db_get_data($mysqli, DB_TABLE_TRIM_BOATS, '*', '`id` IN (' . $boats . ')' . ($whereString ? (' AND ' . $whereString) : ''));
-			if ($response === false) done(DONE_DATABASE);
-			$keys = array_keys($response);
-			if (isset($_REQUEST['changed-after'])) {
-				$response = db_get_data($mysqli, DB_TABLE_TRIM_BOATS, '*', '`id` IN (' . $boats . ') AND `changed` > "' . mysqli_real_escape_string($mysqli, date('Y-m-d H:i:s', $_REQUEST['changed-after'])) . '"' . ($whereString ? (' AND ' . $whereString) : ''));
-				if ($response === false) done(DONE_DATABASE);
-			}
-			$response = array_values($response);
-			done(DONE_OKAY, array('data' => replaceChanged($response), 'keys' => $keys));
-			break;
-		
-		case 'get_trim_boat':
-			checkLoggedIn();
-			checkRequest('id');
-			$response = db_get_data($mysqli, DB_TABLE_TRIM_BOATS, '*', '`id` = "' . mysqli_real_escape_string($mysqli, $_REQUEST['id']) . '"');
-			if ($response === false) done(DONE_DATABASE);
-			if (count($response) != 1) done(DONE_BAD_REQUEST, ['error' => 'id not found']);
-			$response = array_values($response)[0];
-			if (count(db_get_data($mysqli, DB_TABLE_TRIM_USERS, 'id', '`user`="' . $user_id . '" AND `boat`="' . $response['id'] . '"')) != 1)
-				done(DONE_BAD_REQUEST, ['error' => 'id not found']);
-			unset($response['changed']);
-			done(DONE_OKAY, ['data' => $response]);
-			break;
-		
-		case 'get_trim_users':
-			checkLoggedIn();
-			$users = db_get_data($mysqli, DB_TABLE_TRIM_USERS, 'boat', '`user`="' . $user_id . '"');
-			$boats = implode(',', array_column($users, 'boat'));
-			if ($boats == '') {
-				done(DONE_OKAY, array('data' => [], 'keys' => []));
-			}
-			$response = db_get_data($mysqli, DB_TABLE_TRIM_USERS, '*', '`boat` IN (' . $boats . ')' . ($whereString ? (' AND ' . $whereString) : ''));
-			if ($response === false) done(DONE_DATABASE);
-			$keys = array_keys($response);
-			if (isset($_REQUEST['changed-after'])) {
-				$response = db_get_data($mysqli, DB_TABLE_TRIM_USERS, '*', '`boat` IN (' . $boats . ') AND `changed` > "' . mysqli_real_escape_string($mysqli, date('Y-m-d H:i:s', $_REQUEST['changed-after'])) . '"' . ($whereString ? (' AND ' . $whereString) : ''));
-				if ($response === false) done(DONE_DATABASE);
-			}
-			$response = array_values($response);
-			done(DONE_OKAY, array('data' => replaceChanged($response), 'keys' => $keys));
-			break;
-		
-		case 'get_trim_user':
-			checkLoggedIn();
-			checkRequest('id');
-			$response = db_get_data($mysqli, DB_TABLE_TRIM_USERS, '*', '`id` = "' . mysqli_real_escape_string($mysqli, $_REQUEST['id']) . '"');
-			if ($response === false) done(DONE_DATABASE);
-			if (count($response) != 1) done(DONE_BAD_REQUEST, ['error' => 'id not found']);
-			$response = array_values($response)[0];
-			if (count(db_get_data($mysqli, DB_TABLE_TRIM_USERS, 'id', '`user`="' . $user_id . '" AND `boat`="' . $response['boat'] . '"')) != 1)
-				done(DONE_BAD_REQUEST, ['error' => 'id not found']);
-			unset($response['changed']);
-			done(DONE_OKAY, ['data' => $response]);
-			break;
-		
-		case 'get_trim_trims':
-			checkLoggedIn();
-			$users = db_get_data($mysqli, DB_TABLE_TRIM_USERS, 'boat', '`user`="' . $user_id . '"');
-			$boats = implode(',', array_column($users, 'boat'));
-			if ($boats == '') {
-				done(DONE_OKAY, array('data' => [], 'keys' => []));
-			}
-			$response = db_get_data($mysqli, DB_TABLE_TRIM_TRIMS, '*', '`boat` IN (' . $boats . ')' . ($whereString ? (' AND ' . $whereString) : ''));
-			if ($response === false) done(DONE_DATABASE);
-			$keys = array_keys($response);
-			if (isset($_REQUEST['changed-after'])) {
-				$response = db_get_data($mysqli, DB_TABLE_TRIM_TRIMS, '*', '`boat` IN (' . $boats . ') AND `changed` > "' . mysqli_real_escape_string($mysqli, date('Y-m-d H:i:s', $_REQUEST['changed-after'])) . '"' . ($whereString ? (' AND ' . $whereString) : ''));
-				if ($response === false) done(DONE_DATABASE);
-			}
-			$response = array_values($response);
-			done(DONE_OKAY, array('data' => replaceChanged($response), 'keys' => $keys));
-			break;
-		
-		case 'get_trim_trim':
-			checkLoggedIn();
-			checkRequest('id');
-			$response = db_get_data($mysqli, DB_TABLE_TRIM_TRIMS, '*', '`id` = "' . mysqli_real_escape_string($mysqli, $_REQUEST['id']) . '"');
-			if ($response === false) done(DONE_DATABASE);
-			if (count($response) != 1) done(DONE_BAD_REQUEST, ['error' => 'id not found']);
-			$response = array_values($response)[0];
-			if (count(db_get_data($mysqli, DB_TABLE_TRIM_USERS, 'id', '`user`="' . $user_id . '" AND `boat`="' . $response['boat'] . '"')) != 1)
-				done(DONE_BAD_REQUEST, ['error' => 'id not found']);
-			unset($response['changed']);
-			done(DONE_OKAY, ['data' => $response]);
-			break;
-		
-		case 'get_users':
-			$followFields = '';
-			for ($i = 1; $i <= 5; $i ++) $followFields .= ',' . BOATCLASS . '_sailor' . $i . ' AS sailor' . $i;
-			$response = db_get_data($mysqli, DB_TABLE_USERS, 'id,username,email' . $followFields, $whereString);
-			if ($response === false) done(DONE_DATABASE);
-			$keys = array_keys($response);
-			if (isset($_REQUEST['changed-after'])) {
-				$response = db_get_data($mysqli, DB_TABLE_USERS, 'id,username,email' . $followFields, '`changed` > "' . mysqli_real_escape_string($mysqli, date('Y-m-d H:i:s', $_REQUEST['changed-after'])) . '"' . ($whereString ? (' AND ' . $whereString) : ''));
-				if ($response === false) done(DONE_DATABASE);
-			}
-			$response = array_map(function ($entry) {
-				global $user_id;
-				if ($entry['id'] != $user_id) {
-					$entry = ['id' => $entry['id'], 'username' => $entry['username']];
-				}
-				return $entry;
-			}, $response);
-			$response = array_values($response);
-			done(DONE_OKAY, array('data' => replaceChanged($response), 'keys' => $keys));
-			break;
-		
-		case 'get_user':
-			checkRequest('id');
-			$followFields = '';
-			for ($i = 1; $i <= 5; $i ++) $followFields .= ',' . BOATCLASS . '_sailor' . $i . ' AS sailor' . $i;
-			$response = db_get_data($mysqli, DB_TABLE_USERS, 'id,username,email' . $followFields, '`id` = "' . mysqli_real_escape_string($mysqli, $_REQUEST['id']) . '"');
-			if ($response === false) done(DONE_DATABASE);
-			if (count($response) != 1) done(DONE_BAD_REQUEST, ['error' => 'id not found']);
-			$response = array_values($response)[0];
-			if ($response['id'] != $user_id) {
-				$response = ['id' => $response['id'], 'username' => $response['username']];
-			}
-			unset($response['changed']);
-			done(DONE_OKAY, ['data' => $response]);
-			break;
-		
-		case 'add_subscription':
-			checkRequest('subscription');
-			$data = [
-				'auth' => PUSH_AUTH,
-				'subscription' => $_REQUEST['subscription']
-			];
-			$ch = curl_init('https://push.ostertun.net/add_subscription');
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($ch, CURLOPT_POST, true);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-			$result = curl_exec($ch);
-			curl_close($ch);
-			if ($result == "OK")
-				done(DONE_OKAY);
-			else {
-				logE('add_subscription', $result);
-				done(DONE_SERVER_ERROR);
-			}
-			break;
-		
-		case 'remove_subscription':
-			checkRequest('subscription');
-			$data = [
-				'auth' => PUSH_AUTH,
-				'subscription' => $_REQUEST['subscription']
-			];
-			$ch = curl_init('https://push.ostertun.net/remove_subscription');
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($ch, CURLOPT_POST, true);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-			$result = curl_exec($ch);
-			curl_close($ch);
-			if ($result == "OK")
-				done(DONE_OKAY);
-			else {
-				logE('remove_subscription', $result);
-				done(DONE_SERVER_ERROR);
-			}
-			break;
-		
-		default:
-			done(DONE_BAD_REQUEST, ['error' => 'action invalid']);
-		
-	}
-	
-?>

api/login.php

@@ -1,107 +0,0 @@
-<?php
-	
-	function get_user($mysqli, $username = null) {
-		if ($username === null) {
-			return db_get_data($mysqli, DB_TABLE_USERS);
-		} else {
-			$user = db_get_data($mysqli, DB_TABLE_USERS, '*', '`username` = "' . mysqli_real_escape_string($mysqli, $username) . '"', 1);
-			if (($user === false) or (count($user) != 1)) return false;
-			return array_values($user)[0];
-		}
-	}
-	
-	function get_user_by_id($mysqli, $user_id) {
-		$res = db_get_data($mysqli, DB_TABLE_USERS, '*', '`id` = "' . mysqli_real_escape_string($mysqli, $user_id) . '"', 1);
-		if (($res !== false) and (count($res) == 1)) {
-			return array_values($res)[0];
-		}
-		return false;
-	}
-	
-	//function signup($mysqli, $username, $email, $password) {
-	//	if (($username == '') or ($email == '') or ($password == '')) {
-	//		return 1;
-	//	}
-	//	if (get_user($mysqli, $username) !== false) {
-	//		return 1;
-	//	}
-	//	$salt = hash('sha512', uniqid(openssl_random_pseudo_bytes(16), true));
-	//	$hashpassword = hash('sha512', $password . $salt);
-	//	
-	//	$user = array();
-	//	$user['username'] = $username;
-	//	$user['email'] = $email;
-	//	$user['password'] = $hashpassword;
-	//	$user['salt'] = $salt;
-	//	if (db_insert_data($mysqli, DB_TABLE_USERS, $user) !== false) {
-	//		$values = array();
-	//		$values['USERNAME'] = $username;
-	//		$message = createMail('signup', STRING_SIGNUP_EMAIL_SUBJECT, $values);
-	//		smtp_send_mail(['Regatten.net', MAIL_FROM_ADDRESS], [[$username, $email]], [], [], STRING_SIGNUP_EMAIL_SUBJECT, $message, [['Content-Type', 'text/html; charset="UTF-8"']]);
-	//		// Analytics
-	//		matomo_event('Login', 'SignUp', $username);
-	//		return true;
-	//	} else {
-	//		return 2;
-	//	}
-	//}
-	
-	function get_perm($mysqli, $user_id) {
-		if ($user_id !== false) {
-			$result = get_user_by_id($mysqli, $user_id);
-			if ($result !== false) {
-				return $result[DB_FIELD_PERM];
-			} else {
-				return 0;
-			}
-		} else {
-			return 0;
-		}
-	}
-	
-	// ### NEW LOGIN ####################################
-	
-	function auth_login($mysqli, $username, $password, $device) {
-		$user = get_user($mysqli, $username);
-		if ($user === false) {
-			// User does not exist
-			return false;
-		}
-		$hashpassword = hash('sha512', $password . $user['salt']);
-		if ($hashpassword !== $user['password']) {
-			// Password incorrect
-			return false;
-		}
-		// All correct
-		$auth = [];
-		$auth['user'] = $user['id'];
-		$auth['username'] = $user['username'];
-		$auth['auth'] = str_replace('/', '-', str_replace('+', '_', base64_encode(openssl_random_pseudo_bytes(24))));
-		$salt = base64_encode(openssl_random_pseudo_bytes(24));
-		$hash = hash('sha512', $auth['auth'] . $salt);
-		$data = [
-			'user' => $user['id'],
-			'salt' => $salt,
-			'authhash' => $hash,
-			'device' => $device
-		];
-		$auth['id'] = db_insert_data($mysqli, DB_TABLE_LOGINS, $data);
-		return $auth;
-	}
-	
-	function auth_logout($mysqli, $id) {
-		db_delete_data($mysqli, DB_TABLE_LOGINS, 'id = "' . mysqli_real_escape_string($mysqli, $id) . '"', 1);
-		return true;
-	}
-	
-	function auth_check($mysqli, $id, $hash) {
-		$auth = db_get_data($mysqli, DB_TABLE_LOGINS, '*', 'id="' . mysqli_real_escape_string($mysqli, $id) . '"', 1);
-		if (($auth === false) or (count($auth) != 1)) return false;
-		$auth = array_values($auth)[0];
-		$hash = hash('sha512', $hash . $auth['salt']);
-		if ($hash != $auth['authhash']) return false;
-		db_update_data($mysqli, DB_TABLE_LOGINS, ['id' => $auth['id']], 'id="' . $auth['id'] . '"', 1); // update changed field => last login
-		return $auth['user'];
-	}
-	
-?>

client/scripts/database.js

@@ -1,4 +1,4 @@
-const DB_VERSION = 4;
+const DB_VERSION = 6;
 
 const USER_ID = localStorage.getItem('auth_user');
 const USER_NAME = localStorage.getItem('auth_username');
@@ -161,19 +161,19 @@ function dbGetResultCalculated(regatta) {
 	return new Promise(async function(resolve) {
 		var results = await dbGetDataIndex('results', 'regatta', regatta.id);
 		if (results.length > 0) {
-			
+
 			var gemeldet = results.length;
-			
+
 			for (id in results) {
 				results[id]['finished'] = false;
 				results[id]['values'] = [];
 				results[id]['values_all'] = [];
 				results[id]['texts'] = [];
 				var copy = [];
-				
+
 				for (var i = 0; i < regatta['races']; i ++) {
 					var race = results[id]['race' + (i + 1)].replace(',', '.');
-					
+
 					if (!isNaN(race)) {
 						copy[i] = results[id]['values'][i] = parseFloat(race);
 						results[id]['texts'][i] = race;
@@ -198,7 +198,7 @@ function dbGetResultCalculated(regatta) {
 							// Unbekannt
 							default: results[id]['values'][i] = 0; copy[i] = 0; break;
 						}
-						
+
 						if (results[id]['values'][i] != 0) {
 							results[id]['texts'][i] = race + ' (' + results[id]['values'][i] + ')';
 						} else {
@@ -206,7 +206,7 @@ function dbGetResultCalculated(regatta) {
 						}
 					}
 				}
-				
+
 				results[id]['values_all'] = [...results[id]['values']];
 				for (var s = 0; s < regatta['streicher']; s ++) {
 					var max = Math.max(...copy);
@@ -217,7 +217,7 @@ function dbGetResultCalculated(regatta) {
 						}
 					}
 				}
-				
+
 				var brutto = 0;
 				var netto = 0;
 				for (var i = 0; i < regatta['races']; i ++) {
@@ -233,11 +233,11 @@ function dbGetResultCalculated(regatta) {
 				results[id]['brutto'] = brutto;
 				results[id]['netto'] = netto;
 			}
-			
+
 			compareResultsRaceCount = regatta['races'];
-			
+
 			results.sort(compareResults);
-			
+
 			var place = 1;
 			for (id in results) {
 				if ((id > 0) && (compareResults(results[id], results[id - 1]) == 0)) {
@@ -247,9 +247,9 @@ function dbGetResultCalculated(regatta) {
 				}
 				place ++;
 			}
-			
+
 			resolve(results);
-			
+
 		} else {
 			resolve([]);
 		}
@@ -259,26 +259,26 @@ function dbGetResultCalculated(regatta) {
 function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 	return new Promise(async function(resolve) {
 		var rankNoResults = [];
-		
+
 		var sailors = await dbGetData('sailors');
 		var regattas = await dbGetRegattasRange(minDate, maxDate);
-		
+
 		var sailorIds = {};
 		for (s in sailors) {
 			sailorIds[sailors[s].id] = s;
 		}
-		
+
 		for (var i in sailors) {
 			sailors[i].regattas = {};
 			sailors[i].tmp_rlp = [];
 		}
-		
+
 		for (var i in regattas) {
 			var regatta = regattas[i];
-			
+
 			// regatta has to be min. 2 days to be ranking regatta
 			if (regatta.length < 2) continue;
-			
+
 			var results = await dbGetDataIndex('results', 'regatta', regatta.id);
 			if (results.length <= 0) {
 				if (regatta.dateTo <= getToday()) {
@@ -288,7 +288,7 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 				}
 				continue;
 			}
-			
+
 			// in one race there must be at least 10 boats started
 			var ok = false;
 			for (var j = 1; j <= regatta.races; j ++) {
@@ -304,9 +304,9 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 				}
 			}
 			if (!ok) continue;
-			
+
 			var fb = regatta.finishedBoats;
-			
+
 			// calc m
 			var m;
 			if (regatta.m > 0) {
@@ -320,16 +320,16 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 					m = 4;
 				}
 			}
-			
+
 			// add regatta to each sailor
 			for (var r in results) {
 				var result = results[r];
-				
+
 				if (result.rlp == 0) continue;
-				
+
 				// check if crew is youth
 				// TODO: not used
-				
+
 				sailors[sailorIds[result.steuermann]].regattas[regatta.id] = {
 					regatta: regatta.id,
 					boat: result.boat,
@@ -345,7 +345,7 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 				}
 			}
 		}
-		
+
 		// remove not german or not youth sailors
 		for (var i = sailors.length - 1; i >= 0; i --) {
 			if (sailors[i].german == '0') {
@@ -357,13 +357,13 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 				}
 			}
 		}
-		
+
 		for (var i = sailors.length - 1; i >= 0; i --) {
 			// sort rlps desc
 			sailors[i].tmp_rlp.sort(function (a,b) {
 				return b[1] - a[1];
 			});
-			
+
 			// calc mean rlp
 			var sum = 0;
 			var cnt = 0;
@@ -383,20 +383,40 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 				sailors.splice(i, 1);
 			}
 		}
-		
+
 		sailors.sort(function (a,b) {
 			if (a.m != b.m) return b.m - a.m;
 			return b.rlp - a.rlp;
 		});
-		
+
 		for (var i = 0; i < sailors.length; i ++) {
 			sailors[i].rank = (i + 1);
 		}
-		
+
 		resolve([sailors, rankNoResults]);
 	});
 }
 
+function dbSettingsGet(key) {
+	return new Promise(function(resolve) {
+		if (canUseLocalDB) {
+			var request = db.transaction('settings').objectStore('settings').get(key);
+			request.onsuccess = function (event) {
+				resolve(typeof request.result != 'undefined' ? request.result.value : null);
+			}
+		} else {
+			resolve(null);
+		}
+	});
+}
+
+function dbSettingsSet(key, value) {
+	if (canUseLocalDB) {
+		var os = db.transaction('settings', 'readwrite').objectStore('settings');
+		os.put({ key: key, value: value});
+	}
+}
+
 async function updateSyncStatus() { // TODO
 //	var syncStatus = document.getElementById('syncstatus');
 //	var lastSync = await dbGetData('update_times', 'last_sync');
@@ -404,7 +424,7 @@ async function updateSyncStatus() { // TODO
 //	var now = new Date();
 //	var diff = Math.round((now - lastSync) / 1000);
 //	var txt = '';
-//	
+//
 //	if (diff < 30) {  // 30 sec
 //		txt = 'jetzt';
 //	} else if (diff < 3600) {  // 60 min
@@ -417,7 +437,7 @@ async function updateSyncStatus() { // TODO
 //		diff = Math.round(diff / 86400);
 //		txt = 'vor ' + diff + ' ' + (diff == 1 ? 'Tag' : 'Tagen');
 //	}
-//	
+//
 //	var btn = '<a href="#" onclick="setLoading(true); sync(); return false;"><i class="fas fa-sync"></i> Sync</a>';
 //	syncStatus.innerHTML = 'Zuletzt aktualisiert: ' + txt + btn;
 }
@@ -433,6 +453,12 @@ async function runPageScript() {
 			}
 		};
 		updateSyncStatus();
+
+		if (isLoggedIn()) {
+			var plannings = await dbGetDataIndex('plannings', 'user', USER_ID);
+			plannings = plannings.map(function (e) { return e.regatta; });
+			dbSettingsSet('myregattas_' + BOATCLASS, plannings);
+		}
 	}
 	if (typeof updateSyncStatusTimer == 'undefined') { // TODO
 //		var syncStatus = document.getElementById('syncstatus');
@@ -445,7 +471,7 @@ async function runPageScript() {
 		}
 //		syncStatus.style.display = 'block';
 	}
-	
+
 	if (typeof siteScript === 'function') {
 		siteScript();
 	} else {
@@ -456,20 +482,20 @@ async function runPageScript() {
 function sync() {
 	if (!canUseLocalDB) return false;
 	if (syncInProgress > 0) return false;
-	
+
 	var now = Math.floor(Date.now() / 1000);
-	
+
 	db.transaction('update_times').objectStore('update_times').getAll().onsuccess = function (event) {
 		var localTimes = {};
 		event.target.result.forEach(function (entry) {
 			localTimes[entry['table']] = entry['time'];
 		});
-		
-		syncInProgress = 10;
+
+		syncInProgress = 11;
 		var syncOkay = true;
 		console.log("Sync Start");
 		$('#i-sync').addClass('fa-spin');
-		
+
 		var interval = window.setInterval(function () {
 			if (syncInProgress <= 0) {
 				window.clearInterval(interval);
@@ -481,14 +507,17 @@ function sync() {
 				setTimeout(function(){
 					$('#i-sync').removeClass('fa-spin');
 				}, 500);
-				
+
+				if (typeof onAfterSync === 'function') {
+					onAfterSync();
+				}
 				runPageScript();
 			}
 		}, 100);
-		
+
 		getJSON(QUERY_URL + 'get_update_time', function (code, serverTimes) {
 			if (code == 200) {
-				
+
 				// CLUBS
 				if (localTimes['clubs'] < serverTimes['clubs']) {
 					getJSON(QUERY_URL + 'get_clubs?changed-after=' + localTimes['clubs'], function (code, data) {
@@ -520,7 +549,7 @@ function sync() {
 				} else {
 					syncInProgress --;
 				}
-				
+
 				// BOATS
 				if (localTimes['boats'] < serverTimes['boats']) {
 					getJSON(QUERY_URL + 'get_boats?changed-after=' + localTimes['boats'], function (code, data) {
@@ -552,7 +581,7 @@ function sync() {
 				} else {
 					syncInProgress --;
 				}
-				
+
 				// SAILORS
 				if (localTimes['sailors'] < serverTimes['sailors']) {
 					getJSON(QUERY_URL + 'get_sailors?changed-after=' + localTimes['sailors'], function (code, data) {
@@ -584,7 +613,7 @@ function sync() {
 				} else {
 					syncInProgress --;
 				}
-				
+
 				// REGATTAS
 				if (localTimes['regattas'] < serverTimes['regattas']) {
 					getJSON(QUERY_URL + 'get_regattas?changed-after=' + localTimes['regattas'], function (code, data) {
@@ -617,7 +646,7 @@ function sync() {
 											osYears.put({ year: y });
 										}
 									}
-									
+
 									var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
 									osUpdateTimes.put({ table: 'regattas', time: serverTimes['regattas'] });
 									syncInProgress --;
@@ -632,7 +661,7 @@ function sync() {
 				} else {
 					syncInProgress --;
 				}
-				
+
 				// RESULTS
 				if (localTimes['results'] < serverTimes['results']) {
 					getJSON(QUERY_URL + 'get_results?changed-after=' + localTimes['results'], function (code, data) {
@@ -664,7 +693,7 @@ function sync() {
 				} else {
 					syncInProgress --;
 				}
-				
+
 				// PLANNINGS
 				if (localTimes['plannings'] < serverTimes['plannings']) {
 					getJSON(QUERY_URL + 'get_plannings?changed-after=' + localTimes['plannings'], function (code, data) {
@@ -696,7 +725,7 @@ function sync() {
 				} else {
 					syncInProgress --;
 				}
-				
+
 				if (isLoggedIn()) {
 					// TRIM_BOATS
 					if (localTimes['trim_boats'] < serverTimes['trim_boats']) {
@@ -729,7 +758,7 @@ function sync() {
 					} else {
 						syncInProgress --;
 					}
-					
+
 					// TRIM_USERS
 					if (localTimes['trim_users'] < serverTimes['trim_users']) {
 						getJSON(QUERY_URL + 'get_trim_users?changed-after=' + localTimes['trim_users'], function (code, data) {
@@ -761,7 +790,7 @@ function sync() {
 					} else {
 						syncInProgress --;
 					}
-					
+
 					// TRIM_TRIMS
 					if (localTimes['trim_trims'] < serverTimes['trim_trims']) {
 						getJSON(QUERY_URL + 'get_trim_trims?changed-after=' + localTimes['trim_trims'], function (code, data) {
@@ -793,11 +822,43 @@ function sync() {
 					} else {
 						syncInProgress --;
 					}
-					
+
 				} else {
 					syncInProgress -= 3;
 				}
-				
+
+				// NEWS
+				if (localTimes['news'] < serverTimes['news']) {
+					getJSON(QUERY_URL + 'get_news?changed-after=' + localTimes['news'], function (code, data) {
+						if (code == 200) {
+							var os = db.transaction('news', 'readwrite').objectStore('news');
+							console.log(data);
+							data.data.forEach(function (entry) {
+								os.put(entry);
+							});
+							os.openCursor().onsuccess = function (event) {
+								var cursor = event.target.result;
+								if (cursor) {
+									if (!data.keys.includes(parseInt(cursor.key))) {
+										os.delete(cursor.key);
+									}
+									cursor.continue();
+								} else {
+									var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
+									osUpdateTimes.put({ table: 'news', time: serverTimes['news'] });
+									syncInProgress --;
+								}
+							};
+						} else {
+							console.log("Something went wrong (HTTP " + code + ")");
+							syncOkay = false;
+							syncInProgress --;
+						}
+					});
+				} else {
+					syncInProgress --;
+				}
+
 				// USERS
 				if (localTimes['users'] < serverTimes['users']) {
 					getJSON(QUERY_URL + 'get_users?changed-after=' + localTimes['users'], function (code, data) {
@@ -829,7 +890,7 @@ function sync() {
 				} else {
 					syncInProgress --;
 				}
-				
+
 			} else {
 				console.log("Something went wrong (HTTP " + code + ")");
 				syncOkay = false;
@@ -856,13 +917,13 @@ function initDatabase() {
 		var request = window.indexedDB.open('regatten_app_db_' + BOATCLASS, DB_VERSION);
 		request.onerror = function (event) {
 			console.log("Cannot open DB: " + event.target.errorCode);
-			
+
 			runPageScript();
 		};
 		request.onsuccess = function (event) {
 			console.log("Database loaded");
 			db = event.target.result;
-			
+
 			db.onversionchange = function (event) {
 				if (syncTimer != null) window.clearInterval(syncTimer);
 				if (updateSyncStatusTimer != null) window.clearInterval(updateSyncStatusTimer);
@@ -871,13 +932,15 @@ function initDatabase() {
 				db.close();
 				location.reload;
 			}
-			
+
 			db.onerror = function (event) {
 				console.log("DB Error: " + event.target.errorCode);
 			};
-			
+
 			canUseLocalDB = true;
-			
+
+			if (typeof onDatabaseLoaded == 'function') onDatabaseLoaded();
+
 			db.transaction('update_times').objectStore('update_times').get('last_sync').onsuccess = function (event) {
 				var lastSync = event.target.result.time;
 				if (lastSync > 0) {
@@ -886,11 +949,11 @@ function initDatabase() {
 					db.transaction('update_times', 'readwrite').objectStore('update_times').put({ table: 'loggedin', status: isLoggedIn() });
 				}
 			};
-			
+
 			checkSync();
-			
+
 			syncTimer = window.setInterval(checkSync, 300000); // 5 min
-			
+
 			window.ononline = function () {
 				checkSync();
 			}
@@ -900,9 +963,9 @@ function initDatabase() {
 			var upgradeTransaction = event.target.transaction;
 			var oldVersion = event.oldVersion;
 			var newVersion = event.newVersion;
-			
+
 			console.log("Datenbank Version Upgrade von " + oldVersion + " auf " + newVersion);
-			
+
 			if ((oldVersion < 1) && (newVersion >= 1)) {
 				console.log('to version 1');
 				var osClubs = db.createObjectStore('clubs', { keyPath: 'id' });
@@ -931,7 +994,7 @@ function initDatabase() {
 				osUpdateTimes.add({ table: 'trim_users', time: 0 });
 				osUpdateTimes.add({ table: 'trim_trims', time: 0 });
 			}
-			
+
 			if ((oldVersion < 2) && (newVersion >= 2)) {
 				console.log('to version 2');
 				var osUsers = db.createObjectStore('users', { keyPath: 'id' });
@@ -939,20 +1002,32 @@ function initDatabase() {
 				var osUpdateTimes = upgradeTransaction.objectStore('update_times');
 				osUpdateTimes.add({ table: 'users', time: 0 });
 			}
-			
+
 			if ((oldVersion < 3) && (newVersion >= 3)) {
 				console.log('to version 3');
 				var osYears = db.createObjectStore('years', { keyPath: 'year' });
 				var osUpdateTimes = upgradeTransaction.objectStore('update_times');
 				osUpdateTimes.put({ table: 'regattas', time: 0 });
 			}
-			
+
 			if ((oldVersion < 4) && (newVersion >= 4)) {
 				console.log('to version 4');
 				var osUpdateTimes = upgradeTransaction.objectStore('update_times');
 				osUpdateTimes.add({ table: 'loggedin', status: isLoggedIn() });
 			}
-			
+
+			if ((oldVersion < 5) && (newVersion >= 5)) {
+				console.log('to version 5');
+				var osPushes = db.createObjectStore('settings', { keyPath: 'key' });
+			}
+
+			if ((oldVersion < 6) && (newVersion >= 6)) {
+				console.log('to version 6');
+				var osNews = db.createObjectStore('news', { keyPath: 'id' });
+				var osUpdateTimes = upgradeTransaction.objectStore('update_times');
+				osUpdateTimes.add({ table: 'news', time: 0 });
+			}
+
 			var osUpdateTimes = upgradeTransaction.objectStore('update_times');
 			osUpdateTimes.put({ table: 'last_sync', time: 0 });
 		}
@@ -961,8 +1036,7 @@ function initDatabase() {
 	}
 }
 
-function resetDb(silent = true) {
-	$('#menu-developer').hideMenu();
+function resetDb() {
 	if (canUseLocalDB) {
 		showLoader();
 		var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
@@ -976,13 +1050,9 @@ function resetDb(silent = true) {
 		osUpdateTimes.put({ table: 'trim_boats', time: 0 });
 		osUpdateTimes.put({ table: 'trim_users', time: 0 });
 		osUpdateTimes.put({ table: 'trim_trims', time: 0 });
+		osUpdateTimes.put({ table: 'news', time: 0 });
 		osUpdateTimes.put({ table: 'users', time: 0 });
 		console.log('DB update times reset');
-		if (!silent)
-			toastInfo('The database was reset. Please reload or close this tab.<br>At the next visit, a full sync will be performed.');
 		hideLoader();
-	} else {
-		if (!silent)
-			toastWarn('Your device does not support storing data locally. All data is fetched directly from our server.<br>As a result, you can not reset your database.');
 	}
 }

client/scripts/datetime.js

@@ -27,13 +27,13 @@ function parseDate(string) {
 	} else {
 		return null;
 	}
-	
+
 	if (isNaN(year) || isNaN(month) || isNaN(day)) return null;
 	if (year.toString().length == 2) year = (year < 70 ? 2000 : 1900) + year;
 	if ((year < 1970) || (year > 3000)) return null;
 	if ((month < 1) || (month > 12)) return null;
 	if ((day < 1) || (day > 31)) return null;
-	
+
 	var date = new Date(Date.UTC(year, month - 1, day));
 	return date;
 }
@@ -51,37 +51,37 @@ function formatDate(format, date = null) {
 		date = new Date(date.valueOf());
 		date.setMinutes(date.getMinutes() + date.getTimezoneOffset());
 	}
-	
+
 	format = format.replace("M", "%1%");
 	format = format.replace("F", "%2%");
 	format = format.replace("D", "%3%");
 	format = format.replace("l", "%4%");
-	
+
 	var tmp = date.getFullYear().toString();
 	var tmp2 = tmp.substr(2);
 	format = format.replace("Y", tmp);
 	format = format.replace('y', tmp2);
-	
+
 	tmp = (date.getMonth() + 1).toString();
 	tmp2 = (tmp.length > 1 ? tmp : ('0' + tmp));
 	format = format.replace('n', tmp);
 	format = format.replace('m', tmp2);
-	
+
 	tmp = date.getDate().toString();
 	tmp2 = (tmp.length > 1 ? tmp : ('0' + tmp));
 	format = format.replace('j', tmp);
 	format = format.replace('d', tmp2);
-	
+
 	tmp = date.getDay();
 	tmp2 = (tmp == 0 ? 7 : tmp);
 	format = format.replace('w', tmp);
 	format = format.replace('N', tmp2);
-	
+
 	format = format.replace('%1%', strings.months_short[date.getMonth()]);
 	format = format.replace('%2%', strings.months_long[date.getMonth()]);
-	
+
 	format = format.replace('%3%', strings.weekdays_short[date.getDay()]);
 	format = format.replace('%4%', strings.weekdays_long[date.getDay()]);
-	
+
 	return format;
 }

client/scripts/pwa.js.php

@@ -7,9 +7,11 @@
 	
 ?>
 //Loading the Service Worker
+var swRegistration = null;
 if ('serviceWorker' in navigator) {
-  window.addEventListener('load', function() {
-    navigator.serviceWorker.register('<?php echo SERVER_ADDR; ?>/service-worker.js.php');
+  window.addEventListener('load', async function() {
+    swRegistration = await navigator.serviceWorker.register('<?php echo SERVER_ADDR; ?>/service-worker.js.php');
+    if (typeof onServiceWorkerLoaded === 'function') onServiceWorkerLoaded();
   });
 }
 

client/scripts/regatten.js.php

@@ -1,16 +1,17 @@
 <?php
-	
+
 	header('Content-Type: text/javascript');
-	
+
 	require_once(__DIR__ . '/../../server/config.php');
-	
+
 ?>
 
-const QUERY_URL = '<?php echo SERVER_ADDR; ?>/api/';
+const QUERY_URL = '<?php echo QUERY_URL; ?>';
 const BOATCLASS = '<?php echo BOATCLASS; ?>';
 const LINK_PRE = '<?php echo SERVER_ADDR; ?>/';
 const YOUTH_AGE = '<?php echo $_CLASS['youth-age']; ?>';
 const YOUTH_GERMAN_NAME = '<?php echo $_CLASS['youth-german-name']; ?>';
+const PUSH_SERVER_KEY = '<?php echo PUSH_SERVER_KEY; ?>';
 
 var randomId = function() { return '_' + Math.random().toString(36).substr(2, 9); }
 
@@ -121,8 +122,8 @@ var login = function() {
 	showLoader();
 	var username = $('#input-login-username').val();
 	var password = $('#input-login-password').val();
-	$('#input-login-username').val('');
-	$('#input-login-password').val('');
+	$('#input-login-username').val('').trigger('focusin').trigger('focusout');
+	$('#input-login-password').val('').trigger('focusin').trigger('focusout');
 	$.ajax({
 		url: QUERY_URL + 'login',
 		method: 'POST',
@@ -134,7 +135,7 @@ var login = function() {
 		error: function (xhr, status, error) {
 			if (xhr.status == 401) {
 				toastError('Benutzername oder Passwort falsch');
-				$('#input-login-username').val(username);
+				$('#input-login-username').val(username).trigger('focusin').trigger('focusout');
 			} else if (xhr.status == 0) {
 				toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um Dich anzumelden');
 				$('#menu-login').hideMenu();
@@ -202,7 +203,28 @@ var logout = function() {
 	});
 }
 
-function resetCache() {
+function deleteDb() {
+	$('#menu-developer').hideMenu();
+	if (canUseLocalDB) {
+		showLoader();
+		var request = window.indexedDB.deleteDatabase('regatten_app_db_' + BOATCLASS);
+		request.onerror = function (event) {
+			console.log('Cannot delete DB: ', event.target.errorCode);
+			toastError('Beim Löschen der Datenbank ist ein Fehler aufgetreten.<br>Bitte melde diesen Fehler. (Dev-Menu => Problem melden)', 5000);
+			hideLoader();
+		}
+		request.onsuccess = function (event) {
+			console.log('DB deleted');
+			toastInfo('Die Datenbank wurde gelöscht. Die Seite lädt in wenigen Sekunden neu und erstellt damit eine neue Datenbank.', 10000);
+			hideLoader();
+			setTimeout(function(){ location.reload(); }, 3000);
+		}
+	} else {
+		toastWarn('Dein Gerät unterstützt kein lokales Speichern der Daten. Alle Daten werden direkt vom Server gezogen.<br>Entsprechend kannst Du die Datenbank auch nicht zurücksetzen.', 10000);
+	}
+}
+
+function deleteCache() {
 	$('#menu-developer').hideMenu();
 	navigator.serviceWorker.getRegistrations().then(function (registrations) {
 		for (let registration of registrations) {
@@ -216,14 +238,197 @@ function resetCache() {
 			return caches.delete(key);
 		}));
 	});
-	toastInfo('The serviceWorker and the cache were deleted. A new serviceWorker will be generated on the next refresh.');
+	toastInfo('Der serviceWorker und alle Caches wurden gelöscht. Die Seite lädt in wenigen Sekunden neu und erstellt damit neue Caches.', 10000);
+	setTimeout(function(){ location.reload(); }, 3000);
+}
+
+var pushesPossible = false;
+
+function urlB64ToUint8Array(base64String) {
+	const padding = '='.repeat((4 - base64String.length % 4) % 4);
+	const base64 = (base64String + padding)
+		.replace(/\-/g, '+')
+		.replace(/_/g, '/');
+
+	const rawData = window.atob(base64);
+	const outputArray = new Uint8Array(rawData.length);
+
+	for (let i = 0; i < rawData.length; ++i) {
+		outputArray[i] = rawData.charCodeAt(i);
+	}
+	return outputArray;
+}
+
+function pushesSubscribe() {
+	console.log('Subscribing');
+	const applicationServerKey = urlB64ToUint8Array(PUSH_SERVER_KEY);
+	swRegistration.pushManager.subscribe({
+		userVisibleOnly: true,
+		applicationServerKey: applicationServerKey
+	})
+	.then(function(subscription) {
+		pushesUpdateServerSubscription(subscription, true);
+		updatePushSwitches();
+		updatePushBadge();
+	})
+	.catch(function(err) {
+		console.log('Failed to subscribe the user: ', err);
+		toastError('Da ist leider etwas schief gelaufen. Bitte stelle sicher, dass Du mit dem Internet verbunden bist und versuche es erneut.', 5000);
+		pushesUnSubscribe(true);
+	});
+}
+
+function pushesUnSubscribe(silent = false) {
+	console.log('Unsubscribing');
+	swRegistration.pushManager.getSubscription()
+	.then(function(subscription) {
+		if (subscription) {
+			pushesUpdateServerSubscription(subscription, false);
+			subscription.unsubscribe();
+			$('#menu-pushes').hideMenu();
+			updatePushBadge();
+			hideLoader();
+		}
+	})
+	.catch(function(error) {
+		console.log('Error unsubscribing', error);
+		$('#menu-pushes').hideMenu();
+		if (!silent) toastError('Da ist leider etwas schief gelaufen. Bitte versuche es erneut oder wende Dich an unseren Support.', 5000);
+		updatePushBadge();
+		hideLoader();
+	});
+}
+
+function pushesUpdateServerSubscription(subscription, enabled) {
+	console.log('updateServer', enabled, subscription);
+	$.ajax({
+		url: QUERY_URL + (enabled ? 'add' : 'remove') + '_subscription',
+		type: 'POST',
+		data: { subscription: JSON.stringify(subscription) },
+		success: function (data, textStatus, jqXHR) {
+			if (!enabled) {
+				toastOk('Du erhältst ab sofort keine Benachrichtigungen mehr von uns.');
+			}
+			hideLoader();
+		},
+		error: function (jqXHR, textStatus, errorThrown) {
+			throw 'Cannot update server subscription';
+		}
+	});
+}
+
+async function initPushSettings() {
+	var items = [
+		['notify_channel_' + BOATCLASS + '_news', true],
+		['notify_channel_' + BOATCLASS + '_regatta_changed_my', true],
+		['notify_channel_' + BOATCLASS + '_regatta_changed_all', false],
+		['notify_channel_' + BOATCLASS + '_result_ready_my', true],
+		['notify_channel_' + BOATCLASS + '_result_ready_all', true],
+		['notify_channel_' + BOATCLASS + '_meldeschluss', true]
+	];
+	for (var i in items) {
+		var item = items[i];
+		if ((await dbSettingsGet(item[0])) == null) dbSettingsSet(item[0], item[1]);
+	}
+}
+
+async function updatePushSwitches() {
+	$('#switch-pushes-news').prop('checked', await dbSettingsGet('notify_channel_' + BOATCLASS + '_news'));
+	$('#switch-pushes-regatta-changed-my').prop('checked', await dbSettingsGet('notify_channel_' + BOATCLASS + '_regatta_changed_my'));
+	$('#switch-pushes-regatta-changed-all').prop('checked', await dbSettingsGet('notify_channel_' + BOATCLASS + '_regatta_changed_all'));
+	$('#switch-pushes-result-ready-my').prop('checked', await dbSettingsGet('notify_channel_' + BOATCLASS + '_result_ready_my'));
+	$('#switch-pushes-result-ready-all').prop('checked', await dbSettingsGet('notify_channel_' + BOATCLASS + '_result_ready_all'));
+	$('#switch-pushes-meldeschluss').prop('checked', await dbSettingsGet('notify_channel_' + BOATCLASS + '_meldeschluss'));
+
+	if ($('#switch-pushes').prop('checked')) {
+		$('#p-pushes-info').show();
+		$('.a-switch-pushes-channel-all').show();
+		$('.a-switch-pushes-channel-my').show();
+		if (!isLoggedIn()) {
+			$('.a-switch-pushes-channel-my').find('div').remove();
+			$('.a-switch-pushes-channel-my').find('.badge').text('nicht angemeldet');
+		}
+	} else {
+		$('#p-pushes-info').hide();
+		$('.a-switch-pushes-channel-all').hide();
+		$('.a-switch-pushes-channel-my').hide();
+	}
+}
+
+function pushesSubscribeClicked() {
+	showLoader();
+	if ($('#switch-pushes').prop('checked')) {
+		pushesSubscribe();
+	} else {
+		pushesUnSubscribe();
+	}
+}
+
+function pushesChannelClicked() {
+	dbSettingsSet('notify_channel_' + BOATCLASS + '_news', $('#switch-pushes-news').prop('checked'));
+	dbSettingsSet('notify_channel_' + BOATCLASS + '_regatta_changed_my', $('#switch-pushes-regatta-changed-my').prop('checked'));
+	dbSettingsSet('notify_channel_' + BOATCLASS + '_regatta_changed_all', $('#switch-pushes-regatta-changed-all').prop('checked'));
+	dbSettingsSet('notify_channel_' + BOATCLASS + '_result_ready_my', $('#switch-pushes-result-ready-my').prop('checked'));
+	dbSettingsSet('notify_channel_' + BOATCLASS + '_result_ready_all', $('#switch-pushes-result-ready-all').prop('checked'));
+	dbSettingsSet('notify_channel_' + BOATCLASS + '_meldeschluss', $('#switch-pushes-meldeschluss').prop('checked'));
+}
+
+function pushesOpenMenu() {
+	$('#menu-settings').hideMenu();
+	if (!pushesPossible) {
+		toastWarn('Dein Browser unterst&uuml;tzt leider keine Benachrichtigungen.', 5000);
+		return;
+	}
+	if (Notification.permission == 'denied') {
+		toastWarn('Benachrichtigungen werden von Deinem Browser blockiert.', 5000);
+		return;
+	}
+
+	swRegistration.pushManager.getSubscription().then(function(subscription) {
+		var isSub = (subscription !== null);
+		$('#switch-pushes').prop('checked', isSub);
+		updatePushSwitches();
+		$('#menu-pushes').showMenu();
+	});
+}
+
+function updatePushBadge() {
+	if (!pushesPossible) return;
+	if (Notification.permission == 'denied') {
+		$('#badge-pushes').removeClass('bg-green2-dark').addClass('bg-red2-dark').text('BLOCKED');
+		return;
+	}
+	swRegistration.pushManager.getSubscription().then(function(subscription) {
+		var isSub = (subscription !== null);
+		if (isSub) {
+			$('#badge-pushes').removeClass('bg-red2-dark').addClass('bg-green2-dark').text('AN');
+		} else {
+			$('#badge-pushes').removeClass('bg-green2-dark').addClass('bg-red2-dark').text('AUS');
+		}
+	});
+}
+
+async function updateNewsBadge() {
+	var newsRead = await dbSettingsGet('news_read_' + BOATCLASS);
+	if (newsRead === null) dbSettingsSet('news_read_' + BOATCLASS, newsRead = new Date());
+	var news = await dbGetData('news');
+	var now = new Date();
+	var sum = 0;
+	for (var n in news) {
+		var newsEntry = news[n];
+		newsEntry.date = new Date(Date.parse(newsEntry.date));
+		if (newsEntry.date > now) continue;
+		if (newsEntry.date < newsRead) continue;
+		sum ++;
+	}
+	updateBadge('more/news', sum);
 }
 
 var initRegatten = function() {
 	showLoader();
-	
+
 	initDatabase();
-	
+
 	if (isLoggedIn()) {
 		$('.show-loggedin').show();
 		$('.show-notloggedin').hide();
@@ -235,4 +440,51 @@ var initRegatten = function() {
 		$('.show-loggedin').hide();
 		$('.show-notloggedin').show();
 	}
-}
+
+	// Pushes
+	$('#a-switch-pushes').click(pushesSubscribeClicked);
+	$('.a-switch-pushes-channel-all').click(pushesChannelClicked);
+	$('.a-switch-pushes-channel-my').click(pushesChannelClicked);
+}
+
+var onServiceWorkerLoaded = function() {
+	if ((swRegistration !== null) && canUseLocalDB) {
+		pushesPossible = true;
+		updatePushBadge();
+	} else {
+		$('#badge-pushes').removeClass('bg-green2-dark').addClass('bg-red2-dark').text('NOT SUPPORTED');
+	}
+}
+
+var onDatabaseLoaded = function() {
+	onServiceWorkerLoaded();
+	initPushSettings();
+
+	updateNewsBadge();
+}
+
+var onAfterSync = function() {
+	updateNewsBadge();
+}
+
+// Add console opener to preloader
+var addConsoleOpenerToPreloader = function() {
+	addConsoleOpenerToPreloader = function(){};
+	var preloader = document.getElementById('preloader');
+	var button = document.createElement('a');
+	button.href = '#';
+	button.classList = 'btn btn-full rounded-s text-uppercase font-900 shadow-m bg-highlight m-3';
+	button.style.position = 'fixed';
+	button.style.bottom = 0;
+	button.style.left = 0;
+	button.style.right = 0;
+	button.innerHTML = 'Show Console';
+	button.onclick = function(){
+		mobileConsole.displayConsole();
+		return false;
+	}
+	setTimeout(function(){
+		preloader.appendChild(button);
+	}, 5000);
+}
+addConsoleOpenerToPreloader();

client/styles/regatten.css

@@ -173,6 +173,13 @@
 	text-align: right;
 }
 
+/*** BLOCKQUOTE ***/
+blockquote {
+	border-left: 0.5em solid rgba(0, 0, 0, 0.125);
+	font-style: italic;
+	padding-left: 1em;
+}
+
 /*** BLINKING ICONS ***/
 @keyframes fa-blink {
 	0% { opacity: 1; }

client/styles/style.css

@@ -4254,7 +4254,7 @@ code {
 }
 
 /*Contact Form*/
-.menu input[type="text"] {
+/*.menu input[type="text"] {
   height: 35px;
   line-height: 35px;
 }
@@ -4271,7 +4271,7 @@ code {
 .menu .form-field label {
   font-size: 12px;
   margin-bottom: -10px;
-}
+}*/
 
 .form-field span {
   position: absolute;

server/config_example.php

@@ -4,18 +4,18 @@
 	error_reporting(0);   // disable error reporting in browser
 	define('SEND_ERRORS', true);   // send errors via log
 	
+	define('BOATCLASS', 'pirat');
+	
 	date_default_timezone_set('Europe/Berlin');
 	define('SERVER_PATH', '/subfolder');  // path to root directory
 	define('SERVER_ADDR', 'https://' . $_SERVER['SERVER_NAME'] . SERVER_PATH);  // path to root directory
+	define('QUERY_URL', 'http://' . $_SERVER['SERVER_NAME'] . '/api/' . BOATCLASS . '/');  // url to api backend
 	define('LOGGING_APIKEY', 'xxx');  // Apikey for Logging API -> get from ostertun.net/logging
 	
-	// PUSH SERVER
-	define('PUSH_AUTH', 'xxxxxxx'); // auth string for push.ostertun.net
-	define('PUSH_SERVERKEY', 'xxxxxxx'); // server key from push.ostertun.net
+	// PUSH
+	define('PUSH_SERVER_KEY', '');
 	
-	define('BOATCLASS', 'pirat');
-	
-	// BOAT CLASSES
+	// BOAT CLASS
 	$_CLASS = array(
 		'name' => 'Pirat',
 		'desc' => 'eine vom DSV geförderte Jugendmeisterschaftsklasse',

server/content/boats.php

@@ -35,6 +35,11 @@
 	$items .= $tpl->load('menu/item-icon', ['Vereins-Website', '', 'html-id' => 'menu-item-clubwebsite', 'icon' => 'fa-globe', 'css-class' => 'border-0']);
 	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-boat', 'title' => 'Boots-Details', 'height' => 200]);
 	
+	$items = '<p class="mb-2 mt-1" style="line-height: 1.5em;">Bitte trage hier den Bootsnamen ein:</p>';
+	$items .= $tpl->load('input', ['html-id' => 'input-editboatname', 'placeholder' => 'Bootsname', 'type' => 'text']);
+	$items .= $tpl->load('button', ['Speichern', '#', 'html-id' => 'button-editboatname']);
+	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-editboatname', 'height' => 240]);
+	
 	$sp['scripts'] .= $scripts->load('pagination', ['pageChange', 'page', 'pageCount', 'pagination']);
 	$sp['scripts'] .= $scripts->load('boats');
 	

server/content/contact.php

@@ -1,19 +1,38 @@
 <?php
 	
-	// TODO: Create site
-	
-	$sp['title'] = 'Seite noch nicht unterstuuml;tzt - Regatten.net ' . $_CLASS['name'];
+	$sp['title'] = 'Kontakt - Regatten.net ' . $_CLASS['name'];
 	$sp['backbutton'] = true;
+	$sp['activenav'] = 5;
 	
-	$content = $tpl->load('error', ['404', 'Seite existiert noch nicht']);
-	$content .= '<p>';
-	$content .= 'Die gesuchte Seite ist leider noch nicht verf&uuml;gbar.<br>';
-	$content .= 'Wir arbeiten daran, sie schnellstm&ouml;glich zur Verf&uuml;gung zu stellen.<br>';
-	$content .= 'Wie w&auml;re es mit der Homepage?';
+	// TITLE
+	$content = '<h1>Kontakt</h1>';
+	
+	$sp['output'] .= $tpl->load('card', [$content]);
+	
+	// Info
+	$content = '<p>';
+	$content .= 'Du hast eine Frage? Du hast einen Fehler in unserer Software oder in den gespeicherten Daten gefunden? Du willst Regatten.net auch f&uuml;r Deine Bootsklasse nutzen?<br>';
+	$content .= 'Egal was es ist, lass es uns wissen! Schreibe uns eine Mail an <a href="mailto:info@regatten.net">info@regatten.net</a> oder nutze einfach dieses Kontakt-Formular.<br>';
+	$content .= 'Wir werden Deine Anfrage so schnell wie m&ouml;glich bearbeiten.';
+	$content .= '</p>';
+	$content .= '<p>';
+	$content .= 'Alternativ erreichst Du uns auch telefonisch unter <a href="tel:+4941039659768">+49 (0) 4103 965 976 8</a><br>';
+	$content .= 'Mo-Fr: 7-20 Uhr<br>';
+	$content .= 'Sa: 9-17 Uhr';
 	$content .= '</p>';
-	$content .= $tpl->load('button', ['Zur Startseite', LINK_PRE . 'index', 'css-class' => 'mb-3']);
-	$content .= $tpl->load('button', ['Kontakt', LINK_PRE . 'contact']);
 	
-	$sp['output'] = $tpl->load('card', [$content, 'css-class' => 'text-center pt-3']);
+	$sp['output'] .= $tpl->load('card', [$content]);
+	
+	// Formular
+	$content = '<h2>Kontakt-Formular</h2>';
+	$content .= $tpl->load('input', ['html-id' => 'input-name', 'placeholder' => 'Dein Name', 'type' => 'text']);
+	$content .= $tpl->load('input', ['html-id' => 'input-email', 'placeholder' => 'Email-Adresse', 'type' => 'email']);
+	$content .= $tpl->load('input', ['html-id' => 'input-subject', 'placeholder' => 'Betreff', 'type' => 'text']);
+	$content .= $tpl->load('textarea', ['html-id' => 'input-message', 'placeholder' => 'Deine Nachricht']);
+	$content .= $tpl->load('button', ['Senden', '#', 'html-id' => 'button-send']);
+	
+	$sp['output'] .= $tpl->load('card', [$content]);
+	
+	$sp['scripts'] .= $scripts->load('contact');
 	
 ?>

server/content/news.php

@@ -1,19 +1,22 @@
 <?php
 	
-	// TODO: Create site
-	
-	$sp['title'] = 'Seite noch nicht unterstuuml;tzt - Regatten.net ' . $_CLASS['name'];
+	$sp['title'] = 'News - Regatten.net ' . $_CLASS['name'];
 	$sp['backbutton'] = true;
+	$sp['activenav'] = 5;
 	
-	$content = $tpl->load('error', ['404', 'Seite existiert noch nicht']);
-	$content .= '<p>';
-	$content .= 'Die gesuchte Seite ist leider noch nicht verf&uuml;gbar.<br>';
-	$content .= 'Wir arbeiten daran, sie schnellstm&ouml;glich zur Verf&uuml;gung zu stellen.<br>';
-	$content .= 'Wie w&auml;re es mit der Homepage?';
-	$content .= '</p>';
-	$content .= $tpl->load('button', ['Zur Startseite', LINK_PRE . 'index', 'css-class' => 'mb-3']);
-	$content .= $tpl->load('button', ['Kontakt', LINK_PRE . 'contact']);
+	// Title
+	$content = "<h1>Neuigkeiten</h1>";
+	$content .= '<p>Aktuelles der letzten zw&ouml;lf Monate</p>';
 	
-	$sp['output'] = $tpl->load('card', [$content, 'css-class' => 'text-center pt-3']);
+	$sp['output'] .= $tpl->load('card', [$content]);
+	
+	// Menu
+	$sp['menus'] .= $tpl->load('menu/modal', ['html-id' => 'menu-news', 'title' => 'Details']);
+	
+	$cardTemplate = $tpl->load('card', ['%CONTENT%', 'html-id' => '%ID%', 'css-class' => 'card-news']);
+	$cardTemplate = str_replace("\n", '', $cardTemplate);
+	$cardTemplate = str_replace("\r", '', $cardTemplate);
+	$sp['scripts'] .= "<script>const cardTemplate = '" . $cardTemplate . "';</script>";
+	$sp['scripts'] .= $scripts->load('news');
 	
 ?>

server/content/sailors.php

@@ -35,6 +35,11 @@
 	$items .= $tpl->load('menu/item-icon', ['Vereins-Website', '', 'html-id' => 'menu-item-clubwebsite', 'icon' => 'fa-globe', 'css-class' => 'border-0']);
 	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-sailor', 'title' => 'Segler-Details', 'height' => 200]);
 	
+	$items = '<p class="mb-2 mt-1" style="line-height: 1.5em;">Bitte trage hier den Jahrgang ein:</p>';
+	$items .= $tpl->load('input', ['html-id' => 'input-edityear', 'placeholder' => 'Jahrgang', 'type' => 'number']);
+	$items .= $tpl->load('button', ['Speichern', '#', 'html-id' => 'button-edityear']);
+	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-edityear', 'height' => 240]);
+	
 	$sp['scripts'] .= $scripts->load('pagination', ['pageChange', 'page', 'pageCount', 'pagination']);
 	$sp['scripts'] .= $scripts->load('sailors');
 	

server/page/menus.php

@@ -92,7 +92,7 @@
 	</div>
 </div>
 
-<div id="menu-settings" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="270">
+<div id="menu-settings" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="310">
 	<div class="menu-title"><h1>Einstellungen</h1><p class="color-highlight">&nbsp;</p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
 	<div class="divider divider-margins mb-n2"></div>
 	<div class="content">
@@ -110,7 +110,7 @@
 				<span>Login</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
-			<a href="#" data-menu="menu-signup" class="show-notloggedin border-0">
+			<a href="#" data-menu="menu-signup" class="show-notloggedin">
 				<i class="fa font-14 fa-user-plus rounded-s bg-highlight color-white"></i>
 				<span>Registrieren</span>
 				<span class="badge bg-red2-dark color-white">FREE</span>
@@ -120,40 +120,125 @@
 				<span>Account</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
-			<a href="#" onclick="logout();" class="show-loggedin border-0">
+			<a href="#" onclick="logout();" class="show-loggedin">
 				<i class="fa font-14 fa-sign-out-alt rounded-s bg-highlight color-white"></i>
 				<span>Logout</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
+			<a href="#" onclick="pushesOpenMenu()" class="border-0">
+				<i class="fa font-14 fa-bell rounded-s bg-highlight color-white"></i>
+				<span>Benachrichtigungen</span>
+				<span id="badge-pushes" class="badge color-white"></span>
+				<i class="fa fa-angle-right"></i>
+			</a>
 		</div>
 	</div>
 </div>
 
-<div id="menu-developer" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="310">
+<div id="menu-pushes" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="500">
+	<div class="menu-title"><h1>Benachrichtigungen</h1><p class="color-highlight">Bleibe immer auf dem aktuellen Stand</p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
+	<div class="divider divider-margins mb-n2"></div>
+	<div class="content">
+		<div class="list-group list-custom-small">
+			<a id="a-switch-pushes" href="#" data-trigger-switch="switch-pushes" class="pb-2">
+				<i class="fa font-14 fa-bell rounded-s bg-highlight color-white"></i>
+				<span>Benachrichtigungen aktivieren</span>
+				<div class="custom-control scale-switch ios-switch">
+					<input type="checkbox" class="ios-input" id="switch-pushes">
+					<label class="custom-control-label" for="switch-pushes"></label>
+				</div>
+			</a>
+			<div class="divider"></div>
+			<p style="line-height: 1.5em;" id="p-pushes-info">
+				W&auml;hle hier, &uuml;ber was Du informiert werden m&ouml;chtest.<br>
+				(meine) bezieht sich auf die Regatten, die in Deiner Saison-Planung sind,<br>
+				(alle) informiert Dich &uuml;ber alle Regatten
+			</p>
+			<a href="#" data-trigger-switch="switch-pushes-news" class="pb-2 a-switch-pushes-channel-all">
+				<i class="fa font-14 fa-newspaper rounded-s bg-highlight color-white"></i>
+				<span>Neuigkeiten</span>
+				<div class="custom-control scale-switch ios-switch">
+					<input type="checkbox" class="ios-input" id="switch-pushes-news">
+					<label class="custom-control-label" for="switch-pushes-news"></label>
+				</div>
+			</a>
+			<a href="#" data-trigger-switch="switch-pushes-regatta-changed-my" class="pb-2 a-switch-pushes-channel-my">
+				<i class="fa font-14 fa-calendar-check rounded-s bg-highlight color-white"></i>
+				<span>Regatta verschoben (meine)</span>
+				<span class="badge bg-red2-dark color-white"></span>
+				<div class="custom-control scale-switch ios-switch">
+					<input type="checkbox" class="ios-input" id="switch-pushes-regatta-changed-my">
+					<label class="custom-control-label" for="switch-pushes-regatta-changed-my"></label>
+				</div>
+			</a>
+			<a href="#" data-trigger-switch="switch-pushes-regatta-changed-all" class="pb-2 a-switch-pushes-channel-all">
+				<i class="fa font-14 fa-calendar-check rounded-s bg-highlight color-white"></i>
+				<span>Regatta verschoben (alle)</span>
+				<div class="custom-control scale-switch ios-switch">
+					<input type="checkbox" class="ios-input" id="switch-pushes-regatta-changed-all">
+					<label class="custom-control-label" for="switch-pushes-regatta-changed-all"></label>
+				</div>
+			</a>
+			<a href="#" data-trigger-switch="switch-pushes-result-ready-my" class="pb-2 a-switch-pushes-channel-my">
+				<i class="fa font-14 fa-poll rounded-s bg-highlight color-white"></i>
+				<span>Ergebnisse verf&uuml;gbar (meine)</span>
+				<span class="badge bg-red2-dark color-white"></span>
+				<div class="custom-control scale-switch ios-switch">
+					<input type="checkbox" class="ios-input" id="switch-pushes-result-ready-my">
+					<label class="custom-control-label" for="switch-pushes-result-ready-my"></label>
+				</div>
+			</a>
+			<a href="#" data-trigger-switch="switch-pushes-result-ready-all" class="pb-2 a-switch-pushes-channel-all">
+				<i class="fa font-14 fa-poll rounded-s bg-highlight color-white"></i>
+				<span>Ergebnisse verf&uuml;gbar (alle)</span>
+				<div class="custom-control scale-switch ios-switch">
+					<input type="checkbox" class="ios-input" id="switch-pushes-result-ready-all">
+					<label class="custom-control-label" for="switch-pushes-result-ready-all"></label>
+				</div>
+			</a>
+			<a href="#" data-trigger-switch="switch-pushes-meldeschluss" class="pb-2 a-switch-pushes-channel-my">
+				<i class="fa font-14 fa-file-signature rounded-s bg-highlight color-white"></i>
+				<span>Melde-Erinnerungen</span>
+				<span class="badge bg-red2-dark color-white"></span>
+				<div class="custom-control scale-switch ios-switch">
+					<input type="checkbox" class="ios-input" id="switch-pushes-meldeschluss">
+					<label class="custom-control-label" for="switch-pushes-meldeschluss"></label>
+				</div>
+			</a>
+		</div>
+	</div>
+</div>
+
+<div id="menu-developer" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="360">
 	<div class="menu-title"><h1>Entwickler-Optionen</h1><p class="color-highlight">Version <?php echo PWA_VERSION; ?></p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
 	<div class="divider divider-margins mb-n2"></div>
 	<div class="content">
 		<div class="list-group list-custom-small">
-			<a href="https://info.ostertun.net/regatten/beta">
+			<a href="https://github.com/ostertun/RegattenApp/wiki">
 				<i class="fa font-14 fa-info rounded-s bg-highlight color-white"></i>
-				<span>Infos zur BETA</span>
+				<span>App-Wiki</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
-			<a href="javascript:resetDb(false);">
+			<a href="javascript:deleteDb();">
 				<i class="fa font-14 fa-database rounded-s bg-highlight color-white"></i>
 				<span>Reset Database</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
-			<a href="javascript:resetCache();">
+			<a href="javascript:deleteCache();">
 				<i class="fa font-14 fa-trash-alt rounded-s bg-highlight color-white"></i>
 				<span>Reset Cache</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
-			<a href="https://report.regatten.net/" class="border-0">
+			<a href="https://github.com/ostertun/RegattenApp/issues">
 				<i class="fa font-14 fa-bug rounded-s bg-highlight color-white"></i>
 				<span>Problem melden</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
+			<a href="#" onclick="mobileConsole.displayConsole(); return false;" class="border-0 menu-close">
+				<i class="fa font-14 fa-terminal rounded-s bg-highlight color-white"></i>
+				<span>Console anzeigen</span>
+				<i class="fa fa-angle-right"></i>
+			</a>
 		</div>
 	</div>
 </div>
@@ -181,7 +266,7 @@
 		<p class="text-center">
 			Momentan kannst Du Dich leider nicht in der App registrieren.<br>
 			Das ist aber kein Problem, registriere Dich einfach kostenlos auf unserer Website!
-		</p>        
+		</p>
 		<a href="https://regatten.net/de/signup" class="btn btn-center-xl btn-m shadow-xl rounded-s bg-highlight font-900 text-center">Registrieren</a>
 		<p class="text-center font-10 bottom-0">Du kannst Dich danach in dieser App anmelden.</p>
 	</div>
@@ -197,7 +282,7 @@
 			Vielen Dank f&uuml;r Deine Unterst&uuml;tzung!
 		</p>
 		<p>
-			Mehr Informationen findest <a href="https://info.ostertun.net/regatten/beta">hier</a>.
+			Mehr Informationen findest Du <a href="https://info.ostertun.net/regatten/beta">hier</a>.
 		</p>
 		<p>
 			Mit der Nutzung dieser App erkl&auml;rst Du Dich au&szlig;erdem damit einverstanden, dass wir Cookies einsetzen.
@@ -212,8 +297,8 @@
 		<h1 class="text-center mt-5 font-900">Update Verfügbar</h1>
 		<p class="text-center">
 			Eine neue Version unserer App ist verf&uuml;gbar. Keine Sorge, Du musst nichts machen. Wir aktuallisieren den Inhalt in wenigen Sekunden.
-		</p>        
+		</p>
 		<a href="#" class="page-update btn btn-center-xl btn-m shadow-xl rounded-s bg-highlight font-900 text-center">Update</a>
 		<p class="text-center font-10 bottom-0">Die App wird neu laden und das Update ist abgeschlossen.</p>
 	</div>
-</div>
+</div>

server/page/wrapper.php

@@ -1,7 +1,8 @@
 <!DOCTYPE HTML>
 <html lang="de">
-	
+
 	<head>
+		<script type="text/javascript" src="<?php echo SERVER_ADDR; ?>/client/scripts/mobileconsole.js"></script>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
@@ -16,36 +17,36 @@
 		<link rel="icon" type="image/x-icon" href="<?php echo SERVER_ADDR; ?>/client/app/icons/favicon.ico">
 		<link rel="apple-touch-icon" sizes="180x180" href="<?php echo SERVER_ADDR; ?>/client/app/icons/icon-192x192.png">
 	</head>
-	
+
 	<body class="detect-theme" data-background="none" data-highlight="blue2">
-		
+
 		<div id="preloader"><div class="spinner-border color-highlight" role="status"></div></div>
-		
+
 		<div id="page">
-			
+
 			<?php include(__DIR__ . '/headerfooter.php'); ?>
-			
+
 			<!--start of page content, add your stuff here-->
 			<div class="page-content header-clear-medium">
 				<?php echo $sp['output']; ?>
 			</div>
 			<!--end of page content, off canvas elements here-->
-			
+
 			<?php include(__DIR__ . '/menus.php'); ?>
-			
+
 			<?php echo $sp['menus']; ?>
-			
+
 			<?php
 				if ($site == 'index') {
 					include(__DIR__ . '/install.php');
 				}
 			?>
-			
+
 			<!--end of div id page-->
 		</div>
-		
+
 		<?php echo $sp['scripts']; ?>
-		
+
 		<script type="text/javascript" src="<?php echo SERVER_ADDR; ?>/client/scripts/jquery.js"></script>
 		<script type="text/javascript" src="<?php echo SERVER_ADDR; ?>/client/scripts/bootstrap.min.js"></script>
 		<script type="text/javascript" src="<?php echo SERVER_ADDR; ?>/client/scripts/strings.js.php"></script>
@@ -55,5 +56,5 @@
 		<script type="text/javascript" src="<?php echo SERVER_ADDR; ?>/client/scripts/custom.js.php"></script>
 		<script type="text/javascript" src="<?php echo SERVER_ADDR; ?>/client/scripts/pwa.js.php"></script>
 	</body>
-	
-</html>
+
+</html>

server/scripts/boats.js

@@ -5,18 +5,64 @@ var page = 1;
 var pageCount = 0;
 const showCount = 25;
 
+async function onEditBoatnameClick() {
+	var id = $('#button-editboatname').attr('data-boat-id');
+	var name = $('#input-editboatname').val();
+	if (name != '') {
+		showLoader();
+		$.ajax({
+			url: QUERY_URL + 'add_boatname',
+			method: 'POST',
+			data: {
+				boat: id,
+				name: name
+			},
+			error: function (xhr, status, error) {
+				if (xhr.status == 0) {
+					toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um den Bootsnamen zu bearbeiten');
+				} else {
+					console.log('EditBoatname: unbekannter Fehler', status, error);
+					console.log(xhr);
+					toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
+				}
+				hideLoader();
+			},
+			success: function (data, status, xhr) {
+				if ('status' in data) {
+					if (data.status == 'added') {
+						toastOk('Bootsnamen erfolgreich hinzugefügt');
+						sync();
+					} else {
+						toastInfo('Wir prüfen Deine Anfrage und korrigieren den Bootsnamen schnellstmöglich', 5000);
+					}
+				} else {
+					toastOk('Erfolgreich');
+				}
+				hideLoader();
+			}
+		});
+	}
+	$('#menu-editboatname').hideMenu();
+}
+
 async function onListClicked(id) {
 	var boat = await dbGetData('boats', id);
 	
 	$('#menu-boat').find('.menu-title').find('p').text(boat.sailnumber);
 	
 	// Edit Boatname
-	// TODO: create menu for edit boatname
+	$('#button-editboatname').attr('data-boat-id', boat.id);
+	$('#menu-editboatname').find('.menu-title').find('p').text(boat.sailnumber);
 	if (boat['name'] == '') {
 		$('#menu-item-boatname').find('span').text('Bootsnamen hinzufügen');
+		$('#menu-editboatname').find('.menu-title').find('h1').text('Bootsnamen hinzufügen');
+		$('#input-editboatname').val('');
 	} else {
 		$('#menu-item-boatname').find('span').text('Bootsnamen bearbeiten');
+		$('#menu-editboatname').find('.menu-title').find('h1').text('Bootsnamen bearbeiten');
+		$('#input-editboatname').val(boat.name);
 	}
+	$('#input-editboatname').trigger('focusin').trigger('focusout');
 	
 	// club website
 	var clubwebsite = '';
@@ -86,6 +132,8 @@ var siteScript = async function() {
 		firstCall = false;
 		initPagination();
 		$('#input-search').on('input', reSearch);
+		$('#menu-item-boatname').click(function(){ $('#menu-boat').hideMenu(); $('#menu-editboatname').showMenu(); });
+		$('#button-editboatname').click(onEditBoatnameClick);
 	}
 	
 	var results = await dbGetData('boats');

server/scripts/calc.js

@@ -42,7 +42,7 @@ function addRace() {
 	var m = parseFloat($('#input-m').val());
 	var fb = parseFloat($('#input-fb').val());
 	var pl = parseFloat($('#input-pl').val().replace(',', '.'));
-	
+
 	if (isNaN(rlf) || (rlf < 1) || (rlf > 1.6)) {
 		toastError('RLF ungültig');
 		return;
@@ -59,7 +59,7 @@ function addRace() {
 		toastError('pl ungültig');
 		return;
 	}
-	
+
 	var race = {
 		rlf: rlf,
 		m: m,
@@ -67,12 +67,12 @@ function addRace() {
 		pl: pl,
 		rlp: (100 * rlf * ((fb + 1 - pl) / fb))
 	};
-	
-	$('#input-rlf').val('');
-	$('#input-m').val('');
-	$('#input-fb').val('');
-	$('#input-pl').val('');
-	
+
+	$('#input-rlf').val('').trigger('focusin').trigger('focusout');
+	$('#input-m').val('').trigger('focusin').trigger('focusout');
+	$('#input-fb').val('').trigger('focusin').trigger('focusout');
+	$('#input-pl').val('').trigger('focusin').trigger('focusout');
+
 	races.push(race);
 	reCalc();
 }
@@ -89,4 +89,4 @@ var siteScript = async function () {
 	}
 	reCalc();
 	hideLoader();
-}
+}

server/scripts/contact.js

@@ -0,0 +1,49 @@
+function sendMessage() {
+	var name = $('#input-name').val();
+	var email = $('#input-email').val();
+	var subject = $('#input-subject').val();
+	var message = $('#input-message').val();
+
+	if ((name == '') || (email == '') || (subject == '') || (message == '')) {
+		toastError('Bitte fülle alle Felder aus!');
+		return;
+	}
+
+	showLoader();
+	$.ajax({
+		url: QUERY_URL + 'contact',
+		method: 'POST',
+		data: {
+			name: name,
+			email: email,
+			subject: subject,
+			message: message
+		},
+		error: function (xhr, status, error) {
+			if (xhr.status == 0) {
+				toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um eine Nachricht zu versenden');
+			} else {
+				console.log('Contact: unbekannter Fehler', status, error);
+				console.log(xhr);
+				toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
+			}
+			hideLoader();
+		},
+		success: function (data, status, xhr) {
+			toastOk('Nachricht erfolgreich versandt!');
+			$('#input-subject').val('').trigger('focusin').trigger('focusout');
+			$('#input-message').val('').trigger('focusin').trigger('focusout');
+			hideLoader();
+		}
+	});
+}
+
+var siteScript = async function () {
+	if (isLoggedIn()) {
+		var user = await dbGetData('users', USER_ID);
+		$('#input-name').val(user.username).trigger('focusin').trigger('focusout');
+		$('#input-email').val(user.email).trigger('focusin').trigger('focusout');
+	}
+	$('#button-send').click(sendMessage);
+	hideLoader();
+}

server/scripts/index.js

@@ -2,12 +2,12 @@ var today;
 
 var siteScript = async function() {
 	today = getToday();
-	
+
 	if (isLoggedIn()) {
 		$('#card-notloggedin').hide();
-		
+
 		var user = await dbGetData('users', localStorage.getItem('auth_user'));
-		
+
 		// Favorites
 		var watched = [];
 		for (var i = 1; i <= 5; i ++) {
@@ -46,7 +46,7 @@ var siteScript = async function() {
 			$('#p-favorites').show();
 		}
 		$('#card-favorites').show();
-		
+
 		// Your next
 		var planningsDB = await dbGetDataIndex('plannings', 'user', user.id);
 		var minDate = getToday();
@@ -75,35 +75,35 @@ var siteScript = async function() {
 			for (i in plannings) {
 				var planning = plannings[i];
 				var regatta = planning.regatta;
-				
+
 				if (regatta['length'] < 1) continue;
-				
+
 				var club = null;
 				if (regatta['club'] != null)
 					club = await dbGetData('clubs', regatta['club']);
 				var dateFrom = regatta['dateFrom'];
 				var dateTo = regatta['dateTo'];
-				
+
 				// output
-				
+
 				list += '<div onclick="onRegattaClicked(' + regatta['id'] + ');">';
-				
+
 				// ZEILE 1
 				// Name
 				list += '<div><b>' + (regatta['canceled'] == 1 ? '<s>' : '') + regatta['name'] + (regatta['canceled'] == 1 ? '</s>' : '') + '</b></div>';
-				
+
 				// ZEILE 2
 				list += '<div>';
-				
+
 				// Number
 				list += '<div>' + ((regatta['number'] != null) ? ('# ' + regatta['number']) : '') + '</div>';
-				
+
 				// Club
 				list += '<div>' + ((club != null) ? club['kurz'] : '') + '</div>';
-				
+
 				// Special
 				list += '<div>' + regatta['special'] + '</div>';
-				
+
 				// Icons
 				var icons = [];
 				if (regatta['info'] != '')
@@ -120,8 +120,10 @@ var siteScript = async function() {
 								ms = parseDate(regatta['meldungSchluss']);
 							}
 							var diff = Math.round((ms - today) / 86400000);
-							if ((ms >= today) && (diff < 7)) {
+							if (ms < today) {
 								color = ' color-red2-dark';
+							} else if (diff < 7) {
+								color = ' color-yellow2-dark';
 							}
 						}
 					}
@@ -134,18 +136,18 @@ var siteScript = async function() {
 					icons.push('<i class="fas fa-times color-red2-dark"></i>');
 				}
 				list += '<div class="color-green2-dark">' + icons.join('&ensp;') + '</div>';
-				
+
 				list += '</div>';
-				
+
 				// ZEILE 3
 				list += '<div>';
-				
+
 				// Date
 				list += '<div>' + formatDate("d.m.Y", dateFrom) + ' - ' + formatDate("d.m.Y", dateTo) + '</div>';
-				
+
 				// RLF
 				list += '<div>' + parseFloat(regatta['rlf']).toFixed(2) + '</div>';
-				
+
 				list += '</div></div>';
 			}
 			$('#div-yournext').html(list);
@@ -161,7 +163,7 @@ var siteScript = async function() {
 		$('#card-yournext').hide();
 		$('#card-notloggedin').show();
 	}
-	
+
 	// Next
 	var minDate = getToday();
 	minDate.setDate(minDate.getDate() - 1);
@@ -172,35 +174,35 @@ var siteScript = async function() {
 		list = '';
 		for (i in regattas) {
 			var regatta = regattas[i];
-			
+
 			if (regatta['length'] < 1) continue;
-			
+
 			var club = null;
 			if (regatta['club'] != null)
 				club = await dbGetData('clubs', regatta['club']);
 			var plannings = await dbGetDataIndex('plannings', 'regatta', regatta['id']);
 			var dateFrom = regatta['dateFrom'];
 			var dateTo = regatta['dateTo'];
-			
+
 			// output
 			list += '<div onclick="onRegattaClicked(' + regatta['id'] + ');">';
-			
+
 			// ZEILE 1
 			// Name
 			list += '<div><b>' + (regatta['canceled'] == 1 ? '<s>' : '') + regatta['name'] + (regatta['canceled'] == 1 ? '</s>' : '') + '</b></div>';
-			
+
 			// ZEILE 2
 			list += '<div>';
-			
+
 			// Number
 			list += '<div>' + ((regatta['number'] != null) ? ('# ' + regatta['number']) : '') + '</div>';
-			
+
 			// Club
 			list += '<div>' + ((club != null) ? club['kurz'] : '') + '</div>';
-			
+
 			// Special
 			list += '<div>' + regatta['special'] + '</div>';
-			
+
 			// Icons
 			var icons = [];
 			if (regatta['info'] != '')
@@ -227,8 +229,10 @@ var siteScript = async function() {
 							ms = parseDate(regatta['meldungSchluss']);
 						}
 						var diff = Math.round((ms - today) / 86400000);
-						if ((ms >= today) && (diff < 7)) {
+						if (ms < today) {
 							color = ' color-red2-dark';
+						} else if (diff < 7) {
+							color = ' color-yellow2-dark';
 						}
 					}
 				}
@@ -241,18 +245,18 @@ var siteScript = async function() {
 				icons.push('<i class="fas fa-times color-red2-dark"></i>');
 			}
 			list += '<div class="color-green2-dark">' + icons.join('&ensp;') + '</div>';
-			
+
 			list += '</div>';
-			
+
 			// ZEILE 3
 			list += '<div>';
-			
+
 			// Date
 			list += '<div>' + formatDate("d.m.Y", dateFrom) + ' - ' + formatDate("d.m.Y", dateTo) + '</div>';
-			
+
 			// RLF
 			list += '<div>' + parseFloat(regatta['rlf']).toFixed(2) + '</div>';
-			
+
 			list += '</div></div>';
 		}
 		$('#div-next').html(list);
@@ -262,7 +266,7 @@ var siteScript = async function() {
 		$('#div-next').hide();
 		$('#p-next').show();
 	}
-	
+
 	// Last
 	var minDate = getToday();
 	minDate.setDate(minDate.getDate() - 14);
@@ -279,35 +283,35 @@ var siteScript = async function() {
 		list = '';
 		for (i in regattas) {
 			var regatta = regattas[i];
-			
+
 			if (regatta['length'] < 1) continue;
-			
+
 			var club = null;
 			if (regatta['club'] != null)
 				club = await dbGetData('clubs', regatta['club']);
 			var dateFrom = regatta['dateFrom'];
 			var dateTo = regatta['dateTo'];
-			
+
 			// output
-			
+
 			list += '<div onclick="onRegattaClicked(' + regatta['id'] + ');">';
-			
+
 			// ZEILE 1
 			// Name
 			list += '<div><b>' + (regatta['canceled'] == 1 ? '<s>' : '') + regatta['name'] + (regatta['canceled'] == 1 ? '</s>' : '') + '</b></div>';
-			
+
 			// ZEILE 2
 			list += '<div>';
-			
+
 			// Number
 			list += '<div>' + ((regatta['number'] != null) ? ('# ' + regatta['number']) : '') + '</div>';
-			
+
 			// Club
 			list += '<div>' + ((club != null) ? club['kurz'] : '') + '</div>';
-			
+
 			// Special
 			list += '<div>' + regatta['special'] + '</div>';
-			
+
 			// Icons
 			var icons = [];
 			if (regatta['info'] != '')
@@ -320,18 +324,18 @@ var siteScript = async function() {
 				icons.push('<i class="fas fa-poll"></i>');
 			}
 			list += '<div class="color-green2-dark">' + icons.join('&ensp;') + '</div>';
-			
+
 			list += '</div>';
-			
+
 			// ZEILE 3
 			list += '<div>';
-			
+
 			// Date
 			list += '<div>' + formatDate("d.m.Y", dateFrom) + ' - ' + formatDate("d.m.Y", dateTo) + '</div>';
-			
+
 			// RLF
 			list += '<div>' + parseFloat(regatta['rlf']).toFixed(2) + '</div>';
-			
+
 			list += '</div></div>';
 		}
 		$('#div-last').html(list);
@@ -341,6 +345,6 @@ var siteScript = async function() {
 		$('#div-last').hide();
 		$('#p-last').show();
 	}
-	
+
 	hideLoader();
-}
+}

server/scripts/news.js

@@ -0,0 +1,44 @@
+async function onNewsClicked(id) {
+	var newsEntry = await dbGetData('news', id);
+	if (newsEntry == null) return;
+
+	$('#menu-news').css('height', '80%');
+	$('#menu-news').css('width', '90%');
+	$('#menu-news').find('.menu-title').find('p').text(newsEntry.title);
+	$('#menu-news').find('.content').addClass('pb-3');
+	$('#menu-news').find('.content').html(newsEntry.html);
+
+	$('#menu-news').showMenu();
+}
+
+function addCard(newsEntry) {
+	var content = '<h2>' + newsEntry.title + '</h2>';
+	content += '<p class="mb-2"><i>' + formatDate('d.m.Y', newsEntry.date) + '</i></p>';
+	content += '<p class="mb-0">' + newsEntry.description.replace('\n', '<br>') + '</p>';
+	if (newsEntry.html != '') {
+		content += '<a class="btn btn-full rounded-s text-uppercase font-900 shadow-m bg-highlight mt-3" href="#" onclick="onNewsClicked(' + newsEntry.id + '); return false;">Mehr lesen</a>';
+	}
+
+	$('.page-content').append(cardTemplate.replace('%ID%', 'card-news-' + newsEntry.id).replace('%CONTENT%', content));
+}
+
+var siteScript = async function() {
+	$('.card-news').remove();
+	var news = await dbGetData('news');
+	news.sort(function (a,b) {
+		return b.date.localeCompare(a.date);
+	});
+	var now = new Date();
+	var lastYear = new Date();
+	lastYear.setFullYear(lastYear.getFullYear() - 1);
+	for (var n in news) {
+		var newsEntry = news[n];
+		newsEntry.date = new Date(Date.parse(newsEntry.date));
+		if (newsEntry.date > now) continue;
+		if (newsEntry.date < lastYear) break;
+		addCard(newsEntry);
+	}
+	dbSettingsSet('news_read_' + BOATCLASS, now);
+	updateNewsBadge();
+	hideLoader();
+}

server/scripts/rank.js

@@ -11,7 +11,7 @@ async function onRankingClicked(id) {
 		}
 	}
 	if (sailor == null) return;
-	
+
 	$('#menu-rank').find('.menu-title').find('p').text(sailor.name);
 	if (lastRanking != null) {
 		var lastRank;
@@ -25,83 +25,83 @@ async function onRankingClicked(id) {
 	} else {
 		$('#menu-item-text').hide();
 	}
-	
+
 	list = '';
 	for (var i in sailor.regattas) {
 		var entry = sailor.regattas[i];
 		var regatta = entry.regatta;
 		var boat = await dbGetData('boats', entry.boat);
-		
+
 		var dateFrom = parseDate(regatta.date);
 		var dateTo = parseDate(regatta.date);
 		dateTo.setDate(dateTo.getDate() + Math.max(parseInt(regatta.length) - 1, 0));
-		
+
 		list += '<div onclick="onDetailClicked(' + regatta.id + ')">';
-		
+
 		// ZEILE 1
 		list += '<div><b>' + regatta.name + '</b></div>';
-		
+
 		// ZEILE 2
 		list += '<div>';
-		
+
 		// DATE
 		list += '<div>' + formatDate('d.m.Y', dateFrom) + ' - ' + formatDate('d.m.Y', dateTo) + '</div>';
-		
+
 		// m
 		list += '<div>m: ' + entry.m + '</div>';
-		
+
 		// rlf
 		list += '<div>RLF: ' + parseFloat(regatta.rlf).toFixed(2) + '</div>';
-		
+
 		list += '</div>';
-		
+
 		// ZEILE 3
 		list += '<div>';
-		
+
 		// Place
 		list += '<div>Platz ' + entry.place + ' / ' + entry.fb + '</div>';
-		
+
 		// rlp
 		var color;
 		if (entry.used == 0) { color = 'color-red2-dark'; }
 		else if (entry.used == entry.m) { color = 'color-green2-dark'; }
 		else { color = 'color-yellow2-dark'; }
 		list += '<div>Punkte: ' + entry.used + ' x <b class="' + color + '">' + parseFloat(entry.rlp).toFixed(2) + '</b></div>';
-		
+
 		list += '</div>';
-		
+
 		// ZEILE 4
 		list += '<div>';
-		
+
 		// Sailnumber
 		list += '<div>' + boat.sailnumber + '</div>';
-		
+
 		// Boatname
 		list += '<div>' + boat.name + '</div>';
-		
+
 		list += '</div>';
-		
+
 		// ZEILE 5...
 		var crew = entry.crew.split(',');
 		for (var c in crew) {
 			var cr = await dbGetData('sailors', crew[c]);
 			if (cr != null) {
 				list += '<div>';
-				
+
 				// Name
 				list += '<div>' + cr.name + '</div>';
-				
+
 				// Year
 				list += '<div>' + ((cr.year != null) ? ('(' + cr.year + ')') : '') + '</div>';
-				
+
 				list += '</div>';
 			}
 		}
-		
+
 		list += '</div>';
 	}
 	$('#div-details').html(list);
-	
+
 	$('#menu-rank').showMenu();
 	$('#menu-rank').scrollTop(0);
 }
@@ -111,8 +111,8 @@ async function selectChange(callSiteScript = true) {
 	var year = parseInt($('#select-year').val());
 	if (type == "user") {
 		$('#select-year').parent().hide();
-		$('#input-from').parent().show();
-		$('#input-to').parent().show();
+		$('#input-from').trigger('focusin').trigger('focusout').parent().show();
+		$('#input-to').trigger('focusin').trigger('focusout').parent().show();
 		$('#input-jugend').parent().parent().show();
 		$('#input-jugstrict').parent().parent().show();
 		$('#button-show').show();
@@ -123,7 +123,7 @@ async function selectChange(callSiteScript = true) {
 		$('#input-jugend').parent().parent().hide();
 		$('#input-jugstrict').parent().parent().hide();
 		$('#button-show').hide();
-		
+
 		var from, to, jugend, jugstrict;
 		switch (type) {
 			case 'year':
@@ -168,14 +168,26 @@ async function selectChange(callSiteScript = true) {
 				}
 				break;
 		}
-		
+
 		$('#input-from').val(from);
 		$('#input-to').val(to);
 		$('#input-jugend').prop('checked', jugend);
 		$('#input-jugstrict').prop('checked', jugstrict);
-		
-		if (callSiteScript && (typeof siteScript === 'function'))
+
+		if (callSiteScript && (typeof siteScript === 'function')) {
+			history.replaceState(null, '', '?type=' + type + '&year=' + year)
 			siteScript();
+		}
+	}
+}
+
+function buttonShowPressed() {
+	if (typeof siteScript === 'function') {
+		var chboxes = '';
+		if ($('#input-jugend').prop('checked')) chboxes += '&jugend=on'
+		if ($('#input-jugstrict').prop('checked')) chboxes += '&jugstrict=on'
+		history.replaceState(null, '', '?type=user&from=' + $('#input-from').val() + "&to=" + $('#input-to').val() + chboxes)
+		siteScript();
 	}
 }
 
@@ -186,10 +198,23 @@ function initSelects() {
 	if (year === null) year = new Date().getFullYear();
 
 	$('#select-type').val(type);
-	
+
 	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
 	$('#select-year').val(year);
-	
+
+	if (type == "user") {
+		var from = findGetParameter('from');
+		var to = findGetParameter('to');
+		if (from === null) from = formatDate('Y-m-d')
+		if (to === null) to = formatDate('Y-m-d')
+		$('#input-from').val(from).trigger('focusin').trigger('focusout');
+		$('#input-to').val(to).trigger('focusin').trigger('focusout');
+		var jugend = findGetParameter('jugend');
+		var jugstrict = findGetParameter('jugstrict');
+		$('#input-jugend').prop('checked', jugend !== null);
+		$('#input-jugstrict').prop('checked', jugstrict !== null);
+	}
+
 	selectChange(false);
 }
 
@@ -218,17 +243,17 @@ var siteScript = async function() {
 		initSelects();
 		$('#select-type').change(selectChange);
 		$('#select-year').change(selectChange);
-		$('#button-show').click(siteScript);
+		$('#button-show').click(buttonShowPressed);
 		$('#input-search').on('input', drawList);
 	}
-	
+
 	var minDate = parseDate($('#input-from').val());
 	var maxDate = parseDate($('#input-to').val());
 	var jugend = $('#input-jugend').prop('checked');
 	var jugstrict = $('#input-jugstrict').prop('checked');
 	var dbRanking = await dbGetRanking(minDate, maxDate, jugend, jugstrict);
 	ranking = dbRanking[0];
-	
+
 	lastRanking = null;
 	if (($('#select-type').val() == 'year') || ($('#select-type').val() == 'youth')) {
 		lastRanking = {};
@@ -240,9 +265,9 @@ var siteScript = async function() {
 			lastRanking[lDbRanking[i].id] = lDbRanking[i].rank;
 		}
 	}
-	
+
 	var selectedYear = $('#select-year').val();
-	
+
 	var years = await dbGetData('years');
 	years.sort(function (a, b) {
 		if (a['year'] > b['year']) return -1;
@@ -256,7 +281,7 @@ var siteScript = async function() {
 	}
 	$('#select-year').html(options);
 	$('#select-year').val(selectedYear);
-	
+
 	if (dbRanking[1].length > 0) {
 		$('#card-noresults').show();
 		list = '';
@@ -269,18 +294,18 @@ var siteScript = async function() {
 	} else {
 		$('#card-noresults').hide();
 	}
-	
+
 	var count = ranking.length;
 	if (count > 0) {
 		$('#input-search').parent().show();
-		
+
 		var dsvEnd = false;
-		
+
 		rows = [];
-		
+
 		for (id in ranking) {
 			var entry = ranking[id];
-			
+
 			for (var i in entry.regattas) {
 				entry.regattas[i].regatta = await dbGetData('regattas', entry.regattas[i].regatta);
 			}
@@ -288,26 +313,26 @@ var siteScript = async function() {
 			entry.regattas.sort(function (a,b) {
 				return a.regatta.date.localeCompare(b.regatta.date);
 			});
-			
+
 			var club = null;
 			if (entry['club'] != null)
 				club = await dbGetData('clubs', entry['club']);
-			
+
 			var row = { keywords: [], content: '' };
 			row.keywords.push(entry['name']);
 			if (entry['year'] != null) row.keywords.push(entry['year']);
 			if (club != null) row.keywords.push(club['kurz'], club['name']);
-			
+
 			if (!dsvEnd && (entry.m < 9)) {
 				rows.push(null);
 				dsvEnd = true;
 			}
-			
+
 			row.content += '<div onclick="onRankingClicked(' + entry['id'] + ');">';
-			
+
 			// ZEILE 1
 			row.content += '<div>';
-			
+
 			// Rank
 			var icon = '';
 			if (lastRanking != null) {
@@ -321,39 +346,39 @@ var siteScript = async function() {
 				icon = '<i class="font-16 fas ' + icon + '" style="width: 1.1em; text-align: center;"></i> ';
 			}
 			row.content += '<div>' + icon + '<b>' + entry.rank + '.</b></div>';
-			
+
 			// m
 			row.content += '<div>m = ' + entry.m + '</div>';
-			
+
 			// rlp
 			row.content += '<div>' + entry.rlp.toFixed(3) + '</div>';
-			
+
 			row.content += '</div>';
-			
+
 			// ZEILE 2
 			row.content += '<div>';
-			
+
 			// Name
 			row.content += '<div><b>' + entry.name + '</b></div>';
-			
+
 			// Year
 			row.content += '<div>' + ((entry.year != null) ? ('(' + entry.year + ')') : '') + '</div>';
-			
+
 			row.content += '</div></div>';
-			
+
 			rows.push(row);
 		}
-		
+
 		if (!dsvEnd) {
 			rows.push(null);
 		}
-		
+
 		drawList();
-		
+
 	} else {
 		$('#div-rank').html('Keine Ergebnisse gefunden!');
 		$('#input-search').parent().hide();
 	}
-	
+
 	hideLoader();
-}
+}

server/scripts/regatta_plan.js

@@ -39,7 +39,7 @@ var siteScript = async function() {
 			tbody += '<td>' + (await dbGetData('users', planning.user)).username + '</td>';
 			
 			if (planning.steuermann != null) {
-				tbody += '<td>' + (await dbGetData('users', planning.user)).username + '</td>';
+				tbody += '<td>' + (await dbGetData('sailors', planning.steuermann)).name + '</td>';
 			} else {
 				tbody += '<td>(noch unklar)</td>';
 			}

server/scripts/regattas.js

@@ -1,29 +1,47 @@
 function selectChange(callSiteScript = true) {
 	var val = $('#select-year').val();
 	if (val == "user") {
-		$('#input-from').parent().show();
-		$('#input-to').parent().show();
+		$('#input-from').trigger('focusin').trigger('focusout').parent().show();
+		$('#input-to').trigger('focusin').trigger('focusout').parent().show();
 		$('#button-show').show();
 	} else {
 		$('#input-from').parent().hide();
 		$('#input-to').parent().hide();
 		$('#button-show').hide();
-		
+
 		$('#input-from').val(val + '-01-01');
 		$('#input-to').val(val + '-12-31');
-		
-		if (callSiteScript && (typeof siteScript === 'function'))
+
+		if (callSiteScript && (typeof siteScript === 'function')) {
+			history.replaceState(null, '', '?year=' + val);
 			siteScript();
+		}
+	}
+}
+
+function buttonShowPressed() {
+	if (typeof siteScript === 'function') {
+		history.replaceState(null, '', '?year=user&from=' + $('#input-from').val() + "&to=" + $('#input-to').val())
+		siteScript();
 	}
 }
 
 function initYear() {
 	var year = findGetParameter('year');
 	if (year === null) year = new Date().getFullYear();
-	
+
 	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
 	$('#select-year').val(year);
-	
+
+	if (year == "user") {
+		var from = findGetParameter('from');
+		var to = findGetParameter('to');
+		if (from === null) from = formatDate('Y-m-d')
+		if (to === null) to = formatDate('Y-m-d')
+		$('#input-from').val(from).trigger('focusin').trigger('focusout');
+		$('#input-to').val(to).trigger('focusin').trigger('focusout');
+	}
+
 	selectChange(false);
 }
 
@@ -50,12 +68,12 @@ var siteScript = async function() {
 		firstCall = false;
 		initYear();
 		$('#select-year').change(selectChange);
-		$('#button-show').click(siteScript);
+		$('#button-show').click(buttonShowPressed);
 		$('#input-search').on('input', drawList);
 	}
-	
+
 	today = getToday();
-	
+
 	var minDate = parseDate($('#input-from').val());
 	var maxDate = parseDate($('#input-to').val());
 	var regattas = await dbGetRegattasRange(minDate, maxDate);
@@ -65,9 +83,9 @@ var siteScript = async function() {
 		var results = await dbGetDataIndex('results', 'regatta', entry['id']);
 		regattaResults[entry['id']] = (results.length > 0);
 	}
-	
+
 	var selectedYear = $('#select-year').val();
-	
+
 	var years = await dbGetData('years');
 	years.sort(function (a, b) {
 		if (a['year'] > b['year']) return -1;
@@ -81,7 +99,7 @@ var siteScript = async function() {
 	}
 	$('#select-year').html(options);
 	$('#select-year').val(selectedYear);
-	
+
 	var count = regattas.length;
 	if (count > 0) {
 		if (count == 1) {
@@ -91,49 +109,49 @@ var siteScript = async function() {
 		}
 		$('#div-regattas').show();
 		$('#input-search').parent().show();
-		
+
 		var heute = false;
-		
+
 		rows = [];
-		
+
 		for (id in regattas) {
 			var entry = regattas[id];
 			var club = null;
 			if (entry['club'] != null)
 				club = await dbGetData('clubs', entry['club']);
 			var plannings = await dbGetDataIndex('plannings', 'regatta', entry['id']);
-			
+
 			var dateFrom = entry['dateFrom'];
 			var dateTo = entry['dateTo'];
-			
+
 			var row = { keywords: [], content: '' };
 			row.keywords.push(entry['name']);
 			if (entry['number'] != null) row.keywords.push(entry['number']);
 			if (club != null) row.keywords.push(club['kurz'], club['name']);
-			
+
 			if (!heute && (today <= dateFrom)) {
 				rows.push(null);
 				heute = true;
 			}
-			
+
 			row.content += '<div onclick="onRegattaClicked(' + entry['id'] + ');">';
-			
+
 			// ZEILE 1
 			// Name
 			row.content += '<div><b>' + (entry['canceled'] == 1 ? '<s>' : '') + entry['name'] + (entry['canceled'] == 1 ? '</s>' : '') + '</b></div>';
-			
+
 			// ZEILE 2
 			row.content += '<div>';
-			
+
 			// Number
 			row.content += '<div>' + ((entry['number'] != null) ? ('# ' + entry['number']) : '') + '</div>';
-			
+
 			// Club
 			row.content += '<div>' + ((club != null) ? club['kurz'] : '') + '</div>';
-			
+
 			// Special
 			row.content += '<div>' + entry['special'] + '</div>';
-			
+
 			// Icons
 			var icons = [];
 			if (entry['info'] != '')
@@ -160,8 +178,10 @@ var siteScript = async function() {
 							ms = parseDate(entry['meldungSchluss']);
 						}
 						var diff = Math.round((ms - today) / 86400000);
-						if ((ms >= today) && (diff < 7)) {
+						if (ms < today) {
 							color = ' color-red2-dark';
+						} else if (diff < 7) {
+							color = ' color-yellow2-dark';
 						}
 					}
 				}
@@ -178,12 +198,12 @@ var siteScript = async function() {
 				icons.push('<i class="fas fa-poll"></i>');
 			}
 			row.content += '<div class="color-green2-dark">' + icons.join('&ensp;') + '</div>';
-			
+
 			row.content += '</div>';
-			
+
 			// ZEILE 3
 			row.content += '<div>';
-			
+
 			// Date
 			if (entry['length'] < 1) {
 				if (formatDate('d.m', dateFrom) == '01.01') {
@@ -194,26 +214,26 @@ var siteScript = async function() {
 			} else {
 				row.content += '<div>' + formatDate("d.m.Y", dateFrom) + ' - ' + formatDate("d.m.Y", dateTo) + '</div>';
 			}
-			
+
 			// RLF
 			row.content += '<div>' + parseFloat(entry['rlf']).toFixed(2) + '</div>';
-			
+
 			row.content += '</div></div>';
-			
+
 			rows.push(row);
 		}
-		
+
 		if (!heute) {
 			rows.push(null);
 		}
-		
+
 		drawList();
-		
+
 	} else {
 		$('#p-count').html('Keine Regatten gefunden!');
 		$('#div-regattas').hide();
 		$('#input-search').parent().hide();
 	}
-	
+
 	hideLoader();
-}
+}

server/scripts/sailors.js

@@ -5,18 +5,64 @@ var page = 1;
 var pageCount = 0;
 const showCount = 25;
 
+async function onEditYearClick() {
+	var id = $('#button-edityear').attr('data-sailor-id');
+	var year = $('#input-edityear').val();
+	if (year != '') {
+		showLoader();
+		$.ajax({
+			url: QUERY_URL + 'add_year',
+			method: 'POST',
+			data: {
+				sailor: id,
+				year: year
+			},
+			error: function (xhr, status, error) {
+				if (xhr.status == 0) {
+					toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um den Jahrgang zu bearbeiten');
+				} else {
+					console.log('EditYear: unbekannter Fehler', status, error);
+					console.log(xhr);
+					toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
+				}
+				hideLoader();
+			},
+			success: function (data, status, xhr) {
+				if ('status' in data) {
+					if (data.status == 'added') {
+						toastOk('Jahrgang erfolgreich hinzugefügt');
+						sync();
+					} else {
+						toastInfo('Wir prüfen Deine Anfrage und korrigieren den Jahrgang schnellstmöglich', 5000);
+					}
+				} else {
+					toastOk('Erfolgreich');
+				}
+				hideLoader();
+			}
+		});
+	}
+	$('#menu-edityear').hideMenu();
+}
+
 async function onListClicked(id) {
 	var sailor = await dbGetData('sailors', id);
 	
 	$('#menu-sailor').find('.menu-title').find('p').text(sailor.name);
 	
 	// Edit Year
-	// TODO: create menu for edit year
+	$('#button-edityear').attr('data-sailor-id', sailor.id);
+	$('#menu-edityear').find('.menu-title').find('p').text(sailor.name);
 	if (sailor['year'] == null) {
 		$('#menu-item-year').find('span').text('Jahrgang hinzufügen');
+		$('#menu-edityear').find('.menu-title').find('h1').text('Jahrgang hinzufügen');
+		$('#input-edityear').val('');
 	} else {
 		$('#menu-item-year').find('span').text('Jahrgang bearbeiten');
+		$('#menu-edityear').find('.menu-title').find('h1').text('Jahrgang bearbeiten');
+		$('#input-edityear').val(sailor.year);
 	}
+	$('#input-edityear').trigger('focusin').trigger('focusout');
 	
 	// club website
 	var clubwebsite = '';
@@ -86,6 +132,8 @@ var siteScript = async function() {
 		firstCall = false;
 		initPagination();
 		$('#input-search').on('input', reSearch);
+		$('#menu-item-year').click(function(){ $('#menu-sailor').hideMenu(); $('#menu-edityear').showMenu(); });
+		$('#button-edityear').click(onEditYearClick);
 	}
 	
 	var results = await dbGetData('sailors');

server/templates/textarea.html

@@ -1,4 +1,4 @@
 <div class="input-style input-style-2 input-required $$css-class;">
 	<span class="color-highlight">$$placeholder;</span>
-	<textarea id="$$html-id;" class="form-control" placeholder="$$placeholder;">$$value;</textarea>
+	<textarea id="$$html-id;" class="form-control pt-3 pb-3" placeholder="$$placeholder;" style="height: 10em; line-height: 1.5em;">$$value;</textarea>
 </div>

server/version.php

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

service-worker.js.php

@@ -1,9 +1,9 @@
 <?php
-	
+
 	header('Content-Type: text/javascript');
-	
+
 	require_once(__DIR__ . '/server/config.php');
-	
+
 ?>
 importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
 
@@ -41,7 +41,7 @@ workbox.precaching.precacheAndRoute([
 		return $hash;
 	}
 	$hash = md5(getDirHash(__DIR__));
-	
+
 	$path = __DIR__ . '/server/content/';
 	$dir = opendir($path);
 	while ($file = readdir($dir)) {
@@ -50,21 +50,25 @@ workbox.precaching.precacheAndRoute([
 		echo "\t{url: '$file', revision: '$hash'},\n";
 	}
 	closedir($dir);
-	
+
 	// ASSETS
 	$filesToCache = [
 		'/manifest.json.php',
 	];
 	$dirsToCache = [
-		'/client',
+		'/client/app',
+		'/client/fonts/css',
+		'/client/fonts/webfonts',
+		'/client/images',
+		'/client/scripts',
+		'/client/styles',
 	];
-	
+
 	function addDir($path) {
 		global $filesToCache;
 		if ($dir = opendir(__DIR__ . $path)) {
 			while (($file = readdir($dir)) !== false) {
-				if ($file == '.') continue;
-				if ($file == '..') continue;
+				if (substr($file, 0, 1) == '.') continue;
 				if (is_dir(__DIR__ . $path . '/' . $file)) {
 					addDir($path . '/' . $file);
 				} else {
@@ -74,11 +78,11 @@ workbox.precaching.precacheAndRoute([
 			closedir($dir);
 		}
 	}
-	
+
 	foreach ($dirsToCache as $path) {
 		addDir($path);
 	}
-	
+
 	foreach ($filesToCache as $file) {
 		$revision = md5_file(__DIR__ . $file);
 		$file = SERVER_ADDR . $file;
@@ -104,4 +108,205 @@ workbox.routing.registerRoute(
 
 
 //Learn more about Service Workers and Configurations
-//https://developers.google.com/web/tools/workbox/
+//https://developers.google.com/web/tools/workbox/
+
+
+// DB
+
+function openDb() {
+	return new Promise(function(resolve) {
+		if (indexedDB) {
+			var request = indexedDB.open('regatten_app_db_<?php echo BOATCLASS; ?>');
+			request.onerror = function (e) {
+				console.log('[sW] Cannot open DB:', e.targer.errorCode);
+				resolve(null);
+			};
+			request.onupgradeneeded = function (e) {
+				console.log('[sW] DB does not exist');
+				e.target.transaction.abort();
+				resolve(null);
+			};
+			request.onsuccess = function (e) {
+				console.log('[sW] DB loaded');
+				var db = e.target.result;
+				db.onerror = function (e) {
+					console.log('[sW] DB Error:', e);
+				};
+				resolve(db);
+			}
+		} else {
+			resolve(null);
+		}
+	});
+}
+
+function dbSettingsGet(key) {
+	return new Promise(async function(resolve) {
+		var db = await openDb();
+		if (db !== null) {
+			var request = db.transaction('settings').objectStore('settings').get(key);
+			request.onsuccess = function (event) {
+				db.close();
+				console.log('[sW] DB closed');
+				resolve(typeof request.result != 'undefined' ? request.result.value : null);
+			}
+		} else {
+			resolve(null);
+		}
+	});
+}
+
+async function dbSettingsSet(key, value) {
+	var db = await openDb();
+	if (db != null) {
+		var os = db.transaction('settings', 'readwrite').objectStore('settings');
+		var request = os.put({ key: key, value: value});
+		request.onerror = function (event) {
+			console.log('[sW] Error while saving data to DB:', e);
+			db.close();
+			console.log('[sW] DB closed');
+		}
+		request.onsuccess = function (event) {
+			db.close();
+			console.log('[sW] DB closed');
+		}
+	}
+}
+
+
+
+
+// PUSHES
+
+function getEntry(data, index, defaultValue) {
+	return ((typeof data[index] !== "undefined") ? data[index] : defaultValue);
+}
+
+function isMyRegatta(id) {
+	return new Promise(async function (resolve) {
+		var regattas = await dbSettingsGet('myregattas_<?php echo BOATCLASS; ?>');
+		if (regattas == null) resolve(false);
+		else resolve(regattas.includes(id.toString()));
+	});
+}
+
+self.addEventListener('push', async function(event) {
+	console.log('[sW] Push received:', event.data.text());
+
+	var data;
+	try {
+		data = JSON.parse(event.data.text());
+	} catch(e) {
+		console.log(e);
+		data = undefined;
+	}
+
+	if (typeof data.type !== "undefined") {
+		switch (data.type) {
+			case 'notification':
+				if (typeof data.title === "undefined") break;
+				if (typeof data.body === "undefined") break;
+				if (typeof data.channel === "undefined") break;
+
+				// check channel
+				var okay = false;
+				switch (data.channel) {
+					case 'news':
+						if (await dbSettingsGet('notify_channel_<?php echo BOATCLASS; ?>_news')) okay = true;
+						break;
+					case 'regatta_changed':
+						if (await dbSettingsGet('notify_channel_<?php echo BOATCLASS; ?>_regatta_changed_all')) okay = true;
+						else if (await dbSettingsGet('notify_channel_<?php echo BOATCLASS; ?>_regatta_changed_my')) {
+							if (await isMyRegatta(getEntry(data, 'id', ''))) okay = true;
+						}
+						break;
+					case 'result_ready':
+						if (await dbSettingsGet('notify_channel_<?php echo BOATCLASS; ?>_result_ready_all')) okay = true;
+						else if (await dbSettingsGet('notify_channel_<?php echo BOATCLASS; ?>_result_ready_my')) {
+							if (await isMyRegatta(getEntry(data, 'id', ''))) okay = true;
+						}
+						break;
+					case 'meldeschluss':
+						if (await dbSettingsGet('notify_channel_<?php echo BOATCLASS; ?>_meldeschluss')) {
+							if (await isMyRegatta(getEntry(data, 'id', ''))) okay = true;
+						}
+						break;
+					default:
+						console.log('Unknown channel:', data.channel);
+						break;
+				}
+				if (!okay) {
+					console.log('Notification channel not subscribed');
+					return;
+				}
+
+				const options = {
+					data: data,
+					body: data.body,
+					icon: getEntry(data, 'icon', '<?php echo SERVER_ADDR; ?>/client/app/icons/icon-512x512.png'),
+					badge: '<?php echo SERVER_ADDR; ?>/client/app/icons/badge-128x128.png',
+					vibrate: [500,100,500]
+				};
+				if ((image = getEntry(data, 'image', null)) !== null) {
+					options.image = image;
+				}
+
+				// Force refresh on next app open
+				var db = await openDb();
+				if (db != null) {
+					var os = db.transaction('update_times', 'readwrite').objectStore('update_times');
+					var request = os.put({ table: 'last_sync', time: 0 });
+					request.onerror = function (event) {
+						console.log('[sW] Error while saving data to DB:', e);
+						db.close();
+						console.log('[sW] DB closed');
+					}
+					request.onsuccess = function (event) {
+						db.close();
+						console.log('[sW] DB closed');
+					}
+				}
+
+				console.log('Showing notification');
+				self.registration.showNotification(data.title, options);
+				break;
+
+			case 'forcesync':
+				// Force refresh on next app open
+				var db = await openDb();
+				if (db != null) {
+					var os = db.transaction('update_times', 'readwrite').objectStore('update_times');
+					var request = os.put({ table: 'last_sync', time: 0 });
+					request.onerror = function (event) {
+						console.log('[sW] Error while saving data to DB:', e);
+						db.close();
+						console.log('[sW] DB closed');
+					}
+					request.onsuccess = function (event) {
+						console.log('[sW] Data successfully saved');
+						db.close();
+						console.log('[sW] DB closed');
+					}
+				}
+				break;
+
+			default:
+				console.log('[sW] Push type unknown:', data.type);
+				break;
+		}
+	} else {
+		console.log('[sW] No push type given!');
+	}
+});
+
+self.addEventListener('notificationclick', function(event) {
+	var data = event.notification.data;
+
+	event.notification.close();
+
+	var url = '<?php echo SERVER_ADDR; ?>' + getEntry(data, 'url', '');
+
+	event.waitUntil(
+		clients.openWindow(url)
+	);
+});