MAPG-146 [WIP]

.env.example

@@ -1,4 +1,3 @@
-APP_NAME=MapGuesser
 DEV=1
 DB_HOST=mariadb
 DB_USER=mapguesser
@@ -12,10 +11,3 @@ STATIC_ROOT=/static
 MAIL_FROM=mapguesser@mapguesser-dev.ch
 MAIL_HOST=mail
 MAIL_PORT=2500
-GOOGLE_OAUTH_CLIENT_ID=your_google_oauth_client_id
-GOOGLE_OAUTH_CLIENT_SECRET=your_google_oauth_client_secret
-GOOGLE_ANALITICS_ID=your_google_analytics_id
-MULTI_INTERNAL_HOST=multi
-MULTI_INTERNAL_PORT=5000
-MULTI_WS_URL=mapguesser-dev.ch:8090
-MULTI_WS_PORT=8090

.gitignore

@@ -1,4 +1,3 @@
 .env
 installed
 vendor
-node_modules

.vscode/launch.json

@@ -9,14 +9,6 @@
             "pathMappings": {
                 "/var/www/mapguesser": "${workspaceRoot}",
             }
-        },
-        {
-            "name": "Listen for NodeJS Inspector in Docker",
-            "type": "node",
-            "request": "attach",
-            "port": 9229,
-            "localRoot": "${workspaceFolder}",
-            "remoteRoot": "/var/www/mapguesser"
         }
     ]
 }

README.md

@@ -1,71 +1,5 @@
 # MapGuesser
 
-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.
+This is the MapGuesser Application project.
 
-## Installation
-
-### Clone the Git repository
-
-The first step is obviously cloning the repository to your machine:
-
-```
-git clone https://gitea.e5tv.hu/esoko/mapguesser.git
-```
-
-All the commands listed here should be executed from the repository root.
-
-### (Optional) Setup Docker stack
-
-The easiest way to build up a fully working application with web server and database is to use Docker Compose with the included `docker-compose.yml`.
-
-All you have to do is executing the following command:
-
-```
-docker-compose up -d
-```
-
-Attach shell to the container of `mapguesser_app`. All of the following commands should be executed there.
-
-**If you don't use the Docker stack you need to install your environment manually. Check `docker-compose.yml` and `docker/Dockerfile` to see the system requirements.**
-
-### Initialize project
-
-This command installes all of the Composer requirements and creates a copy of the example `.env` file.
-
-```
-composer create-project
-```
-
-### Set environment variables
-
-The `.env` file contains several environment variables that are needed by the application to work properly. These should be configured for your environment.
-
-**You should set here the API keys that enable playing the game. Without these API keys the application cannot work well. To get Google API keys visit this page: https://console.developers.google.com/**
-
-One very important variable is `DEV`. This indicates that the application operates in development (staging) and not in produciton mode.
-
-If you install the application in the Docker stack for development (staging) environment, only the variables for external dependencies (API keys, map attribution, etc.) should be adapted. All other variables (for DB connection, static root, mailing, etc.) are fine with the default value.
-
-### (Production only) Create cron job
-
-To maintain database (delete inactive users, old sessions etc.), the command `db:maintain` should be regularly executed. It is recommened to create a cron job that runs every hour:
-
-```
-0 * * * * /path/to/your/installation/mapg db:maintain >>/var/log/cron-mapguesser.log 2>&1
-```
-
-### Finalize installation
-
-After you set the environment variables in the `.env` file, execute the following command:
-
-```
-scripts/install.sh
-```
-
-**And you are done!** The application is ready to use and develop.
-
-If you installed it in the Docker stack, you can reach it on http://localhost. The mails that are sent by the application can be found on http://localhost:8080/. If needed, the database server can be directly reached on localhost:3306.
-
----
-
-*License: **GNU AGPL 3.0**. Full license text can be found in file `LICENSE`.*
+License: GNU AGPL 3.0

bitbucket-pipelines.yml

@@ -1,26 +0,0 @@
-image: php:7.4.7-cli-buster
-
-pipelines:
-    default:
-        - step:
-              name: Unit Testing
-              caches:
-                  - composer
-              artifacts:
-                  - unit_test_results.xml
-              script:
-                  - apt-get update && apt-get install -y unzip
-                  - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-                  - composer install
-                  - vendor/bin/phpunit --log-junit unit_test_results.xml --testdox tests
-        - step:
-              name: Static Code Analysis
-              caches:
-                  - composer
-              artifacts:
-                  - static_code_analysis_results.json
-              script:
-                  - apt-get update && apt-get install -y unzip
-                  - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-                  - composer install
-                  - php -d memory_limit=1G vendor/bin/phpstan analyse -c phpstan.neon --error-format=prettyJson > static_code_analysis_results.json

cache/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

composer.json

@@ -6,13 +6,9 @@
   "require": {
     "vlucas/phpdotenv": "^4.1",
     "symfony/console": "^5.1",
-    "phpmailer/phpmailer": "^6.1",
-    "fzaninotto/faker": "^1.9"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "^9",
-    "phpstan/phpstan": "^0.12.32"
+    "phpmailer/phpmailer": "^6.1"
   },
+  "require-dev": {},
   "autoload": {
     "psr-4": {
       "MapGuesser\\": "src"

database/migrations/structure/20200620_2113_google_login.sql

@@ -1,8 +0,0 @@
-ALTER TABLE
-  `users`
-ADD
-  `google_sub` varchar(255) CHARACTER SET ascii COLLATE ascii_bin NULL DEFAULT NULL,
-ADD
-  UNIQUE `google_sub` (`google_sub`),
-MODIFY
-  `password` varchar(60) NULL DEFAULT NULL;

database/migrations/structure/20200704_0005_pov_for_places.sql

@@ -1,8 +0,0 @@
-ALTER TABLE
-  `places`
-ADD
-  `pov_heading` decimal(6, 3) NOT NULL DEFAULT 0.0,
-ADD
-  `pov_pitch` decimal(5, 3) NOT NULL DEFAULT 0.0,
-ADD
-  `pov_zoom` decimal(5, 4) NOT NULL DEFAULT 0.0;

database/migrations/structure/20200704_1954_password_forgotten.sql

@@ -1,10 +0,0 @@
-CREATE TABLE `user_password_resetters` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `user_id` int(10) unsigned NOT NULL,
-  `token` varchar(32) CHARACTER SET ascii NOT NULL,
-  `expires` timestamp NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `user_id` (`user_id`),
-  KEY `token` (`token`),
-  CONSTRAINT `user_password_resetters_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20200705_0118_resend_activation.sql

@@ -1,5 +0,0 @@
-UPDATE `user_confirmations` SET token=SUBSTRING(token, 1, 32);
-
-ALTER TABLE `user_confirmations`
-  ADD `last_sent` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  MODIFY `token` varchar(32) CHARACTER SET ascii NOT NULL;

database/migrations/structure/20200705_0218_fix_timestamp_onupdate.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `sessions`
-  MODIFY `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;

database/migrations/structure/20200705_0219_redefine_tokens.sql

@@ -1,4 +0,0 @@
-UPDATE `sessions` SET id=SUBSTRING(id, 1, 32);
-
-ALTER TABLE `sessions`
-  MODIFY `id` varchar(32) CHARACTER SET ascii NOT NULL;

database/migrations/structure/20200706_1236_user_created.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `users`
-  ADD `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;

database/migrations/structure/20210318_2136_multiplayer.sql

@@ -1,9 +0,0 @@
-CREATE TABLE `multi_rooms` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `room_id` varchar(6) NOT NULL,
-  `state` text NOT NULL,
-  `members` text NOT NULL,
-  `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `room_id` (`room_id`)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

docker-compose.yml

@@ -1,27 +1,16 @@
 version: '3'
 services:
     app:
-        build:
-            context: ./docker
-            dockerfile: Dockerfile-app
+        build: ./docker
         ports:
             - 80:80
         volumes:
             - .:/var/www/mapguesser
-    multi:
-        build:
-            context: ./docker
-            dockerfile: Dockerfile-multi
-        ports:
-            - 5000:5000
-            - 8090:8090
-            - 9229:9229
-        volumes:
-            - .:/var/www/mapguesser
+        links:
+            - 'mariadb'
+            - 'mail'
     mariadb:
-        image: mariadb:10.3
-        ports:
-            - 3306:3306
+        image: mariadb:10.1
         volumes:
             - mysql:/var/lib/mysql
         environment:

docker/Dockerfile

@@ -4,8 +4,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # Install Nginx, PHP and further necessary packages
 RUN apt update --fix-missing
-RUN apt install -y curl git unzip mariadb-client nginx \
-    php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
+RUN apt install -y curl git mariadb-client nginx \
+    php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip
 
 # Configure Nginx with PHP
 RUN mkdir -p /run/php
@@ -21,7 +21,7 @@ RUN ./install-composer.sh
 # Install Node.js and required packages
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN apt install -y nodejs
-RUN npm install -g uglify-js clean-css-cli svgo yarn
+RUN npm install -g uglify-js clean-css-cli svgo
 
 EXPOSE 80
 VOLUME /var/www/mapguesser

docker/Dockerfile-multi

@@ -1,16 +0,0 @@
-FROM ubuntu:focal
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install necessary packages
-RUN apt update --fix-missing
-RUN apt install -y curl build-essential
-
-# Install Node.js and required packages
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt install -y nodejs
-
-VOLUME /var/www/mapguesser
-WORKDIR /var/www/mapguesser
-
-ENTRYPOINT /usr/bin/node --inspect=0.0.0.0:9229 multi

mail/password-reset.html

@@ -1,13 +0,0 @@
-Hi,
-<br><br>
-You recently requested password reset on {{APP_NAME}} with this email address ({{EMAIL}}).
-To reset the password to your account, please click on the following link:<br>
-<a href="{{RESET_LINK}}" title="Reset password">{{RESET_LINK}}</a>
-<br><br>
-You can reset your password with this link util {{EXPIRES}}.
-<br><br>
-If you did not requested password reset, no further action is required, your account is not touched.
-<br><br>
-Regards,<br>
-{{APP_NAME}}<br>
-<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>

mail/signup-noconfirm.html

@@ -1,9 +0,0 @@
-Hi,
-<br><br>
-You recently signed up on {{APP_NAME}} with this Google account ({{EMAIL}}).
-<br><br>
-Have fun on {{APP_NAME}}!
-<br><br>
-Regards,<br>
-{{APP_NAME}}<br>
-<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>

mail/signup.html

@@ -1,18 +1,13 @@
 Hi,
 <br><br>
-You recently signed up on {{APP_NAME}} with this email address ({{EMAIL}}).
-To activate your account, please click on the following link:<br>
+You recently signed up on MapGuesser with this email address ({{EMAIL}}). To activate your account, please click on the following link:<br>
 <a href="{{ACTIVATE_LINK}}" title="Account activation">{{ACTIVATE_LINK}}</a>
 <br><br>
-You can activate your account until {{ACTIVATABLE_UNTIL}}.
-If you don't activate your account, your email address will be permanently deleted after this point of time.
-<br><br>
-If you did not sign up on {{APP_NAME}} or changed your mind, no further action is required.
-However if you want to immediately delete your email address, please click on the following link:<br>
+If you did not sign up on MapGuesser or changed your mind, no further action is required, your email address will be deleted soon.<br>
+However if you want to immediately delete it, please click on the following link:<br>
 <a href="{{CANCEL_LINK}}" title="Sign up cancellation">{{CANCEL_LINK}}</a>
 <br><br>
-Have fun on {{APP_NAME}}!
+Have fun on MapGuesser!
 <br><br>
 Regards,<br>
-{{APP_NAME}}<br>
-<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>
+MapGuesser

main.php

@@ -1,7 +1,5 @@
 <?php
 
-define('SCRIPT_STARTED', hrtime(true));
-
 require 'vendor/autoload.php';
 
 const ROOT = __DIR__;
@@ -16,7 +14,7 @@ class Container
 {
     static MapGuesser\Interfaces\Database\IConnection $dbConnection;
     static MapGuesser\Routing\RouteCollection $routeCollection;
-    static MapGuesser\Interfaces\Session\ISessionHandler $sessionHandler;
+    static \SessionHandlerInterface $sessionHandler;
     static MapGuesser\Interfaces\Request\IRequest $request;
 }
 

mapg

@@ -5,9 +5,7 @@ require 'main.php';
 
 $app = new Symfony\Component\Console\Application('MapGuesser Console', '');
 
-$app->add(new MapGuesser\Cli\MigrateDatabaseCommand());
+$app->add(new MapGuesser\Cli\DatabaseMigration());
 $app->add(new MapGuesser\Cli\AddUserCommand());
-$app->add(new MapGuesser\Cli\LinkViewCommand());
-$app->add(new \MapGuesser\Cli\MaintainDatabaseCommand());
 
 $app->run();

multi/index.js

@@ -1,292 +0,0 @@
-'use strict';
-
-process.title = 'mapguesser-multi';
-
-class State {
-    static OPEN = 1;
-    static PLACE_RECEIVED = 2;
-    static GUESS_SENT = 3;
-}
-
-class MultiGame {
-    constructor() {
-        this.rooms = new Map();
-    }
-
-    cleanupRooms() {
-        this.rooms.forEach(function (room, roomId) {
-            var lastValidDate = new Date(new Date().getTime() - 7 * 24 * 60 * 60 * 1000);
-
-            if (room.updated < lastValidDate) {
-                this.rooms.delete(roomId);
-            }
-        });
-    }
-
-    connectToRoom(roomId, token, connection) {
-        if (!this.rooms.has(roomId) || !this.rooms.get(roomId).members.has(token)) {
-            return;
-        }
-
-        var room = this.rooms.get(roomId)
-        var member = room.members.get(token);
-        member.connection = connection;
-
-        this._sendInitialData(room, member);
-    }
-
-    createRoom(roomId) {
-        this.rooms.set(roomId, { members: new Map(), rounds: [], currentRound: -1, updated: new Date() });
-    }
-
-    joinRoom(roomId, token, userName) {
-        if (!this.rooms.has(roomId)) {
-            console.error('Room does not exist!')
-            return;
-        }
-
-        var room = this.rooms.get(roomId);
-        room.updated = new Date();
-
-        if (room.members.has(token)) {
-            return;
-        }
-
-        var data = { userName: userName };
-        var self = this;
-        room.members.forEach(function (member) {
-            self._sendToMember(member, 'member_joined', data);
-        });
-
-        room.members.set(token, { userName: userName, state: State.OPEN, connection: null });
-    }
-
-    startGame(roomId, places) {
-        if (!this.rooms.has(roomId)) {
-            //TODO: send something back
-            console.log('Room does not exist!')
-            return;
-        }
-
-        var room = this.rooms.get(roomId);
-        room.updated = new Date();
-
-        var rounds = [];
-        places.forEach(function (place) {
-            rounds.push({ place: place, results: new Map() })
-        });
-
-        room.rounds = rounds;
-
-        this.nextRound(roomId, 0);
-    }
-
-    guess(roomId, token, guessPosition, distance, score) {
-        if (!this.rooms.has(roomId)) {
-            //TODO: send something back
-            console.log('Room does not exist!')
-            return;
-        }
-
-        var room = this.rooms.get(roomId);
-        room.updated = new Date();
-
-        var round = room.rounds[room.currentRound];
-        var member = this.rooms.get(roomId).members.get(token);
-
-        this._sendResultsUntilNow(room, member);
-
-        round.results.set(member.userName, { guessPosition: guessPosition, distance: distance, score: score });
-        member.state = State.GUESS_SENT;
-
-        this._broadcastGuess(room, member.userName, guessPosition, distance, score);
-    }
-
-    nextRound(roomId, currentRound) {
-        if (!this.rooms.has(roomId)) {
-            //TODO: send something back
-            console.log('Room does not exist!')
-            return;
-        }
-
-        var room = this.rooms.get(roomId);
-        room.updated = new Date();
-
-        room.currentRound = currentRound;
-
-        var round = room.rounds[room.currentRound];
-
-        var data = {};
-        data.place = { panoId: round.place.panoId, pov: round.place.pov };
-
-        if (room.currentRound > 0) {
-            data.result = { position: room.rounds[room.currentRound - 1].place.position };
-        }
-
-        var self = this;
-        room.members.forEach(function (member) {
-            self._sendToMember(member, 'new_round', data);
-
-            member.state = State.PLACE_RECEIVED;
-        });
-    }
-
-    _sendInitialData(room, member) {
-        var data = {};
-
-        if (room.currentRound >= 0) {
-            data.place = room.rounds[room.currentRound].place;
-        }
-
-        data.history = [];
-        for (var i = 0; i < room.currentRound; ++i) {
-            var round = room.rounds[i];
-            var result;
-            if (round.results.has(member.userName)) {
-                result = round.results.get(member.userName);
-            } else {
-                result = { guessPosition: null, distance: null, score: 0 };
-            }
-
-            data.history.push({
-                position: round.place.position,
-                guessPosition: result.guessPosition,
-                distance: result.distance,
-                score: result.score
-            });
-        }
-
-        data.members = [];
-        room.members.forEach(function (currentMember) {
-            data.members.push({ userName: currentMember.userName, me: member === currentMember });
-        });
-
-        this._sendToMember(member, 'initialize', data);
-    }
-
-    _sendResultsUntilNow(room, member) {
-        if (member.state !== State.GUESS_SENT) {
-            return;
-        }
-
-        var round = room.rounds[room.currentRound];
-
-        var results = [];
-        round.results.forEach(function (result, userName) {
-            results.push({ userName: userName, guessPosition: result.guessPosition, distance: result.distance, score: result.score });
-        });
-
-        this._sendToMember(member, 'results', results);
-    }
-
-    _broadcastGuess(room, userName, guessPosition, distance, score) {
-        var data = { userName: userName, guessPosition: guessPosition, distance: distance, score: score };
-
-        room.members.forEach(function (member) {
-            if (!member.state !== State.GUESS_SENT) {
-                return;
-            }
-
-            this._sendToMember(member, 'guess', data);
-        });
-    }
-
-    _sendToMember(member, type, data) {
-        if (!member.connection) {
-            return;
-        }
-
-        if (member.connection.readyState !== ws.OPEN) {
-            member.connection = null;
-            return;
-        }
-
-        member.connection.send(JSON.stringify({ type: type, data: data }));
-    }
-}
-
-require('dotenv').config();
-
-var
-    net = require('net'),
-    ws = require('ws');
-
-var multiGame = new MultiGame();
-
-//TODO: following should be in a separate class/function
-
-var tcpServer = net.createServer(function (socket) {
-    socket.on('data', function (data) {
-        try {
-            data = JSON.parse(data);
-        } catch (e) {
-            console.error('Cannot parse data: ' + data);
-            return;
-        }
-
-        switch (data.func) {
-            case 'create_room':
-                multiGame.createRoom(data.args.roomId);
-
-                break;
-
-            case 'join_room':
-                multiGame.joinRoom(data.args.roomId, data.args.token, data.args.userName);
-
-                break;
-
-            case 'start_game':
-                multiGame.startGame(data.args.roomId, data.args.places);
-
-                break
-
-            case 'guess':
-                multiGame.guess(data.args.roomId, data.args.token, data.args.guessPosition, data.args.distance, data.args.score);
-
-                break;
-
-            case 'next_round':
-                multiGame.nextRound(data.args.roomId, data.args.currentRound);
-
-                break;
-        }
-
-        socket.write('OK');
-        socket.end();
-    });
-});
-tcpServer.on('listening', function () {
-    console.log('[INFO] TCP server started');
-});
-tcpServer.listen(process.env.MULTI_INTERNAL_PORT);
-
-var wsServer = new ws.Server({ port: process.env.MULTI_WS_PORT });
-wsServer.on('connection', function (connection, request) {
-    console.log('[INFO] New WS connection: ' + request.connection.remoteAddress);
-
-    connection.on('message', function (data) {
-        try {
-            data = JSON.parse(data);
-        } catch (e) {
-            console.error('Cannot parse data: ' + data);
-            return;
-        }
-
-        switch (data.func) {
-            case 'connect_to_room':
-                multiGame.connectToRoom(data.args.roomId, data.args.token, connection);
-                break;
-        }
-    });
-
-    connection.on('close', function () {
-        console.log('[INFO] WS connection ended: ' + request.connection.remoteAddress);
-    });
-});
-wsServer.on('listening', function () {
-    console.log('[INFO] WS server started');
-});
-
-setInterval(function () {
-    multiGame.cleanupRooms();
-}, 24 * 60 * 60 * 1000);

multi/package-lock.json

@@ -1,17 +0,0 @@
-{
-    "name": "mapguesser-multi",
-    "requires": true,
-    "lockfileVersion": 1,
-    "dependencies": {
-        "dotenv": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-            "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
-        },
-        "ws": {
-            "version": "7.4.4",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
-            "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="
-        }
-    }
-}

multi/package.json

@@ -1,13 +0,0 @@
-{
-    "name": "mapguesser-multi",
-    "version": "",
-    "description": "MapGuesser Application - Multiplayer",
-    "main": "index.js",
-    "dependencies": {
-        "dotenv": "^8.2.0",
-        "ws": "^7.4.4"
-    },
-    "scripts": {},
-    "author": "Pőcze Bence <bence@pocze.ch>",
-    "license": "GNU AGPL 3.0"
-}

phpstan.neon

@@ -1,9 +0,0 @@
-parameters:
-    level: 5
-    checkMissingIterableValueType: false
-    paths:
-        - main.php
-        - mapg
-        - web.php
-        - src
-        - tests

public/index.php

@@ -9,7 +9,7 @@ if (($pos = strpos($url, '?')) !== false) {
 }
 $url = rawurldecode($url);
 
-$match = Container::$routeCollection->match($method, $url == '' ? [] : explode('/', $url));
+$match = Container::$routeCollection->match($method, explode('/', $url));
 
 if ($match !== null) {
     list($route, $params) = $match;
@@ -26,9 +26,8 @@ if ($match !== null) {
     }
 
     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']);
         header('Content-Type: text/html; charset=UTF-8', true, 403);
-        $content->render();
+        echo json_encode(['error' => 'no_valid_anti_csrf_token']);
         return;
     }
 
@@ -37,17 +36,16 @@ if ($match !== null) {
 
         if ($response instanceof MapGuesser\Interfaces\Response\IContent) {
             header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
-            $response->render();
+            echo $response->render();
 
             return;
         } elseif ($response instanceof MapGuesser\Interfaces\Response\IRedirect) {
-            header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
+            header('Location: ' . Container::$request->getBase() . '/' . $response->getUrl(), true, $response->getHttpCode());
 
             return;
         }
     }
 }
 
-$content = new MapGuesser\Response\HtmlContent('error/404');
 header('Content-Type: text/html; charset=UTF-8', true, 404);
-$content->render();
+require ROOT . '/views/error/404.php';

