Merge pull request 'feature/use-new-features-from-soko-web' (!58) from feature/use-new-features-from-soko-web into develop

Reviewed-on: #58

.env.example

@@ -1,4 +1,5 @@
 APP_NAME=MapGuesser
+APP_URL=mapguesser.dev
 DEV=1
 DB_HOST=mariadb
 DB_USER=mapguesser
@@ -7,6 +8,7 @@ DB_NAME=mapguesser
 GOOGLE_MAPS_SERVER_API_KEY=your_google_maps_server_api_key
 GOOGLE_MAPS_JS_API_KEY=your_google_maps_js_api_key
 LEAFLET_TILESERVER_URL=a_leaflet_compatible_tileserver_url
+LEAFLET_TILESERVER_SUBDOMAINS=list_of_subdomains_for_the_tileserver_without_separators
 LEAFLET_TILESERVER_ATTRIBUTION=attribution_to_be_shown_for_tiles
 STATIC_ROOT=/static
 MAIL_FROM=mapguesser@mapguesser-dev.ch
@@ -19,3 +21,6 @@ MULTI_INTERNAL_HOST=multi
 MULTI_INTERNAL_PORT=5000
 MULTI_WS_URL=mapguesser-dev.ch:8090
 MULTI_WS_PORT=8090
+ENABLE_GAME_FOR_GUESTS=0
+RECAPTCHA_SITEKEY=your_recaptcha_sitekey
+RECAPTCHA_SECRET=your_recaptcha_secret

Jenkinsfile

@@ -0,0 +1,62 @@
+pipeline {
+    agent {
+        node {
+            label 'mapguesser'
+            customWorkspace 'workspace/mapguesser'
+        }
+    }
+
+    stages {
+        stage('Install composer') {
+            environment {
+                COMPOSER_HOME="${WORKSPACE}/.composer"
+            }
+            agent {
+                dockerfile {
+                    filename 'docker/Dockerfile-test'
+                    dir '.'
+                    reuseNode true
+                }
+            }
+            steps {
+                sh 'composer install'
+            }
+        }
+
+        stage('Unit Testing') {
+            agent {
+                dockerfile {
+                    filename 'docker/Dockerfile-test'
+                    dir '.'
+                    reuseNode true
+                }
+            }
+            steps {
+                sh 'vendor/bin/phpunit --log-junit unit_test_results.xml --testdox tests'
+            }
+            post {
+                success {
+                    archiveArtifacts 'unit_test_results.xml'
+                }
+            }
+        }
+
+        stage('Static Code Analysis') {
+            agent {
+                dockerfile {
+                    filename 'docker/Dockerfile-test'
+                    dir '.'
+                    reuseNode true
+                }
+            }
+            steps {
+                sh 'php -d memory_limit=1G vendor/bin/phpstan analyse -c phpstan.neon --error-format=prettyJson > static_code_analysis_results.json'
+            }
+            post {
+                success {
+                    archiveArtifacts 'static_code_analysis_results.json'
+                }
+            }
+        }
+    }
+}

README.md

@@ -1,5 +1,7 @@
 # MapGuesser
 