public/static/css/game.css

@@ -1,15 +1,12 @@
 #panorama {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
+    width: 100%;
+    height: calc(100% - 40px);
     z-index: 1;
 }
 
-#panoCover {
+#guessCover {
     position: absolute;
-    top: 0;
+    top: 40px;
     left: 0;
     bottom: 0;
     right: 0;
@@ -102,15 +99,6 @@
     display: none;
 }
 
-#startMultiGameButton {
-    display: none;
-}
-
-#players > p {
-    font-size: 14px;
-    font-weight: bold;
-}
-
 @media screen and (max-width: 599px) {
     #mapName {
         display: none;
@@ -123,7 +111,7 @@
         z-index: 2;
     }
     #guess {
-        top: 10px;
+        top: 50px;
         left: 20px;
         opacity: 0.95;
         visibility: hidden;
@@ -169,7 +157,7 @@
     #guess.result {
         width: initial;
         height: initial;
-        top: 10px;
+        top: 50px;
         left: 50px;
         right: 50px;
         bottom: 50px;
@@ -179,11 +167,11 @@
     }
     @media screen and (max-height: 424px) {
         #guess {
-            top: 10px;
+            top: 50px;
             height: initial;
         }
         #guess.adapt:hover {
-            top: 10px;
+            top: 50px;
             height: initial;
         }
         #guess.result {

public/static/css/map_editor.css

@@ -1,13 +1,9 @@
 #map {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
+    width: 100%;
+    height: calc(100% - 40px);
     z-index: 1;
 }
 
-/* modify the cursor for the Leaflet map */
 .leaflet-container {
     cursor: crosshair;
 }
@@ -20,8 +16,6 @@
 
 #noPano {
     display: flex;
-    justify-content: center;
-    align-items: center;
     position: absolute;
     z-index: 2;
     visibility: hidden;
@@ -29,12 +23,12 @@
 }
 
 #noPano>p {
-    text-align: center;
+    margin: auto;
 }
 
 #control {
     position: absolute;
-    top: 10px;
+    top: 50px;
     right: 10px;
     width: 125px;
     z-index: 3;
@@ -54,34 +48,31 @@
 
 @media screen and (max-width: 999px) and (min-height: 600px) {
     #map.selected {
-        height: 50%;
+        height: calc(50% - 20px);
     }
     #panorama, #noPano {
         left: 0;
         bottom: 0;
         right: 0;
-        height: 50%;
+        height: calc(50% - 20px);
     }
     #placeControl {
-        top: calc(50% + 10px);
+        top: calc(50% + 30px);
     }
 }
 
 @media screen and (min-width: 1000px), (max-height: 599px) {
     #map.selected {
-        top: 0;
-        bottom: 0;
-        left: 0;
         width: 50%;
     }
     #panorama, #noPano {
-        top: 0;
+        top: 40px;
         bottom: 0;
         right: 0;
         width: 50%;
     }
     #placeControl {
-        top: 10px;
+        top: 50px;
     }
     #modified.selected {
         right: calc(50% + 10px);

public/static/css/mapguesser.css

@@ -17,16 +17,6 @@ button::-moz-focus-inner, input::-moz-focus-inner {
     border: 0;
 }
 
-/* to be compatible with browsers that don't know <main> */
-main {
-    display: block;
-}
-
-::selection {
-    background-color: #28a745;
-    color: #ffffff;
-}
-
 p, h1, h2, input, textarea, select, button, a {
     font-family: 'Roboto', sans-serif;
 }
@@ -47,7 +37,7 @@ h1>a:hover, h1>a:focus {
     text-decoration: none;
 }
 