+[![Build Status](https://jenkins.e5tv.hu/job/mapguesser/job/develop/badge/icon)](https://jenkins.e5tv.hu/job/mapguesser/job/develop/)
+
 This is the MapGuesser Application project. This is a game about guessing where you are based on a street view panorama - inspired by existing applications.
 
 ## Installation
@@ -65,7 +67,13 @@ Required API keys:
 * **GOOGLE_MAPS_SERVER_API_KEY**: this it used by the backend and should have access to **Street View Static API**
 * **GOOGLE_MAPS_JS_API_KEY**: this is used by the frontend and should have access to **Maps JavaScript API** and **Maps Static API**
 
-Additionally, a tile provider is also needed for map editor. This should be configured by `LEAFLET_TILESERVER_URL` and `LEAFLET_TILESERVER_ATTRIBUTION`. You can find some providers here: https://wiki.openstreetmap.org/wiki/Tile_servers. OpenStreetMap's tile server is fine for testing.
+Additionally, a tile provider is also needed for map editor. This should be configured by `LEAFLET_TILESERVER_URL`, `LEAFLET_TILESERVER_SUBDOMAINS` and `LEAFLET_TILESERVER_ATTRIBUTION`. You can find some providers here: https://wiki.openstreetmap.org/wiki/Tile_servers. OpenStreetMap's tile server is fine for testing.
+Example:
+```
+LEAFLET_TILESERVER_URL=https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
+LEAFLET_TILESERVER_SUBDOMAINS=abc
+LEAFLET_TILESERVER_ATTRIBUTION="&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
+```
 
 ### (Production only) Create cron job
 

composer.json

@@ -3,15 +3,19 @@
   "type": "project",
   "description": "MapGuesser Application",
   "license": "GNU GPL 3.0",
+  "repositories": [
+    {
+        "url": "https://git.esoko.eu/esoko/soko-web.git",
+        "type": "git"
+    }
+  ],
   "require": {
-    "vlucas/phpdotenv": "^4.1",
-    "symfony/console": "^5.1",
-    "phpmailer/phpmailer": "^6.1",
+    "esoko/soko-web": "0.3",
     "fzaninotto/faker": "^1.9"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9",
-    "phpstan/phpstan": "^0.12.32"
+    "phpunit/phpunit": "^9.6",
+    "phpstan/phpstan": "^1.10"
   },
   "autoload": {
     "psr-4": {

database/migrations/data/20200612_2124_map_area.php

@@ -1,8 +1,8 @@
 <?php
 
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use SokoWeb\Database\Query\Modify;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IResultSet;
 use MapGuesser\Util\Geo\Bounds;
 
 $select = new Select(\Container::$dbConnection, 'maps');

database/migrations/data/20200614_1328_user_confirmation.php

@@ -1,8 +1,8 @@
 <?php
 
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use SokoWeb\Database\Query\Modify;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IResultSet;
 
 $select = new Select(\Container::$dbConnection, 'users');
 $select->columns(['id']);

database/migrations/structure/20210503_1040_user_played_place.sql

@@ -0,0 +1,12 @@
+CREATE TABLE `user_played_place` (
+    `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+    `user_id` int(10) unsigned NOT NULL,
+    `place_id` int(10) unsigned NOT NULL,
+    `last_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `occurrences` int(10) NOT NULL DEFAULT 1,
+    PRIMARY KEY(`id`),
+    KEY `user_id` (`user_id`),
+    KEY `place_id` (`place_id`),
+    CONSTRAINT `user_played_place_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`),
+    CONSTRAINT `user_played_place_place_id` FOREIGN KEY (`place_id`) REFERENCES `places` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20210510_2000_challenge.sql

@@ -0,0 +1,54 @@
+CREATE TABLE `challenges` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `token` int(10) unsigned NOT NULL,
+  `time_limit` int(10) unsigned,
+  `time_limit_type` enum('game', 'round') NOT NULL DEFAULT 'game',
+  `no_move` tinyint(1) NOT NULL DEFAULT 0,
+  `no_pan` tinyint(1) NOT NULL DEFAULT 0,
+  `no_zoom` tinyint(1) NOT NULL DEFAULT 0,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+CREATE TABLE `user_in_challenge` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `challenge_id` int(10) unsigned NOT NULL,
+  `current_round` smallint(5) signed NOT NULL DEFAULT 0,
+  `time_left` int(10) unsigned,
+  `is_owner` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `user_id` (`user_id`),
+  KEY `challenge_id` (`challenge_id`),
+  CONSTRAINT `user_in_challenge_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `user_in_challenge_challenge_id` FOREIGN KEY (`challenge_id`) REFERENCES `challenges` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+CREATE TABLE `place_in_challenge` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `place_id` int(10) unsigned NOT NULL,
+  `challenge_id` int(10) unsigned NOT NULL,
+  `round` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `place_id` (`place_id`),
+  KEY `challenge_id` (`challenge_id`),
+  CONSTRAINT `place_in_challenge_place_id` FOREIGN KEY (`place_id`) REFERENCES `places` (`id`),
+  CONSTRAINT `place_in_challenge_challenge_id` FOREIGN KEY (`challenge_id`) REFERENCES `challenges` (`id`),
+  CONSTRAINT `unique_order_in_challenge` UNIQUE (`round`, `challenge_id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+CREATE TABLE `guesses` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `place_in_challenge_id` int(10) unsigned NOT NULL,
+  `lat` decimal(8,6) NOT NULL,
+  `lng` decimal(9,6) NOT NULL,
+  `score` int(10) NOT NULL,
+  `distance` int(10) NOT NULL,
+  `time_spent` int(10),
+  PRIMARY KEY (`id`),
+  KEY `user_id` (`user_id`),
+  KEY `place_in_challenge_id` (`place_in_challenge_id`),
+  CONSTRAINT `guesses_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `guesses_place_in_challenge_id` FOREIGN KEY (`place_in_challenge_id`) REFERENCES `place_in_challenge` (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20220526_1315_unlisted_maps.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `maps`
+  ADD `unlisted` TINYINT(1) NOT NULL DEFAULT 0;

docker-compose.yml

@@ -29,6 +29,12 @@ services:
             MYSQL_DATABASE: 'mapguesser'
             MYSQL_USER: 'mapguesser'
             MYSQL_PASSWORD: 'mapguesser'
+    adminer:
+        image: adminer:4.8.1-standalone
+        ports:
+        - 9090:8080
+        environment:
+            - ADMINER_DEFAULT_SERVER=mariadb
     mail:
         image: marcopas/docker-mailslurper:latest
         ports:

docker/Dockerfile-test

@@ -0,0 +1,6 @@
+FROM ubuntu:focal
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update && apt install -y curl git unzip php7.4-cli php7.4-mbstring php7.4-xml
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

main.php

@@ -14,10 +14,10 @@ $dotenv->load();
 
 class Container
 {
-    static MapGuesser\Interfaces\Database\IConnection $dbConnection;
-    static MapGuesser\Routing\RouteCollection $routeCollection;
-    static MapGuesser\Interfaces\Session\ISessionHandler $sessionHandler;
-    static MapGuesser\Interfaces\Request\IRequest $request;
+    static SokoWeb\Interfaces\Database\IConnection $dbConnection;
+    static SokoWeb\Routing\RouteCollection $routeCollection;
+    static SokoWeb\Interfaces\Session\ISessionHandler $sessionHandler;
+    static SokoWeb\Interfaces\Request\IRequest $request;
 }
 
-Container::$dbConnection = new MapGuesser\Database\Mysql\Connection($_ENV['DB_HOST'], $_ENV['DB_USER'], $_ENV['DB_PASSWORD'], $_ENV['DB_NAME']);
+Container::$dbConnection = new SokoWeb\Database\Mysql\Connection($_ENV['DB_HOST'], $_ENV['DB_USER'], $_ENV['DB_PASSWORD'], $_ENV['DB_NAME']);

mapg

@@ -8,6 +8,6 @@ $app = new Symfony\Component\Console\Application('MapGuesser Console', '');
 $app->add(new MapGuesser\Cli\MigrateDatabaseCommand());
 $app->add(new MapGuesser\Cli\AddUserCommand());
 $app->add(new MapGuesser\Cli\LinkViewCommand());
-$app->add(new \MapGuesser\Cli\MaintainDatabaseCommand());
+$app->add(new MapGuesser\Cli\MaintainDatabaseCommand());
 
 $app->run();

public/index.php

@@ -1,5 +1,13 @@
 <?php
 
+use SokoWeb\Interfaces\Response\IRedirect;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Authorization\ISecured;
+use SokoWeb\Response\Redirect;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
+
 require '../web.php';
 
 $method = strtolower($_SERVER['REQUEST_METHOD']);
@@ -19,35 +27,40 @@ if ($match !== null) {
     $handler = $route->getHandler();
     $controller = new $handler[0](Container::$request);
 
-    if ($controller instanceof MapGuesser\Interfaces\Authorization\ISecured) {
-        $authorized = $controller->authorize();
-    } else {
-        $authorized = true;
+    if (
+        $controller instanceof IAuthenticationRequired &&
+        $controller->isAuthenticationRequired() &&
+        Container::$request->user() === null
+    ) {
+        Container::$request->session()->set('redirect_after_login', substr($_SERVER['REQUEST_URI'], strlen('/')));
+        $response = new Redirect(Container::$routeCollection->getRoute('login')->generateLink(), IRedirect::TEMPORARY);
+        header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
+        return;
     }
 
     if ($method === 'post' && Container::$request->post('anti_csrf_token') !== Container::$request->session()->get('anti_csrf_token')) {
-        $content = new MapGuesser\Response\JsonContent(['error' => 'no_valid_anti_csrf_token']);
+        $content = new JsonContent(['error' => 'no_valid_anti_csrf_token']);
         header('Content-Type: text/html; charset=UTF-8', true, 403);
         $content->render();
         return;
     }
 
-    if ($authorized) {
+    if (
+        !($controller instanceof ISecured) ||
+        $controller->authorize()
+    ) {
         $response = call_user_func([$controller, $handler[1]]);
-
-        if ($response instanceof MapGuesser\Interfaces\Response\IContent) {
+        if ($response instanceof IContent) {
             header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
             $response->render();
-
             return;
-        } elseif ($response instanceof MapGuesser\Interfaces\Response\IRedirect) {
+        } elseif ($response instanceof IRedirect) {
             header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
-
             return;
         }
     }
 }
 
-$content = new MapGuesser\Response\HtmlContent('error/404');
+$content = new HtmlContent('error/404');
 header('Content-Type: text/html; charset=UTF-8', true, 404);
 $content->render();

public/static/css/game.css

@@ -15,6 +15,17 @@
     right: 0;
     background-color: #000000;
     opacity: 0.5;
+    z-index: 4;
+}
+
+#panningBlockerCover {
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    opacity: 0;
     z-index: 3;
 }
 
@@ -22,7 +33,7 @@
     position: absolute;
     bottom: 30px;
     right: 20px;
-    z-index: 2;
+    z-index: 3;
 }
 
 #guess.result {
@@ -153,6 +164,47 @@
     z-index: 2;
 }
 
+#goToStart {
+    display: none;
+}
+
+#highscoresTable {
+    margin: 1em;
+    border-collapse: collapse;
+    width: 90%;
+}
+
+#highscoresTable td, #highscoresTable th {
+    border: 1px solid #ddd;
+    padding: 8px;
+}
+
+#highscoresTable tr:nth-child(even) {
+    background-color: #f2f2f2;
+}
+
+#highscoresTable tr:hover {
+    background-color: #ddd;
+}
+
+#highscoresTable th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    background-color: #e8a349;
+    color: white;
+}
+
+#highscoresTable tr.ownPlayer {
+    font-weight: 500;
+}
+
+@media screen and (max-width: 899px) {
+    .hideOnNarrowScreen {
+        display: none;
+    }
+}
+
 @media screen and (max-width: 599px) {
     #mapName {
         display: none;

public/static/css/mapguesser.css

@@ -31,11 +31,11 @@ main {
     color: #ffffff;
 }
 
-p, h1, h2, input, textarea, select, button, a {
+p, h1, h2, h3, input, textarea, select, button, a, table, label {
     font-family: 'Roboto', sans-serif;
 }
 
-h1, h2 {
+h1, h2, h3 {
     font-weight: 500;
 }
 
@@ -55,7 +55,11 @@ h2, header.small h1 {
     font-size: 24px;
 }
 
-p, h2 {
+h3 {
+    font-size: 18px;
+}
+
+p, h2, h3 {
     line-height: 150%;
 }
 
@@ -237,7 +241,7 @@ button.green:enabled:hover, button.green:enabled:focus, a.button.green:hover, a.
     background-color: #1b7d31;
 }
 
-input, select, textarea {
+input.text, select, textarea {
     background-color: #f9fafb;
     border: solid #c8d2e1 1px;
     border-radius: 2px;
@@ -246,22 +250,26 @@ input, select, textarea {
     font-weight: 300;
 }
 
-input, select {
+input.text, select {
     height: 30px;
     line-height: 30px;
     padding: 0 5px;
 }
 
+input[type=checkbox], input[type=radio] {
+    margin-right: 0.5em;
+}
+
 textarea {
     padding: 5px;
     resize: none;
 }
 
-input.big, select.big, textarea.big, div.inputWithButton>input {
+input.text.big, select.big, textarea.big, div.inputWithButton>input.text {
     font-size: 18px;
 }
 
-input.big, select.big, div.inputWithButton>input {
+input.text.big, select.big, div.inputWithButton>input.text {
     height: 35px;
     line-height: 35px;
     padding: 0 6px;
@@ -276,19 +284,19 @@ input.fullWidth, select.fullWidth, textarea.fullWidth {
     width: 100%;
 }
 
-input:disabled, select:disabled, textarea:disabled {
+input.text:disabled, select:disabled, textarea:disabled {
     background-color: #dfdfdf;
     border: solid #dfdfdf 1px;
     color: #000000;
 }
 
-input:focus, select:focus, textarea:focus {
+input.text:focus, select:focus, textarea:focus {
     background-color: #ffffff;
     border: solid #29457f 2px;
     outline: none;
 }
 
-input:focus, select:focus {
+input.text:focus, select:focus {
     padding: 0 4px;
 }
 
@@ -296,16 +304,16 @@ textarea:focus {
     padding: 4px;
 }
 
-input.big:focus, select.big:focus {
+input.text.big:focus, select.big:focus {
     padding: 0 5px;
 }
 
-div.inputWithButton>input {
+div.inputWithButton>input.text {
     width: 100%;
     padding: 0 83px 0 6px;
 }
 
-div.inputWithButton>input:focus {
+div.inputWithButton>input.text:focus {
     padding: 0 82px 0 5px;
 }
 
@@ -451,6 +459,7 @@ div.box {
 }
 
 .circleControl .controlItem {
+    position: relative;
     height: 60px;
     margin-top: 10px;
     opacity: 70%;
@@ -463,6 +472,8 @@ div.box {
 
 .circleControl .controlItem div {
     position: absolute;
+    width: 100%;
+    height: 100%;
 }
 
 .circleControl .controlBackground {
@@ -477,7 +488,6 @@ div.box {
     margin: auto;
     margin-top: 50%;
     transform: translateY(-50%);
-    -ms-transform: translateY(-50%);
 }
 
 @media screen and (max-width: 599px) {

public/static/css/maps.css

@@ -13,6 +13,10 @@ div.mapItem.new {
     align-items: center;
 }
 
+div.mapItem.unlisted {
+    opacity: 0.6;
+}
+
 div.mapItem>div.title {
     background-color: #28a745;
     color: white;
@@ -75,6 +79,10 @@ div.mapItem>div.buttonContainer {
     grid-auto-flow: column;
 }
 
+#timeLimitType {
+    margin-left: 1.5em;
+}
+
 @media screen and (min-width: 1504px) {
     #mapContainer {
         grid-template-columns: auto auto auto auto;

public/static/js/game.js

@@ -1,10 +1,13 @@
 'use strict';
 
+const GameType = Object.freeze({ 'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2 });
+
 (function () {
     var Game = {
         NUMBER_OF_ROUNDS: 5,
         MAX_SCORE: 1000,
 
+        type: GameType.SINGLE,
         mapBounds: null,
         multi: { token: null, owner: false },
         rounds: [],
@@ -16,6 +19,8 @@
         guessMarker: null,
         adaptGuess: false,
         googleLink: null,
+        history: [],
+        restrictions: null,
 
         readyToContinue: true,
         timeoutEnd: null,
@@ -211,6 +216,19 @@
             }
         },
 
+        getGameIdentifier: function () {
+            switch (Game.type) {
+                case GameType.SINGLE:
+                    return '/game/' + mapId;
+                case GameType.MULTI:
+                    return '/multiGame/' + roomId;
+                case GameType.CHALLENGE:
+                    return '/challenge/' + challengeToken;
+                default:
+                    return '/game/' + mapId;
+            }
+        },
+
         prepare: function () {
             var data = new FormData();
             var userNames;
@@ -226,7 +244,7 @@
             }
 
             document.getElementById('loading').style.visibility = 'visible';
-            var url = roomId ? '/multiGame/' + roomId + '/prepare.json' : '/game/' + mapId + '/prepare.json';
+            var url = Game.getGameIdentifier() + '/prepare.json';
             MapGuesser.httpRequest('POST', url, function () {
                 document.getElementById('loading').style.visibility = 'hidden';
 
@@ -269,7 +287,7 @@
             }
 
             document.getElementById('loading').style.visibility = 'visible';
-            MapGuesser.httpRequest('POST', '/game/' + mapId + '/initialData.json', function () {
+            MapGuesser.httpRequest('POST', Game.getGameIdentifier() + '/initialData.json', function () {
                 document.getElementById('loading').style.visibility = 'hidden';
                 document.getElementById('panoCover').style.visibility = 'hidden';
 
@@ -278,24 +296,199 @@
                     return;
                 }
 
-                Game.panoId = this.response.place.panoId;
-                Game.pov = this.response.place.pov;
+                Game.loadHistory(this.response);
 
-                for (var i = 0; i < this.response.history.length; ++i) {
-                    var round = this.response.history[i];
-                    Game.rounds.push({ position: round.position, guessPosition: round.result.guessPosition, realMarker: null, guessMarkers: [] });
-                    Game.addPositionToResultMap(true);
-                    Game.addGuessPositionToResultMap(round.result.guessPosition, null, true);
-                    Game.scoreSum += round.result.score;
+                Game.restrictions = this.response.restrictions;
+                Game.displayRestrictions();
+
+                if (this.response.finished) {
+
+                    Game.transitToResultMap();
+                    Game.showSummary();
+
+                } else {
+
+                    Game.panoId = this.response.place.panoId;
+                    Game.pov = this.response.place.pov;
+
+                    Game.startNewRound();
                 }
 
                 document.getElementById('currentRound').innerHTML = String(Game.rounds.length) + '/' + String(Game.NUMBER_OF_ROUNDS);
                 document.getElementById('currentScoreSum').innerHTML = String(Game.scoreSum) + '/' + String(Game.rounds.length * Game.MAX_SCORE);
-
-                Game.startNewRound();
             });
         },
 
+        enableRestrictions: function () {
+            if (!Game.restrictions) {
+                return;
+            }
+
+            Game.panorama.setOptions({
+                clickToGo: !Game.restrictions.noMove,
+                linksControl: !(Game.restrictions.noMove || Game.restrictions.noPan),
+                scrollwheel: !Game.restrictions.noZoom
+            });
+
+            if (Game.restrictions.noPan) {
+                document.getElementById('panningBlockerCover').style.display = 'block';
+            }
+
+            if (Game.restrictions.timeLimit) {
+                Game.startCountdown(Game.restrictions.timeLimit, function () {
+                    Game.guess();
+                });
+            }
+
+        },
+
+        displayRestrictions: function () {
+            if (!Game.restrictions) {
+                return;
+            }
+
+            var restrictionsForDisplay = [];
+            if (Game.restrictions.timeLimit) {
+                restrictionsForDisplay.push('time limit per ' + Game.restrictions.timeLimitType);
+            }
+            if (Game.restrictions.noPan) {
+                restrictionsForDisplay.push('no camera change');
+            }
+            else {
+                if (Game.restrictions.noMove) {
+                    restrictionsForDisplay.push('no move');
+                }
+                if (Game.restrictions.noZoom) {
+                    restrictionsForDisplay.push('no zoom');
+                }
+            }
+
+            if (restrictionsForDisplay.length == 0) {
+                return;
+            }
+
+            // create restrictions span for header
+            var restrictions = document.createElement('span');
+            restrictions.setAttribute('id', 'restrictions');
+            restrictions.setAttribute('class', 'hideOnNarrowScreen');
+            var restrictionsTitle = document.createElement('span');
+            restrictionsTitle.setAttribute('class', 'bold');
+            restrictionsTitle.innerText = 'Restrictions: ';
+            var restrictionsList = document.createElement('span');
+            restrictionsList.innerText = restrictionsForDisplay.join(', ');
+            restrictions.appendChild(restrictionsTitle);
+            restrictions.appendChild(restrictionsList);
+
+            var roundContainer = document.getElementById('roundContainer');
+            var header = roundContainer.parentNode;
+            header.insertBefore(restrictions, roundContainer);
+        },
+
+        disableRestrictions: function () {
+
+            Game.panorama.setOptions({
+                clickToGo: true,
+                linksControl: true,
+                scrollwheel: true
+            });
+
+            document.getElementById('panningBlockerCover').style.display = null;
+
+            Game.startCountdown(0);
+            Game.timeoutEnd = null;
+        },
+
+        hideRestrictions: function () {
+            var restrictions = document.getElementById('restrictions');
+            if (restrictions) {
+                var header = restrictions.parentNode;
+                header.removeChild(restrictions);
+            }
+        },
+
+        transitToResultMap: function () {
+            // TODO: refactor - it is necessary for mobile
+            if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') {
+                document.getElementById('showGuessButton').click();
+            }
+
+            if (Game.adaptGuess) {
+                document.getElementById('guess').classList.remove('adapt');
+            }
+
+            if (Game.guessMarker) {
+                Game.guessMarker.setMap(null);
+                Game.guessMarker = null;
+            }
+
+            document.getElementById('guess').classList.add('result');
+
+            Game.map.setOptions({
+                draggableCursor: 'grab'
+            });
+
+            if (Game.rounds.length === Game.NUMBER_OF_ROUNDS) {
+                document.getElementById('continueButton').style.display = 'none';
+                document.getElementById('showSummaryButton').style.display = 'block';
+            } else if (Game.type == GameType.MULTI) {
+                if (Game.multi.owner) {
+                    if (!Game.readyToContinue) {
+                        document.getElementById('continueButton').disabled = true;
+                    }
+                } else {
+                    document.getElementById('continueButton').style.display = 'none';
+                }
+            }
+        },
+
+        loadHistory: function (response) {
+            if (!response.history)
+                return;
+
+            Game.history = response.history;
+
+            for (var i = 0; i < Game.rounds.length; ++i) {
+                var round = Game.rounds[i];
+
+                if (round.realMarker) {
+                    round.realMarker.setMap(null);
+                }
+                for (var j = 0; j < round.guessMarkers.length; ++j) {
+                    var guessMarker = round.guessMarkers[j];
+                    guessMarker.marker.setMap(null);
+                    guessMarker.line.setMap(null);
+                    if (guessMarker.info) {
+                        guessMarker.info.close();
+                    }
+                }
+            }
+            Game.rounds = [];
+
+            Game.scoreSum = 0;
+            for (var i = 0; i < Game.history.length; ++i) {
+                var round = Game.history[i];
+
+                if (round.result) {
+                    Game.rounds.push({ position: round.position, guessPosition: round.result.guessPosition, realMarker: null, guessMarkers: [] });
+                    Game.addPositionToResultMap(true);
+                    if (round.result.guessPosition) {
+                        Game.addGuessPositionToResultMap(round.result.guessPosition, round.result, true);
+                    }
+                    Game.scoreSum += round.result.score;
+
+
+                    if (round.allResults !== undefined) {
+                        for (var j = 0; j < round.allResults.length; ++j) {
+                            var result = round.allResults[j];
+                            if (result.guessPosition) {
+                                Game.addGuessPositionToResultMap(result.guessPosition, result, true);
+                            }
+                        }
+                    }
+                }
+            }
+        },
+
         reset: function () {
             if (Game.guessMarker) {
                 Game.guessMarker.setMap(null);
@@ -325,6 +518,7 @@
             distanceInfo.children[0].style.display = null;
             distanceInfo.children[1].style.display = null;
             distanceInfo.children[2].style.display = null;
+            document.getElementById('summaryInfo').innerHTML = "Game finished."
             var scoreInfo = document.getElementById('scoreInfo');
             scoreInfo.children[0].style.display = null;
             scoreInfo.children[1].style.display = null;
@@ -339,6 +533,13 @@
             // needs to be set visible after the show guess map hid it in mobile view
             document.getElementById("navigation").style.visibility = 'visible';
 
+            Game.disableRestrictions();
+            Game.hideRestrictions();
+
+            document.getElementById('panningBlockerCover').style.display = null;
+
+            Game.history = [];
+
             Game.initialize();
         },
 
@@ -391,6 +592,8 @@
             // update the compass
             const heading = Game.panorama.getPov().heading;
             document.getElementById("compass").style.transform = "translateY(-50%) rotate(" + heading + "deg)";
+
+            Game.enableRestrictions();
         },
 
         handleErrorResponse: function (error) {
@@ -410,6 +613,14 @@
                     MapGuesser.showModalWithContent('Error', 'This game is already started, you cannot join.');
                     break;
 
+                case 'game_not_found':
+                    MapGuesser.showModalWithContent('Error', 'The game was not found by this ID. Please check the link.');
+                    break;
+
+                case 'anonymous_user':
+                    MapGuesser.showModalWithContent('Error', 'You have to login to join a challenge!');
+                    break;
+
                 default:
                     MapGuesser.showModalWithContent('Error', 'Error code: \'' + error + '\'');
                     break
@@ -437,7 +648,7 @@
             resultBounds.extend(position);
 
             if (guessPosition) {
-                Game.addGuessPositionToResultMap(guessPosition);
+                Game.addGuessPositionToResultMap(guessPosition, result);
                 resultBounds.extend(guessPosition);
             }
 
@@ -473,25 +684,9 @@
         },
 
         showResultMap: function (result, resultBounds) {
-            // TODO: refactor - it is necessary for mobile
-            if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') {
-                document.getElementById('showGuessButton').click();
-            }
 
-            if (Game.adaptGuess) {
-                document.getElementById('guess').classList.remove('adapt');
-            }
+            Game.transitToResultMap();
 
-            if (Game.guessMarker) {
-                Game.guessMarker.setMap(null);
-                Game.guessMarker = null;
-            }
-
-            document.getElementById('guess').classList.add('result');
-
-            Game.map.setOptions({
-                draggableCursor: 'grab'
-            });
             Game.map.fitBounds(resultBounds);
 
             var distanceInfo = document.getElementById('distanceInfo');
@@ -510,38 +705,32 @@
             var scoreBar = document.getElementById('scoreBar');
             scoreBar.style.backgroundColor = scoreBarProperties.backgroundColor;
             scoreBar.style.width = scoreBarProperties.width;
-
-            if (Game.rounds.length === Game.NUMBER_OF_ROUNDS) {
-                document.getElementById('continueButton').style.display = 'none';
-                document.getElementById('showSummaryButton').style.display = 'block';
-            } else if (roomId) {
-                if (Game.multi.owner) {
-                    if (!Game.readyToContinue) {
-                        document.getElementById('continueButton').disabled = true;
-                    }
-                } else {
-                    document.getElementById('continueButton').style.display = 'none';
-                }
-            }
         },
 
         guess: function () {
-            if (!Game.guessMarker) {
-                return;
+
+            var data = new FormData();
+
+            if (Game.timeoutEnd) {
+                var timeLeft = Math.ceil((Game.timeoutEnd - new Date()) / 1000);
+                data.append('timeLeft', timeLeft);
             }
 
-            var guessPosition = Game.guessMarker.getPosition().toJSON();
-            Game.rounds[Game.rounds.length - 1].guessPosition = guessPosition;
+            Game.disableRestrictions();
+
+            if (Game.guessMarker) {
+                var guessPosition = Game.guessMarker.getPosition().toJSON();
+                Game.rounds[Game.rounds.length - 1].guessPosition = guessPosition;
+
+                data.append('lat', String(guessPosition.lat));
+                data.append('lng', String(guessPosition.lng));
+            }
 
             document.getElementById('guessButton').disabled = true;
             document.getElementById('panoCover').style.visibility = 'visible';
-
-            var data = new FormData();
-            data.append('lat', String(guessPosition.lat));
-            data.append('lng', String(guessPosition.lng));
-
             document.getElementById('loading').style.visibility = 'visible';
-            var url = roomId ? '/multiGame/' + roomId + '/guess.json' : '/game/' + mapId + '/guess.json';
+            var url = Game.getGameIdentifier() + '/guess.json';
+
             MapGuesser.httpRequest('POST', url, function () {
                 document.getElementById('loading').style.visibility = 'hidden';
 
@@ -550,12 +739,16 @@
                     return;
                 }
 
+                Game.loadHistory(this.response);
+                Game.restrictions = this.response.restrictions;
+
                 Game.receiveResult(this.response.position, guessPosition, this.response.result, this.response.allResults);
 
                 if (this.response.place) {
                     Game.panoId = this.response.place.panoId;
                     Game.pov = this.response.place.pov;
                 }
+
             }, data);
         },
 
@@ -589,8 +782,8 @@
             var position = round.position;
 
             var guessMarker = { marker: null, line: null, info: null };
-            var markerSvg = result ? 'marker-gray-empty.svg' : 'marker-blue-empty.svg';
-            var markerLabel = result ? result.userName.charAt(0).toUpperCase() : '?';
+            var markerSvg = result && result.userName ? 'marker-gray-empty.svg' : 'marker-blue-empty.svg';
+            var markerLabel = result && result.userName ? result.userName.charAt(0).toUpperCase() : '?';
 
             guessMarker.marker = new google.maps.Marker({
                 map: Game.map,
@@ -640,8 +833,9 @@
             });
 
             if (result) {
+                const userName = result.userName ? result.userName : 'me';
                 guessMarker.info = new google.maps.InfoWindow({
-                    content: '<p class="small bold">' + result.userName + '</p>' +
+                    content: '<p class="small bold">' + userName + '</p>' +
                         '<p class="small">' + Util.printDistanceForHuman(result.distance) + ' | ' + result.score + ' points</p>',
                 });
 
@@ -668,6 +862,36 @@
             return { width: percent + '%', backgroundColor: color };
         },
 
+        calculateHighScores: function () {
+
+            var highscores = new Map();
+            highscores.set('me', Game.scoreSum);
+
+            // collect the results of users who are through the last round
+            const round = Game.history[Game.history.length - 1];
+            if (round.allResults) {
+                for (const result of round.allResults) {
+                    highscores.set(result.userName, result.score);
+                }
+            }
+
+            // add up scores only for the finishers
+            for (var i = Game.history.length - 2; i >= 0; --i) {
+                const round = Game.history[i];
+                if (round.allResults) {
+                    for (const result of round.allResults) {
+                        if (highscores.has(result.userName)) {
+                            highscores.set(result.userName, highscores.get(result.userName) + result.score);
+                        }
+                    }
+                }
+            }
+
+            var sortedHighscores = Array.from(highscores, ([userName, score]) => ({ 'userName': userName, 'score': score }))
+                .sort(function (resultA, resultB) { return resultB.score - resultA.score });
+            return sortedHighscores;
+        },
+
         showSummary: function () {
             var distanceInfo = document.getElementById('distanceInfo');
             distanceInfo.children[0].style.display = 'none';
@@ -678,11 +902,13 @@
             scoreInfo.children[1].style.display = 'block';
             document.getElementById('showSummaryButton').style.display = null;
 
-            if (!roomId || Game.multi.owner) {
+            if (Game.type == GameType.SINGLE || Game.multi.owner) {
                 document.getElementById('startNewGameButton').style.display = 'block';
                 if (!Game.readyToContinue) {
                     document.getElementById('startNewGameButton').disabled = true;
                 }
+            } else if (Game.type == GameType.CHALLENGE) {
+                document.getElementById('goToStart').style.display = 'block';
             }
 
             var resultBounds = new google.maps.LatLngBounds();
@@ -725,6 +951,48 @@
             var scoreBar = document.getElementById('scoreBar');
             scoreBar.style.backgroundColor = scoreBarProperties.backgroundColor;
             scoreBar.style.width = scoreBarProperties.width;
+
+            Game.showHighscores();
+
+        },
+
+        showHighscores: function () {
+
+            if (Game.type == GameType.CHALLENGE) {
+                var highscores = this.calculateHighScores();
+                var summaryInfo = document.getElementById('summaryInfo');
+
+                if (highscores.length > 2) {
+                    var table = document.getElementById('highscoresTable');
+                    for (const result of highscores) {
+                        var userName = document.createElement('td');
+                        userName.innerHTML = result.userName;
+                        var score = document.createElement('td');
+                        score.innerHTML = result.score;
+                        var line = document.createElement('tr');
+                        line.appendChild(userName);
+                        line.appendChild(score);
+                        table.appendChild(line);
+
+                        if (result.userName === 'me') {
+                            line.setAttribute('class', 'ownPlayer');
+                        }
+                    }
+
+                    MapGuesser.showModal('highscores');
+                } else if (highscores.length == 2) {
+
+                    if (highscores[0].userName === 'me') {
+                        summaryInfo.innerHTML = 'You won! <span class="hideOnNarrowScreen">' + highscores[1].userName + ' got only ' + highscores[1].score + ' points.</span>';
+                    } else {
+                        summaryInfo.innerHTML = 'You lost! <span class="hideOnNarrowScreen">' + highscores[0].userName + ' won with ' + highscores[0].score + ' points.</span>';
+                    }
+
+                } else if (highscores.length == 1) {
+                    summaryInfo.innerHTML = 'You are the first to finish. <span class="hideOnNarrowScreen">Invite your friends by sending them the link.</span>'
+                }
+
+            }
         },
 
         rewriteGoogleLink: function () {
@@ -747,7 +1015,7 @@
             }, 1);
         },
 
-        startCountdown: function (timeout) {
+        startCountdown: function (timeout, timedOutHandler) {
             if (Game.countdownHandler) {
                 clearInterval(Game.countdownHandler);
             }
@@ -769,7 +1037,12 @@
                 Game.setCountdownTime(timeLeft);
 
                 if (timeLeft <= 0) {
-                    document.getElementById('panoCover').style.visibility = 'visible';
+                    if (typeof timedOutHandler === 'function') {
+                        timedOutHandler();
+                    } else {
+                        document.getElementById('panoCover').style.visibility = 'visible';
+                    }
+
                     clearInterval(Game.countdownHandler);
                 }
             }, 1000);
@@ -872,6 +1145,12 @@
         document.getElementById("compass").style.transform = "translateY(-50%) rotate(" + heading + "deg)";
     });
 
+    if (roomId !== null) {
+        Game.type = GameType.MULTI;
+    } else if (challengeToken !== null) {
+        Game.type = GameType.CHALLENGE;
+    }
+
     if (COOKIES_CONSENT) {
         Game.prepare();
     }
@@ -961,4 +1240,8 @@
     document.getElementById('compassContainer').onclick = function () {
         Game.panorama.setPov({ heading: 0, pitch: Game.panorama.getPov().pitch });
     }
+
+    document.getElementById('closeHighscoresButton').onclick = function () {
+        MapGuesser.hideModal();
+    };
 })();

public/static/js/map_editor.js

@@ -18,6 +18,7 @@
 
             MapEditor.metadata.name = form.elements.name.value;
             MapEditor.metadata.description = form.elements.description.value;
+            MapEditor.metadata.unlisted = form.elements.unlisted.checked;
 
             document.getElementById('mapName').innerHTML = form.elements.name.value ? form.elements.name.value : '[unnamed map]';
 
@@ -86,14 +87,14 @@
             sv.getPanorama({
                 location: location,
                 preference: google.maps.StreetViewPreference.NEAREST,
-                radius: 100,
+                radius: MapEditor.map.getSearchRadius(location),
                 source: canBeIndoor ? google.maps.StreetViewSource.DEFAULT : google.maps.StreetViewSource.OUTDOOR
             }, function (data, status) {
                 var panoLocationData = status === google.maps.StreetViewStatus.OK ? data.location : null;
 
-                if (panoLocationData === null && !canBeIndoor) {
-                    MapEditor.requestPanoData(location, true);
-                    return;
+                if (panoLocationData === null && !canBeIndoor) {	
+                    MapEditor.requestPanoData(location, true);	
+                    return;	
                 }
 
                 document.getElementById('loading').style.visibility = 'hidden';
@@ -254,6 +255,9 @@
             if (MapEditor.metadata.description !== null) {
                 data.append('description', MapEditor.metadata.description);
             }
+            if (MapEditor.metadata.unlisted !== null) {
+                data.append('unlisted', MapEditor.metadata.unlisted);
+            }
 
             for (var placeId in MapEditor.added) {
                 if (!MapEditor.added.hasOwnProperty(placeId)) {
@@ -388,7 +392,7 @@
 
                 L.tileLayer(tileUrl, {
                     attribution: tileAttribution,
-                    subdomains: '1234',
+                    subdomains: tileSubdomains,
                     ppi: highResData.ppi,
                     tileSize: highResData.tileSize,
                     zoomOffset: highResData.zoomOffset,
@@ -473,7 +477,11 @@
             LMapWrapper.markers.removeLayer(marker);
         },
 
-        toggleStreetViewCover: function () { }
+        toggleStreetViewCover: function () { },
+
+        getSearchRadius: function (location) {
+            return 100;
+        }
     };
 
     var GMapWrapper = {
@@ -626,6 +634,20 @@
                 GMapWrapper.streetViewCover.setMap(GMapWrapper.map);
                 GMapWrapper.streetViewCoverOn = true;
             }
+        },
+
+        getSearchRadius: function (location) {
+            // source: https://www.yorku.ca/mack/CHI01.htm
+            var movementOffset = 4;
+
+            // source: https://groups.google.com/g/google-maps-js-api-v3/c/hDRO4oHVSeM/m/osOYQYXg2oUJ?pli=1
+            var metersPerPixel = 156543.03392 * Math.cos(location.lat * Math.PI / 180) / Math.pow(2, GMapWrapper.map.getZoom());
+
+            var minSearchRadius = 5;
+
+            var searchRadius = Math.max(minSearchRadius, Math.round(movementOffset * metersPerPixel));
+
+            return searchRadius;
         }
     };
 

public/static/js/maps.js

@@ -65,6 +65,32 @@
         }
     };
 
+    var Util = {
+        printTimeForHuman: function (time) {
+            const minutes = Math.floor(time / 60);
+            const seconds = time % 60;
+            var time_str = '';
+
+            if (minutes == 1) {
+                time_str += '1 minute';
+            } else if (minutes > 1) {
+                time_str += minutes + ' minutes';
+            }
+
+            if (minutes > 0 && seconds > 0) {
+                time_str += ' and ';
+            }
+
+            if (seconds == 1) {
+                time_str += '1 second';
+            } else if (seconds > 1) {
+                time_str += seconds + ' seconds';
+            }
+
+            return time_str;
+        }
+    };
+
     Maps.addStaticMaps();
 
     Maps.initializeDescriptionDivs();
@@ -85,10 +111,40 @@
         window.location.href = '/multiGame/' + this.elements.roomId.value;
     };
 
+    document.getElementById('challengeForm').onsubmit = function (e) {
+        e.preventDefault();
+
+        var url = '/challenge/create.json';
+        var formData = new FormData(this);
+
+        document.getElementById('loading').style.visibility = 'visible';
+        MapGuesser.httpRequest('POST', url, function() {
+            document.getElementById('loading').style.visibility = 'hidden';
+
+            if (this.response.error) {
+                Game.handleErrorResponse(this.response.error);
+                return;
+            }
+
+            window.location.href = '/challenge/' + this.response.challengeToken;
+
+        }, formData);
+    };
+
     document.getElementById('multiButton').onclick = function () {
         MapGuesser.showModal('multi');
         document.getElementById('createNewRoomButton').href = '/multiGame/new/' + this.dataset.mapId;
         document.getElementById('multiForm').elements.roomId.select();
+        document.getElementById('playMode').style.visibility = 'hidden';
+    }
+
+    if (document.getElementById('challengeButton')) {
+        document.getElementById('challengeButton').onclick = function () {
+            MapGuesser.showModal('challenge');
+            document.getElementById('playMode').style.visibility = 'hidden';
+            var timeLimit = document.getElementById('timeLimit').value;
+            document.getElementById('timeLimitLabel').innerText = 'Time limit of ' + Util.printTimeForHuman(timeLimit);
+        };
     }
 
     document.getElementById('closePlayModeButton').onclick = function () {
@@ -99,6 +155,10 @@
         MapGuesser.hideModal();
     };
 
+    document.getElementById('closeChallengeButton').onclick = function () {
+        MapGuesser.hideModal();
+    }
+
     var buttons = document.getElementById('mapContainer').getElementsByClassName('playButton');
     for (var i = 0; i < buttons.length; i++) {
         var button = buttons[i];
@@ -107,6 +167,13 @@
             MapGuesser.showModal('playMode');
             document.getElementById('singleButton').href = '/game/' + this.dataset.mapId;
             document.getElementById('multiButton').dataset.mapId = this.dataset.mapId;
+            document.getElementById('challengeMapId').value = this.dataset.mapId;
         };
     }
+
+    document.getElementById('timeLimit').oninput = function () {
+        var timeLimit = document.getElementById('timeLimit').value;
+        document.getElementById('timeLimitLabel').innerText = 'Time limit of ' + Util.printTimeForHuman(timeLimit);
+        document.getElementById('timerEnabled').checked = true;
+    }
 })();

src/Cli/AddUserCommand.php

@@ -1,7 +1,7 @@
 <?php namespace MapGuesser\Cli;
 
 use DateTime;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\PersistentData\Model\User;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -27,7 +27,7 @@ class AddUserCommand extends Command
         $user->setActive(true);
         $user->setCreatedDate(new DateTime());
 
-        if ($input->hasArgument('type')) {
+        if ($input->hasArgument('type') && $input->getArgument('type') !== null) {
             $user->setType($input->getArgument('type'));
         }
 

src/Cli/LinkViewCommand.php

@@ -1,7 +1,7 @@
 <?php namespace MapGuesser\Cli;
 
 use FilesystemIterator;
-use MapGuesser\View\Linker;
+use SokoWeb\View\Linker;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use Symfony\Component\Console\Command\Command;

src/Cli/MaintainDatabaseCommand.php

@@ -1,13 +1,14 @@
 <?php namespace MapGuesser\Cli;
 
 use DateTime;
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\Database\Query\Modify;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IResultSet;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\MultiRoomRepository;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
+use MapGuesser\Repository\UserPlayedPlaceRepository;
 use MapGuesser\Repository\UserRepository;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -25,6 +26,8 @@ class MaintainDatabaseCommand extends Command
 
     private MultiRoomRepository $multiRoomRepository;
 
+    private UserPlayedPlaceRepository $userPlayedPlaceRepository;
+
     public function __construct()
     {
         parent::__construct();
@@ -34,6 +37,7 @@ class MaintainDatabaseCommand extends Command
         $this->userConfirmationRepository = new UserConfirmationRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
         $this->multiRoomRepository = new MultiRoomRepository();
+        $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
     }
 
     public function configure(): void
@@ -81,6 +85,10 @@ class MaintainDatabaseCommand extends Command
                 $this->pdm->deleteFromDb($userPasswordResetter);
             }
 
+            foreach ($this->userPlayedPlaceRepository->getAllByUser($user) as $userPlayedPlace) {
+                $this->pdm->deleteFromDb($userPlayedPlace);
+            }
+
             $this->pdm->deleteFromDb($user);
         }
 

src/Cli/MigrateDatabaseCommand.php

@@ -1,8 +1,8 @@
 <?php namespace MapGuesser\Cli;
 
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use SokoWeb\Database\Query\Modify;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IResultSet;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

src/Controller/GameController.php

@@ -2,20 +2,29 @@
 
 use DateTime;
 use Faker\Factory;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Request\IRequest;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
 use MapGuesser\Multi\MultiConnector;
+use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\MultiRoom;
-use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\PersistentData\Model\PlaceInChallenge;
+use MapGuesser\PersistentData\Model\UserInChallenge;
+use SokoWeb\PersistentData\PersistentDataManager;
+use MapGuesser\Repository\ChallengeRepository;
 use MapGuesser\Repository\MapRepository;
 use MapGuesser\Repository\MultiRoomRepository;
-use MapGuesser\Response\Redirect;
+use MapGuesser\Repository\PlaceRepository;
+use MapGuesser\Repository\UserInChallengeRepository;
+use SokoWeb\Response\Redirect;
 
-class GameController
+class GameController implements IAuthenticationRequired
 {
+    const NUMBER_OF_ROUNDS = 5;
+
     private IRequest $request;
 
     private PersistentDataManager $pdm;
@@ -26,6 +35,12 @@ class GameController
 
     private MapRepository $mapRepository;
 
+    private PlaceRepository $placeRepository;
+
+    private ChallengeRepository $challengeRepository;
+
+    private UserInChallengeRepository $userInChallengeRepository;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
@@ -33,6 +48,14 @@ class GameController
         $this->multiConnector = new MultiConnector();
         $this->multiRoomRepository = new MultiRoomRepository();
         $this->mapRepository = new MapRepository();
+        $this->placeRepository = new PlaceRepository();
+        $this->challengeRepository = new ChallengeRepository();
+        $this->userInChallengeRepository = new UserInChallengeRepository();
+    }
+
+    public function isAuthenticationRequired(): bool
+    {
+        return empty($_ENV['ENABLE_GAME_FOR_GUESTS']);
     }
 
     public function getGame(): IContent
@@ -79,6 +102,75 @@ class GameController
         return new HtmlContent('game', ['roomId' => $roomId]);
     }
 
+    public function getChallenge(): IContent
+    {
+        $challengeToken = $this->request->query('challengeToken');
+
+        return new HtmlContent('game', ['challengeToken' => $challengeToken]);
+    }
+
+    public function createNewChallenge(): IContent
+    {
+        // create Challenge
+        do {
+            // initiliaze or if a challenge with the same token already exists
+            $challengeToken = mt_rand();
+        } while ($this->challengeRepository->getByToken($challengeToken));
+
+        $challenge = new Challenge();
+        $challenge->setToken($challengeToken);
+        $challenge->setCreatedDate(new DateTime());
+
+        if ($this->request->post('timerEnabled') !== null && $this->request->post('timeLimit') !== null) {
+            $challenge->setTimeLimit($this->request->post('timeLimit'));
+        }
+        if ($this->request->post('timeLimitType') !== null) {
+            $challenge->setTimeLimitType($this->request->post('timeLimitType'));
+        }
+        if ($this->request->post('noMove') !== null) {
+            $challenge->setNoMove(true);
+        }
+        if ($this->request->post('noPan') !== null) {
+            $challenge->setNoPan(true);
+        }
+        if ($this->request->post('noZoom') !== null) {
+            $challenge->setNoZoom(true);
+        }
+
+        $this->pdm->saveToDb($challenge);
+
+        // save owner/creator
+
+        $session = $this->request->session();
+        $userId = $session->get('userId');
+
+        $userInChallenge = new UserInChallenge();
+        $userInChallenge->setUserId($userId);
+        $userInChallenge->setChallenge($challenge);
+        $userInChallenge->setTimeLeft($challenge->getTimeLimit());
+        $userInChallenge->setIsOwner(true);
+
+        $this->pdm->saveToDb($userInChallenge);
+
+        // select places
+
+        $mapId = (int) $this->request->post('mapId');
+        // $map = $this->mapRepository->getById($mapId);
+
+        $places = $this->placeRepository->getRandomNPlaces($mapId, static::NUMBER_OF_ROUNDS, $userId);
+
+        $round = 0;
+        foreach ($places as $place) {
+            $placeInChallenge = new PlaceInChallenge();
+            $placeInChallenge->setPlace($place);
+            $placeInChallenge->setChallenge($challenge);
+            $placeInChallenge->setRound($round++);
+            $this->pdm->saveToDb($placeInChallenge);
+        }
+
+        return new JsonContent(['challengeToken' => dechex($challengeToken)]);
+    }
+
     public function prepareGame(): IContent
     {
         $mapId = (int) $this->request->query('mapId');
@@ -114,6 +206,11 @@ class GameController
         }
 
         $room = $this->multiRoomRepository->getByRoomId($roomId);
+
+        if (!isset($room)) {
+            return new JsonContent(['error' => 'game_not_found']);
+        }
+
         $state = $room->getStateArray();
         $map = $this->mapRepository->getById($state['mapId']);
         $token = $this->getMultiToken($roomId);
@@ -149,6 +246,42 @@ class GameController
         ]);
     }
 
+    public function prepareChallenge(): IContent
+    {
+        $challengeToken_str = $this->request->query('challengeToken');
+        $session = $this->request->session();
+        $userId = $session->get('userId');
+
+        if (!isset($userId))
+        {
+            return new JsonContent(['error' => 'anonymous_user']);
+        }
+
+        $challenge = $this->challengeRepository->getByTokenStr($challengeToken_str);
+
+        if (!isset($challenge))
+        {
+            return new JsonContent(['error' => 'game_not_found']);
+        }
+
+        if (!$this->userInChallengeRepository->isUserParticipatingInChallenge($userId, $challenge)) {
+            // new player is joining
+            $userInChallenge = new UserInChallenge();
+            $userInChallenge->setUserId($userId);
+            $userInChallenge->setChallenge($challenge);
+            $userInChallenge->setTimeLeft($challenge->getTimeLimit());
+            $this->pdm->saveToDb($userInChallenge);
+        }
+
+        $map = $this->mapRepository->getByChallenge($challenge);
+
+        return new JsonContent([
+            'mapId' => $map->getId(),
+            'mapName' => $map->getName(),
+            'bounds' => $map->getBounds()->toArray()
+        ]);
+    }
+
     private function getMultiToken(string $roomId): string
     {
         $session = $this->request->session();

src/Controller/GameFlowController.php

@@ -1,16 +1,28 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Request\IRequest;
 use MapGuesser\Util\Geo\Position;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Interfaces\Response\IContent;
 use MapGuesser\Multi\MultiConnector;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
+use MapGuesser\PersistentData\Model\Challenge;
+use MapGuesser\PersistentData\Model\Guess;
+use MapGuesser\PersistentData\Model\Map;
+use MapGuesser\PersistentData\Model\Place;
+use MapGuesser\PersistentData\Model\PlaceInChallenge;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\Model\UserPlayedPlace;
+use MapGuesser\Repository\GuessRepository;
 use MapGuesser\Repository\MultiRoomRepository;
+use MapGuesser\Repository\PlaceInChallengeRepository;
 use MapGuesser\Repository\PlaceRepository;
+use MapGuesser\Repository\UserInChallengeRepository;
+use MapGuesser\Repository\UserPlayedPlaceRepository;
 
-class GameFlowController
+class GameFlowController implements IAuthenticationRequired
 {
     const NUMBER_OF_ROUNDS = 5;
     const MAX_SCORE = 1000;
@@ -25,6 +37,14 @@ class GameFlowController
 
     private PlaceRepository $placeRepository;
 
+    private UserPlayedPlaceRepository $userPlayedPlaceRepository;
+
+    private UserInChallengeRepository $userInChallengeRepository;
+
+    private PlaceInChallengeRepository $placeInChallengeRepository;
+
+    private GuessRepository $guessRepository;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
@@ -32,6 +52,15 @@ class GameFlowController
         $this->multiConnector = new MultiConnector();
         $this->multiRoomRepository = new MultiRoomRepository();
         $this->placeRepository = new PlaceRepository();
+        $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
+        $this->userInChallengeRepository = new UserInChallengeRepository();
+        $this->placeInChallengeRepository = new PlaceInChallengeRepository();
+        $this->guessRepository = new GuessRepository();
+    }
+
+    public function isAuthenticationRequired(): bool
+    {
+        return empty($_ENV['ENABLE_GAME_FOR_GUESTS']);
     }
 
     public function initialData(): IContent
@@ -110,6 +139,110 @@ class GameFlowController
         return new JsonContent(['ok' => true]);
     }
 
+    private function prepareChallengeResponse(int $userId, Challenge $challenge, int $currentRound, bool $withHistory = false): array
+    {
+        $currentPlace = $this->placeRepository->getByRoundInChallenge($challenge, $currentRound);
+
+        // if the last round was played ($currentPlace == null) or history is explicitly requested (for initializing)
+        if (!isset($currentPlace) || $withHistory) {
+
+            $withRelations = [User::class, PlaceInChallenge::class, Place::class];
+            foreach ($this->guessRepository->getAllInChallenge($challenge, $withRelations) as $guess) {
+                $round = $guess->getPlaceInChallenge()->getRound();
+
+                if ($guess->getUser()->getId() === $userId) {
+                    $response['history'][$round]['position'] =
+                            $guess->getPlaceInChallenge()->getPlace()->getPosition()->toArray();
+                    $response['history'][$round]['result'] = [
+                            'guessPosition' => $guess->getPosition()->toArray(),
+                            'distance' => $guess->getDistance(),
+                            'score' => $guess->getScore()
+                    ];
+                } else {
+                    $response['history'][$round]['allResults'][] = [
+                        'userName' => $guess->getUser()->getDisplayName(),
+                        'guessPosition' => $guess->getPosition()->toArray(),
+                        'distance' => $guess->getDistance(),
+                        'score' => $guess->getScore()
+                    ];
+                }
+            }
+
+            // setting default values for rounds without guesses (because of timeout)
+            for ($i = 0; $i < $currentRound; ++$i) {
+                if (!isset($response['history'][$i]) || !isset($response['history'][$i]['result'])) {
+                    $response['history'][$i]['result'] = [
+                            'guessPosition' => null,
+                            'distance' => null,
+                            'score' => 0
+                    ];
+
+                    $response['history'][$i]['position'] =
+                            $this->placeRepository->getByRoundInChallenge($challenge, $i)->getPosition()->toArray();
+                }
+            }
+
+            $response['history']['length'] = $currentRound;
+        }
+
+        if (!isset($currentPlace)) { // game finished
+            $response['finished'] = true;
+        } else { // continue game
+            $response['place'] = [
+                'panoId' => $currentPlace->getPanoIdCached(),
+                'pov' => $currentPlace->getPov()->toArray()
+            ];
+
+            $prevRound = $currentRound - 1;
+            if ($prevRound >= 0) {
+                foreach ($this->guessRepository->getAllInChallengeByRound($prevRound, $challenge, [User::class]) as $guess) {
+                    if ($guess->getUser()->getId() != $userId) {
+                        $response['allResults'][] = [
+                            'userName' => $guess->getUser()->getDisplayName(),
+                            'guessPosition' => $guess->getPosition()->toArray(),
+                            'distance' => $guess->getDistance(),
+                            'score' => $guess->getScore()
+                        ];
+                    }
+                }
+            }
+        }
+
+        $response['restrictions'] = [
+            'timeLimit' => $challenge->getTimeLimit() * 1000,
+            'timeLimitType' => $challenge->getTimeLimitType(),
+            'noMove' => $challenge->getNoMove(),
+            'noPan' => $challenge->getNoPan(),
+            'noZoom' => $challenge->getNoZoom()
+        ];
+
+        return $response;
+    }
+
+    public function challengeInitialData(): IContent
+    {
+        $session = $this->request->session();
+        $userId = $session->get('userId');
+        $challengeToken_str = $this->request->query('challengeToken');
+        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]);
+
+        if (!isset($userInChallenge)) {
+            return new JsonContent(['error' => 'game_not_found']);
+        }
+
+        $challenge = $userInChallenge->getChallenge();
+        $currentRound = $userInChallenge->getCurrentRound();
+
+        $response = $this->prepareChallengeResponse($userId, $challenge, $currentRound, true);
+
+        if ($challenge->getTimeLimitType() === 'game' && $challenge->getTimeLimit() !== null && $userInChallenge->getCurrentRound() > 0) {
+            $timeLimit = max(10, $userInChallenge->getTimeLeft());
+            $response['restrictions']['timeLimit'] = $timeLimit * 1000;
+        }
+
+        return new JsonContent($response);
+    }
+
     public function guess(): IContent
     {
         $mapId = (int) $this->request->query('mapId');
@@ -121,7 +254,7 @@ class GameFlowController
 
         $last = $state['rounds'][$state['currentRound']];
         $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
-        $result = $this->evalueteGuess($last['position'], $guessPosition, $state['area']);
+        $result = $this->evaluateGuess($last['position'], $guessPosition, $state['area']);
 
         $last['guessPosition'] = $guessPosition;
         $last['distance'] = $result['distance'];
@@ -145,9 +278,31 @@ class GameFlowController
 
         $session->set('state', $state);
 
+        $this->saveVisit($last['placeId']);
+
         return new JsonContent($response);
     }
 
+    // save the selected place for the round in UserPlayedPlace
+    private function saveVisit($placeId): void
+    {
+        $session = $this->request->session();
+        $userId = $session->get('userId');
+
+        if (isset($userId)) {
+            $userPlayedPlace = $this->userPlayedPlaceRepository->getByUserIdAndPlaceId($userId, $placeId);
+            if (!$userPlayedPlace) {
+                $userPlayedPlace = new UserPlayedPlace();
+                $userPlayedPlace->setUserId($userId);
+                $userPlayedPlace->setPlaceId($placeId);
+            } else {
+                $userPlayedPlace->incrementOccurrences();
+            }
+            $userPlayedPlace->setLastTimeDate(new DateTime());
+            $this->pdm->saveToDb($userPlayedPlace);
+        }
+    }
+
     public function multiGuess(): IContent
     {
         $roomId = $this->request->query('roomId');
@@ -162,7 +317,7 @@ class GameFlowController
 
         $last = $state['rounds'][$state['currentRound']];
         $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
-        $result = $this->evalueteGuess($last['position'], $guessPosition, $state['area']);
+        $result = $this->evaluateGuess($last['position'], $guessPosition, $state['area']);
 
         $responseFromMulti = $this->multiConnector->sendMessage('guess', [
             'roomId' => $roomId,
@@ -185,6 +340,70 @@ class GameFlowController
         return new JsonContent($response);
     }
 
+    public function challengeGuess(): IContent
+    {
+        $session = $this->request->session();
+        $userId = $session->get('userId');
+        $challengeToken_str = $this->request->query('challengeToken');
+        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]);
+
+        if (!isset($userInChallenge)) {
+            return new JsonContent(['error' => 'game_not_found']);
+        }
+
+        $challenge = $userInChallenge->getChallenge();
+        $currentRound = $userInChallenge->getCurrentRound();
+        $currentPlaceInChallenge = $this->placeInChallengeRepository->getByRoundInChallenge($currentRound, $challenge, [Place::class, Map::class]);
+        $currentPlace = $currentPlaceInChallenge->getPlace();
+        $map = $currentPlace->getMap();
+
+        // creating response
+        $nextRound = $currentRound + 1;
+        $response = $this->prepareChallengeResponse($userId, $challenge, $nextRound);
+        $response['position'] = $currentPlace->getPosition()->toArray();
+
+        if ($this->request->post('lat') && $this->request->post('lng')) {
+            $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
+            $result = $this->evaluateGuess($currentPlace->getPosition(), $guessPosition, $map->getArea());
+
+            // save guess
+            $guess = new Guess();
+            $guess->setUserId($userId);
+            $guess->setPlaceInChallenge($currentPlaceInChallenge);
+            $guess->setPosition($guessPosition);
+            $guess->setDistance($result['distance']);
+            $guess->setScore($result['score']);
+            $this->pdm->saveToDb($guess);
+
+            $response['result'] = $result;
+
+        } else {
+            // user didn't manage to guess in the round in the given timeframe
+            $response['result'] = ['distance' => null, 'score' => 0];
+        }
+
+        // save user relevant state of challenge
+        $userInChallenge->setCurrentRound($nextRound);
+        $timeLeft = $this->request->post('timeLeft');
+        if (isset($timeLeft)) {
+            $userInChallenge->setTimeLeft(intval($timeLeft));
+        }
+        $this->pdm->saveToDb($userInChallenge);
+
+        if ($challenge->getTimeLimitType() === 'game' && isset($timeLeft)) {
+            $timeLimit = max(10, intval($timeLeft));
+            $response['restrictions']['timeLimit'] = $timeLimit * 1000;
+        }
+
+        if (isset($response['history'][$currentRound]['allResults'])) {
+            $response['allResults'] = $response['history'][$currentRound]['allResults'];
+        }
+
+        $this->saveVisit($currentPlace->getId());
+
+        return new JsonContent($response);
+    }
+
     public function multiNextRound(): IContent
     {
         $roomId = $this->request->query('roomId');
@@ -214,7 +433,7 @@ class GameFlowController
         return new JsonContent(['ok' => true]);
     }
 
-    private function evalueteGuess(Position $realPosition, Position $guessPosition, float $area)
+    private function evaluateGuess(Position $realPosition, Position $guessPosition, float $area)
     {
         $distance = $this->calculateDistance($realPosition, $guessPosition);
         $score = $this->calculateScore($distance, $area);
@@ -224,7 +443,10 @@ class GameFlowController
 
     private function startNewGame(array &$state, int $mapId): void
     {
-        $places = $this->placeRepository->getRandomNForMapWithValidPano($mapId, static::NUMBER_OF_ROUNDS);
+        $session = $this->request->session();
+        $userId = $session->get('userId');
+
+        $places = $this->placeRepository->getRandomNPlaces($mapId, static::NUMBER_OF_ROUNDS, $userId);
 
         $state['rounds'] = [];
         $state['currentRound'] = 0;

src/Controller/HomeController.php

@@ -1,10 +1,10 @@
 <?php namespace MapGuesser\Controller;
 
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Response\Redirect;
+use SokoWeb\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Response\Redirect;
 
 class HomeController
 {

src/Controller/LoginController.php

@@ -2,23 +2,25 @@
 
 use DateInterval;
 use DateTime;
-use MapGuesser\Http\Request;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\Mailing\Mail;
-use MapGuesser\OAuth\GoogleOAuth;
+use SokoWeb\Http\Request;
+use SokoWeb\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
+use SokoWeb\Mailing\Mail;
+use SokoWeb\OAuth\GoogleOAuth;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserConfirmation;
 use MapGuesser\PersistentData\Model\UserPasswordResetter;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
+use MapGuesser\Repository\UserPlayedPlaceRepository;
 use MapGuesser\Repository\UserRepository;
-use MapGuesser\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Response\Redirect;
-use MapGuesser\Util\JwtParser;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Response\Redirect;
+use SokoWeb\Util\CaptchaValidator;
+use SokoWeb\Util\JwtParser;
 
 class LoginController
 {
@@ -32,6 +34,10 @@ class LoginController
 
     private UserPasswordResetterRepository $userPasswordResetterRepository;
 
+    private UserPlayedPlaceRepository $userPlayedPlaceRepository;
+
+    private string $redirectUrl;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
@@ -39,15 +45,20 @@ class LoginController
         $this->userRepository = new UserRepository();
         $this->userConfirmationRepository = new UserConfirmationRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
+        $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
+        $this->redirectUrl = $this->request->session()->has('redirect_after_login') ?
+            $this->request->session()->get('redirect_after_login') :
+            \Container::$routeCollection->getRoute('index')->generateLink();
     }
 
     public function getLoginForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        return new HtmlContent('login/login');
+        return new HtmlContent('login/login', ['redirectUrl' => '/' . $this->redirectUrl]);
     }
 
     public function getGoogleLoginRedirect(): IRedirect
@@ -71,7 +82,8 @@ class LoginController
     public function getSignupForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         if ($this->request->session()->has('tmp_user_data')) {
@@ -93,7 +105,8 @@ class LoginController
     public function getSignupWithGoogleForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         if (!$this->request->session()->has('google_user_data')) {
@@ -104,13 +117,14 @@ class LoginController
 
         $user = $this->userRepository->getByEmail($userData['email']);
 
-        return new HtmlContent('login/google_signup', ['found' => $user !== null, 'email' => $userData['email']]);
+        return new HtmlContent('login/google_signup', ['found' => $user !== null, 'email' => $userData['email'], 'redirectUrl' => '/' . $this->redirectUrl]);
     }
 
     public function getRequestPasswordResetForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         return new HtmlContent('login/password_reset_request', ['email' => $this->request->query('email')]);
@@ -124,7 +138,8 @@ class LoginController
     public function getResetPasswordForm()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         $token = $this->request->query('token');
@@ -136,12 +151,13 @@ class LoginController
 
         $user = $this->userRepository->getById($resetter->getUserId());
 
-        return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail()]);
+        return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail(), 'redirectUrl' => '/' . $this->redirectUrl]);
     }
 
     public function login(): IContent
     {
         if ($this->request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent(['success' => true]);
         }
 
@@ -193,13 +209,15 @@ class LoginController
 
         $this->request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
     public function loginWithGoogle()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
@@ -237,7 +255,8 @@ class LoginController
 
         $this->request->setUser($user);
 
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        $this->deleteRedirectUrl();
+        return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
     }
 
     public function logout(): IRedirect
@@ -250,7 +269,8 @@ class LoginController
     public function signup(): IContent
     {
         if ($this->request->user() !== null) {
-            return new JsonContent(['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()]]);
+            $this->deleteRedirectUrl();
+            return new JsonContent(['redirect' => ['target' => '/' . $this->redirectUrl]]);
         }
 
         $user = $this->userRepository->getByEmail($this->request->post('email'));
@@ -269,7 +289,8 @@ class LoginController
 
                 $this->request->setUser($user);
 
-                $data = ['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('index')->generateLink()]];
+                $this->deleteRedirectUrl();
+                $data = ['redirect' => ['target' => '/' . $this->redirectUrl]];
             } else {
                 $data = [
                     'error' => [
@@ -281,6 +302,18 @@ class LoginController
             return new JsonContent($data);
         }
 
+        if (!empty($_ENV['RECAPTCHA_SITEKEY'])) {
+            if (!$this->request->post('g-recaptcha-response')) {
+                return new JsonContent(['error' => ['errorText' => 'Please check "I\'m not a robot" in the reCAPTCHA box!']]);
+            }
+
+            $captchaValidator = new CaptchaValidator();
+            $captchaResponse = $captchaValidator->validate($this->request->post('g-recaptcha-response'));
+            if (!$captchaResponse['success']) {
+                return new JsonContent(['error' => ['errorText' => 'reCAPTCHA challenge failed. Please try again!']]);
+            }
+        }
+
         if (filter_var($this->request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
             return new JsonContent(['error' => ['errorText' => 'The given email address is not valid.']]);
         }
@@ -338,6 +371,7 @@ class LoginController
     public function signupWithGoogle(): IContent
     {
         if ($this->request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent(['success' => true]);
         }
 
@@ -367,6 +401,7 @@ class LoginController
         $this->request->session()->delete('google_user_data');
         $this->request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
@@ -387,7 +422,8 @@ class LoginController
     public function activate()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
@@ -409,13 +445,15 @@ class LoginController
 
         $this->request->setUser($user);
 
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        $this->deleteRedirectUrl();
+        return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
     }
 
     public function cancel()
     {
         if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
         $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
@@ -430,6 +468,10 @@ class LoginController
 
         $user = $this->userRepository->getById($confirmation->getUserId());
 
+        foreach ($this->userPlayedPlaceRepository->getAllByUser($user) as $userPlayedPlace) {
+            $this->pdm->deleteFromDb($userPlayedPlace);
+        }
+
         $this->pdm->deleteFromDb($user);
 
         \Container::$dbConnection->commit();
@@ -440,13 +482,26 @@ class LoginController
     public function requestPasswordReset(): IContent
     {
         if ($this->request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
+                    'target' => '/' . $this->redirectUrl
                 ]
             ]);
         }
 
+        if (!empty($_ENV['RECAPTCHA_SITEKEY'])) {
+            if (!$this->request->post('g-recaptcha-response')) {
+                return new JsonContent(['error' => ['errorText' => 'Please check "I\'m not a robot" in the reCAPTCHA box!']]);
+            }
+
+            $captchaValidator = new CaptchaValidator();
+            $captchaResponse = $captchaValidator->validate($this->request->post('g-recaptcha-response'));
+            if (!$captchaResponse['success']) {
+                return new JsonContent(['error' => ['errorText' => 'reCAPTCHA challenge failed. Please try again!']]);
+            }
+        }
+
         $user = $this->userRepository->getByEmail($this->request->post('email'));
 
         if ($user === null) {
@@ -505,9 +560,10 @@ class LoginController
     public function resetPassword(): IContent
     {
         if ($this->request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
+                    'target' => '/' . $this->redirectUrl
                 ]
             ]);
         }
@@ -548,6 +604,7 @@ class LoginController
 
         $this->request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
@@ -608,4 +665,9 @@ class LoginController
         ]);
         $mail->send();
     }
+
+    private function deleteRedirectUrl(): void
+    {
+        $this->request->session()->delete('redirect_after_login');
+    }
 }

src/Controller/MapAdminController.php

@@ -1,21 +1,29 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Interfaces\Authentication\IUser;
-use MapGuesser\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Authentication\IUser;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
+use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Map;
 use MapGuesser\PersistentData\Model\Place;
-use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\PersistentData\Model\PlaceInChallenge;
+use SokoWeb\PersistentData\PersistentDataManager;
+use MapGuesser\Repository\ChallengeRepository;
+use MapGuesser\Repository\GuessRepository;
 use MapGuesser\Repository\MapRepository;
+use MapGuesser\Repository\PlaceInChallengeRepository;
 use MapGuesser\Repository\PlaceRepository;
-use MapGuesser\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
+use MapGuesser\Repository\UserInChallengeRepository;
+use MapGuesser\Repository\UserPlayedPlaceRepository;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
 use MapGuesser\Util\Geo\Bounds;
 use MapGuesser\Util\Panorama\Pov;
 
-class MapAdminController implements ISecured
+class MapAdminController implements IAuthenticationRequired, ISecured
 {
     private static string $unnamedMapName = '[unnamed map]';
 
@@ -27,19 +35,37 @@ class MapAdminController implements ISecured
 
     private PlaceRepository $placeRepository;
 
+    private UserPlayedPlaceRepository $userPlayedPlaceRepository;
+
+    private ChallengeRepository $challengeRepository;
+
+    private GuessRepository $guessRepository;
+
+    private PlaceInChallengeRepository $placeInChallengeRepository;
+
+    private UserInChallengeRepository $userInChallengeRepository;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
         $this->pdm = new PersistentDataManager();
         $this->mapRepository = new MapRepository();
         $this->placeRepository = new PlaceRepository();
+        $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
+        $this->challengeRepository = new ChallengeRepository();
+        $this->guessRepository = new GuessRepository();
+        $this->placeInChallengeRepository = new PlaceInChallengeRepository();
+        $this->userInChallengeRepository = new UserInChallengeRepository();
+    }
+
+    public function isAuthenticationRequired(): bool
+    {
+        return true;
     }
 
     public function authorize(): bool
     {
-        $user = $this->request->user();
-
-        return $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN);
+        return $this->request->user()->hasPermission(IUser::PERMISSION_ADMIN);
     }
 
     public function getMapEditor(): IContent
@@ -59,6 +85,7 @@ class MapAdminController implements ISecured
             'mapId' => $mapId,
             'mapName' => $map->getName(),
             'mapDescription' => str_replace('<br>', "\n", $map->getDescription()),
+            'mapUnlisted' => $map->getUnlisted(),
             'bounds' => $map->getBounds()->toArray(),
             'places' => &$places
         ]);
@@ -138,7 +165,7 @@ class MapAdminController implements ISecured
 
                 $place = $this->placeRepository->getById((int) $placeRaw['id']);
 
-                $this->pdm->deleteFromDb($place);
+                $this->deletePlace($place);
             }
         }
 
@@ -153,6 +180,9 @@ class MapAdminController implements ISecured
         if (isset($_POST['description'])) {
             $map->setDescription(str_replace(["\n", "\r\n"], '<br>', $_POST['description']));
         }
+        if (isset($_POST['unlisted'])) {
+            $map->setUnlisted((bool)$_POST['unlisted']);
+        }
 
         $this->pdm->saveToDb($map);
 
@@ -178,13 +208,43 @@ class MapAdminController implements ISecured
         return new JsonContent(['success' => true]);
     }
 
+    private function deletePlace(Place $place): void
+    {
+        foreach ($this->userPlayedPlaceRepository->getAllByPlace($place) as $userPlayedPlace) {
+            $this->pdm->deleteFromDb($userPlayedPlace);
+        }
+
+        foreach ($this->challengeRepository->getAllByPlace($place) as $challenge) {
+            $this->deleteChallenge($challenge);
+        }
+
+        $this->pdm->deleteFromDb($place);
+    }
+
     private function deletePlaces(Map $map): void
     {
         foreach ($this->placeRepository->getAllForMap($map) as $place) {
-            $this->pdm->deleteFromDb($place);
+            $this->deletePlace($place);
         }
     }
 
+    private function deleteChallenge(Challenge $challenge): void
+    {
+        foreach ($this->userInChallengeRepository->getAllByChallenge($challenge) as $userInChallenge) {
+            $this->pdm->deleteFromDb($userInChallenge);
+        }
+
+        foreach ($this->guessRepository->getAllInChallenge($challenge, [PlaceInChallenge::class]) as $guess) {
+            $this->pdm->deleteFromDb($guess);
+        }
+
+        foreach ($this->placeInChallengeRepository->getAllByChallenge($challenge) as $placeInChallenge) {
+            $this->pdm->deleteFromDb($placeInChallenge);
+        }
+
+        $this->pdm->deleteFromDb($challenge);
+    }
+
     private function calculateMapBounds(Map $map): Bounds
     {
         $bounds = new Bounds();

src/Controller/MapsController.php

@@ -1,12 +1,12 @@
 <?php namespace MapGuesser\Controller;
 
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Database\RawExpression;
-use MapGuesser\Interfaces\Authentication\IUser;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Response\HtmlContent;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Database\RawExpression;
+use SokoWeb\Interfaces\Authentication\IUser;
+use SokoWeb\Interfaces\Database\IResultSet;
+use SokoWeb\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Response\HtmlContent;
 
 class MapsController
 {
@@ -30,12 +30,19 @@ class MapsController
             ['maps', 'bound_north_lat'],
             ['maps', 'bound_east_lng'],
             ['maps', 'area'],
+            ['maps', 'unlisted'],
             new RawExpression('COUNT(places.id) AS num_places')
         ]);
         $select->leftJoin('places', ['places', 'map_id'], '=', ['maps', 'id']);
         $select->groupBy(['maps', 'id']);
         $select->orderBy('name');
 
+        $user = $this->request->user();
+        $isAdmin = $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN);
+        if (!$isAdmin) {
+            $select->where(['maps', 'unlisted'], '=', false);
+        }
+
         $result = $select->execute();
 
         $maps = [];
@@ -45,10 +52,10 @@ class MapsController
             $maps[] = $map;
         }
 
-        $user = $this->request->user();
         return new HtmlContent('maps', [
             'maps' => $maps,
-            'isAdmin' => $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN)
+            'isLoggedIn' => $user !== null,
+            'isAdmin' => $isAdmin
         ]);
     }
 

src/Controller/UserController.php

@@ -1,22 +1,25 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Http\Request;
-use MapGuesser\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\OAuth\GoogleOAuth;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\Http\Request;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
+use SokoWeb\OAuth\GoogleOAuth;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\PersistentData\Model\User;
+use MapGuesser\Repository\GuessRepository;
 use MapGuesser\Repository\UserConfirmationRepository;
+use MapGuesser\Repository\UserInChallengeRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
-use MapGuesser\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Response\Redirect;
-use MapGuesser\Util\JwtParser;
+use MapGuesser\Repository\UserPlayedPlaceRepository;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Response\Redirect;
+use SokoWeb\Util\JwtParser;
 
-class UserController implements ISecured
+class UserController implements IAuthenticationRequired
 {
     private IRequest $request;
 
@@ -26,19 +29,26 @@ class UserController implements ISecured
 
     private UserPasswordResetterRepository $userPasswordResetterRepository;
 
+    private UserPlayedPlaceRepository $userPlayedPlaceRepository;
+
+    private UserInChallengeRepository $userInChallengeRepository;
+
+    private GuessRepository $guessRepository;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
         $this->pdm = new PersistentDataManager();
         $this->userConfirmationRepository = new UserConfirmationRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
+        $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
+        $this->userInChallengeRepository = new UserInChallengeRepository();
+        $this->guessRepository = new GuessRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        $user = $this->request->user();
-
-        return $user !== null;
+        return true;
     }
 
     public function getAccount(): IContent
@@ -201,6 +211,18 @@ class UserController implements ISecured
             $this->pdm->deleteFromDb($userPasswordResetter);
         }
 
+        foreach ($this->userPlayedPlaceRepository->getAllByUser($user) as $userPlayedPlace) {
+            $this->pdm->deleteFromDb($userPlayedPlace);
+        }
+
+        foreach ($this->userInChallengeRepository->getAllByUser($user) as $userInChallenge) {
+            $this->pdm->deleteFromDb($userInChallenge);
+        }
+
+        foreach ($this->guessRepository->getAllByUser($user) as $guess) {
+            $this->pdm->deleteFromDb($guess);
+        }
+
         $this->pdm->deleteFromDb($user);
 
         \Container::$dbConnection->commit();
@@ -210,7 +232,7 @@ class UserController implements ISecured
         return new JsonContent(['success' => true]);
     }
 
-    private function confirmUserIdentity(User $user, ?DateTime $authenticatedWithGoogleUntil, ?string $password, string &$error): bool
+    private function confirmUserIdentity(User $user, ?DateTime $authenticatedWithGoogleUntil, ?string $password, ?string &$error): bool
     {
         if ($authenticatedWithGoogleUntil !== null && $authenticatedWithGoogleUntil > new DateTime()) {
             return true;

src/Database/Mysql/Connection.php

@@ -1,114 +0,0 @@
-<?php namespace MapGuesser\Database\Mysql;
-
-use MapGuesser\Interfaces\Database\IConnection;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Database\IStatement;
-use mysqli;
-
-class Connection implements IConnection
-{
-    private mysqli $connection;
-
-    public function __construct(string $host, string $user, string $password, string $db, int $port = -1, string $socket = null)
-    {
-        if ($port < 0) {
-            $port = (int) ini_get('mysqli.default_port');
-        }
-
-        if ($socket === null) {
-            $socket = (string) ini_get('mysqli.default_socket');
-        }
-
-        $this->connection = new mysqli($host, $user, $password, $db, $port, $socket);
-
-        if ($this->connection->connect_error) {
-            throw new \Exception('Connection failed: ' . $this->connection->connect_error);
-        }
-
-        if (!$this->connection->set_charset('utf8mb4')) {
-            throw new \Exception($this->connection->error);
-        }
-    }
-
-    public function __destruct()
-    {
-        $this->connection->close();
-    }
-
-    public function startTransaction(): void
-    {
-        if (!$this->connection->autocommit(false)) {
-            throw new \Exception($this->connection->error);
-        }
-    }
-
-    public function commit(): void
-    {
-        if (!$this->connection->commit() || !$this->connection->autocommit(true)) {
-            throw new \Exception($this->connection->error);
-        }
-    }
-
-    public function rollback(): void
-    {
-        if (!$this->connection->rollback() || !$this->connection->autocommit(true)) {
-            throw new \Exception($this->connection->error);
-        }
-    }
-
-    public function query(string $query): ?IResultSet
-    {
-        if (!($result = $this->connection->query($query))) {
-            throw new \Exception($this->connection->error . '. Query: ' . $query);
-        }
-
-        if ($result !== true) {
-            return new ResultSet($result);
-        }
-
-        return null;
-    }
-
-    public function multiQuery(string $query): array
-    {
-        if (!$this->connection->multi_query($query)) {
-            throw new \Exception($this->connection->error . '. Query: ' . $query);
-        }
-
-        $ret = [];
-        do {
-            if ($result = $this->connection->store_result()) {
-                $ret[] = new ResultSet($result);
-            } else {
-                $ret[] = null;
-            }
-
-            $this->connection->more_results();
-        } while ($this->connection->next_result());
-
-        if ($this->connection->error) {
-            throw new \Exception($this->connection->error  . '. Query: ' . $query);
-        }
-
-        return $ret;
-    }
-
-    public function prepare(string $query): IStatement
-    {
-        if (!($stmt = $this->connection->prepare($query))) {
-            throw new \Exception($this->connection->error . '. Query: ' . $query);
-        }
-
-        return new Statement($stmt);
-    }
-
-    public function lastId(): int
-    {
-        return $this->connection->insert_id;
-    }
-
-    public function getAffectedRows(): int
-    {
-        return $this->connection->affected_rows;
-    }
-}

src/Database/Mysql/ResultSet.php

@@ -1,62 +0,0 @@
-<?php namespace MapGuesser\Database\Mysql;
-
-use MapGuesser\Interfaces\Database\IResultSet;
-use mysqli_result;
-
-class ResultSet implements IResultSet
-{
-    private mysqli_result $result;
-
-    public function __construct(mysqli_result $result)
-    {
-        $this->result = $result;
-    }
-
-    public function fetch(int $type = IResultSet::FETCH_ASSOC): ?array
-    {
-        return $this->result->fetch_array($this->convertFetchType($type));
-    }
-
-    public function fetchAll(int $type = IResultSet::FETCH_ASSOC): array
-    {
-        return $this->result->fetch_all($this->convertFetchType($type));
-    }
-
-    public function fetchOneColumn(string $valueName, string $keyName = null): array
-    {
-        $array = [];
-
-        while ($r = $this->fetch(IResultSet::FETCH_ASSOC)) {
-            if (isset($keyName)) {
-                $array[$r[$keyName]] = $r[$valueName];
-            } else {
-                $array[] = $r[$valueName];
-            }
-        }
-
-        return $array;
-    }
-
-    private function convertFetchType(int $type): int
-    {
-        switch ($type) {
-            case IResultSet::FETCH_ASSOC:
-                $internal_type = MYSQLI_ASSOC;
-                break;
-
-            case IResultSet::FETCH_BOTH:
-                $internal_type = MYSQLI_BOTH;
-                break;
-
-            case IResultSet::FETCH_NUM:
-                $internal_type = MYSQLI_NUM;
-                break;
-
-            default:
-                $internal_type = MYSQLI_BOTH;
-                break;
-        }
-
-        return $internal_type;
-    }
-}

src/Database/Mysql/Statement.php

@@ -1,79 +0,0 @@
-<?php namespace MapGuesser\Database\Mysql;
-
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Database\IStatement;
-use mysqli_stmt;
-
-class Statement implements IStatement
-{
-    private mysqli_stmt $stmt;
-
-    public function __construct(mysqli_stmt $stmt)
-    {
-        $this->stmt = $stmt;
-    }
-
-    public function __destruct()
-    {
-        $this->stmt->close();
-    }
-
-    public function execute(array $params = []): ?IResultSet
-    {
-        if ($params) {
-            $ref_params = [''];
-
-            foreach ($params as &$param) {
-                $type = gettype($param);
-
-                switch ($type) {
-                    case 'integer':
-                    case 'double':
-                    case 'string':
-                        $t = $type[0];
-                        break;
-
-                    case 'NULL':
-                        $t = 's';
-                        break;
-
-                    case 'boolean':
-                        $param = (string) (int) $param;
-                        $t = 's';
-                        break;
-
-                    case 'array':
-                        $param = json_encode($param);
-                        $t = 's';
-                        break;
-                }
-
-                if (!isset($t)) {
-                    throw new \Exception('Data type ' . $type . ' not supported!');
-                }
-
-                $ref_params[] = &$param;
-                $ref_params[0] .= $t;
-            }
-
-            if (!call_user_func_array([$this->stmt, 'bind_param'], $ref_params)) {
-                throw new \Exception($this->stmt->error);
-            }
-        }
-
-        if (!$this->stmt->execute()) {
-            throw new \Exception($this->stmt->error);
-        }
-
-        if ($result_set = $this->stmt->get_result()) {
-            return new ResultSet($result_set);
-        }
-
-        return null;
-    }
-
-    public function getAffectedRows(): int
-    {
-        return $this->stmt->affected_rows;
-    }
-}

src/Database/Query/Modify.php

@@ -1,140 +0,0 @@
-<?php namespace MapGuesser\Database\Query;
-
-use MapGuesser\Interfaces\Database\IConnection;
-use MapGuesser\Database\Utils;
-
-class Modify
-{
-    private IConnection $connection;
-
-    private string $table;
-
-    private string $idName = 'id';
-
-    private array $attributes = [];
-
-    private ?string $externalId = null;
-
-    private bool $autoIncrement = true;
-
-    public function __construct(IConnection $connection, string $table)
-    {
-        $this->connection = $connection;
-        $this->table = $table;
-    }
-
-    public function setIdName(string $idName): Modify
-    {
-        $this->idName = $idName;
-
-        return $this;
-    }
-
-    public function setExternalId($id): Modify
-    {
-        $this->externalId = $id;
-
-        return $this;
-    }
-
-    public function setAutoIncrement(bool $autoIncrement = true): Modify
-    {
-        $this->autoIncrement = $autoIncrement;
-
-        return $this;
-    }
-
-    public function fill(array $attributes): Modify
-    {
-        $this->attributes = array_merge($this->attributes, $attributes);
-
-        return $this;
-    }
-
-    public function set(string $name, $value): Modify
-    {
-        $this->attributes[$name] = $value;
-
-        return $this;
-    }
-
-    public function setId($id): Modify
-    {
-        $this->attributes[$this->idName] = $id;
-
-        return $this;
-    }
-
-    public function getId()
-    {
-        return $this->attributes[$this->idName];
-    }
-
-    public function save(): void
-    {
-        if (isset($this->attributes[$this->idName])) {
-            $this->update();
-        } else {
-            $this->insert();
-        }
-    }
-
-    public function delete(): void
-    {
-        if (!isset($this->attributes[$this->idName])) {
-            throw new \Exception('No primary key specified!');
-        }
-
-        $query = 'DELETE FROM ' . Utils::backtick($this->table) . ' WHERE ' . Utils::backtick($this->idName) . '=?';
-
-        $stmt = $this->connection->prepare($query);
-        $stmt->execute([$this->idName => $this->attributes[$this->idName]]);
-    }
-
-    private function insert(): void
-    {
-        if ($this->externalId !== null) {
-            $this->attributes[$this->idName] = $this->externalId;
-        } elseif (!$this->autoIncrement) {
-            $this->attributes[$this->idName] = $this->generateKey();
-        }
-
-        $set = $this->generateColumnsWithBinding(array_keys($this->attributes));
-
-        $query = 'INSERT INTO ' . Utils::backtick($this->table) . ' SET ' . $set;
-
-        $stmt = $this->connection->prepare($query);
-        $stmt->execute($this->attributes);
-
-        if ($this->autoIncrement) {
-            $this->attributes[$this->idName] = $this->connection->lastId();
-        }
-    }
-
-    private function update(): void
-    {
-        $attributes = $this->attributes;
-        unset($attributes[$this->idName]);
-
-        $set = $this->generateColumnsWithBinding(array_keys($attributes));
-
-        $query = 'UPDATE ' . Utils::backtick($this->table) . ' SET ' . $set . ' WHERE ' . Utils::backtick($this->idName) . '=?';
-
-        $stmt = $this->connection->prepare($query);
-        $stmt->execute(array_merge($attributes, [$this->idName => $this->attributes[$this->idName]]));
-    }
-
-    public static function generateColumnsWithBinding(array $columns): string
-    {
-        array_walk($columns, function(&$value, $key) {
-            $value = Utils::backtick($value) . '=?';
-        });
-
-        return implode(',', $columns);
-    }
-
-    private function generateKey(): string
-    {
-        return substr(hash('sha256', serialize($this->attributes) . random_bytes(5) . microtime()), 0, 7);
-    }
-}

src/Database/Query/Select.php

@@ -1,412 +0,0 @@
-<?php namespace MapGuesser\Database\Query;
-
-use Closure;
-use MapGuesser\Interfaces\Database\IConnection;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Database\RawExpression;
-use MapGuesser\Database\Utils;
-
-class Select
-{
-    const CONDITION_WHERE = 0;
-
-    const CONDITION_HAVING = 1;
-
-    private IConnection $connection;
-
-    private string $table;
-
-    private string $idName = 'id';
-
-    private array $tableAliases = [];
-
-    private array $joins = [];
-
-    private array $columns = [];
-
-    private array $conditions = [self::CONDITION_WHERE => [], self::CONDITION_HAVING => []];
-
-    private array $groups = [];
-
-    private array $orders = [];
-
-    private ?array $limit;
-
-    public function __construct(IConnection $connection, ?string $table = null)
-    {
-        $this->connection = $connection;
-
-        if ($table !== null) {
-            $this->table = $table;
-        }
-    }
-
-    public function setIdName(string $idName): Select
-    {
-        $this->idName = $idName;
-
-        return $this;
-    }
-
-    public function setTableAliases(array $tableAliases): Select
-    {
-        $this->tableAliases = array_merge($this->tableAliases, $tableAliases);
-
-        return $this;
-    }
-
-    public function from(string $table): Select
-    {
-        $this->table = $table;
-
-        return $this;
-    }
-
-    public function columns(array $columns): Select
-    {
-        $this->columns = array_merge($this->columns, $columns);
-
-        return $this;
-    }
-
-    public function innerJoin($table, $column1, string $relation, $column2): Select
-    {
-        $this->addJoin('INNER', $table, $column1, $relation, $column2);
-
-        return $this;
-    }
-
-    public function leftJoin($table, $column1, string $relation, $column2): Select
-    {
-        $this->addJoin('LEFT', $table, $column1, $relation, $column2);
-
-        return $this;
-    }
-
-    public function whereId($value): Select
-    {
-        $this->addWhereCondition('AND', $this->idName, '=', $value);
-
-        return $this;
-    }
-
-    public function where($column, string $relation = null, $value = null): Select
-    {
-        $this->addWhereCondition('AND', $column, $relation, $value);
-
-        return $this;
-    }
-
-    public function orWhere($column, string $relation = null, $value = null): Select
-    {
-        $this->addWhereCondition('OR', $column, $relation, $value);
-
-        return $this;
-    }
-
-    public function having($column, string $relation = null, $value = null): Select
-    {
-        $this->addHavingCondition('AND', $column, $relation, $value);
-
-        return $this;
-    }
-
-    public function orHaving($column, string $relation = null, $value = null): Select
-    {
-        $this->addHavingCondition('OR', $column, $relation, $value);
-
-        return $this;
-    }
-
-    public function groupBy($column): Select
-    {
-        $this->groups[] = $column;
-
-        return $this;
-    }
-
-    public function orderBy($column, string $type = 'ASC'): Select
-    {
-        $this->orders[] = [$column, $type];
-
-        return $this;
-    }
-
-    public function limit(int $limit, int $offset = 0): Select
-    {
-        $this->limit = [$limit, $offset];
-
-        return $this;
-    }
-
-    public function resetLimit(): void
-    {
-        $this->limit = null;
-    }
-
-    public function paginate(int $page, int $itemsPerPage): Select
-    {
-        $this->limit($itemsPerPage, ($page - 1) * $itemsPerPage);
-
-        return $this;
-    }
-
-    public function execute(): IResultSet
-    {
-        list($query, $params) = $this->generateQuery();
-
-        return $this->connection->prepare($query)->execute($params);
-    }
-
-    public function count(): int
-    {
-        if (count($this->groups) > 0 || count($this->conditions[self::CONDITION_HAVING]) > 0) {
-            $orders = $this->orders;
-
-            $this->orders = [];
-
-            list($query, $params) = $this->generateQuery();
-
-            $result = $this->connection->prepare('SELECT COUNT(*) num_rows FROM (' . $query . ') x')
-                ->execute($params)
-                ->fetch(IResultSet::FETCH_NUM);
-
-            $this->orders = $orders;
-
-            return $result[0];
-        } else {
-            $columns = $this->columns;
-            $orders = $this->orders;
-
-            $this->columns = [new RawExpression('COUNT(*) num_rows')];
-            $this->orders = [];
-
-            list($query, $params) = $this->generateQuery();
-
-            $result = $this->connection->prepare($query)
-                ->execute($params)
-                ->fetch(IResultSet::FETCH_NUM);
-
-            $this->columns = $columns;
-            $this->orders = $orders;
-
-            return $result[0];
-        }
-    }
-
-    private function addJoin(string $type, $table, $column1, string $relation, $column2): void
-    {
-        $this->joins[] = [$type, $table, $column1, $relation, $column2];
-    }
-
-    private function addWhereCondition(string $logic, $column, string $relation, $value): void
-    {
-        $this->conditions[self::CONDITION_WHERE][] = [$logic, $column, $relation, $value];
-    }
-
-    private function addHavingCondition(string $logic, $column, string $relation, $value): void
-    {
-        $this->conditions[self::CONDITION_HAVING][] = [$logic, $column, $relation, $value];
-    }
-
-    private function generateQuery(): array
-    {
-        $queryString = 'SELECT ' . $this->generateColumns() . ' FROM ' . $this->generateTable($this->table, true);
-
-        if (count($this->joins) > 0) {
-            $queryString .= ' ' . $this->generateJoins();
-        }
-
-        if (count($this->conditions[self::CONDITION_WHERE]) > 0) {
-            list($wheres, $whereParams) = $this->generateConditions(self::CONDITION_WHERE);
-
-            $queryString .= ' WHERE ' .  $wheres;
-        } else {
-            $whereParams = [];
-        }
-
-        if (count($this->groups) > 0) {
-            $queryString .= ' GROUP BY ' . $this->generateGroupBy();
-        }
-
-        if (count($this->conditions[self::CONDITION_HAVING]) > 0) {
-            list($havings, $havingParams) = $this->generateConditions(self::CONDITION_HAVING);
-
-            $queryString .= ' HAVING ' .  $havings;
-        } else {
-            $havingParams = [];
-        }
-
-        if (count($this->orders) > 0) {
-            $queryString .= ' ORDER BY ' . $this->generateOrderBy();
-        }
-
-        if (isset($this->limit)) {
-            $queryString .= ' LIMIT ' . $this->limit[1] . ', ' . $this->limit[0];
-        }
-
-        return [$queryString, array_merge($whereParams, $havingParams)];
-    }
-
-    private function generateTable($table, bool $defineAlias = false): string
-    {
-        if ($table instanceof RawExpression) {
-            return (string) $table;
-        }
-
-        if (isset($this->tableAliases[$table])) {
-            return ($defineAlias ? Utils::backtick($this->tableAliases[$table]) . ' ' . Utils::backtick($table) : Utils::backtick($table));
-        }
-
-        return Utils::backtick($table);
-    }
-
-    private function generateColumn($column): string
-    {
-        if ($column instanceof RawExpression) {
-            return (string) $column;
-        }
-
-        if (is_array($column)) {
-            $out = '';
-
-            if ($column[0]) {
-                $out .= $this->generateTable($column[0]) . '.';
-            }
-
-            $out .= Utils::backtick($column[1]);
-
-            if (!empty($column[2])) {
-                $out .= ' ' . Utils::backtick($column[2]);
-            }
-
-            return $out;
-        } else {
-            return Utils::backtick($column);
-        }
-    }
-
-    private function generateColumns(): string
-    {
-        $columns = $this->columns;
-
-        array_walk($columns, function (&$value, $key) {
-            $value = $this->generateColumn($value);
-        });
-
-        return implode(',', $columns);
-    }
-
-    private function generateJoins(): string
-    {
-        $joins = $this->joins;
-
-        array_walk($joins, function (&$value, $key) {
-            $value = $value[0] . ' JOIN ' . $this->generateTable($value[1], true) . ' ON ' . $this->generateColumn($value[2]) . ' ' . $value[3] . ' ' . $this->generateColumn($value[4]);
-        });
-
-        return implode(' ', $joins);
-    }
-
-    private function generateConditions(int $type): array
-    {
-        $conditions = '';
-        $params = [];
-
-        foreach ($this->conditions[$type] as $condition) {
-            list($logic, $column, $relation, $value) = $condition;
-
-            if ($column instanceof Closure) {
-                list($conditionsStringFragment, $paramsFragment) = $this->generateComplexConditionFragment($type, $column);
-            } else {
-                list($conditionsStringFragment, $paramsFragment) = $this->generateConditionFragment($condition);
-            }
-
-            if ($conditions !== '') {
-                $conditions .= ' ' . $logic . ' ';
-            }
-
-            $conditions .= $conditionsStringFragment;
-            $params = array_merge($params, $paramsFragment);
-        }
-
-        return [$conditions, $params];
-    }
-
-    private function generateConditionFragment(array $condition): array
-    {
-        list($logic, $column, $relation, $value) = $condition;
-
-        if ($column instanceof RawExpression) {
-            return [(string) $column, []];
-        }
-
-        $conditionsString = $this->generateColumn($column) . ' ';
-
-        if ($value === null) {
-            return [$conditionsString . ($relation == '=' ? 'IS NULL' : 'IS NOT NULL'), []];
-        }
-
-        $conditionsString .= strtoupper($relation) . ' ';;
-
-        switch ($relation = strtolower($relation)) {
-            case 'between':
-                $params = [$value[0], $value[1]];
-
-                $conditionsString .= '? AND ?';
-                break;
-
-            case 'in':
-            case 'not in':
-                $params = $value;
-
-                if (count($value) > 0) {
-                    $conditionsString .= '(' . implode(', ', array_fill(0, count($value), '?')) . ')';
-                } else {
-                    $conditionsString = $relation == 'in' ? '0' : '1';
-                }
-                break;
-
-            default:
-                $params = [$value];
-
-                $conditionsString .= '?';
-        }
-
-        return [$conditionsString, $params];
-    }
-
-    private function generateComplexConditionFragment(int $type, Closure $conditionCallback): array
-    {
-        $instance = new self($this->connection, $this->table);
-        $instance->tableAliases = $this->tableAliases;
-
-        $conditionCallback($instance);
-
-        list($conditions, $params) = $instance->generateConditions($type);
-
-        return ['(' . $conditions . ')', $params];
-    }
-
-    private function generateGroupBy(): string
-    {
-        $groups = $this->groups;
-
-        array_walk($groups, function (&$value, $key) {
-            $value = $this->generateColumn($value);
-        });
-
-        return implode(',', $groups);
-    }
-
-    private function generateOrderBy(): string
-    {
-        $orders = $this->orders;
-
-        array_walk($orders, function (&$value, $key) {
-            $value = $this->generateColumn($value[0]) . ' ' . strtoupper($value[1]);
-        });
-
-        return implode(',', $orders);
-    }
-}

src/Database/RawExpression.php

@@ -1,16 +0,0 @@
-<?php namespace MapGuesser\Database;
-
-class RawExpression
-{
-    private string $expression;
-
-    public function __construct(string $expression)
-    {
-        $this->expression = $expression;
-    }
-
-    public function __toString(): string
-    {
-        return $this->expression;
-    }
-}

src/Database/Utils.php

@@ -1,8 +0,0 @@
-<?php namespace MapGuesser\Database;
-
-class Utils {
-    public static function backtick(string $name): string
-    {
-        return '`' . $name . '`';
-    }
-}

src/Http/Request.php

@@ -1,102 +0,0 @@
-<?php namespace MapGuesser\Http;
-
-use MapGuesser\Interfaces\Http\IRequest;
-use MapGuesser\Interfaces\Http\IResponse;
-
-class Request implements IRequest
-{
-    private string $url;
-
-    private int $method;
-
-    private string $query = '';
-
-    private array $headers = [];
-
-    public function __construct(string $url = '', int $method = self::HTTP_GET)
-    {
-        $this->url = $url;
-        $this->method = $method;
-    }
-
-    public function setUrl(string $url): void
-    {
-        $this->url = $url;
-    }
-
-    public function setMethod(int $method): void
-    {
-        $this->method = $method;
-    }
-
-    public function setQuery($query): void
-    {
-        if (is_string($query)) {
-            $this->query = $query;
-        } else {
-            $this->query = http_build_query($query);
-        }
-    }
-
-    public function setHeaders(array $headers): void
-    {
-        $this->headers = array_merge($this->headers, $headers);
-    }
-
-    public function send(): IResponse
-    {
-        $ch = curl_init();
-
-        if ($this->method === self::HTTP_POST) {
-            $url = $this->url;
-
-            curl_setopt($ch, CURLOPT_POST, 1);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->query);
-        } else {
-            $url = $this->url . '?' . $this->query;
-        }
-
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 20);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'MapGuesser cURL/1.0');
-
-        if (count($this->headers) > 0) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $this->headers);
-        }
-
-        $responseHeaders = [];
-        curl_setopt(
-            $ch,
-            CURLOPT_HEADERFUNCTION,
-            function ($ch, $header) use (&$responseHeaders) {
-                $len = strlen($header);
-                $header = explode(':', $header, 2);
-
-                if (count($header) < 2) {
-                    return $len;
-                }
-
-                $responseHeaders[strtolower(trim($header[0]))][] = trim($header[1]);
-
-                return $len;
-            }
-        );
-
-        $responseBody = curl_exec($ch);
-
-        if ($responseBody === false) {
-            $error = curl_error($ch);
-
-            curl_close($ch);
-
-            throw new \Exception($error);
-        }
-
-        curl_close($ch);
-
-        return new Response($responseBody, $responseHeaders);
-    }
-}

src/Http/Response.php

@@ -1,26 +0,0 @@
-<?php namespace MapGuesser\Http;
-
-use MapGuesser\Interfaces\Http\IResponse;
-
-class Response implements IResponse
-{
-    private string $body;
-
-    private array $headers;
-
-    public function __construct(string $body, array $headers)
-    {
-        $this->body = $body;
-        $this->headers = $headers;
-    }
-
-    public function getBody(): string
-    {
-        return $this->body;
-    }
-
-    public function getHeaders(): array
-    {
-        return $this->headers;
-    }
-}

src/Interfaces/Authentication/IUser.php

@@ -1,16 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Authentication;
-
-interface IUser
-{
-    const PERMISSION_NORMAL = 0;
-
-    const PERMISSION_ADMIN = 1;
-
-    public function hasPermission(int $permission): bool;
-
-    public function getUniqueId();
-
-    public function getDisplayName(): string;
-
-    public function checkPassword(string $password): bool;
-}

src/Interfaces/Authorization/ISecured.php

@@ -1,6 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Authorization;
-
-interface ISecured
-{
-    public function authorize(): bool;
-}

src/Interfaces/Database/IConnection.php

@@ -1,20 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Database;
-
-interface IConnection
-{
-    public function startTransaction(): void;
-
-    public function commit(): void;
-
-    public function rollback(): void;
-
-    public function query(string $query): ?IResultSet;
-
-    public function multiQuery(string $query): array;
-
-    public function prepare(string $query): IStatement;
-
-    public function lastId(): int;
-
-    public function getAffectedRows(): int;
-}

src/Interfaces/Database/IResultSet.php

@@ -1,16 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Database;
-
-interface IResultSet
-{
-    const FETCH_ASSOC = 0;
-
-    const FETCH_NUM = 1;
-
-    const FETCH_BOTH = 2;
-
-    public function fetch(int $type): ?array;
-
-    public function fetchAll(int $type): array;
-
-    public function fetchOneColumn(string $valueName, string $keyName): array;
-}

src/Interfaces/Database/IStatement.php

@@ -1,8 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Database;
-
-interface IStatement
-{
-    public function execute(array $params): ?IResultSet;
-
-    public function getAffectedRows(): int;
-}

src/Interfaces/Http/IRequest.php

@@ -1,18 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Http;
-
-interface IRequest
-{
-    const HTTP_GET = 0;
-
-    const HTTP_POST = 1;
-
-    public function setUrl(string $url): void;
-
-    public function setMethod(int $method): void;
-
-    public function setQuery($query): void;
-
-    public function setHeaders(array $headers): void;
-
-    public function send(): IResponse;
-}

src/Interfaces/Http/IResponse.php

@@ -1,8 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Http;
-
-interface IResponse
-{
-    public function getBody(): string;
-
-    public function getHeaders(): array;
-}

src/Interfaces/Request/IRequest.php

@@ -1,20 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Request;
-
-use MapGuesser\Interfaces\Authentication\IUser;
-
-interface IRequest
-{
-    public function setParsedRouteParams(array &$routeParams): void;
-
-    public function getBase(): string;
-
-    public function query(string $key);
-
-    public function post(string $key);
-
-    public function session(): ISession;
-
-    public function setUser(?IUser $user): void;
-
-    public function user(): ?IUser;
-}

src/Interfaces/Request/ISession.php

@@ -1,12 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Request;
-
-interface ISession
-{
-    public function has(string $key): bool;
-
-    public function get(string $key);
-
-    public function set(string $key, $value): void;
-
-    public function delete(string $key): void;
-}

src/Interfaces/Response/IContent.php

@@ -1,12 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Response;
-
-interface IContent
-{
-    public function setData(array $data): void;
-
-    public function getData(): array;
-
-    public function render(): void;
-
-    public function getContentType(): string;
-}

src/Interfaces/Response/IRedirect.php

@@ -1,12 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Response;
-
-interface IRedirect
-{
-    const PERMANENT = 1;
-
-    const TEMPORARY = 2;
-
-    public function getUrl(): string;
-
-    public function getHttpCode(): int;
-}

src/Interfaces/Session/ISessionHandler.php

@@ -1,9 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Session;
-
-use SessionHandlerInterface;
-use SessionIdInterface;
-use SessionUpdateTimestampHandlerInterface;
-
-interface ISessionHandler extends SessionHandlerInterface, SessionIdInterface, SessionUpdateTimestampHandlerInterface
-{
-}

src/Mailing/Mail.php

@@ -1,87 +0,0 @@
-<?php namespace MapGuesser\Mailing;
-
-use PHPMailer\PHPMailer\PHPMailer;
-
-class Mail
-{
-    private array $recipients = [];
-
-    public string $subject = '';
-
-    public string $body = '';
-
-    public function addRecipient(string $mail, ?string $name = null): void
-    {
-        $this->recipients[] = [$mail, $name];
-    }
-
-    public function setSubject(string $subject): void
-    {
-        $this->subject = $subject;
-    }
-
-    public function setBody(string $body): void
-    {
-        $this->body = $body;
-    }
-
-    public function setBodyFromTemplate(string $template, array $params = []): void
-    {
-        $this->body = file_get_contents(ROOT . '/mail/' . $template . '.html');
-
-        $baseParameters = [
-            'APP_NAME' => $_ENV['APP_NAME'],
-            'BASE_URL' => \Container::$request->getBase(),
-        ];
-
-        $params = array_merge($baseParameters, $params);
-
-        foreach ($params as $key => $param) {
-            $this->body = str_replace('{{' . $key . '}}', $param, $this->body);
-        }
-    }
-
-    public function send(): void
-    {
-        $mailer = new PHPMailer(true);
-
-        $mailer->CharSet = 'utf-8';
-        $mailer->Hostname = substr($_ENV['MAIL_FROM'], strpos($_ENV['MAIL_FROM'], '@') + 1);
-
-        if (!empty($_ENV['MAIL_HOST'])) {
-            $mailer->Mailer = 'smtp';
-            $mailer->Host = $_ENV['MAIL_HOST'];
-            $mailer->Port = !empty($_ENV['MAIL_PORT']) ? $_ENV['MAIL_PORT'] : 25;
-            $mailer->SMTPSecure = !empty($_ENV['MAIL_SECURE']) ? $_ENV['MAIL_SECURE'] : '';
-
-            if (!empty($_ENV['MAIL_USER'])) {
-                $mailer->SMTPAuth = true;
-                $mailer->Username = $_ENV['MAIL_USER'];
-                $mailer->Password = $_ENV['MAIL_PASSWORD'];
-            } else {
-                $mailer->SMTPAuth = false;
-            }
-        } else {
-            $mailer->Mailer = 'mail';
-        }
-
-        $mailer->setFrom($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
-        $mailer->addReplyTo($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
-
-        $mailer->Sender = !empty($_ENV['MAIL_BOUNCE']) ? $_ENV['MAIL_BOUNCE'] : $_ENV['MAIL_FROM'];
-        $mailer->Subject = $this->subject;
-        $mailer->msgHTML($this->body);
-
-        foreach ($this->recipients as $recipient) {
-            $this->sendMail($mailer, $recipient);
-        }
-    }
-
-    private function sendMail(PHPMailer $mailer, array $recipient): void
-    {
-        $mailer->clearAddresses();
-        $mailer->addAddress($recipient[0], $recipient[1]);
-
-        $mailer->send();
-    }
-}

src/OAuth/GoogleOAuth.php

@@ -1,56 +0,0 @@
-<?php namespace MapGuesser\OAuth;
-
-use MapGuesser\Interfaces\Http\IRequest;
-
-class GoogleOAuth
-{
-    private static string $dialogUrlBase = 'https://accounts.google.com/o/oauth2/v2/auth';
-
-    private static string $tokenUrlBase = 'https://oauth2.googleapis.com/token';
-
-    private IRequest $request;
-
-    public function __construct(IRequest $request)
-    {
-        $this->request = $request;
-    }
-
-    public function getDialogUrl(string $state, string $redirectUrl, ?string $nonce = null, ?string $loginHint = null): string
-    {
-        $oauthParams = [
-            'response_type' => 'code',
-            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
-            'scope' => 'openid email',
-            'redirect_uri' => $redirectUrl,
-            'state' => $state,
-        ];
-
-        if ($nonce !== null) {
-            $oauthParams['nonce'] = $nonce;
-        }
-
-        if ($loginHint !== null) {
-            $oauthParams['login_hint'] = $loginHint;
-        }
-
-        return self::$dialogUrlBase . '?' . http_build_query($oauthParams);
-    }
-
-    public function getToken(string $code, string $redirectUrl): array
-    {
-        $tokenParams = [
-            'code' => $code,
-            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
-            'client_secret' => $_ENV['GOOGLE_OAUTH_CLIENT_SECRET'],
-            'redirect_uri' => $redirectUrl,
-            'grant_type' => 'authorization_code',
-        ];
-
-        $this->request->setUrl(self::$tokenUrlBase);
-        $this->request->setMethod(IRequest::HTTP_POST);
-        $this->request->setQuery($tokenParams);
-        $response = $this->request->send();
-
-        return json_decode($response->getBody(), true);
-    }
-}

src/PersistentData/Model/Challenge.php

@@ -0,0 +1,113 @@
+<?php namespace MapGuesser\PersistentData\Model;
+
+use DateTime;
+use SokoWeb\PersistentData\Model\Model;
+
+class Challenge extends Model
+{
+    protected static string $table = 'challenges';
+
+    protected static array $fields = ['token', 'time_limit', 'time_limit_type', 'no_move', 'no_pan', 'no_zoom', 'created'];
+
+    protected static array $relations = [];
+
+    private int $token;
+
+    private ?int $timeLimit = null;
+
+    private static array $timeLimitTypes = ['game', 'round'];
+
+    private string $timeLimitType = 'game';
+
+    private bool $noMove = false;
+
+    private bool $noPan = false;
+
+    private bool $noZoom = false;
+
+    private DateTime $created;
+
+    public function setToken(int $token): void
+    {
+        $this->token = $token;
+    }
+
+    public function setTimeLimit(?int $timeLimit): void
+    {
+        if (isset($timeLimit)) {
+            $this->timeLimit = $timeLimit;
+        }
+    }
+
+    public function setTimeLimitType(string $timeLimitType): void
+    {
+        if (in_array($timeLimitType, self::$timeLimitTypes)) {
+            $this->timeLimitType = $timeLimitType;
+        }
+    }
+
+    public function setNoMove(bool $noMove): void
+    {
+        $this->noMove = $noMove;
+    }
+
+    public function setNoPan(bool $noPan): void
+    {
+        $this->noPan = $noPan;
+    }
+
+    public function setNoZoom(bool $noZoom): void
+    {
+        $this->noZoom = $noZoom;
+    }
+
+    public function setCreatedDate(DateTime $created): void
+    {
+        $this->created = $created;
+    }
+
+    public function setCreated(string $created): void
+    {
+        $this->created = new DateTime($created);
+    }
+
+    public function getToken(): int
+    {
+        return $this->token;
+    }
+
+    public function getTimeLimit(): ?int
+    {
+        return $this->timeLimit;
+    }
+
+    public function getTimeLimitType(): string
+    {
+        return $this->timeLimitType;
+    }
+
+    public function getNoMove(): bool
+    {
+        return $this->noMove;
+    }
+
+    public function getNoPan(): bool
+    {
+        return $this->noPan;
+    }
+
+    public function getNoZoom(): bool
+    {
+        return $this->noZoom;
+    }
+
+    public function getCreatedDate(): DateTime
+    {
+        return $this->created;
+    }
+
+    public function getCreated(): string
+    {
+        return $this->created->format('Y-m-d H:i:s');
+    }
+}

src/PersistentData/Model/Guess.php

@@ -0,0 +1,134 @@
+<?php namespace MapGuesser\PersistentData\Model;
+
+use SokoWeb\PersistentData\Model\Model;
+use MapGuesser\Util\Geo\Position;
+
+class Guess extends Model
+{
+    protected static string $table = 'guesses';
+
+    protected static array $fields = ['user_id', 'place_in_challenge_id', 'lat', 'lng', 'score', 'distance', 'time_spent'];
+
+    protected static array $relations = ['user' => User::class, 'place_in_challenge' => PlaceInChallenge::class];
+
+    private ?User $user = null;
+
+    private ?int $userId = null;
+
+    private ?PlaceInChallenge $placeInChallenge = null;
+
+    private ?int $placeInChallengeId = null;
+
+    private Position $position;
+
+    private int $score = 0;
+
+    private int $distance = 0;
+
+    private int $timeSpent = 0;
+
+    public function __construct()
+    {
+        $this->position = new Position(0.0, 0.0);
+    }
+
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    public function setUserId(int $userId): void
+    {
+        $this->userId = $userId;
+    }
+
+    public function setPlaceInChallenge(PlaceInChallenge $placeInChallenge): void
+    {
+        $this->placeInChallenge = $placeInChallenge;
+    }
+
+    public function setPlaceInChallengeId(int $placeInChallengeId): void
+    {
+        $this->placeInChallengeId = $placeInChallengeId;
+    }
+
+    public function setPosition(Position $position): void
+    {
+        $this->position = $position;
+    }
+
+    public function setLat(float $lat): void
+    {
+        $this->position->setLat($lat);
+    }
+
+    public function setLng(float $lng): void
+    {
+        $this->position->setLng($lng);
+    }
+
+    public function setScore(int $score): void
+    {
+        $this->score = $score;
+    }
+
+    public function setDistance(int $distance): void
+    {
+        $this->distance = $distance;
+    }
+
+    public function setTimeSpent(int $timeSpent): void
+    {
+        $this->timeSpent = $timeSpent;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function getUserId(): ?int
+    {
+        return $this->userId;
+    }
+
+    public function getPlaceInChallenge(): ?PlaceInChallenge
+    {
+        return $this->placeInChallenge;
+    }
+
+    public function getPlaceInChallengeId(): ?int
+    {
+        return $this->placeInChallengeId;
+    }
+
+    public function getPosition(): Position
+    {
+        return $this->position;
+    }
+
+    public function getLat(): float
+    {
+        return $this->position->getLat();
+    }
+
+    public function getLng(): float
+    {
+        return $this->position->getLng();
+    }
+
+    public function getScore(): int
+    {
+        return $this->score;
+    }
+
+    public function getDistance(): int
+    {
+        return $this->distance;
+    }
+
+    public function getTimeSpent(): ?int
+    {
+        return $this->timeSpent;
+    }
+}

src/PersistentData/Model/Map.php

@@ -1,12 +1,13 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
+use SokoWeb\PersistentData\Model\Model;
 use MapGuesser\Util\Geo\Bounds;
 
 class Map extends Model
 {
     protected static string $table = 'maps';
 
-    protected static array $fields = ['name', 'description', 'bound_south_lat', 'bound_west_lng', 'bound_north_lat', 'bound_east_lng', 'area'];
+    protected static array $fields = ['name', 'description', 'bound_south_lat', 'bound_west_lng', 'bound_north_lat', 'bound_east_lng', 'area', 'unlisted'];
 
     private string $name = '';
 
@@ -16,6 +17,8 @@ class Map extends Model
 
     private float $area = 0.0;
 
+    private bool $unlisted = false;
+
     public function __construct()
     {
         $this->bounds = Bounds::createDirectly(-90.0, -180.0, 90.0, 180.0);
@@ -61,6 +64,11 @@ class Map extends Model
         $this->area = $area;
     }
 
+    public function setUnlisted(bool $unlisted): void
+    {
+        $this->unlisted = $unlisted;
+    }
+
     public function getName(): string
     {
         return $this->name;
@@ -100,4 +108,9 @@ class Map extends Model
     {
         return $this->area;
     }
+
+    public function getUnlisted(): bool
+    {
+        return $this->unlisted;
+    }
 }

src/PersistentData/Model/Model.php

@@ -1,69 +0,0 @@
-<?php namespace MapGuesser\PersistentData\Model;
-
-abstract class Model
-{
-    protected static string $table;
-
-    protected static array $fields;
-
-    protected static array $relations = [];
-
-    protected $id = null;
-
-    private array $snapshot = [];
-
-    public static function getTable(): string
-    {
-        return static::$table;
-    }
-
-    public static function getFields(): array
-    {
-        return array_merge(['id'], static::$fields);
-    }
-
-    public static function getRelations(): array
-    {
-        return static::$relations;
-    }
-
-    public function setId($id): void
-    {
-        $this->id = $id;
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function toArray(): array
-    {
-        $array = [];
-
-        foreach (self::getFields() as $key) {
-            $method = 'get' . str_replace('_', '', ucwords($key, '_'));
-
-            if (method_exists($this, $method)) {
-                $array[$key] = $this->$method();
-            }
-        }
-
-        return $array;
-    }
-
-    public function saveSnapshot(): void
-    {
-        $this->snapshot = $this->toArray();
-    }
-
-    public function resetSnapshot(): void
-    {
-        $this->snapshot = [];
-    }
-
-    public function getSnapshot(): array
-    {
-        return $this->snapshot;
-    }
-}

src/PersistentData/Model/MultiRoom.php

@@ -1,6 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
+use SokoWeb\PersistentData\Model\Model;
 
 class MultiRoom extends Model
 {

src/PersistentData/Model/Place.php

@@ -2,8 +2,9 @@
 
 use DateInterval;
 use DateTime;
-use MapGuesser\Http\Request;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\Model\Model;
+use SokoWeb\Http\Request;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\Util\Geo\Position;
 use MapGuesser\Util\Panorama\Pov;
 
@@ -140,7 +141,7 @@ class Place extends Model
         return $this->pov->getZoom();
     }
 
-    public function getFreshPanoId(bool $canBeIndoor = false): ?string
+    public function getFreshPanoId(): ?string
     {
         if (
             $this->panoIdCachedTimestamp !== null &&
@@ -152,19 +153,13 @@ class Place extends Model
         $request = new Request('https://maps.googleapis.com/maps/api/streetview/metadata', Request::HTTP_GET);
         $request->setQuery([
             'key' => $_ENV['GOOGLE_MAPS_SERVER_API_KEY'],
-            'location' => $this->position->getLat() . ',' . $this->position->getLng(),
-            'source' => $canBeIndoor ? 'default' : 'outdoor'
+            'location' => $this->position->getLat() . ',' . $this->position->getLng()
         ]);
 
         $response = $request->send();
         $panoData = json_decode($response->getBody(), true);
         $panoId = $panoData['status'] === 'OK' ? $panoData['pano_id'] : null;
 
-        // enable indoor panos if no outdoor found
-        if ($panoId === null && !$canBeIndoor) {
-            return $this->getFreshPanoId(true);
-        }
-
         $this->panoIdCached = $panoId;
         $this->panoIdCachedTimestamp = new DateTime();
 

src/PersistentData/Model/PlaceInChallenge.php

@@ -0,0 +1,72 @@
+<?php namespace MapGuesser\PersistentData\Model;
+
+use SokoWeb\PersistentData\Model\Model;
+
+class PlaceInChallenge extends Model
+{
+    protected static string $table = 'place_in_challenge';
+
+    protected static array $fields = ['place_id', 'challenge_id', 'round'];
+
+    protected static array $relations = ['place' => Place::class, 'challenge' => Challenge::class];
+
+    private ?Place $place = null;
+
+    private ?int $placeId = null;
+
+    private ?Challenge $challenge = null;
+
+    private ?int $challengeId = null;
+
+    private int $round;
+
+    public function setPlace(Place $place): void
+    {
+        $this->place = $place;
+    }
+
+    public function setPlaceId(int $placeId): void
+    {
+        $this->placeId = $placeId;
+    }
+
+    public function setChallenge(Challenge $challenge): void
+    {
+        $this->challenge = $challenge;
+    }
+
+    public function setChallengeId(int $challengeId): void
+    {
+        $this->challengeId = $challengeId;
+    }
+
+    public function setRound(int $round): void
+    {
+        $this->round = $round;
+    }
+
+    public function getPlace(): ?Place
+    {
+        return $this->place;
+    }
+
+    public function getPlaceId(): ?int
+    {
+        return $this->placeId;
+    }
+
+    public function getChallenge(): ?Challenge
+    {
+        return $this->challenge;
+    }
+
+    public function getChallengeId(): ?int
+    {
+        return $this->challengeId;
+    }
+
+    public function getRound(): int
+    {
+        return $this->round;
+    }
+}

src/PersistentData/Model/User.php

@@ -1,7 +1,8 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
-use MapGuesser\Interfaces\Authentication\IUser;
+use SokoWeb\PersistentData\Model\Model;
+use SokoWeb\Interfaces\Authentication\IUser;
 
 class User extends Model implements IUser
 {

src/PersistentData/Model/UserConfirmation.php

@@ -1,6 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
+use SokoWeb\PersistentData\Model\Model;
 
 class UserConfirmation extends Model
 {

src/PersistentData/Model/UserInChallenge.php

@@ -0,0 +1,98 @@
+<?php namespace MapGuesser\PersistentData\Model;
+
+use SokoWeb\PersistentData\Model\Model;
+
+class UserInChallenge extends Model
+{
+    protected static string $table = 'user_in_challenge';
+
+    protected static array $fields = ['user_id', 'challenge_id', 'current_round', 'time_left', 'is_owner'];
+
+    protected static array $relations = ['user' => User::class, 'challenge' => Challenge::class];
+
+    private ?User $user = null;
+
+    private ?int $userId = null;
+
+    private ?Challenge $challenge = null;
+
+    private ?int $challengeId = null;
+
+    private int $currentRound = 0;
+
+    private ?int $timeLeft = null;
+
+    private bool $isOwner = false;
+
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    public function setUserId(int $userId): void
+    {
+        $this->userId = $userId;
+    }
+
+    public function setChallenge(Challenge $challenge): void
+    {
+        $this->challenge = $challenge;
+    }
+
+    public function setChallengeId(int $challengeId): void
+    {
+        $this->challengeId = $challengeId;
+    }
+
+    public function setCurrentRound(int $currentRound): void
+    {
+        $this->currentRound = $currentRound;
+    }
+
+    public function setTimeLeft(?int $timeLeft): void
+    {
+        if (isset($timeLeft)) {
+            $this->timeLeft = max(0, $timeLeft);
+        }
+    }
+
+    public function setIsOwner(bool $isOwner): void
+    {
+        $this->isOwner = $isOwner;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function getUserId(): ?int
+    {
+        return $this->userId;
+    }
+
+    public function getChallenge(): ?Challenge
+    {
+        return $this->challenge;
+    }
+
+    public function getChallengeId(): ?int
+    {
+        return $this->challengeId;
+    }
+
+    public function getCurrentRound(): int
+    {
+        return $this->currentRound;
+    }
+
+    public function getTimeLeft(): ?int
+    {
+        return $this->timeLeft;
+    }
+
+    public function getIsOwner(): bool
+    {
+        return $this->isOwner;
+    }
+}

src/PersistentData/Model/UserPasswordResetter.php

@@ -1,6 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
+use SokoWeb\PersistentData\Model\Model;
 
 class UserPasswordResetter extends Model
 {

src/PersistentData/Model/UserPlayedPlace.php

@@ -0,0 +1,100 @@
+<?php namespace MapGuesser\PersistentData\Model;
+
+use DateTime;
+use SokoWeb\PersistentData\Model\Model;
+
+class UserPlayedPlace extends Model
+{
+    protected static string $table = 'user_played_place';
+
+    protected static array $fields = ['user_id', 'place_id', 'last_time', 'occurrences'];
+
+    protected static array $relations = ['user' => User::class, 'place' => Place::class];
+
+    private ?User $user = null;
+
+    private ?int $userId = null;
+
+    private ?Place $place = null;
+
+    private ?int $placeId = null;
+
+    private DateTime $lastTime;
+
+    private int $occurrences = 1;
+
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    public function setUserId(int $userId): void
+    {
+        $this->userId = $userId;
+    }
+
+    public function setPlace(Place $place): void
+    {
+        $this->place = $place;
+    }
+
+    public function setPlaceId(int $placeId): void
+    {
+        $this->placeId = $placeId;
+    }
+
+    public function setLastTimeDate(DateTime $lastTime): void
+    {
+        $this->lastTime = $lastTime;
+    }
+
+    public function setLastTime(string $lastTime): void
+    {
+        $this->lastTime = new DateTime($lastTime);
+    }
+
+    public function setOccurrences(int $occurrences): void
+    {
+        $this->occurrences = $occurrences;
+    }
+
+    public function incrementOccurrences(): void
+    {
+        $this->occurrences++;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function getUserId(): ?int
+    {
+        return $this->userId;
+    }
+
+    public function getPlace(): ?Place
+    {
+        return $this->place;
+    }
+
+    public function getPlaceId(): ?int
+    {
+        return $this->placeId;
+    }
+
+    public function getLastTimeDate(): DateTime
+    {
+        return $this->lastTime;
+    }
+
+    public function getLastTime(): string
+    {
+        return $this->lastTime->format('Y-m-d H:i:s');
+    }
+
+    public function getOccurrences(): int
+    {
+        return $this->occurrences;
+    }
+}

src/PersistentData/PersistentDataManager.php

@@ -1,226 +0,0 @@
-<?php namespace MapGuesser\PersistentData;
-
-use Generator;
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\PersistentData\Model\Model;
-
-class PersistentDataManager
-{
-    public function selectFromDb(Select $select, string $type, bool $withRelations = false)
-    {
-        $select = $this->createSelect($select, $type, $withRelations);
-
-        $data = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
-        if ($data === null) {
-            return null;
-        }
-
-        $model = new $type();
-        $this->fillWithData($data, $model);
-
-        return $model;
-    }
-
-    public function selectMultipleFromDb(Select $select, string $type, bool $withRelations = false): Generator
-    {
-        $select = $this->createSelect($select, $type, $withRelations);
-        $result = $select->execute();
-
-        while ($data = $result->fetch(IResultSet::FETCH_ASSOC)) {
-            $model = new $type();
-            $this->fillWithData($data, $model);
-
-            yield $model;
-        }
-    }
-
-    public function selectFromDbById($id, string $type, bool $withRelations = false)
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->whereId($id);
-
-        return $this->selectFromDb($select, $type, $withRelations);
-    }
-
-    public function fillWithData(array $data, Model $model): void
-    {
-        $relations = $model::getRelations();
-        $relationData = [];
-
-        foreach ($data as $key => $value) {
-            if ($this->extractRelationData($key, $value, $relationData, $relations)) {
-                continue;
-            }
-
-            $method = 'set' . str_replace('_', '', ucwords($key, '_'));
-
-            if (method_exists($model, $method)) {
-                $model->$method($value);
-            }
-        }
-
-        $this->setRelations($model, $relationData);
-
-        $model->saveSnapshot();
-    }
-
-    public function loadRelationsFromDb(Model $model, bool $recursive): void
-    {
-        foreach ($model::getRelations() as $relation => $relationType) {
-            $camel = str_replace('_', '', ucwords($relation, '_'));
-
-            $methodGet = 'get' . $camel . 'Id';
-            $methodSet = 'set' . $camel;
-
-            $relationId = $model->$methodGet();
-
-            if ($relationId !== null) {
-                $relationModel = $this->selectFromDbById($relationId, $relationType, $recursive);
-
-                $model->$methodSet($relationModel);
-            }
-        }
-    }
-
-    public function saveToDb(Model $model): void
-    {
-        $this->syncRelations($model);
-
-        $modified = $model->toArray();
-        $id = $model->getId();
-
-        $modify = new Modify(\Container::$dbConnection, $model::getTable());
-
-        if ($id !== null) {
-            $original = $model->getSnapshot();
-
-            foreach ($original as $key => $value) {
-                if ($value === $modified[$key]) {
-                    unset($modified[$key]);
-                }
-            }
-
-            if (count($modified) > 0) {
-                $modify->setId($id);
-                $modify->fill($modified);
-                $modify->save();
-            }
-        } else {
-            $modify->fill($modified);
-            $modify->save();
-
-            $model->setId($modify->getId());
-        }
-
-        $model->saveSnapshot();
-    }
-
-    public function deleteFromDb(Model $model): void
-    {
-        $modify = new Modify(\Container::$dbConnection, $model::getTable());
-        $modify->setId($model->getId());
-        $modify->delete();
-
-        $model->setId(null);
-        $model->resetSnapshot();
-    }
-
-    private function createSelect(Select $select, string $type, bool $withRelations = false): Select
-    {
-        $table = call_user_func([$type, 'getTable']);
-        $fields = call_user_func([$type, 'getFields']);
-
-        $select->from($table);
-
-        //TODO: only with some relations?
-        if ($withRelations) {
-            $relations = call_user_func([$type, 'getRelations']);
-
-            $columns = [];
-
-            foreach ($fields as $field) {
-                $columns[] = [$table, $field];
-            }
-
-            $columns = array_merge($columns, $this->getRelationColumns($relations));
-
-            $this->leftJoinRelations($select, $table, $relations);
-            $select->columns($columns);
-        } else {
-            $select->columns($fields);
-        }
-
-        return $select;
-    }
-
-    private function getRelationColumns(array $relations): array
-    {
-        $columns = [];
-
-        foreach ($relations as $relation => $relationType) {
-            $relationTable = call_user_func([$relationType, 'getTable']);
-            foreach (call_user_func([$relationType, 'getFields']) as $relationField) {
-                $columns[] = [$relationTable, $relationField, $relation . '__' . $relationField];
-            }
-        }
-
-        return $columns;
-    }
-
-    private function leftJoinRelations(Select $select, string $table, array $relations): void
-    {
-        foreach ($relations as $relation => $relationType) {
-            $relationTable = call_user_func([$relationType, 'getTable']);
-            $select->leftJoin($relationTable, [$relationTable, 'id'], '=', [$table, $relation . '_id']);
-        }
-    }
-
-    private function extractRelationData(string $key, $value, array &$relationData, array $relations): bool
-    {
-        $found = false;
-
-        foreach ($relations as $relation => $relationType) {
-            if (substr($key, 0, strlen($relation . '__')) === $relation . '__') {
-                $found = true;
-                $relationData[$relation][substr($key, strlen($relation . '__'))] = $value;
-                break;
-            }
-        }
-
-        return $found;
-    }
-
-    private function setRelations(Model $model, array &$relations): void
-    {
-        foreach ($model::getRelations() as $relation => $relationType) {
-            if (isset($relations[$relation])) {
-                $object = new $relationType();
-
-                $this->fillWithData($relations[$relation], $object);
-
-                $method = 'set' . str_replace('_', '', ucwords($relation, '_'));
-
-                $model->$method($object);
-            }
-        }
-    }
-
-    private function syncRelations(Model $model): void
-    {
-        foreach ($model::getRelations() as $relation => $relationType) {
-            $camel = str_replace('_', '', ucwords($relation, '_'));
-
-            $methodGet = 'get' . $camel;
-            $methodSet = 'set' . $camel . 'Id';
-
-            $relationModel = $model->$methodGet();
-
-            if ($relationModel !== null) {
-                $model->$methodSet($relationModel->getId());
-            }
-        }
-    }
-}

src/Repository/ChallengeRepository.php

@@ -0,0 +1,75 @@
+<?php namespace MapGuesser\Repository;
+
+use Generator;
+use SokoWeb\Database\Query\Select;
+use MapGuesser\PersistentData\Model\Challenge;
+use MapGuesser\PersistentData\Model\Place;
+use MapGuesser\PersistentData\Model\User;
+use SokoWeb\PersistentData\PersistentDataManager;
+
+class ChallengeRepository
+{
+    private PersistentDataManager $pdm;
+
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getById(int $challengeId): ?Challenge
+    {
+        return $this->pdm->selectFromDbById($challengeId, Challenge::class);
+    }
+
+    public function getByToken(int $token): ?Challenge
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('token', '=', $token);
+
+        return $this->pdm->selectFromDb($select, Challenge::class);
+    }
+
+    public function getByTokenStr(string $token_str): ?Challenge
+    {
+        // validate token string
+        foreach (str_split($token_str) as $char) {
+            if (!(('0' <= $char && $char <= '9') || ('a' <= $char && $char <= 'f'))) {
+                return null;
+            }
+        }
+        // convert token to int
+        $token = hexdec($token_str);
+
+        return $this->getByToken($token);
+    }
+
+    public function getAllByParticipant(User $user): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('user_in_challenge', ['challenge', 'id'], '=', ['user_in_challenge', 'challenge_id']);
+        $select->innerJoin('users', ['users', 'id'], '=', ['user_in_challenge', 'user_id']);
+        $select->where('user_id', '=', $user->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, Challenge::class);
+    }
+
+    public function getAllByOwner(User $user): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('user_in_challenge', ['challenge', 'id'], '=', ['user_in_challenge', 'challenge_id']);
+        $select->innerJoin('users', ['users', 'id'], '=', ['user_in_challenge', 'user_id']);
+        $select->where('user_id', '=', $user->getId());
+        $select->where('is_owner', '=', true);
+
+        yield from $this->pdm->selectMultipleFromDb($select, Challenge::class);
+    }
+
+    public function getAllByPlace(Place $place): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('place_in_challenge', ['challenges', 'id'], '=', ['place_in_challenge', 'challenge_id']);
+        $select->where('place_id', '=', $place->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, Challenge::class);
+    }
+}

src/Repository/GuessRepository.php

@@ -0,0 +1,97 @@
+<?php namespace MapGuesser\Repository;
+
+use Generator;
+use SokoWeb\Database\Query\Select;
+use MapGuesser\PersistentData\Model\Challenge;
+use MapGuesser\PersistentData\Model\Guess;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\Model\Place;
+use MapGuesser\PersistentData\Model\PlaceInChallenge;
+use SokoWeb\PersistentData\PersistentDataManager;
+
+class GuessRepository
+{
+    private PersistentDataManager $pdm;
+
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getAllByUser(User $user): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('user_id', '=', $user->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
+    }
+
+    public function getAllByUserAndChallenge(User $user, Challenge $challenge): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
+        $select->where('user_id', '=', $user->getId());
+        $select->where('challenge_id', '=', $challenge->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
+    }
+
+    public function getByUserAndPlaceInChallenge(User $user, Challenge $challenge, Place $place): ?Guess
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
+        $select->where('user_id', '=', $user->getId());
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->where('place_id', '=', $place->getId());
+
+        return $this->pdm->selectFromDb($select, Guess::class);
+    }
+
+    public function getAllInChallengeByUser(int $userId, Challenge $challenge): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
+        $select->where('user_id', '=', $userId);
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->orderBy('round');
+
+        yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
+    }
+
+    public function getAllInChallenge(Challenge $challenge, array $withRelations = []): Generator
+    {
+        if (count($withRelations)) {
+            $necessaryRelations = [PlaceInChallenge::class];
+            $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
+        }
+
+        $select = new Select(\Container::$dbConnection);
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->orderBy('round');
+
+        yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true, $withRelations);
+    }
+
+    public function getAllInChallengeByRound(int $round, Challenge $challenge, array $withRelations = []): Generator
+    {
+        if (count($withRelations)) {
+            $necessaryRelations = [PlaceInChallenge::class];
+            $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
+        }
+
+        $select = new Select(\Container::$dbConnection);
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->where('round', '=', $round);
+
+        yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true, $withRelations);
+    }
+
+    public function getAllByPlace(Place $place): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
+        $select->where('place_id', '=', $place->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
+    }
+}

src/Repository/MapRepository.php

@@ -1,7 +1,10 @@
 <?php namespace MapGuesser\Repository;
 
+use SokoWeb\Database\Query\Select;
+use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Map;
-use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\PersistentData\Model\Place;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class MapRepository
 {
@@ -16,4 +19,20 @@ class MapRepository
     {
         return $this->pdm->selectFromDbById($mapId, Map::class);
     }
+
+    public function getByPlace(Place $place): ?Map
+    {
+        return $this->getById($place->getMapId());
+    }
+
+    public function getByChallenge(Challenge $challenge): ?Map
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('places', ['maps', 'id'], '=', ['places', 'map_id']);
+        $select->innerJoin('place_in_challenge', ['places', 'id'], '=', ['place_in_challenge', 'place_id']);
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->limit(1);
+
+        return $this->pdm->selectFromDb($select, Map::class);
+    }
 }

src/Repository/MultiRoomRepository.php

@@ -2,9 +2,9 @@
 
 use DateTime;
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\MultiRoom;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class MultiRoomRepository
 {

src/Repository/PlaceInChallengeRepository.php

@@ -0,0 +1,53 @@
+<?php namespace MapGuesser\Repository;
+
+use Generator;
+use SokoWeb\Database\Query\Select;
+use MapGuesser\PersistentData\Model\Challenge;
+use MapGuesser\PersistentData\Model\Place;
+use MapGuesser\PersistentData\Model\PlaceInChallenge;
+use SokoWeb\PersistentData\PersistentDataManager;
+
+class PlaceInChallengeRepository
+{
+    private PersistentDataManager $pdm;
+
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getAllByPlace(Place $place, array $withRelations = []) : Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('place_id', '=', $place->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, PlaceInChallenge::class, true, $withRelations);
+    }
+
+    public function getAllByChallenge(Challenge $challenge) : Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('challenge_id', '=', $challenge->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, PlaceInChallenge::class);
+    }
+
+    public function getByPlaceAndChallenge(Place $place, Challenge $challenge) : ?PlaceInChallenge
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('place_id', '=', $place->getId());
+        $select->where('challenge_id', '=', $challenge->getId());
+
+        return $this->pdm->selectFromDb($select, PlaceInChallenge::class);
+    }
+
+    public function getByRoundInChallenge(int $round, Challenge $challenge, array $withRelations = []): ?PlaceInChallenge
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->orderBy('round');
+        $select->limit(1, $round);
+
+        return $this->pdm->selectFromDb($select, PlaceInChallenge::class, true, $withRelations);
+    }
+}

src/Repository/PlaceRepository.php

@@ -1,10 +1,11 @@
 <?php namespace MapGuesser\Repository;
 
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
+use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Map;
 use MapGuesser\PersistentData\Model\Place;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class PlaceRepository
 {
@@ -28,13 +29,35 @@ class PlaceRepository
         yield from $this->pdm->selectMultipleFromDb($select, Place::class);
     }
 
+    //TODO: use Map and User instead of id
+    public function getRandomNPlaces(int $mapId, int $n, ?int $userId): array
+    {
+        if (!isset($userId)) { // anonymous single player
+            return $this->getRandomNForMapWithValidPano($mapId, $n);
+        } else { // authorized user or multiplayer game with selection based on what the host played before
+            $unvisitedPlaces = $this->getRandomUnvisitedNForMapWithValidPano($mapId, $n, $userId);
+            if (count($unvisitedPlaces) == $n) {
+                return $unvisitedPlaces;
+            }
+
+            $oldPlaces = $this->getRandomOldNForMapWithValidPano($mapId, $n - count($unvisitedPlaces), $userId);
+
+            return array_merge($unvisitedPlaces, $oldPlaces);
+        }
+    }
+
     //TODO: use Map instead of id
-    public function getRandomNForMapWithValidPano(int $mapId, int $n, array $exclude = []): array
+    private function getRandomNForMapWithValidPano(int $mapId, int $n): array
     {
         $places = [];
 
+        $select = new Select(\Container::$dbConnection, 'places');
+        $select->where('map_id', '=', $mapId);
+        $numberOfPlaces = $select->count();
+
+        $exclude = [];
         for ($i = 1; $i <= $n; ++$i) {
-            $place = $this->getRandomForMapWithValidPano($mapId, $exclude);
+            $place = $this->getRandomForMapWithValidPano($numberOfPlaces, $select, $exclude);
 
             $places[] = $place;
             $exclude[] = $place->getId();
@@ -43,11 +66,15 @@ class PlaceRepository
         return $places;
     }
 
-    //TODO: use Map instead of id
-    public function getRandomForMapWithValidPano(int $mapId, array $exclude = []): Place
+    private function getRandomForMapWithValidPano(int $numberOfPlaces, Select $select, array &$exclude, ?callable $pickRandomInt = null): ?Place
     {
         do {
-            $place = $this->selectRandomFromDbForMap($mapId, $exclude);
+            $numberOfPlacesLeft = $numberOfPlaces - count($exclude);
+            $place = $this->selectRandomFromDbForMap($numberOfPlacesLeft, $select, $exclude, $pickRandomInt);
+            if ($place === null) {
+                // there is no more never visited place left
+                return null;
+            }
 
             $panoId = $place->getFreshPanoId();
             if ($panoId === null) {
@@ -58,25 +85,118 @@ class PlaceRepository
         return $place;
     }
 
-    private function selectRandomFromDbForMap(int $mapId, array $exclude): Place
+    private function selectRandomFromDbForMap(int $numberOfPlacesLeft, Select $select, array $exclude, ?callable $pickRandomInt): ?Place
     {
-        //TODO: omit table name here
-        $select = new Select(\Container::$dbConnection, 'places');
-        $select->where('id', 'NOT IN', $exclude);
-        $select->where('map_id', '=', $mapId);
+        if ($numberOfPlacesLeft <= 0)
+            return null;
 
-        $numberOfPlaces = $select->count();
-
-        //TODO: prevent this
-        if ($numberOfPlaces === 0) {
-            throw new \Exception('There is no selectable place (count was 0).');
+        if (!isset($pickRandomInt)) {
+            $randomOffset = random_int(0, $numberOfPlacesLeft - 1);
+        } else {
+            $randomOffset = $pickRandomInt($numberOfPlacesLeft);
         }
 
-        $randomOffset = random_int(0, $numberOfPlaces - 1);
-
-        $select->orderBy('id');
+        $select->where('id', 'NOT IN', $exclude);
         $select->limit(1, $randomOffset);
 
         return $this->pdm->selectFromDb($select, Place::class);
     }
+
+    // Never visited places
+    private function getRandomUnvisitedNForMapWithValidPano(int $mapId, int $n, int $userId): array
+    {
+        $places = [];
+        $exclude = [];
+
+        // list of places visited by user
+        $selectPlacesByCurrentUser = new Select(\Container::$dbConnection, 'user_played_place');
+        $selectPlacesByCurrentUser->columns(['place_id', 'last_time']);
+        $selectPlacesByCurrentUser->where('user_id', '=', $userId);
+        $selectPlacesByCurrentUser->setDerivedTableAlias('places_by_current_user');
+
+        // count the places never visited
+        $selectUnvisited = new Select(\Container::$dbConnection, 'places');
+        $selectUnvisited->leftJoin($selectPlacesByCurrentUser, ['places', 'id'], '=', ['places_by_current_user', 'place_id']);
+        $selectUnvisited->where('map_id', '=', $mapId);
+        $selectUnvisited->where('last_time', '=', null);
+        $numberOfUnvisitedPlaces = $selectUnvisited->count();
+
+        // look for as many new places as possible but maximum $n
+        do {
+            $place = $this->getRandomForMapWithValidPano($numberOfUnvisitedPlaces, $selectUnvisited, $exclude);
+            if (isset($place)) {
+                $places[] = $place;
+                $exclude[] = $place->getId();
+            }
+        } while (count($places) < $n && isset($place));
+
+        return $places;
+    }
+
+    // Places visited in the longest time
+    private function getRandomOldNForMapWithValidPano(int $mapId, int $n, int $userId): array
+    {
+        $places = [];
+        $exclude = [];
+
+        // list of places visited by user
+        $selectPlacesByCurrentUser = new Select(\Container::$dbConnection, 'user_played_place');
+        $selectPlacesByCurrentUser->columns(['place_id', 'last_time']);
+        $selectPlacesByCurrentUser->where('user_id', '=', $userId);
+        $selectPlacesByCurrentUser->setDerivedTableAlias('places_by_current_user');
+
+        // count places that were visited at least once
+        $selectOldPlaces = new Select(\Container::$dbConnection, 'places');
+        $selectOldPlaces->innerJoin($selectPlacesByCurrentUser, ['places', 'id'], '=', ['places_by_current_user', 'place_id']);
+        $selectOldPlaces->where('map_id', '=', $mapId);
+        $numberOfOldPlaces = $selectOldPlaces->count();
+
+        // set order by datetime, oldest first
+        $selectOldPlaces->orderBy('last_time');
+
+        // selection algorithm with preference (weighting) for older places using Box-Muller transform
+        $pickGaussianRandomInt = function($numberOfPlaces) {
+            $stdev = 0.2;
+            $avg = 0.0;
+            $x = mt_rand() / mt_getrandmax();
+            $y = mt_rand() / mt_getrandmax();
+            $randomNum = abs(sqrt(-2 * log($x)) * cos(2 * pi() * $y) * $stdev + $avg);
+            return (int) min($randomNum * $numberOfPlaces, $numberOfPlaces - 1);
+        };
+
+        // look for n - numberOfUnvisitedPlaces places
+        while (count($places) < $n)
+        {
+            $place = $this->getRandomForMapWithValidPano($numberOfOldPlaces, $selectOldPlaces, $exclude, $pickGaussianRandomInt);
+            if (isset($place))
+            {
+                $places[] = $place;
+                $exclude[] = $place->getId();
+            }
+        }
+
+        return $places;
+    }
+
+    public function getByRoundInChallenge(Challenge $challenge, int $round): ?Place
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('place_in_challenge', ['places', 'id'], '=', ['place_in_challenge', 'place_id']);
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->orderBy('round');
+        $select->limit(1, $round);
+
+        return $this->pdm->selectFromDb($select, Place::class);
+    }
+
+    public function getAllInChallenge(Challenge $challenge): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('place_in_challenge', ['places', 'id'], '=', ['place_in_challenge', 'place_id']);
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->orderBy('round');
+
+        yield from $this->pdm->selectMultipleFromDb($select, Place::class);
+    }
+
 }

src/Repository/UserConfirmationRepository.php

@@ -1,9 +1,9 @@
 <?php namespace MapGuesser\Repository;
 
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserConfirmation;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class UserConfirmationRepository
 {

src/Repository/UserInChallengeRepository.php

@@ -0,0 +1,81 @@
+<?php namespace MapGuesser\Repository;
+
+use Generator;
+use SokoWeb\Database\Query\Select;
+use MapGuesser\PersistentData\Model\Challenge;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\Model\UserInChallenge;
+use SokoWeb\PersistentData\PersistentDataManager;
+
+class UserInChallengeRepository
+{
+    private PersistentDataManager $pdm;
+
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getAllByUser(User $user) : Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('user_id', '=', $user->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, UserInChallenge::class);
+    }
+
+    public function getAllByChallenge(Challenge $challenge) : Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('challenge_id', '=', $challenge->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, UserInChallenge::class);
+    }
+
+    public function getAllByChallengeWithUsers(Challenge $challenge) : Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('challenge_id', '=', $challenge->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, UserInChallenge::class, true, [User::class]);
+    }
+
+    public function getByUserIdAndChallenge(int $userId, Challenge $challenge): ?UserInChallenge
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('user_id', '=', $userId);
+        $select->where('challenge_id', '=', $challenge->getId());
+
+        return $this->pdm->selectFromDb($select, UserInChallenge::class);
+    }
+
+    public function getByUserIdAndToken(int $userId, string $token_str, array $withRelations = []): ?UserInChallenge
+    {
+        if (count($withRelations)) {
+            $necessaryRelations = [Challenge::class];
+            $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
+        }
+
+        // validate token string
+        if (!ctype_xdigit($token_str)) {
+            return null;
+        }
+        // convert token to int
+        $token = hexdec($token_str);
+
+        $select = new Select(\Container::$dbConnection);
+        $select->where('user_id', '=', $userId);
+        $select->where('token', '=', $token);
+
+        return $this->pdm->selectFromDb($select, UserInChallenge::class, true, $withRelations);
+    }
+
+    public function isUserParticipatingInChallenge(int $userId, Challenge $challenge): bool
+    {
+        $select = new Select(\Container::$dbConnection, 'user_in_challenge');
+        $select->where('user_id', '=', $userId);
+        $select->where('challenge_id', '=', $challenge->getId());
+
+        return $select->count() != 0;
+    }
+}

src/Repository/UserPasswordResetterRepository.php

@@ -2,10 +2,10 @@
 
 use DateTime;
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserPasswordResetter;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class UserPasswordResetterRepository
 {

src/Repository/UserPlayedPlaceRepository.php

@@ -0,0 +1,51 @@
+<?php namespace MapGuesser\Repository;
+
+use Generator;
+use SokoWeb\Database\Query\Select;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\Model\Place;
+use MapGuesser\PersistentData\Model\UserPlayedPlace;
+use SokoWeb\PersistentData\PersistentDataManager;
+
+class UserPlayedPlaceRepository
+{
+    private PersistentDataManager $pdm;
+
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getByUser(User $user): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('user_id', '=', $user->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, UserPlayedPlace::class);
+    }
+
+    public function getAllByPlace(Place $place): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('place_id', '=', $place->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, UserPlayedPlace::class);
+    }
+
+    public function getAllByUser(User $user) : Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('user_id', '=', $user->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, UserPlayedPlace::class);
+    }
+
+    public function getByUserIdAndPlaceId(int $userId, int $placeId) : ?UserPlayedPlace
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('user_id', '=', $userId);
+        $select->where('place_id', '=', $placeId);
+
+        return $this->pdm->selectFromDb($select, UserPlayedPlace::class);
+    }
+}

src/Repository/UserRepository.php

@@ -2,11 +2,13 @@
 
 use DateTime;
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Interfaces\Repository\IUserRepository;
+use SokoWeb\Database\Query\Select;
+use MapGuesser\PersistentData\Model\Guess;
 use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 
-class UserRepository
+class UserRepository implements IUserRepository
 {
     private PersistentDataManager $pdm;
 
@@ -44,4 +46,9 @@ class UserRepository
 
         yield from $this->pdm->selectMultipleFromDb($select, User::class);
     }
+
+    public function getByGuess(Guess $guess): ?User
+    {
+        return $this->getById($guess->getUserId());
+    }
 }

src/Request/Request.php

@@ -1,93 +0,0 @@
-<?php namespace MapGuesser\Request;
-
-use MapGuesser\Interfaces\Authentication\IUser;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Request\ISession;
-use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\PersistentDataManager;
-use MapGuesser\Repository\UserRepository;
-
-class Request implements IRequest
-{
-    private string $base;
-
-    private array $get;
-
-    private array $routeParams = [];
-
-    private array $post;
-
-    private Session $session;
-
-    private UserRepository $userRepository;
-
-    private ?User $user = null;
-
-    public function __construct(string $base, array &$get, array &$post, array &$session)
-    {
-        $this->base = $base;
-        $this->get = &$get;
-        $this->post = &$post;
-        $this->session = new Session($session);
-
-        $this->userRepository = new UserRepository();
-
-        $userId = $this->session->get('userId');
-
-        if ($userId !== null) {
-            $this->user = $this->userRepository->getById($userId);
-        }
-    }
-
-    public function setParsedRouteParams(array &$routeParams): void
-    {
-        $this->routeParams = &$routeParams;
-    }
-
-    public function getBase(): string
-    {
-        return $this->base;
-    }
-
-    public function query($key)
-    {
-        if (isset($this->get[$key])) {
-            return $this->get[$key];
-        }
-
-        if (isset($this->routeParams[$key])) {
-            return $this->routeParams[$key];
-        }
-
-        return null;
-    }
-
-    public function post($key)
-    {
-        if (isset($this->post[$key])) {
-            return $this->post[$key];
-        }
-
-        return null;
-    }
-
-    public function session(): ISession
-    {
-        return $this->session;
-    }
-
-    public function setUser(?IUser $user): void
-    {
-        if ($user === null) {
-            $this->session->delete('userId');
-            return;
-        }
-
-        $this->session->set('userId', $user->getUniqueId());
-    }
-
-    public function user(): ?IUser
-    {
-        return $this->user;
-    }
-}

src/Request/Session.php

@@ -1,37 +0,0 @@
-<?php namespace MapGuesser\Request;
-
-use MapGuesser\Interfaces\Request\ISession;
-
-class Session implements ISession
-{
-    private array $data;
-
-    public function __construct(array &$data)
-    {
-        $this->data = &$data;
-    }
-
-    public function has(string $key): bool
-    {
-        return isset($this->data[$key]);
-    }
-
-    public function get(string $key)
-    {
-        if (isset($this->data[$key])) {
-            return $this->data[$key];
-        }
-
-        return null;
-    }
-
-    public function set(string $key, $value): void
-    {
-        $this->data[$key] = $value;
-    }
-
-    public function delete(string $key): void
-    {
-        unset($this->data[$key]);
-    }
-}

src/Response/ContentBase.php

@@ -1,22 +0,0 @@
-<?php namespace MapGuesser\Response;
-
-use MapGuesser\Interfaces\Response\IContent;
-
-abstract class ContentBase implements IContent
-{
-    protected array $data;
-
-    public function setData(array $data): void
-    {
-        $this->data = $data;
-    }
-
-    public function getData(): array
-    {
-        return $this->data;
-    }
-
-    abstract public function render(): void;
-
-    abstract public function getContentType(): string;
-}

src/Response/HtmlContent.php

@@ -1,34 +0,0 @@
-<?php namespace MapGuesser\Response;
-
-use MapGuesser\View\Linker;
-
-class HtmlContent extends ContentBase
-{
-    private string $view;
-
-    public function __construct(string $view, array $data = [])
-    {
-        $this->view = $view;
-        $this->data = $data;
-    }
-
-    public function render(): void
-    {
-        if (!empty($_ENV['DEV'])) {
-            $generator = new Linker($this->view);
-            $generator->generate();
-        }
-
-        extract($this->data);
-
-        require ROOT . '/cache/views/' . $this->view . '.php';
-
-        // @phpstan-ignore-next-line - SCRIPT_STARTED is defined in main.php
-        echo '<!-- __debug__runtime: ' . round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1) . ' -->';
-    }
-
-    public function getContentType(): string
-    {
-        return 'text/html';
-    }
-}

src/Response/JsonContent.php

@@ -1,22 +0,0 @@
-<?php namespace MapGuesser\Response;
-
-class JsonContent extends ContentBase
-{
-    public function __construct(array $data = [])
-    {
-        $this->data = $data;
-    }
-
-    public function render(): void
-    {
-        // @phpstan-ignore-next-line - SCRIPT_STARTED is defined in main.php
-        $this->data['__debug__runtime'] = round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1);
-
-        echo json_encode($this->data);
-    }
-
-    public function getContentType(): string
-    {
-        return 'application/json';
-    }
-}

src/Response/Redirect.php

@@ -1,41 +0,0 @@
-<?php namespace MapGuesser\Response;
-
-use MapGuesser\Interfaces\Response\IRedirect;
-
-class Redirect implements IRedirect
-{
-    private string $target;
-
-    private int $type;
-
-    public function __construct(string $target, int $type = IRedirect::TEMPORARY)
-    {
-        $this->target = $target;
-        $this->type = $type;
-    }
-
-    public function getUrl(): string
-    {
-        if (preg_match('/^http(s)?/', $this->target) === 1) {
-            $link = $this->target;
-        } else {
-            $link = \Container::$request->getBase() . '/' . $this->target;
-        }
-
-        return $link;
-    }
-
-    public function getHttpCode(): int
-    {
-        switch ($this->type) {
-            case IRedirect::PERMANENT:
-                return 301;
-
-            case IRedirect::TEMPORARY:
-                return 302;
-
-            default:
-                return 302;
-        }
-    }
-}

src/Routing/Route.php

@@ -1,73 +0,0 @@
-<?php namespace MapGuesser\Routing;
-
-class Route
-{
-    private string $id;
-
-    private array $pattern;
-
-    private array $handler;
-
-    public function __construct(string $id, array $pattern, array $handler)
-    {
-        $this->id = $id;
-        $this->pattern = $pattern;
-        $this->handler = $handler;
-    }
-
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    public function getHandler(): array
-    {
-        return $this->handler;
-    }
-
-    public function generateLink(array $parameters = []): string
-    {
-        $link = [];
-
-        foreach ($this->pattern as $fragment) {
-            if (preg_match('/^{(\\w+)(\\?)?}$/', $fragment, $matches) === 1) {
-                if (isset($parameters[$matches[1]])) {
-                    $link[] = $parameters[$matches[1]];
-                    unset($parameters[$matches[1]]);
-                } elseif (!isset($matches[2])) {//TODO: why? parameter not found but not optional
-                    $link[] = $fragment;
-                }
-            } else {
-                $link[] = $fragment;
-            }
-        }
-
-        $queryParams = [];
-        foreach ($parameters as $key => $value) {
-            if ($value === null) {
-                continue;
-            }
-
-            $queryParams[$key] = $value;
-        }
-
-        $query = count($queryParams) > 0 ? '?' . http_build_query($queryParams) : '';
-
-        return implode('/', $link) . $query;
-    }
-
-    public function testAgainst(array $path): ?array
-    {
-        $parameters = [];
-
-        foreach ($path as $i => $fragment) {
-            if (preg_match('/^{(\\w+)(?:\\?)?}$/', $this->pattern[$i], $matches) === 1) {
-                $parameters[$matches[1]] = $fragment;
-            } elseif ($fragment != $this->pattern[$i]) {
-                return null;
-            }
-        }
-
-        return $parameters;
-    }
-}

src/Routing/RouteCollection.php

@@ -1,88 +0,0 @@
-<?php namespace MapGuesser\Routing;
-
-use Closure;
-
-class RouteCollection
-{
-    private array $routes = [];
-
-    private array $searchTable = [
-        'get' => [],
-        'post' => []
-    ];
-
-    private array $groupStack = [];
-
-    public function get(string $id, string $pattern, array $handler): void
-    {
-        $this->addRoute('get', $id, $pattern, $handler);
-    }
-
-    public function post(string $id, string $pattern, array $handler): void
-    {
-        $this->addRoute('post', $id, $pattern, $handler);
-    }
-
-    public function group(string $pattern, Closure $group): void
-    {
-        $this->groupStack[] = $pattern;
-
-        $group($this);
-
-        array_pop($this->groupStack);
-    }
-
-    public function getRoute(string $id): ?Route
-    {
-        if (!isset($this->routes[$id])) {
-            return null;
-        }
-
-        return $this->routes[$id];
-    }
-
-    public function match(string $method, array $uri): ?array
-    {
-        $groupNumber = count($uri);
-
-        // response to HEAD request with the GET content
-        if ($method === 'head') {
-            $method = 'get';
-        }
-
-        if (!isset($this->searchTable[$method][$groupNumber])) {
-            return null;
-        }
-
-        foreach ($this->searchTable[$method][$groupNumber] as $route) {
-            if (($parameters = $route->testAgainst($uri)) !== null) {
-                return [$route, $parameters];
-            }
-        }
-
-        return null;
-    }
-
-    private function addRoute(string $method, string $id, string $pattern, array $handler): void
-    {
-        if (isset($this->routes[$id])) {
-            throw new \Exception('Route already exists: ' . $id);
-        }
-
-        $pattern = array_merge($this->groupStack, $pattern === '' ? [] : explode('/', $pattern));
-        $route = new Route($id, $pattern, $handler);
-
-        $groupNumber = count($pattern);
-
-        $this->searchTable[$method][$groupNumber][] = $route;
-
-        while (preg_match('/^{\\w+\\?}$/', end($pattern)) === 1) {
-            $groupNumber--;
-            array_pop($pattern);
-
-            $this->searchTable[$method][$groupNumber][] = $route;
-        }
-
-        $this->routes[$id] = $route;
-    }
-}

src/Session/DatabaseSessionHandler.php

@@ -1,104 +0,0 @@
-<?php namespace MapGuesser\Session;
-
-use DateTime;
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Session\ISessionHandler;
-
-class DatabaseSessionHandler implements ISessionHandler
-{
-    private bool $exists = false;
-
-    private bool $written = false;
-
-    public function open($savePath, $sessionName): bool
-    {
-        return true;
-    }
-
-    public function close(): bool
-    {
-        return true;
-    }
-
-    public function read($id): string
-    {
-        $select = new Select(\Container::$dbConnection, 'sessions');
-        $select->columns(['data']);
-        $select->whereId(substr($id, 0, 32));
-
-        $result = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
-        if ($result === null) {
-            return '';
-        }
-
-        $this->exists = true;
-
-        return $result['data'];
-    }
-
-    public function write($id, $data): bool
-    {
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
-
-        if ($this->exists) {
-            $modify->setId(substr($id, 0, 32));
-        } else {
-            $modify->setExternalId(substr($id, 0, 32));
-        }
-
-        $modify->set('data', $data);
-        $modify->set('updated', (new DateTime())->format('Y-m-d H:i:s'));
-        $modify->save();
-
-        $this->written = true;
-
-        return true;
-    }
-
-    public function destroy($id): bool
-    {
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
-        $modify->setId(substr($id, 0, 32));
-        $modify->delete();
-
-        $this->exists = false;
-
-        return true;
-    }
-
-    public function gc($maxlifetime): bool
-    {
-        // empty on purpose
-        // old sessions are deleted by MaintainDatabaseCommand
-
-        return true;
-    }
-
-    public function create_sid(): string
-    {
-        return bin2hex(random_bytes(16));
-    }
-
-    public function validateId($id): bool
-    {
-        return preg_match('/^[a-f0-9]{32}$/', $id) === 1;
-    }
-
-    public function updateTimestamp($id, $data): bool
-    {
-        if ($this->written) {
-            return true;
-        }
-
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
-
-        $modify->setId(substr($id, 0, 32));
-        $modify->set('updated', (new DateTime())->format('Y-m-d H:i:s'));
-        $modify->save();
-
-        return true;
-    }
-}

src/Util/JwtParser.php

@@ -1,33 +0,0 @@
-<?php namespace MapGuesser\Util;
-
-class JwtParser
-{
-    private array $token;
-
-    public function __construct(?string $token = null)
-    {
-        if ($token !== null) {
-            $this->setToken($token);
-        }
-    }
-
-    public function setToken(string $token): void
-    {
-        $this->token = explode('.', str_replace(['_', '-'], ['/', '+'], $token));
-    }
-
-    public function getHeader(): array
-    {
-        return json_decode(base64_decode($this->token[0]), true);
-    }
-
-    public function getPayload(): array
-    {
-        return json_decode(base64_decode($this->token[1]), true);
-    }
-
-    public function getSignature(): string
-    {
-        return base64_decode($this->token[2]);
-    }
-}

src/View/Linker.php

@@ -1,152 +0,0 @@
-<?php namespace MapGuesser\View;
-
-class Linker
-{
-    const INLINE_ASSET_LIMIT = 2000;
-
-    private string $view;
-
-    public function __construct(string $view)
-    {
-        $this->view = $view;
-    }
-
-    public function generate(): void
-    {
-        $input = ROOT . '/views/' . $this->view . '.php';
-
-        $temporaryFiles = [];
-        $sections = ['externalCss' => '', 'inlineCss' => '', 'externalJs' => '', 'inlineJs' => ''];
-        $extra = ['', ''];
-
-        do {
-            $parser = new Parser($input);
-            $fragment = $parser->parse();
-
-            $extends = $fragment->getExtends();
-
-            $this->generateAssets($fragment, $sections);
-
-            $sections = array_merge($sections, $fragment->getSections()); //TODO: detect if section defined multiple times
-            $extra[0] = $fragment->getExtra()[0] . $extra[0];
-            $extra[1] = $extra[1] . $fragment->getExtra()[1];
-
-            if ($extends === null) {
-                $this->writeFinal($extra, $input, ROOT . '/cache/views/' . $this->view . '.php');
-                break;
-            }
-
-            $tmpFile = tempnam(sys_get_temp_dir(), 'mapg-view-');
-            $temporaryFiles[] = $tmpFile;
-
-            $this->extendTemplate($sections, ROOT . '/views/' . $extends . '.php', $tmpFile);
-
-            $input = $tmpFile;
-        } while (true);
-
-        foreach ($temporaryFiles as $tmpFile) {
-            unlink($tmpFile);
-        }
-    }
-
-    private function extendTemplate(array $sections, string $file, string $output): void
-    {
-        $inputFileHandle = fopen($file, 'r');
-        if (!$inputFileHandle) {
-            throw new \Exception('Cannot open file ' . $file);
-        }
-
-        $outputFileHandle = fopen($output, 'w');
-        if (!$outputFileHandle) {
-            throw new \Exception('Cannot open file ' . $output . 'for writing.');
-        }
-
-        $lineNumber = 0;
-        while (($line = fgets($inputFileHandle)) !== false) {
-            ++$lineNumber;
-
-            if (preg_match('/^\s*@yields\(\'([\w\/]+)\'\)\s*$/', $line, $matches) === 1) {
-                if (isset($sections[$matches[1]])) {
-                    fwrite($outputFileHandle, $sections[$matches[1]]);
-                }
-            } else {
-                fwrite($outputFileHandle, $line);
-            }
-        }
-
-        fclose($inputFileHandle);
-        fclose($outputFileHandle);
-    }
-
-    private function writeFinal(array $extra, string $file, string $output): void
-    {
-        $dirname = pathinfo($output, PATHINFO_DIRNAME);
-        if (!is_dir($dirname)) {
-            mkdir($dirname, 0755, true);
-        }
-
-        $inputFileHandle = fopen($file, 'r');
-        if (!$inputFileHandle) {
-            throw new \Exception('Cannot open file ' . $file);
-        }
-
-        $outputFileHandle = fopen($output, 'w');
-        if (!$outputFileHandle) {
-            throw new \Exception('Cannot open file ' . $output . 'for writing.');
-        }
-
-        fwrite($outputFileHandle, $extra[0]);
-        while (($line = fgets($inputFileHandle)) !== false) {
-            fwrite($outputFileHandle, $line);
-        }
-        fwrite($outputFileHandle, $extra[1]);
-
-        fclose($inputFileHandle);
-        fclose($outputFileHandle);
-    }
-
-    private function generateAssets(ParsedFragment $fragment, array &$sections): void
-    {
-        foreach ($fragment->getCss() as $cssFile) {
-            $asset = $this->parseAsset($cssFile);
-            if (isset($asset['code'])) {
-                $sections['inlineCss'] .= '<style>' . PHP_EOL;
-                $sections['inlineCss'] .= $asset['code'];
-                $sections['inlineCss'] .= '</style>' . PHP_EOL;
-            } elseif (isset($asset['file'])) {
-                $sections['externalCss'] .= '<link href="' . $asset['file'] . '" rel="stylesheet">' . PHP_EOL;
-            }
-        }
-
-        foreach ($fragment->getJs() as $jsFile) {
-            $asset = $this->parseAsset($jsFile);
-            if (isset($asset['code'])) {
-                $sections['inlineJs'] .= '<script>' . PHP_EOL;
-                $sections['inlineJs'] .= $asset['code'];
-                $sections['inlineJs'] .= '</script>' . PHP_EOL;
-            } elseif (isset($asset['file'])) {
-                $sections['externalJs'] .= '<script src="' . $asset['file'] . '"></script>' . PHP_EOL;
-            }
-        }
-    }
-
-    private function parseAsset(string $asset): array
-    {
-        $output = [];
-
-        if (preg_match('/^[\w\/\.]+$/', $asset) === 1) {
-            if (
-                empty($_ENV['DEV']) &&
-                filesize(ROOT . '/public/static/' . $asset) < self::INLINE_ASSET_LIMIT
-            ) {
-                $output['code'] = file_get_contents(ROOT . '/public/static/' . $asset);
-            } else {
-                $output['file'] = '<?= $_ENV[\'STATIC_ROOT\'] ?>/' . $asset . '?rev=<?= REVISION ?>';
-            }
-        } else {
-            $output['file'] = $asset;
-        }
-
-        return $output;
-    }
-}

src/View/ParsedFragment.php

@@ -1,48 +0,0 @@
-<?php namespace MapGuesser\View;
-
-class ParsedFragment
-{
-    private ?string $extends;
-
-    private array $css;
-
-    private array $js;
-
-    private array $sections;
-
-    private array $extra;
-
-    public function __construct(?string $extends, array $css, array $js, array $sections, array $extra)
-    {
-        $this->extends = $extends;
-        $this->css = $css;
-        $this->js = $js;
-        $this->sections = $sections;
-        $this->extra = $extra;
-    }
-
-    public function getExtends(): ?string
-    {
-        return $this->extends;
-    }
-
-    public function getCss(): array
-    {
-        return $this->css;
-    }
-
-    public function getJs(): array
-    {
-        return $this->js;
-    }
-
-    public function getSections(): array
-    {
-        return $this->sections;
-    }
-
-    public function getExtra(): array
-    {
-        return $this->extra;
-    }
-}

src/View/Parser.php

@@ -1,159 +0,0 @@
-<?php namespace MapGuesser\View;
-
-class Parser
-{
-    private string $file;
-
-    public function __construct(string $file)
-    {
-        $this->file = $file;
-    }
-
-    public function parse(): ParsedFragment
-    {
-        $sectionOpen = null;
-        $extraOpen = false;
-
-        $extends = null;
-        $js = [];
-        $css = [];
-        $sections = [];
-        $extra = ['', ''];
-
-        $fileHandle = fopen($this->file, 'r');
-        if (!$fileHandle) {
-            throw new \Exception('Cannot open file ' . $this->file);
-        }
-
-        $lineNumber = 0;
-        while (($line = fgets($fileHandle)) !== false) {
-            ++$lineNumber;
-
-            if (($cssMatched = $this->matchCss($line)) !== null) {
-                $css[] = $cssMatched;
-
-                continue;
-            }
-
-            if (($jsMatched = $this->matchJs($line)) !== null) {
-                $js[] = $jsMatched;
-
-                continue;
-            }
-
-            if (($extendsMatched = $this->matchExtends($line)) !== null) {
-                if ($extends !== null) {
-                    throw new \Exception('Error in file ' . $this->file . ' in line ' . $lineNumber . ' - There is already an \'@extends\' declared.');
-                }
-
-                $extends = $extendsMatched;
-
-                continue;
-            }
-
-            if (($sectionMatched = $this->matchSection($line)) !== null) {
-                if ($extends === null) {
-                    throw new \Exception('Error in file ' . $this->file . ' in line ' . $lineNumber . ' - \'@section\' has no meaning if view extends nothing.');
-                }
-                if ($sectionOpen !== null) {
-                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - A \'@section\' is already open (no \'@endsection\' found).');
-                }
-
-                $sectionOpen = $sectionMatched;
-                $sections[$sectionOpen] = '';
-
-                continue;
-            }
-
-            if ($this->matchEndSection($line)) {
-                if ($sectionOpen === null) {
-                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - Cannot end section until no \'@section\' is open.');
-                }
-
-                $sectionOpen = null;
-            }
-
-            if ($this->matchExtra($line)) {
-                if ($extraOpen) {
-                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - An \'@extra\' is already open (no \'@endextra\' found).');
-                }
-
-                $extraOpen = true;
-
-                continue;
-            }
-
-            if ($this->matchEndExtra($line)) {
-                if (!$extraOpen) {
-                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - Cannot end extra until no \'@extra\' is open.');
-                }
-
-                $extraOpen = false;
-            }
-
-            if ($sectionOpen !== null) {
-                $sections[$sectionOpen] .= $line;
-            }
-
-            if ($extraOpen) {
-                $offset = $extends === null ? 0 : 1;
-                $extra[$offset] .= $line;
-            }
-        }
-
-        fclose($fileHandle);
-
-        return new ParsedFragment($extends, $css, $js, $sections, $extra);
-    }
-
-    private function matchCss(string $line): ?string
-    {
-        if (preg_match('/^\s*@css\((.*)\)\s*$/', $line, $matches) === 1) {
-            return $matches[1];
-        }
-
-        return null;
-    }
-
-    private function matchJs(string $line): ?string
-    {
-        if (preg_match('/^\s*@js\((.*)\)\s*$/', $line, $matches) === 1) {
-            return $matches[1];
-        }
-
-        return null;
-    }
-
-    private function matchExtends(string $line): ?string
-    {
-        if (preg_match('/^\s*@extends\(([\w\/]+)\)\s*$/', $line, $matches) === 1) {
-            return $matches[1];
-        }
-
-        return null;
-    }
-
-    private function matchSection(string $line): ?string
-    {
-        if (preg_match('/^\s*@section\((\w+)\)\s*$/', $line, $matches) === 1) {
-            return $matches[1];
-        }
-
-        return null;
-    }
-
-    private function matchEndSection(string $line): bool
-    {
-        return preg_match('/^\s*@endsection(?:\(\))?\s*$/', $line) === 1;
-    }
-
-    private function matchExtra(string $line): bool
-    {
-        return preg_match('/^\s*@extra(?:\(\))?\s*$/', $line) === 1;
-    }
-
-    private function matchEndExtra(string $line): bool
-    {
-        return preg_match('/^\s*@endextra(?:\(\))?\s*$/', $line) === 1;
-    }
-}

tests/OAuth/GoogleOAuthTest.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace MapGuesser\Tests\OAuth;
-
-use MapGuesser\Interfaces\Http\IRequest;
-use MapGuesser\Interfaces\Http\IResponse;
-use MapGuesser\OAuth\GoogleOAuth;
-use PHPUnit\Framework\TestCase;
-
-final class GoogleOAuthTest extends TestCase
-{
-    public function testCanCreateDialogUrl(): void
-    {
-        $_ENV['GOOGLE_OAUTH_CLIENT_ID'] = 'xyz';
-        $state = 'random_state_string';
-        $nonce = 'random_nonce_string';
-        $redirectUrl = 'http://example.com/oauth';
-
-        $requestMock = $this->getMockBuilder(IRequest::class)
-            ->setMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send'])
-            ->getMock();
-        $googleOAuth = new GoogleOAuth($requestMock);
-
-        $dialogUrl = $googleOAuth->getDialogUrl($state, $redirectUrl, $nonce);
-        $dialogUrlParsed = explode('?', $dialogUrl);
-
-        $this->assertEquals('https://accounts.google.com/o/oauth2/v2/auth', $dialogUrlParsed[0]);
-
-        parse_str($dialogUrlParsed[1], $dialogUrlQueryParams);
-
-        $expectedQueryParams = [
-            'response_type' => 'code',
-            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
-            'scope' => 'openid email',
-            'redirect_uri' => $redirectUrl,
-            'state' => $state,
-            'nonce' => $nonce,
-        ];
-
-        $this->assertEquals($expectedQueryParams, $dialogUrlQueryParams);
-    }
-
-    public function testCanRequestToken(): void
-    {
-        $_ENV['GOOGLE_OAUTH_CLIENT_ID'] = 'abc';
-        $_ENV['GOOGLE_OAUTH_CLIENT_SECRET'] = 'xxx';
-        $code = 'code_from_google';
-        $redirectUrl = 'http://example.com/oauth';
-
-        $requestMock = $this->getMockBuilder(IRequest::class)
-            ->setMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send'])
-            ->getMock();
-        $responseMock = $this->getMockBuilder(IResponse::class)
-            ->setMethods(['getBody', 'getHeaders'])
-            ->getMock();
-        $googleOAuth = new GoogleOAuth($requestMock);
-
-        $expectedQueryParams = [
-            'code' => $code,
-            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
-            'client_secret' => $_ENV['GOOGLE_OAUTH_CLIENT_SECRET'],
-            'redirect_uri' => $redirectUrl,
-            'grant_type' => 'authorization_code',
-        ];
-
-        $requestMock->expects($this->once())
-            ->method('setUrl')
-            ->with($this->equalTo('https://oauth2.googleapis.com/token'));
-        $requestMock->expects($this->once())
-            ->method('setMethod')
-            ->with($this->equalTo(IRequest::HTTP_POST));
-        $requestMock->expects($this->once())
-            ->method('setQuery')
-            ->with($this->equalTo($expectedQueryParams));
-        $requestMock->expects($this->once())
-            ->method('send')
-            ->will($this->returnValue($responseMock));
-        $responseMock->expects($this->once())
-            ->method('getBody')
-            ->will($this->returnValue('{"test":"json"}'));
-
-        $token = $googleOAuth->getToken($code, $redirectUrl);
-
-        $this->assertEquals(['test' => 'json'], $token);
-    }
-}

tests/PersistentData/Model/ModelTest.php

@@ -1,93 +0,0 @@
-<?php namespace MapGuesser\Tests\Util;
-
-use MapGuesser\PersistentData\Model\Model;
-use PHPUnit\Framework\TestCase;
-
-class OtherModel
-{
-}
-
-class DummyModel extends Model
-{
-    protected static string $table = 'test_table';
-
-    protected static array $fields = ['name', 'valid'];
-
-    protected static array $relations = ['other_model' => OtherModel::class];
-
-    private string $name;
-
-    private bool $valid;
-
-    public function setName(string $name): void
-    {
-        $this->name = $name;
-    }
-
-    public function setValid(bool $valid): void
-    {
-        $this->valid = $valid;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function getValid(): bool
-    {
-        return $this->valid;
-    }
-}
-
-final class ModelTest extends TestCase
-{
-    public function testCanReturnTable(): void
-    {
-        $this->assertEquals('test_table', DummyModel::getTable());
-    }
-
-    public function testCanReturnFields(): void
-    {
-        $this->assertEquals(['id', 'name', 'valid'], DummyModel::getFields());
-    }
-
-    public function testCanReturnRelations(): void
-    {
-        $this->assertEquals(['other_model' => OtherModel::class], DummyModel::getRelations());
-    }
-
-    public function testCanBeConvertedToArray(): void
-    {
-        $model = new DummyModel();
-        $model->setId(123);
-        $model->setName('John');
-        $model->setValid(true);
-
-        $this->assertEquals([
-            'id' => 123,
-            'name' => 'John',
-            'valid' => true
-        ], $model->toArray());
-    }
-
-    public function testCanSaveAndResetSnapshot(): void
-    {
-        $model = new DummyModel();
-        $model->setId(123);
-        $model->setName('John');
-        $model->setValid(true);
-
-        $model->saveSnapshot();
-
-        $this->assertEquals([
-            'id' => 123,
-            'name' => 'John',
-            'valid' => true
-        ], $model->getSnapshot());
-
-        $model->resetSnapshot();
-
-        $this->assertEquals([], $model->getSnapshot());
-    }
-}

tests/Util/JwtParserTest.php

@@ -1,51 +0,0 @@
-<?php namespace MapGuesser\Tests\Util;
-
-use MapGuesser\Util\JwtParser;
-use PHPUnit\Framework\TestCase;
-
-final class JwtParserTest extends TestCase
-{
-    private JwtParser $jwtParser;
-
-    protected function setUp(): void
-    {
-        $this->jwtParser = new JwtParser(
-            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c'
-        );
-    }
-
-    public function testSettingTokenIsTheSameAsCreatingWithToken(): void
-    {
-        $jwtParser2 = new JwtParser();
-        $jwtParser2->setToken(
-            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c'
-        );
-
-        $this->assertEquals($this->jwtParser, $jwtParser2);
-    }
-
-    public function testCanParseTokenHeader(): void
-    {
-        $this->assertEquals([
-            'alg' => 'HS256',
-            'typ' => 'JWT'
-        ], $this->jwtParser->getHeader());
-    }
-
-    public function testCanParseTokenPayload(): void
-    {
-        $this->assertEquals([
-            'sub' => '1234567890',
-            'name' => 'John Doe',
-            'iat' => 1516239022
-        ], $this->jwtParser->getPayload());
-    }
-
-    public function testCanParseTokenSignature(): void
-    {
-        $this->assertEquals(
-            '49f94ac7044948c78a285d904f87f0a4c7897f7e8f3a4eb2255fda750b2cc397',
-            bin2hex($this->jwtParser->getSignature())
-        );
-    }
-}

tests/View/ParserTest.php

@@ -1,144 +0,0 @@
-<?php namespace MapGuesser\Tests\View\Parser;
-
-use MapGuesser\View\ParsedFragment;
-use MapGuesser\View\Parser;
-use PHPUnit\Framework\TestCase;
-
-final class ParserTest extends TestCase
-{
-    const TEST_VIEWS_PATH = __DIR__ . '/../../views/tests';
-
-    public function testCanParseViewWithoutExtends(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_without_extends.php');
-
-        $parser = new Parser($file);
-        $fragment = $parser->parse();
-
-        $expected = new ParsedFragment(
-            null,
-            [],
-            [],
-            [],
-            ['', '']
-        );
-
-        $this->assertEquals($expected, $fragment);
-    }
-
-    public function testCanParseViewWithAssets(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_with_assets.php');
-
-        $parser = new Parser($file);
-        $fragment = $parser->parse();
-
-        $expected = new ParsedFragment(
-            null,
-            [
-                'test.css'
-            ],
-            [
-                'test.js',
-                'test_<?= $some[\'expression\'] ?>'
-            ],
-            [],
-            ['', '']
-        );
-
-        $this->assertEquals($expected, $fragment);
-    }
-
-    public function testCanParseViewWithExtends(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_with_extends.php');
-
-        $parser = new Parser($file);
-        $fragment = $parser->parse();
-
-        $expected = new ParsedFragment(
-            'parent',
-            [],
-            [],
-            [
-                'section1' => '<div>Test HTML with @extends</div>' . "\n"
-            ],
-            ['', '']
-        );
-
-        $this->assertEquals($expected, $fragment);
-    }
-
-    public function testCanParseComplexView(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_complex.php');
-
-        $parser = new Parser($file);
-        $fragment = $parser->parse();
-
-        $expected = new ParsedFragment(
-            'parent',
-            [
-                'test1.css'
-            ],
-            [
-                'test1.js',
-                'test2_<?= $some[\'expression\'] ?>'
-            ],
-            [
-                'section1' => '<div>Test HTML with @extends - section 1</div>' . "\n",
-                'section2' => '<div>Test HTML with @extends - section 2</div>' . "\n"
-            ],
-            [
-                '<?php phpinfo() ?>' . "\n",
-                '<?php $a = \'test_string\' ?>' . "\n" . 'EXTRA' . "\n",
-            ]
-        );
-
-        $this->assertEquals($expected, $fragment);
-    }
-
-    public function testFailsIfMultipleExtendsGiven(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_multiple_extends.php');
-
-        $parser = new Parser($file);
-
-        $this->expectExceptionMessage('Error in file ' . $file . ' in line 3 - There is already an \'@extends\' declared.');
-
-        $parser->parse();
-    }
-
-    public function testFailsIfSectionWithoutExtendsGiven(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_section_without_extends.php');
-
-        $parser = new Parser($file);
-
-        $this->expectExceptionMessage('Error in file ' . $file . ' in line 1 - \'@section\' has no meaning if view extends nothing.');
-
-        $parser->parse();
-    }
-
-    public function testFailsIfOpeningSectionBeforePreviousClosed(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_multiple_sections_open.php');
-
-        $parser = new Parser($file);
-
-        $this->expectExceptionMessage('Parse error in file ' . $file . ' in line 4 - A \'@section\' is already open (no \'@endsection\' found).');
-
-        $parser->parse();
-    }
-
-    public function testFailsIfClosingSectionWhenNoSectionIsOpen(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_section_not_open.php');
-
-        $parser = new Parser($file);
-
-        $this->expectExceptionMessage('Parse error in file ' . $file . ' in line 4 - Cannot end section until no \'@section\' is open.');
-
-        $parser->parse();
-    }
-}

views/account/account.php

@@ -9,24 +9,24 @@
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to modify your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text name="password" placeholder="Current password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to modify your account.</p>
-                <input class="big fullWidth" type="password" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to modify your account.</p>
                 <div class="inputWithButton">
-                    <input type="text" name="password" placeholder="Authenticate with Google..." disabled><!--
+                    <input type="text" class="text" name="password" placeholder="Authenticate with Google..." disabled><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php endif; ?>
             <hr>
             <?php /* TODO: disabled for the time being, email modification should be implemented */ ?>
-            <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
-            <input class="big fullWidth marginTop" type="password" name="password_new" placeholder="New password" minlength="6">
-            <input class="big fullWidth marginTop" type="password" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
+            <input type="password" class="text big fullWidth marginTop" name="password_new" placeholder="New password" minlength="6">
+            <input type="password" class="text big fullWidth marginTop" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
             <p id="accountFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit" name="submit" disabled>Save</button>

views/account/delete.php

@@ -10,16 +10,16 @@
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to delete your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text" name="password" placeholder="Current password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to delete your account.</p>
-                <input class="big fullWidth" type="password" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to delete your account.</p>
                 <div class="inputWithButton">
-                    <input type="text" name="password" placeholder="Authenticate with Google..." disabled><!--
+                    <input type="text" class="text" name="password" placeholder="Authenticate with Google..." disabled><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php endif; ?>

views/admin/map_editor.php

@@ -19,7 +19,7 @@
                 </button>
            </span><!--
         --><span class="inline hideOnMobile">
-               <input type="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
+               <input type="text" class="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
                <button id="jumpButton" disabled >Jump</button>
            </span><!--
         --><span><!--
@@ -52,8 +52,11 @@
 <div id="metadata" class="modal">
     <h2>Edit map data</h2>
     <form id="metadataForm" class="marginTop" data-no-submit="true">
-        <input class="fullWidth" type="text" name="name" value="<?= $mapName ?>" placeholder="Name of the map">
-        <textarea  class="fullWidth marginTop" name="description" rows="4" placeholder="Description of the map"><?= $mapDescription ?></textarea>
+        <input type="text" class="text fullWidth" name="name" value="<?= $mapName ?>" placeholder="Name of the map">
+        <textarea class="fullWidth marginTop" name="description" rows="4" placeholder="Description of the map"><?= $mapDescription ?></textarea>
+        <div class="marginTop">
+            <input type="checkbox" id="unlisted" name="unlisted" <?= $mapUnlisted ? 'checked' : '' ?>><label for="unlisted">Unlisted</label>
+        </div>
         <div class="right">
             <button class="marginTop marginRight" type="submit">Apply</button><!--
          --><button id="closeMetadataButton" class="gray marginTop" type="button">Close</button>
@@ -94,6 +97,7 @@
 @section(pageScript)
 <script>
     var tileUrl = '<?= $_ENV['LEAFLET_TILESERVER_URL'] ?>';
+    var tileSubdomains = '<?= $_ENV['LEAFLET_TILESERVER_SUBDOMAINS'] ?>';
     var tileAttribution = '<?= $_ENV['LEAFLET_TILESERVER_ATTRIBUTION'] ?>';
     var mapId = <?= $mapId ?>;
     var mapBounds = <?= json_encode($bounds) ?>;

views/game.php

@@ -12,11 +12,25 @@
     <div id="players" class="marginTop"></div>
     <button id="startMultiGameButton" class="button fullWidth marginTop green">Start game</button>
 </div>
+<div id="highscores" class="modal">
+    <h2>Highscores</h2>
+    <div>
+        <table id="highscoresTable">
+            <tr>
+                <th>Player</th>
+                <th>Score</th>
+            </tr>
+        </table>
+    </div>
+    <div class="right">
+        <button id="closeHighscoresButton" class="gray marginTop" type="button">Close</button>
+    </div>
+</div>
 @endsection
 
 @section(subheader)
     <span id="mapName" class="bold">Loading map...</span><!--
- --><span>Round <span id="currentRound" class="bold"></span></span><!--
+ --><span id="roundContainer">Round <span id="currentRound" class="bold"></span></span><!--
  --><span>Score <span id="currentScoreSum" class="bold"></span></span>
 @endsection
 
@@ -25,6 +39,7 @@
         <p id="countdownTime" class="mono bold"></p>
     </div>
     <div id="panoCover"></div>
+    <div id="panningBlockerCover"></div>
     <div id="panorama"></div>
     <div id="showGuessButtonContainer">
         <button id="showGuessButton" class="fullWidth">Show guess map</button>
@@ -41,7 +56,7 @@
             <div id="distanceInfo">
                 <p>You were <span id="distance" class="bold"></span> close.</p>
                 <p>You didn't guess in this round.</p>
-                <p class="bold">Game finished.</p>
+                <p id="summaryInfo" class="bold">Game finished.</p>
             </div>
             <div id="scoreInfo">
                 <p>You earned <span id="score" class="bold"></span> points.</p>
@@ -57,6 +72,7 @@
             <button id="continueButton" class="fullWidth">Continue</button>
             <button id="showSummaryButton" class="fullWidth">Show summary</button>
             <button id="startNewGameButton" class="fullWidth">Play this map again</button>
+            <a href="/" id="goToStart"><button class="fullWidth">Go back to the menu</button></a> 
         </div>
     </div>
     <div id="navigation" class="circleControl">
@@ -84,5 +100,6 @@
     var multiUrl = '<?= $_ENV['MULTI_WS_URL'] ?>';
     var roomId = <?= isset($roomId) ? '\'' . $roomId . '\'' : 'null' ?>;
     var mapId = <?= isset($mapId) ? '\'' . $mapId . '\'' : 'null' ?>;
+    var challengeToken = <?= isset($challengeToken) ? '\'' . $challengeToken . '\'' : 'null' ?>;
 </script>
 @endsection