-h2, header.small h1 {
+h2, div.header.small h1 {
     font-size: 24px;
 }
 
@@ -88,8 +78,8 @@ hr {
     font-weight: 500;
 }
 
-p.small, span.small {
-    font-size: 14px;
+.small {
+    font-size: 12px;
 }
 
 .justify {
@@ -112,10 +102,6 @@ p.small, span.small {
     margin-right: 10px;
 }
 
-.center {
-    text-align: center;
-}
-
 .right {
     text-align: right;
 }
@@ -124,7 +110,6 @@ svg.inline, img.inline {
     display: inline;
     width: 1em;
     height: 1em;
-    margin-right: 0.3em;
     vertical-align: -0.15em;
 }
 
@@ -153,27 +138,6 @@ button, a.button {
     line-height: 35px;
 }
 
-button.small, div.inputWithButton>button {
-    font-size: 14px;
-    padding: 0 12px;
-    height: 32px;
-    line-height: 32px;
-}
-
-button.small {
-    height: 32px;
-    line-height: 32px;
-}
-
-div.inputWithButton>button {
-    border-radius: 2px;
-    height: 27px;
-    line-height: 27px;
-    width: 75px;
-    margin-left: -79px;
-    vertical-align: 2px;
-}
-
 button:enabled:hover, button:enabled:focus, a.button:hover, a.button:focus {
     background-color: #29457f;
     outline: none;
@@ -205,7 +169,7 @@ button.gray, a.button.gray {
     background-color: #808080;
 }
 
-button.gray:enabled:hover, button.gray:enabled:focus, a.button.gray:hover, a.button.gray:focus {
+button.gray:hover, button.gray:focus, a.button.gray:hover, a.button.gray:focus {
     background-color: #555555;
 }
 
@@ -213,7 +177,7 @@ button.red, a.button.red {
     background-color: #aa5e5e;
 }
 
-button.red:enabled:hover, button.red:enabled:focus, a.button.red:hover, a.button.red:focus {
+button.red:hover, button.red:focus, a.button.red:hover, a.button.red:focus {
     background-color: #7f2929;
 }
 
@@ -221,7 +185,7 @@ button.yellow, a.button.yellow {
     background-color: #e8a349;
 }
 
-button.yellow:enabled:hover, button.yellow:enabled:focus, a.button.yellow:hover, a.button.yellow:focus {
+button.yellow:hover, button.yellow:focus, a.button.yellow:hover, a.button.yellow:focus {
     background-color: #c37713;
 }
 
@@ -229,7 +193,7 @@ button.green, a.button.green {
     background-color: #28a745;
 }
 
-button.green:enabled:hover, button.green:enabled:focus, a.button.green:hover, a.button.green:focus {
+button.green:hover, button.green:focus, a.button.green:hover, a.button.green:focus {
     background-color: #1b7d31;
 }
 
@@ -237,36 +201,22 @@ input, select, textarea {
     background-color: #f9fafb;
     border: solid #c8d2e1 1px;
     border-radius: 2px;
+    padding: 4px;
     box-sizing: border-box;
     font-size: 15px;
     font-weight: 300;
 }
 
-input, select {
-    height: 30px;
-    line-height: 30px;
-    padding: 0 5px;
-}
-
 textarea {
-    padding: 5px;
+    font-size: 13px;
     resize: none;
 }
 
-input.big, select.big, textarea.big, div.inputWithButton>input {
+input.big, select.big, textarea.big {
+    padding: 5px;
     font-size: 18px;
 }
 
-input.big, select.big, div.inputWithButton>input {
-    height: 35px;
-    line-height: 35px;
-    padding: 0 6px;
-}
-
-textarea.big {
-    padding: 6px;
-}
-
 input.fullWidth, select.fullWidth, textarea.fullWidth {
     display: block;
     width: 100%;
@@ -281,41 +231,22 @@ input:disabled, select:disabled, textarea:disabled {
 input:focus, select:focus, textarea:focus {
     background-color: #ffffff;
     border: solid #29457f 2px;
+    padding: 3px;
     outline: none;
 }
 
-input:focus, select:focus {
-    padding: 0 4px;
-}
-
-textarea:focus {
+input.big:focus, select.big:focus, textarea.big:focus {
     padding: 4px;
 }
 
-input.big:focus, select.big:focus {
-    padding: 0 5px;
-}
-
-div.inputWithButton>input {
-    width: 100%;
-    padding: 0 83px 0 6px;
-}
-
-div.inputWithButton>input:focus {
-    padding: 0 82px 0 5px;
-}
-
-textarea.big:focus {
-    padding: 5px;
-}
-
 div.modal {
     position: fixed;
+    top: 100px;
     background-color: #ffffff;
     border-radius: 3px;
+    padding: 20px;
     box-sizing: border-box;
-    overflow-y: auto;
-    z-index: 6;
+    z-index: 3;
     visibility: hidden;
 }
 
@@ -327,7 +258,7 @@ div.modal {
     right: 0;
     background-color: #000000;
     opacity: 0.5;
-    z-index: 5;
+    z-index: 2;
     visibility: hidden;
 }
 
@@ -340,7 +271,7 @@ p.formError {
     display: none;
 }
 
-header {
+div.header {
     display: grid;
     grid-template-columns: auto auto;
     background-color: #333333;
@@ -350,51 +281,33 @@ header {
     color: white;
 }
 
-header.small {
+div.header.small {
     height: 40px;
     line-height: 40px;
 }
 
-header>p {
+div.header>p.header {
     line-height: inherit;
     text-align: right;
 }
 
-header>p>span {
+div.header>p.header>span {
     padding-left: 6px;
 }
 
-header>p>span>a:link, header>p>span>a:visited {
+div.header>p.header>span>a:link, div.header>p.header>span>a:visited {
     color: inherit;
 }
 
-header>p>span:not(:last-child) {
+div.header>p.header>span:not(:last-child) {
     border-right: solid white 1px;
     padding-right: 6px;
 }
 
-main {
+div.main {
     padding: 6px 12px;
 }
 
-main.full {
-    position: relative;
-    width: 100%;
-    height: calc(100% - 40px);
-    padding: 0;
-}
-
-footer {
-    background-color: #444444;
-    padding: 6px 12px;
-    color: white;
-    text-align: center;
-}
-
-footer>p {
-    font-size: 13px;
-}
-
 div.buttonContainer {
     height: 35px;
 }
@@ -403,20 +316,6 @@ div.buttonContainer>button {
     margin: 0 auto;
 }
 
-#cookiesNotice {
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    margin: 20px;
-    background-color: #eeeeee;
-    border: solid #888888 1px;
-    border-radius: 3px;
-    padding: 10px;
-    text-align: center;
-    z-index: 10;
-}
-
 #loading {
     position: fixed;
     width: 64px;
@@ -425,7 +324,7 @@ div.buttonContainer>button {
     left: 50%;
     margin-top: -32px;
     margin-left: -32px;
-    z-index: 7;
+    z-index: 5;
     visibility: hidden;
 }
 
@@ -439,27 +338,16 @@ div.box {
 }
 
 @media screen and (max-width: 599px) {
-    header h1 span {
+    div.header h1 span {
         display: none;
     }
-    footer>p:not(:first-child) {
-        margin-top: 4px;
-    }
     button, a.button {
         padding: 0;
         width: 100%;
     }
-    button.marginLeft, a.button.marginLeft {
-        margin-left: 0;
-    }
-    button.marginRight, a.button.marginRight {
-        margin-right: 0;
-    }
     div.modal {
         left: 20px;
         right: 20px;
-        padding-left: 15px;
-        padding-right: 15px;
     }
     div.box {
         width: initial;
@@ -467,48 +355,9 @@ div.box {
 }
 
 @media screen and (min-width: 600px) {
-    footer>p {
-        display: inline;
-    }
-    footer>p:not(:first-child) {
-        padding-left: 6px;
-    }
-    footer>p:not(:last-child) {
-        border-right: solid white 1px;
-        padding-right: 6px;
-    }
     div.modal {
         width: 540px;
         left: 50%;
         margin-left: -270px;
-        padding-left: 20px;
-        padding-right: 20px;
-    }
-}
-
-@media screen and (max-height: 399px) {
-    div.modal {
-        top: 20px;
-        max-height: calc(100% - 40px);
-        padding-top: 10px;
-        padding-bottom: 10px;
-    }
-}
-
-@media screen and (min-height: 400px) and (max-height: 499px) {
-    div.modal {
-        top: 50px;
-        max-height: calc(100% - 100px);
-        padding-top: 15px;
-        padding-bottom: 15px;
-    }
-}
-
-@media screen and (min-height: 500px) {
-    div.modal {
-        top: 75px;
-        max-height: calc(100% - 150px);
-        padding-top: 15px;
-        padding-bottom: 15px;
     }
 }

public/static/css/maps.css

@@ -18,16 +18,7 @@ div.mapItem>div.title {
     color: white;
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
-    padding: 0 8px;
-    height: 35px;
-    line-height: 35px;
-}
-
-div.mapItem>div.title>p {
-    line-height: inherit;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    padding: 4px 8px;
 }
 
 div.mapItem>div.title>p.title {
@@ -38,16 +29,17 @@ div.mapItem>div.title>p.title {
 div.mapItem>div.imgContainer {
     width: 100%;
     padding-top: 50%;
-    background-color: #cccccc;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-size: cover;
+    background: #cccccc;
+}
+
+div.mapItem>div.imgContainer>img {
+    width: 100%;
+    margin-top: -50%
 }
 
 div.mapItem>div.inner {
     background-color: #eeeeee;
     padding: 10px 8px;
-    box-sizing: border-box;
 }
 
 div.mapItem>div.inner>div.info {
@@ -55,12 +47,6 @@ div.mapItem>div.inner>div.info {
     grid-template-columns: auto auto;
 }
 
-div.mapItem>div.inner>div.description {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
 div.mapItem>div.inner>div.info>p:nth-child(1) {
     text-align: left;
 }

public/static/js/account/account.js

@@ -1,69 +0,0 @@
-var Account = {
-    original: null,
-    countdown: null,
-
-    openGoogleAuthenticate: function () {
-        window.open('/account/googleAuthenticate', 'googleAuthenticate', 'height=600,width=600')
-    },
-
-    authenticatedWithGoogleCallback: function (authenticatedWithGoogleUntil) {
-        var password = document.getElementsByTagName('form')[0].elements.password;
-        var button = document.getElementById('authenticateWithGoogleButton');
-
-        Account.original = {
-            type: password.type,
-            placeholder: password.placeholder,
-            required: password.required,
-            disabled: password.disabled
-        };
-
-        password.type = 'text';
-        password.placeholder = 'Authenticated!'
-        password.value = '';
-        password.required = false;
-        password.disabled = true;
-
-        button.disabled = true;
-
-        Account.countdown = setInterval(function () {
-            var timeLeft = Math.ceil((authenticatedWithGoogleUntil.getTime() - new Date().getTime()) / 1000);
-
-            if (timeLeft > 30) {
-                return;
-            }
-
-            if (timeLeft <= 0) {
-                Account.resetGoogleAuthentication();
-                return;
-            }
-
-            password.placeholder = 'Authenticated! ' + timeLeft + ' seconds left...';
-        }, 1000);
-    },
-
-    resetGoogleAuthentication: function () {
-        if (Account.countdown !== null) {
-            clearInterval(Account.countdown);
-        }
-
-        var password = document.getElementsByTagName('form')[0].elements.password;
-        var button = document.getElementById('authenticateWithGoogleButton');
-
-        password.type = Account.original.type;
-        password.placeholder = Account.original.placeholder
-        password.required = Account.original.required;
-        password.disabled = Account.original.disabled;
-
-        button.disabled = false;
-    }
-};
-
-(function () {
-    document.getElementById('authenticateWithGoogleButton').onclick = function () {
-        Account.openGoogleAuthenticate();
-    };
-
-    document.getElementsByTagName('form')[0].onreset = function () {
-        Account.resetGoogleAuthentication();
-    };
-})();

public/static/js/account/google_authenticate.js

@@ -1,10 +0,0 @@
-(function () {
-    if (success) {
-        window.opener.Account.authenticatedWithGoogleCallback(authenticatedWithGoogleUntil);
-        window.close();
-    } else {
-        document.getElementById('closeWindowButton').onclick = function () {
-            window.close();
-        }
-    }
-})();

public/static/js/game.js

@@ -5,231 +5,36 @@
         NUMBER_OF_ROUNDS: 5,
         MAX_SCORE: 1000,
 
-        mapBounds: null,
-        multi: { token: null, owner: false },
         rounds: [],
         scoreSum: 0,
         panoId: null,
-        pov: null,
         panorama: null,
         map: null,
         guessMarker: null,
         adaptGuess: false,
         googleLink: null,
 
-        MultiConnector: {
-            connection: null,
-            reconnectCounter: 0,
-
-            connect: function () {
-                if (Game.MultiConnector.connection && Game.MultiConnector.connection.readyState !== WebSocket.CLOSED) {
-                    return;
-                }
-
-                Game.MultiConnector.connection = new WebSocket((MapGuesser.isSecure ? 'wss' : 'ws') + '://' + multiUrl);
-
-                Game.MultiConnector.connection.onopen = function () {
-                    document.getElementById('loading').style.visibility = 'hidden';
-
-                    Game.MultiConnector.reconnectCounter = 0;
-
-                    Game.MultiConnector.connection.send(JSON.stringify({ func: 'connect_to_room', args: { roomId: roomId, token: Game.multi.token } }));
-                };
-
-                Game.MultiConnector.connection.onclose = Game.MultiConnector.noConnection;
-
-                Game.MultiConnector.connection.onerror = function (event) {
-                    console.error('WebSocket error in Game.MultiConnector:', event);
-                };
-
-                Game.MultiConnector.connection.onmessage = function (message) {
-                    var json;
-
-                    try {
-                        json = JSON.parse(message.data);
-                    } catch (e) {
-                        console.error('Cannot parse message!');
-                        console.error(message.data);
-                        return;
-                    }
-
-                    switch (json.type) {
-                        case 'initialize':
-                            Game.MultiConnector.initialize(json.data);
-                            break;
-
-                        case 'member_joined':
-                            Game.MultiConnector.memberJoined(json.data);
-                            break;
-
-                        case 'new_round':
-                            Game.MultiConnector.newRound(json.data);
-                            break;
-
-                        case 'results':
-                            //TODO
-                            break;
-
-                        case 'guess':
-                            //TODO
-                            break;
-                    }
-                };
-            },
-
-            noConnection: function () {
-                if (Game.MultiConnector.reconnectCounter === 2) {
-                    console.error('Could not reconnect WebSocket for Game.MultiConnector...')
-                }
-
-                setTimeout(function () {
-                    Game.MultiConnector.reconnectCounter++;
-
-                    console.log('Reconnecting WebSocket for Game.MultiConnector... ' + Game.MultiConnector.reconnectCounter);
-                    Game.MultiConnector.connect();
-                }, 1000 + Math.min(Game.MultiConnector.reconnectCounter * 500, 9000));
-            },
-
-            initialize: function (data) {
-                if (data.history) {
-                    for (var i = 0; i < data.history.length; ++i) {
-                        var round = data.history[i];
-                        Game.rounds.push({ position: round.position, guessPosition: round.guessPosition, realMarker: null, guessMarker: null, line: null });
-                        Game.addRealGuessPair(round.position, round.guessPosition, true);
-                        Game.scoreSum += round.score;
-                    }
-
-                    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);
-                }
-
-                if (data.place) {
-                    Game.panoId = data.place.panoId;
-                    Game.pov = data.place.pov;
-
-                    document.getElementById('multi').style.visibility = 'hidden';
-                    document.getElementById('panoCover').style.visibility = 'hidden';
-
-                    Game.startNewRound();
-                }
-
-                document.getElementById('loading').style.visibility = 'hidden';
-
-                var div = document.getElementById('players');
-
-                for (var i = 0; i < data.members.length; ++i) {
-                    var member = data.members[i];
-
-                    var p = document.createElement('p');
-                    p.innerHTML = member.userName + (member.me ? ' (me)' : '');
-                    div.appendChild(p);
-                }
-            },
-
-            memberJoined: function (data) {
-                var div = document.getElementById('players');
-
-                var p = document.createElement('p');
-                p.innerHTML = data.userName;
-                div.appendChild(p);
-            },
-
-            newRound: function (data) {
-                //TODO: workaround until results are not sent
-                if (Game.adaptGuess) {
-                    document.getElementById('guess').classList.remove('adapt');
-                }
-
-                if (Game.rounds.length === Game.NUMBER_OF_ROUNDS) {
-                    Game.reset();
-                }
-
-                // if player didn't guess - TODO: show everything on a map
-                if (data.result && Game.rounds.length > 0 && !Game.rounds[Game.rounds.length - 1].position) {
-                    Game.rounds[Game.rounds.length - 1].position = data.result.position;
-                    Game.addRealGuessPair(data.result.position, null);
-                }
-
-                Game.panoId = data.place.panoId;
-                Game.pov = data.place.pov;
-
-                document.getElementById('multi').style.visibility = 'hidden';
-                Game.resetRound();
-                Game.startNewRound();
-            }
-        },
-
-        prepare: function () {
-            var data = new FormData();
-            var userNames;
-
-            if (roomId) {
-                var userNames = localStorage.userNames ? JSON.parse(localStorage.userNames) : {};
-                if (!userNames.hasOwnProperty(roomId)) {
-                    userNames[roomId] = prompt('Your name: ');
-                    localStorage.userNames = JSON.stringify(userNames);
-                }
-
-                data.append('userName', userNames[roomId]);
-            }
-
-            document.getElementById('loading').style.visibility = 'visible';
-            var url = roomId ? '/multiGame/' + roomId + '/prepare.json' : '/game/' + mapId + '/prepare.json';
-            MapGuesser.httpRequest('POST', url, function () {
-                document.getElementById('loading').style.visibility = 'hidden';
-
-                if (this.response.error) {
-                    Game.handleErrorResponse(this.response.error);
-                    return;
-                }
-
-                document.getElementById('mapName').innerHTML = this.response.mapName;
-                Game.mapBounds = this.response.bounds;
-
-                Game.initialize();
-
-                if (roomId) {
-                    Game.multi.token = this.response.token;
-                    Game.multi.owner = this.response.owner;
-
-                    document.getElementById('multi').style.visibility = 'visible';
-                    if (Game.multi.owner) {
-                        document.getElementById('startMultiGameButton').style.display = 'block';
-                    }
-
-                    document.getElementById('loading').style.visibility = 'visible';
-                    Game.MultiConnector.connect();
-                }
-            }, data);
-        },
-
         initialize: function () {
-            document.getElementById('panoCover').style.visibility = 'visible';
+            document.getElementById('loading').style.visibility = 'visible';
+            document.getElementById('guessCover').style.visibility = 'visible';
             document.getElementById('currentRound').innerHTML = '1/' + String(Game.NUMBER_OF_ROUNDS);
             document.getElementById('currentScoreSum').innerHTML = '0/0';
 
             Game.map.setOptions({
                 draggableCursor: 'crosshair'
             });
-            Game.map.fitBounds(Game.mapBounds);
+            Game.map.fitBounds(mapBounds);
 
-            if (roomId) {
-                // if it is multiplayer mode, data is sent via WS
-                return;
-            }
-
-            document.getElementById('loading').style.visibility = 'visible';
-            MapGuesser.httpRequest('POST', '/game/' + mapId + '/initialData.json', function () {
+            MapGuesser.httpRequest('GET', '/game/' + mapId + '/newPlace.json', function () {
                 document.getElementById('loading').style.visibility = 'hidden';
-                document.getElementById('panoCover').style.visibility = 'hidden';
+                document.getElementById('guessCover').style.visibility = 'hidden';
 
                 if (this.response.error) {
-                    Game.handleErrorResponse(this.response.error);
+                    //TODO: handle this error
                     return;
                 }
 
-                Game.panoId = this.response.place.panoId;
-                Game.pov = this.response.place.pov;
+                Game.panoId = this.response.panoId;
 
                 if (this.response.history) {
                     for (var i = 0; i < this.response.history.length; ++i) {
@@ -256,10 +61,8 @@
             for (var i = 0; i < Game.rounds.length; ++i) {
                 var round = Game.rounds[i];
 
-                if (round.realMarker) {
+                if (round.realMarker && round.guessMarker && round.line) {
                     round.realMarker.setMap(null);
-                }
-                if (round.guessMarker) {
                     round.guessMarker.setMap(null);
                     round.line.setMap(null);
                 }
@@ -291,13 +94,11 @@
                 var lastRound = Game.rounds[Game.rounds.length - 1];
 
                 lastRound.realMarker.setVisible(false);
-                if (lastRound.guessMarker) {
                 lastRound.guessMarker.setVisible(false);
                 lastRound.line.setVisible(false);
             }
-            }
 
-            document.getElementById('panoCover').style.visibility = 'hidden';
+            document.getElementById('guessCover').style.visibility = 'hidden';
             document.getElementById('showGuessButton').style.visibility = null;
             document.getElementById('guess').style.visibility = null;
             document.getElementById('guess').classList.remove('result')
@@ -305,12 +106,7 @@
             Game.map.setOptions({
                 draggableCursor: 'crosshair'
             });
-            Game.map.fitBounds(Game.mapBounds);
-
-            if (roomId) {
-                // if it is multiplayer mode, data is sent via WS
-                return;
-            }
+            Game.map.fitBounds(mapBounds);
 
             Game.startNewRound();
         },
@@ -320,39 +116,26 @@
 
             document.getElementById('currentRound').innerHTML = String(Game.rounds.length) + '/' + String(Game.NUMBER_OF_ROUNDS);
 
-            Game.loadPano(Game.panoId, Game.pov);
+            Game.loadPano(Game.panoId);
         },
 
         handleErrorResponse: function (error) {
-            switch (error) {
-                case 'no_session_found':
-                    MapGuesser.showModalWithContent('Error', 'Your session is invalid!', [{
-                        type: 'button',
-                        classNames: [],
-                        text: 'Restart game',
-                        onclick: function () {
-                            window.location.reload();
-                        }
-                    }]);
-                    break;
+            // for the time being we only handle the "no_session_found" error and reset the game
 
-                case 'game_already_started':
-                    MapGuesser.showModalWithContent('Error', 'This game is already started, you cannot join.');
-                    break;
+            MapGuesser.httpRequest('GET', '/game/' + mapId + '/json', function () {
+                mapBounds = this.response.bounds;
 
-                default:
-                    MapGuesser.showModalWithContent('Error', 'Error code: \'' + error + '\'');
-                    break
-            }
+                Game.reset();
+            });
         },
 
-        loadPano: function (panoId, pov) {
+        loadPano: function (panoId) {
             if (Game.adaptGuess) {
                 document.getElementById('guess').classList.add('adapt');
             }
 
-            Game.panorama.setPov({ heading: pov.heading, pitch: pov.pitch });
-            Game.panorama.setZoom(pov.zoom);
+            Game.panorama.setPov({ heading: 0, pitch: 0 });
+            Game.panorama.setZoom(0);
             Game.panorama.setPano(panoId);
         },
 
@@ -368,17 +151,14 @@
             if (Game.adaptGuess) {
                 document.getElementById('guess').classList.remove('adapt');
             }
-            document.getElementById('panoCover').style.visibility = 'visible';
+            document.getElementById('loading').style.visibility = 'visible';
+            document.getElementById('guessCover').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';
-            MapGuesser.httpRequest('POST', url, function () {
-                document.getElementById('loading').style.visibility = 'hidden';
-
+            MapGuesser.httpRequest('POST', '/game/' + mapId + '/guess.json', function () {
                 if (this.response.error) {
                     Game.handleErrorResponse(this.response.error);
                     return;
@@ -387,6 +167,7 @@
                 Game.guessMarker.setMap(null);
                 Game.guessMarker = null;
 
+                document.getElementById('loading').style.visibility = 'hidden';
                 document.getElementById('guess').classList.add('result');
 
                 Game.scoreSum += this.response.result.score;
@@ -417,17 +198,7 @@
                     document.getElementById('showSummaryButton').style.display = 'block';
                 }
 
-                if (this.response.place) {
-                    Game.panoId = this.response.place.panoId;
-                    Game.pov = this.response.place.pov;
-                } else {
-                    if (!Game.multi.owner) {
-                        //TODO: "waiting for" disabled button
-                        document.getElementById('continueButton').style.display = 'none';
-                    }
-                    Game.panoId = null;
-                    Game.pov = null;
-                }
+                Game.panoId = this.response.panoId;
             }, data);
         },
 
@@ -454,10 +225,6 @@
                 window.open('https://www.google.com/maps/search/?api=1&query=' + this.getPosition().toUrlValue(), '_blank');
             });
 
-            if (!guessPosition) {
-                return;
-            }
-
             round.guessMarker = new google.maps.Marker({
                 map: Game.map,
                 visible: !hidden,
@@ -529,10 +296,7 @@
             scoreInfo.children[0].style.display = 'none';
             scoreInfo.children[1].style.display = 'block';
             document.getElementById('showSummaryButton').style.display = null;
-
-            if (!roomId || Game.multi.owner) {
             document.getElementById('startNewGameButton').style.display = 'block';
-            }
 
             var resultBounds = new google.maps.LatLngBounds();
 
@@ -553,18 +317,13 @@
                     fontWeight: '500',
                     text: String(i + 1)
                 });
-
                 round.realMarker.setVisible(true);
-                if (round.guessMarker) {
                 round.guessMarker.setVisible(true);
                 round.line.setVisible(true);
-                }
 
                 resultBounds.extend(round.position);
-                if (round.guessMarker) {
                 resultBounds.extend(round.guessPosition);
             }
-            }
 
             Game.map.fitBounds(resultBounds);
 
@@ -611,8 +370,6 @@
         }
     };
 
-    MapGuesser.sessionAvailableHooks.reinitializeGame = Game.prepare;
-
     if (!('ontouchstart' in document.documentElement)) {
         Game.adaptGuess = true;
     }
@@ -672,9 +429,7 @@
         Game.rewriteGoogleLink();
     });
 
-    if (COOKIES_CONSENT) {
-        Game.prepare();
-    }
+    Game.initialize();
 
     document.getElementById('showGuessButton').onclick = function () {
         this.style.visibility = 'hidden';
@@ -691,64 +446,14 @@
     }
 
     document.getElementById('continueButton').onclick = function () {
-        if (roomId) {
-            if (!Game.multi.owner) {
-                return;
-            }
-
-            document.getElementById('loading').style.visibility = 'visible';
-            MapGuesser.httpRequest('POST', '/multiGame/' + roomId + '/nextRound.json', function () {
-                document.getElementById('loading').style.visibility = 'hidden';
-
-                if (this.response.error) {
-                    Game.handleErrorResponse(this.response.error);
-                    return;
-                }
-            });
-        } else {
         Game.resetRound();
     }
-    }
 
     document.getElementById('showSummaryButton').onclick = function () {
         Game.showSummary();
     }
 
     document.getElementById('startNewGameButton').onclick = function () {
-        if (roomId) {
-            if (!Game.multi.owner) {
-                return;
-            }
-
-            document.getElementById('loading').style.visibility = 'visible';
-            MapGuesser.httpRequest('POST', '/multiGame/' + roomId + '/initialData.json', function () {
-                document.getElementById('loading').style.visibility = 'hidden';
-
-                if (this.response.error) {
-                    Game.handleErrorResponse(this.response.error);
-                    return;
-                }
-            });
-        } else {
         Game.reset();
     }
-    }
-
-    document.getElementById('startMultiGameButton').onclick = function () {
-        if (!roomId || !Game.multi.owner) {
-            return;
-        }
-
-        document.getElementById('multi').style.visibility = 'hidden';
-
-        document.getElementById('loading').style.visibility = 'visible';
-        MapGuesser.httpRequest('POST', '/multiGame/' + roomId + '/initialData.json', function () {
-            document.getElementById('loading').style.visibility = 'hidden';
-
-            if (this.response.error) {
-                Game.handleErrorResponse(this.response.error);
-                return;
-            }
-        });
-    }
 })();

public/static/js/login.js

@@ -0,0 +1,40 @@
+(function () {
+    var form = document.getElementById('loginForm');
+
+    form.onsubmit = function (e) {
+        document.getElementById('loading').style.visibility = 'visible';
+
+        e.preventDefault();
+
+        var formData = new FormData(form);
+
+        MapGuesser.httpRequest('POST', form.action, function () {
+            if (this.response.error) {
+                var errorText;
+                switch (this.response.error) {
+                    case 'user_not_found':
+                        errorText = 'No user found with the given email address. You can <a href="/signup" title="Sign up">sign up here</a>!';
+                        break;
+                    case 'user_not_active':
+                        errorText = 'User found with the given email address, but the account is not activated. Please check your email and click on the activation link!';
+                        break;
+                    case 'password_not_match':
+                        errorText = 'The given password is wrong.'
+                        break;
+                }
+
+                document.getElementById('loading').style.visibility = 'hidden';
+
+                var loginFormError = document.getElementById('loginFormError');
+                loginFormError.style.display = 'block';
+                loginFormError.innerHTML = errorText;
+
+                form.elements.email.select();
+
+                return;
+            }
+
+            window.location.replace('/');
+        }, formData);
+    };
+})();

public/static/js/login/google_signup.js

@@ -1,9 +0,0 @@
-(function () {
-    document.getElementById('cancelGoogleSignupButton').onclick = function () {
-        document.getElementById('loading').style.visibility = 'visible';
-
-        MapGuesser.httpRequest('POST', '/signup/google/reset', function () {
-            window.location.replace('/signup');
-        });
-    };
-})();

public/static/js/login/signup.js

@@ -1,12 +0,0 @@
-(function () {
-    var resetSignupButton = document.getElementById('resetSignupButton');
-    if (resetSignupButton) {
-        resetSignupButton.onclick = function () {
-            document.getElementById('loading').style.visibility = 'visible';
-
-            MapGuesser.httpRequest('POST', '/signup/reset', function () {
-                window.location.reload();
-            });
-        };
-    }
-})();

public/static/js/map_editor.js

@@ -13,6 +13,7 @@
         added: {},
         edited: {},
         deleted: {},
+        saved: true,
 
         editMetadata: function () {
             var form = document.getElementById('metadataForm');
@@ -24,6 +25,7 @@
 
             MapGuesser.hideModal();
 
+            MapEditor.saved = false;
             document.getElementById('saveButton').disabled = false;
         },
 
@@ -210,6 +212,7 @@
 
             MapEditor.selectedMarker.setLatLng({ lat: places[placeId].lat, lng: places[placeId].lng });
 
+            MapEditor.saved = false;
             document.getElementById('saveButton').disabled = false;
         },
 
@@ -243,6 +246,7 @@
             document.getElementById('added').innerHTML = String(Object.keys(MapEditor.added).length);
             document.getElementById('edited').innerHTML = String(Object.keys(MapEditor.edited).length);
 
+            MapEditor.saved = false;
             document.getElementById('saveButton').disabled = false;
         },
 
@@ -300,6 +304,7 @@
                 document.getElementById('edited').innerHTML = '0';
                 document.getElementById('deleted').innerHTML = '0';
 
+                MapEditor.saved = true;
                 document.getElementById('saveButton').disabled = true;
             }, data);
         },
@@ -334,11 +339,11 @@
     var Util = {
         getHighResData: function () {
             if (window.devicePixelRatio >= 4) {
-                return { ppi: 320, tileSize: 128, zoomOffset: 1, minZoom: 0, maxZoom: 18 };
+                return { ppi: 320, tileSize: 128, zoomOffset: 1 };
             } else if (window.devicePixelRatio >= 2) {
-                return { ppi: 250, tileSize: 256, zoomOffset: 0, minZoom: 1, maxZoom: 19 };
+                return { ppi: 250, tileSize: 256, zoomOffset: 0 };
             } else {
-                return { ppi: 72, tileSize: 512, zoomOffset: -1, minZoom: 2, maxZoom: 20 };
+                return { ppi: 72, tileSize: 512, zoomOffset: -1 };
             }
         }
     };
@@ -368,8 +373,8 @@
         ppi: highResData.ppi,
         tileSize: highResData.tileSize,
         zoomOffset: highResData.zoomOffset,
-        minZoom: highResData.minZoom,
-        maxZoom: highResData.maxZoom
+        minZoom: 2,
+        maxZoom: 20
     }).addTo(MapEditor.map);
 
     MapEditor.map.fitBounds(L.latLngBounds({ lat: mapBounds.south, lng: mapBounds.west }, { lat: mapBounds.north, lng: mapBounds.east }));
@@ -440,4 +445,13 @@
     document.getElementById('deleteButton').onclick = function () {
         MapEditor.deletePlace();
     };
+
+    window.addEventListener('beforeunload', function (e) {
+        if (MapEditor.saved) {
+            return;
+        }
+
+        e.preventDefault();
+        e.returnValue = '';
+    });
 })();

public/static/js/mapguesser.js

@@ -1,59 +1,12 @@
 var MapGuesser = {
-    isSecure: window.location.protocol === 'https:',
-    cookiesAgreed: false,
-    sessionAvailableHooks: {},
-
-    initGoogleAnalitics: function () {
-        if (typeof GOOGLE_ANALITICS_ID === 'undefined') {
-            return;
-        }
-
-        // Global site tag (gtag.js) - Google Analytics
-        var script = document.createElement('script');
-        script.src = 'https://www.googletagmanager.com/gtag/js?id=' + GOOGLE_ANALITICS_ID;
-        script.async = true;
-
-        document.head.appendChild(script);
-
-        window.dataLayer = window.dataLayer || [];
-        function gtag() { dataLayer.push(arguments); }
-        gtag('js', new Date());
-        gtag('config', GOOGLE_ANALITICS_ID);
-    },
-
-    agreeCookies: function () {
-        if (MapGuesser.cookiesAgreed) {
-            return;
-        }
-
-        var expirationDate = new Date(new Date().getTime() + 20 * 365 * 24 * 60 * 60 * 1000).toUTCString();
-        document.cookie = 'COOKIES_CONSENT=1; expires=' + expirationDate + '; path=/';
-
-        MapGuesser.initGoogleAnalitics();
-        MapGuesser.httpRequest('GET', '/startSession.json', function () {
-            ANTI_CSRF_TOKEN = this.response.antiCsrfToken;
-
-            for (var hookId in MapGuesser.sessionAvailableHooks) {
-                if (!MapGuesser.sessionAvailableHooks.hasOwnProperty(hookId)) {
-                    continue;
-                }
-
-                MapGuesser.sessionAvailableHooks[hookId]();
-            }
-        });
-
-        MapGuesser.cookiesAgreed = true;
-    },
-
     httpRequest: function (method, url, callback, data) {
         var xhr = new XMLHttpRequest();
 
+        xhr.responseType = 'json';
         xhr.onload = callback;
 
         xhr.open(method, url, true);
 
-        xhr.responseType = 'json';
-
         if (method === 'POST') {
             if (typeof data === 'undefined') {
                 data = new FormData();
@@ -67,52 +20,6 @@ var MapGuesser = {
         }
     },
 
-    setOnsubmitForForm: function (form) {
-        form.onsubmit = function (e) {
-            e.preventDefault();
-
-            document.getElementById('loading').style.visibility = 'visible';
-
-            var formData = new FormData(form);
-            var formError = form.getElementsByClassName('formError')[0];
-            var pageLeaveOnSuccess = form.dataset.redirectOnSuccess || form.dataset.reloadOnSuccess;
-
-            MapGuesser.httpRequest('POST', form.action, function () {
-                if (!pageLeaveOnSuccess) {
-                    document.getElementById('loading').style.visibility = 'hidden';
-                }
-
-                if (this.response.error) {
-                    if (pageLeaveOnSuccess) {
-                        document.getElementById('loading').style.visibility = 'hidden';
-                    }
-
-                    formError.style.display = 'block';
-                    formError.innerHTML = this.response.error.errorText;
-
-                    return;
-                }
-
-                if (this.response.redirect) {
-                    window.location.replace(this.response.redirect.target);
-
-                    return;
-                }
-
-                if (!pageLeaveOnSuccess) {
-                    formError.style.display = 'none';
-                    form.reset();
-                } else {
-                    if (form.dataset.redirectOnSuccess) {
-                        window.location.replace(form.dataset.redirectOnSuccess);
-                    } else if (form.dataset.reloadOnSuccess) {
-                        window.location.reload();
-                    }
-                }
-            }, formData);
-        }
-    },
-
     showModal: function (id) {
         document.getElementById(id).style.visibility = 'visible';
         document.getElementById('cover').style.visibility = 'visible';
@@ -183,35 +90,11 @@ var MapGuesser = {
         document.getElementById('cover').style.visibility = 'hidden';
     },
 
-    observeInput: function (input, buttonToToggle) {
+    toggleDisableOnChange: function (input, button) {
         if (input.defaultValue !== input.value) {
-            buttonToToggle.disabled = false;
+            button.disabled = false;
         } else {
-            buttonToToggle.disabled = true;
-        }
-    },
-
-    observeInputsInForm: function (form, observedInputs) {
-        for (var i = 0; i < observedInputs.length; i++) {
-            var input = form.elements[observedInputs[i]];
-
-            switch (input.tagName) {
-                case 'INPUT':
-                case 'TEXTAREA':
-                    input.oninput = function () {
-                        MapGuesser.observeInput(this, form.elements.submit);
-                    };
-                    break;
-                case 'SELECT':
-                    input.onchange = function () {
-                        MapGuesser.observeInput(this, form.elements.submit);
-                    };
-                    break;
-            }
-        }
-
-        form.onreset = function () {
-            form.elements.submit.disabled = true;
+            button.disabled = true;
         }
     }
 };
@@ -227,41 +110,7 @@ var MapGuesser = {
         }
     }
 
-    var forms = document.getElementsByTagName('form');
-    for (var i = 0; i < forms.length; i++) {
-        var form = forms[i];
-
-        if (form.dataset.noSubmit) {
-            continue;
-        }
-
-        MapGuesser.setOnsubmitForForm(form);
-
-        if (form.dataset.observeInputs) {
-            MapGuesser.observeInputsInForm(form, form.dataset.observeInputs.split(','));
-        }
-    }
-
     document.getElementById('cover').onclick = function () {
         MapGuesser.hideModal();
     };
-
-    if (COOKIES_CONSENT) {
-        MapGuesser.initGoogleAnalitics();
-    } else {
-        // we don't want user to agree cookies when clicking on the notice itself
-        document.getElementById('cookiesNotice').onclick = function (e) {
-            e.stopPropagation();
-        };
-
-        document.getElementById('agreeCookiesButton').onclick = function () {
-            MapGuesser.agreeCookies();
-
-            document.getElementById('cookiesNotice').style.display = 'none';
-        };
-
-        window.onclick = function () {
-            MapGuesser.agreeCookies();
-        };
-    }
 })();

public/static/js/maps.js

@@ -1,112 +0,0 @@
-(function () {
-    var Maps = {
-        descriptionDivs: null,
-
-        addStaticMaps: function () {
-            var imgContainers = document.getElementById('mapContainer').getElementsByClassName('imgContainer');
-            for (var i = 0; i < imgContainers.length; i++) {
-                var imgContainer = imgContainers[i];
-
-                var imgSrc = 'https://maps.googleapis.com/maps/api/staticmap?size=350x175&' +
-                    'scale=' + (window.devicePixelRatio >= 2 ? 2 : 1) + '&' +
-                    'visible=' + imgContainer.dataset.boundSouthLat + ',' + imgContainer.dataset.boundWestLng + '|' +
-                    imgContainer.dataset.boundNorthLat + ',' + imgContainer.dataset.boundEastLng +
-                    '&key=' + GOOGLE_MAPS_JS_API_KEY;
-
-                imgContainer.style.backgroundImage = 'url("' + imgSrc + '")';
-            }
-        },
-
-        initializeDescriptionDivs: function () {
-            Maps.descriptionDivs = document.getElementById('mapContainer').getElementsByClassName('description');
-
-            for (var i = 0; i < Maps.descriptionDivs.length; i++) {
-                var description = Maps.descriptionDivs[i];
-                var boundingClientRect = description.getBoundingClientRect();
-
-                description.defaultHeight = boundingClientRect.height;
-            }
-        },
-
-        calculateDescriptionDivHeights: function () {
-            var currentY;
-            var rows = [];
-            for (var i = 0; i < Maps.descriptionDivs.length; i++) {
-                var description = Maps.descriptionDivs[i];
-                var boundingClientRect = description.getBoundingClientRect();
-
-                if (currentY !== boundingClientRect.y) {
-                    rows.push([]);
-                }
-
-                rows[rows.length - 1].push(description);
-
-                currentY = boundingClientRect.y;
-            }
-
-            for (var i = 0; i < rows.length; i++) {
-                var row = rows[i];
-
-                var maxHeight = 0;
-                for (var j = 0; j < row.length; j++) {
-                    var description = row[j];
-
-                    if (description.defaultHeight > maxHeight) {
-                        maxHeight = description.defaultHeight;
-                    }
-                }
-
-                for (var j = 0; j < row.length; j++) {
-                    var description = row[j];
-
-                    description.style.height = maxHeight + 'px';
-                }
-            }
-        }
-    };
-
-    Maps.addStaticMaps();
-
-    Maps.initializeDescriptionDivs();
-    Maps.calculateDescriptionDivHeights();
-
-    window.onresize = function () {
-        Maps.calculateDescriptionDivHeights();
-    };
-
-    document.getElementById('multiForm').onsubmit = function (e) {
-        e.preventDefault();
-
-        var roomId = this.elements.roomId.value;
-        if (roomId.length !== 6) {
-            return;
-        }
-
-        window.location.href = '/multiGame/' + this.elements.roomId.value;
-    };
-
-    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('closePlayModeButton').onclick = function () {
-        MapGuesser.hideModal();
-    };
-
-    document.getElementById('closeMultiButton').onclick = function () {
-        MapGuesser.hideModal();
-    };
-
-    var buttons = document.getElementById('mapContainer').getElementsByClassName('playButton');
-    for (var i = 0; i < buttons.length; i++) {
-        var button = buttons[i];
-
-        button.onclick = function () {
-            MapGuesser.showModal('playMode');
-            document.getElementById('singleButton').href = '/game/' + this.dataset.mapId;
-            document.getElementById('multiButton').dataset.mapId = this.dataset.mapId;
-        };
-    }
-})();

public/static/js/maps_admin.js

@@ -1,34 +0,0 @@
-(function () {
-    Maps = {
-        deleteMap: function (mapId, mapName) {
-            MapGuesser.showModalWithContent('Delete map', 'Are you sure you want to delete map \'' + mapName + '\'?', [{
-                type: 'button',
-                classNames: ['red'],
-                text: 'Delete',
-                onclick: function () {
-                    document.getElementById('loading').style.visibility = 'visible';
-
-                    MapGuesser.httpRequest('POST', '/admin/deleteMap/' + mapId, function () {
-                        if (this.response.error) {
-                            document.getElementById('loading').style.visibility = 'hidden';
-
-                            //TODO: handle this error
-                            return;
-                        }
-
-                        window.location.reload();
-                    });
-                }
-            }]);
-        }
-    };
-
-    var buttons = document.getElementById('mapContainer').getElementsByClassName('deleteButton');
-    for (var i = 0; i < buttons.length; i++) {
-        var button = buttons[i];
-
-        button.onclick = function () {
-            Maps.deleteMap(this.dataset.mapId, this.dataset.mapName);
-        };
-    }
-})();

public/static/js/profile.js

@@ -0,0 +1,51 @@
+(function () {
+    var form = document.getElementById('profileForm');
+
+    form.elements.password_new.onkeyup = function () {
+        MapGuesser.toggleDisableOnChange(this, form.elements.save);
+    };
+
+    form.elements.password_new_confirm.onkeyup = function () {
+        MapGuesser.toggleDisableOnChange(this, form.elements.save);
+    };
+
+    form.onsubmit = function (e) {
+        document.getElementById('loading').style.visibility = 'visible';
+
+        e.preventDefault();
+
+        var formData = new FormData(form);
+
+        MapGuesser.httpRequest('POST', form.action, function () {
+            document.getElementById('loading').style.visibility = 'hidden';
+
+            if (this.response.error) {
+                var errorText;
+                switch (this.response.error) {
+                    case 'password_not_match':
+                        errorText = 'The given current password is wrong.'
+                        break;
+                    case 'passwords_too_short':
+                        errorText = 'The given new password is too short. Please choose a password that is at least 6 characters long!'
+                        break;
+                    case 'passwords_not_match':
+                        errorText = 'The given new passwords do not match.'
+                        break;
+                }
+
+                var profileFormError = document.getElementById('profileFormError');
+                profileFormError.style.display = 'block';
+                profileFormError.innerHTML = errorText;
+
+                form.elements.password_new.select();
+
+                return;
+            }
+
+            document.getElementById('profileFormError').style.display = 'none';
+            form.reset();
+            form.elements.save.disabled = true;
+            form.elements.password_new.focus();
+        }, formData);
+    };
+})();

public/static/js/signup.js

@@ -0,0 +1,47 @@
+(function () {
+    var form = document.getElementById('signupForm');
+
+    form.onsubmit = function (e) {
+        document.getElementById('loading').style.visibility = 'visible';
+
+        e.preventDefault();
+
+        var formData = new FormData(form);
+
+        MapGuesser.httpRequest('POST', form.action, function () {
+            document.getElementById('loading').style.visibility = 'hidden';
+
+            if (this.response.error) {
+                var errorText;
+                switch (this.response.error) {
+                    case 'passwords_too_short':
+                        errorText = 'The given password is too short. Please choose a password that is at least 6 characters long!'
+                        break;
+                    case 'passwords_not_match':
+                        errorText = 'The given passwords do not match.'
+                        break;
+                    case 'user_found':
+                        errorText = 'There is a user already registered with the given email address. Please <a href="/login" title="Login">login here</a>!';
+                        break;
+                    case 'not_active_user_found':
+                        errorText = 'There is a user already registered with the given email address. Please check your email and click on the activation link!';
+                        break;
+                }
+
+                var signupFormError = document.getElementById('signupFormError');
+                signupFormError.style.display = 'block';
+                signupFormError.innerHTML = errorText;
+
+                form.elements.email.select();
+
+                return;
+            }
+
+            document.getElementById('signupFormError').style.display = 'none';
+            form.reset();
+            form.elements.email.focus();
+
+            MapGuesser.showModalWithContent('Sign up successful', 'Sign up was successful. Please check your email and click on the activation link to activate your account!');
+        }, formData);
+    };
+})();

scripts/install.sh

@@ -9,9 +9,6 @@ if [ -f ${ROOT_DIR}/installed ]; then
     exit 1
 fi
 
-echo "Installing NPM packages..."
-(cd ${ROOT_DIR}/multi && npm install)
-
 echo "Installing Yarn packages..."
 (cd ${ROOT_DIR}/public/static && yarn install)
 
@@ -19,14 +16,11 @@ echo "Installing MapGuesser DB..."
 mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${ROOT_DIR}/db/mapguesser.sql
 
 echo "Migrating DB..."
-(cd ${ROOT_DIR} && ./mapg db:migrate)
+(cd ${ROOT_DIR} && ./mapg migrate)
 
 if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
     echo "Minifying JS, CSS and SVG files..."
     ${ROOT_DIR}/scripts/minify.sh
-
-    echo "Linking view files..."
-    (cd ${ROOT_DIR} && ./mapg view:link)
 fi
 
 touch ${ROOT_DIR}/installed

scripts/run-sql.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-if [ "$#" -lt 1 ]; then
-    echo "Usage: $0 <sql_file>"
-    exit 1
-fi
-
-SQL_FILE=$1
-
-ROOT_DIR=$(dirname $(readlink -f "$0"))/..
-
-. ${ROOT_DIR}/.env
-
-if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
-    echo "This script can only be used in DEV mode!"
-    exit 1
-fi
-
-echo "Running SQL on DB..."
-mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${SQL_FILE}

scripts/update.sh

@@ -5,25 +5,15 @@ ROOT_DIR=$(dirname $(readlink -f "$0"))/..
 . ${ROOT_DIR}/.env
 
 echo "Installing Composer packages..."
-if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
-    (cd ${ROOT_DIR} && composer install --no-dev)
-else
-    (cd ${ROOT_DIR} && composer install --dev)
-fi
-
-echo "Installing NPM packages..."
-(cd ${ROOT_DIR}/multi && npm install)
+(cd ${ROOT_DIR} && composer install)
 
 echo "Installing Yarn packages..."
 (cd ${ROOT_DIR}/public/static && yarn install)
 
 echo "Migrating DB..."
-(cd ${ROOT_DIR} && ./mapg db:migrate)
+(cd ${ROOT_DIR} && ./mapg migrate)
 
 if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
     echo "Minifying JS, CSS and SVG files..."
     ${ROOT_DIR}/scripts/minify.sh
-
-    echo "Linking view files..."
-    (cd ${ROOT_DIR} && ./mapg view:link)
 fi

src/Cli/AddUserCommand.php

@@ -1,8 +1,7 @@
 <?php namespace MapGuesser\Cli;
 
-use DateTime;
-use MapGuesser\PersistentData\PersistentDataManager;
-use MapGuesser\PersistentData\Model\User;
+use MapGuesser\Database\Query\Modify;
+use MapGuesser\Model\User;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -10,7 +9,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class AddUserCommand extends Command
 {
-    public function configure(): void
+    public function configure()
     {
         $this->setName('user:add')
             ->setDescription('Adding of user.')
@@ -21,19 +20,20 @@ class AddUserCommand extends Command
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $user = new User();
-        $user->setEmail($input->getArgument('email'));
+        $user = new User([
+            'email' => $input->getArgument('email'),
+        ]);
+
         $user->setPlainPassword($input->getArgument('password'));
-        $user->setActive(true);
-        $user->setCreatedDate(new DateTime());
 
         if ($input->hasArgument('type')) {
             $user->setType($input->getArgument('type'));
         }
 
         try {
-            $pdm = new PersistentDataManager();
-            $pdm->saveToDb($user);
+            $modify = new Modify(\Container::$dbConnection, 'users');
+            $modify->fill($user->toArray());
+            $modify->save();
         } catch (\Exception $e) {
             $output->writeln('<error>Adding user failed!</error>');
             $output->writeln('');

src/Cli/DatabaseMigration.php

@@ -7,11 +7,11 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class MigrateDatabaseCommand extends Command
+class DatabaseMigration extends Command
 {
-    public function configure(): void
+    public function configure()
     {
-        $this->setName('db:migrate')
+        $this->setName('migrate')
             ->setDescription('Migration of database changes.');
     }
 
@@ -88,10 +88,6 @@ class MigrateDatabaseCommand extends Command
         $path = ROOT . '/database/migrations/' . $type;
         $dir = opendir($path);
 
-        if ($dir === false) {
-            throw new \Exception('Cannot open dir: ' . $path);
-        }
-
         $files = [];
         while ($file = readdir($dir)) {
             $filePath = $path . '/' . $file;

src/Cli/LinkViewCommand.php

@@ -1,69 +0,0 @@
-<?php namespace MapGuesser\Cli;
-
-use FilesystemIterator;
-use MapGuesser\View\Linker;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class LinkViewCommand extends Command
-{
-    public function configure(): void
-    {
-        $this->setName('view:link')
-            ->setDescription('Linking of views.')
-            ->addArgument('view', InputArgument::OPTIONAL, 'View file to be linked.');
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $views = [];
-
-        $view = $input->getArgument('view');
-
-        if ($view !== null) {
-            $views[] = $view;
-        } else {
-            $folder = ROOT . '/views';
-            $folderLength = strlen($folder) + 1;
-
-            $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($folder, FilesystemIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST);
-
-            foreach ($iterator as $file) {
-                if ($file->isDir() || $file->getExtension() !== 'php') {
-                    continue;
-                }
-
-                $view = substr($file->getPath(), $folderLength) . '/' . $file->getBasename('.php');
-
-                if (strpos($view, 'templates') === 0 || strpos($view, 'tests') === 0) {
-                    continue;
-                }
-
-                $views[] = $view;
-            }
-        }
-
-        try {
-            foreach ($views as $view) {
-                $generator = new Linker($view);
-                $generator->generate();
-            }
-        } catch (\Exception $e) {
-            $output->writeln('<error>Linking view(s) failed!</error>');
-            $output->writeln('');
-
-            $output->writeln((string) $e);
-            $output->writeln('');
-
-            return 1;
-        }
-
-        $output->writeln('<info>View(s) successfully linked!</info>');
-
-        return 0;
-    }
-}

src/Cli/MaintainDatabaseCommand.php

@@ -1,119 +0,0 @@
-<?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 MapGuesser\Repository\MultiRoomRepository;
-use MapGuesser\Repository\UserConfirmationRepository;
-use MapGuesser\Repository\UserPasswordResetterRepository;
-use MapGuesser\Repository\UserRepository;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class MaintainDatabaseCommand extends Command
-{
-    private PersistentDataManager $pdm;
-
-    private UserRepository $userRepository;
-
-    private UserConfirmationRepository $userConfirmationRepository;
-
-    private UserPasswordResetterRepository $userPasswordResetterRepository;
-
-    private MultiRoomRepository $multiRoomRepository;
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->pdm = new PersistentDataManager();
-        $this->userRepository = new UserRepository();
-        $this->userConfirmationRepository = new UserConfirmationRepository();
-        $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
-        $this->multiRoomRepository = new MultiRoomRepository();
-    }
-
-    public function configure(): void
-    {
-        $this->setName('db:maintain')
-            ->setDescription('Maintain database.');
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output): int
-    {
-        try {
-            $this->deleteInactiveExpiredUsers();
-            $this->deleteExpiredPasswordResetters();
-            $this->deleteExpiredRooms();
-            $this->deleteExpiredSessions();
-        } catch (\Exception $e) {
-            $output->writeln('<error>Maintenance failed!</error>');
-            $output->writeln('');
-
-            $output->writeln((string) $e);
-            $output->writeln('');
-
-            return 1;
-        }
-
-        $output->writeln('<info>Maintenance was successful!</info>');
-        $output->writeln('');
-
-        return 0;
-    }
-
-    private function deleteInactiveExpiredUsers(): void
-    {
-        \Container::$dbConnection->startTransaction();
-
-        foreach ($this->userRepository->getAllInactiveExpired() as $user) {
-            //TODO: these can be in some wrapper class
-            $userConfirmation = $this->userConfirmationRepository->getByUser($user);
-            if ($userConfirmation !== null) {
-                $this->pdm->deleteFromDb($userConfirmation);
-            }
-
-            $userPasswordResetter = $this->userPasswordResetterRepository->getByUser($user);
-            if ($userPasswordResetter !== null) {
-                $this->pdm->deleteFromDb($userPasswordResetter);
-            }
-
-            $this->pdm->deleteFromDb($user);
-        }
-
-        \Container::$dbConnection->commit();
-    }
-
-    private function deleteExpiredPasswordResetters(): void
-    {
-        foreach ($this->userPasswordResetterRepository->getAllExpired() as $passwordResetter) {
-            $this->pdm->deleteFromDb($passwordResetter);
-        }
-    }
-
-    private function deleteExpiredRooms(): void
-    {
-        foreach ($this->multiRoomRepository->getAllExpired() as $multiRoom) {
-            $this->pdm->deleteFromDb($multiRoom);
-        }
-    }
-
-    private function deleteExpiredSessions(): void
-    {
-        //TODO: model may be used for sessions too
-        $select = new Select(\Container::$dbConnection, 'sessions');
-        $select->columns(['id']);
-        $select->where('updated', '<', (new DateTime('-7 days'))->format('Y-m-d H:i:s'));
-
-        $result = $select->execute();
-
-        while ($session = $result->fetch(IResultSet::FETCH_ASSOC)) {
-            $modify = new Modify(\Container::$dbConnection, 'sessions');
-            $modify->setId($session['id']);
-            $modify->delete();
-        }
-    }
-}

src/Controller/GameController.php

@@ -1,166 +1,54 @@
 <?php namespace MapGuesser\Controller;
 
-use DateTime;
-use Faker\Factory;
 use MapGuesser\Interfaces\Request\IRequest;
+use MapGuesser\Util\Geo\Bounds;
 use MapGuesser\Response\HtmlContent;
 use MapGuesser\Response\JsonContent;
 use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\Multi\MultiConnector;
-use MapGuesser\PersistentData\Model\MultiRoom;
-use MapGuesser\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\MapRepository;
-use MapGuesser\Repository\MultiRoomRepository;
-use MapGuesser\Response\Redirect;
 
 class GameController
 {
     private IRequest $request;
 
-    private PersistentDataManager $pdm;
-
-    private MultiConnector $multiConnector;
-
-    private MultiRoomRepository $multiRoomRepository;
-
     private MapRepository $mapRepository;
 
     public function __construct(IRequest $request)
     {
         $this->request = $request;
-        $this->pdm = new PersistentDataManager();
-        $this->multiConnector = new MultiConnector();
-        $this->multiRoomRepository = new MultiRoomRepository();
         $this->mapRepository = new MapRepository();
     }
 
     public function getGame(): IContent
     {
         $mapId = (int) $this->request->query('mapId');
-
-        return new HtmlContent('game', ['mapId' => $mapId]);
+        $data = $this->prepareGame($mapId);
+        return new HtmlContent('game', $data);
     }
 
-    public function getNewMultiGame(): IRedirect
+    public function getGameJson(): IContent
     {
         $mapId = (int) $this->request->query('mapId');
-        $map = $this->mapRepository->getById($mapId);
-        $roomId = bin2hex(random_bytes(3));
-        $token = $this->getMultiToken($roomId);
-
-        $room = new MultiRoom();
-        $room->setRoomId($roomId);
-        $room->setStateArray([
-            'mapId' => $mapId,
-            'area' => $map->getArea(),
-            'rounds' => [],
-            'currentRound' => -1
-        ]);
-        $room->setMembersArray(['owner' => $token, 'all' => []]);
-        $room->setUpdatedDate(new DateTime());
-
-        $this->pdm->saveToDb($room);
-
-        $this->multiConnector->sendMessage('create_room', ['roomId' => $roomId]);
-
-        return new Redirect(
-            \Container::$routeCollection
-                ->getRoute('multiGame')
-                ->generateLink(['roomId' => $roomId]),
-            IRedirect::TEMPORARY
-        );
+        $data = $this->prepareGame($mapId);
+        return new JsonContent($data);
     }
 
-    public function getMultiGame(): IContent
+    private function prepareGame(int $mapId)
     {
-        $roomId = $this->request->query('roomId');
-
-        return new HtmlContent('game', ['roomId' => $roomId]);
-    }
-
-    public function prepareGame(): IContent
-    {
-        $mapId = (int) $this->request->query('mapId');
         $map = $this->mapRepository->getById($mapId);
+
+        $bounds = Bounds::createDirectly($map['bound_south_lat'], $map['bound_west_lng'], $map['bound_north_lat'], $map['bound_east_lng']);
+
         $session = $this->request->session();
 
         if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
             $session->set('state', [
                 'mapId' => $mapId,
-                'area' => $map->getArea(),
-                'rounds' => [],
-                'currentRound' => -1
+                'area' => $map['area'],
+                'rounds' => []
             ]);
         }
 
-        return new JsonContent([
-            'mapId' => $mapId,
-            'mapName' => $map->getName(),
-            'bounds' => $map->getBounds()->toArray()
-        ]);
-    }
-
-    public function prepareMultiGame(): IContent
-    {
-        $roomId = $this->request->query('roomId');
-        $userName = $this->request->post('userName');
-        if (empty($userName)) {
-            $faker = Factory::create();
-            $userName = $faker->userName;
-        }
-
-        $room = $this->multiRoomRepository->getByRoomId($roomId);
-        $state = $room->getStateArray();
-        $map = $this->mapRepository->getById($state['mapId']);
-        $token = $this->getMultiToken($roomId);
-
-        $members = $room->getMembersArray();
-
-        if (!in_array($token, $members['all'])) {
-            if ($state['currentRound'] >= 0) {
-                return new JsonContent(['error' => 'game_already_started']);
-            }
-
-            $members['all'][] = $token;
-        }
-
-        $room->setMembersArray($members);
-        $room->setUpdatedDate(new DateTime());
-
-        $this->pdm->saveToDb($room);
-
-        $this->multiConnector->sendMessage('join_room', [
-            'roomId' => $roomId,
-            'token' => $token,
-            'userName' => $userName
-        ]);
-
-        return new JsonContent([
-            'roomId' => $roomId,
-            'token' => $token,
-            'owner' => $members['owner'] == $token,
-            'mapId' => $state['mapId'],
-            'mapName' => $map->getName(),
-            'bounds' => $map->getBounds()->toArray()
-        ]);
-    }
-
-    private function getMultiToken(string $roomId): string
-    {
-        $session = $this->request->session();
-
-        if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
-            $token = bin2hex(random_bytes(16));
-
-            $session->set('multiState', [
-                'roomId' => $roomId,
-                'token' => $token
-            ]);
-        } else {
-            $token = $multiState['token'];
-        }
-
-        return $token;
+        return ['mapId' => $mapId, 'mapName' => $map['name'], 'bounds' => $bounds->toArray()];
     }
 }

src/Controller/GameFlowController.php

@@ -1,13 +1,9 @@
 <?php namespace MapGuesser\Controller;
 
-use DateTime;
 use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Util\Geo\Position;
 use MapGuesser\Response\JsonContent;
 use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Multi\MultiConnector;
-use MapGuesser\PersistentData\PersistentDataManager;
-use MapGuesser\Repository\MultiRoomRepository;
 use MapGuesser\Repository\PlaceRepository;
 
 class GameFlowController
@@ -17,49 +13,39 @@ class GameFlowController
 
     private IRequest $request;
 
-    private PersistentDataManager $pdm;
-
-    private MultiConnector $multiConnector;
-
-    private MultiRoomRepository $multiRoomRepository;
-
     private PlaceRepository $placeRepository;
 
     public function __construct(IRequest $request)
     {
         $this->request = $request;
-        $this->pdm = new PersistentDataManager();
-        $this->multiConnector = new MultiConnector();
-        $this->multiRoomRepository = new MultiRoomRepository();
         $this->placeRepository = new PlaceRepository();
     }
 
-    public function initialData(): IContent
+    public function getNewPlace(): IContent
     {
         $mapId = (int) $this->request->query('mapId');
+
         $session = $this->request->session();
 
         if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
-            return new JsonContent(['error' => 'no_session_found']);
+            $data = ['error' => 'no_session_found'];
+            return new JsonContent($data);
         }
 
-        if (!isset($state['currentRound']) || $state['currentRound'] == -1 || $state['currentRound'] >= static::NUMBER_OF_ROUNDS) {
-            $this->startNewGame($state, $mapId);
+        if (count($state['rounds']) === 0) {
+            $place = $this->placeRepository->getForMapWithValidPano($mapId);
+            $state['rounds'][] = $place;
             $session->set('state', $state);
-        }
 
-        $response = [];
+            $data = ['panoId' => $place['panoId']];
+        } else {
+            $rounds = count($state['rounds']);
+            $last = $state['rounds'][$rounds - 1];
 
-        $last = $state['rounds'][$state['currentRound']];
-        $response['place'] = [
-            'panoId' => $last['panoId'],
-            'pov' => $last['pov']->toArray()
-        ];
-
-        $response['history'] = [];
-        for ($i = 0; $i < $state['currentRound']; ++$i) {
+            $history = [];
+            for ($i = 0; $i < $rounds - 1; ++$i) {
                 $round = $state['rounds'][$i];
-            $response['history'][] = [
+                $history[] = [
                     'position' => $round['position']->toArray(),
                     'guessPosition' => $round['guessPosition']->toArray(),
                     'distance' => $round['distance'],
@@ -67,175 +53,67 @@ class GameFlowController
                 ];
             }
 
-        return new JsonContent($response);
-    }
-
-    public function multiInitialData(): IContent
-    {
-        $roomId = $this->request->query('roomId');
-        $session = $this->request->session();
-
-        if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
-            return new JsonContent(['error' => 'no_session_found']);
-        }
-
-        $room = $this->multiRoomRepository->getByRoomId($roomId);
-        $state = $room->getStateArray();
-        $members = $room->getMembersArray();
-
-        if ($members['owner'] !== $multiState['token']) {
-            return new JsonContent(['error' => 'not_owner_of_room']);
-        }
-
-        if ($state['currentRound'] == -1 || $state['currentRound'] >= static::NUMBER_OF_ROUNDS - 1) {
-            $this->startNewGame($state, $state['mapId']);
-            $room->setStateArray($state);
-            $room->setUpdatedDate(new DateTime());
-            $this->pdm->saveToDb($room);
-        }
-
-        $places = [];
-        foreach ($state['rounds'] as $round) {
-            $places[] = [
-                'position' => $round['position']->toArray(),
-                'panoId' => $round['panoId'],
-                'pov' => $round['pov']->toArray()
+            $data = [
+                'history' => $history,
+                'panoId' => $last['panoId']
             ];
         }
 
-        $this->multiConnector->sendMessage('start_game', ['roomId' => $roomId, 'places' => $places]);
-
-        return new JsonContent(['ok' => true]);
+        return new JsonContent($data);
     }
 
-    public function guess(): IContent
+    public function evaluateGuess(): IContent
     {
         $mapId = (int) $this->request->query('mapId');
+
         $session = $this->request->session();
 
         if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
-            return new JsonContent(['error' => 'no_session_found']);
+            $data = ['error' => 'no_session_found'];
+            return new JsonContent($data);
         }
 
-        $last = $state['rounds'][$state['currentRound']];
+        $last = $state['rounds'][count($state['rounds']) - 1];
+
+        $position = $last['position'];
         $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
-        $result = $this->evalueteGuess($last['position'], $guessPosition, $state['area']);
+
+        $distance = $this->calculateDistance($position, $guessPosition);
+        $score = $this->calculateScore($distance, $state['area']);
 
         $last['guessPosition'] = $guessPosition;
-        $last['distance'] = $result['distance'];
-        $last['score'] = $result['score'];
+        $last['distance'] = $distance;
+        $last['score'] = $score;
+        $state['rounds'][count($state['rounds']) - 1] = $last;
 
-        $response = [
-            'result' => [
-                'position' => $last['position']->toArray(),
-                'distance' => $result['distance'],
-                'score' => $result['score']
-            ]
-        ];
+        if (count($state['rounds']) < static::NUMBER_OF_ROUNDS) {
+            $exclude = [];
 
-        $state['rounds'][$state['currentRound']] = $last;
-        $state['currentRound'] += 1;
-        if ($state['currentRound'] < static::NUMBER_OF_ROUNDS) {
-            $next = $state['rounds'][$state['currentRound']];
-
-            $response['place'] = [
-                'panoId' => $next['panoId'],
-                'pov' => $next['pov']->toArray()
-            ];
+            foreach ($state['rounds'] as $round) {
+                $exclude = array_merge($exclude, $round['placesWithoutPano'], [$round['placeId']]);
             }
 
+            $place = $this->placeRepository->getForMapWithValidPano($mapId, $exclude);
+            $state['rounds'][] = $place;
             $session->set('state', $state);
 
-        return new JsonContent($response);
-    }
-
-    public function multiGuess(): IContent
-    {
-        $roomId = $this->request->query('roomId');
-        $session = $this->request->session();
-
-        if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
-            return new JsonContent(['error' => 'no_session_found']);
-        }
-
-        $room = $this->multiRoomRepository->getByRoomId($roomId);
-        $state = $room->getStateArray();
-
-        $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']);
-
-        $this->multiConnector->sendMessage('guess', [
-            'roomId' => $roomId,
-            'token' => $multiState['token'],
-            'guess' => $guessPosition->toArray(),
-            'distance' => $result['distance'],
-            'score' => $result['score']
-        ]);
-
-        $response = [
-            'result' => [
-                'position' => $last['position']->toArray(),
-                'distance' => $result['distance'],
-                'score' => $result['score']
-            ]
-        ];
-
-        return new JsonContent($response);
-    }
-
-    public function multiNextRound(): IContent
-    {
-        $roomId = $this->request->query('roomId');
-        $session = $this->request->session();
-
-        if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
-            return new JsonContent(['error' => 'no_session_found']);
-        }
-
-        $room = $this->multiRoomRepository->getByRoomId($roomId);
-        $state = $room->getStateArray();
-        $members = $room->getMembersArray();
-
-        if ($members['owner'] !== $multiState['token']) {
-            return new JsonContent(['error' => 'not_owner_of_room']);
-        }
-
-        $state['currentRound'] += 1;
-        if ($state['currentRound'] < static::NUMBER_OF_ROUNDS) {
-            $this->multiConnector->sendMessage('next_round', ['roomId' => $roomId, 'currentRound' => $state['currentRound']]);
-        }
-
-        $room->setStateArray($state);
-        $room->setUpdatedDate(new DateTime());
-        $this->pdm->saveToDb($room);
-
-        return new JsonContent(['ok' => true]);
-    }
-
-    private function evalueteGuess(Position $realPosition, Position $guessPosition, float $area)
-    {
-        $distance = $this->calculateDistance($realPosition, $guessPosition);
-        $score = $this->calculateScore($distance, $area);
-
-        return ['distance' => $distance, 'score' => $score];
-    }
-
-    private function startNewGame(array &$state, int $mapId): void
-    {
-        $places = $this->placeRepository->getRandomNForMapWithValidPano($mapId, static::NUMBER_OF_ROUNDS);
-
+            $panoId = $place['panoId'];
+        } else {
             $state['rounds'] = [];
-        $state['currentRound'] = 0;
+            $session->set('state', $state);
 
-        foreach ($places as $place) {
-            $state['rounds'][] = [
-                'placeId' => $place->getId(),
-                'position' => $place->getPosition(),
-                'panoId' => $place->getPanoIdCached(),
-                'pov' => $place->getPov()
-            ];
+            $panoId = null;
         }
+
+        $data = [
+            'result' => [
+                'position' => $position->toArray(),
+                'distance' => $distance,
+                'score' => $score
+            ],
+            'panoId' => $panoId
+        ];
+        return new JsonContent($data);
     }
 
     private function calculateDistance(Position $realPosition, Position $guessPosition): float

src/Controller/HomeController.php

@@ -1,29 +1,12 @@
 <?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;
 
 class HomeController
 {
-    private IRequest $request;
-
-    public function __construct(IRequest $request)
-    {
-        $this->request = $request;
-    }
-
     public function getIndex(): IRedirect
     {
-        return new Redirect(\Container::$routeCollection->getRoute('maps')->generateLink(), IRedirect::TEMPORARY);
-    }
-
-    public function startSession(): IContent
-    {
-        // session starts with the request, this method just sends valid data to the client
-
-        return new JsonContent(['antiCsrfToken' => $this->request->session()->get('anti_csrf_token')]);
+        return new Redirect([\Container::$routeCollection->getRoute('maps'), []], IRedirect::TEMPORARY);
     }
 }

src/Controller/LoginController.php

@@ -1,611 +1,78 @@
 <?php namespace MapGuesser\Controller;
 
-use DateInterval;
-use DateTime;
-use MapGuesser\Http\Request;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Interfaces\Database\IResultSet;
 use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Interfaces\Response\IContent;
 use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\Mailing\Mail;
-use MapGuesser\OAuth\GoogleOAuth;
-use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\Model\UserConfirmation;
-use MapGuesser\PersistentData\Model\UserPasswordResetter;
-use MapGuesser\PersistentData\PersistentDataManager;
-use MapGuesser\Repository\UserConfirmationRepository;
-use MapGuesser\Repository\UserPasswordResetterRepository;
-use MapGuesser\Repository\UserRepository;
+use MapGuesser\Model\User;
 use MapGuesser\Response\HtmlContent;
 use MapGuesser\Response\JsonContent;
 use MapGuesser\Response\Redirect;
-use MapGuesser\Util\JwtParser;
 
 class LoginController
 {
     private IRequest $request;
 
-    private PersistentDataManager $pdm;
-
-    private UserRepository $userRepository;
-
-    private UserConfirmationRepository $userConfirmationRepository;
-
-    private UserPasswordResetterRepository $userPasswordResetterRepository;
-
     public function __construct(IRequest $request)
     {
         $this->request = $request;
-        $this->pdm = new PersistentDataManager();
-        $this->userRepository = new UserRepository();
-        $this->userConfirmationRepository = new UserConfirmationRepository();
-        $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
     }
 
     public function getLoginForm()
     {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        $session = $this->request->session();
+
+        if ($session->get('user')) {
+            return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
         }
 
-        return new HtmlContent('login/login');
-    }
-
-    public function getGoogleLoginRedirect(): IRedirect
-    {
-        $state = bin2hex(random_bytes(16));
-        $nonce = bin2hex(random_bytes(16));
-
-        $this->request->session()->set('oauth_state', $state);
-        $this->request->session()->set('oauth_nonce', $nonce);
-
-        $oAuth = new GoogleOAuth(new Request());
-        $url = $oAuth->getDialogUrl(
-            $state,
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink(),
-            $nonce
-        );
-
-        return new Redirect($url, IRedirect::TEMPORARY);
-    }
-
-    public function getSignupForm()
-    {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
-        }
-
-        if ($this->request->session()->has('tmp_user_data')) {
-            $tmpUserData = $this->request->session()->get('tmp_user_data');
-
-            $data = ['email' => $tmpUserData['email']];
-        } else {
         $data = [];
-        }
-
-        return new HtmlContent('login/signup', $data);
-    }
-
-    public function getSignupSuccess(): IContent
-    {
-        return new HtmlContent('login/signup_success');
-    }
-
-    public function getSignupWithGoogleForm()
-    {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
-        }
-
-        if (!$this->request->session()->has('google_user_data')) {
-            return new Redirect(\Container::$routeCollection->getRoute('login-google')->generateLink(), IRedirect::TEMPORARY);
-        }
-
-        $userData = $this->request->session()->get('google_user_data');
-
-        $user = $this->userRepository->getByEmail($userData['email']);
-
-        return new HtmlContent('login/google_signup', ['found' => $user !== null, 'email' => $userData['email']]);
-    }
-
-    public function getRequestPasswordResetForm()
-    {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
-        }
-
-        return new HtmlContent('login/password_reset_request', ['email' => $this->request->query('email')]);
-    }
-
-    public function getRequestPasswordResetSuccess(): IContent
-    {
-        return new HtmlContent('login/password_reset_request_success');
-    }
-
-    public function getResetPasswordForm()
-    {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
-        }
-
-        $token = $this->request->query('token');
-        $resetter = $this->userPasswordResetterRepository->getByToken($token);
-
-        if ($resetter === null || $resetter->getExpiresDate() < new DateTime()) {
-            return new HtmlContent('login/reset_password', ['success' => false]);
-        }
-
-        $user = $this->userRepository->getById($resetter->getUserId());
-
-        return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail()]);
+        return new HtmlContent('login', $data);
     }
 
     public function login(): IContent
     {
-        if ($this->request->user() !== null) {
-            return new JsonContent(['success' => true]);
+        $session = $this->request->session();
+
+        if ($session->get('user')) {
+            $data = ['success' => true];
+            return new JsonContent($data);
         }
 
-        $user = $this->userRepository->getByEmail($this->request->post('email'));
+        $select = new Select(\Container::$dbConnection, 'users');
+        $select->columns(User::getFields());
+        $select->where('email', '=', $this->request->post('email'));
 
-        if ($user === null) {
-            if (strlen($this->request->post('password')) < 6) {
-                return new JsonContent([
-                    'error' => [
-                        'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
-                    ]
-                ]);
+        $userData = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+
+        if ($userData === null) {
+            $data = ['error' => 'user_not_found'];
+            return new JsonContent($data);
         }
 
-            $tmpUser = new User();
-            $tmpUser->setPlainPassword($this->request->post('password'));
-
-            $this->request->session()->set('tmp_user_data', [
-                'email' => $this->request->post('email'),
-                'password_hashed' => $tmpUser->getPassword()
-            ]);
-
-            return new JsonContent([
-                'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('signup')->generateLink()
-                ]
-            ]);
-        }
+        $user = new User($userData);
 
         if (!$user->getActive()) {
-            $this->resendConfirmationEmail($user);
-
-            return new JsonContent([
-                'error' => [
-                    'errorText' => 'User found with the given email address, but the account is not activated. ' .
-                        'Please check your email and click on the activation link!'
-                ]
-            ]);
+            $data = ['error' => 'user_not_active'];
+            return new JsonContent($data);
         }
 
         if (!$user->checkPassword($this->request->post('password'))) {
-            return new JsonContent([
-                'error' => [
-                    'errorText' => 'The given password is wrong. You can <a href="/password/requestReset?email=' .
-                        urlencode($user->getEmail()) . '" title="Request password reset">request password reset</a>!'
-                ]
-            ]);
+            $data = ['error' => 'password_not_match'];
+            return new JsonContent($data);
         }
 
-        $this->request->setUser($user);
+        $session->set('user', $user);
 
-        return new JsonContent(['success' => true]);
-    }
-
-    public function loginWithGoogle()
-    {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
-        }
-
-        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
-            return new HtmlContent('login/google_login');
-        }
-
-        $oAuth = new GoogleOAuth(new Request());
-        $tokenData = $oAuth->getToken(
-            $this->request->query('code'),
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
-        );
-
-        if (!isset($tokenData['id_token'])) {
-            return new HtmlContent('login/google_login');
-        }
-
-        $jwtParser = new JwtParser($tokenData['id_token']);
-        $idToken = $jwtParser->getPayload();
-
-        if ($idToken['nonce'] !== $this->request->session()->get('oauth_nonce')) {
-            return new HtmlContent('login/google_login');
-        }
-
-        if (!$idToken['email_verified']) {
-            return new HtmlContent('login/google_login');
-        }
-
-        $user = $this->userRepository->getByGoogleSub($idToken['sub']);
-
-        if ($user === null) {
-            $this->request->session()->set('google_user_data', ['sub' => $idToken['sub'], 'email' => $idToken['email']]);
-
-            return new Redirect(\Container::$routeCollection->getRoute('signup-google')->generateLink(), IRedirect::TEMPORARY);
-        }
-
-        $this->request->setUser($user);
-
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        $data = ['success' => true];
+        return new JsonContent($data);
     }
 
     public function logout(): IRedirect
     {
-        $this->request->setUser(null);
+        $this->request->session()->delete('user');
 
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
-    }
-
-    public function signup(): IContent
-    {
-        if ($this->request->user() !== null) {
-            return new JsonContent(['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()]]);
-        }
-
-        $user = $this->userRepository->getByEmail($this->request->post('email'));
-
-        if ($user !== null) {
-            if ($user->getActive()) {
-                if (!$user->checkPassword($this->request->post('password'))) {
-                    return new JsonContent([
-                        'error' => [
-                            'errorText' => 'There is a user already registered with the given email address, ' .
-                                'but the given password is wrong. You can <a href="/password/requestReset?email=' .
-                                urlencode($user->getEmail()) . '" title="Request password reset">request password reset</a>!'
-                        ]
-                    ]);
-                }
-
-                $this->request->setUser($user);
-
-                $data = ['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('index')->generateLink()]];
-            } else {
-                $data = [
-                    'error' => [
-                        'errorText' => 'There is a user already registered with the given email address. ' .
-                            'Please check your email and click on the activation link!'
-                    ]
-                ];
-            }
-            return new JsonContent($data);
-        }
-
-        if (filter_var($this->request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
-            return new JsonContent(['error' => ['errorText' => 'The given email address is not valid.']]);
-        }
-
-        if ($this->request->session()->has('tmp_user_data')) {
-            $tmpUserData = $this->request->session()->get('tmp_user_data');
-
-            $tmpUser = new User();
-            $tmpUser->setPassword($tmpUserData['password_hashed']);
-
-            if (!$tmpUser->checkPassword($this->request->post('password'))) {
-                return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
-            }
-        } else {
-            if (strlen($this->request->post('password')) < 6) {
-                return new JsonContent([
-                    'error' => [
-                        'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
-                    ]
-                ]);
-            }
-
-            if ($this->request->post('password') !== $this->request->post('password_confirm')) {
-                return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
-            }
-        }
-
-        $user = new User();
-        $user->setEmail($this->request->post('email'));
-        $user->setPlainPassword($this->request->post('password'));
-        $user->setCreatedDate(new DateTime());
-
-        \Container::$dbConnection->startTransaction();
-
-        $this->pdm->saveToDb($user);
-
-        $token = bin2hex(random_bytes(16));
-
-        $confirmation = new UserConfirmation();
-        $confirmation->setUser($user);
-        $confirmation->setToken($token);
-        $confirmation->setLastSentDate(new DateTime());
-
-        $this->pdm->saveToDb($confirmation);
-
-        \Container::$dbConnection->commit();
-
-        $this->sendConfirmationEmail($user->getEmail(), $token, $user->getCreatedDate());
-
-        $this->request->session()->delete('tmp_user_data');
-
-        return new JsonContent(['success' => true]);
-    }
-
-    public function signupWithGoogle(): IContent
-    {
-        if ($this->request->user() !== null) {
-            return new JsonContent(['success' => true]);
-        }
-
-        $userData = $this->request->session()->get('google_user_data');
-
-        $user = $this->userRepository->getByEmail($userData['email']);
-
-        if ($user === null) {
-            $sendWelcomeEmail = true;
-
-            $user = new User();
-            $user->setEmail($userData['email']);
-            $user->setCreatedDate(new DateTime());
-        } else {
-            $sendWelcomeEmail = false;
-        }
-
-        $user->setActive(true);
-        $user->setGoogleSub($userData['sub']);
-
-        $this->pdm->saveToDb($user);
-
-        if ($sendWelcomeEmail) {
-            $this->sendWelcomeEmail($user->getEmail());
-        }
-
-        $this->request->session()->delete('google_user_data');
-        $this->request->setUser($user);
-
-        return new JsonContent(['success' => true]);
-    }
-
-    public function resetSignup(): IContent
-    {
-        $this->request->session()->delete('tmp_user_data');
-
-        return new JsonContent(['success' => true]);
-    }
-
-    public function resetGoogleSignup(): IContent
-    {
-        $this->request->session()->delete('google_user_data');
-
-        return new JsonContent(['success' => true]);
-    }
-
-    public function activate()
-    {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
-        }
-
-        $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
-
-        if ($confirmation === null) {
-            return new HtmlContent('login/activate');
-        }
-
-        \Container::$dbConnection->startTransaction();
-
-        $this->pdm->deleteFromDb($confirmation);
-
-        $user = $this->userRepository->getById($confirmation->getUserId());
-        $user->setActive(true);
-
-        $this->pdm->saveToDb($user);
-
-        \Container::$dbConnection->commit();
-
-        $this->request->setUser($user);
-
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
-    }
-
-    public function cancel()
-    {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
-        }
-
-        $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
-
-        if ($confirmation === null) {
-            return new HtmlContent('login/cancel', ['success' => false]);
-        }
-
-        \Container::$dbConnection->startTransaction();
-
-        $this->pdm->deleteFromDb($confirmation);
-
-        $user = $this->userRepository->getById($confirmation->getUserId());
-
-        $this->pdm->deleteFromDb($user);
-
-        \Container::$dbConnection->commit();
-
-        return new HtmlContent('login/cancel', ['success' => true]);
-    }
-
-    public function requestPasswordReset(): IContent
-    {
-        if ($this->request->user() !== null) {
-            return new JsonContent([
-                'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
-                ]
-            ]);
-        }
-
-        $user = $this->userRepository->getByEmail($this->request->post('email'));
-
-        if ($user === null) {
-            return new JsonContent([
-                'error' => [
-                    'errorText' => 'No user found with the given email address. You can <a href="/signup" title="Sign up">sign up</a>!'
-                ]
-            ]);
-        }
-
-        if (!$user->getActive()) {
-            $this->resendConfirmationEmail($user);
-
-            return new JsonContent([
-                'error' => [
-                    'errorText' => 'User found with the given email address, but the account is not activated. ' .
-                        'Please check your email and click on the activation link!'
-                ]
-            ]);
-        }
-
-        $existingResetter = $this->userPasswordResetterRepository->getByUser($user);
-
-        if ($existingResetter !== null && $existingResetter->getExpiresDate() > new DateTime()) {
-            return new JsonContent([
-                'error' => [
-                    'errorText' => 'Password reset was recently requested for this account. Please check your email, or try again later!'
-                ]
-            ]);
-        }
-
-        $token = bin2hex(random_bytes(16));
-        $expires = new DateTime('+1 hour');
-
-        $passwordResetter = new UserPasswordResetter();
-        $passwordResetter->setUser($user);
-        $passwordResetter->setToken($token);
-        $passwordResetter->setExpiresDate($expires);
-
-        \Container::$dbConnection->startTransaction();
-
-        if ($existingResetter !== null) {
-            $this->pdm->deleteFromDb($existingResetter);
-        }
-
-        $this->pdm->saveToDb($passwordResetter);
-
-        \Container::$dbConnection->commit();
-
-        $this->sendPasswordResetEmail($user->getEmail(), $token, $expires);
-
-        return new JsonContent(['success' => true]);
-    }
-
-
-    public function resetPassword(): IContent
-    {
-        if ($this->request->user() !== null) {
-            return new JsonContent([
-                'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
-                ]
-            ]);
-        }
-
-        $token = $this->request->query('token');
-        $resetter = $this->userPasswordResetterRepository->getByToken($token);
-
-        if ($resetter === null || $resetter->getExpiresDate() < new DateTime()) {
-            return new JsonContent([
-                'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token])
-                ]
-            ]);
-        }
-
-        if (strlen($this->request->post('password')) < 6) {
-            return new JsonContent([
-                'error' => [
-                    'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
-                ]
-            ]);
-        }
-
-        if ($this->request->post('password') !== $this->request->post('password_confirm')) {
-            return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
-        }
-
-        \Container::$dbConnection->startTransaction();
-
-        $this->pdm->deleteFromDb($resetter);
-
-        $user = $this->userRepository->getById($resetter->getUserId());
-        $user->setPlainPassword($this->request->post('password'));
-
-        $this->pdm->saveToDb($user);
-
-        \Container::$dbConnection->commit();
-
-        $this->request->setUser($user);
-
-        return new JsonContent(['success' => true]);
-    }
-
-    private function sendConfirmationEmail(string $email, string $token, DateTime $created): void
-    {
-        $mail = new Mail();
-        $mail->addRecipient($email);
-        $mail->setSubject('Welcome to ' . $_ENV['APP_NAME'] . ' - Activate your account');
-        $mail->setBodyFromTemplate('signup', [
-            'EMAIL' => $email,
-            'ACTIVATE_LINK' => $this->request->getBase() . '/' .
-                \Container::$routeCollection->getRoute('signup.activate')->generateLink(['token' => $token]),
-            'CANCEL_LINK' => $this->request->getBase() . '/' .
-                \Container::$routeCollection->getRoute('signup.cancel')->generateLink(['token' => $token]),
-            'ACTIVATABLE_UNTIL' => (clone $created)->add(new DateInterval('P1D'))->format('Y-m-d H:i T')
-        ]);
-        $mail->send();
-    }
-
-    private function resendConfirmationEmail(User $user): bool
-    {
-        $confirmation = $this->userConfirmationRepository->getByUser($user);
-
-        if ($confirmation === null || (clone $confirmation->getLastSentDate())->add(new DateInterval('PT1H')) > new DateTime()) {
-            return false;
-        }
-
-        $confirmation->setLastSentDate(new DateTime());
-
-        $this->pdm->saveToDb($confirmation);
-
-        $this->sendConfirmationEmail($user->getEmail(), $confirmation->getToken(), $user->getCreatedDate());
-
-        return true;
-    }
-
-    private function sendWelcomeEmail(string $email): void
-    {
-        $mail = new Mail();
-        $mail->addRecipient($email);
-        $mail->setSubject('Welcome to ' . $_ENV['APP_NAME']);
-        $mail->setBodyFromTemplate('signup-noconfirm', [
-            'EMAIL' => $email,
-        ]);
-        $mail->send();
-    }
-
-    private function sendPasswordResetEmail(string $email, string $token, DateTime $expires): void
-    {
-        $mail = new Mail();
-        $mail->addRecipient($email);
-        $mail->setSubject($_ENV['APP_NAME'] . ' - Password reset');
-        $mail->setBodyFromTemplate('password-reset', [
-            'EMAIL' => $email,
-            'RESET_LINK' => $this->request->getBase() . '/' .
-                \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token]),
-            'EXPIRES' => $expires->format('Y-m-d H:i T')
-        ]);
-        $mail->send();
+        return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
     }
 }

src/Controller/MapAdminController.php

@@ -1,19 +1,19 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
+use MapGuesser\Database\Query\Modify;
+use MapGuesser\Database\Query\Select;
 use MapGuesser\Interfaces\Authentication\IUser;
 use MapGuesser\Interfaces\Authorization\ISecured;
+use MapGuesser\Interfaces\Database\IResultSet;
 use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\PersistentData\Model\Map;
-use MapGuesser\PersistentData\Model\Place;
-use MapGuesser\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\MapRepository;
 use MapGuesser\Repository\PlaceRepository;
 use MapGuesser\Response\HtmlContent;
 use MapGuesser\Response\JsonContent;
 use MapGuesser\Util\Geo\Bounds;
-use MapGuesser\Util\Panorama\Pov;
+use MapGuesser\Util\Geo\Position;
 
 class MapAdminController implements ISecured
 {
@@ -21,8 +21,6 @@ class MapAdminController implements ISecured
 
     private IRequest $request;
 
-    private PersistentDataManager $pdm;
-
     private MapRepository $mapRepository;
 
     private PlaceRepository $placeRepository;
@@ -30,7 +28,6 @@ class MapAdminController implements ISecured
     public function __construct(IRequest $request)
     {
         $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->mapRepository = new MapRepository();
         $this->placeRepository = new PlaceRepository();
     }
@@ -48,29 +45,29 @@ class MapAdminController implements ISecured
 
         if ($mapId) {
             $map = $this->mapRepository->getById($mapId);
-            $places = $this->getPlaces($map);
+            $bounds = Bounds::createDirectly($map['bound_south_lat'], $map['bound_west_lng'], $map['bound_north_lat'], $map['bound_east_lng']);
+            $places = $this->getPlaces($mapId);
         } else {
-            $map = new Map();
-            $map->setName(self::$unnamedMapName);
+            $map = [
+                'name' => self::$unnamedMapName,
+                'description' => ''
+            ];
+            $bounds = Bounds::createDirectly(-90.0, -180.0, 90.0, 180.0);
             $places = [];
         }
 
-        return new HtmlContent('admin/map_editor', [
-            'mapId' => $mapId,
-            'mapName' => $map->getName(),
-            'mapDescription' => str_replace('<br>', "\n", $map->getDescription()),
-            'bounds' => $map->getBounds()->toArray(),
-            'places' => &$places
-        ]);
+        $data = ['mapId' => $mapId, 'mapName' => $map['name'], 'mapDescription' => str_replace('<br>', "\n", $map['description']), 'bounds' => $bounds->toArray(), 'places' => &$places];
+        return new HtmlContent('admin/map_editor', $data);
     }
 
     public function getPlace(): IContent
     {
         $placeId = (int) $this->request->query('placeId');
 
-        $place = $this->placeRepository->getById($placeId);
+        $placeData = $this->placeRepository->getById($placeId);
 
-        return new JsonContent(['panoId' => $place->getFreshPanoId()]);
+        $data = ['panoId' => $placeData['panoId']];
+        return new JsonContent($data);
     }
 
     public function saveMap(): IContent
@@ -79,12 +76,8 @@ class MapAdminController implements ISecured
 
         \Container::$dbConnection->startTransaction();
 
-        if ($mapId) {
-            $map = $this->mapRepository->getById($mapId);
-        } else {
-            $map = new Map();
-            $map->setName(self::$unnamedMapName);
-            $this->pdm->saveToDb($map);
+        if (!$mapId) {
+            $mapId = $this->addNewMap();
         }
 
         if (isset($_POST['added'])) {
@@ -92,23 +85,11 @@ class MapAdminController implements ISecured
             foreach ($_POST['added'] as $placeRaw) {
                 $placeRaw = json_decode($placeRaw, true);
 
-                $place = new Place();
-                $place->setMap($map);
-                $place->setLat((float) $placeRaw['lat']);
-                $place->setLng((float) $placeRaw['lng']);
-                $place->setPov(new Pov(
-                    (float) $placeRaw['pov']['heading'],
-                    (float) $placeRaw['pov']['pitch'],
-                    (float) $placeRaw['pov']['zoom']
-                ));
-
-                if ($placeRaw['panoId'] === -1) {
-                    $place->setPanoIdCachedTimestampDate(new DateTime('-1 day'));
-                }
-
-                $this->pdm->saveToDb($place);
-
-                $addedIds[] = ['tempId' => $placeRaw['id'], 'id' => $place->getId()];
+                $addedIds[] = ['tempId' => $placeRaw['id'], 'id' => $this->placeRepository->addToMap($mapId, [
+                    'lat' => (float) $placeRaw['lat'],
+                    'lng' => (float) $placeRaw['lng'],
+                    'pano_id_cached_timestamp' => $placeRaw['panoId'] === -1 ? (new DateTime('-1 day'))->format('Y-m-d H:i:s') : null
+                ])];
             }
         } else {
             $addedIds = [];
@@ -118,17 +99,10 @@ class MapAdminController implements ISecured
             foreach ($_POST['edited'] as $placeRaw) {
                 $placeRaw = json_decode($placeRaw, true);
 
-                $place = $this->placeRepository->getById((int) $placeRaw['id']);
-                $place->setLat((float) $placeRaw['lat']);
-                $place->setLng((float) $placeRaw['lng']);
-                $place->setPov(new Pov(
-                    (float) $placeRaw['pov']['heading'],
-                    (float) $placeRaw['pov']['pitch'],
-                    (float) $placeRaw['pov']['zoom']
-                ));
-                $place->setPanoIdCachedTimestampDate(new DateTime('-1 day'));
-
-                $this->pdm->saveToDb($place);
+                $this->placeRepository->modify((int) $placeRaw['id'], [
+                    'lat' => (float) $placeRaw['lat'],
+                    'lng' => (float) $placeRaw['lng']
+                ]);
             }
         }
 
@@ -136,81 +110,128 @@ class MapAdminController implements ISecured
             foreach ($_POST['deleted'] as $placeRaw) {
                 $placeRaw = json_decode($placeRaw, true);
 
-                $place = $this->placeRepository->getById((int) $placeRaw['id']);
-
-                $this->pdm->deleteFromDb($place);
+                $this->placeRepository->delete($placeRaw['id']);
             }
         }
 
-        $mapBounds = $this->calculateMapBounds($map);
+        $mapBounds = $this->calculateMapBounds($mapId);
 
-        $map->setBounds($mapBounds);
-        $map->setArea($mapBounds->calculateApproximateArea());
+        $map = [
+            'bound_south_lat' => $mapBounds->getSouthLat(),
+            'bound_west_lng' => $mapBounds->getWestLng(),
+            'bound_north_lat' => $mapBounds->getNorthLat(),
+            'bound_east_lng' => $mapBounds->getEastLng(),
+            'area' => $mapBounds->calculateApproximateArea(),
+        ];
 
         if (isset($_POST['name'])) {
-            $map->setName($_POST['name'] ? $_POST['name'] : self::$unnamedMapName);
+            $map['name'] = $_POST['name'] ? $_POST['name'] : self::$unnamedMapName;
         }
         if (isset($_POST['description'])) {
-            $map->setDescription(str_replace(["\n", "\r\n"], '<br>', $_POST['description']));
+            $map['description'] = str_replace(["\n", "\r\n"], '<br>', $_POST['description']);
         }
 
-        $this->pdm->saveToDb($map);
+        $this->saveMapData($mapId, $map);
 
         \Container::$dbConnection->commit();
 
-        return new JsonContent(['mapId' => $map->getId(), 'added' => $addedIds]);
+        $data = ['mapId' => $mapId, 'added' => $addedIds];
+        return new JsonContent($data);
     }
 
-    public function deleteMap(): IContent
-    {
+    public function deleteMap() {
         $mapId = (int) $this->request->query('mapId');
 
-        $map = $this->mapRepository->getById($mapId);
-
         \Container::$dbConnection->startTransaction();
 
-        $this->deletePlaces($map);
+        $this->deletePlaces($mapId);
 
-        $this->pdm->deleteFromDb($map);
+        $modify = new Modify(\Container::$dbConnection, 'maps');
+        $modify->setId($mapId);
+        $modify->delete();
 
         \Container::$dbConnection->commit();
 
-        return new JsonContent(['success' => true]);
+        $data = ['success' => true];
+        return new JsonContent($data);
     }
 
-    private function deletePlaces(Map $map): void
+    private function deletePlaces(int $mapId): void
     {
-        foreach ($this->placeRepository->getAllForMap($map) as $place) {
-            $this->pdm->deleteFromDb($place);
+        $select = new Select(\Container::$dbConnection, 'places');
+        $select->columns(['id']);
+        $select->where('map_id', '=', $mapId);
+
+        $result = $select->execute();
+
+        while ($place = $result->fetch(IResultSet::FETCH_ASSOC)) {
+            $modify = new Modify(\Container::$dbConnection, 'places');
+            $modify->setId($place['id']);
+            $modify->delete();
         }
     }
 
-    private function calculateMapBounds(Map $map): Bounds
+    private function calculateMapBounds(int $mapId): Bounds
     {
+        $select = new Select(\Container::$dbConnection, 'places');
+        $select->columns(['lat', 'lng']);
+        $select->where('map_id', '=', $mapId);
+
+        $result = $select->execute();
+
         $bounds = new Bounds();
-
-        foreach ($this->placeRepository->getAllForMap($map) as $place) {
-            $bounds->extend($place->getPosition());
+        while ($place = $result->fetch(IResultSet::FETCH_ASSOC)) {
+            $bounds->extend(new Position($place['lat'], $place['lng']));
         }
 
         return $bounds;
     }
 
-    private function &getPlaces(Map $map): array
+    private function addNewMap(): int
     {
+        $modify = new Modify(\Container::$dbConnection, 'maps');
+        $modify->fill([
+            'name' => self::$unnamedMapName,
+            'description' => '',
+            'bound_south_lat' => 0.0,
+            'bound_west_lng' => 0.0,
+            'bound_north_lat' => 0.0,
+            'bound_east_lng' => 0.0
+        ]);
+        $modify->save();
+
+        return $modify->getId();
+    }
+
+    private function saveMapData(int $mapId, array $map): void
+    {
+        $modify = new Modify(\Container::$dbConnection, 'maps');
+        $modify->setId($mapId);
+        $modify->fill($map);
+        $modify->save();
+    }
+
+    private function &getPlaces(int $mapId): array
+    {
+        $select = new Select(\Container::$dbConnection, 'places');
+        $select->columns(['id', 'lat', 'lng', 'pano_id_cached', 'pano_id_cached_timestamp']);
+        $select->where('map_id', '=', $mapId);
+
+        $result = $select->execute();
+
         $places = [];
 
-        foreach ($this->placeRepository->getAllForMap($map) as $place) {
-            $noPano = $place->getPanoIdCachedTimestampDate() !== null && $place->getPanoIdCached() === null;
+        while ($place = $result->fetch(IResultSet::FETCH_ASSOC)) {
+            //$panoId = ???
+            //$pov = ???
+            $noPano = $place['pano_id_cached_timestamp'] && $place['pano_id_cached'] === null;
 
-            $placeId = $place->getId();
-
-            $places[$placeId] = [
-                'id' => $placeId,
-                'lat' => $place->getLat(),
-                'lng' => $place->getLng(),
+            $places[$place['id']] = [
+                'id' => $place['id'],
+                'lat' => $place['lat'],
+                'lng' => $place['lng'],
                 'panoId' => null,
-                'pov' => $place->getPov()->toArray(),
+                'pov' => ['heading' => 0.0, 'pitch' => 0.0, 'zoom' => 0.0],
                 'noPano' => $noPano
             ];
         }

src/Controller/MapsController.php

@@ -19,7 +19,6 @@ class MapsController
 
     public function getMaps(): IContent
     {
-        //TODO: from repository - count should be added
         $select = new Select(\Container::$dbConnection, 'maps');
         $select->columns([
             ['maps', 'id'],
@@ -46,10 +45,8 @@ class MapsController
         }
 
         $user = $this->request->user();
-        return new HtmlContent('maps', [
-            'maps' => $maps,
-            'isAdmin' => $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN)
-        ]);
+        $data = ['maps' => $maps, 'isAdmin' => $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN)];
+        return new HtmlContent('maps', $data);
     }
 
     private function formatMapAreaForHuman(float $area): array

src/Controller/SignupController.php

@@ -0,0 +1,192 @@
+<?php namespace MapGuesser\Controller;
+
+use MapGuesser\Database\Query\Modify;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Interfaces\Database\IResultSet;
+use MapGuesser\Interfaces\Request\IRequest;
+use MapGuesser\Interfaces\Response\IContent;
+use MapGuesser\Interfaces\Response\IRedirect;
+use MapGuesser\Mailing\Mail;
+use MapGuesser\Model\User;
+use MapGuesser\Response\HtmlContent;
+use MapGuesser\Response\JsonContent;
+use MapGuesser\Response\Redirect;
+
+class SignupController
+{
+    private IRequest $request;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+    }
+
+    public function getSignupForm()
+    {
+        $session = $this->request->session();
+
+        if ($session->get('user')) {
+            return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
+        }
+
+        $data = [];
+        return new HtmlContent('signup/signup', $data);
+    }
+
+    public function signup(): IContent
+    {
+        $session = $this->request->session();
+
+        if ($session->get('user')) {
+            //TODO: return with some error
+            $data = ['success' => true];
+            return new JsonContent($data);
+        }
+
+        $select = new Select(\Container::$dbConnection, 'users');
+        $select->columns(User::getFields());
+        $select->where('email', '=', $this->request->post('email'));
+
+        $userData = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+
+        if ($userData !== null) {
+            $user = new User($userData);
+
+            if ($user->getActive()) {
+                $data = ['error' => 'user_found'];
+            } else {
+                $data = ['error' => 'not_active_user_found'];
+            }
+            return new JsonContent($data);
+        }
+
+        if (strlen($this->request->post('password')) < 6) {
+            $data = ['error' => 'passwords_too_short'];
+            return new JsonContent($data);
+        }
+
+        if ($this->request->post('password') !== $this->request->post('password_confirm')) {
+            $data = ['error' => 'passwords_not_match'];
+            return new JsonContent($data);
+        }
+
+        $user = new User([
+            'email' => $this->request->post('email'),
+        ]);
+
+        $user->setPlainPassword($this->request->post('password'));
+
+        \Container::$dbConnection->startTransaction();
+
+        $modify = new Modify(\Container::$dbConnection, 'users');
+        $modify->fill($user->toArray());
+        $modify->save();
+        $userId = $modify->getId();
+
+        $token = hash('sha256', serialize($user) . random_bytes(10) . microtime());
+
+        $modify = new Modify(\Container::$dbConnection, 'user_confirmations');
+        $modify->set('user_id', $userId);
+        $modify->set('token', $token);
+        $modify->save();
+
+        \Container::$dbConnection->commit();
+
+        $this->sendConfirmationEmail($user->getEmail(), $token);
+
+        $data = ['success' => true];
+        return new JsonContent($data);
+    }
+
+    public function activate()
+    {
+        $session = $this->request->session();
+
+        if ($session->get('user')) {
+            return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
+        }
+
+        $select = new Select(\Container::$dbConnection, 'user_confirmations');
+        $select->columns(['id', 'user_id']);
+        $select->where('token', '=', $this->request->query('token'));
+
+        $confirmation = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+
+        if ($confirmation === null) {
+            $data = [];
+            return new HtmlContent('signup/activate', $data);
+        }
+
+        \Container::$dbConnection->startTransaction();
+
+        $modify = new Modify(\Container::$dbConnection, 'user_confirmations');
+        $modify->setId($confirmation['id']);
+        $modify->delete();
+
+        $modify = new Modify(\Container::$dbConnection, 'users');
+        $modify->setId($confirmation['user_id']);
+        $modify->set('active', true);
+        $modify->save();
+
+        \Container::$dbConnection->commit();
+
+        $select = new Select(\Container::$dbConnection, 'users');
+        $select->columns(User::getFields());
+        $select->whereId($confirmation['user_id']);
+
+        $userData = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+        $user = new User($userData);
+
+        $session->set('user', $user);
+
+        return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
+    }
+
+    public function cancel()
+    {
+        $session = $this->request->session();
+
+        if ($session->get('user')) {
+            return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
+        }
+
+        $select = new Select(\Container::$dbConnection, 'user_confirmations');
+        $select->columns(['id', 'user_id']);
+        $select->where('token', '=', $this->request->query('token'));
+
+        $confirmation = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+
+        if ($confirmation === null) {
+            $data = ['success' => false];
+            return new HtmlContent('signup/cancel', $data);
+        }
+
+        \Container::$dbConnection->startTransaction();
+
+        $modify = new Modify(\Container::$dbConnection, 'user_confirmations');
+        $modify->setId($confirmation['id']);
+        $modify->delete();
+
+        $modify = new Modify(\Container::$dbConnection, 'users');
+        $modify->setId($confirmation['user_id']);
+        $modify->delete();
+
+        \Container::$dbConnection->commit();
+
+        $data = ['success' => true];
+        return new HtmlContent('signup/cancel', $data);
+    }
+
+    private function sendConfirmationEmail($email, $token): void
+    {
+        $mail = new Mail();
+        $mail->addRecipient($email);
+        $mail->setSubject('Welcome to MapGuesser - Activate your account');
+        $mail->setBodyFromTemplate('signup', [
+            'EMAIL' => $email,
+            'ACTIVATE_LINK' => $this->request->getBase() . '/signup/activate/' . $token,
+            'CANCEL_LINK' => $this->request->getBase() . '/signup/cancel/' . $token,
+        ]);
+        $mail->send();
+    }
+}

src/Controller/UserController.php

@@ -1,37 +1,19 @@
 <?php namespace MapGuesser\Controller;
 
-use DateTime;
-use MapGuesser\Http\Request;
+use MapGuesser\Database\Query\Modify;
 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 MapGuesser\PersistentData\Model\User;
-use MapGuesser\Repository\UserConfirmationRepository;
-use MapGuesser\Repository\UserPasswordResetterRepository;
 use MapGuesser\Response\HtmlContent;
 use MapGuesser\Response\JsonContent;
-use MapGuesser\Response\Redirect;
-use MapGuesser\Util\JwtParser;
 
 class UserController implements ISecured
 {
     private IRequest $request;
 
-    private PersistentDataManager $pdm;
-
-    private UserConfirmationRepository $userConfirmationRepository;
-
-    private UserPasswordResetterRepository $userPasswordResetterRepository;
-
     public function __construct(IRequest $request)
     {
         $this->request = $request;
-        $this->pdm = new PersistentDataManager();
-        $this->userConfirmationRepository = new UserConfirmationRepository();
-        $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
     }
 
     public function authorize(): bool
@@ -41,191 +23,42 @@ class UserController implements ISecured
         return $user !== null;
     }
 
-    public function getAccount(): IContent
+    public function getProfile(): IContent
     {
-        /**
-         * @var User $user
-         */
         $user = $this->request->user();
 
-        return new HtmlContent('account/account', ['user' => $user->toArray()]);
+        $data = ['user' => $user->toArray()];
+        return new HtmlContent('profile', $data);
     }
 
-    public function getGoogleAuthenticateRedirect(): IRedirect
+    public function saveProfile(): IContent
     {
-        /**
-         * @var User $user
-         */
         $user = $this->request->user();
 
-        $state = bin2hex(random_bytes(16));
-        $nonce = bin2hex(random_bytes(16));
-
-        $this->request->session()->set('oauth_state', $state);
-        $this->request->session()->set('oauth_nonce', $nonce);
-
-        $oAuth = new GoogleOAuth(new Request());
-
-        $url = $oAuth->getDialogUrl(
-            $state,
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink(),
-            $nonce,
-            $user->getEmail()
-        );
-
-        return new Redirect($url, IRedirect::TEMPORARY);
-    }
-
-    public function authenticateWithGoogle(): IContent
-    {
-        /**
-         * @var User $user
-         */
-        $user = $this->request->user();
-
-        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
-            return new HtmlContent('account/google_authenticate', ['success' => false]);
-        }
-
-        $oAuth = new GoogleOAuth(new Request());
-        $tokenData = $oAuth->getToken(
-            $this->request->query('code'),
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
-        );
-
-        if (!isset($tokenData['id_token'])) {
-            return new HtmlContent('account/google_authenticate', ['success' => false]);
-        }
-
-        $jwtParser = new JwtParser($tokenData['id_token']);
-        $idToken = $jwtParser->getPayload();
-
-        if ($idToken['nonce'] !== $this->request->session()->get('oauth_nonce')) {
-            return new HtmlContent('account/google_authenticate', ['success' => false]);
-        }
-
-        if ($idToken['sub'] !== $user->getGoogleSub()) {
-            return new HtmlContent('account/google_authenticate', [
-                'success' => false,
-                'errorText' => 'This Google account is not linked to your account.'
-            ]);
-        }
-
-        $authenticatedWithGoogleUntil = new DateTime('+45 seconds');
-        $this->request->session()->set('authenticated_with_google_until', $authenticatedWithGoogleUntil);
-
-        return new HtmlContent('account/google_authenticate', [
-            'success' => true,
-            'authenticatedWithGoogleUntil' => $authenticatedWithGoogleUntil
-        ]);
-    }
-
-    public function getDeleteAccount(): IContent
-    {
-        /**
-         * @var User $user
-         */
-        $user = $this->request->user();
-
-        return new HtmlContent('account/delete', ['user' => $user->toArray()]);
-    }
-
-    public function saveAccount(): IContent
-    {
-        /**
-         * @var User $user
-         */
-        $user = $this->request->user();
-
-        if (!$this->confirmUserIdentity(
-            $user,
-            $this->request->session()->get('authenticated_with_google_until'),
-            $this->request->post('password'),
-            $error
-        )) {
-            return new JsonContent(['error' => ['errorText' => $error]]);
+        if (!$user->checkPassword($this->request->post('password'))) {
+            $data = ['error' => 'password_not_match'];
+            return new JsonContent($data);
         }
 
         if (strlen($this->request->post('password_new')) > 0) {
             if (strlen($this->request->post('password_new')) < 6) {
-                return new JsonContent([
-                    'error' => [
-                        'errorText' => 'The given new password is too short. Please choose a password that is at least 6 characters long!'
-                    ]
-                ]);
+                $data = ['error' => 'passwords_too_short'];
+                return new JsonContent($data);
             }
 
             if ($this->request->post('password_new') !== $this->request->post('password_new_confirm')) {
-                return new JsonContent([
-                    'error' => [
-                        'errorText' => 'The given new passwords do not match.'
-                    ]
-                ]);
+                $data = ['error' => 'passwords_not_match'];
+                return new JsonContent($data);
             }
 
             $user->setPlainPassword($this->request->post('password_new'));
         }
 
-        $this->pdm->saveToDb($user);
+        $modify = new Modify(\Container::$dbConnection, 'users');
+        $modify->fill($user->toArray());
+        $modify->save();
 
-        $this->request->session()->delete('authenticated_with_google_until');
-
-        return new JsonContent(['success' => true]);
-    }
-
-    public function deleteAccount(): IContent
-    {
-        /**
-         * @var User $user
-         */
-        $user = $this->request->user();
-
-        if (!$this->confirmUserIdentity(
-            $user,
-            $this->request->session()->get('authenticated_with_google_until'),
-            $this->request->post('password'),
-            $error
-        )) {
-            return new JsonContent(['error' => ['errorText' => $error]]);
-        }
-
-        \Container::$dbConnection->startTransaction();
-
-        $userConfirmation = $this->userConfirmationRepository->getByUser($user);
-        if ($userConfirmation !== null) {
-            $this->pdm->deleteFromDb($userConfirmation);
-        }
-
-        $userPasswordResetter = $this->userPasswordResetterRepository->getByUser($user);
-        if ($userPasswordResetter !== null) {
-            $this->pdm->deleteFromDb($userPasswordResetter);
-        }
-
-        $this->pdm->deleteFromDb($user);
-
-        \Container::$dbConnection->commit();
-
-        $this->request->session()->delete('authenticated_with_google_until');
-
-        return new JsonContent(['success' => true]);
-    }
-
-    private function confirmUserIdentity(User $user, ?DateTime $authenticatedWithGoogleUntil, ?string $password, string &$error): bool
-    {
-        if ($authenticatedWithGoogleUntil !== null && $authenticatedWithGoogleUntil > new DateTime()) {
-            return true;
-        }
-
-        if ($password !== null) {
-            if ($user->checkPassword($password)) {
-                return true;
-            }
-
-            $error = 'The given current password is wrong.';
-            return false;
-        }
-
-        $error = 'Could not confirm your identity. Please try again!';
-        return false;
+        $data = ['success' => true];
+        return new JsonContent($data);
     }
 }

src/Database/Mysql/Connection.php

@@ -12,11 +12,11 @@ class Connection implements IConnection
     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');
+            $port = ini_get('mysqli.default_port');
         }
 
         if ($socket === null) {
-            $socket = (string) ini_get('mysqli.default_socket');
+            $socket = ini_get('mysqli.default_socket');
         }
 
         $this->connection = new mysqli($host, $user, $password, $db, $port, $socket);

src/Database/Query/Modify.php

@@ -1,6 +1,7 @@
 <?php namespace MapGuesser\Database\Query;
 
 use MapGuesser\Interfaces\Database\IConnection;
+use MapGuesser\Interfaces\Database\IResultSet;
 use MapGuesser\Database\Utils;
 
 class Modify
@@ -13,6 +14,8 @@ class Modify
 
     private array $attributes = [];
 
+    private array $original = [];
+
     private ?string $externalId = null;
 
     private bool $autoIncrement = true;
@@ -113,15 +116,48 @@ class Modify
 
     private function update(): void
     {
-        $attributes = $this->attributes;
-        unset($attributes[$this->idName]);
+        /*$diff = $this->generateDiff();
 
-        $set = $this->generateColumnsWithBinding(array_keys($attributes));
+        if (count($diff) === 0) {
+            return;
+        }*/
+
+        $diff = $this->attributes;
+        unset($diff[$this->idName]);
+
+        $set = $this->generateColumnsWithBinding(array_keys($diff));
 
         $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]]));
+        $stmt->execute(array_merge($diff, [$this->idName => $this->attributes[$this->idName]]));
+    }
+
+    private function readFromDB(array $columns): void
+    {
+        $select = (new Select($this->connection, $this->table))
+            ->setIdName($this->idName)
+            ->whereId($this->attributes[$this->idName])
+            ->columns($columns);
+
+        $this->original = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+    }
+
+    private function generateDiff(): array
+    {
+        $this->readFromDB(array_keys($this->attributes));
+
+        $diff = [];
+
+        foreach ($this->attributes as $name => $value) {
+            $original = $this->original[$name];
+
+            if ($original != $value) {
+                $diff[$name] = $value;
+            }
+        }
+
+        return $diff;
     }
 
     public static function generateColumnsWithBinding(array $columns): string
@@ -135,6 +171,6 @@ class Modify
 
     private function generateKey(): string
     {
-        return substr(hash('sha256', serialize($this->attributes) . random_bytes(5) . microtime()), 0, 7);
+        return substr(hash('sha256', serialize($this->attributes) . random_bytes(10) . microtime()), 0, 7);
     }
 }

src/Database/Query/Select.php

@@ -30,16 +30,13 @@ class Select
 
     private array $orders = [];
 
-    private ?array $limit;
+    private array $limit;
 
-    public function __construct(IConnection $connection, ?string $table = null)
+    public function __construct(IConnection $connection, string $table)
     {
         $this->connection = $connection;
-
-        if ($table !== null) {
         $this->table = $table;
     }
-    }
 
     public function setIdName(string $idName): Select
     {
@@ -55,13 +52,6 @@ class Select
         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);
@@ -144,7 +134,7 @@ class Select
         $this->limit = null;
     }
 
-    public function paginate(int $page, int $itemsPerPage): Select
+    public function paginate(int $page, int $itemsPerPage)
     {
         $this->limit($itemsPerPage, ($page - 1) * $itemsPerPage);
 
@@ -308,7 +298,7 @@ class Select
         return implode(' ', $joins);
     }
 
-    private function generateConditions(int $type): array
+    private function generateConditions(string $type): array
     {
         $conditions = '';
         $params = [];
@@ -376,9 +366,9 @@ class Select
         return [$conditionsString, $params];
     }
 
-    private function generateComplexConditionFragment(int $type, Closure $conditionCallback): array
+    private function generateComplexConditionFragment(string $type, Closure $conditionCallback): array
     {
-        $instance = new self($this->connection, $this->table);
+        $instance = new static($this->connection, $this->table);
         $instance->tableAliases = $this->tableAliases;
 
         $conditionCallback($instance);

src/Database/Utils.php

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

src/Http/Request.php

@@ -1,10 +1,11 @@
 <?php namespace MapGuesser\Http;
 
-use MapGuesser\Interfaces\Http\IRequest;
-use MapGuesser\Interfaces\Http\IResponse;
-
-class Request implements IRequest
+class Request
 {
+    const HTTP_GET = 0;
+
+    const HTTP_POST = 1;
+
     private string $url;
 
     private int $method;
@@ -13,23 +14,13 @@ class Request implements IRequest
 
     private array $headers = [];
 
-    public function __construct(string $url = '', int $method = self::HTTP_GET)
+    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
+    public function setQuery($query)
     {
         if (is_string($query)) {
             $this->query = $query;
@@ -38,22 +29,22 @@ class Request implements IRequest
         }
     }
 
-    public function setHeaders(array $headers): void
+    public function setHeaders(array $headers)
     {
         $this->headers = array_merge($this->headers, $headers);
     }
 
-    public function send(): IResponse
+    public function send(): Response
     {
         $ch = curl_init();
 
-        if ($this->method === self::HTTP_POST) {
+        if ($this->method === self::HTTP_GET) {
+            $url = $this->url . '?' . $this->query;
+        } elseif ($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);

src/Http/Response.php

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

src/Interfaces/Authentication/IUser.php

@@ -8,9 +8,5 @@ interface IUser
 
     public function hasPermission(int $permission): bool;
 
-    public function getUniqueId();
-
     public function getDisplayName(): string;
-
-    public function checkPassword(string $password): bool;
 }

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

@@ -4,7 +4,7 @@ use MapGuesser\Interfaces\Authentication\IUser;
 
 interface IRequest
 {
-    public function setParsedRouteParams(array &$routeParams): void;
+    public function setParsedRouteParams(array &$routeParams);
 
     public function getBase(): string;
 
@@ -14,7 +14,5 @@ interface IRequest
 
     public function session(): ISession;
 
-    public function setUser(?IUser $user): void;
-
     public function user(): ?IUser;
 }

src/Interfaces/Response/IContent.php

@@ -2,11 +2,9 @@
 
 interface IContent
 {
-    public function setData(array $data): void;
+    public function &getData(): array;
 
-    public function getData(): array;
-
-    public function render(): void;
+    public function &render(): string;
 
     public function getContentType(): string;
 }

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

@@ -29,13 +29,6 @@ class Mail
     {
         $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);
         }
@@ -65,8 +58,8 @@ class Mail
             $mailer->Mailer = 'mail';
         }
 
-        $mailer->setFrom($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
-        $mailer->addReplyTo($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
+        $mailer->setFrom($_ENV['MAIL_FROM'], 'MapGuesser');
+        $mailer->addReplyTo($_ENV['MAIL_FROM'], 'MapGuesser');
 
         $mailer->Sender = !empty($_ENV['MAIL_BOUNCE']) ? $_ENV['MAIL_BOUNCE'] : $_ENV['MAIL_FROM'];
         $mailer->Subject = $this->subject;
@@ -77,7 +70,7 @@ class Mail
         }
     }
 
-    private function sendMail(PHPMailer $mailer, array $recipient): void
+    private function sendMail(PHPMailer $mailer, array $recipient)
     {
         $mailer->clearAddresses();
         $mailer->addAddress($recipient[0], $recipient[1]);

src/Model/BaseModel.php

@@ -0,0 +1,49 @@
+<?php namespace MapGuesser\Model;
+
+abstract class BaseModel
+{
+    protected static array $fields;
+
+    protected $id = null;
+
+    public static function getFields(): array
+    {
+        return array_merge(['id'], static::$fields);
+    }
+
+    public function __construct(array $data)
+    {
+        foreach ($data as $key => $value) {
+            $method = 'set' . str_replace('_', '', ucwords($key, '_'));
+
+            if (method_exists($this, $method)) {
+                $this->$method($value);
+            }
+        }
+    }
+
+    public function setId($id): void
+    {
+        $this->id = $id;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    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;
+    }
+}

src/Model/User.php

@@ -1,34 +1,27 @@
-<?php namespace MapGuesser\PersistentData\Model;
+<?php namespace MapGuesser\Model;
 
-use DateTime;
 use MapGuesser\Interfaces\Authentication\IUser;
 
-class User extends Model implements IUser
+class User extends BaseModel implements IUser
 {
-    protected static string $table = 'users';
-
-    protected static array $fields = ['email', 'password', 'type', 'active', 'google_sub', 'created'];
-
     private static array $types = ['user', 'admin'];
 
-    private string $email = '';
+    protected static array $fields = ['email', 'password', 'type', 'active'];
 
-    private ?string $password = null;
+    private string $email;
+
+    private string $password;
 
     private string $type = 'user';
 
     private bool $active = false;
 
-    private ?string $googleSub = null;
-
-    private DateTime $created;
-
     public function setEmail(string $email): void
     {
         $this->email = $email;
     }
 
-    public function setPassword(?string $hashedPassword): void
+    public function setPassword(string $hashedPassword): void
     {
         $this->password = $hashedPassword;
     }
@@ -45,24 +38,9 @@ class User extends Model implements IUser
         }
     }
 
-    public function setActive(bool $active): void
+    public function setActive($active): void
     {
-        $this->active = $active;
-    }
-
-    public function setGoogleSub(?string $googleSub): void
-    {
-        $this->googleSub = $googleSub;
-    }
-
-    public function setCreatedDate(DateTime $created): void
-    {
-        $this->created = $created;
-    }
-
-    public function setCreated(string $created): void
-    {
-        $this->created = new DateTime($created);
+        $this->active = (bool) $active;
     }
 
     public function getEmail(): string
@@ -70,7 +48,7 @@ class User extends Model implements IUser
         return $this->email;
     }
 
-    public function getPassword(): ?string
+    public function getPassword(): string
     {
         return $this->password;
     }
@@ -85,38 +63,18 @@ class User extends Model implements IUser
         return $this->active;
     }
 
-    public function getGoogleSub(): ?string
-    {
-        return $this->googleSub;
-    }
-
-    public function getCreatedDate(): DateTime
-    {
-        return $this->created;
-    }
-
-    public function getCreated(): string
-    {
-        return $this->created->format('Y-m-d H:i:s');
-    }
-
     public function hasPermission(int $permission): bool
     {
         switch ($permission) {
             case IUser::PERMISSION_NORMAL:
                 return true;
+                break;
             case IUser::PERMISSION_ADMIN:
                 return $this->type === 'admin';
-            default:
-                throw new \Exception('Permission does not exist: ' . $permission);
+                break;
         }
     }
 
-    public function getUniqueId()
-    {
-        return $this->id;
-    }
-
     public function getDisplayName(): string
     {
         return $this->email;
@@ -124,10 +82,6 @@ class User extends Model implements IUser
 
     public function checkPassword(string $password): bool
     {
-        if ($this->password === null) {
-            return false;
-        }
-
         return password_verify($password, $this->password);
     }
 }

src/Multi/MultiConnector.php

@@ -1,24 +0,0 @@
-<?php namespace MapGuesser\Multi;
-
-class MultiConnector
-{
-    public function sendMessage(string $func, array $args = []): void
-    {
-        $message = json_encode([
-            'func' => $func,
-            'args' => $args
-        ]);
-
-        $connection = fsockopen($_ENV['MULTI_INTERNAL_HOST'], $_ENV['MULTI_INTERNAL_PORT']);
-        fwrite($connection, $message);
-        $response = '';
-        while (!feof($connection)) {
-            $response .= fgets($connection);
-        }
-        fclose($connection);
-
-        if ($response !== 'OK') {
-            throw new \Exception('Sending message failed with response: ' . $response);
-        }
-    }
-}

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/Map.php

@@ -1,103 +0,0 @@
-<?php namespace MapGuesser\PersistentData\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'];
-
-    private string $name = '';
-
-    private string $description = '';
-
-    private Bounds $bounds;
-
-    private float $area = 0.0;
-
-    public function __construct()
-    {
-        $this->bounds = Bounds::createDirectly(-90.0, -180.0, 90.0, 180.0);
-    }
-
-    public function setName(string $name): void
-    {
-        $this->name = $name;
-    }
-
-    public function setDescription(string $description): void
-    {
-        $this->description = $description;
-    }
-
-    public function setBounds(Bounds $bounds): void
-    {
-        $this->bounds = $bounds;
-    }
-
-    public function setBoundSouthLat(float $bound_south_lat): void
-    {
-        $this->bounds->setSouthLat($bound_south_lat);
-    }
-
-    public function setBoundWestLng(float $bound_west_lng): void
-    {
-        $this->bounds->setWestLng($bound_west_lng);
-    }
-
-    public function setBoundNorthLat(float $bound_north_lat): void
-    {
-        $this->bounds->setNorthLat($bound_north_lat);
-    }
-
-    public function setBoundEastLng(float $bound_east_lng): void
-    {
-        $this->bounds->setEastLng($bound_east_lng);
-    }
-
-    public function setArea(float $area): void
-    {
-        $this->area = $area;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    public function getBounds(): Bounds
-    {
-        return $this->bounds;
-    }
-
-    public function getBoundSouthLat(): float
-    {
-        return $this->bounds->getSouthLat();
-    }
-
-    public function getBoundWestLng(): float
-    {
-        return $this->bounds->getWestLng();
-    }
-
-    public function getBoundNorthLat(): float
-    {
-        return $this->bounds->getNorthLat();
-    }
-
-    public function getBoundEastLng(): float
-    {
-        return $this->bounds->getEastLng();
-    }
-
-    public function getArea(): float
-    {
-        return $this->area;
-    }
-}

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,88 +0,0 @@
-<?php namespace MapGuesser\PersistentData\Model;
-
-use DateTime;
-
-class MultiRoom extends Model
-{
-    protected static string $table = 'multi_rooms';
-
-    protected static array $fields = ['room_id', 'state', 'members', 'updated'];
-
-    private string $roomId = '';
-
-    private array $state = [];
-
-    private array $members = [];
-
-    private DateTime $updated;
-
-    public function setRoomId(string $roomId): void
-    {
-        $this->roomId = $roomId;
-    }
-
-    public function setStateArray(array $state): void
-    {
-        $this->state = $state;
-    }
-
-    public function setMembersArray(array $members): void
-    {
-        $this->members = $members;
-    }
-
-    public function setState(string $state): void
-    {
-        $this->state = unserialize($state);
-    }
-
-    public function setMembers(string $members): void
-    {
-        $this->members = unserialize($members);
-    }
-
-    public function setUpdatedDate(DateTime $updated): void
-    {
-        $this->updated = $updated;
-    }
-
-    public function setUpdated(string $updated): void
-    {
-        $this->updated = new DateTime($updated);
-    }
-
-    public function getRoomId(): string
-    {
-        return $this->roomId;
-    }
-
-    public function getStateArray(): array
-    {
-        return $this->state;
-    }
-
-    public function getState(): string
-    {
-        return serialize($this->state);
-    }
-
-    public function getMembersArray(): array
-    {
-        return $this->members;
-    }
-
-    public function getMembers(): string
-    {
-        return serialize($this->members);
-    }
-
-    public function getUpdatedDate(): DateTime
-    {
-        return $this->updated;
-    }
-
-    public function getUpdated(): string
-    {
-        return $this->updated->format('Y-m-d H:i:s');
-    }
-}

src/PersistentData/Model/Place.php

@@ -1,194 +0,0 @@
-<?php namespace MapGuesser\PersistentData\Model;
-
-use DateInterval;
-use DateTime;
-use MapGuesser\Http\Request;
-use MapGuesser\PersistentData\PersistentDataManager;
-use MapGuesser\Util\Geo\Position;
-use MapGuesser\Util\Panorama\Pov;
-
-class Place extends Model
-{
-    protected static string $table = 'places';
-
-    protected static array $fields = ['map_id', 'lat', 'lng', 'pano_id_cached', 'pano_id_cached_timestamp', 'pov_heading', 'pov_pitch', 'pov_zoom'];
-
-    protected static array $relations = ['map' => Map::class];
-
-    private ?Map $map = null;
-
-    private ?int $mapId = null;
-
-    private Position $position;
-
-    private ?string $panoIdCached = null;
-
-    private ?DateTime $panoIdCachedTimestamp = null;
-
-    private Pov $pov;
-
-    public function __construct()
-    {
-        $this->position = new Position(0.0, 0.0);
-        $this->pov = new Pov(0.0, 0.0, 0.0);
-    }
-
-    public function setMap(Map $map): void
-    {
-        $this->map = $map;
-    }
-
-    public function setMapId(int $mapId): void
-    {
-        $this->mapId = $mapId;
-    }
-
-    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 setPov(Pov $pov): void
-    {
-        $this->pov = $pov;
-    }
-
-    public function setPovHeading(float $heading): void
-    {
-        $this->pov->setHeading($heading);
-    }
-
-    public function setPovPitch(float $pitch): void
-    {
-        $this->pov->setPitch($pitch);
-    }
-
-    public function setPovZoom(float $zoom): void
-    {
-        $this->pov->setZoom($zoom);
-    }
-
-    public function setPanoIdCached(?string $panoIdCached): void
-    {
-        $this->panoIdCached = $panoIdCached;
-    }
-
-    public function setPanoIdCachedTimestampDate(?DateTime $panoIdCachedTimestamp): void
-    {
-        $this->panoIdCachedTimestamp = $panoIdCachedTimestamp;
-    }
-
-    public function setPanoIdCachedTimestamp(?string $panoIdCachedTimestamp): void
-    {
-        if ($panoIdCachedTimestamp !== null) {
-            $this->panoIdCachedTimestamp = new DateTime($panoIdCachedTimestamp);
-        }
-    }
-
-    public function getMap(): ?Map
-    {
-        return $this->map;
-    }
-
-    public function getMapId(): ?int
-    {
-        return $this->mapId;
-    }
-
-    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 getPov(): Pov
-    {
-        return $this->pov;
-    }
-
-    public function getPovHeading(): float
-    {
-        return $this->pov->getHeading();
-    }
-
-    public function getPovPitch(): float
-    {
-        return $this->pov->getPitch();
-    }
-
-    public function getPovZoom(): float
-    {
-        return $this->pov->getZoom();
-    }
-
-    public function getFreshPanoId(bool $canBeIndoor = false): ?string
-    {
-        if (
-            $this->panoIdCachedTimestamp !== null &&
-            (clone $this->panoIdCachedTimestamp)->add(new DateInterval('P1D')) > new DateTime()
-        ) {
-            return $this->panoIdCached;
-        }
-
-        $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'
-        ]);
-
-        $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();
-
-        (new PersistentDataManager())->saveToDb($this);
-
-        return $panoId;
-    }
-
-    public function getPanoIdCached(): ?string
-    {
-        return $this->panoIdCached;
-    }
-
-    public function getPanoIdCachedTimestampDate(): ?DateTime
-    {
-        return $this->panoIdCachedTimestamp;
-    }
-
-    public function getPanoIdCachedTimestamp(): ?string
-    {
-        if ($this->panoIdCachedTimestamp === null) {
-            return null;
-        }
-
-        return $this->panoIdCachedTimestamp->format('Y-m-d H:i:s');
-    }
-}

src/PersistentData/Model/UserConfirmation.php

@@ -1,70 +0,0 @@
-<?php namespace MapGuesser\PersistentData\Model;
-
-use DateTime;
-
-class UserConfirmation extends Model
-{
-    protected static string $table = 'user_confirmations';
-
-    protected static array $fields = ['user_id', 'token', 'last_sent'];
-
-    protected static array $relations = ['user' => User::class];
-
-    private ?User $user = null;
-
-    private ?int $userId = null;
-
-    private string $token = '';
-
-    private DateTime $lastSent;
-
-    public function setUser(User $user): void
-    {
-        $this->user = $user;
-    }
-
-    public function setUserId(int $userId): void
-    {
-        $this->userId = $userId;
-    }
-
-    public function setToken(string $token): void
-    {
-        $this->token = $token;
-    }
-
-    public function setLastSentDate(DateTime $lastSent): void
-    {
-        $this->lastSent = $lastSent;
-    }
-
-    public function setLastSent(string $lastSent): void
-    {
-        $this->lastSent = new DateTime($lastSent);
-    }
-
-    public function getUser(): ?User
-    {
-        return $this->user;
-    }
-
-    public function getUserId(): ?int
-    {
-        return $this->userId;
-    }
-
-    public function getToken(): string
-    {
-        return $this->token;
-    }
-
-    public function getLastSentDate(): DateTime
-    {
-        return $this->lastSent;
-    }
-
-    public function getLastSent(): string
-    {
-        return $this->lastSent->format('Y-m-d H:i:s');
-    }
-}

src/PersistentData/Model/UserPasswordResetter.php

@@ -1,70 +0,0 @@
-<?php namespace MapGuesser\PersistentData\Model;
-
-use DateTime;
-
-class UserPasswordResetter extends Model
-{
-    protected static string $table = 'user_password_resetters';
-
-    protected static array $fields = ['user_id', 'token', 'expires'];
-
-    protected static array $relations = ['user' => User::class];
-
-    private ?User $user = null;
-
-    private ?int $userId = null;
-
-    private string $token = '';
-
-    private DateTime $expires;
-
-    public function setUser(User $user): void
-    {
-        $this->user = $user;
-    }
-
-    public function setUserId(int $userId): void
-    {
-        $this->userId = $userId;
-    }
-
-    public function setToken(string $token): void
-    {
-        $this->token = $token;
-    }
-
-    public function setExpiresDate(DateTime $expires): void
-    {
-        $this->expires = $expires;
-    }
-
-    public function setExpires(string $expires): void
-    {
-        $this->expires = new DateTime($expires);
-    }
-
-    public function getUser(): ?User
-    {
-        return $this->user;
-    }
-
-    public function getUserId(): ?int
-    {
-        return $this->userId;
-    }
-
-    public function getToken(): string
-    {
-        return $this->token;
-    }
-
-    public function getExpiresDate(): DateTime
-    {
-        return $this->expires;
-    }
-
-    public function getExpires(): string
-    {
-        return $this->expires->format('Y-m-d H:i:s');
-    }
-}

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/MapRepository.php

@@ -1,19 +1,16 @@
 <?php namespace MapGuesser\Repository;
 
-use MapGuesser\PersistentData\Model\Map;
-use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Interfaces\Database\IResultSet;
 
 class MapRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
+    public function getById(int $mapId)
     {
-        $this->pdm = new PersistentDataManager();
-    }
+        $select = new Select(\Container::$dbConnection, 'maps');
+        $select->columns(['id', 'name', 'description', 'bound_south_lat', 'bound_west_lng', 'bound_north_lat', 'bound_east_lng', 'area']);
+        $select->whereId($mapId);
 
-    public function getById(int $mapId): ?Map
-    {
-        return $this->pdm->selectFromDbById($mapId, Map::class);
+        return $select->execute()->fetch(IResultSet::FETCH_ASSOC);
     }
 }

src/Repository/MultiRoomRepository.php

@@ -1,38 +0,0 @@
-<?php namespace MapGuesser\Repository;
-
-use DateTime;
-use Generator;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\PersistentData\Model\MultiRoom;
-use MapGuesser\PersistentData\PersistentDataManager;
-
-class MultiRoomRepository
-{
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
-    public function getById(int $id): ?MultiRoom
-    {
-        return $this->pdm->selectFromDbById($id, MultiRoom::class);
-    }
-
-    public function getByRoomId(string $roomId): ?MultiRoom
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('room_id', '=', $roomId);
-
-        return $this->pdm->selectFromDb($select, MultiRoom::class);
-    }
-
-    public function getAllExpired(): Generator
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('updated', '<', (new DateTime('-7 day'))->format('Y-m-d H:i:s'));
-
-        yield from $this->pdm->selectMultipleFromDb($select, MultiRoom::class);
-    }
-}

src/Repository/PlaceRepository.php

@@ -1,82 +1,147 @@
 <?php namespace MapGuesser\Repository;
 
-use Generator;
+use MapGuesser\Util\Geo\Position;
 use MapGuesser\Database\Query\Select;
-use MapGuesser\PersistentData\Model\Map;
-use MapGuesser\PersistentData\Model\Place;
-use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Database\Query\Modify;
+use MapGuesser\Http\Request;
+use MapGuesser\Interfaces\Database\IResultSet;
+use DateTime;
+use DateInterval;
 
 class PlaceRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
+    public function getById(int $placeId)
     {
-        $this->pdm = new PersistentDataManager();
+        $place = $this->selectFromDbById($placeId);
+
+        $panoId = $this->requestPanoId($place);
+
+        $position = new Position($place['lat'], $place['lng']);
+
+        return [
+            'position' => $position,
+            'panoId' => $panoId
+        ];
     }
 
-    public function getById(int $placeId): ?Place
+    public function getForMapWithValidPano(int $mapId, array $exclude = []): array
     {
-        return $this->pdm->selectFromDbById($placeId, Place::class);
-    }
+        $placesWithoutPano = [];
 
-    public function getAllForMap(Map $map): Generator
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('map_id', '=', $map->getId());
-
-        yield from $this->pdm->selectMultipleFromDb($select, Place::class);
-    }
-
-    //TODO: use Map instead of id
-    public function getRandomNForMapWithValidPano(int $mapId, int $n, array $exclude = []): array
-    {
-        $places = [];
-
-        for ($i = 1; $i <= $n; ++$i) {
-            $place = $this->getRandomForMapWithValidPano($mapId, $exclude);
-
-            $places[] = $place;
-            $exclude[] = $place->getId();
-        }
-
-        return $places;
-    }
-
-    //TODO: use Map instead of id
-    public function getRandomForMapWithValidPano(int $mapId, array $exclude = []): Place
-    {
         do {
-            $place = $this->selectRandomFromDbForMap($mapId, $exclude);
+            $place = $this->selectFromDbForMap($mapId, $exclude);
+
+            $panoId = $this->requestPanoId($place);
 
-            $panoId = $place->getFreshPanoId();
             if ($panoId === null) {
-                $exclude[] = $place->getId();
+                $placesWithoutPano[] = $exclude[] = $place['id'];
             }
         } while ($panoId === null);
 
+        $position = new Position($place['lat'], $place['lng']);
+
+        return [
+            'placesWithoutPano' => $placesWithoutPano,
+            'placeId' => $place['id'],
+            'position' => $position,
+            'panoId' => $panoId
+        ];
+    }
+
+    public function addToMap(int $mapId, array $place): int
+    {
+        $modify = new Modify(\Container::$dbConnection, 'places');
+        $modify->set('map_id', $mapId);
+        $modify->fill($place);
+        $modify->save();
+
+        return $modify->getId();
+    }
+
+    public function modify(int $id, array $place): void
+    {
+        $modify = new Modify(\Container::$dbConnection, 'places');
+        $modify->setId($id);
+        $modify->set('pano_id_cached', null);
+        $modify->set('pano_id_cached_timestamp', null);
+        $modify->fill($place);
+        $modify->save();
+    }
+
+    public function delete(int $id): void
+    {
+        $modify = new Modify(\Container::$dbConnection, 'places');
+        $modify->setId($id);
+        $modify->delete();
+    }
+
+    private function selectFromDbById(int $placeId): array
+    {
+        $select = new Select(\Container::$dbConnection, 'places');
+        $select->columns(['id', 'lat', 'lng', 'pano_id_cached', 'pano_id_cached_timestamp']);
+        $select->whereId($placeId);
+
+        $place = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+
         return $place;
     }
 
-    private function selectRandomFromDbForMap(int $mapId, array $exclude): Place
+    private function selectFromDbForMap(int $mapId, array $exclude): array
     {
-        //TODO: omit table name here
         $select = new Select(\Container::$dbConnection, 'places');
+        $select->columns(['id', 'lat', 'lng', 'pano_id_cached', 'pano_id_cached_timestamp']);
         $select->where('id', 'NOT IN', $exclude);
         $select->where('map_id', '=', $mapId);
 
-        $numberOfPlaces = $select->count();
-
-        //TODO: prevent this
-        if ($numberOfPlaces === 0) {
-            throw new \Exception('There is no selectable place (count was 0).');
-        }
-
+        $numberOfPlaces = $select->count(); // TODO: what if 0
         $randomOffset = random_int(0, $numberOfPlaces - 1);
 
         $select->orderBy('id');
         $select->limit(1, $randomOffset);
 
-        return $this->pdm->selectFromDb($select, Place::class);
+        $place = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+
+        return $place;
+    }
+
+    private function requestPanoId(array $place, bool $canBeIndoor = false): ?string
+    {
+        if (
+            $place['pano_id_cached_timestamp'] &&
+            (new DateTime($place['pano_id_cached_timestamp']))->add(new DateInterval('P1D')) > new DateTime()
+        ) {
+            return $place['pano_id_cached'];
+        }
+
+        $request = new Request('https://maps.googleapis.com/maps/api/streetview/metadata', Request::HTTP_GET);
+        $request->setQuery([
+            'key' => $_ENV['GOOGLE_MAPS_SERVER_API_KEY'],
+            'location' => $place['lat'] . ',' . $place['lng'],
+            'source' => $canBeIndoor ? 'default' : 'outdoor'
+        ]);
+
+        $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->requestPanoId($place, true);
+        }
+
+        $this->saveCachedPanoId($place['id'], $panoId);
+
+        return $panoId;
+    }
+
+    private function saveCachedPanoId(int $placeId, ?string $panoId): void
+    {
+        $modify = new Modify(\Container::$dbConnection, 'places');
+        $modify->setId($placeId);
+        $modify->set('pano_id_cached', $panoId);
+        $modify->set('pano_id_cached_timestamp', (new DateTime())->format('Y-m-d H:i:s'));
+        $modify->save();
     }
 }

src/Repository/UserConfirmationRepository.php

@@ -1,37 +0,0 @@
-<?php namespace MapGuesser\Repository;
-
-use MapGuesser\Database\Query\Select;
-use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\Model\UserConfirmation;
-use MapGuesser\PersistentData\PersistentDataManager;
-
-class UserConfirmationRepository
-{
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
-    public function getById(int $userConfirmationId): ?UserConfirmation
-    {
-        return $this->pdm->selectFromDbById($userConfirmationId, UserConfirmation::class);
-    }
-
-    public function getByToken(string $token): ?UserConfirmation
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('token', '=', $token);
-
-        return $this->pdm->selectFromDb($select, UserConfirmation::class);
-    }
-
-    public function getByUser(User $user): ?UserConfirmation
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('user_id', '=', $user->getId());
-
-        return $this->pdm->selectFromDb($select, UserConfirmation::class);
-    }
-}

src/Repository/UserPasswordResetterRepository.php

@@ -1,47 +0,0 @@
-<?php namespace MapGuesser\Repository;
-
-use DateTime;
-use Generator;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\Model\UserPasswordResetter;
-use MapGuesser\PersistentData\PersistentDataManager;
-
-class UserPasswordResetterRepository
-{
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
-    public function getById(int $userConfirmationId): ?UserPasswordResetter
-    {
-        return $this->pdm->selectFromDbById($userConfirmationId, UserPasswordResetter::class);
-    }
-
-    public function getByToken(string $token): ?UserPasswordResetter
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('token', '=', $token);
-
-        return $this->pdm->selectFromDb($select, UserPasswordResetter::class);
-    }
-
-    public function getByUser(User $user): ?UserPasswordResetter
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('user_id', '=', $user->getId());
-
-        return $this->pdm->selectFromDb($select, UserPasswordResetter::class);
-    }
-
-    public function getAllExpired(): Generator
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('expires', '<', (new DateTime())->format('Y-m-d H:i:s'));
-
-        yield from $this->pdm->selectMultipleFromDb($select, UserPasswordResetter::class);
-    }
-}

src/Repository/UserRepository.php

@@ -1,47 +0,0 @@
-<?php namespace MapGuesser\Repository;
-
-use DateTime;
-use Generator;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\PersistentDataManager;
-
-class UserRepository
-{
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
-    public function getById(int $userId): ?User
-    {
-        return $this->pdm->selectFromDbById($userId, User::class);
-    }
-
-    public function getByEmail(string $email): ?User
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('email', '=', $email);
-
-        return $this->pdm->selectFromDb($select, User::class);
-    }
-
-    public function getByGoogleSub(string $sub): ?User
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('google_sub', '=', $sub);
-
-        return $this->pdm->selectFromDb($select, User::class);
-    }
-
-    public function getAllInactiveExpired(): Generator
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->where('active', '=', false);
-        $select->where('created', '<', (new DateTime('-1 day'))->format('Y-m-d H:i:s'));
-
-        yield from $this->pdm->selectMultipleFromDb($select, User::class);
-    }
-}

src/Request/Request.php

@@ -3,9 +3,6 @@
 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
 {
@@ -19,27 +16,15 @@ class Request implements IRequest
 
     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
+    public function setParsedRouteParams(array &$routeParams)
     {
         $this->routeParams = &$routeParams;
     }
@@ -76,18 +61,8 @@ class Request implements IRequest
         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;
+        return $this->session->get('user');
     }
 }

src/Request/Session.php

@@ -11,12 +11,12 @@ class Session implements ISession
         $this->data = &$data;
     }
 
-    public function has(string $key): bool
+    public function has($key): bool
     {
         return isset($this->data[$key]);
     }
 
-    public function get(string $key)
+    public function get($key)
     {
         if (isset($this->data[$key])) {
             return $this->data[$key];
@@ -25,12 +25,12 @@ class Session implements ISession
         return null;
     }
 
-    public function set(string $key, $value): void
+    public function set($key, $value): void
     {
         $this->data[$key] = $value;
     }
 
-    public function delete(string $key): void
+    public function delete($key): void
     {
         unset($this->data[$key]);
     }

src/Response/ContentBase.php

@@ -6,17 +6,12 @@ abstract class ContentBase implements IContent
 {
     protected array $data;
 
-    public function setData(array $data): void
-    {
-        $this->data = $data;
-    }
-
-    public function getData(): array
+    public function &getData(): array
     {
         return $this->data;
     }
 
-    abstract public function render(): void;
+    abstract public function &render(): string;
 
     abstract public function getContentType(): string;
 }

src/Response/HtmlContent.php

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

src/Response/JsonContent.php

@@ -2,17 +2,16 @@
 
 class JsonContent extends ContentBase
 {
-    public function __construct(array $data = [])
+    public function __construct(array &$data = [])
     {
-        $this->data = $data;
+        $this->data = &$data;
     }
 
-    public function render(): void
+    public function &render(): string
     {
-        // @phpstan-ignore-next-line - SCRIPT_STARTED is defined in main.php
-        $this->data['__debug__runtime'] = round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1);
+        $content = json_encode($this->data);
 
-        echo json_encode($this->data);
+        return $content;
     }
 
     public function getContentType(): string

src/Response/Redirect.php

@@ -4,11 +4,11 @@ use MapGuesser\Interfaces\Response\IRedirect;
 
 class Redirect implements IRedirect
 {
-    private string $target;
+    private $target;
 
     private int $type;
 
-    public function __construct(string $target, int $type = IRedirect::TEMPORARY)
+    public function __construct($target, int $type = IRedirect::TEMPORARY)
     {
         $this->target = $target;
         $this->type = $type;
@@ -16,10 +16,10 @@ class Redirect implements IRedirect
 
     public function getUrl(): string
     {
-        if (preg_match('/^http(s)?/', $this->target) === 1) {
-            $link = $this->target;
+        if (is_array($this->target)) {
+            $link = $this->target[0]->generateLink($this->target[1]);
         } else {
-            $link = \Container::$request->getBase() . '/' . $this->target;
+            $link = $this->target;
         }
 
         return $link;

src/Routing/Route.php

@@ -30,7 +30,7 @@ class Route
         $link = [];
 
         foreach ($this->pattern as $fragment) {
-            if (preg_match('/^{(\\w+)(\\?)?}$/', $fragment, $matches) === 1) {
+            if (preg_match('/^{(\\w+)(\\?)?}$/', $fragment, $matches)) {
                 if (isset($parameters[$matches[1]])) {
                     $link[] = $parameters[$matches[1]];
                     unset($parameters[$matches[1]]);
@@ -61,7 +61,7 @@ class Route
         $parameters = [];
 
         foreach ($path as $i => $fragment) {
-            if (preg_match('/^{(\\w+)(?:\\?)?}$/', $this->pattern[$i], $matches) === 1) {
+            if (preg_match('/^{(\\w+)(?:\\?)?}$/', $this->pattern[$i], $matches)) {
                 $parameters[$matches[1]] = $fragment;
             } elseif ($fragment != $this->pattern[$i]) {
                 return null;

src/Routing/RouteCollection.php

@@ -45,11 +45,6 @@ class RouteCollection
     {
         $groupNumber = count($uri);
 
-        // response to HEAD request with the GET content
-        if ($method === 'head') {
-            $method = 'get';
-        }
-
         if (!isset($this->searchTable[$method][$groupNumber])) {
             return null;
         }
@@ -69,14 +64,14 @@ class RouteCollection
             throw new \Exception('Route already exists: ' . $id);
         }
 
-        $pattern = array_merge($this->groupStack, $pattern === '' ? [] : explode('/', $pattern));
+        $pattern = array_merge($this->groupStack, explode('/', $pattern));
         $route = new Route($id, $pattern, $handler);
 
         $groupNumber = count($pattern);
 
         $this->searchTable[$method][$groupNumber][] = $route;
 
-        while (preg_match('/^{\\w+\\?}$/', end($pattern)) === 1) {
+        while (preg_match('/^{\\w+\\?}$/', end($pattern))) {
             $groupNumber--;
             array_pop($pattern);
 

src/Session/DatabaseSessionHandler.php

@@ -4,9 +4,11 @@ use DateTime;
 use MapGuesser\Database\Query\Modify;
 use MapGuesser\Database\Query\Select;
 use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Session\ISessionHandler;
+use SessionHandlerInterface;
+use SessionIdInterface;
+use SessionUpdateTimestampHandlerInterface;
 
-class DatabaseSessionHandler implements ISessionHandler
+class DatabaseSessionHandler implements SessionHandlerInterface, SessionIdInterface, SessionUpdateTimestampHandlerInterface
 {
     private bool $exists = false;
 
@@ -26,7 +28,7 @@ class DatabaseSessionHandler implements ISessionHandler
     {
         $select = new Select(\Container::$dbConnection, 'sessions');
         $select->columns(['data']);
-        $select->whereId(substr($id, 0, 32));
+        $select->whereId($id);
 
         $result = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
 
@@ -44,16 +46,16 @@ class DatabaseSessionHandler implements ISessionHandler
         $modify = new Modify(\Container::$dbConnection, 'sessions');
 
         if ($this->exists) {
-            $modify->setId(substr($id, 0, 32));
+            $modify->setId($id);
         } else {
-            $modify->setExternalId(substr($id, 0, 32));
+            $modify->setExternalId($id);
         }
 
         $modify->set('data', $data);
         $modify->set('updated', (new DateTime())->format('Y-m-d H:i:s'));
         $modify->save();
 
-        $this->written = true;
+        $written = true;
 
         return true;
     }
@@ -61,30 +63,37 @@ class DatabaseSessionHandler implements ISessionHandler
     public function destroy($id): bool
     {
         $modify = new Modify(\Container::$dbConnection, 'sessions');
-        $modify->setId(substr($id, 0, 32));
+        $modify->setId($id);
         $modify->delete();
 
-        $this->exists = false;
-
         return true;
     }
 
-    public function gc($maxlifetime): bool
+    public function gc($maxlifetime): int
     {
-        // empty on purpose
-        // old sessions are deleted by MaintainDatabaseCommand
+        $select = new Select(\Container::$dbConnection, 'sessions');
+        $select->columns(['id']);
+        $select->where('updated', '<', (new DateTime('-' . $maxlifetime . ' seconds'))->format('Y-m-d H:i:s'));
+
+        $result = $select->execute();
+
+        while ($session = $result->fetch(IResultSet::FETCH_ASSOC)) {
+            $modify = new Modify(\Container::$dbConnection, 'sessions');
+            $modify->setId($session['id']);
+            $modify->delete();
+        }
 
         return true;
     }
 
     public function create_sid(): string
     {
-        return bin2hex(random_bytes(16));
+        return hash('sha256', random_bytes(10) . microtime());
     }
 
     public function validateId($id): bool
     {
-        return preg_match('/^[a-f0-9]{32}$/', $id) === 1;
+        return preg_match('/^[a-f0-9]{64}$/', $id);
     }
 
     public function updateTimestamp($id, $data): bool
@@ -95,7 +104,7 @@ class DatabaseSessionHandler implements ISessionHandler
 
         $modify = new Modify(\Container::$dbConnection, 'sessions');
 
-        $modify->setId(substr($id, 0, 32));
+        $modify->setId($id);
         $modify->set('updated', (new DateTime())->format('Y-m-d H:i:s'));
         $modify->save();
 

src/Util/Geo/Bounds.php

@@ -27,7 +27,7 @@ class Bounds
 
     public static function createDirectly(float $southLat, float $westLng, float $northLat, float $eastLng): Bounds
     {
-        $instance = new self();
+        $instance = new static();
 
         $instance->southLat = $southLat;
         $instance->westLng = $westLng;
@@ -59,26 +59,6 @@ class Bounds
         }
     }
 
-    public function setSouthLat(float $southLat): void
-    {
-        $this->southLat = $southLat;
-    }
-
-    public function setWestLng(float $westLng): void
-    {
-        $this->westLng = $westLng;
-    }
-
-    public function setNorthLat(float $northLat): void
-    {
-        $this->northLat = $northLat;
-    }
-
-    public function setEastLng(float $eastLng): void
-    {
-        $this->eastLng = $eastLng;
-    }
-
     public function getSouthLat(): float
     {
         return $this->southLat;