From a0f7b7258966434d2e9fd8c287db5c0010b66d2d Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 10 Jan 2016 17:17:06 +0100
Subject: [PATCH 001/183] Moved GD check in front of the configuration check

---
 plugins/check/index.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/check/index.php b/plugins/check/index.php
index b44519e..07c7701 100644
--- a/plugins/check/index.php
+++ b/plugins/check/index.php
@@ -45,6 +45,12 @@ if (hasPermissions(LYCHEE_UPLOADS_IMPORT)===false)		$error .= ('Error: \'uploads
 if (hasPermissions(LYCHEE_UPLOADS)===false)				$error .= ('Error: \'uploads/\' is missing or has insufficient read/write privileges' . PHP_EOL);
 if (hasPermissions(LYCHEE_DATA)===false)				$error .= ('Error: \'data/\' is missing or has insufficient read/write privileges' . PHP_EOL);
 
+# About GD
+$gdVersion = gd_info();
+if (!$gdVersion['JPEG Support'])											$error .= ('Error: PHP gd extension without jpeg support' . PHP_EOL);
+if (!$gdVersion['PNG Support'])												$error .= ('Error: PHP gd extension without png support' . PHP_EOL);
+if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support'])	$error .= ('Error: PHP gd extension without full gif support' . PHP_EOL);
+
 # Load config
 if (!file_exists(LYCHEE_CONFIG_FILE))	exit('Error: Configuration not found. Please install Lychee for additional tests');
 else									require(LYCHEE_CONFIG_FILE);
@@ -89,12 +95,6 @@ if (!ini_get('allow_url_fopen')) echo('Warning: You may experience problems with
 # Check mysql version
 if ($database->server_version<50500) echo('Warning: Lychee uses the GBK charset to avoid sql injections on your MySQL version. Please update to MySQL 5.5 or higher to enable UTF-8 support.' . PHP_EOL);
 
-# About GD
-$gdVersion = gd_info();
-if (!$gdVersion['JPEG Support'])											$error .= ('Error: PHP gd extension without jpeg support' . PHP_EOL);
-if (!$gdVersion['PNG Support'])												$error .= ('Error: PHP gd extension without png support' . PHP_EOL);
-if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support'])	$error .= ('Error: PHP gd extension without full gif support' . PHP_EOL);
-
 # Output
 if ($error==='')	echo('No critical problems found. Lychee should work without problems!' . PHP_EOL);
 else				echo $error;

From 978caa90b3c51092d993e4a2e8b6506acb782519 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 11:02:47 +0100
Subject: [PATCH 002/183] Code style adjustment

---
 src/scripts/lychee.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 03d1c1f..21be02a 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -7,9 +7,9 @@ lychee = {
 
 	title           : document.title,
 	version         : '3.0.9',
-	version_code    : '030009',
+	versionCode     : '030009',
 
-	update_path     : '//update.electerious.com/index.json',
+	updatePath      : '//update.electerious.com/index.json',
 	updateURL       : 'https://github.com/electerious/Lychee',
 	website         : 'http://lychee.electerious.com',
 
@@ -232,8 +232,8 @@ lychee.load = function() {
 lychee.getUpdate = function() {
 
 	$.ajax({
-		url     : lychee.update_path,
-		success : function(data) { if (data.lychee.version>parseInt(lychee.version_code)) $('.version span').show() },
+		url     : lychee.updatePath,
+		success : function(data) { if (data.lychee.version>parseInt(lychee.versionCode)) $('.version span').show() },
 	})
 
 }

From 9e76acd9a80325647bed52a33c541d41b9cf3faf Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 11:03:28 +0100
Subject: [PATCH 003/183] PHP code style adjustments

---
 php/modules/Photo.php   | 5 +++--
 php/modules/Session.php | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/php/modules/Photo.php b/php/modules/Photo.php
index bc745dd..5f34ccb 100755
--- a/php/modules/Photo.php
+++ b/php/modules/Photo.php
@@ -18,6 +18,7 @@ class Photo extends Module {
 		IMAGETYPE_GIF,
 		IMAGETYPE_PNG
 	);
+
 	public static $validExtensions = array(
 		'.jpg',
 		'.jpeg',
@@ -125,7 +126,7 @@ class Photo extends Module {
 
 			# Verify extension
 			$extension = getExtension($file['name']);
-			if (!in_array(strtolower($extension), Photo::$validExtensions, true)) {
+			if (!in_array(strtolower($extension), self::$validExtensions, true)) {
 				Log::error($this->database, __METHOD__, __LINE__, 'Photo format not supported');
 				if ($returnOnError===true) return false;
 				exit('Error: Photo format not supported!');
@@ -133,7 +134,7 @@ class Photo extends Module {
 
 			# Verify image
 			$type = @exif_imagetype($file['tmp_name']);
-			if (!in_array($type, Photo::$validTypes, true)) {
+			if (!in_array($type, self::$validTypes, true)) {
 				Log::error($this->database, __METHOD__, __LINE__, 'Photo type not supported');
 				if ($returnOnError===true) return false;
 				exit('Error: Photo type not supported!');
diff --git a/php/modules/Session.php b/php/modules/Session.php
index 16916c9..461110e 100755
--- a/php/modules/Session.php
+++ b/php/modules/Session.php
@@ -40,6 +40,9 @@ class Session extends Module {
 		# Return settings
 		$return['config'] = $this->settings;
 
+		# Path to Lychee for the server-import dialog
+		$return['config']['location'] = LYCHEE;
+
 		# Remove username and password from response
 		unset($return['config']['username']);
 		unset($return['config']['password']);
@@ -47,9 +50,6 @@ class Session extends Module {
 		# Remove identifier from response
 		unset($return['config']['identifier']);
 
-		# Path to Lychee for the server-import dialog
-		$return['config']['location'] = LYCHEE;
-
 		# Check if login credentials exist and login if they don't
 		if ($this->noLogin()===true) {
 			$public = false;

From 634c3621db40ae3478d051231b264190a45f6843 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 11:06:54 +0100
Subject: [PATCH 004/183] Update database connect function and update mechanism

Database::connect now takes care of the update-mechanism and uses the current database version instead of the version from the client.
---
 php/access/Admin.php     |   3 +-
 php/access/Guest.php     |   2 +-
 php/modules/Database.php | 106 ++++++++++++++++++++-------------------
 php/modules/Session.php  |  12 +----
 src/scripts/lychee.js    |   6 +--
 5 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/php/access/Admin.php b/php/access/Admin.php
index e70aa07..251328e 100644
--- a/php/access/Admin.php
+++ b/php/access/Admin.php
@@ -247,9 +247,8 @@ class Admin extends Access {
 
 		global $dbName;
 
-		Module::dependencies(isset($_POST['version']));
 		$session = new Session($this->plugins, $this->settings);
-		echo json_encode($session->init($this->database, $dbName, false, $_POST['version']));
+		echo json_encode($session->init($this->database, $dbName, false));
 
 	}
 
diff --git a/php/access/Guest.php b/php/access/Guest.php
index 611d310..2cfab14 100644
--- a/php/access/Guest.php
+++ b/php/access/Guest.php
@@ -112,7 +112,7 @@ class Guest extends Access {
 		global $dbName;
 
 		$session = new Session($this->plugins, $this->settings);
-		echo json_encode($session->init($this->database, $dbName, true, $_POST['version']));
+		echo json_encode($session->init($this->database, $dbName, true));
 
 	}
 
diff --git a/php/modules/Database.php b/php/modules/Database.php
index d7764e4..9b25860 100755
--- a/php/modules/Database.php
+++ b/php/modules/Database.php
@@ -9,6 +9,20 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 class Database extends Module {
 
+	private static $versions = array(
+		'020100', #2.1
+		'020101', #2.1.1
+		'020200', #2.2
+		'020500', #2.5
+		'020505', #2.5.5
+		'020601', #2.6.1
+		'020602', #2.6.2
+		'020700', #2.7.0
+		'030000', #3.0.0
+		'030001', #3.0.1
+		'030003' #3.0.3
+	);
+
 	static function connect($host = 'localhost', $user, $password, $name = 'lychee') {
 
 		# Check dependencies
@@ -26,44 +40,34 @@ class Database extends Module {
 		# Set unicode
 		$database->query('SET NAMES utf8;');
 
-		# Check database
-		if (!$database->select_db($name))
-			if (!Database::createDatabase($database, $name)) exit('Error: Could not create database!');
+		# Create database
+		if (!self::createDatabase($database, $name)) exit('Error: Could not create database!');
 
-		# Check tables
-		$query = Database::prepare($database, 'SELECT * FROM ?, ?, ?, ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS, LYCHEE_TABLE_ALBUMS, LYCHEE_TABLE_SETTINGS, LYCHEE_TABLE_LOG));
-		if (!$database->query($query))
-			if (!Database::createTables($database)) exit('Error: Could not create tables!');
+		# Create tables
+		if (!self::createTables($database)) exit('Error: Could not create tables!');
+
+		# Update database
+		if (!self::update($database, $name)) exit('Error: Could not update database and tables!');
 
 		return $database;
 
 	}
 
-	static function update($database, $dbName, $version = 0) {
+	private static function update($database, $dbName) {
 
 		# Check dependencies
 		Module::dependencies(isset($database, $dbName));
-		if (!isset($version)) return true;
 
-		# List of updates
-		$updates = array(
-			'020100', #2.1
-			'020101', #2.1.1
-			'020200', #2.2
-			'020500', #2.5
-			'020505', #2.5.5
-			'020601', #2.6.1
-			'020602', #2.6.2
-			'020700', #2.7.0
-			'030000', #3.0.0
-			'030001', #3.0.1
-			'030003' #3.0.3
-		);
+		# Get current version
+		$query		= self::prepare($database, "SELECT * FROM ? WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS));
+		$results	= $database->query($query);
+		$current	= $results->fetch_object()->value;
 
 		# For each update
-		foreach ($updates as $update) {
+		foreach (self::$versions as $version) {
 
-			if ($update<=$version) continue;
+			# Only update when newer version available
+			if ($version<=$current) continue;
 
 			# Load update
 			include(__DIR__ . '/../database/update_' . $update . '.php');
@@ -74,7 +78,7 @@ class Database extends Module {
 
 	}
 
-	static function createConfig($host = 'localhost', $user, $password, $name = 'lychee', $prefix = '') {
+	public static function createConfig($host = 'localhost', $user, $password, $name = 'lychee', $prefix = '') {
 
 		# Check dependencies
 		Module::dependencies(isset($host, $user, $password, $name));
@@ -83,15 +87,8 @@ class Database extends Module {
 
 		if ($database->connect_errno) return 'Warning: Connection failed!';
 
-		# Check if database exists
-		if (!$database->select_db($name)) {
-
-			# Database doesn't exist
-			# Check if user can create the database
-			$result = Database::createDatabase($database, $name);
-			if ($result===false) return 'Warning: Creation failed!';
-
-		}
+		# Check if user can create the database before saving the configuration
+		if (!self::createDatabase($database, $name)) return 'Warning: Creation failed!';
 
 		# Escape data
 		$host		= mysqli_real_escape_string($database, $host);
@@ -127,13 +124,16 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 	}
 
-	static function createDatabase($database, $name = 'lychee') {
+	private static function createDatabase($database, $name = 'lychee') {
 
 		# Check dependencies
 		Module::dependencies(isset($database, $name));
 
+		# Check if database exists
+		if ($database->select_db($name)) return true;
+
 		# Create database
-		$query	= Database::prepare($database, 'CREATE DATABASE IF NOT EXISTS ?', array($name));
+		$query	= self::prepare($database, 'CREATE DATABASE IF NOT EXISTS ?', array($name));
 		$result = $database->query($query);
 
 		if (!$database->select_db($name)||!$result) return false;
@@ -141,13 +141,17 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 	}
 
-	static function createTables($database) {
+	private static function createTables($database) {
 
 		# Check dependencies
 		Module::dependencies(isset($database));
 
+		# Check if tables exist
+		$query = self::prepare($database, 'SELECT * FROM ?, ?, ?, ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS, LYCHEE_TABLE_ALBUMS, LYCHEE_TABLE_SETTINGS, LYCHEE_TABLE_LOG));
+		if ($database->query($query)) return true;
+
 		# Create log
-		$exist = Database::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_LOG));
+		$exist = self::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_LOG));
 		if (!$database->query($exist)) {
 
 			# Read file
@@ -157,13 +161,13 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 			if (!isset($query)||$query===false) return false;
 
 			# Create table
-			$query = Database::prepare($database, $query, array(LYCHEE_TABLE_LOG));
+			$query = self::prepare($database, $query, array(LYCHEE_TABLE_LOG));
 			if (!$database->query($query)) return false;
 
 		}
 
 		# Create settings
-		$exist = Database::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_SETTINGS));
+		$exist = self::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_SETTINGS));
 		if (!$database->query($exist)) {
 
 			# Read file
@@ -176,7 +180,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 			}
 
 			# Create table
-			$query = Database::prepare($database, $query, array(LYCHEE_TABLE_SETTINGS));
+			$query = self::prepare($database, $query, array(LYCHEE_TABLE_SETTINGS));
 			if (!$database->query($query)) {
 				Log::error($database, __METHOD__, __LINE__, $database->error);
 				return false;
@@ -192,7 +196,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 			}
 
 			# Add content
-			$query = Database::prepare($database, $query, array(LYCHEE_TABLE_SETTINGS));
+			$query = self::prepare($database, $query, array(LYCHEE_TABLE_SETTINGS));
 			if (!$database->query($query)) {
 				Log::error($database, __METHOD__, __LINE__, $database->error);
 				return false;
@@ -200,7 +204,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 			# Generate identifier
 			$identifier	= md5(microtime(true));
-			$query		= Database::prepare($database, "UPDATE `?` SET `value` = '?' WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS, $identifier));
+			$query		= self::prepare($database, "UPDATE `?` SET `value` = '?' WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS, $identifier));
 			if (!$database->query($query)) {
 				Log::error($database, __METHOD__, __LINE__, $database->error);
 				return false;
@@ -209,7 +213,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 		}
 
 		# Create albums
-		$exist = Database::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_ALBUMS));
+		$exist = self::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_ALBUMS));
 		if (!$database->query($exist)) {
 
 			# Read file
@@ -222,7 +226,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 			}
 
 			# Create table
-			$query = Database::prepare($database, $query, array(LYCHEE_TABLE_ALBUMS));
+			$query = self::prepare($database, $query, array(LYCHEE_TABLE_ALBUMS));
 			if (!$database->query($query)) {
 				Log::error($database, __METHOD__, __LINE__, $database->error);
 				return false;
@@ -231,7 +235,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 		}
 
 		# Create photos
-		$exist = Database::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS));
+		$exist = self::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS));
 		if (!$database->query($exist)) {
 
 			# Read file
@@ -244,7 +248,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 			}
 
 			# Create table
-			$query = Database::prepare($database, $query, array(LYCHEE_TABLE_PHOTOS));
+			$query = self::prepare($database, $query, array(LYCHEE_TABLE_PHOTOS));
 			if (!$database->query($query)) {
 				Log::error($database, __METHOD__, __LINE__, $database->error);
 				return false;
@@ -256,9 +260,9 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 	}
 
-	static function setVersion($database, $version) {
+	public static function setVersion($database, $version) {
 
-		$query	= Database::prepare($database, "UPDATE ? SET value = '?' WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS, $version));
+		$query	= self::prepare($database, "UPDATE ? SET value = '?' WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS, $version));
 		$result = $database->query($query);
 		if (!$result) {
 			Log::error($database, __METHOD__, __LINE__, 'Could not update database (' . $database->error . ')');
@@ -267,7 +271,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 	}
 
-	static function prepare($database, $query, $data) {
+	public static function prepare($database, $query, $data) {
 
 		# Check dependencies
 		Module::dependencies(isset($database, $query, $data));
diff --git a/php/modules/Session.php b/php/modules/Session.php
index 461110e..524877b 100755
--- a/php/modules/Session.php
+++ b/php/modules/Session.php
@@ -21,22 +21,14 @@ class Session extends Module {
 
 	}
 
-	public function init($database, $dbName, $public, $version) {
+	public function init($database, $dbName, $public) {
 
 		# Check dependencies
-		self::dependencies(isset($this->settings, $public, $version));
+		self::dependencies(isset($this->settings, $public));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
-		# Update
-		if (!isset($this->settings['version'])||$this->settings['version']!==$version) {
-			if (!Database::update($database, $dbName, @$this->settings['version'])) {
-				Log::error($database, __METHOD__, __LINE__, 'Updating the database failed');
-				exit('Error: Updating the database failed!');
-			}
-		}
-
 		# Return settings
 		$return['config'] = $this->settings;
 
diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 21be02a..c326cef 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -32,11 +32,7 @@ lychee = {
 
 lychee.init = function() {
 
-	let params = {
-		version: lychee.version_code
-	}
-
-	api.post('Session::init', params, function(data) {
+	api.post('Session::init', {}, function(data) {
 
 		// Check status
 		// 0 = No configuration

From 9cb6dc19b79a305c59150a6f60e9099d96fad628 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 11:45:41 +0100
Subject: [PATCH 005/183] Added abstract/final to classes to be more strict

---
 php/modules/Album.php    | 2 +-
 php/modules/Database.php | 2 +-
 php/modules/Import.php   | 2 +-
 php/modules/Log.php      | 2 +-
 php/modules/Module.php   | 4 ++--
 php/modules/Photo.php    | 2 +-
 php/modules/Plugins.php  | 2 +-
 php/modules/Session.php  | 2 +-
 php/modules/Settings.php | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/php/modules/Album.php b/php/modules/Album.php
index 1b8d1c5..f4ed7f7 100644
--- a/php/modules/Album.php
+++ b/php/modules/Album.php
@@ -7,7 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Album extends Module {
+final class Album extends Module {
 
 	private $database	= null;
 	private $settings	= null;
diff --git a/php/modules/Database.php b/php/modules/Database.php
index 9b25860..131e5e2 100755
--- a/php/modules/Database.php
+++ b/php/modules/Database.php
@@ -7,7 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Database extends Module {
+final class Database extends Module {
 
 	private static $versions = array(
 		'020100', #2.1
diff --git a/php/modules/Import.php b/php/modules/Import.php
index 621c562..5c42dd1 100644
--- a/php/modules/Import.php
+++ b/php/modules/Import.php
@@ -7,7 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Import extends Module {
+final class Import extends Module {
 
 	private $database	= null;
 	private $settings	= null;
diff --git a/php/modules/Log.php b/php/modules/Log.php
index 1725020..5befb0a 100644
--- a/php/modules/Log.php
+++ b/php/modules/Log.php
@@ -7,7 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Log extends Module {
+final class Log extends Module {
 
 	public static function notice($database, $function, $line, $text = '') {
 
diff --git a/php/modules/Module.php b/php/modules/Module.php
index 3e8b672..ab9fb0a 100644
--- a/php/modules/Module.php
+++ b/php/modules/Module.php
@@ -7,7 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Module {
+abstract class Module {
 
 	protected $plugins = null;
 
@@ -25,7 +25,7 @@ class Module {
 
 	}
 
-	public static function dependencies($available = false) {
+	final public static function dependencies($available = false) {
 
 		if ($available===false) exit('Error: Can not execute function. Missing parameters or variables.');
 
diff --git a/php/modules/Photo.php b/php/modules/Photo.php
index 5f34ccb..ce99dd7 100755
--- a/php/modules/Photo.php
+++ b/php/modules/Photo.php
@@ -7,7 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Photo extends Module {
+final class Photo extends Module {
 
 	private $database	= null;
 	private $settings	= null;
diff --git a/php/modules/Plugins.php b/php/modules/Plugins.php
index 9663814..d58cbaf 100644
--- a/php/modules/Plugins.php
+++ b/php/modules/Plugins.php
@@ -7,7 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Plugins implements \SplSubject {
+final class Plugins implements \SplSubject {
 
 	private $files		= array();
 	private $observers	= array();
diff --git a/php/modules/Session.php b/php/modules/Session.php
index 524877b..3e27d98 100755
--- a/php/modules/Session.php
+++ b/php/modules/Session.php
@@ -7,7 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Session extends Module {
+final class Session extends Module {
 
 	private $settings = null;
 
diff --git a/php/modules/Settings.php b/php/modules/Settings.php
index f0f57f4..689fd1c 100755
--- a/php/modules/Settings.php
+++ b/php/modules/Settings.php
@@ -7,7 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Settings extends Module {
+final class Settings extends Module {
 
 	private $database = null;
 

From 1019b0fef1d89c99293691041839ac5352fee367 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 11:45:59 +0100
Subject: [PATCH 006/183] Added 'public' to database connect function

---
 php/modules/Database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/modules/Database.php b/php/modules/Database.php
index 131e5e2..07d4035 100755
--- a/php/modules/Database.php
+++ b/php/modules/Database.php
@@ -23,7 +23,7 @@ final class Database extends Module {
 		'030003' #3.0.3
 	);
 
-	static function connect($host = 'localhost', $user, $password, $name = 'lychee') {
+	public static function connect($host = 'localhost', $user, $password, $name = 'lychee') {
 
 		# Check dependencies
 		Module::dependencies(isset($host, $user, $password, $name));

From 33e16041af0fa8762db9f880bdcc2ce8ecb824b0 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 11:57:16 +0100
Subject: [PATCH 007/183] Removed $dbTablePrefix definition as
 defineTablePrefix() will do the same

---
 php/api.php                  | 3 +--
 php/define.php               | 2 +-
 plugins/check/index.php      | 3 +--
 plugins/displaylog/index.php | 3 +--
 view.php                     | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/php/api.php b/php/api.php
index d043a4d..4c259cb 100755
--- a/php/api.php
+++ b/php/api.php
@@ -33,8 +33,7 @@ if (!empty($_POST['function'])||!empty($_GET['function'])) {
 	}
 
 	# Define the table prefix
-	if (!isset($dbTablePrefix)) $dbTablePrefix = '';
-	defineTablePrefix($dbTablePrefix);
+	defineTablePrefix(@$dbTablePrefix);
 
 	# Connect to database
 	$database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName);
diff --git a/php/define.php b/php/define.php
index fb045f2..65b99d6 100644
--- a/php/define.php
+++ b/php/define.php
@@ -34,7 +34,7 @@ define('LYCHEE_URL_UPLOADS_THUMB', 'uploads/thumb/');
 function defineTablePrefix($dbTablePrefix) {
 
 	# This part is wrapped into a function, because it needs to be called
-	# after the config-file has been loaded. Other defines are also available
+	# after the config-file has been loaded. Other defines are available
 	# before the config-file has been loaded.
 
 	# Parse table prefix
diff --git a/plugins/check/index.php b/plugins/check/index.php
index 07c7701..dfcbd12 100644
--- a/plugins/check/index.php
+++ b/plugins/check/index.php
@@ -56,8 +56,7 @@ if (!file_exists(LYCHEE_CONFIG_FILE))	exit('Error: Configuration not found. Plea
 else									require(LYCHEE_CONFIG_FILE);
 
 # Define the table prefix
-if (!isset($dbTablePrefix)) $dbTablePrefix = '';
-defineTablePrefix($dbTablePrefix);
+defineTablePrefix(@$dbTablePrefix);
 
 # Database
 $database = new mysqli($dbHost, $dbUser, $dbPassword, $dbName);
diff --git a/plugins/displaylog/index.php b/plugins/displaylog/index.php
index e6e690b..a9ac561 100644
--- a/plugins/displaylog/index.php
+++ b/plugins/displaylog/index.php
@@ -23,8 +23,7 @@ if (!file_exists(LYCHEE_CONFIG_FILE)) exit('Error 001: Configuration not found.
 require(LYCHEE_CONFIG_FILE);
 
 # Define the table prefix
-if (!isset($dbTablePrefix)) $dbTablePrefix = '';
-defineTablePrefix($dbTablePrefix);
+defineTablePrefix(@$dbTablePrefix);
 
 # Declare
 $result = '';
diff --git a/view.php b/view.php
index f051f21..c1b1160 100644
--- a/view.php
+++ b/view.php
@@ -29,8 +29,7 @@
 				require(LYCHEE_CONFIG_FILE);
 
 				# Define the table prefix
-				if (!isset($dbTablePrefix)) $dbTablePrefix = '';
-				defineTablePrefix($dbTablePrefix);
+				defineTablePrefix(@$dbTablePrefix);
 
 				$database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName);
 

From 0a9b0d0078e3c1d581d0295c140afb744540e6b1 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 14:58:08 +0100
Subject: [PATCH 008/183] Simplified autoloader

---
 php/autoload.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/php/autoload.php b/php/autoload.php
index 91df00c..6dad8c0 100644
--- a/php/autoload.php
+++ b/php/autoload.php
@@ -7,23 +7,19 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-function lycheeAutoloaderModules($class_name) {
+function lycheeAutoloaderModules($class) {
 
-	$modules = array('Album', 'Database', 'Import', 'Log', 'Module', 'Photo', 'Plugins', 'Session', 'Settings');
-	if (!in_array($class_name, $modules)) return false;
+	$file = LYCHEE . 'php/modules/' . $class . '.php';
 
-	$file = LYCHEE . 'php/modules/' . $class_name . '.php';
-	if (file_exists($file)!==false) require $file;
+	if (file_exists($file)===true) require $file;
 
 }
 
-function lycheeAutoloaderAccess($class_name) {
+function lycheeAutoloaderAccess($class) {
 
-	$access = array('Access', 'Admin', 'Guest', 'Installation');
-	if (!in_array($class_name, $access)) return false;
+	$file = LYCHEE . 'php/access/' . $class . '.php';
 
-	$file = LYCHEE . 'php/access/' . $class_name . '.php';
-	if (file_exists($file)!==false) require $file;
+	if (file_exists($file)===true) require $file;
 
 }
 

From 7bce954c8d3ac3f99d512742214ed1c4a283776e Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 15:03:50 +0100
Subject: [PATCH 009/183] Register autoloader functions as anonymous functions

Requires PHP 5.3
---
 php/autoload.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/php/autoload.php b/php/autoload.php
index 6dad8c0..e7bede4 100644
--- a/php/autoload.php
+++ b/php/autoload.php
@@ -7,23 +7,20 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-function lycheeAutoloaderModules($class) {
+spl_autoload_register(function($class) {
 
 	$file = LYCHEE . 'php/modules/' . $class . '.php';
 
 	if (file_exists($file)===true) require $file;
 
-}
+});
 
-function lycheeAutoloaderAccess($class) {
+spl_autoload_register(function($class) {
 
 	$file = LYCHEE . 'php/access/' . $class . '.php';
 
 	if (file_exists($file)===true) require $file;
 
-}
-
-spl_autoload_register('lycheeAutoloaderModules');
-spl_autoload_register('lycheeAutoloaderAccess');
+});
 
 ?>
\ No newline at end of file

From 3d88300df18250c298f92442a7ee001f70a2b754 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 16:08:43 +0100
Subject: [PATCH 010/183] Code style adjustment

---
 php/modules/Plugins.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/modules/Plugins.php b/php/modules/Plugins.php
index d58cbaf..283223d 100644
--- a/php/modules/Plugins.php
+++ b/php/modules/Plugins.php
@@ -20,7 +20,7 @@ final class Plugins implements \SplSubject {
 		if (!isset($files)) return false;
 
 		# Init vars
-		$this->files	= $files;
+		$this->files = $files;
 
 		# Load plugins
 		foreach ($this->files as $file) {

From a5cab35e34eb6407afa96d9cb3436e937084dc6c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 16:08:50 +0100
Subject: [PATCH 011/183] Added type hints

---
 php/modules/Plugins.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/modules/Plugins.php b/php/modules/Plugins.php
index 283223d..94aa1bd 100644
--- a/php/modules/Plugins.php
+++ b/php/modules/Plugins.php
@@ -15,7 +15,7 @@ final class Plugins implements \SplSubject {
 	public $action	= null;
 	public $args	= null;
 
-	public function __construct($files, $database, $settings) {
+	public function __construct(array $files, $database, array $settings) {
 
 		if (!isset($files)) return false;
 

From 70d7e1e6f249993a11171293366caef55ceebc7c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 19 Jan 2016 16:09:06 +0100
Subject: [PATCH 012/183] API cleanup and code style changes

---
 php/api.php | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/php/api.php b/php/api.php
index 4c259cb..d9e8381 100755
--- a/php/api.php
+++ b/php/api.php
@@ -5,8 +5,15 @@
 # @copyright	2015 by Tobias Reich
 ###
 
-if (!empty($_POST['function'])||!empty($_GET['function'])) {
+# Define the called function
+if (isset($_POST['function']))		$fn = $_POST['function'];
+else if (isset($_GET['function']))	$fn = $_GET['function'];
+else								$fn = null;
 
+# Check if a function has been specified
+if (!empty($fn)) {
+
+	# Start the session and set the default timezone
 	session_start();
 	date_default_timezone_set('UTC');
 
@@ -15,6 +22,13 @@ if (!empty($_POST['function'])||!empty($_GET['function'])) {
 	require(__DIR__ . '/autoload.php');
 	require(__DIR__ . '/modules/misc.php');
 
+	# Validate parameters
+	if (isset($_POST['albumIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['albumIDs'])!==1)	exit('Error: Wrong parameter type for albumIDs!');
+	if (isset($_POST['photoIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['photoIDs'])!==1)	exit('Error: Wrong parameter type for photoIDs!');
+	if (isset($_POST['albumID'])&&preg_match('/^[0-9sfr]{1,}$/', $_POST['albumID'])!==1)	exit('Error: Wrong parameter type for albumID!');
+	if (isset($_POST['photoID'])&&preg_match('/^[0-9]{14}$/', $_POST['photoID'])!==1)		exit('Error: Wrong parameter type for photoID!');
+
+	# Check if a configuration exists
 	if (file_exists(LYCHEE_CONFIG_FILE)) require(LYCHEE_CONFIG_FILE);
 	else {
 
@@ -46,16 +60,7 @@ if (!empty($_POST['function'])||!empty($_GET['function'])) {
 	$plugins = explode(';', $settings['plugins']);
 	$plugins = new Plugins($plugins, $database, $settings);
 
-	# Validate parameters
-	if (isset($_POST['albumIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['albumIDs'])!==1)	exit('Error: Wrong parameter type for albumIDs!');
-	if (isset($_POST['photoIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['photoIDs'])!==1)	exit('Error: Wrong parameter type for photoIDs!');
-	if (isset($_POST['albumID'])&&preg_match('/^[0-9sfr]{1,}$/', $_POST['albumID'])!==1)	exit('Error: Wrong parameter type for albumID!');
-	if (isset($_POST['photoID'])&&preg_match('/^[0-9]{14}$/', $_POST['photoID'])!==1)		exit('Error: Wrong parameter type for photoID!');
-
-	# Function for switch statement
-	if (isset($_POST['function']))	$fn = $_POST['function'];
-	else							$fn = $_GET['function'];
-
+	# Check if user is logged
 	if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 		(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
 
@@ -85,8 +90,8 @@ if (!empty($_POST['function'])||!empty($_GET['function'])) {
 
 } else {
 
-	exit('Error: Called function not found!');
+	exit('Error: No API function specified!');
 
 }
 
-?>
+?>
\ No newline at end of file

From d5a03a31f8411d57a39cb2debccb477d0fb683b9 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 13:07:25 +0100
Subject: [PATCH 013/183] Fix for session_start() after sending headers #433

---
 plugins/check/index.php      | 5 +++--
 plugins/displaylog/index.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/check/index.php b/plugins/check/index.php
index dfcbd12..7340573 100644
--- a/plugins/check/index.php
+++ b/plugins/check/index.php
@@ -15,6 +15,9 @@ require($lychee . 'php/define.php');
 require($lychee . 'php/autoload.php');
 require($lychee . 'php/modules/misc.php');
 
+# Start the session
+session_start();
+
 # Set content
 header('content-type: text/plain');
 
@@ -103,8 +106,6 @@ echo(PHP_EOL . PHP_EOL . 'System Information' . PHP_EOL);
 echo('------------------' . PHP_EOL);
 
 # Ensure that user is logged in
-session_start();
-
 if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 	(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
 
diff --git a/plugins/displaylog/index.php b/plugins/displaylog/index.php
index a9ac561..52aa698 100644
--- a/plugins/displaylog/index.php
+++ b/plugins/displaylog/index.php
@@ -10,6 +10,9 @@
 # Location
 $lychee = __DIR__ . '/../../';
 
+# Start the session
+session_start();
+
 # Load requirements
 require($lychee . 'php/define.php');
 require($lychee . 'php/autoload.php');
@@ -41,8 +44,6 @@ $settings = new Settings($database);
 $settings = $settings->get();
 
 # Ensure that user is logged in
-session_start();
-
 if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 	(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
 

From 1a856eeb4f8b10d27d6ed7cbefe9dd4aedff0965 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 14:21:06 +0100
Subject: [PATCH 014/183] Updated jquery

---
 src/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/package.json b/src/package.json
index 2de6f1e..fa9ea25 100644
--- a/src/package.json
+++ b/src/package.json
@@ -23,7 +23,7 @@
     "gulp-rimraf": "^0.2.0",
     "gulp-sass": "^2.1.1",
     "gulp-uglify": "^1.5.1",
-    "jquery": "^2.1.4",
+    "jquery": "^2.2.0",
     "mousetrap": "^1.5.3"
   }
 }

From eb887c7ca83314cf30337e7bcf0b3f1c79158258 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 14:57:22 +0100
Subject: [PATCH 015/183] Added scripts to package.json and removed gulp from
 the global dependencies

---
 docs/Build.md    | 12 ++++--------
 src/package.json |  4 ++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/Build.md b/docs/Build.md
index 6d9af87..acb0a09 100644
--- a/docs/Build.md
+++ b/docs/Build.md
@@ -4,22 +4,18 @@ First you have to install the following dependencies:
 
 - `node` [Node.js](http://nodejs.org) v0.10 or later
 - `npm` [Node Packaged Modules](https://www.npmjs.org)
-- `gulp` [Gulp.js](http://gulpjs.com)
 
-After [installing Node.js](http://nodejs.org) you can use the included `npm` package manager to install the global requirements and Lychee-dependencies with the following command:
+After [installing Node.js](http://nodejs.org) you can use the included `npm` package manager to download all dependencies:
 
 	cd src/
-	npm install -g gulp
 	npm install
 
 ### Build
 
-The Gulpfile is located in `src/` and can be easily executed using the `gulp` command.
+The Gulpfile is located in `src/` and can be executed using the `npm start` command.
 
 ### Watch for changes
 
-While developing, you might want to use the following command to watch for changes:
+While developing, you might want to use the following command to automatically build Lychee everytime you save a file:
 
-	gulp watch
-
-`gulp watch` will automatically build Lychee everytime you save a file.
+	npm run watch
diff --git a/src/package.json b/src/package.json
index fa9ea25..fecdb82 100644
--- a/src/package.json
+++ b/src/package.json
@@ -9,6 +9,10 @@
     "type": "git",
     "url": "https://github.com/electerious/Lychee.git"
   },
+  "scripts": {
+    "start": "gulp",
+    "watch": "gulp watch"
+  },
   "devDependencies": {
     "babel-preset-es2015": "^6.3.13",
     "basiccontext": "^3.5.1",

From 606968f349cdfa695d386f9788436c78637c8a8e Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 15:16:03 +0100
Subject: [PATCH 016/183] Updated code style

---
 src/scripts/_gup.js        |  6 ++--
 src/scripts/album.js       | 36 ++++++++++++------------
 src/scripts/albums.js      |  2 +-
 src/scripts/api.js         |  8 +++---
 src/scripts/build.js       |  6 ++--
 src/scripts/contextMenu.js | 28 +++++++++----------
 src/scripts/header.js      | 14 +++++-----
 src/scripts/init.js        | 22 +++++++--------
 src/scripts/lychee.js      | 57 +++++++++++++++++++++-----------------
 src/scripts/multiselect.js | 36 ++++++++++++------------
 src/scripts/photo.js       | 54 ++++++++++++++++++------------------
 src/scripts/search.js      |  6 ++--
 src/scripts/settings.js    | 24 ++++++++--------
 src/scripts/sidebar.js     | 32 ++++++++++-----------
 src/scripts/upload.js      | 36 ++++++++++++------------
 src/scripts/view.js        | 44 ++++++++++++++++-------------
 src/scripts/view/main.js   | 14 +++++-----
 17 files changed, 218 insertions(+), 207 deletions(-)

diff --git a/src/scripts/_gup.js b/src/scripts/_gup.js
index 8757da7..c71c790 100644
--- a/src/scripts/_gup.js
+++ b/src/scripts/_gup.js
@@ -2,9 +2,9 @@ function gup(b) {
 
 	b = b.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]")
 
-	let a = "[\\?&]" + b + "=([^&#]*)",
-		d = new RegExp(a),
-		c = d.exec(window.location.href)
+	let a = "[\\?&]" + b + "=([^&#]*)"
+	let d = new RegExp(a)
+	let c = d.exec(window.location.href)
 
 	if (c === null) return ''
 	else return c[1]
diff --git a/src/scripts/album.js b/src/scripts/album.js
index b552fd6..6f3a9b7 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -146,12 +146,12 @@ album.add = function() {
 
 album.delete = function(albumIDs) {
 
-	let action     = {},
-	    cancel     = {},
-	    msg        = ''
+	let action = {}
+	let cancel = {}
+	let msg    = ''
 
 	if (!albumIDs) return false
-	if (albumIDs instanceof Array===false) albumIDs = [albumIDs]
+	if (albumIDs instanceof Array===false) albumIDs = [ albumIDs ]
 
 	action.fn = function() {
 
@@ -234,11 +234,11 @@ album.delete = function(albumIDs) {
 
 album.setTitle = function(albumIDs) {
 
-	let oldTitle = '',
-	    msg      = ''
+	let oldTitle = ''
+	let msg      = ''
 
 	if (!albumIDs) return false
-	if (albumIDs instanceof Array===false) albumIDs = [albumIDs]
+	if (albumIDs instanceof Array===false) albumIDs = [ albumIDs ]
 
 	if (albumIDs.length===1) {
 
@@ -365,12 +365,12 @@ album.setPublic = function(albumID, modal, e) {
 
 	if (modal===true) {
 
-		let text   = '',
-		    action = {}
+		let text   = ''
+		let action = {}
 
 		action.fn = () => {
 
-			// setPublic function without showing the modal
+			// Call setPublic function without showing the modal
 			album.setPublic(album.getID(), false, e)
 
 		}
@@ -515,8 +515,8 @@ album.setPublic = function(albumID, modal, e) {
 
 album.share = function(service) {
 
-	let link = '',
-	    url  = location.href
+	let link = ''
+	let url  = location.href
 
 	switch (service) {
 		case 'twitter':
@@ -539,8 +539,8 @@ album.share = function(service) {
 
 album.getArchive = function(albumID) {
 
-	let link,
-	    url = `${ api.path }?function=Album::getArchive&albumID=${ albumID }`
+	let link = ''
+	let url  = `${ api.path }?function=Album::getArchive&albumID=${ albumID }`
 
 	if (location.href.indexOf('index.html')>0) link = location.href.replace(location.hash, '').replace('index.html', url)
 	else                                       link = location.href.replace(location.hash, '') + url
@@ -553,12 +553,12 @@ album.getArchive = function(albumID) {
 
 album.merge = function(albumIDs) {
 
-	let title  = '',
-	    sTitle = '',
-	    msg    = ''
+	let title  = ''
+	let sTitle = ''
+	let msg    = ''
 
 	if (!albumIDs) return false
-	if (albumIDs instanceof Array===false) albumIDs = [albumIDs]
+	if (albumIDs instanceof Array===false) albumIDs = [ albumIDs ]
 
 	// Get title of first album
 	if (albums.json) title = albums.getByID(albumIDs[0]).title
diff --git a/src/scripts/albums.js b/src/scripts/albums.js
index ef6b6d1..846046c 100644
--- a/src/scripts/albums.js
+++ b/src/scripts/albums.js
@@ -134,7 +134,7 @@ albums.deleteByID = function(albumID) {
 	if (!albums.json)        return false
 	if (!albums.json.albums) return false
 
-	var deleted = false
+	let deleted = false
 
 	$.each(albums.json.albums, function(i) {
 
diff --git a/src/scripts/api.js b/src/scripts/api.js
index 3301dbd..264a7e6 100644
--- a/src/scripts/api.js
+++ b/src/scripts/api.js
@@ -14,7 +14,7 @@ api.post = function(fn, params, callback) {
 
 	loadingBar.show()
 
-	params = $.extend({function: fn}, params)
+	params = $.extend({ function: fn }, params)
 
 	const success = (data) => {
 
@@ -31,9 +31,9 @@ api.post = function(fn, params, callback) {
 		else if (data==='') data = false
 
 		// Convert to JSON if string start with '{' and ends with '}'
-		if (typeof data==='string' &&
-			data.substring(0, 1)==='{' &&
-			data.substring(data.length-1, data.length)==='}') data = $.parseJSON(data)
+		if (typeof data==='string' && data.substring(0, 1)==='{' && data.substring(data.length - 1, data.length)==='}') {
+			data = $.parseJSON(data)
+		}
 
 		// Output response when debug mode is enabled
 		if (lychee.debugMode) console.log(data)
diff --git a/src/scripts/build.js b/src/scripts/build.js
index 75cc311..4b1f020 100644
--- a/src/scripts/build.js
+++ b/src/scripts/build.js
@@ -115,8 +115,8 @@ build.photo = function(data) {
 
 build.imageview = function(data, visibleControls) {
 
-	let html      = '',
-	    hasMedium = data.medium!==''
+	let html      = ''
+	let hasMedium = data.medium!==''
 
 	if (hasMedium===false) {
 
@@ -182,7 +182,7 @@ build.uploadModal = function(title, files) {
 
 		let file = files[i]
 
-		if (file.name.length>40) file.name = file.name.substr(0, 17) + '...' + file.name.substr(file.name.length-20, 20)
+		if (file.name.length>40) file.name = file.name.substr(0, 17) + '...' + file.name.substr(file.name.length - 20, 20)
 
 		html += lychee.html`
 		        <div class='row'>
diff --git a/src/scripts/contextMenu.js b/src/scripts/contextMenu.js
index 2d6b6b5..cc036fd 100644
--- a/src/scripts/contextMenu.js
+++ b/src/scripts/contextMenu.js
@@ -53,9 +53,9 @@ contextMenu.album = function(albumID, e) {
 	let showMerge = (albums.json && albums.json.albums && Object.keys(albums.json.albums).length>1)
 
 	let items = [
-		{ title: build.iconic('pencil') + 'Rename', fn: () => album.setTitle([albumID]) },
+		{ title: build.iconic('pencil') + 'Rename', fn: () => album.setTitle([ albumID ]) },
 		{ title: build.iconic('collapse-left') + 'Merge', visible: showMerge, fn: () => { basicContext.close(); contextMenu.mergeAlbum(albumID, e) } },
-		{ title: build.iconic('trash') + 'Delete', fn: () => album.delete([albumID]) }
+		{ title: build.iconic('trash') + 'Delete', fn: () => album.delete([ albumID ]) }
 	]
 
 	$('.album[data-id="' + albumID + '"]').addClass('active')
@@ -111,7 +111,7 @@ contextMenu.albumTitle = function(albumID, e) {
 
 		}
 
-		items.unshift({ title: build.iconic('pencil') + 'Rename', fn: () => album.setTitle([albumID]) })
+		items.unshift({ title: build.iconic('pencil') + 'Rename', fn: () => album.setTitle([ albumID ]) })
 
 		basicContext.show(items, e.originalEvent, contextMenu.close)
 
@@ -133,7 +133,7 @@ contextMenu.mergeAlbum = function(albumID, e) {
 
 				let title = lychee.html`<img class='cover' width='16' height='16' src='$${ this.thumbs[0] }'><div class='title'>$${ this.title }</div>`
 
-				if (this.id!=albumID) items.push({ title, fn: () => album.merge([albumID, this.id]) })
+				if (this.id!=albumID) items.push({ title, fn: () => album.merge([ albumID, this.id ]) })
 
 			})
 
@@ -154,13 +154,13 @@ contextMenu.photo = function(photoID, e) {
 	// in order to keep the selection
 
 	let items = [
-		{ title: build.iconic('star') + 'Star', fn: () => photo.setStar([photoID]) },
-		{ title: build.iconic('tag') + 'Tags', fn: () => photo.editTags([photoID]) },
+		{ title: build.iconic('star') + 'Star', fn: () => photo.setStar([ photoID ]) },
+		{ title: build.iconic('tag') + 'Tags', fn: () => photo.editTags([ photoID ]) },
 		{ },
-		{ title: build.iconic('pencil') + 'Rename', fn: () => photo.setTitle([photoID]) },
-		{ title: build.iconic('layers') + 'Duplicate', fn: () => photo.duplicate([photoID]) },
-		{ title: build.iconic('folder') + 'Move', fn: () => { basicContext.close(); contextMenu.move([photoID], e) } },
-		{ title: build.iconic('trash') + 'Delete', fn: () => photo.delete([photoID]) }
+		{ title: build.iconic('pencil') + 'Rename', fn: () => photo.setTitle([ photoID ]) },
+		{ title: build.iconic('layers') + 'Duplicate', fn: () => photo.duplicate([ photoID ]) },
+		{ title: build.iconic('folder') + 'Move', fn: () => { basicContext.close(); contextMenu.move([ photoID ], e) } },
+		{ title: build.iconic('trash') + 'Delete', fn: () => photo.delete([ photoID ]) }
 	]
 
 	$('.photo[data-id="' + photoID + '"]').addClass('active')
@@ -194,7 +194,7 @@ contextMenu.photoMulti = function(photoIDs, e) {
 contextMenu.photoTitle = function(albumID, photoID, e) {
 
 	let items = [
-		{ title: build.iconic('pencil') + 'Rename', fn: () => photo.setTitle([photoID]) }
+		{ title: build.iconic('pencil') + 'Rename', fn: () => photo.setTitle([ photoID ]) }
 	]
 
 	let data = album.json
@@ -236,7 +236,7 @@ contextMenu.photoMore = function(photoID, e) {
 
 contextMenu.move = function(photoIDs, e) {
 
-	var items = []
+	let items = []
 
 	api.post('Album::getAll', {}, function(data) {
 
@@ -278,8 +278,8 @@ contextMenu.move = function(photoIDs, e) {
 
 contextMenu.sharePhoto = function(photoID, e) {
 
-	let link      = photo.getViewLink(photoID),
-		iconClass = 'ionicons'
+	let link      = photo.getViewLink(photoID)
+	let iconClass = 'ionicons'
 
 	let items = [
 		{ title: `<input readonly id="link" value="${ link }">`, fn: () => {}, class: 'basicContext__item--noHover' },
diff --git a/src/scripts/header.js b/src/scripts/header.js
index bced47a..c8a9672 100644
--- a/src/scripts/header.js
+++ b/src/scripts/header.js
@@ -46,17 +46,17 @@ header.bind = function() {
 	header.dom('#button_info')        .on(eventName, sidebar.toggle)
 	header.dom('.button_add')         .on(eventName, contextMenu.add)
 	header.dom('#button_more')        .on(eventName, function(e) { contextMenu.photoMore(photo.getID(), e) })
-	header.dom('#button_move')        .on(eventName, function(e) { contextMenu.move([photo.getID()], e) })
+	header.dom('#button_move')        .on(eventName, function(e) { contextMenu.move([ photo.getID() ], e) })
 	header.dom('.header__hostedwith') .on(eventName, function() { window.open(lychee.website) })
-	header.dom('#button_trash_album') .on(eventName, function() { album.delete([album.getID()]) })
-	header.dom('#button_trash')       .on(eventName, function() { photo.delete([photo.getID()]) })
+	header.dom('#button_trash_album') .on(eventName, function() { album.delete([ album.getID() ]) })
+	header.dom('#button_trash')       .on(eventName, function() { photo.delete([ photo.getID() ]) })
 	header.dom('#button_archive')     .on(eventName, function() { album.getArchive(album.getID()) })
-	header.dom('#button_star')        .on(eventName, function() { photo.setStar([photo.getID()]) })
+	header.dom('#button_star')        .on(eventName, function() { photo.setStar([ photo.getID() ]) })
 	header.dom('#button_back_home')   .on(eventName, function() { lychee.goto('') })
 	header.dom('#button_back')        .on(eventName, function() { lychee.goto(album.getID()) })
 
 	header.dom('.header__search').on('keyup click', function() { search.find($(this).val()) })
-	header.dom('.header__clear').on(eventName, function () {
+	header.dom('.header__clear').on(eventName, function() {
 		header.dom('.header__search').focus()
 		search.reset()
 	})
@@ -99,8 +99,8 @@ header.hide = function(e, delay = 500) {
 
 header.setTitle = function(title = 'Untitled') {
 
-	let $title = header.dom('.header__title'),
-	    html   = lychee.html`$${ title }${ build.iconic('caret-bottom') }`
+	let $title = header.dom('.header__title')
+	let html   = lychee.html`$${ title }${ build.iconic('caret-bottom') }`
 
 	$title.html(html)
 
diff --git a/src/scripts/init.js b/src/scripts/init.js
index 474064d..612eeff 100755
--- a/src/scripts/init.js
+++ b/src/scripts/init.js
@@ -24,38 +24,38 @@ $(document).ready(function() {
 
 	// Keyboard
 	Mousetrap
-		.bind('left', function() {
+		.bind([ 'left' ], function() {
 			if (visible.photo()) { $('#imageview a#previous').click(); return false }
 		})
-		.bind('right', function() {
+		.bind([ 'right' ], function() {
 			if (visible.photo()) { $('#imageview a#next').click(); return false }
 		})
-		.bind('u', function() {
+		.bind([ 'u' ], function() {
 			if (!visible.photo()) { $('#upload_files').click(); return false }
 		})
-		.bind(['s', 'f'], function() {
+		.bind([ 's', 'f' ], function() {
 			if (visible.photo())       { header.dom('#button_star').click(); return false }
 			else if (visible.albums()) { header.dom('.header__search').focus(); return false }
 		})
-		.bind('r', function() {
+		.bind([ 'r' ], function() {
 			if (visible.album())      { album.setTitle(album.getID()); return false }
 			else if (visible.photo()) { photo.setTitle([photo.getID()]); return false }
 		})
-		.bind('d', function() {
+		.bind([ 'd' ], function() {
 			if (visible.photo())      { photo.setDescription(photo.getID()); return false }
 			else if (visible.album()) { album.setDescription(album.getID()); return false }
 		})
-		.bind('t', function() {
+		.bind([ 't' ], function() {
 			if (visible.photo()) { photo.editTags([photo.getID()]); return false }
 		})
-		.bind('i', function() {
+		.bind([ 'i' ], function() {
 			if (!visible.multiselect()) { sidebar.toggle(); return false }
 		})
-		.bind(['command+backspace', 'ctrl+backspace'], function() {
+		.bind([ 'command+backspace', 'ctrl+backspace' ], function() {
 			if (visible.photo() && basicModal.visible()===false)      { photo.delete([photo.getID()]); return false }
 			else if (visible.album() && basicModal.visible()===false) { album.delete([album.getID()]); return false }
 		})
-		.bind(['command+a', 'ctrl+a'], function() {
+		.bind([ 'command+a', 'ctrl+a' ], function() {
 			if (visible.album() && basicModal.visible()===false)       { multiselect.selectAll(); return false }
 			else if (visible.albums() && basicModal.visible()===false) { multiselect.selectAll(); return false }
 		})
@@ -64,7 +64,7 @@ $(document).ready(function() {
 		if (basicModal.visible()===true) basicModal.action()
 	})
 
-	Mousetrap.bindGlobal(['esc', 'command+up'], function() {
+	Mousetrap.bindGlobal([ 'esc', 'command+up' ], function() {
 		if (basicModal.visible()===true)                                             basicModal.cancel()
 		else if (visible.contextMenu())                                              contextMenu.close()
 		else if (visible.photo())                                                    lychee.goto(album.getID())
diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index c326cef..1efc4eb 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -84,8 +84,8 @@ lychee.init = function() {
 
 lychee.login = function(data) {
 
-	let user     = data.username,
-	    password = data.password
+	let user     = data.username
+	let password = data.password
 
 	let params = {
 		user,
@@ -169,9 +169,9 @@ lychee.goto = function(url) {
 
 lychee.load = function() {
 
-	let albumID = '',
-	    photoID = '',
-	    hash    = document.location.hash.replace('#', '').split('/')
+	let albumID = ''
+	let photoID = ''
+	let hash    = document.location.hash.replace('#', '').split('/')
 
 	$('.no_content').remove()
 	contextMenu.close()
@@ -227,9 +227,13 @@ lychee.load = function() {
 
 lychee.getUpdate = function() {
 
+	const success = function(data) {
+		if (data.lychee.version>parseInt(lychee.versionCode)) $('.version span').show()
+	}
+
 	$.ajax({
 		url     : lychee.updatePath,
-		success : function(data) { if (data.lychee.version>parseInt(lychee.versionCode)) $('.version span').show() },
+		success : success
 	})
 
 }
@@ -256,14 +260,14 @@ lychee.setMode = function(mode) {
 		.off('drop')
 
 	Mousetrap
-		.unbind('u')
-		.unbind('s')
-		.unbind('f')
-		.unbind('r')
-		.unbind('d')
-		.unbind('t')
-		.unbind(['command+backspace', 'ctrl+backspace'])
-		.unbind(['command+a', 'ctrl+a'])
+		.unbind([ 'u' ])
+		.unbind([ 's' ])
+		.unbind([ 'f' ])
+		.unbind([ 'r' ])
+		.unbind([ 'd' ])
+		.unbind([ 't' ])
+		.unbind([ 'command+backspace', 'ctrl+backspace' ])
+		.unbind([ 'command+a', 'ctrl+a' ])
 
 	if (mode==='public') {
 
@@ -271,7 +275,8 @@ lychee.setMode = function(mode) {
 
 	} else if (mode==='view') {
 
-		Mousetrap.unbind(['esc', 'command+up'])
+		Mousetrap.unbind([ 'esc', 'command+up' ])
+
 		$('#button_back, a#next, a#previous').remove()
 		$('.no_content').remove()
 
@@ -285,8 +290,8 @@ lychee.setMode = function(mode) {
 lychee.animate = function(obj, animation) {
 
 	let animations = [
-		['fadeIn', 'fadeOut'],
-		['contentZoomIn', 'contentZoomOut']
+		[ 'fadeIn', 'fadeOut' ],
+		[ 'contentZoomIn', 'contentZoomOut' ]
 	]
 
 	if (!obj.jQuery) obj = $(obj)
@@ -306,8 +311,8 @@ lychee.animate = function(obj, animation) {
 
 lychee.retinize = function(path = '') {
 
-	let extention = path.split('.').pop(),
-	    isPhoto   = extention!=='svg'
+	let extention = path.split('.').pop()
+	let isPhoto   = extention!=='svg'
 
 	if (isPhoto===true) {
 
@@ -329,8 +334,8 @@ lychee.loadDropbox = function(callback) {
 
 		loadingBar.show()
 
-		let g = document.createElement('script'),
-		    s = document.getElementsByTagName('script')[0]
+		let g = document.createElement('script')
+		let s = document.getElementsByTagName('script')[0]
 
 		g.src   = 'https://www.dropbox.com/static/api/1/dropins.js'
 		g.id    = 'dropboxjs'
@@ -360,8 +365,8 @@ lychee.loadDropbox = function(callback) {
 
 lychee.getEventName = function() {
 
-	let touchendSupport = (/Android|iPhone|iPad|iPod/i).test(navigator.userAgent || navigator.vendor || window.opera) && ('ontouchend' in document.documentElement),
-	    eventName       = (touchendSupport===true ? 'touchend' : 'click')
+	let touchendSupport = (/Android|iPhone|iPad|iPod/i).test(navigator.userAgent || navigator.vendor || window.opera) && ('ontouchend' in document.documentElement)
+	let eventName       = (touchendSupport===true ? 'touchend' : 'click')
 
 	return eventName
 
@@ -388,8 +393,8 @@ lychee.html = function(literalSections, ...substs) {
 
 	// Use raw literal sections: we don’t want
 	// backslashes (\n etc.) to be interpreted
-	let raw    = literalSections.raw,
-	    result = ''
+	let raw    = literalSections.raw
+	let result = ''
 
 	substs.forEach((subst, i) => {
 
@@ -412,7 +417,7 @@ lychee.html = function(literalSections, ...substs) {
 	// Take care of last literal section
 	// (Never fails, because an empty template string
 	// produces one literal section, an empty string)
-	result += raw[raw.length-1]
+	result += raw[raw.length - 1]
 
 	return result
 
diff --git a/src/scripts/multiselect.js b/src/scripts/multiselect.js
index b9318fe..e9c60e2 100644
--- a/src/scripts/multiselect.js
+++ b/src/scripts/multiselect.js
@@ -89,8 +89,8 @@ multiselect.resize = function(e) {
 	    multiselect.position.bottom === null ||
 	    multiselect.position.left   === null) return false
 
-	let newSize      = {},
-	    documentSize = {}
+	let newSize      = {}
+	let documentSize = {}
 
 	// Get the position of the mouse
 	let mousePos = {
@@ -114,7 +114,7 @@ multiselect.resize = function(e) {
 
 		// Do not leave the screen
 		newSize.height = mousePos.y - multiselect.position.top
-		if ((multiselect.position.top+newSize.height)>=documentSize.height) {
+		if ((multiselect.position.top + newSize.height)>=documentSize.height) {
 			newSize.height -= (multiselect.position.top + newSize.height) - documentSize.height + 2
 		}
 
@@ -136,7 +136,7 @@ multiselect.resize = function(e) {
 
 		// Do not leave the screen
 		newSize.width = mousePos.x - multiselect.position.left
-		if ((multiselect.position.left+newSize.width)>=documentSize.width) {
+		if ((multiselect.position.left + newSize.width)>=documentSize.width) {
 			newSize.width -= (multiselect.position.left + newSize.width) - documentSize.width + 2
 		}
 
@@ -167,8 +167,8 @@ multiselect.getSize = function() {
 
 	if (!visible.multiselect()) return false
 
-	let $elem  = $('#multiselect'),
-	    offset = $elem.offset()
+	let $elem  = $('#multiselect')
+	let offset = $elem.offset()
 
 	return {
 		top    : offset.top,
@@ -181,9 +181,9 @@ multiselect.getSize = function() {
 
 multiselect.getSelection = function(e) {
 
-	let tolerance = 150,
-	    ids       = [],
-	    size      = multiselect.getSize()
+	let tolerance = 150
+	let ids       = []
+	let size      = multiselect.getSize()
 
 	if (visible.contextMenu())  return false
 	if (!visible.multiselect()) return false
@@ -192,19 +192,19 @@ multiselect.getSelection = function(e) {
 
 		let offset = $(this).offset()
 
-		if (offset.top>=(size.top-tolerance) &&
-			offset.left>=(size.left-tolerance) &&
-			(offset.top+206)<=(size.top+size.height+tolerance) &&
-			(offset.left+206)<=(size.left+size.width+tolerance)) {
+		if (offset.top>=(size.top - tolerance) &&
+			offset.left>=(size.left - tolerance) &&
+			(offset.top + 206)<=(size.top + size.height + tolerance) &&
+			(offset.left + 206)<=(size.left + size.width + tolerance)) {
 
-				let id = $(this).data('id')
+			let id = $(this).data('id')
 
-				if (id!=='0' && id!==0 && id!=='f' && id!=='s' && id!=='r' && id!=null) {
+			if (id!=='0' && id!==0 && id!=='f' && id!=='s' && id!=='r' && id!=null) {
 
-					ids.push(id)
-					$(this).addClass('active')
+				ids.push(id)
+				$(this).addClass('active')
 
-				}
+			}
 
 		}
 
diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index c486313..7c73d44 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -71,8 +71,8 @@ photo.preloadNext = function(photoID) {
 	    album.json.content[photoID] &&
 	    album.json.content[photoID].nextPhoto!='') {
 
-		let nextPhoto = album.json.content[photoID].nextPhoto,
-		    url       = album.json.content[nextPhoto].url
+		let nextPhoto = album.json.content[photoID].nextPhoto
+		let url       = album.json.content[nextPhoto].url
 
 		$('head [data-prefetch]').remove()
 		$('head').append(`<link data-prefetch rel="prefetch" href="${ url }">`)
@@ -152,7 +152,7 @@ photo.next = function(animate) {
 photo.duplicate = function(photoIDs) {
 
 	if (!photoIDs) return false
-	if (photoIDs instanceof Array===false) photoIDs = [photoIDs]
+	if (photoIDs instanceof Array===false) photoIDs = [ photoIDs ]
 
 	albums.refresh()
 
@@ -171,13 +171,13 @@ photo.duplicate = function(photoIDs) {
 
 photo.delete = function(photoIDs) {
 
-	let action     = {},
-	    cancel     = {},
-	    msg        = '',
-	    photoTitle = ''
+	let action     = {}
+	let cancel     = {}
+	let msg        = ''
+	let photoTitle = ''
 
 	if (!photoIDs) return false
-	if (photoIDs instanceof Array===false) photoIDs = [photoIDs]
+	if (photoIDs instanceof Array===false) photoIDs = [ photoIDs ]
 
 	if (photoIDs.length===1) {
 
@@ -192,8 +192,8 @@ photo.delete = function(photoIDs) {
 
 	action.fn = function() {
 
-		let nextPhoto,
-			previousPhoto
+		let nextPhoto
+		let previousPhoto
 
 		basicModal.close()
 
@@ -269,11 +269,11 @@ photo.delete = function(photoIDs) {
 
 photo.setTitle = function(photoIDs) {
 
-	let oldTitle = '',
-	    msg      = ''
+	let oldTitle = ''
+	let msg      = ''
 
 	if (!photoIDs) return false
-	if (photoIDs instanceof Array===false) photoIDs = [photoIDs]
+	if (photoIDs instanceof Array===false) photoIDs = [ photoIDs ]
 
 	if (photoIDs.length===1) {
 
@@ -300,8 +300,8 @@ photo.setTitle = function(photoIDs) {
 		})
 
 		let params = {
-			photoIDs: photoIDs.join(),
-			title: newTitle
+			photoIDs : photoIDs.join(),
+			title    : newTitle
 		}
 
 		api.post('Photo::setTitle', params, function(data) {
@@ -335,11 +335,11 @@ photo.setTitle = function(photoIDs) {
 
 photo.setAlbum = function(photoIDs, albumID) {
 
-	let nextPhoto,
-		previousPhoto
+	let nextPhoto
+	let previousPhoto
 
 	if (!photoIDs) return false
-	if (photoIDs instanceof Array===false) photoIDs = [photoIDs]
+	if (photoIDs instanceof Array===false) photoIDs = [ photoIDs ]
 
 	if (visible.photo) lychee.goto(album.getID())
 
@@ -416,7 +416,7 @@ photo.setPublic = function(photoID, e) {
 		}
 
 		basicModal.show({
-			body: "<p>This photo is located in a public album. To make this photo private or public, edit the visibility of the associated album.</p>",
+			body: '<p>This photo is located in a public album. To make this photo private or public, edit the visibility of the associated album.</p>',
 			buttons: {
 				action: {
 					title: 'Show Album',
@@ -500,11 +500,11 @@ photo.setDescription = function(photoID) {
 
 photo.editTags = function(photoIDs) {
 
-	let oldTags = '',
-	    msg     = ''
+	let oldTags = ''
+	let msg     = ''
 
 	if (!photoIDs) return false
-	if (photoIDs instanceof Array===false) photoIDs = [photoIDs]
+	if (photoIDs instanceof Array===false) photoIDs = [ photoIDs ]
 
 	// Get tags
 	if (visible.photo())                              oldTags = photo.json.tags
@@ -591,14 +591,14 @@ photo.deleteTag = function(photoID, index) {
 
 	// Save
 	photo.json.tags = tags.toString()
-	photo.setTags([photoID], photo.json.tags)
+	photo.setTags([ photoID ], photo.json.tags)
 
 }
 
 photo.share = function(photoID, service) {
 
-	let link = '',
-	    url  = photo.getViewLink(photoID)
+	let link = ''
+	let url  = photo.getViewLink(photoID)
 
 	switch (service) {
 		case 'twitter':
@@ -627,8 +627,8 @@ photo.share = function(photoID, service) {
 
 photo.getArchive = function(photoID) {
 
-	let link,
-	    url = `${ api.path }?function=Photo::getArchive&photoID=${ photoID }`
+	let link
+	let url = `${ api.path }?function=Photo::getArchive&photoID=${ photoID }`
 
 	if (location.href.indexOf('index.html')>0) link = location.href.replace(location.hash, '').replace('index.html', url)
 	else                                       link = location.href.replace(location.hash, '') + url
diff --git a/src/scripts/search.js b/src/scripts/search.js
index af7e142..a723a1c 100755
--- a/src/scripts/search.js
+++ b/src/scripts/search.js
@@ -19,9 +19,9 @@ search.find = function(term) {
 
 			api.post('search', { term }, function(data) {
 
-				let html       = '',
-				    albumsData = '',
-				    photosData = ''
+				let html       = ''
+				let albumsData = ''
+				let photosData = ''
 
 				// Build albums
 				if (data && data.albums) {
diff --git a/src/scripts/settings.js b/src/scripts/settings.js
index 876ef8b..db5810f 100644
--- a/src/scripts/settings.js
+++ b/src/scripts/settings.js
@@ -9,11 +9,11 @@ settings.createConfig = function() {
 
 	const action = function(data) {
 
-		let dbName        = data.dbName        || '',
-		    dbUser        = data.dbUser        || '',
-		    dbPassword    = data.dbPassword    || '',
-		    dbHost        = data.dbHost        || '',
-		    dbTablePrefix = data.dbTablePrefix || ''
+		let dbName        = data.dbName        || ''
+		let dbUser        = data.dbUser        || ''
+		let dbPassword    = data.dbPassword    || ''
+		let dbHost        = data.dbHost        || ''
+		let dbTablePrefix = data.dbTablePrefix || ''
 
 		if (dbUser.length<1) {
 			basicModal.error('dbUser')
@@ -140,8 +140,8 @@ settings.createLogin = function() {
 
 	const action = function(data) {
 
-		let username = data.username,
-		    password = data.password
+		let username = data.username
+		let password = data.password
 
 		if (username.length<1) {
 			basicModal.error('username')
@@ -204,9 +204,9 @@ settings.setLogin = function() {
 
 	const action = function(data) {
 
-		let oldPassword = data.oldPassword || '',
-		    username    = data.username    || '',
-		    password    = data.password    || ''
+		let oldPassword = data.oldPassword || ''
+		let username    = data.username    || ''
+		let password    = data.password    || ''
 
 		if (oldPassword.length<1) {
 			basicModal.error('oldPassword')
@@ -269,8 +269,8 @@ settings.setLogin = function() {
 
 settings.setSorting = function() {
 
-	let sortingPhotos = [],
-	    sortingAlbums = []
+	let sortingPhotos = []
+	let sortingAlbums = []
 
 	const action = function() {
 
diff --git a/src/scripts/sidebar.js b/src/scripts/sidebar.js
index f628506..8f1770b 100644
--- a/src/scripts/sidebar.js
+++ b/src/scripts/sidebar.js
@@ -30,14 +30,14 @@ sidebar.bind = function() {
 	// event handlers should be removed before binding a new one.
 
 	// Event Name
-	let eventName = lychee.getEventName();
+	let eventName = lychee.getEventName()
 
 	sidebar
 		.dom('#edit_title')
 		.off(eventName)
 		.on(eventName, function() {
-			if (visible.photo())      photo.setTitle([photo.getID()])
-			else if (visible.album()) album.setTitle([album.getID()])
+			if (visible.photo())      photo.setTitle([ photo.getID() ])
+			else if (visible.album()) album.setTitle([ album.getID() ])
 		})
 
 	sidebar
@@ -52,7 +52,7 @@ sidebar.bind = function() {
 		.dom('#edit_tags')
 		.off(eventName)
 		.on(eventName, function() {
-			photo.editTags([photo.getID()])
+			photo.editTags([ photo.getID() ])
 		})
 
 	sidebar
@@ -114,10 +114,10 @@ sidebar.createStructure.photo = function(data) {
 
 	if (data==null || data==='') return false
 
-	let editable  = false,
-	    exifHash  = data.takestamp + data.make + data.model + data.shutter + data.aperture + data.focal + data.iso,
-	    structure = {},
-	    _public   = ''
+	let editable  = false
+	let exifHash  = data.takestamp + data.make + data.model + data.shutter + data.aperture + data.focal + data.iso
+	let structure = {}
+	let _public   = ''
 
 	// Enable editable when user logged in
 	if (lychee.publicMode===false) editable = true
@@ -220,12 +220,12 @@ sidebar.createStructure.album = function(data) {
 
 	if (data==null || data==='') return false
 
-	let editable     = false,
-	    structure    = {},
-	    _public      = '',
-	    visible      = '',
-	    downloadable = '',
-	    password     = ''
+	let editable     = false
+	let structure    = {}
+	let _public      = ''
+	let visible      = ''
+	let downloadable = ''
+	let password     = ''
 
 	// Enable editable when user logged in
 	if (lychee.publicMode===false) editable = true
@@ -367,8 +367,8 @@ sidebar.render = function(structure) {
 
 	let renderTags = function(section) {
 
-		let _html    = '',
-		    editable = ''
+		let _html    = ''
+		let editable = ''
 
 		// Add edit-icon to the value when editable
 		if (section.editable===true) editable = build.editIcon('edit_tags')
diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index 2d473af..9f546e7 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -40,16 +40,16 @@ upload.start = {
 
 	local: function(files) {
 
-		let albumID = album.getID(),
-		    error   = false,
-		    warning = false
+		let albumID = album.getID()
+		let error   = false
+		let warning = false
 
 		const process = function(files, file) {
 
-			let formData     = new FormData(),
-				xhr          = new XMLHttpRequest(),
-				pre_progress = 0,
-				progress     = 0
+			let formData     = new FormData()
+			let xhr          = new XMLHttpRequest()
+			let pre_progress = 0
+			let progress     = 0
 
 			const finish = function() {
 
@@ -122,8 +122,8 @@ upload.start = {
 
 			xhr.onload = function() {
 
-				let wait      = false,
-				    errorText = ''
+				let wait      = false
+				let errorText = ''
 
 				file.ready = true
 
@@ -131,7 +131,7 @@ upload.start = {
 				if (xhr.status===200 && xhr.responseText==='1') {
 
 					// Success
-					$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
+					$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status')
 						.html('Finished')
 						.addClass('success')
 
@@ -143,7 +143,7 @@ upload.start = {
 						error     = true
 
 						// Error Status
-						$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
+						$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status')
 							.html('Failed')
 							.addClass('error')
 
@@ -153,7 +153,7 @@ upload.start = {
 						warning   = true
 
 						// Warning Status
-						$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
+						$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status')
 							.html('Skipped')
 							.addClass('warning')
 
@@ -163,13 +163,13 @@ upload.start = {
 						error     = true
 
 						// Error Status
-						$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status')
+						$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status')
 							.html('Failed')
 							.addClass('error')
 
 					}
 
-					$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') p.notice')
+					$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') p.notice')
 						.html(errorText)
 						.show()
 
@@ -210,11 +210,11 @@ upload.start = {
 
 					// Scroll to the uploading file
 					let scrollPos = 0
-					if ((file.num+1)>4) scrollPos = (file.num + 1 - 4) * 40
+					if ((file.num + 1)>4) scrollPos = (file.num + 1 - 4) * 40
 					$('.basicModal .rows').scrollTop(scrollPos)
 
 					// Set status to processing
-					$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html('Processing')
+					$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status').html('Processing')
 
 					// Upload next file
 					if (file.next!=null) process(files, file.next)
@@ -236,7 +236,7 @@ upload.start = {
 			files[i].ready     = false
 			files[i].supported = true
 
-			if (i < files.length-1) files[i].next = files[i+1]
+			if (i < files.length-1) files[i].next = files[i + 1]
 			else                    files[i].next = null
 
 			// Check if file is supported
@@ -480,7 +480,7 @@ upload.start = {
 			}
 
 			// Remove last comma
-			links = links.substr(0, links.length-1)
+			links = links.substr(0, links.length - 1)
 
 			upload.show('Importing from Dropbox', files, function() {
 
diff --git a/src/scripts/view.js b/src/scripts/view.js
index 099295a..02cc498 100644
--- a/src/scripts/view.js
+++ b/src/scripts/view.js
@@ -26,8 +26,8 @@ view.albums = {
 
 		init: function() {
 
-			let smartData  = '',
-			    albumsData = ''
+			let smartData  = ''
+			let albumsData = ''
 
 			// Smart Albums
 			if (lychee.publicMode===false) {
@@ -271,8 +271,8 @@ view.album = {
 
 		if ((visible.album() || !album.json.init) && !visible.photo()) {
 
-			let structure = sidebar.createStructure.album(album.json),
-			    html      = sidebar.render(structure)
+			let structure = sidebar.createStructure.album(album.json)
+			let html      = sidebar.render(structure)
 
 			sidebar.dom('.sidebar__wrapper').html(html)
 			sidebar.bind()
@@ -408,27 +408,33 @@ view.photo = {
 
 		lychee.imageview.html(build.imageview(photo.json, visible.header()))
 
-		let $nextArrow     = lychee.imageview.find('a#next'),
-		    $previousArrow = lychee.imageview.find('a#previous'),
-		    photoID        = photo.getID(),
-		    hasNext        = album.json && album.json.content && album.json.content[photoID] && album.json.content[photoID].nextPhoto!=='',
-		    hasPrevious    = album.json && album.json.content && album.json.content[photoID] && album.json.content[photoID].previousPhoto!==''
+		let $nextArrow     = lychee.imageview.find('a#next')
+		let $previousArrow = lychee.imageview.find('a#previous')
+		let photoID        = photo.getID()
+		let hasNext        = album.json && album.json.content && album.json.content[photoID] && album.json.content[photoID].nextPhoto!==''
+		let hasPrevious    = album.json && album.json.content && album.json.content[photoID] && album.json.content[photoID].previousPhoto!==''
 
-		if (hasNext===false || lychee.viewMode===true) { $nextArrow.hide() }
-		else {
+		if (hasNext===false || lychee.viewMode===true) {
 
-			let nextPhotoID = album.json.content[photoID].nextPhoto,
-			    nextPhoto   = album.json.content[nextPhotoID]
+			$nextArrow.hide()
+
+		} else {
+
+			let nextPhotoID = album.json.content[photoID].nextPhoto
+			let nextPhoto   = album.json.content[nextPhotoID]
 
 			$nextArrow.css('background-image', lychee.html`linear-gradient(to bottom, rgba(0, 0, 0, .4), rgba(0, 0, 0, .4)), url("$${ nextPhoto.thumbUrl }")`)
 
 		}
 
-		if (hasPrevious===false || lychee.viewMode===true) { $previousArrow.hide() }
-		else {
+		if (hasPrevious===false || lychee.viewMode===true) {
 
-			let previousPhotoID = album.json.content[photoID].previousPhoto,
-			    previousPhoto   = album.json.content[previousPhotoID]
+			$previousArrow.hide()
+
+		} else {
+
+			let previousPhotoID = album.json.content[photoID].previousPhoto
+			let previousPhoto   = album.json.content[previousPhotoID]
 
 			$previousArrow.css('background-image', lychee.html`linear-gradient(to bottom, rgba(0, 0, 0, .4), rgba(0, 0, 0, .4)), url("$${ previousPhoto.thumbUrl }")`)
 
@@ -438,8 +444,8 @@ view.photo = {
 
 	sidebar: function() {
 
-		let structure = sidebar.createStructure.photo(photo.json),
-		    html      = sidebar.render(structure)
+		let structure = sidebar.createStructure.photo(photo.json)
+		let html      = sidebar.render(structure)
 
 		sidebar.dom('.sidebar__wrapper').html(html)
 		sidebar.bind()
diff --git a/src/scripts/view/main.js b/src/scripts/view/main.js
index 5f03cbe..e7a2725 100644
--- a/src/scripts/view/main.js
+++ b/src/scripts/view/main.js
@@ -11,8 +11,8 @@ lychee.content = $('.content')
 
 lychee.getEventName = function() {
 
-	let touchendSupport = (/Android|iPhone|iPad|iPod/i).test(navigator.userAgent || navigator.vendor || window.opera) && ('ontouchend' in document.documentElement),
-	    eventName       = (touchendSupport===true ? 'touchend' : 'click')
+	let touchendSupport = (/Android|iPhone|iPad|iPod/i).test(navigator.userAgent || navigator.vendor || window.opera) && ('ontouchend' in document.documentElement)
+	let eventName       = (touchendSupport===true ? 'touchend' : 'click')
 
 	return eventName
 
@@ -39,8 +39,8 @@ lychee.html = function(literalSections, ...substs) {
 
 	// Use raw literal sections: we don’t want
 	// backslashes (\n etc.) to be interpreted
-	let raw    = literalSections.raw,
-	    result = ''
+	let raw    = literalSections.raw
+	let result = ''
 
 	substs.forEach((subst, i) => {
 
@@ -63,7 +63,7 @@ lychee.html = function(literalSections, ...substs) {
 	// Take care of last literal section
 	// (Never fails, because an empty template string
 	// produces one literal section, an empty string)
-	result += raw[raw.length-1]
+	result += raw[raw.length - 1]
 
 	return result
 
@@ -127,8 +127,8 @@ const loadPhotoInfo = function(photoID) {
 		imageview.addClass('fadeIn').show()
 
 		// Render Sidebar
-		let structure = sidebar.createStructure.photo(data),
-		    html      = sidebar.render(structure)
+		let structure = sidebar.createStructure.photo(data)
+		let html      = sidebar.render(structure)
 
 		sidebar.dom('.sidebar__wrapper').html(html)
 		sidebar.bind()

From 454a503196d3f13067dc771782af3f4682c67c5e Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 15:21:40 +0100
Subject: [PATCH 017/183] Rebuild

---
 dist/main.css | Bin 31994 -> 32020 bytes
 dist/main.js  | Bin 190680 -> 192549 bytes
 dist/view.js  | Bin 105146 -> 107024 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.css b/dist/main.css
index 63c0582915a29247aa0cf0cd7c98eb4bf278166f..ffedd78f8afda0cf78a65f28e0c244ac7ee0f00b 100755
GIT binary patch
delta 27
jcmezMlX1!~#tl-=Ji58Xy6HukDY`}Z<(qk&-&q0xrW6Y+

delta 14
WcmbR8i}BY_#tl-=n@yY_SONezJ_ghP

diff --git a/dist/main.js b/dist/main.js
index cb570890acad884cf55aa08c1a8e1ecaf10578bb..a813e60400c5aec0a6f623fc4dab3763c33d450a 100644
GIT binary patch
delta 31629
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
Y7pw_c9WNgHY}qsD@M7yP%I;(T8>lu4L;wH)

delta 30029
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

diff --git a/dist/view.js b/dist/view.js
index 388f4a0a27aca4e07152ae58ff35b0476b1af4a3..825385ae2a3ccab785da8aa5f1f5cd1e85e3f538 100644
GIT binary patch
delta 29808
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
M^U#SY>Fl=u4NFPvC;$Ke

delta 28206
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


From b4084102e8a452822787875c31127173e25ab141 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 15:39:12 +0100
Subject: [PATCH 018/183] Fixed the loading bar

---
 src/scripts/loadingBar.js | 6 +++---
 src/styles/_header.scss   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/scripts/loadingBar.js b/src/scripts/loadingBar.js
index f656511..732d0e5 100755
--- a/src/scripts/loadingBar.js
+++ b/src/scripts/loadingBar.js
@@ -29,7 +29,7 @@ loadingBar.show = function(status, errorText) {
 		if (!errorText) errorText = 'Whoops, it looks like something went wrong. Please reload the site and try again!'
 
 		// Move header down
-		if (visible.header()) header.dom().addClass('header__error')
+		if (visible.header()) header.dom().addClass('header--error')
 
 		// Modify loading
 		loadingBar.dom()
@@ -56,7 +56,7 @@ loadingBar.show = function(status, errorText) {
 		loadingBar._timeout = setTimeout(() => {
 
 			// Move header down
-			if (visible.header()) header.dom().addClass('header__loading')
+			if (visible.header()) header.dom().addClass('header--loading')
 
 			// Modify loading
 			loadingBar.dom()
@@ -81,7 +81,7 @@ loadingBar.hide = function(force) {
 		loadingBar.status = null
 
 		// Move header up
-		header.dom().removeClass('header__error header__loading')
+		header.dom().removeClass('header--error header--loading')
 
 		// Set timeout
 		clearTimeout(loadingBar._timeout)
diff --git a/src/styles/_header.scss b/src/styles/_header.scss
index 96f29fe..f727063 100644
--- a/src/styles/_header.scss
+++ b/src/styles/_header.scss
@@ -19,7 +19,7 @@
 		background: none;
 		border-bottom: none;
 
-		.header__error { background-color: rgba(10, 10, 10, .99); }
+		&.header--error { background-color: rgba(10, 10, 10, .99); }
 	}
 
 	// Toolbars -------------------------------------------------------------- //

From 61c13e36a0829b2d836730272bab1ecdf7b85195 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 15:39:22 +0100
Subject: [PATCH 019/183] Rebuild

---
 dist/main.css | Bin 32020 -> 32019 bytes
 dist/main.js  | Bin 192549 -> 192549 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 dist/main.js

diff --git a/dist/main.css b/dist/main.css
index ffedd78f8afda0cf78a65f28e0c244ac7ee0f00b..7edc009c68d977ae6e352ed9e987e1b4388a9587 100755
GIT binary patch
delta 24
gcmbR8i*fQV#tqY*IQ2486H`))bagi`bSkz20EH$A<NyEw

delta 25
hcmbRIi*d>?#tqY*xD@m<QWH~Bi{j%qFK{Zh0sxLl3TOZT

diff --git a/dist/main.js b/dist/main.js
old mode 100644
new mode 100755
index a813e60400c5aec0a6f623fc4dab3763c33d450a..e6e9190a58c6284c2014aff798cb8606707054e2
GIT binary patch
delta 54
zcmZ4bfP3i!?uHh|Ell~QOuD+;3r(38FoGDu=1lC20=l}XMMe2V3K^-1DXB$3VJ!=$
G-`fG^FcF6U

delta 54
zcmZ4bfP3i!?uHh|Ell~QO!4vC3r(38FoGDu=1lC20`c*wMMe2V3K^-1DXB$3VJ!=$
G-`fEU>k}6M


From 9e52f93a59d83099c799e02331c182eb19ded32f Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 16:51:09 +0100
Subject: [PATCH 020/183] Removed database updates for versions <= 2.5.0

---
 php/database/update_020100.php | 44 ----------------------------------
 php/database/update_020101.php | 20 ----------------
 php/database/update_020200.php | 23 ------------------
 php/modules/Database.php       |  3 ---
 4 files changed, 90 deletions(-)
 delete mode 100644 php/database/update_020100.php
 delete mode 100644 php/database/update_020101.php
 delete mode 100644 php/database/update_020200.php

diff --git a/php/database/update_020100.php b/php/database/update_020100.php
deleted file mode 100644
index a9c9c9b..0000000
--- a/php/database/update_020100.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-###
-# @name			Update to version 2.1
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
-$query = Database::prepare($database, "SELECT `tags` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
-if(!$database->query($query)) {
-	$query = Database::prepare($database, "ALTER TABLE `?` ADD `tags` VARCHAR( 1000 ) NULL DEFAULT ''", array(LYCHEE_TABLE_PHOTOS));
-	$result = $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020100', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-}
-
-$query	= Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'dropboxKey' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
-if ($result->num_rows===0) {
-	$query	= Database::prepare($database, "INSERT INTO `?` (`key`, `value`) VALUES ('dropboxKey', '')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020100', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-}
-
-$query	= Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'version' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
-if ($result->num_rows===0) {
-	$query	= Database::prepare($database, "INSERT INTO `?` (`key`, `value`) VALUES ('version', '020100')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020100', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-} else {
-	if (Database::setVersion($database, '020100')===false) return false;
-}
-
-?>
\ No newline at end of file
diff --git a/php/database/update_020101.php b/php/database/update_020101.php
deleted file mode 100644
index 435477e..0000000
--- a/php/database/update_020101.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-###
-# @name			Update to version 2.1.1
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
-$query	= Database::prepare($database, "ALTER TABLE `?` CHANGE `value` `value` VARCHAR( 200 ) NULL DEFAULT ''", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
-if (!$result) {
-	Log::error($database, 'update_020101', __LINE__, 'Could not update database (' . $database->error . ')');
-	return false;
-}
-
-# Set version
-if (Database::setVersion($database, '020101')===false) return false;
-
-?>
\ No newline at end of file
diff --git a/php/database/update_020200.php b/php/database/update_020200.php
deleted file mode 100644
index 161ccc2..0000000
--- a/php/database/update_020200.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-###
-# @name			Update to version 2.2
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
-$query = Database::prepare($database, "SELECT `visible` FROM `?` LIMIT 1", array(LYCHEE_TABLE_ALBUMS));
-if (!$database->query($query)) {
-	$query	= Database::prepare($database, "ALTER TABLE `?` ADD `visible` TINYINT(1) NOT NULL DEFAULT 1", array(LYCHEE_TABLE_ALBUMS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020200', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-}
-
-# Set version
-if (Database::setVersion($database, '020200')===false) return false;
-
-?>
\ No newline at end of file
diff --git a/php/modules/Database.php b/php/modules/Database.php
index 07d4035..3b088ed 100755
--- a/php/modules/Database.php
+++ b/php/modules/Database.php
@@ -10,9 +10,6 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 final class Database extends Module {
 
 	private static $versions = array(
-		'020100', #2.1
-		'020101', #2.1.1
-		'020200', #2.2
 		'020500', #2.5
 		'020505', #2.5.5
 		'020601', #2.6.1

From f7e624ca8b10d2e9e0fc07f24ef3a14fcc8e8b3d Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 17:09:49 +0100
Subject: [PATCH 021/183] Fixed 'Full Photo' in view.php

---
 src/scripts/view/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/view/main.js b/src/scripts/view/main.js
index e7a2725..329892e 100644
--- a/src/scripts/view/main.js
+++ b/src/scripts/view/main.js
@@ -88,7 +88,7 @@ $(document).ready(function() {
 	// Direct Link
 	header.dom('#button_direct').on(eventName, function() {
 
-		let link = $('#imageview #image').css('background-image').replace(/"/g,'').replace(/url\(|\)$/ig, '')
+		let link = $('#imageview img').attr('src').replace(/"/g,'').replace(/url\(|\)$/ig, '')
 		window.open(link, '_newtab')
 
 	})

From 24c883a661b7a617e146b1036118c94bd2564430 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 17:10:23 +0100
Subject: [PATCH 022/183] Use default value to define defineTablePrefix

---
 php/define.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/php/define.php b/php/define.php
index 65b99d6..01b59fd 100644
--- a/php/define.php
+++ b/php/define.php
@@ -31,7 +31,7 @@ define('LYCHEE_URL_UPLOADS_BIG', 'uploads/big/');
 define('LYCHEE_URL_UPLOADS_MEDIUM', 'uploads/medium/');
 define('LYCHEE_URL_UPLOADS_THUMB', 'uploads/thumb/');
 
-function defineTablePrefix($dbTablePrefix) {
+function defineTablePrefix($dbTablePrefix = '') {
 
 	# This part is wrapped into a function, because it needs to be called
 	# after the config-file has been loaded. Other defines are available
@@ -39,8 +39,7 @@ function defineTablePrefix($dbTablePrefix) {
 
 	# Parse table prefix
 	# Old users do not have the table prefix stored in their config-file
-	if (!isset($dbTablePrefix)||$dbTablePrefix==='') $dbTablePrefix = '';
-	else $dbTablePrefix .= '_';
+	if ($dbTablePrefix!=='') $dbTablePrefix .= '_';
 
 	# Define tables
 	define('LYCHEE_TABLE_ALBUMS', $dbTablePrefix . 'lychee_albums');

From 36b1b403259b00d3e4d81ffbbac89b5d3107b773 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 17:10:54 +0100
Subject: [PATCH 023/183] Added 'final' to access classes

---
 php/access/Admin.php        | 2 +-
 php/access/Guest.php        | 2 +-
 php/access/Installation.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/php/access/Admin.php b/php/access/Admin.php
index 251328e..8d02c74 100644
--- a/php/access/Admin.php
+++ b/php/access/Admin.php
@@ -8,7 +8,7 @@
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 if (!defined('LYCHEE_ACCESS_ADMIN')) exit('Error: You are not allowed to access this area!');
 
-class Admin extends Access {
+final class Admin extends Access {
 
 	public function check($fn) {
 
diff --git a/php/access/Guest.php b/php/access/Guest.php
index 2cfab14..94d9e31 100644
--- a/php/access/Guest.php
+++ b/php/access/Guest.php
@@ -8,7 +8,7 @@
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 if (!defined('LYCHEE_ACCESS_GUEST')) exit('Error: You are not allowed to access this area!');
 
-class Guest extends Access {
+final class Guest extends Access {
 
 	public function check($fn) {
 
diff --git a/php/access/Installation.php b/php/access/Installation.php
index ef1b21f..67c8811 100644
--- a/php/access/Installation.php
+++ b/php/access/Installation.php
@@ -8,7 +8,7 @@
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 if (!defined('LYCHEE_ACCESS_INSTALLATION')) exit('Error: You are not allowed to access this area!');
 
-class Installation extends Access {
+final class Installation extends Access {
 
 	public function check($fn) {
 

From c8a3a92c3f10e19fdcd3ee57b2cb83d863cf05ce Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 17:11:05 +0100
Subject: [PATCH 024/183] Rebuild

---
 dist/view.js | Bin 107024 -> 107009 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/view.js b/dist/view.js
index 825385ae2a3ccab785da8aa5f1f5cd1e85e3f538..084bab82048e3368096d073e4663f0a2df545500 100644
GIT binary patch
delta 33
pcmbPmgst%iTf-K{CG+?*bJLYH^%6@;iZqmpi;}k=n#btJ3;^LW4441_

delta 48
zcmZoX!ZzUuTf-K{CG+HzGjkKuQ<XIJl8cKql#&vYv(t<6OY>56!Q$ID&tvps1^~ob
B5*Gjf


From 0dffa5c765647ef8fb506b0c7a5599834e3bea32 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 18:38:26 +0100
Subject: [PATCH 025/183] Dropped update support for versions < 2.7

---
 docs/Update.md                 |  13 ++-
 php/database/update_020500.php | 156 ---------------------------------
 php/database/update_020505.php |  24 -----
 php/database/update_020601.php |  24 -----
 php/database/update_020602.php |  47 ----------
 php/modules/Database.php       |   4 -
 6 files changed, 9 insertions(+), 259 deletions(-)
 delete mode 100644 php/database/update_020500.php
 delete mode 100644 php/database/update_020505.php
 delete mode 100644 php/database/update_020601.php
 delete mode 100644 php/database/update_020602.php

diff --git a/docs/Update.md b/docs/Update.md
index 4fbec1d..ad8529c 100644
--- a/docs/Update.md
+++ b/docs/Update.md
@@ -1,15 +1,20 @@
+### Update requirements
+
+- Your system must comply with the latest [system requirements](https://github.com/electerious/Lychee/blob/master/docs/Installation.md) of Lychee.
+- Ensure that your current version is greater than 2.7.0. Updates from older Lychee versions aren't supported.
+
 ### Update with `git`
 
-The easiest way to update Lychee is with `git`:
+Updating Lychee with `git` is the easiest way:
 
 	git pull
-	
+
 ### Update manually
 
-1. Download the [newest Version](https://github.com/electerious/Lychee/archive/master.zip)
+1. Download the [newest Version](https://github.com/electerious/Lychee/release)
 2. Replace all existing files, excluding `uploads/` and `data/`
 3. Open Lychee (and enter your database details)
 
 ### Changelog
 
-Take a look at the [Changelog](Changelog.md) to see what's new.
+Take a look at the [Changelog](Changelog.md) to see what's new.
\ No newline at end of file
diff --git a/php/database/update_020500.php b/php/database/update_020500.php
deleted file mode 100644
index 9892961..0000000
--- a/php/database/update_020500.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-###
-# @name			Update to version 2.5
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
-# Add `plugins`
-$query	= Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'plugins' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
-if ($result->num_rows===0) {
-	$query	= Database::prepare($database, "INSERT INTO `?` (`key`, `value`) VALUES ('plugins', '')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-}
-
-# Add `takestamp`
-$query = Database::prepare($database, "SELECT `takestamp` FROM `?` LIMIT 1;", array(LYCHEE_TABLE_PHOTOS));
-if (!$database->query($query)) {
-	$query	= Database::prepare($database, "ALTER TABLE `?` ADD `takestamp` INT(11) DEFAULT NULL", array(LYCHEE_TABLE_PHOTOS));
-	$result = $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-}
-
-# Convert to `takestamp`
-$query = Database::prepare($database, "SELECT `takedate`, `taketime` FROM `?` LIMIT 1;", array(LYCHEE_TABLE_PHOTOS));
-if ($database->query($query)) {
-	$query	= Database::prepare($database, "SELECT `id`, `takedate`, `taketime` FROM `?` WHERE `takedate` <> '' AND `taketime` <> ''", array(LYCHEE_TABLE_PHOTOS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-	while ($photo = $result->fetch_object()) {
-		$takestamp	= strtotime($photo->takedate . $photo->taketime);
-		$query		= Database::prepare($database, "UPDATE `?` SET `takestamp` = '?' WHERE `id` = '?'", array(LYCHEE_TABLE_PHOTOS, $takestamp, $photo->id));
-		$database->query($query);
-	}
-	$query	= Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `takedate`;", array(LYCHEE_TABLE_PHOTOS));
-	$result	= $database->query($query);
-	$query	= Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `taketime`", array(LYCHEE_TABLE_PHOTOS));
-	$result	= $database->query($query);
-}
-
-# Remove `import_name`
-$query = Database::prepare($database, "SELECT `import_name` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
-if ($database->query($query)) {
-	$query	= Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `import_name`", array(LYCHEE_TABLE_PHOTOS));
-	$result	= $database->query($query);
-}
-
-# Remove `sysdate` and `systime`
-$query = Database::prepare($database, "SELECT `sysdate`, `systime` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
-if ($database->query($query)) {
-	$query	= Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `sysdate`", array(LYCHEE_TABLE_PHOTOS));
-	$result	= $database->query($query);
-	$query	= Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `systime`", array(LYCHEE_TABLE_PHOTOS));
-	$result	= $database->query($query);
-}
-
-# Add `sysstamp`
-$query = Database::prepare($database, "SELECT `sysstamp` FROM `?` LIMIT 1", array(LYCHEE_TABLE_ALBUMS));
-if (!$database->query($query)) {
-	$query	= Database::prepare($database, "ALTER TABLE `?` ADD `sysstamp` INT(11) DEFAULT NULL", array(LYCHEE_TABLE_ALBUMS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-}
-
-# Convert to `sysstamp`
-$query = Database::prepare($database, "SELECT `sysdate` FROM `?` LIMIT 1", array(LYCHEE_TABLE_ALBUMS));
-if ($database->query($query)) {
-	$query	= Database::prepare($database, "SELECT `id`, `sysdate` FROM `?`", array(LYCHEE_TABLE_ALBUMS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-	while ($album = $result->fetch_object()) {
-		$sysstamp	= strtotime($album->sysdate);
-		$query		= Database::prepare($database, "UPDATE `?` SET `sysstamp` = '?' WHERE `id` = '?'", array(LYCHEE_TABLE_ALBUMS, $sysstamp, $album->id));
-		$database->query($query);
-	}
-	$query	= Database::prepare($database, "ALTER TABLE `?` DROP COLUMN `sysdate`", array(LYCHEE_TABLE_ALBUMS));
-	$result	= $database->query($query);
-}
-
-# Set character of database
-$result = $database->query("ALTER DATABASE $dbName CHARACTER SET utf8 COLLATE utf8_general_ci;");
-if (!$result) {
-	Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-	return false;
-}
-
-# Set character
-$query	= Database::prepare($database, "ALTER TABLE `?` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci", array(LYCHEE_TABLE_ALBUMS));
-$result	= $database->query($query);
-if (!$result) {
-	Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-	return false;
-}
-
-# Set character
-$query	= Database::prepare($database, "ALTER TABLE `?` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci", array(LYCHEE_TABLE_PHOTOS));
-$result	= $database->query($query);
-if (!$result) {
-	Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-	return false;
-}
-
-# Set character
-$query	= Database::prepare($database, "ALTER TABLE `?` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
-if (!$result) {
-	Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-	return false;
-}
-
-# Set album password length to 100 (for longer hashes)
-$query	= Database::prepare($database, "ALTER TABLE `?` CHANGE `password` `password` VARCHAR(100)", array(LYCHEE_TABLE_ALBUMS));
-$result	= $database->query($query);
-if (!$result) {
-	Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-	return false;
-}
-
-# Set make length to 50
-$query	= Database::prepare($database, "ALTER TABLE `?` CHANGE `make` `make` VARCHAR(50)", array(LYCHEE_TABLE_PHOTOS));
-$result	= $database->query($query);
-if (!$result) {
-	Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-	return false;
-}
-
-# Reset sorting
-$query	= Database::prepare($database, "UPDATE ? SET value = 'ORDER BY takestamp DESC' WHERE `key` = 'sorting' AND `value` LIKE '%UNIX_TIMESTAMP%'", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
-if (!$result) {
-	Log::error($database, 'update_020500', __LINE__, 'Could not update database (' . $database->error . ')');
-	return false;
-}
-
-# Set version
-if (Database::setVersion($database, '020500')===false) return false;
-
-?>
\ No newline at end of file
diff --git a/php/database/update_020505.php b/php/database/update_020505.php
deleted file mode 100644
index 6c25fa0..0000000
--- a/php/database/update_020505.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-###
-# @name			Update to version 2.5.5
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
-# Add `checksum`
-$query = Database::prepare($database, "SELECT `checksum` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
-if (!$database->query($query)) {
-	$query	= Database::prepare($database, "ALTER TABLE `?` ADD `checksum` VARCHAR(100) DEFAULT NULL", array(LYCHEE_TABLE_PHOTOS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020505', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-}
-
-# Set version
-if (Database::setVersion($database, '020505')===false) return false;
-
-?>
\ No newline at end of file
diff --git a/php/database/update_020601.php b/php/database/update_020601.php
deleted file mode 100644
index 453114b..0000000
--- a/php/database/update_020601.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-###
-# @name			Update to version 2.6.1
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
-# Add `downloadable`
-$query = Database::prepare($database, "SELECT `downloadable` FROM `?` LIMIT 1", array(LYCHEE_TABLE_ALBUMS));
-if (!$database->query($query)) {
-	$query	= Database::prepare($database, "ALTER TABLE `?` ADD `downloadable` TINYINT(1) NOT NULL DEFAULT 1", array(LYCHEE_TABLE_ALBUMS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020601', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-}
-
-# Set version
-if (Database::setVersion($database, '020601')===false) return false;
-
-?>
\ No newline at end of file
diff --git a/php/database/update_020602.php b/php/database/update_020602.php
deleted file mode 100644
index a97f263..0000000
--- a/php/database/update_020602.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-###
-# @name			Update to version 2.6.2
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
-# Add a checksum
-$query	= Database::prepare($database, "SELECT `id`, `url` FROM `?` WHERE `checksum` IS NULL", array(LYCHEE_TABLE_PHOTOS));
-$result	= $database->query($query);
-if (!$result) {
-	Log::error($database, 'update_020602', __LINE__, 'Could not find photos without checksum (' . $database->error . ')');
-	return false;
-}
-while ($photo = $result->fetch_object()) {
-	$checksum = sha1_file(LYCHEE_UPLOADS_BIG . $photo->url);
-	if ($checksum!==false) {
-		$query			= Database::prepare($database, "UPDATE `?` SET `checksum` = '?' WHERE `id` = '?'", array(LYCHEE_TABLE_PHOTOS, $checksum, $photo->id));
-		$setChecksum	= $database->query($query);
-		if (!$setChecksum) {
-			Log::error($database, 'update_020602', __LINE__, 'Could not update checksum (' . $database->error . ')');
-			return false;
-		}
-	} else {
-		Log::error($database, 'update_020602', __LINE__, 'Could not calculate checksum for photo with id ' . $photo->id);
-		return false;
-	}
-}
-
-# Add Imagick
-$query	= Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'imagick' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
-if ($result->num_rows===0) {
-	$query	= Database::prepare($database, "INSERT INTO `?` (`key`, `value`) VALUES ('imagick', '1')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $database->query($query);
-	if (!$result) {
-		Log::error($database, 'update_020602', __LINE__, 'Could not update database (' . $database->error . ')');
-		return false;
-	}
-}
-
-# Set version
-if (Database::setVersion($database, '020602')===false) return false;
-
-?>
\ No newline at end of file
diff --git a/php/modules/Database.php b/php/modules/Database.php
index 3b088ed..aa56c56 100755
--- a/php/modules/Database.php
+++ b/php/modules/Database.php
@@ -10,10 +10,6 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 final class Database extends Module {
 
 	private static $versions = array(
-		'020500', #2.5
-		'020505', #2.5.5
-		'020601', #2.6.1
-		'020602', #2.6.2
 		'020700', #2.7.0
 		'030000', #3.0.0
 		'030001', #3.0.1

From 17e5dba9793f2e240410f66ea7f7b551c8d0c24b Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 22:14:20 +0100
Subject: [PATCH 026/183] Singleton pattern for Settings::get(),
 Database::get() and Plugins::get()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

What could properly go wrong? ¯\_(ツ)_/¯
---
 dist/main.js                   | Bin 192549 -> 192541 bytes
 docs/Plugins.md                |  36 +--
 php/access/Access.php          |  17 +-
 php/access/Admin.php           |  66 +++--
 php/access/Guest.php           |  21 +-
 php/access/Installation.php    |   9 +-
 php/api.php                    |  33 +--
 php/autoload.php               |   8 +
 php/database/update_020700.php |  24 +-
 php/database/update_030000.php |  20 +-
 php/database/update_030001.php |  40 ++--
 php/database/update_030003.php |  12 +-
 php/modules/Album.php          | 187 +++++++--------
 php/modules/Config.php         |  79 ++++++
 php/modules/Database.php       | 423 +++++++++++++++++----------------
 php/modules/Import.php         |  45 ++--
 php/modules/Log.php            |  20 +-
 php/modules/Module.php         |   6 +-
 php/modules/Photo.php          | 205 ++++++++--------
 php/modules/Plugins.php        |  47 ++--
 php/modules/Session.php        |  39 +--
 php/modules/Settings.php       |  91 ++++---
 php/modules/misc.php           |  26 +-
 plugins/check/index.php        |   8 +-
 plugins/displaylog/index.php   |   9 +-
 src/scripts/settings.js        |   2 +-
 view.php                       |   8 +-
 27 files changed, 726 insertions(+), 755 deletions(-)
 mode change 100755 => 100644 dist/main.js
 create mode 100644 php/modules/Config.php

diff --git a/dist/main.js b/dist/main.js
old mode 100755
new mode 100644
index e6e9190a58c6284c2014aff798cb8606707054e2..7fc8c459c694ab4108d722023329b69ec9d13a2e
GIT binary patch
delta 60
zcmZ4bfP3x(?uHh|EleUEg3kGQX_@I(R>?)Fi6yB@Iz`hP+ZaW+J9RMGq)o4X$0W_j
QHJx!8lkoPn@0cnW0k7{BqyPW_

delta 78
zcmbRHfP3i!?uHh|EleUEk}ioQiAjmYsa96WMX8A;sm}R%X_@ItIz`hP+ZaW+TXitm
iqzQ19Wfo^9<)rErXQrekB^FID6lD_LKJy(@3nKu2!yI$~

diff --git a/docs/Plugins.md b/docs/Plugins.md
index deef245..e47a7ce 100644
--- a/docs/Plugins.md
+++ b/docs/Plugins.md
@@ -11,33 +11,19 @@ The plugin-system of Lychee allows you to execute scripts, when a certain action
 
 ### How to create a plugin
 
-1. Create a folder in `plugins/`
-2. Create an `index.php` within the new folder and with the following content:
+1. Create a folder in `plugins/` (e.g. `plugins/ExamplePlugin/`)
+2. Create an `ExamplePlugin.php` file within the new folder and add the following content:
 
 ```php
 <?php
 
-###
-# @name			ExamplePlugin
-# @author		Tobias Reich
-# @copyright	2015 by Tobias Reich
-###
-
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 class ExamplePlugin implements SplObserver {
 
-	private $database = null;
-	private $settings = null;
+	public function __construct() {
 
-	public function __construct($database, $settings) {
-
-		# These params are passed to your plugin from Lychee
-		# Save them to access the database and settings of Lychee
-		$this->database = $database;
-		$this->settings = $settings;
-
-		# Add more code here if wanted
+		# Add code here if wanted
 		# __construct() will be called every time Lychee gets called
 		# Make sure this part is performant
 
@@ -52,8 +38,9 @@ class ExamplePlugin implements SplObserver {
 		if ($subject->action!=='Photo::add:before') return false;
 
 		# Do something when Photo::add:before gets called
-		# $this->database => The database of Lychee
-		# $this->settings => The settings of Lychee
+		# Database::get() => Database connection of Lychee
+		# Settings::get() => Settings of Lychee
+		# $subject->action => Called hook
 		# $subject->args => Params passed to the original function
 
 		return true;
@@ -62,15 +49,14 @@ class ExamplePlugin implements SplObserver {
 
 }
 
-# Register your plugin
-$plugins->attach(new ExamplePlugin($database, $settings));
+?>
 ```
 
-3. Add the plugin-path to the database of Lychee
+3. Add the class name to the database of Lychee
 
-Select the table `lychee_settings` and edit the value of `plugins` to the path of your plugin. The path must be relative from the `plugins/`-folder: `ExamplePlugin/index.php`.
+Select the table `lychee_settings` and add the name of the class to the value of `plugins` (e.g. `ExamplePlugin`). Please ensure that the folder has the same name as the class and as the file.
 
-Divide multiple plugins with semicolons: `Plugin01/index.php;Plugin02/index.php`.
+Divide multiple plugins with semicolons: `ExamplePlugin;ExampleTwoPlugin`.
 
 ### Available hooks
 
diff --git a/php/access/Access.php b/php/access/Access.php
index 8a145c8..cf515c4 100644
--- a/php/access/Access.php
+++ b/php/access/Access.php
@@ -7,22 +7,9 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-class Access {
+abstract class Access {
 
-	protected $database	= null;
-	protected $plugins	= null;
-	protected $settings	= null;
-
-	public function __construct($database, $plugins, $settings) {
-
-		# Init vars
-		$this->database	= $database;
-		$this->plugins	= $plugins;
-		$this->settings	= $settings;
-
-		return true;
-
-	}
+	abstract protected function check($fn);
 
 }
 
diff --git a/php/access/Admin.php b/php/access/Admin.php
index 8d02c74..59917cf 100644
--- a/php/access/Admin.php
+++ b/php/access/Admin.php
@@ -6,7 +6,6 @@
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-if (!defined('LYCHEE_ACCESS_ADMIN')) exit('Error: You are not allowed to access this area!');
 
 final class Admin extends Access {
 
@@ -71,7 +70,7 @@ final class Admin extends Access {
 
 	private function getAlbums() {
 
-		$album = new Album($this->database, $this->plugins, $this->settings, null);
+		$album = new Album(null);
 		echo json_encode($album->getAll(false));
 
 	}
@@ -79,7 +78,7 @@ final class Admin extends Access {
 	private function getAlbum() {
 
 		Module::dependencies(isset($_POST['albumID']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+		$album = new Album($_POST['albumID']);
 		echo json_encode($album->get());
 
 	}
@@ -87,7 +86,7 @@ final class Admin extends Access {
 	private function addAlbum() {
 
 		Module::dependencies(isset($_POST['title']));
-		$album = new Album($this->database, $this->plugins, $this->settings, null);
+		$album = new Album(null);
 		echo $album->add($_POST['title']);
 
 	}
@@ -95,7 +94,7 @@ final class Admin extends Access {
 	private function setAlbumTitle() {
 
 		Module::dependencies(isset($_POST['albumIDs'], $_POST['title']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumIDs']);
+		$album = new Album($_POST['albumIDs']);
 		echo $album->setTitle($_POST['title']);
 
 	}
@@ -103,7 +102,7 @@ final class Admin extends Access {
 	private function setAlbumDescription() {
 
 		Module::dependencies(isset($_POST['albumID'], $_POST['description']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+		$album = new Album($_POST['albumID']);
 		echo $album->setDescription($_POST['description']);
 
 	}
@@ -111,7 +110,7 @@ final class Admin extends Access {
 	private function setAlbumPublic() {
 
 		Module::dependencies(isset($_POST['albumID'], $_POST['password'], $_POST['visible'], $_POST['downloadable']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+		$album = new Album($_POST['albumID']);
 		echo $album->setPublic($_POST['public'], $_POST['password'], $_POST['visible'], $_POST['downloadable']);
 
 	}
@@ -119,7 +118,7 @@ final class Admin extends Access {
 	private function deleteAlbum() {
 
 		Module::dependencies(isset($_POST['albumIDs']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumIDs']);
+		$album = new Album($_POST['albumIDs']);
 		echo $album->delete();
 
 	}
@@ -127,7 +126,7 @@ final class Admin extends Access {
 	private function mergeAlbums() {
 
 		Module::dependencies(isset($_POST['albumIDs']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumIDs']);
+		$album = new Album($_POST['albumIDs']);
 		echo $album->merge();
 
 	}
@@ -137,7 +136,7 @@ final class Admin extends Access {
 	private function getPhoto() {
 
 		Module::dependencies(isset($_POST['photoID'], $_POST['albumID']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoID']);
+		$photo = new Photo($_POST['photoID']);
 		echo json_encode($photo->get($_POST['albumID']));
 
 	}
@@ -145,7 +144,7 @@ final class Admin extends Access {
 	private function setPhotoTitle() {
 
 		Module::dependencies(isset($_POST['photoIDs'], $_POST['title']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->setTitle($_POST['title']);
 
 	}
@@ -153,7 +152,7 @@ final class Admin extends Access {
 	private function setPhotoDescription() {
 
 		Module::dependencies(isset($_POST['photoID'], $_POST['description']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoID']);
+		$photo = new Photo($_POST['photoID']);
 		echo $photo->setDescription($_POST['description']);
 
 	}
@@ -161,7 +160,7 @@ final class Admin extends Access {
 	private function setPhotoStar() {
 
 		Module::dependencies(isset($_POST['photoIDs']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->setStar();
 
 	}
@@ -169,7 +168,7 @@ final class Admin extends Access {
 	private function setPhotoPublic() {
 
 		Module::dependencies(isset($_POST['photoID']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoID']);
+		$photo = new Photo($_POST['photoID']);
 		echo $photo->setPublic();
 
 	}
@@ -177,7 +176,7 @@ final class Admin extends Access {
 	private function setPhotoAlbum() {
 
 		Module::dependencies(isset($_POST['photoIDs'], $_POST['albumID']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->setAlbum($_POST['albumID']);
 
 	}
@@ -185,7 +184,7 @@ final class Admin extends Access {
 	private function setPhotoTags() {
 
 		Module::dependencies(isset($_POST['photoIDs'], $_POST['tags']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->setTags($_POST['tags']);
 
 	}
@@ -193,7 +192,7 @@ final class Admin extends Access {
 	private function duplicatePhoto() {
 
 		Module::dependencies(isset($_POST['photoIDs']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->duplicate();
 
 	}
@@ -201,7 +200,7 @@ final class Admin extends Access {
 	private function deletePhoto() {
 
 		Module::dependencies(isset($_POST['photoIDs']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoIDs']);
+		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->delete();
 
 	}
@@ -211,7 +210,7 @@ final class Admin extends Access {
 	private function upload() {
 
 		Module::dependencies(isset($_FILES, $_POST['albumID'], $_POST['tags']));
-		$photo = new Photo($this->database, $this->plugins, $this->settings, null);
+		$photo = new Photo(null);
 		echo $photo->add($_FILES, $_POST['albumID'], '', $_POST['tags']);
 
 	}
@@ -219,7 +218,7 @@ final class Admin extends Access {
 	private function importUrl() {
 
 		Module::dependencies(isset($_POST['url'], $_POST['albumID']));
-		$import = new Import($this->database, $this->plugins, $this->settings);
+		$import = new Import();
 		echo $import->url($_POST['url'], $_POST['albumID']);
 
 	}
@@ -227,7 +226,7 @@ final class Admin extends Access {
 	private function importServer() {
 
 		Module::dependencies(isset($_POST['albumID'], $_POST['path']));
-		$import = new Import($this->database, $this->plugins, $this->settings);
+		$import = new Import();
 		echo $import->server($_POST['path'], $_POST['albumID']);
 
 	}
@@ -237,7 +236,7 @@ final class Admin extends Access {
 	private function search() {
 
 		Module::dependencies(isset($_POST['term']));
-		echo json_encode(search($this->database, $this->settings, $_POST['term']));
+		echo json_encode(search($_POST['term']));
 
 	}
 
@@ -247,22 +246,22 @@ final class Admin extends Access {
 
 		global $dbName;
 
-		$session = new Session($this->plugins, $this->settings);
-		echo json_encode($session->init($this->database, $dbName, false));
+		$session = new Session();
+		echo json_encode($session->init(false));
 
 	}
 
 	private function login() {
 
 		Module::dependencies(isset($_POST['user'], $_POST['password']));
-		$session = new Session($this->plugins, $this->settings);
+		$session = new Session();
 		echo $session->login($_POST['user'], $_POST['password']);
 
 	}
 
 	private function logout() {
 
-		$session = new Session($this->plugins, $this->settings);
+		$session = new Session();
 		echo $session->logout();
 
 	}
@@ -273,18 +272,16 @@ final class Admin extends Access {
 
 		Module::dependencies(isset($_POST['username'], $_POST['password']));
 		if (!isset($_POST['oldPassword'])) $_POST['oldPassword'] = '';
-		$this->settings = new Settings($this->database);
-		echo $this->settings->setLogin($_POST['oldPassword'], $_POST['username'], $_POST['password']);
+		echo Settings::setLogin($_POST['oldPassword'], $_POST['username'], $_POST['password']);
 
 	}
 
 	private function setSorting() {
 
 		Module::dependencies(isset($_POST['typeAlbums'], $_POST['orderAlbums'], $_POST['typePhotos'], $_POST['orderPhotos']));
-		$this->settings = new Settings($this->database);
 
-		$sA = $this->settings->setSortingAlbums($_POST['typeAlbums'], $_POST['orderAlbums']);
-		$sP = $this->settings->setSortingPhotos($_POST['typePhotos'], $_POST['orderPhotos']);
+		$sA = Settings::setSortingAlbums($_POST['typeAlbums'], $_POST['orderAlbums']);
+		$sP = Settings::setSortingPhotos($_POST['typePhotos'], $_POST['orderPhotos']);
 
 		if ($sA===true&&$sP===true)	echo true;
 		else						echo false;
@@ -294,8 +291,7 @@ final class Admin extends Access {
 	private function setDropboxKey() {
 
 		Module::dependencies(isset($_POST['key']));
-		$this->settings = new Settings($this->database);
-		echo $this->settings->setDropboxKey($_POST['key']);
+		echo Settings::setDropboxKey($_POST['key']);
 
 	}
 
@@ -304,7 +300,7 @@ final class Admin extends Access {
 	private function getAlbumArchive() {
 
 		Module::dependencies(isset($_GET['albumID']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_GET['albumID']);
+		$album = new Album($_GET['albumID']);
 		$album->getArchive();
 
 	}
@@ -312,7 +308,7 @@ final class Admin extends Access {
 	private function getPhotoArchive() {
 
 		Module::dependencies(isset($_GET['photoID']));
-		$photo = new Photo($this->database, $this->plugins, null, $_GET['photoID']);
+		$photo = new Photo($_GET['photoID']);
 		$photo->getArchive();
 
 	}
diff --git a/php/access/Guest.php b/php/access/Guest.php
index 94d9e31..e153f78 100644
--- a/php/access/Guest.php
+++ b/php/access/Guest.php
@@ -6,7 +6,6 @@
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-if (!defined('LYCHEE_ACCESS_GUEST')) exit('Error: You are not allowed to access this area!');
 
 final class Guest extends Access {
 
@@ -45,7 +44,7 @@ final class Guest extends Access {
 
 	private function getAlbums() {
 
-		$album = new Album($this->database, $this->plugins, $this->settings, null);
+		$album = new Album(null);
 		echo json_encode($album->getAll(true));
 
 	}
@@ -53,7 +52,7 @@ final class Guest extends Access {
 	private function getAlbum() {
 
 		Module::dependencies(isset($_POST['albumID'], $_POST['password']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+		$album = new Album($_POST['albumID']);
 
 		if ($album->getPublic()) {
 
@@ -73,7 +72,7 @@ final class Guest extends Access {
 	private function checkAlbumAccess() {
 
 		Module::dependencies(isset($_POST['albumID'], $_POST['password']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_POST['albumID']);
+		$album = new Album($_POST['albumID']);
 
 		if ($album->getPublic()) {
 
@@ -95,7 +94,7 @@ final class Guest extends Access {
 	private function getPhoto() {
 
 		Module::dependencies(isset($_POST['photoID'], $_POST['albumID'], $_POST['password']));
-		$photo = new Photo($this->database, $this->plugins, null, $_POST['photoID']);
+		$photo = new Photo($_POST['photoID']);
 
 		$pgP = $photo->getPublic($_POST['password']);
 
@@ -111,22 +110,22 @@ final class Guest extends Access {
 
 		global $dbName;
 
-		$session = new Session($this->plugins, $this->settings);
-		echo json_encode($session->init($this->database, $dbName, true));
+		$session = new Session();
+		echo json_encode($session->init(true));
 
 	}
 
 	private function login() {
 
 		Module::dependencies(isset($_POST['user'], $_POST['password']));
-		$session = new Session($this->plugins, $this->settings);
+		$session = new Session();
 		echo $session->login($_POST['user'], $_POST['password']);
 
 	}
 
 	private function logout() {
 
-		$session = new Session($this->plugins, $this->settings);
+		$session = new Session();
 		echo $session->logout();
 
 	}
@@ -136,7 +135,7 @@ final class Guest extends Access {
 	private function getAlbumArchive() {
 
 		Module::dependencies(isset($_GET['albumID'], $_GET['password']));
-		$album = new Album($this->database, $this->plugins, $this->settings, $_GET['albumID']);
+		$album = new Album($_GET['albumID']);
 
 		if ($album->getPublic()&&$album->getDownloadable()) {
 
@@ -156,7 +155,7 @@ final class Guest extends Access {
 	private function getPhotoArchive() {
 
 		Module::dependencies(isset($_GET['photoID'], $_GET['password']));
-		$photo = new Photo($this->database, $this->plugins, null, $_GET['photoID']);
+		$photo = new Photo($_GET['photoID']);
 
 		$pgP = $photo->getPublic($_GET['password']);
 
diff --git a/php/access/Installation.php b/php/access/Installation.php
index 67c8811..c0c0ef7 100644
--- a/php/access/Installation.php
+++ b/php/access/Installation.php
@@ -6,7 +6,6 @@
 ###
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-if (!defined('LYCHEE_ACCESS_INSTALLATION')) exit('Error: You are not allowed to access this area!');
 
 final class Installation extends Access {
 
@@ -14,10 +13,10 @@ final class Installation extends Access {
 
 		switch ($fn) {
 
-			case 'Database::createConfig':	$this->dbCreateConfig(); break;
+			case 'Config::create':	$this->configCreate(); break;
 
 			# Error
-			default:						$this->init(); break;
+			default:				$this->init(); break;
 
 		}
 
@@ -25,10 +24,10 @@ final class Installation extends Access {
 
 	}
 
-	private function dbCreateConfig() {
+	private function configCreate() {
 
 		Module::dependencies(isset($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']));
-		echo Database::createConfig($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']);
+		echo Config::create($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']);
 
 	}
 
diff --git a/php/api.php b/php/api.php
index d9e8381..d64e4fe 100755
--- a/php/api.php
+++ b/php/api.php
@@ -29,49 +29,30 @@ if (!empty($fn)) {
 	if (isset($_POST['photoID'])&&preg_match('/^[0-9]{14}$/', $_POST['photoID'])!==1)		exit('Error: Wrong parameter type for photoID!');
 
 	# Check if a configuration exists
-	if (file_exists(LYCHEE_CONFIG_FILE)) require(LYCHEE_CONFIG_FILE);
-	else {
+	if (Config::exists()===false) {
 
 		###
 		# Installation Access
 		# Limited access to configure Lychee. Only available when the config.php file is missing.
 		###
 
-		define('LYCHEE_ACCESS_INSTALLATION', true);
-
-		$installation = new Installation(null, null, null);
-		$installation->check($_POST['function']);
+		$installation = new Installation();
+		$installation->check($fn);
 
 		exit();
 
 	}
 
-	# Define the table prefix
-	defineTablePrefix(@$dbTablePrefix);
-
-	# Connect to database
-	$database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName);
-
-	# Load settings
-	$settings = new Settings($database);
-	$settings = $settings->get();
-
-	# Init plugins
-	$plugins = explode(';', $settings['plugins']);
-	$plugins = new Plugins($plugins, $database, $settings);
-
 	# Check if user is logged
 	if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
-		(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
+		(isset($_SESSION['identifier'])&&$_SESSION['identifier']===Settings::get()['identifier'])) {
 
 		###
 		# Admin Access
 		# Full access to Lychee. Only with correct password/session.
 		###
 
-		define('LYCHEE_ACCESS_ADMIN', true);
-
-		$admin = new Admin($database, $plugins, $settings);
+		$admin = new Admin();
 		$admin->check($fn);
 
 	} else {
@@ -81,9 +62,7 @@ if (!empty($fn)) {
 		# Access to view all public folders and photos in Lychee.
 		###
 
-		define('LYCHEE_ACCESS_GUEST', true);
-
-		$guest = new Guest($database, $plugins, $settings);
+		$guest = new Guest();
 		$guest->check($fn);
 
 	}
diff --git a/php/autoload.php b/php/autoload.php
index e7bede4..bd5aca4 100644
--- a/php/autoload.php
+++ b/php/autoload.php
@@ -23,4 +23,12 @@ spl_autoload_register(function($class) {
 
 });
 
+spl_autoload_register(function($class) {
+
+	$file = LYCHEE . 'plugins/' . $class . '/' . $class . '.php';
+
+	if (file_exists($file)===true) require $file;
+
+});
+
 ?>
\ No newline at end of file
diff --git a/php/database/update_020700.php b/php/database/update_020700.php
index e6e594e..c610054 100644
--- a/php/database/update_020700.php
+++ b/php/database/update_020700.php
@@ -8,12 +8,12 @@
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 # Add medium to photos
-$query = Database::prepare($database, "SELECT `medium` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
-if (!$database->query($query)) {
-	$query	= Database::prepare($database, "ALTER TABLE `?` ADD `medium` TINYINT(1) NOT NULL DEFAULT 0", array(LYCHEE_TABLE_PHOTOS));
-	$result	= $database->query($query);
+$query = Database::prepare($connection, "SELECT `medium` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
+if (!$connection->query($query)) {
+	$query	= Database::prepare($connection, "ALTER TABLE `?` ADD `medium` TINYINT(1) NOT NULL DEFAULT 0", array(LYCHEE_TABLE_PHOTOS));
+	$result	= $connection->query($query);
 	if (!$result) {
-		Log::error($database, 'update_020700', __LINE__, 'Could not update database (' . $database->error . ')');
+		Log::error('update_020700', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
@@ -22,22 +22,22 @@ if (!$database->query($query)) {
 if (is_dir(LYCHEE_UPLOADS_MEDIUM)===false) {
 	# Only create the folder when it is missing
 	if (@mkdir(LYCHEE_UPLOADS_MEDIUM)===false)
-		Log::error($database, 'update_020700', __LINE__, 'Could not create medium-folder');
+		Log::error('update_020700', __LINE__, 'Could not create medium-folder');
 }
 
 # Add medium to settings
-$query	= Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'medium' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
+$query	= Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'medium' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result	= $connection->query($query);
 if ($result->num_rows===0) {
-	$query	= Database::prepare($database, "INSERT INTO `?` (`key`, `value`) VALUES ('medium', '1')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $database->query($query);
+	$query	= Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('medium', '1')", array(LYCHEE_TABLE_SETTINGS));
+	$result	= $connection->query($query);
 	if (!$result) {
-		Log::error($database, 'update_020700', __LINE__, 'Could not update database (' . $database->error . ')');
+		Log::error('update_020700', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
 
 # Set version
-if (Database::setVersion($database, '020700')===false) return false;
+if (Database::setVersion($connection, '020700')===false) return false;
 
 ?>
\ No newline at end of file
diff --git a/php/database/update_030000.php b/php/database/update_030000.php
index 632277d..937f1d4 100644
--- a/php/database/update_030000.php
+++ b/php/database/update_030000.php
@@ -9,29 +9,29 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 # Remove login
 # Login now saved as crypt without md5. Legacy code has been removed.
-$query			= Database::prepare($database, "UPDATE `?` SET `value` = '' WHERE `key` = 'username' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$resetUsername	= $database->query($query);
+$query			= Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'username' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$resetUsername	= $connection->query($query);
 if (!$resetUsername) {
-	Log::error($database, 'update_030000', __LINE__, 'Could not reset username (' . $database->error . ')');
+	Log::error('update_030000', __LINE__, 'Could not reset username (' . $connection->error . ')');
 	return false;
 }
-$query			= Database::prepare($database, "UPDATE `?` SET `value` = '' WHERE `key` = 'password' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$resetPassword	= $database->query($query);
+$query			= Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'password' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$resetPassword	= $connection->query($query);
 if (!$resetPassword) {
-	Log::error($database, 'update_030000', __LINE__, 'Could not reset password (' . $database->error . ')');
+	Log::error('update_030000', __LINE__, 'Could not reset password (' . $connection->error . ')');
 	return false;
 }
 
 # Make public albums private and reset password
 # Password now saved as crypt without md5. Legacy code has been removed.
-$query			= Database::prepare($database, "UPDATE `?` SET `public` = 0, `password` = NULL", array(LYCHEE_TABLE_ALBUMS));
-$resetPublic	= $database->query($query);
+$query			= Database::prepare($connection, "UPDATE `?` SET `public` = 0, `password` = NULL", array(LYCHEE_TABLE_ALBUMS));
+$resetPublic	= $connection->query($query);
 if (!$resetPublic) {
-	Log::error($database, 'update_030000', __LINE__, 'Could not reset public albums (' . $database->error . ')');
+	Log::error('update_030000', __LINE__, 'Could not reset public albums (' . $connection->error . ')');
 	return false;
 }
 
 # Set version
-if (Database::setVersion($database, '030000')===false) return false;
+if (Database::setVersion($connection, '030000')===false) return false;
 
 ?>
\ No newline at end of file
diff --git a/php/database/update_030001.php b/php/database/update_030001.php
index 3147255..c13505c 100644
--- a/php/database/update_030001.php
+++ b/php/database/update_030001.php
@@ -8,55 +8,55 @@
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 # Change length of photo title
-$query	= Database::prepare($database, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_PHOTOS));
-$result	= $database->query($query);
+$query	= Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_PHOTOS));
+$result	= $connection->query($query);
 if (!$result) {
-	Log::error($database, 'update_030001', __LINE__, 'Could not update database (' . $database->error . ')');
+	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 	return false;
 }
 
 # Change length of album title
-$query	= Database::prepare($database, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_ALBUMS));
-$result	= $database->query($query);
+$query	= Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_ALBUMS));
+$result	= $connection->query($query);
 if (!$result) {
-	Log::error($database, 'update_030001', __LINE__, 'Could not update database (' . $database->error . ')');
+	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 	return false;
 }
 
 # Add album sorting to settings
-$query	= Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'sortingAlbums' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
+$query	= Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'sortingAlbums' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result	= $connection->query($query);
 if ($result->num_rows===0) {
-	$query	= Database::prepare($database, "INSERT INTO `?` (`key`, `value`) VALUES ('sortingAlbums', 'ORDER BY id DESC')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $database->query($query);
+	$query	= Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('sortingAlbums', 'ORDER BY id DESC')", array(LYCHEE_TABLE_SETTINGS));
+	$result	= $connection->query($query);
 	if (!$result) {
-		Log::error($database, 'update_030001', __LINE__, 'Could not update database (' . $database->error . ')');
+		Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
 
 # Rename sorting to sortingPhotos
-$query	= Database::prepare($database, "UPDATE ? SET `key` = 'sortingPhotos' WHERE `key` = 'sorting' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
+$query	= Database::prepare($connection, "UPDATE ? SET `key` = 'sortingPhotos' WHERE `key` = 'sorting' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result	= $connection->query($query);
 if (!$result) {
-	Log::error($database, 'update_030001', __LINE__, 'Could not update database (' . $database->error . ')');
+	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 	return false;
 }
 
 # Add identifier to settings
-$query	= Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
+$query	= Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result	= $connection->query($query);
 if ($result->num_rows===0) {
 	$identifier	= md5(microtime(true));
-	$query		= Database::prepare($database, "INSERT INTO `?` (`key`, `value`) VALUES ('identifier', '?')", array(LYCHEE_TABLE_SETTINGS, $identifier));
-	$result		= $database->query($query);
+	$query		= Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('identifier', '?')", array(LYCHEE_TABLE_SETTINGS, $identifier));
+	$result		= $connection->query($query);
 	if (!$result) {
-		Log::error($database, 'update_030001', __LINE__, 'Could not update database (' . $database->error . ')');
+		Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
 
 # Set version
-if (Database::setVersion($database, '030001')===false) return false;
+if (Database::setVersion($connection, '030001')===false) return false;
 
 ?>
\ No newline at end of file
diff --git a/php/database/update_030003.php b/php/database/update_030003.php
index c658bc0..dd09fe7 100644
--- a/php/database/update_030003.php
+++ b/php/database/update_030003.php
@@ -8,18 +8,18 @@
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 # Add skipDuplicates to settings
-$query	= Database::prepare($database, "SELECT `key` FROM `?` WHERE `key` = 'skipDuplicates' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $database->query($query);
+$query	= Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'skipDuplicates' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result	= $connection->query($query);
 if ($result->num_rows===0) {
-	$query	= Database::prepare($database, "INSERT INTO `?` (`key`, `value`) VALUES ('skipDuplicates', '0')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $database->query($query);
+	$query	= Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('skipDuplicates', '0')", array(LYCHEE_TABLE_SETTINGS));
+	$result	= $connection->query($query);
 	if (!$result) {
-		Log::error($database, 'update_030003', __LINE__, 'Could not update database (' . $database->error . ')');
+		Log::error('update_030003', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
 
 # Set version
-if (Database::setVersion($database, '030003')===false) return false;
+if (Database::setVersion($connection, '030003')===false) return false;
 
 ?>
\ No newline at end of file
diff --git a/php/modules/Album.php b/php/modules/Album.php
index f4ed7f7..e74997e 100644
--- a/php/modules/Album.php
+++ b/php/modules/Album.php
@@ -9,26 +9,18 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 final class Album extends Module {
 
-	private $database	= null;
-	private $settings	= null;
 	private $albumIDs	= null;
 
-	public function __construct($database, $plugins, $settings, $albumIDs) {
+	public function __construct($albumIDs) {
 
 		# Init vars
-		$this->database	= $database;
-		$this->plugins	= $plugins;
-		$this->settings	= $settings;
 		$this->albumIDs	= $albumIDs;
 
 		return true;
 
 	}
 
-	public function add($title = 'Untitled', $public = 0, $visible = 1) {
-
-		# Check dependencies
-		self::dependencies(isset($this->database));
+	public function add($title = 'Untitled') {
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -36,19 +28,23 @@ final class Album extends Module {
 		# Parse
 		if (strlen($title)>50) $title = substr($title, 0, 50);
 
+		# Properties
+		$public		= 0;
+		$visible	= 1;
+
 		# Database
 		$sysstamp	= time();
-		$query		= Database::prepare($this->database, "INSERT INTO ? (title, sysstamp, public, visible) VALUES ('?', '?', '?', '?')", array(LYCHEE_TABLE_ALBUMS, $title, $sysstamp, $public, $visible));
-		$result		= $this->database->query($query);
+		$query		= Database::prepare(Database::get(), "INSERT INTO ? (title, sysstamp, public, visible) VALUES ('?', '?', '?', '?')", array(LYCHEE_TABLE_ALBUMS, $title, $sysstamp, $public, $visible));
+		$result		= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
-		return $this->database->insert_id;
+		return Database::get()->insert_id;
 
 	}
 
@@ -91,7 +87,7 @@ final class Album extends Module {
 	public function get() {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->settings, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -100,32 +96,32 @@ final class Album extends Module {
 		switch ($this->albumIDs) {
 
 			case 'f':	$return['public'] = '0';
-						$query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE star = 1 " . $this->settings['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+						$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE star = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
 						break;
 
 			case 's':	$return['public'] = '0';
-						$query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE public = 1 " . $this->settings['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+						$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE public = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
 						break;
 
 			case 'r':	$return['public'] = '0';
-						$query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) " . $this->settings['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+						$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
 						break;
 
 			case '0':	$return['public'] = '0';
-						$query = Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = 0 " . $this->settings['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+						$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = 0 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
 						break;
 
-			default:	$query	= Database::prepare($this->database, "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-						$albums = $this->database->query($query);
+			default:	$query	= Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+						$albums = Database::get()->query($query);
 						$return = $albums->fetch_assoc();
 						$return = Album::prepareData($return);
-						$query	= Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = '?' " . $this->settings['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
+						$query	= Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
 						break;
 
 		}
 
 		# Get photos
-		$photos				= $this->database->query($query);
+		$photos				= Database::get()->query($query);
 		$previousPhotoID	= '';
 		while ($photo = $photos->fetch_assoc()) {
 
@@ -178,7 +174,7 @@ final class Album extends Module {
 	public function getAll($public) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->settings, $public));
+		self::dependencies(isset($public));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -194,14 +190,14 @@ final class Album extends Module {
 		if ($public===false) $return['smartalbums'] = $this->getSmartInfo();
 
 		# Albums query
-		if ($public===false)	$query = Database::prepare($this->database, 'SELECT id, title, public, sysstamp, password FROM ? ' . $this->settings['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
-		else					$query = Database::prepare($this->database, 'SELECT id, title, public, sysstamp, password FROM ? WHERE public = 1 AND visible <> 0 ' . $this->settings['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
+		if ($public===false)	$query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
+		else					$query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? WHERE public = 1 AND visible <> 0 ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
 
 		# Execute query
-		$albums = $this->database->query($query);
+		$albums = Database::get()->query($query);
 		if (!$albums) {
-			Log::error($this->database, __METHOD__, __LINE__, 'Could not get all albums (' . $this->database->error . ')');
-			exit('Error: ' . $this->database->error);
+			Log::error(__METHOD__, __LINE__, 'Could not get all albums (' . Database::get()->error . ')');
+			exit('Error: ' . Database::get()->error);
 		}
 
 		# For each album
@@ -215,8 +211,8 @@ final class Album extends Module {
 				($public===false)) {
 
 					# Execute query
-					$query	= Database::prepare($this->database, "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr($this->settings['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
-					$thumbs	= $this->database->query($query);
+					$query	= Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr(Settings::get()['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
+					$thumbs	= Database::get()->query($query);
 
 					# For each thumb
 					$k = 0;
@@ -244,9 +240,6 @@ final class Album extends Module {
 
 	private function getSmartInfo() {
 
-		# Check dependencies
-		self::dependencies(isset($this->database, $this->settings));
-
 		# Initialize return var
 		$return = array(
 			'unsorted'	=> null,
@@ -259,8 +252,8 @@ final class Album extends Module {
 		# Unsorted
 		###
 
-		$query		= Database::prepare($this->database, 'SELECT thumbUrl FROM ? WHERE album = 0 ' . $this->settings['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$unsorted	= $this->database->query($query);
+		$query		= Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE album = 0 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$unsorted	= Database::get()->query($query);
 		$i			= 0;
 
 		$return['unsorted'] = array(
@@ -279,8 +272,8 @@ final class Album extends Module {
 		# Starred
 		###
 
-		$query		= Database::prepare($this->database, 'SELECT thumbUrl FROM ? WHERE star = 1 ' . $this->settings['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$starred	= $this->database->query($query);
+		$query		= Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE star = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$starred	= Database::get()->query($query);
 		$i			= 0;
 
 		$return['starred'] = array(
@@ -299,8 +292,8 @@ final class Album extends Module {
 		# Public
 		###
 
-		$query		= Database::prepare($this->database, 'SELECT thumbUrl FROM ? WHERE public = 1 ' . $this->settings['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$public		= $this->database->query($query);
+		$query		= Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE public = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$public		= Database::get()->query($query);
 		$i			= 0;
 
 		$return['public'] = array(
@@ -319,8 +312,8 @@ final class Album extends Module {
 		# Recent
 		###
 
-		$query		= Database::prepare($this->database, 'SELECT thumbUrl FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) ' . $this->settings['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$recent		= $this->database->query($query);
+		$query		= Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$recent		= Database::get()->query($query);
 		$i			= 0;
 
 		$return['recent'] = array(
@@ -343,7 +336,7 @@ final class Album extends Module {
 	public function getArchive() {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -357,31 +350,31 @@ final class Album extends Module {
 		# Photos query
 		switch($this->albumIDs) {
 			case 's':
-				$photos		= Database::prepare($this->database, 'SELECT title, url FROM ? WHERE public = 1', array(LYCHEE_TABLE_PHOTOS));
+				$photos		= Database::prepare(Database::get(), 'SELECT title, url FROM ? WHERE public = 1', array(LYCHEE_TABLE_PHOTOS));
 				$zipTitle	= 'Public';
 				break;
 			case 'f':
-				$photos		= Database::prepare($this->database, 'SELECT title, url FROM ? WHERE star = 1', array(LYCHEE_TABLE_PHOTOS));
+				$photos		= Database::prepare(Database::get(), 'SELECT title, url FROM ? WHERE star = 1', array(LYCHEE_TABLE_PHOTOS));
 				$zipTitle	= 'Starred';
 				break;
 			case 'r':
-				$photos		= Database::prepare($this->database, 'SELECT title, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) GROUP BY checksum', array(LYCHEE_TABLE_PHOTOS));
+				$photos		= Database::prepare(Database::get(), 'SELECT title, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) GROUP BY checksum', array(LYCHEE_TABLE_PHOTOS));
 				$zipTitle	= 'Recent';
 				break;
 			default:
-				$photos		= Database::prepare($this->database, "SELECT title, url FROM ? WHERE album = '?'", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
+				$photos		= Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE album = '?'", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
 				$zipTitle	= 'Unsorted';
 		}
 
 		# Get title from database when album is not a SmartAlbum
 		if ($this->albumIDs!=0&&is_numeric($this->albumIDs)) {
 
-			$query = Database::prepare($this->database, "SELECT title FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-			$album = $this->database->query($query);
+			$query = Database::prepare(Database::get(), "SELECT title FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+			$album = Database::get()->query($query);
 
 			# Error in database query
 			if (!$album) {
-				Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
 
@@ -390,7 +383,7 @@ final class Album extends Module {
 
 			# Photo not found
 			if ($album===null) {
-				Log::error($this->database, __METHOD__, __LINE__, 'Album not found. Cannot start download.');
+				Log::error(__METHOD__, __LINE__, 'Album not found. Cannot start download.');
 				return false;
 			}
 
@@ -407,16 +400,16 @@ final class Album extends Module {
 		# Create zip
 		$zip = new ZipArchive();
 		if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) {
-			Log::error($this->database, __METHOD__, __LINE__, 'Could not create ZipArchive');
+			Log::error(__METHOD__, __LINE__, 'Could not create ZipArchive');
 			return false;
 		}
 
 		# Execute query
-		$photos = $this->database->query($photos);
+		$photos = Database::get()->query($photos);
 
 		# Check if album empty
 		if ($photos->num_rows==0) {
-			Log::error($this->database, __METHOD__, __LINE__, 'Could not create ZipArchive without images');
+			Log::error(__METHOD__, __LINE__, 'Could not create ZipArchive without images');
 			return false;
 		}
 
@@ -483,20 +476,20 @@ final class Album extends Module {
 	public function setTitle($title = 'Untitled') {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Execute query
-		$query	= Database::prepare($this->database, "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $title, $this->albumIDs));
-		$result = $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $title, $this->albumIDs));
+		$result = Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -506,20 +499,20 @@ final class Album extends Module {
 	public function setDescription($description = '') {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Execute query
-		$query	= Database::prepare($this->database, "UPDATE ? SET description = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $description, $this->albumIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $description, $this->albumIDs));
+		$result	= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -529,7 +522,7 @@ final class Album extends Module {
 	public function getPublic() {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -537,8 +530,8 @@ final class Album extends Module {
 		if ($this->albumIDs==='0'||$this->albumIDs==='s'||$this->albumIDs==='f') return false;
 
 		# Execute query
-		$query	= Database::prepare($this->database, "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$albums	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+		$albums	= Database::get()->query($query);
 		$album	= $albums->fetch_object();
 
 		# Call plugins
@@ -552,7 +545,7 @@ final class Album extends Module {
 	public function getDownloadable() {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -560,8 +553,8 @@ final class Album extends Module {
 		if ($this->albumIDs==='0'||$this->albumIDs==='s'||$this->albumIDs==='f'||$this->albumIDs==='r') return false;
 
 		# Execute query
-		$query	= Database::prepare($this->database, "SELECT downloadable FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$albums	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT downloadable FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+		$albums	= Database::get()->query($query);
 		$album	= $albums->fetch_object();
 
 		# Call plugins
@@ -575,7 +568,7 @@ final class Album extends Module {
 	public function setPublic($public, $password, $visible, $downloadable) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -586,19 +579,19 @@ final class Album extends Module {
 		$downloadable	= ($downloadable==='1' ? 1 : 0);
 
 		# Set public
-		$query	= Database::prepare($this->database, "UPDATE ? SET public = '?', visible = '?', downloadable = '?', password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $public, $visible, $downloadable, $this->albumIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET public = '?', visible = '?', downloadable = '?', password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $public, $visible, $downloadable, $this->albumIDs));
+		$result	= Database::get()->query($query);
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
 		# Reset permissions for photos
 		if ($public===1) {
-			$query	= Database::prepare($this->database, "UPDATE ? SET public = 0 WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
-			$result	= $this->database->query($query);
+			$query	= Database::prepare(Database::get(), "UPDATE ? SET public = 0 WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
+			$result	= Database::get()->query($query);
 			if (!$result) {
-				Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
 		}
@@ -616,7 +609,7 @@ final class Album extends Module {
 	private function setPassword($password) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -629,23 +622,23 @@ final class Album extends Module {
 			# Set hashed password
 			# Do not prepare $password because it is hashed and save
 			# Preparing (escaping) the password would destroy the hash
-			$query	= Database::prepare($this->database, "UPDATE ? SET password = '$password' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+			$query	= Database::prepare(Database::get(), "UPDATE ? SET password = '$password' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
 
 		} else {
 
 			# Unset password
-			$query	= Database::prepare($this->database, "UPDATE ? SET password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+			$query	= Database::prepare(Database::get(), "UPDATE ? SET password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
 
 		}
 
 		# Execute query
-		$result	= $this->database->query($query);
+		$result	= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -655,14 +648,14 @@ final class Album extends Module {
 	public function checkPassword($password) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Execute query
-		$query	= Database::prepare($this->database, "SELECT password FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$albums	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT password FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+		$albums	= Database::get()->query($query);
 		$album	= $albums->fetch_object();
 
 		# Call plugins
@@ -677,7 +670,7 @@ final class Album extends Module {
 	public function merge() {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -689,11 +682,11 @@ final class Album extends Module {
 		$albumID = array_splice($albumIDs, 0, 1);
 		$albumID = $albumID[0];
 
-		$query	= Database::prepare($this->database, "UPDATE ? SET album = ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->albumIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET album = ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->albumIDs));
+		$result	= Database::get()->query($query);
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
@@ -701,14 +694,14 @@ final class Album extends Module {
 		# Convert to string
 		$filteredIDs = implode(',', $albumIDs);
 
-		$query	= Database::prepare($this->database, "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $filteredIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $filteredIDs));
+		$result	= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -718,7 +711,7 @@ final class Album extends Module {
 	public function delete() {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->albumIDs));
+		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -727,27 +720,27 @@ final class Album extends Module {
 		$error = false;
 
 		# Execute query
-		$query	= Database::prepare($this->database, "SELECT id FROM ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
-		$photos = $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT id FROM ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
+		$photos = Database::get()->query($query);
 
 		# For each album delete photo
 		while ($row = $photos->fetch_object()) {
 
-			$photo = new Photo($this->database, $this->plugins, null, $row->id);
+			$photo = new Photo($row->id);
 			if (!$photo->delete($row->id)) $error = true;
 
 		}
 
 		# Delete albums
-		$query	= Database::prepare($this->database, "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+		$result	= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if ($error) return false;
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
diff --git a/php/modules/Config.php b/php/modules/Config.php
new file mode 100644
index 0000000..317571f
--- /dev/null
+++ b/php/modules/Config.php
@@ -0,0 +1,79 @@
+<?php
+
+###
+# @name			Database Module
+# @copyright	2015 by Tobias Reich
+###
+
+if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
+final class Config extends Module {
+
+	public static function create($host, $user, $password, $name = 'lychee', $prefix = '') {
+
+		# Open a new connection to the MySQL server
+		$connection = Database::connect($host, $user, $password);
+
+		# Check if the connection was successful
+		if ($connection===false) return 'Warning: Connection failed!';
+
+		# Check if user can create the database before saving the configuration
+		if (!Database::createDatabase($connection, $name)) return 'Warning: Creation failed!';
+
+		# Escape data
+		$host		= mysqli_real_escape_string($connection, $host);
+		$user		= mysqli_real_escape_string($connection, $user);
+		$password	= mysqli_real_escape_string($connection, $password);
+		$name		= mysqli_real_escape_string($connection, $name);
+		$prefix		= mysqli_real_escape_string($connection, $prefix);
+
+		# Save config.php
+$config = "<?php
+
+###
+# @name			Configuration
+# @author		Tobias Reich
+# @copyright	2015 Tobias Reich
+###
+
+if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+
+# Database configuration
+\$dbHost = '$host'; # Host of the database
+\$dbUser = '$user'; # Username of the database
+\$dbPassword = '$password'; # Password of the database
+\$dbName = '$name'; # Database name
+\$dbTablePrefix = '$prefix'; # Table prefix
+
+?>";
+
+		# Save file
+		if (file_put_contents(LYCHEE_CONFIG_FILE, $config)===false) return 'Warning: Could not create file!';
+
+		return true;
+
+	}
+
+	public static function exists() {
+
+		return file_exists(LYCHEE_CONFIG_FILE);
+
+	}
+
+	public static function get() {
+
+		require(LYCHEE_CONFIG_FILE);
+
+		return(array(
+			'host'		=> $dbHost,
+			'user'		=> $dbUser,
+			'password'	=> $dbPassword,
+			'name'		=> $dbName,
+			'prefix'	=> $dbTablePrefix
+		));
+
+	}
+
+}
+
+?>
diff --git a/php/modules/Database.php b/php/modules/Database.php
index aa56c56..9662be2 100755
--- a/php/modules/Database.php
+++ b/php/modules/Database.php
@@ -9,6 +9,9 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 final class Database extends Module {
 
+	private $connection = null;
+	private static $instance = null;
+
 	private static $versions = array(
 		'020700', #2.7.0
 		'030000', #3.0.0
@@ -16,44 +19,230 @@ final class Database extends Module {
 		'030003' #3.0.3
 	);
 
-	public static function connect($host = 'localhost', $user, $password, $name = 'lychee') {
+	public static function get() {
+
+		if (!self::$instance) {
+
+			$credentials = Config::get();
+
+			self::$instance = new self(
+				$credentials['host'],
+				$credentials['user'],
+				$credentials['password'],
+				$credentials['name'],
+				$credentials['prefix']
+			);
+
+		}
+
+		return self::$instance->connection;
+
+	}
+
+	private function __construct($host, $user, $password, $name = 'lychee', $dbTablePrefix) {
 
 		# Check dependencies
 		Module::dependencies(isset($host, $user, $password, $name));
 
-		$database = new mysqli($host, $user, $password);
+		# Define the table prefix
+		defineTablePrefix($dbTablePrefix);
 
-		# Check connection
-		if ($database->connect_errno) exit('Error: ' . $database->connect_error);
+		# Open a new connection to the MySQL server
+		$connection = self::connect($host, $user, $password);
 
-		# Avoid sql injection on older MySQL versions by using GBK
-		if ($database->server_version<50500) @$database->set_charset('GBK');
-		else @$database->set_charset('utf8');
+		# Check if the connection was successful
+		if ($connection===false) exit('Error: ' . $connection->connect_error);
 
-		# Set unicode
-		$database->query('SET NAMES utf8;');
+		if (!self::setCharset($connection)) exit('Error: Could not set database charset!');
 
 		# Create database
-		if (!self::createDatabase($database, $name)) exit('Error: Could not create database!');
+		if (!self::createDatabase($connection, $name)) exit('Error: Could not create database!');
 
 		# Create tables
-		if (!self::createTables($database)) exit('Error: Could not create tables!');
+		if (!self::createTables($connection)) exit('Error: Could not create tables!');
 
 		# Update database
-		if (!self::update($database, $name)) exit('Error: Could not update database and tables!');
+		if (!self::update($connection, $name)) exit('Error: Could not update database and tables!');
 
-		return $database;
+		$this->connection = $connection;
 
 	}
 
-	private static function update($database, $dbName) {
+	private function __clone() {
+
+		# Magic method clone is empty to prevent duplication of connection
+
+	}
+
+	public static function connect($host = 'localhost', $user, $password) {
+
+		# Open a new connection to the MySQL server
+		$connection = new mysqli($host, $user, $password);
+
+		# Check if the connection was successful
+		if ($connection->connect_errno) return false;
+
+		return $connection;
+
+	}
+
+	private static function setCharset($connection) {
+
+		# Avoid sql injection on older MySQL versions by using GBK
+		if ($connection->server_version<50500) @$connection->set_charset('GBK');
+		else @$connection->set_charset('utf8');
+
+		# Set unicode
+		$connection->query('SET NAMES utf8;');
+
+		return true;
+
+	}
+
+	public static function createDatabase($connection, $name = 'lychee') {
 
 		# Check dependencies
-		Module::dependencies(isset($database, $dbName));
+		Module::dependencies(isset($connection, $name));
+
+		# Check if database exists
+		if ($connection->select_db($name)) return true;
+
+		# Create database
+		$query	= self::prepare($connection, 'CREATE DATABASE IF NOT EXISTS ?', array($name));
+		$result = $connection->query($query);
+
+		if (!$connection->select_db($name)) return false;
+		return true;
+
+	}
+
+	private static function createTables($connection) {
+
+		# Check dependencies
+		Module::dependencies(isset($connection));
+
+		# Check if tables exist
+		$query = self::prepare($connection, 'SELECT * FROM ?, ?, ?, ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS, LYCHEE_TABLE_ALBUMS, LYCHEE_TABLE_SETTINGS, LYCHEE_TABLE_LOG));
+		if ($connection->query($query)) return true;
+
+		# Create log
+		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_LOG));
+		if (!$connection->query($exist)) {
+
+			# Read file
+			$file	= __DIR__ . '/../database/log_table.sql';
+			$query	= @file_get_contents($file);
+
+			if (!isset($query)||$query===false) return false;
+
+			# Create table
+			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_LOG));
+			if (!$connection->query($query)) return false;
+
+		}
+
+		# Create settings
+		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_SETTINGS));
+		if (!$connection->query($exist)) {
+
+			# Read file
+			$file	= __DIR__ . '/../database/settings_table.sql';
+			$query	= @file_get_contents($file);
+
+			if (!isset($query)||$query===false) {
+				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_settings');
+				return false;
+			}
+
+			# Create table
+			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
+			if (!$connection->query($query)) {
+				Log::error(__METHOD__, __LINE__, $connection->error);
+				return false;
+			}
+
+			# Read file
+			$file	= __DIR__ . '/../database/settings_content.sql';
+			$query	= @file_get_contents($file);
+
+			if (!isset($query)||$query===false) {
+				Log::error(__METHOD__, __LINE__, 'Could not load content-query for lychee_settings');
+				return false;
+			}
+
+			# Add content
+			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
+			if (!$connection->query($query)) {
+				Log::error(__METHOD__, __LINE__, $connection->error);
+				return false;
+			}
+
+			# Generate identifier
+			$identifier	= md5(microtime(true));
+			$query		= self::prepare($connection, "UPDATE `?` SET `value` = '?' WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS, $identifier));
+			if (!$connection->query($query)) {
+				Log::error(__METHOD__, __LINE__, $connection->error);
+				return false;
+			}
+
+		}
+
+		# Create albums
+		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_ALBUMS));
+		if (!$connection->query($exist)) {
+
+			# Read file
+			$file	= __DIR__ . '/../database/albums_table.sql';
+			$query	= @file_get_contents($file);
+
+			if (!isset($query)||$query===false) {
+				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_albums');
+				return false;
+			}
+
+			# Create table
+			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_ALBUMS));
+			if (!$connection->query($query)) {
+				Log::error(__METHOD__, __LINE__, $connection->error);
+				return false;
+			}
+
+		}
+
+		# Create photos
+		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS));
+		if (!$connection->query($exist)) {
+
+			# Read file
+			$file	= __DIR__ . '/../database/photos_table.sql';
+			$query	= @file_get_contents($file);
+
+			if (!isset($query)||$query===false) {
+				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_photos');
+				return false;
+			}
+
+			# Create table
+			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_PHOTOS));
+			if (!$connection->query($query)) {
+				Log::error(__METHOD__, __LINE__, $connection->error);
+				return false;
+			}
+
+		}
+
+		return true;
+
+	}
+
+	private static function update($connection, $dbName) {
+
+		# Check dependencies
+		Module::dependencies(isset($connection));
 
 		# Get current version
-		$query		= self::prepare($database, "SELECT * FROM ? WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS));
-		$results	= $database->query($query);
+		$query		= self::prepare($connection, "SELECT * FROM ? WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS));
+		$results	= $connection->query($query);
 		$current	= $results->fetch_object()->value;
 
 		# For each update
@@ -63,7 +252,7 @@ final class Database extends Module {
 			if ($version<=$current) continue;
 
 			# Load update
-			include(__DIR__ . '/../database/update_' . $update . '.php');
+			include(__DIR__ . '/../database/update_' . $version . '.php');
 
 		}
 
@@ -71,203 +260,21 @@ final class Database extends Module {
 
 	}
 
-	public static function createConfig($host = 'localhost', $user, $password, $name = 'lychee', $prefix = '') {
+	public static function setVersion($connection, $version) {
 
-		# Check dependencies
-		Module::dependencies(isset($host, $user, $password, $name));
-
-		$database = new mysqli($host, $user, $password);
-
-		if ($database->connect_errno) return 'Warning: Connection failed!';
-
-		# Check if user can create the database before saving the configuration
-		if (!self::createDatabase($database, $name)) return 'Warning: Creation failed!';
-
-		# Escape data
-		$host		= mysqli_real_escape_string($database, $host);
-		$user		= mysqli_real_escape_string($database, $user);
-		$password	= mysqli_real_escape_string($database, $password);
-		$name		= mysqli_real_escape_string($database, $name);
-		$prefix		= mysqli_real_escape_string($database, $prefix);
-
-		# Save config.php
-$config = "<?php
-
-###
-# @name			Configuration
-# @author		Tobias Reich
-# @copyright	2015 Tobias Reich
-###
-
-if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
-# Database configuration
-\$dbHost = '$host'; # Host of the database
-\$dbUser = '$user'; # Username of the database
-\$dbPassword = '$password'; # Password of the database
-\$dbName = '$name'; # Database name
-\$dbTablePrefix = '$prefix'; # Table prefix
-
-?>";
-
-		# Save file
-		if (file_put_contents(LYCHEE_CONFIG_FILE, $config)===false) return 'Warning: Could not create file!';
-
-		return true;
-
-	}
-
-	private static function createDatabase($database, $name = 'lychee') {
-
-		# Check dependencies
-		Module::dependencies(isset($database, $name));
-
-		# Check if database exists
-		if ($database->select_db($name)) return true;
-
-		# Create database
-		$query	= self::prepare($database, 'CREATE DATABASE IF NOT EXISTS ?', array($name));
-		$result = $database->query($query);
-
-		if (!$database->select_db($name)||!$result) return false;
-		return true;
-
-	}
-
-	private static function createTables($database) {
-
-		# Check dependencies
-		Module::dependencies(isset($database));
-
-		# Check if tables exist
-		$query = self::prepare($database, 'SELECT * FROM ?, ?, ?, ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS, LYCHEE_TABLE_ALBUMS, LYCHEE_TABLE_SETTINGS, LYCHEE_TABLE_LOG));
-		if ($database->query($query)) return true;
-
-		# Create log
-		$exist = self::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_LOG));
-		if (!$database->query($exist)) {
-
-			# Read file
-			$file	= __DIR__ . '/../database/log_table.sql';
-			$query	= @file_get_contents($file);
-
-			if (!isset($query)||$query===false) return false;
-
-			# Create table
-			$query = self::prepare($database, $query, array(LYCHEE_TABLE_LOG));
-			if (!$database->query($query)) return false;
-
-		}
-
-		# Create settings
-		$exist = self::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_SETTINGS));
-		if (!$database->query($exist)) {
-
-			# Read file
-			$file	= __DIR__ . '/../database/settings_table.sql';
-			$query	= @file_get_contents($file);
-
-			if (!isset($query)||$query===false) {
-				Log::error($database, __METHOD__, __LINE__, 'Could not load query for lychee_settings');
-				return false;
-			}
-
-			# Create table
-			$query = self::prepare($database, $query, array(LYCHEE_TABLE_SETTINGS));
-			if (!$database->query($query)) {
-				Log::error($database, __METHOD__, __LINE__, $database->error);
-				return false;
-			}
-
-			# Read file
-			$file	= __DIR__ . '/../database/settings_content.sql';
-			$query	= @file_get_contents($file);
-
-			if (!isset($query)||$query===false) {
-				Log::error($database, __METHOD__, __LINE__, 'Could not load content-query for lychee_settings');
-				return false;
-			}
-
-			# Add content
-			$query = self::prepare($database, $query, array(LYCHEE_TABLE_SETTINGS));
-			if (!$database->query($query)) {
-				Log::error($database, __METHOD__, __LINE__, $database->error);
-				return false;
-			}
-
-			# Generate identifier
-			$identifier	= md5(microtime(true));
-			$query		= self::prepare($database, "UPDATE `?` SET `value` = '?' WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS, $identifier));
-			if (!$database->query($query)) {
-				Log::error($database, __METHOD__, __LINE__, $database->error);
-				return false;
-			}
-
-		}
-
-		# Create albums
-		$exist = self::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_ALBUMS));
-		if (!$database->query($exist)) {
-
-			# Read file
-			$file	= __DIR__ . '/../database/albums_table.sql';
-			$query	= @file_get_contents($file);
-
-			if (!isset($query)||$query===false) {
-				Log::error($database, __METHOD__, __LINE__, 'Could not load query for lychee_albums');
-				return false;
-			}
-
-			# Create table
-			$query = self::prepare($database, $query, array(LYCHEE_TABLE_ALBUMS));
-			if (!$database->query($query)) {
-				Log::error($database, __METHOD__, __LINE__, $database->error);
-				return false;
-			}
-
-		}
-
-		# Create photos
-		$exist = self::prepare($database, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS));
-		if (!$database->query($exist)) {
-
-			# Read file
-			$file	= __DIR__ . '/../database/photos_table.sql';
-			$query	= @file_get_contents($file);
-
-			if (!isset($query)||$query===false) {
-				Log::error($database, __METHOD__, __LINE__, 'Could not load query for lychee_photos');
-				return false;
-			}
-
-			# Create table
-			$query = self::prepare($database, $query, array(LYCHEE_TABLE_PHOTOS));
-			if (!$database->query($query)) {
-				Log::error($database, __METHOD__, __LINE__, $database->error);
-				return false;
-			}
-
-		}
-
-		return true;
-
-	}
-
-	public static function setVersion($database, $version) {
-
-		$query	= self::prepare($database, "UPDATE ? SET value = '?' WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS, $version));
-		$result = $database->query($query);
+		$query	= self::prepare($connection, "UPDATE ? SET value = '?' WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS, $version));
+		$result = $connection->query($query);
 		if (!$result) {
-			Log::error($database, __METHOD__, __LINE__, 'Could not update database (' . $database->error . ')');
+			Log::error(__METHOD__, __LINE__, 'Could not update database (' . $connection->error . ')');
 			return false;
 		}
 
 	}
 
-	public static function prepare($database, $query, $data) {
+	public static function prepare($connection, $query, $data) {
 
 		# Check dependencies
-		Module::dependencies(isset($database, $query, $data));
+		Module::dependencies(isset($connection, $query, $data));
 
 		# Count the number of placeholders and compare it with the number of arguments
 		# If it doesn't match, calculate the difference and skip this number of placeholders before starting the replacement
@@ -280,12 +287,12 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 			'data'			=> count($data)
 		);
 
-		if (($num['data']-$num['placeholder'])<0) Log::notice($database, __METHOD__, __LINE__, 'Could not completely prepare query. Query has more placeholders than values.');
+		if (($num['data']-$num['placeholder'])<0) Log::notice(__METHOD__, __LINE__, 'Could not completely prepare query. Query has more placeholders than values.');
 
 		foreach ($data as $value) {
 
 			# Escape
-			$value = mysqli_real_escape_string($database, $value);
+			$value = mysqli_real_escape_string($connection, $value);
 
 			# Recalculate number of placeholders
 			$num['placeholder'] = substr_count($query, '?');
diff --git a/php/modules/Import.php b/php/modules/Import.php
index 5c42dd1..93ceb54 100644
--- a/php/modules/Import.php
+++ b/php/modules/Import.php
@@ -9,31 +9,17 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 final class Import extends Module {
 
-	private $database	= null;
-	private $settings	= null;
-
-	public function __construct($database, $plugins, $settings) {
-
-		# Init vars
-		$this->database	= $database;
-		$this->plugins	= $plugins;
-		$this->settings	= $settings;
-
-		return true;
-
-	}
-
 	private function photo($path, $albumID = 0, $description = '', $tags = '') {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->plugins, $this->settings, $path));
+		self::dependencies(isset($path));
 
 		# No need to validate photo type and extension in this function.
 		# $photo->add will take care of it.
 
 		$info	= getimagesize($path);
 		$size	= filesize($path);
-		$photo	= new Photo($this->database, $this->plugins, $this->settings, null);
+		$photo	= new Photo(null);
 
 		$nameFile					= array(array());
 		$nameFile[0]['name']		= $path;
@@ -51,7 +37,7 @@ final class Import extends Module {
 	public function url($urls, $albumID = 0) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $urls));
+		self::dependencies(isset($urls));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -71,7 +57,7 @@ final class Import extends Module {
 			$extension = getExtension($url);
 			if (!in_array(strtolower($extension), Photo::$validExtensions, true)) {
 				$error = true;
-				Log::error($this->database, __METHOD__, __LINE__, 'Photo format not supported (' . $url . ')');
+				Log::error(__METHOD__, __LINE__, 'Photo format not supported (' . $url . ')');
 				continue;
 			}
 
@@ -79,7 +65,7 @@ final class Import extends Module {
 			$type = @exif_imagetype($url);
 			if (!in_array($type, Photo::$validTypes, true)) {
 				$error = true;
-				Log::error($this->database, __METHOD__, __LINE__, 'Photo type not supported (' . $url . ')');
+				Log::error(__METHOD__, __LINE__, 'Photo type not supported (' . $url . ')');
 				continue;
 			}
 
@@ -89,14 +75,14 @@ final class Import extends Module {
 
 			if (@copy($url, $tmp_name)===false) {
 				$error = true;
-				Log::error($this->database, __METHOD__, __LINE__, 'Could not copy file (' . $tmp_name . ') to temp-folder (' . $tmp_name . ')');
+				Log::error(__METHOD__, __LINE__, 'Could not copy file (' . $tmp_name . ') to temp-folder (' . $tmp_name . ')');
 				continue;
 			}
 
 			# Import photo
 			if (!$this->photo($tmp_name, $albumID)) {
 				$error = true;
-				Log::error($this->database, __METHOD__, __LINE__, 'Could not import file: ' . $tmp_name);
+				Log::error(__METHOD__, __LINE__, 'Could not import file: ' . $tmp_name);
 				continue;
 			}
 
@@ -112,15 +98,12 @@ final class Import extends Module {
 
 	public function server($path, $albumID = 0) {
 
-		# Check dependencies
-		self::dependencies(isset($this->database, $this->plugins, $this->settings));
-
 		# Parse path
 		if (!isset($path))				$path = LYCHEE_UPLOADS_IMPORT;
 		if (substr($path, -1)==='/')	$path = substr($path, 0, -1);
 
 		if (is_dir($path)===false) {
-			Log::error($this->database, __METHOD__, __LINE__, 'Given path is not a directory (' . $path . ')');
+			Log::error(__METHOD__, __LINE__, 'Given path is not a directory (' . $path . ')');
 			return 'Error: Given path is not a directory!';
 		}
 
@@ -128,7 +111,7 @@ final class Import extends Module {
 		if ($path===LYCHEE_UPLOADS_BIG||($path . '/')===LYCHEE_UPLOADS_BIG||
 			$path===LYCHEE_UPLOADS_MEDIUM||($path . '/')===LYCHEE_UPLOADS_MEDIUM||
 			$path===LYCHEE_UPLOADS_THUMB||($path . '/')===LYCHEE_UPLOADS_THUMB) {
-				Log::error($this->database, __METHOD__, __LINE__, 'The given path is a reserved path of Lychee (' . $path . ')');
+				Log::error(__METHOD__, __LINE__, 'The given path is a reserved path of Lychee (' . $path . ')');
 				return 'Error: Given path is a reserved path of Lychee!';
 		}
 
@@ -150,7 +133,7 @@ final class Import extends Module {
 			# the file may still be unreadable by the user
 			if (!is_readable($file)) {
 				$error = true;
-				Log::error($this->database, __METHOD__, __LINE__, 'Could not read file or directory: ' . $file);
+				Log::error(__METHOD__, __LINE__, 'Could not read file or directory: ' . $file);
 				continue;
 			}
 
@@ -162,7 +145,7 @@ final class Import extends Module {
 
 				if (!$this->photo($file, $albumID)) {
 					$error = true;
-					Log::error($this->database, __METHOD__, __LINE__, 'Could not import file: ' . $file);
+					Log::error(__METHOD__, __LINE__, 'Could not import file: ' . $file);
 					continue;
 				}
 
@@ -170,13 +153,13 @@ final class Import extends Module {
 
 				# Folder
 
-				$album				= new Album($this->database, $this->plugins, $this->settings, null);
+				$album				= new Album(null);
 				$newAlbumID			= $album->add('[Import] ' . basename($file));
 				$contains['albums']	= true;
 
 				if ($newAlbumID===false) {
 					$error = true;
-					Log::error($this->database, __METHOD__, __LINE__, 'Could not create album in Lychee (' . $newAlbumID . ')');
+					Log::error(__METHOD__, __LINE__, 'Could not create album in Lychee (' . $newAlbumID . ')');
 					continue;
 				}
 
@@ -184,7 +167,7 @@ final class Import extends Module {
 
 				if ($import!==true&&$import!=='Notice: Import only contains albums!') {
 					$error = true;
-					Log::error($this->database, __METHOD__, __LINE__, 'Could not import folder. Function returned warning.');
+					Log::error(__METHOD__, __LINE__, 'Could not import folder. Function returned warning.');
 					continue;
 				}
 
diff --git a/php/modules/Log.php b/php/modules/Log.php
index 5befb0a..889de39 100644
--- a/php/modules/Log.php
+++ b/php/modules/Log.php
@@ -9,35 +9,35 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 final class Log extends Module {
 
-	public static function notice($database, $function, $line, $text = '') {
+	public static function notice($function, $line, $text = '') {
 
-		return Log::text($database, 'notice', $function, $line, $text);
+		return Log::text('notice', $function, $line, $text);
 
 	}
 
-	public static function warning($database, $function, $line, $text = '') {
+	public static function warning($function, $line, $text = '') {
 
-		return Log::text($database, 'warning', $function, $line, $text);
+		return Log::text('warning', $function, $line, $text);
 
 	}
 
-	public static function error($database, $function, $line, $text = '') {
+	public static function error($function, $line, $text = '') {
 
-		return Log::text($database, 'error', $function, $line, $text);
+		return Log::text('error', $function, $line, $text);
 
 	}
 
-	public static function text($database, $type, $function, $line, $text = '') {
+	private static function text($type, $function, $line, $text = '') {
 
 		# Check dependencies
-		Module::dependencies(isset($database, $type, $function, $line, $text));
+		Module::dependencies(isset($type, $function, $line, $text));
 
 		# Get time
 		$sysstamp = time();
 
 		# Save in database
-		$query	= Database::prepare($database, "INSERT INTO ? (time, type, function, line, text) VALUES ('?', '?', '?', '?', '?')", array(LYCHEE_TABLE_LOG, $sysstamp, $type, $function, $line, $text));
-		$result	= $database->query($query);
+		$query	= Database::prepare(Database::get(), "INSERT INTO ? (time, type, function, line, text) VALUES ('?', '?', '?', '?', '?')", array(LYCHEE_TABLE_LOG, $sysstamp, $type, $function, $line, $text));
+		$result	= Database::get()->query($query);
 
 		if (!$result) return false;
 		return true;
diff --git a/php/modules/Module.php b/php/modules/Module.php
index ab9fb0a..9a58de2 100644
--- a/php/modules/Module.php
+++ b/php/modules/Module.php
@@ -9,17 +9,15 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 abstract class Module {
 
-	protected $plugins = null;
-
 	protected function plugins($name, $location, $args) {
 
-		if (!isset($this->plugins, $name, $location, $args)) return false;
+		self::dependencies(isset($name, $location, $args));
 
 		# Parse
 		$location = ($location===0 ? 'before' : 'after');
 
 		# Call plugins
-		$this->plugins->activate($name . ":" . $location, $args);
+		Plugins::get()->activate($name . ":" . $location, $args);
 
 		return true;
 
diff --git a/php/modules/Photo.php b/php/modules/Photo.php
index ce99dd7..ddc14a1 100755
--- a/php/modules/Photo.php
+++ b/php/modules/Photo.php
@@ -9,9 +9,7 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 final class Photo extends Module {
 
-	private $database	= null;
-	private $settings	= null;
-	private $photoIDs	= null;
+	private $photoIDs = null;
 
 	public static $validTypes = array(
 		IMAGETYPE_JPEG,
@@ -26,12 +24,9 @@ final class Photo extends Module {
 		'.gif'
 	);
 
-	public function __construct($database, $plugins, $settings, $photoIDs) {
+	public function __construct($photoIDs) {
 
 		# Init vars
-		$this->database	= $database;
-		$this->plugins	= $plugins;
-		$this->settings	= $settings;
 		$this->photoIDs	= $photoIDs;
 
 		return true;
@@ -44,13 +39,13 @@ final class Photo extends Module {
 		# e.g. when calling this functions inside an if-condition
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->settings, $files));
+		self::dependencies(isset($files));
 
 		# Check permissions
 		if (hasPermissions(LYCHEE_UPLOADS)===false||
 			hasPermissions(LYCHEE_UPLOADS_BIG)===false||
 			hasPermissions(LYCHEE_UPLOADS_THUMB)===false) {
-				Log::error($this->database, __METHOD__, __LINE__, 'An upload-folder is missing or not readable and writable');
+				Log::error(__METHOD__, __LINE__, 'An upload-folder is missing or not readable and writable');
 				exit('Error: An upload-folder is missing or not readable and writable!');
 		}
 
@@ -91,35 +86,35 @@ final class Photo extends Module {
 
 			# Check if file exceeds the upload_max_filesize directive
 			if ($file['error']===UPLOAD_ERR_INI_SIZE) {
-				Log::error($this->database, __METHOD__, __LINE__, 'The uploaded file exceeds the upload_max_filesize directive in php.ini');
+				Log::error(__METHOD__, __LINE__, 'The uploaded file exceeds the upload_max_filesize directive in php.ini');
 				if ($returnOnError===true) return false;
 				exit('Error: The uploaded file exceeds the upload_max_filesize directive in php.ini!');
 			}
 
 			# Check if file was only partially uploaded
 			if ($file['error']===UPLOAD_ERR_PARTIAL) {
-				Log::error($this->database, __METHOD__, __LINE__, 'The uploaded file was only partially uploaded');
+				Log::error(__METHOD__, __LINE__, 'The uploaded file was only partially uploaded');
 				if ($returnOnError===true) return false;
 				exit('Error: The uploaded file was only partially uploaded!');
 			}
 
 			# Check if writing file to disk failed
 			if ($file['error']===UPLOAD_ERR_CANT_WRITE) {
-				Log::error($this->database, __METHOD__, __LINE__, 'Failed to write photo to disk');
+				Log::error(__METHOD__, __LINE__, 'Failed to write photo to disk');
 				if ($returnOnError===true) return false;
 				exit('Error: Failed to write photo to disk!');
 			}
 
 			# Check if a extension stopped the file upload
 			if ($file['error']===UPLOAD_ERR_EXTENSION) {
-				Log::error($this->database, __METHOD__, __LINE__, 'A PHP extension stopped the file upload');
+				Log::error(__METHOD__, __LINE__, 'A PHP extension stopped the file upload');
 				if ($returnOnError===true) return false;
 				exit('Error: A PHP extension stopped the file upload!');
 			}
 
 			# Check if the upload was successful
 			if ($file['error']!==UPLOAD_ERR_OK) {
-				Log::error($this->database, __METHOD__, __LINE__, 'Upload contains an error (' . $file['error'] . ')');
+				Log::error(__METHOD__, __LINE__, 'Upload contains an error (' . $file['error'] . ')');
 				if ($returnOnError===true) return false;
 				exit('Error: Upload failed!');
 			}
@@ -127,7 +122,7 @@ final class Photo extends Module {
 			# Verify extension
 			$extension = getExtension($file['name']);
 			if (!in_array(strtolower($extension), self::$validExtensions, true)) {
-				Log::error($this->database, __METHOD__, __LINE__, 'Photo format not supported');
+				Log::error(__METHOD__, __LINE__, 'Photo format not supported');
 				if ($returnOnError===true) return false;
 				exit('Error: Photo format not supported!');
 			}
@@ -135,7 +130,7 @@ final class Photo extends Module {
 			# Verify image
 			$type = @exif_imagetype($file['tmp_name']);
 			if (!in_array($type, self::$validTypes, true)) {
-				Log::error($this->database, __METHOD__, __LINE__, 'Photo type not supported');
+				Log::error(__METHOD__, __LINE__, 'Photo type not supported');
 				if ($returnOnError===true) return false;
 				exit('Error: Photo type not supported!');
 			}
@@ -152,7 +147,7 @@ final class Photo extends Module {
 			# Calculate checksum
 			$checksum = sha1_file($tmp_name);
 			if ($checksum===false) {
-				Log::error($this->database, __METHOD__, __LINE__, 'Could not calculate checksum for photo');
+				Log::error(__METHOD__, __LINE__, 'Could not calculate checksum for photo');
 				if ($returnOnError===true) return false;
 				exit('Error: Could not calculate checksum for photo!');
 			}
@@ -182,13 +177,13 @@ final class Photo extends Module {
 				# Import if not uploaded via web
 				if (!is_uploaded_file($tmp_name)) {
 					if (!@copy($tmp_name, $path)) {
-						Log::error($this->database, __METHOD__, __LINE__, 'Could not copy photo to uploads');
+						Log::error(__METHOD__, __LINE__, 'Could not copy photo to uploads');
 						if ($returnOnError===true) return false;
 						exit('Error: Could not copy photo to uploads!');
 					} else @unlink($tmp_name);
 				} else {
 					if (!@move_uploaded_file($tmp_name, $path)) {
-						Log::error($this->database, __METHOD__, __LINE__, 'Could not move photo to uploads');
+						Log::error(__METHOD__, __LINE__, 'Could not move photo to uploads');
 						if ($returnOnError===true) return false;
 						exit('Error: Could not move photo to uploads!');
 					}
@@ -198,8 +193,8 @@ final class Photo extends Module {
 
 				# Photo already exists
 				# Check if the user wants to skip duplicates
-				if ($this->settings['skipDuplicates']==='1') {
-					Log::notice($this->database, __METHOD__, __LINE__, 'Skipped upload of existing photo because skipDuplicates is activated');
+				if (Settings::get()['skipDuplicates']==='1') {
+					Log::notice(__METHOD__, __LINE__, 'Skipped upload of existing photo because skipDuplicates is activated');
 					if ($returnOnError===true) return false;
 					exit('Warning: This photo has been skipped because it\'s already in your library.');
 				}
@@ -221,7 +216,7 @@ final class Photo extends Module {
 				if ($file['type']==='image/jpeg'&&isset($info['orientation'])&&$info['orientation']!=='') {
 					$adjustFile = $this->adjustFile($path, $info);
 					if ($adjustFile!==false) $info = $adjustFile;
-					else Log::notice($this->database, __METHOD__, __LINE__, 'Skipped adjustment of photo (' . $info['title'] . ')');
+					else Log::notice(__METHOD__, __LINE__, 'Skipped adjustment of photo (' . $info['title'] . ')');
 				}
 
 				# Set original date
@@ -229,7 +224,7 @@ final class Photo extends Module {
 
 				# Create Thumb
 				if (!$this->createThumb($path, $photo_name, $info['type'], $info['width'], $info['height'])) {
-					Log::error($this->database, __METHOD__, __LINE__, 'Could not create thumbnail for photo');
+					Log::error(__METHOD__, __LINE__, 'Could not create thumbnail for photo');
 					if ($returnOnError===true) return false;
 					exit('Error: Could not create thumbnail for photo!');
 				}
@@ -245,11 +240,11 @@ final class Photo extends Module {
 
 			# Save to DB
 			$values	= array(LYCHEE_TABLE_PHOTOS, $id, $info['title'], $photo_name, $description, $tags, $info['type'], $info['width'], $info['height'], $info['size'], $info['iso'], $info['aperture'], $info['make'], $info['model'], $info['shutter'], $info['focal'], $info['takestamp'], $path_thumb, $albumID, $public, $star, $checksum, $medium);
-			$query	= Database::prepare($this->database, "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum, medium) VALUES ('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?')", $values);
-			$result = $this->database->query($query);
+			$query	= Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum, medium) VALUES ('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?')", $values);
+			$result = Database::get()->query($query);
 
 			if (!$result) {
-				Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				if ($returnOnError===true) return false;
 				exit('Error: Could not save photo in database!');
 			}
@@ -266,16 +261,16 @@ final class Photo extends Module {
 	private function exists($checksum, $photoID = null) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $checksum));
+		self::dependencies(isset($checksum));
 
 		# Exclude $photoID from select when $photoID is set
-		if (isset($photoID)) $query = Database::prepare($this->database, "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' AND id <> '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum, $photoID));
-		else $query = Database::prepare($this->database, "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum));
+		if (isset($photoID)) $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' AND id <> '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum, $photoID));
+		else $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum));
 
-		$result	= $this->database->query($query);
+		$result	= Database::get()->query($query);
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, 'Could not check for existing photos with the same checksum');
+			Log::error(__METHOD__, __LINE__, 'Could not check for existing photos with the same checksum');
 			return false;
 		}
 
@@ -301,7 +296,7 @@ final class Photo extends Module {
 	private function createThumb($url, $filename, $type, $width, $height) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->settings, $url, $filename, $type, $width, $height));
+		self::dependencies(isset($url, $filename, $type, $width, $height));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -315,12 +310,12 @@ final class Photo extends Module {
 		$newUrl2x	= LYCHEE_UPLOADS_THUMB . $photoName[0] . '@2x.jpeg';
 
 		# Create thumbnails with Imagick
-		if(extension_loaded('imagick')&&$this->settings['imagick']==='1') {
+		if(extension_loaded('imagick')&&Settings::get()['imagick']==='1') {
 
 			# Read image
 			$thumb = new Imagick();
 			$thumb->readImage($url);
-			$thumb->setImageCompressionQuality($this->settings['thumbQuality']);
+			$thumb->setImageCompressionQuality(Settings::get()['thumbQuality']);
 			$thumb->setImageFormat('jpeg');
 
 			# Copy image for 2nd thumb version
@@ -360,19 +355,19 @@ final class Photo extends Module {
 				case 'image/jpeg':	$sourceImg = imagecreatefromjpeg($url); break;
 				case 'image/png':	$sourceImg = imagecreatefrompng($url); break;
 				case 'image/gif':	$sourceImg = imagecreatefromgif($url); break;
-				default:			Log::error($this->database, __METHOD__, __LINE__, 'Type of photo is not supported');
+				default:			Log::error(__METHOD__, __LINE__, 'Type of photo is not supported');
 									return false;
 									break;
 			}
 
 			# Create thumb
 			fastimagecopyresampled($thumb, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth, $newHeight, $newSize, $newSize);
-			imagejpeg($thumb, $newUrl, $this->settings['thumbQuality']);
+			imagejpeg($thumb, $newUrl, Settings::get()['thumbQuality']);
 			imagedestroy($thumb);
 
 			# Create retina thumb
 			fastimagecopyresampled($thumb2x, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth*2, $newHeight*2, $newSize, $newSize);
-			imagejpeg($thumb2x, $newUrl2x, $this->settings['thumbQuality']);
+			imagejpeg($thumb2x, $newUrl2x, Settings::get()['thumbQuality']);
 			imagedestroy($thumb2x);
 
 			# Free memory
@@ -400,7 +395,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->settings, $url, $filename, $width, $height));
+		self::dependencies(isset($url, $filename, $width, $height));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -418,7 +413,7 @@ final class Photo extends Module {
 		if (hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false) {
 
 			# Permissions are missing
-			Log::notice($this->database, __METHOD__, __LINE__, 'Skipped creation of medium-photo, because uploads/medium/ is missing or not readable and writable.');
+			Log::notice(__METHOD__, __LINE__, 'Skipped creation of medium-photo, because uploads/medium/ is missing or not readable and writable.');
 			$error = true;
 
 		}
@@ -428,8 +423,8 @@ final class Photo extends Module {
 		# Is Imagick installed and activated?
 		if (($error===false)&&
 			($width>$newWidth||$height>$newHeight)&&
-			($this->settings['medium']==='1')&&
-			(extension_loaded('imagick')&&$this->settings['imagick']==='1')) {
+			(Settings::get()['medium']==='1')&&
+			(extension_loaded('imagick')&&Settings::get()['imagick']==='1')) {
 
 			$newUrl = LYCHEE_UPLOADS_MEDIUM . $filename;
 
@@ -443,7 +438,7 @@ final class Photo extends Module {
 			# Save image
 			try { $medium->writeImage($newUrl); }
 			catch (ImagickException $err) {
-				Log::notice($this->database, __METHOD__, __LINE__, 'Could not save medium-photo: ' . $err->getMessage());
+				Log::notice(__METHOD__, __LINE__, 'Could not save medium-photo: ' . $err->getMessage());
 				$error = true;
 			}
 
@@ -485,7 +480,7 @@ final class Photo extends Module {
 
 		$swapSize = false;
 
-		if (extension_loaded('imagick')&&$this->settings['imagick']==='1') {
+		if (extension_loaded('imagick')&&Settings::get()['imagick']==='1') {
 
 			switch ($info['orientation']) {
 
@@ -655,14 +650,14 @@ final class Photo extends Module {
 		# (array) $photo
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Get photo
-		$query	= Database::prepare($this->database, "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos	= Database::get()->query($query);
 		$photo	= $photos->fetch_assoc();
 
 		# Parse photo
@@ -684,8 +679,8 @@ final class Photo extends Module {
 			if ($photo['album']!=='0') {
 
 				# Get album
-				$query	= Database::prepare($this->database, "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $photo['album']));
-				$albums	= $this->database->query($query);
+				$query	= Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $photo['album']));
+				$albums	= Database::get()->query($query);
 				$album	= $albums->fetch_assoc();
 
 				# Parse album
@@ -714,7 +709,7 @@ final class Photo extends Module {
 		# (array) $return
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $url));
+		self::dependencies(isset($url));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -821,32 +816,32 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Get photo
-		$query	= Database::prepare($this->database, "SELECT title, url FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos	= Database::get()->query($query);
 		$photo	= $photos->fetch_object();
 
 		# Error in database query
 		if (!$photos) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
 		# Photo not found
 		if ($photo===null) {
-			Log::error($this->database, __METHOD__, __LINE__, 'Album not found. Cannot start download.');
+			Log::error(__METHOD__, __LINE__, 'Album not found. Cannot start download.');
 			return false;
 		}
 
 		# Get extension
 		$extension = getExtension($photo->url);
 		if ($extension===false) {
-			Log::error($this->database, __METHOD__, __LINE__, 'Invalid photo extension');
+			Log::error(__METHOD__, __LINE__, 'Invalid photo extension');
 			return false;
 		}
 
@@ -887,20 +882,20 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Set title
-		$query	= Database::prepare($this->database, "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $title, $this->photoIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $title, $this->photoIDs));
+		$result	= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -917,20 +912,20 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Set description
-		$query	= Database::prepare($this->database, "UPDATE ? SET description = '?' WHERE id IN ('?')", array(LYCHEE_TABLE_PHOTOS, $description, $this->photoIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN ('?')", array(LYCHEE_TABLE_PHOTOS, $description, $this->photoIDs));
+		$result	= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -945,7 +940,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -954,8 +949,8 @@ final class Photo extends Module {
 		$error	= false;
 
 		# Get photos
-		$query	= Database::prepare($this->database, "SELECT id, star FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT id, star FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos	= Database::get()->query($query);
 
 		# For each photo
 		while ($photo = $photos->fetch_object()) {
@@ -964,8 +959,8 @@ final class Photo extends Module {
 			$star = ($photo->star==0 ? 1 : 0);
 
 			# Set star
-			$query	= Database::prepare($this->database, "UPDATE ? SET star = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $star, $photo->id));
-			$star	= $this->database->query($query);
+			$query	= Database::prepare(Database::get(), "UPDATE ? SET star = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $star, $photo->id));
+			$star	= Database::get()->query($query);
 			if (!$star) $error = true;
 
 		}
@@ -974,7 +969,7 @@ final class Photo extends Module {
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if ($error===true) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -990,14 +985,14 @@ final class Photo extends Module {
 		# (int) 2 = Photo public or album public and password correct
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Get photo
-		$query	= Database::prepare($this->database, "SELECT public, album FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT public, album FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos	= Database::get()->query($query);
 		$photo	= $photos->fetch_object();
 
 		# Check if public
@@ -1009,7 +1004,7 @@ final class Photo extends Module {
 		} else {
 
 			# Check if album public
-			$album	= new Album($this->database, null, null, $photo->album);
+			$album	= new Album($photo->album);
 			$agP	= $album->getPublic();
 			$acP	= $album->checkPassword($password);
 
@@ -1037,28 +1032,28 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Get public
-		$query	= Database::prepare($this->database, "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos	= Database::get()->query($query);
 		$photo	= $photos->fetch_object();
 
 		# Invert public
 		$public = ($photo->public==0 ? 1 : 0);
 
 		# Set public
-		$query	= Database::prepare($this->database, "UPDATE ? SET public = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $public, $this->photoIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET public = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $public, $this->photoIDs));
+		$result	= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -1073,20 +1068,20 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Set album
-		$query	= Database::prepare($this->database, "UPDATE ? SET album = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->photoIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET album = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->photoIDs));
+		$result	= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -1103,7 +1098,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
@@ -1113,14 +1108,14 @@ final class Photo extends Module {
 		$tags = preg_replace('/,$|^,|(\ ){0,}$/', '', $tags);
 
 		# Set tags
-		$query	= Database::prepare($this->database, "UPDATE ? SET tags = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $tags, $this->photoIDs));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET tags = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $tags, $this->photoIDs));
+		$result	= Database::get()->query($query);
 
 		# Call plugins
 		$this->plugins(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
@@ -1135,16 +1130,16 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Get photos
-		$query	= Database::prepare($this->database, "SELECT id, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT id, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos	= Database::get()->query($query);
 		if (!$photos) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
@@ -1157,10 +1152,10 @@ final class Photo extends Module {
 
 			# Duplicate entry
 			$values		= array(LYCHEE_TABLE_PHOTOS, $id, LYCHEE_TABLE_PHOTOS, $photo->id);
-			$query		= Database::prepare($this->database, "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum) SELECT '?' AS id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum FROM ? WHERE id = '?'", $values);
-			$duplicate	= $this->database->query($query);
+			$query		= Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum) SELECT '?' AS id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum FROM ? WHERE id = '?'", $values);
+			$duplicate	= Database::get()->query($query);
 			if (!$duplicate) {
-				Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
 
@@ -1178,16 +1173,16 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $this->photoIDs));
+		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Get photos
-		$query	= Database::prepare($this->database, "SELECT id, url, thumbUrl, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT id, url, thumbUrl, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos	= Database::get()->query($query);
 		if (!$photos) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
@@ -1204,35 +1199,35 @@ final class Photo extends Module {
 
 				# Delete big
 				if (file_exists(LYCHEE_UPLOADS_BIG . $photo->url)&&!unlink(LYCHEE_UPLOADS_BIG . $photo->url)) {
-					Log::error($this->database, __METHOD__, __LINE__, 'Could not delete photo in uploads/big/');
+					Log::error(__METHOD__, __LINE__, 'Could not delete photo in uploads/big/');
 					return false;
 				}
 
 				# Delete medium
 				if (file_exists(LYCHEE_UPLOADS_MEDIUM . $photo->url)&&!unlink(LYCHEE_UPLOADS_MEDIUM . $photo->url)) {
-					Log::error($this->database, __METHOD__, __LINE__, 'Could not delete photo in uploads/medium/');
+					Log::error(__METHOD__, __LINE__, 'Could not delete photo in uploads/medium/');
 					return false;
 				}
 
 				# Delete thumb
 				if (file_exists(LYCHEE_UPLOADS_THUMB . $photo->thumbUrl)&&!unlink(LYCHEE_UPLOADS_THUMB . $photo->thumbUrl)) {
-					Log::error($this->database, __METHOD__, __LINE__, 'Could not delete photo in uploads/thumb/');
+					Log::error(__METHOD__, __LINE__, 'Could not delete photo in uploads/thumb/');
 					return false;
 				}
 
 				# Delete thumb@2x
 				if (file_exists(LYCHEE_UPLOADS_THUMB . $thumbUrl2x)&&!unlink(LYCHEE_UPLOADS_THUMB . $thumbUrl2x))	 {
-					Log::error($this->database, __METHOD__, __LINE__, 'Could not delete high-res photo in uploads/thumb/');
+					Log::error(__METHOD__, __LINE__, 'Could not delete high-res photo in uploads/thumb/');
 					return false;
 				}
 
 			}
 
 			# Delete db entry
-			$query	= Database::prepare($this->database, "DELETE FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photo->id));
-			$delete	= $this->database->query($query);
+			$query	= Database::prepare(Database::get(), "DELETE FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photo->id));
+			$delete	= Database::get()->query($query);
 			if (!$delete) {
-				Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
 
diff --git a/php/modules/Plugins.php b/php/modules/Plugins.php
index 94aa1bd..6b83180 100644
--- a/php/modules/Plugins.php
+++ b/php/modules/Plugins.php
@@ -9,32 +9,35 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 final class Plugins implements \SplSubject {
 
-	private $files		= array();
-	private $observers	= array();
+	private static $instance = null;
 
-	public $action	= null;
-	public $args	= null;
+	private $observers = array();
 
-	public function __construct(array $files, $database, array $settings) {
+	public $action = null;
+	public $args = null;
 
-		if (!isset($files)) return false;
+	public static function get() {
 
-		# Init vars
-		$this->files = $files;
+		if (!self::$instance) {
+
+			$files = Settings::get()['plugins'];
+
+			self::$instance = new self($files);
+
+		}
+
+		return self::$instance;
+
+	}
+
+	private function __construct(array $plugins) {
 
 		# Load plugins
-		foreach ($this->files as $file) {
+		foreach ($plugins as $plugin) {
 
-			if ($file==='') continue;
+			if ($plugin==='') continue;
 
-			$file = LYCHEE_PLUGINS . $file;
-
-			if (file_exists($file)===false) {
-				Log::warning($database, __METHOD__, __LINE__, 'Could not include plugin. File does not exist (' . $file . ').');
-				continue;
-			}
-
-			include($file);
+			$this->attach(new $plugin);
 
 		}
 
@@ -42,6 +45,12 @@ final class Plugins implements \SplSubject {
 
 	}
 
+	private function __clone() {
+
+		# Magic method clone is empty to prevent duplication of plugins
+
+	}
+
 	public function attach(\SplObserver $observer) {
 
 		if (!isset($observer)) return false;
@@ -91,4 +100,4 @@ final class Plugins implements \SplSubject {
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/php/modules/Session.php b/php/modules/Session.php
index 3e27d98..bd823ca 100755
--- a/php/modules/Session.php
+++ b/php/modules/Session.php
@@ -9,28 +9,16 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 final class Session extends Module {
 
-	private $settings = null;
-
-	public function __construct($plugins, $settings) {
-
-		# Init vars
-		$this->plugins	= $plugins;
-		$this->settings	= $settings;
-
-		return true;
-
-	}
-
-	public function init($database, $dbName, $public) {
+	public function init($public) {
 
 		# Check dependencies
-		self::dependencies(isset($this->settings, $public));
+		self::dependencies(isset($public));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
 		# Return settings
-		$return['config'] = $this->settings;
+		$return['config'] = Settings::get();
 
 		# Path to Lychee for the server-import dialog
 		$return['config']['location'] = LYCHEE;
@@ -83,19 +71,19 @@ final class Session extends Module {
 	public function login($username, $password) {
 
 		# Check dependencies
-		self::dependencies(isset($this->settings, $username, $password));
+		self::dependencies(isset($username, $password));
 
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
-		$username = crypt($username, $this->settings['username']);
-		$password = crypt($password, $this->settings['password']);
+		$username = crypt($username, Settings::get()['username']);
+		$password = crypt($password, Settings::get()['password']);
 
 		# Check login with crypted hash
-		if ($this->settings['username']===$username&&
-			$this->settings['password']===$password) {
+		if (Settings::get()['username']===$username&&
+			Settings::get()['password']===$password) {
 				$_SESSION['login']		= true;
-				$_SESSION['identifier']	= $this->settings['identifier'];
+				$_SESSION['identifier']	= Settings::get()['identifier'];
 				return true;
 		}
 
@@ -111,14 +99,11 @@ final class Session extends Module {
 
 	private function noLogin() {
 
-		# Check dependencies
-		self::dependencies(isset($this->settings));
-
 		# Check if login credentials exist and login if they don't
-		if ($this->settings['username']===''&&
-			$this->settings['password']==='') {
+		if (Settings::get()['username']===''&&
+			Settings::get()['password']==='') {
 				$_SESSION['login']		= true;
-				$_SESSION['identifier']	= $this->settings['identifier'];
+				$_SESSION['identifier']	= Settings::get()['identifier'];
 				return true;
 		}
 
diff --git a/php/modules/Settings.php b/php/modules/Settings.php
index 689fd1c..6c68373 100755
--- a/php/modules/Settings.php
+++ b/php/modules/Settings.php
@@ -9,51 +9,40 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 final class Settings extends Module {
 
-	private $database = null;
+	private static $cache = null;
 
-	public function __construct($database) {
+	public static function get() {
 
-		# Init vars
-		$this->database = $database;
-
-		return true;
-
-	}
-
-	public function get() {
-
-		# Check dependencies
-		self::dependencies(isset($this->database));
+		if (self::$cache) return self::$cache;
 
 		# Execute query
-		$query		= Database::prepare($this->database, "SELECT * FROM ?", array(LYCHEE_TABLE_SETTINGS));
-		$settings	= $this->database->query($query);
+		$query		= Database::prepare(Database::get(), "SELECT * FROM ?", array(LYCHEE_TABLE_SETTINGS));
+		$settings	= Database::get()->query($query);
 
 		# Add each to return
 		while ($setting = $settings->fetch_object()) $return[$setting->key] = $setting->value;
 
-		# Fallback for versions below v2.5
-		if (!isset($return['plugins'])) $return['plugins'] = '';
+		# Convert plugins to array
+		$return['plugins'] = explode(';', $return['plugins']);
+
+		self::$cache = $return;
 
 		return $return;
 
 	}
 
-	public function setLogin($oldPassword = '', $username, $password) {
+	public static function setLogin($oldPassword = '', $username, $password) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database));
+		self::dependencies(isset($oldPassword, $username, $password));
 
-		# Load settings
-		$settings = $this->get();
-
-		if ($oldPassword===$settings['password']||$settings['password']===crypt($oldPassword, $settings['password'])) {
+		if ($oldPassword===self::get()['password']||self::get()['password']===crypt($oldPassword, self::get()['password'])) {
 
 			# Save username
-			if ($this->setUsername($username)!==true) exit('Error: Updating username failed!');
+			if (self::setUsername($username)!==true) exit('Error: Updating username failed!');
 
 			# Save password
-			if ($this->setPassword($password)!==true) exit('Error: Updating password failed!');
+			if (self::setPassword($password)!==true) exit('Error: Updating password failed!');
 
 			return true;
 
@@ -63,10 +52,10 @@ final class Settings extends Module {
 
 	}
 
-	private function setUsername($username) {
+	private static function setUsername($username) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database));
+		self::dependencies(isset($username));
 
 		# Hash username
 		$username = getHashedString($username);
@@ -74,21 +63,21 @@ final class Settings extends Module {
 		# Execute query
 		# Do not prepare $username because it is hashed and save
 		# Preparing (escaping) the username would destroy the hash
-		$query	= Database::prepare($this->database, "UPDATE ? SET value = '$username' WHERE `key` = 'username'", array(LYCHEE_TABLE_SETTINGS));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$username' WHERE `key` = 'username'", array(LYCHEE_TABLE_SETTINGS));
+		$result	= Database::get()->query($query);
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
 
 	}
 
-	private function setPassword($password) {
+	private static function setPassword($password) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database));
+		self::dependencies(isset($password));
 
 		# Hash password
 		$password = getHashedString($password);
@@ -96,43 +85,43 @@ final class Settings extends Module {
 		# Execute query
 		# Do not prepare $password because it is hashed and save
 		# Preparing (escaping) the password would destroy the hash
-		$query	= Database::prepare($this->database, "UPDATE ? SET value = '$password' WHERE `key` = 'password'", array(LYCHEE_TABLE_SETTINGS));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$password' WHERE `key` = 'password'", array(LYCHEE_TABLE_SETTINGS));
+		$result	= Database::get()->query($query);
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
 
 	}
 
-	public function setDropboxKey($key) {
+	public static function setDropboxKey($key) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $key));
+		self::dependencies(isset($key));
 
 		if (strlen($key)<1||strlen($key)>50) {
-			Log::notice($this->database, __METHOD__, __LINE__, 'Dropbox key is either too short or too long');
+			Log::notice(__METHOD__, __LINE__, 'Dropbox key is either too short or too long');
 			return false;
 		}
 
 		# Execute query
-		$query	= Database::prepare($this->database, "UPDATE ? SET value = '?' WHERE `key` = 'dropboxKey'", array(LYCHEE_TABLE_SETTINGS, $key));
-		$result = $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '?' WHERE `key` = 'dropboxKey'", array(LYCHEE_TABLE_SETTINGS, $key));
+		$result = Database::get()->query($query);
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
 
 	}
 
-	public function setSortingPhotos($type, $order) {
+	public static function setSortingPhotos($type, $order) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $type, $order));
+		self::dependencies(isset($type, $order));
 
 		$sorting = 'ORDER BY ';
 
@@ -183,21 +172,21 @@ final class Settings extends Module {
 		# Do not prepare $sorting because it is a true statement
 		# Preparing (escaping) the sorting would destroy it
 		# $sorting is save and can't contain user-input
-		$query	= Database::prepare($this->database, "UPDATE ? SET value = '$sorting' WHERE `key` = 'sortingPhotos'", array(LYCHEE_TABLE_SETTINGS));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$sorting' WHERE `key` = 'sortingPhotos'", array(LYCHEE_TABLE_SETTINGS));
+		$result	= Database::get()->query($query);
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
 
 	}
 
-	public function setSortingAlbums($type, $order) {
+	public static function setSortingAlbums($type, $order) {
 
 		# Check dependencies
-		self::dependencies(isset($this->database, $type, $order));
+		self::dependencies(isset($type, $order));
 
 		$sorting = 'ORDER BY ';
 
@@ -239,11 +228,11 @@ final class Settings extends Module {
 		# Do not prepare $sorting because it is a true statement
 		# Preparing (escaping) the sorting would destroy it
 		# $sorting is save and can't contain user-input
-		$query	= Database::prepare($this->database, "UPDATE ? SET value = '$sorting' WHERE `key` = 'sortingAlbums'", array(LYCHEE_TABLE_SETTINGS));
-		$result	= $this->database->query($query);
+		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$sorting' WHERE `key` = 'sortingAlbums'", array(LYCHEE_TABLE_SETTINGS));
+		$result	= Database::get()->query($query);
 
 		if (!$result) {
-			Log::error($this->database, __METHOD__, __LINE__, $this->database->error);
+			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 		return true;
diff --git a/php/modules/misc.php b/php/modules/misc.php
index 865d812..07dde6b 100755
--- a/php/modules/misc.php
+++ b/php/modules/misc.php
@@ -7,9 +7,7 @@
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-function search($database, $settings, $term) {
-
-	if (!isset($database, $settings, $term)) return false;
+function search($term) {
 
 	$return['albums'] = '';
 
@@ -24,8 +22,8 @@ function search($database, $settings, $term) {
 	# Photos
 	###
 
-	$query	= Database::prepare($database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term));
-	$result	= $database->query($query);
+	$query	= Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term));
+	$result	= Database::get()->query($query);
 
 	while($photo = $result->fetch_assoc()) {
 
@@ -38,8 +36,8 @@ function search($database, $settings, $term) {
 	# Albums
 	###
 
-	$query	= Database::prepare($database, "SELECT id, title, public, sysstamp, password FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%'", array(LYCHEE_TABLE_ALBUMS, $term, $term));
-	$result = $database->query($query);
+	$query	= Database::prepare(Database::get(), "SELECT id, title, public, sysstamp, password FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%'", array(LYCHEE_TABLE_ALBUMS, $term, $term));
+	$result = Database::get()->query($query);
 
 	while($album = $result->fetch_assoc()) {
 
@@ -47,8 +45,8 @@ function search($database, $settings, $term) {
 		$album = Album::prepareData($album);
 
 		# Thumbs
-		$query	= Database::prepare($database, "SELECT thumbUrl FROM ? WHERE album = '?' " . $settings['sortingPhotos'] . " LIMIT 0, 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
-		$thumbs	= $database->query($query);
+		$query	= Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'] . " LIMIT 0, 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
+		$thumbs	= Database::get()->query($query);
 
 		# For each thumb
 		$k = 0;
@@ -69,15 +67,13 @@ function search($database, $settings, $term) {
 
 }
 
-function getGraphHeader($database, $photoID) {
+function getGraphHeader($photoID) {
 
-	if (!isset($database, $photoID)) return false;
-
-	$photo = new Photo($database, null, null, $photoID);
+	$photo = new Photo($photoID);
 	if ($photo->getPublic('')===false) return false;
 
-	$query	= Database::prepare($database, "SELECT title, description, url, medium FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photoID));
-	$result	= $database->query($query);
+	$query	= Database::prepare(Database::get(), "SELECT title, description, url, medium FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photoID));
+	$result	= Database::get()->query($query);
 	$row	= $result->fetch_object();
 
 	if (!$result||!$row) return false;
diff --git a/plugins/check/index.php b/plugins/check/index.php
index 7340573..d14dc0f 100644
--- a/plugins/check/index.php
+++ b/plugins/check/index.php
@@ -58,16 +58,12 @@ if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support'])	$error
 if (!file_exists(LYCHEE_CONFIG_FILE))	exit('Error: Configuration not found. Please install Lychee for additional tests');
 else									require(LYCHEE_CONFIG_FILE);
 
-# Define the table prefix
-defineTablePrefix(@$dbTablePrefix);
-
 # Database
 $database = new mysqli($dbHost, $dbUser, $dbPassword, $dbName);
 if (mysqli_connect_errno()!=0) $error .= ('Error: ' . mysqli_connect_errno() . ': ' . mysqli_connect_error() . '' . PHP_EOL);
 
 # Load settings
-$settings = new Settings($database);
-$settings = $settings->get();
+$settings = Settings::get();
 
 # Config
 if (!isset($dbName)||$dbName==='')	$error .= ('Error: No property for $dbName in config.php' . PHP_EOL);
@@ -130,7 +126,7 @@ if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 	echo('Imagick Active:  ' . $settings['imagick'] . PHP_EOL);
 	echo('Imagick Version: ' . $imagickVersion . PHP_EOL);
 	echo('GD Version:      ' . $gdVersion['GD Version'] . PHP_EOL);
-	echo('Plugins:         ' . $settings['plugins'] . PHP_EOL);
+	echo('Plugins:         ' . implode($settings['plugins'], ', ') . PHP_EOL);
 
 } else {
 
diff --git a/plugins/displaylog/index.php b/plugins/displaylog/index.php
index 52aa698..dda47a2 100644
--- a/plugins/displaylog/index.php
+++ b/plugins/displaylog/index.php
@@ -25,12 +25,6 @@ header('content-type: text/plain');
 if (!file_exists(LYCHEE_CONFIG_FILE)) exit('Error 001: Configuration not found. Please install Lychee first.');
 require(LYCHEE_CONFIG_FILE);
 
-# Define the table prefix
-defineTablePrefix(@$dbTablePrefix);
-
-# Declare
-$result = '';
-
 # Database
 $database = new mysqli($dbHost, $dbUser, $dbPassword, $dbName);
 
@@ -40,8 +34,7 @@ if (mysqli_connect_errno()!=0) {
 }
 
 # Load settings
-$settings = new Settings($database);
-$settings = $settings->get();
+$settings = Settings::get();
 
 # Ensure that user is logged in
 if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
diff --git a/src/scripts/settings.js b/src/scripts/settings.js
index db5810f..8fd92d6 100644
--- a/src/scripts/settings.js
+++ b/src/scripts/settings.js
@@ -31,7 +31,7 @@ settings.createConfig = function() {
 			dbTablePrefix
 		}
 
-		api.post('Database::createConfig', params, function(data) {
+		api.post('Config::create', params, function(data) {
 
 			if (data!==true) {
 
diff --git a/view.php b/view.php
index c1b1160..821b1f5 100644
--- a/view.php
+++ b/view.php
@@ -26,14 +26,8 @@
 				require(__DIR__ . '/php/define.php');
 				require(__DIR__ . '/php/autoload.php');
 				require(__DIR__ . '/php/modules/misc.php');
-				require(LYCHEE_CONFIG_FILE);
 
-				# Define the table prefix
-				defineTablePrefix(@$dbTablePrefix);
-
-				$database = Database::connect($dbHost, $dbUser, $dbPassword, $dbName);
-
-				echo getGraphHeader($database, $_GET['p']);
+				echo getGraphHeader($_GET['p']);
 
 			}
 

From 84c4a5b267b88d223d2090695aeaf4cdabd5893c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 22:15:04 +0100
Subject: [PATCH 027/183] Removed version from sql files

---
 php/database/albums_table.sql     | 1 -
 php/database/log_table.sql        | 1 -
 php/database/photos_table.sql     | 1 -
 php/database/settings_content.sql | 1 -
 php/database/settings_table.sql   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/php/database/albums_table.sql b/php/database/albums_table.sql
index b949e2e..8303b88 100644
--- a/php/database/albums_table.sql
+++ b/php/database/albums_table.sql
@@ -1,5 +1,4 @@
 # Dump of table lychee_albums
-# Version 2.5
 # ------------------------------------------------------------
 
 CREATE TABLE IF NOT EXISTS `?` (
diff --git a/php/database/log_table.sql b/php/database/log_table.sql
index 800b00c..c5869bf 100644
--- a/php/database/log_table.sql
+++ b/php/database/log_table.sql
@@ -1,5 +1,4 @@
 # Dump of table lychee_log
-# Version 2.5
 # ------------------------------------------------------------
 
 CREATE TABLE IF NOT EXISTS `?` (
diff --git a/php/database/photos_table.sql b/php/database/photos_table.sql
index b8d5ef9..bd265e8 100644
--- a/php/database/photos_table.sql
+++ b/php/database/photos_table.sql
@@ -1,5 +1,4 @@
 # Dump of table lychee_photos
-# Version 2.5
 # ------------------------------------------------------------
 
 CREATE TABLE IF NOT EXISTS `?` (
diff --git a/php/database/settings_content.sql b/php/database/settings_content.sql
index cbcc9d6..907e6c4 100644
--- a/php/database/settings_content.sql
+++ b/php/database/settings_content.sql
@@ -1,5 +1,4 @@
 # Content of table lychee_settings
-# Version 2.5
 # ------------------------------------------------------------
 
 INSERT INTO `?` (`key`, `value`)
diff --git a/php/database/settings_table.sql b/php/database/settings_table.sql
index 80eccce..bdc1cf2 100644
--- a/php/database/settings_table.sql
+++ b/php/database/settings_table.sql
@@ -1,5 +1,4 @@
 # Dump of table lychee_settings
-# Version 2.5
 # ------------------------------------------------------------
 
 CREATE TABLE IF NOT EXISTS `?` (

From 2f70bfac41e0130cfa57ffdaf6aca47f580d388a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 22:17:47 +0100
Subject: [PATCH 028/183] Removed __clone

---
 php/modules/Database.php | 6 ------
 php/modules/Plugins.php  | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/php/modules/Database.php b/php/modules/Database.php
index 9662be2..6ef3327 100755
--- a/php/modules/Database.php
+++ b/php/modules/Database.php
@@ -68,12 +68,6 @@ final class Database extends Module {
 
 	}
 
-	private function __clone() {
-
-		# Magic method clone is empty to prevent duplication of connection
-
-	}
-
 	public static function connect($host = 'localhost', $user, $password) {
 
 		# Open a new connection to the MySQL server
diff --git a/php/modules/Plugins.php b/php/modules/Plugins.php
index 6b83180..c1fd4db 100644
--- a/php/modules/Plugins.php
+++ b/php/modules/Plugins.php
@@ -45,12 +45,6 @@ final class Plugins implements \SplSubject {
 
 	}
 
-	private function __clone() {
-
-		# Magic method clone is empty to prevent duplication of plugins
-
-	}
-
 	public function attach(\SplObserver $observer) {
 
 		if (!isset($observer)) return false;

From aeb62bba48e7db3907895b7452e19c05239d5255 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 22:30:37 +0100
Subject: [PATCH 029/183] Moved misc file

---
 php/api.php                  | 2 +-
 php/{modules => }/misc.php   | 0
 plugins/check/index.php      | 2 +-
 plugins/displaylog/index.php | 2 +-
 view.php                     | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename php/{modules => }/misc.php (100%)

diff --git a/php/api.php b/php/api.php
index d64e4fe..76e4ee1 100755
--- a/php/api.php
+++ b/php/api.php
@@ -20,7 +20,7 @@ if (!empty($fn)) {
 	# Load required files
 	require(__DIR__ . '/define.php');
 	require(__DIR__ . '/autoload.php');
-	require(__DIR__ . '/modules/misc.php');
+	require(__DIR__ . '/misc.php');
 
 	# Validate parameters
 	if (isset($_POST['albumIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['albumIDs'])!==1)	exit('Error: Wrong parameter type for albumIDs!');
diff --git a/php/modules/misc.php b/php/misc.php
similarity index 100%
rename from php/modules/misc.php
rename to php/misc.php
diff --git a/plugins/check/index.php b/plugins/check/index.php
index d14dc0f..1a56c35 100644
--- a/plugins/check/index.php
+++ b/plugins/check/index.php
@@ -13,7 +13,7 @@ $lychee = __DIR__ . '/../../';
 # Load requirements
 require($lychee . 'php/define.php');
 require($lychee . 'php/autoload.php');
-require($lychee . 'php/modules/misc.php');
+require($lychee . 'php/misc.php');
 
 # Start the session
 session_start();
diff --git a/plugins/displaylog/index.php b/plugins/displaylog/index.php
index dda47a2..0e36c5a 100644
--- a/plugins/displaylog/index.php
+++ b/plugins/displaylog/index.php
@@ -16,7 +16,7 @@ session_start();
 # Load requirements
 require($lychee . 'php/define.php');
 require($lychee . 'php/autoload.php');
-require($lychee . 'php/modules/misc.php');
+require($lychee . 'php/misc.php');
 
 # Set content
 header('content-type: text/plain');
diff --git a/view.php b/view.php
index 821b1f5..0b0e001 100644
--- a/view.php
+++ b/view.php
@@ -25,7 +25,7 @@
 				# Load required files
 				require(__DIR__ . '/php/define.php');
 				require(__DIR__ . '/php/autoload.php');
-				require(__DIR__ . '/php/modules/misc.php');
+				require(__DIR__ . '/php/misc.php');
 
 				echo getGraphHeader($_GET['p']);
 

From 412fbf47eeed2a6ad66ad0a79298d9913a9c5995 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 22:30:57 +0100
Subject: [PATCH 030/183] exit() after using access-file

---
 php/api.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/php/api.php b/php/api.php
index 76e4ee1..5f50dd9 100755
--- a/php/api.php
+++ b/php/api.php
@@ -55,18 +55,18 @@ if (!empty($fn)) {
 		$admin = new Admin();
 		$admin->check($fn);
 
-	} else {
-
-		###
-		# Guest Access
-		# Access to view all public folders and photos in Lychee.
-		###
-
-		$guest = new Guest();
-		$guest->check($fn);
+		exit();
 
 	}
 
+	###
+	# Guest Access
+	# Access to view all public folders and photos in Lychee.
+	###
+
+	$guest = new Guest();
+	$guest->check($fn);
+
 } else {
 
 	exit('Error: No API function specified!');

From dc35658ddc6c64c07bb9f2ebd202ba9fabc0a376 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 24 Jan 2016 22:31:03 +0100
Subject: [PATCH 031/183] Fixed name

---
 php/modules/Import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/modules/Import.php b/php/modules/Import.php
index 93ceb54..ac1cc98 100644
--- a/php/modules/Import.php
+++ b/php/modules/Import.php
@@ -1,7 +1,7 @@
 <?php
 
 ###
-# @name			Upload Module
+# @name			Import Module
 # @copyright	2015 by Tobias Reich
 ###
 

From 145c3f5147f450070e076024078a00583c7542e0 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 26 Jan 2016 15:31:53 +0100
Subject: [PATCH 032/183] Namespaces, Plugins via Namespaces, API entry file
 renamned, Settings::set()

---
 .gitignore                               |   7 +-
 dist/main.js                             | Bin 192541 -> 192542 bytes
 dist/view.js                             | Bin 107009 -> 107011 bytes
 php/access/Access.php                    |  11 +-
 php/access/Admin.php                     |  14 +-
 php/access/Guest.php                     |  12 +-
 php/access/Installation.php              |  10 +-
 php/autoload.php                         |  22 +--
 php/define.php                           |   5 -
 php/helpers/fastImageCopyResampled.php   |  35 ++++
 php/helpers/getExtension.php             |  13 ++
 php/helpers/getGraphHeader.php           |  47 ++++++
 php/helpers/getHashedString.php          |  31 ++++
 php/helpers/hasPermissions.php           |  14 ++
 php/helpers/search.php                   |  63 ++++++++
 php/{api.php => index.php}               |  25 ++-
 php/misc.php                             | 195 -----------------------
 php/modules/Album.php                    |   7 +-
 php/modules/Config.php                   |   7 +-
 php/modules/Database.php                 |   9 +-
 php/modules/Import.php                   |   7 +-
 php/modules/Log.php                      |   7 +-
 php/modules/Module.php                   |   7 +-
 php/modules/Photo.php                    |  11 +-
 php/modules/Plugins.php                  |   9 +-
 php/modules/Session.php                  |   7 +-
 php/modules/Settings.php                 |  66 ++++----
 plugins/{check => Diagnostics}/index.php |  18 ++-
 plugins/{displaylog => Log}/index.php    |  34 ++--
 src/scripts/api.js                       |   2 +-
 src/scripts/contextMenu.js               |   4 +-
 31 files changed, 329 insertions(+), 370 deletions(-)
 create mode 100644 php/helpers/fastImageCopyResampled.php
 create mode 100644 php/helpers/getExtension.php
 create mode 100644 php/helpers/getGraphHeader.php
 create mode 100644 php/helpers/getHashedString.php
 create mode 100644 php/helpers/hasPermissions.php
 create mode 100755 php/helpers/search.php
 rename php/{api.php => index.php} (76%)
 delete mode 100755 php/misc.php
 rename plugins/{check => Diagnostics}/index.php (97%)
 rename plugins/{displaylog => Log}/index.php (65%)

diff --git a/.gitignore b/.gitignore
index 254c796..7763479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,13 @@ uploads/big/*
 uploads/import/*
 uploads/medium/*
 uploads/thumb/*
-plugins/*
 
 !uploads/big/index.html
 !uploads/import/index.html
 !uploads/medium/index.html
 !uploads/thumb/index.html
 
-!plugins/check/
-!plugins/displaylog/
\ No newline at end of file
+plugins/*
+
+!plugins/Diagnostics/
+!plugins/Log/
\ No newline at end of file
diff --git a/dist/main.js b/dist/main.js
index 7fc8c459c694ab4108d722023329b69ec9d13a2e..56ab19262be169576c9846f89d20c48a12d4af93 100644
GIT binary patch
delta 64
zcmbRHfP3Bp?uIRl#jjX1^HNePwwJwPj1c5?$xKYo%P%g;OfJ?}n$F0{Bsu-vZ$>9p
UpZs(nf58t%ne7pO7>|Ai08?Tb9{>OV

delta 62
zcmV-E0KxyB;0vAL3xKo%bLs<OaA~)A>H%002V-buV{0!Wm!S*-8JG6^0YVF8X>)LF
UVR>wCXD^pf6apQ$S^NRT^COcPH2?qr

diff --git a/dist/view.js b/dist/view.js
index 084bab82048e3368096d073e4663f0a2df545500..75fb8cf31bb8e951224353713b1ec8288fb26b5c 100644
GIT binary patch
delta 23
ecmZoX!q$9*tziq}<s#P1yp+_6?bnJJwe<mcA_<BB

delta 21
ccmZoZ!q#|%tziq}<s#<9g3RqViWs%^0cG<DtN;K2

diff --git a/php/access/Access.php b/php/access/Access.php
index cf515c4..50551f7 100644
--- a/php/access/Access.php
+++ b/php/access/Access.php
@@ -1,15 +1,10 @@
 <?php
 
-###
-# @name			Access
-# @copyright	2015 by Tobias Reich
-###
+namespace Lychee\Access;
 
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+interface Access {
 
-abstract class Access {
-
-	abstract protected function check($fn);
+	public function check($fn);
 
 }
 
diff --git a/php/access/Admin.php b/php/access/Admin.php
index 59917cf..659e325 100644
--- a/php/access/Admin.php
+++ b/php/access/Admin.php
@@ -1,13 +1,15 @@
 <?php
 
-###
-# @name			Admin Access
-# @copyright	2015 by Tobias Reich
-###
+namespace Lychee\Access;
 
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+use Lychee\Modules\Album;
+use Lychee\Modules\Import;
+use Lychee\Modules\Module;
+use Lychee\Modules\Photo;
+use Lychee\Modules\Session;
+use Lychee\Modules\Settings;
 
-final class Admin extends Access {
+final class Admin implements Access {
 
 	public function check($fn) {
 
diff --git a/php/access/Guest.php b/php/access/Guest.php
index e153f78..e1050b4 100644
--- a/php/access/Guest.php
+++ b/php/access/Guest.php
@@ -1,13 +1,13 @@
 <?php
 
-###
-# @name			Guest Access (Public Mode)
-# @copyright	2015 by Tobias Reich
-###
+namespace Lychee\Access;
 
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+use Lychee\Modules\Album;
+use Lychee\Modules\Module;
+use Lychee\Modules\Photo;
+use Lychee\Modules\Session;
 
-final class Guest extends Access {
+final class Guest implements Access {
 
 	public function check($fn) {
 
diff --git a/php/access/Installation.php b/php/access/Installation.php
index c0c0ef7..ec1cabb 100644
--- a/php/access/Installation.php
+++ b/php/access/Installation.php
@@ -1,13 +1,11 @@
 <?php
 
-###
-# @name			Installation Access
-# @copyright	2015 by Tobias Reich
-###
+namespace Lychee\Access;
 
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+use Lychee\Modules\Config;
+use Lychee\Modules\Module;
 
-final class Installation extends Access {
+final class Installation implements Access {
 
 	public function check($fn) {
 
diff --git a/php/autoload.php b/php/autoload.php
index bd5aca4..64356af 100644
--- a/php/autoload.php
+++ b/php/autoload.php
@@ -1,15 +1,11 @@
 <?php
 
-###
-# @name			Autoload
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
 spl_autoload_register(function($class) {
 
-	$file = LYCHEE . 'php/modules/' . $class . '.php';
+	$classPath = str_replace('Lychee\\', '', $class);
+	$classPath = str_replace('\\', DIRECTORY_SEPARATOR, $classPath);
+
+	$file = LYCHEE . 'php/' . $classPath . '.php';
 
 	if (file_exists($file)===true) require $file;
 
@@ -17,15 +13,9 @@ spl_autoload_register(function($class) {
 
 spl_autoload_register(function($class) {
 
-	$file = LYCHEE . 'php/access/' . $class . '.php';
+	$classPath = str_replace('\\', DIRECTORY_SEPARATOR, $class);
 
-	if (file_exists($file)===true) require $file;
-
-});
-
-spl_autoload_register(function($class) {
-
-	$file = LYCHEE . 'plugins/' . $class . '/' . $class . '.php';
+	$file = LYCHEE . 'plugins/' . $classPath . '.php';
 
 	if (file_exists($file)===true) require $file;
 
diff --git a/php/define.php b/php/define.php
index 01b59fd..cf35353 100644
--- a/php/define.php
+++ b/php/define.php
@@ -1,10 +1,5 @@
 <?php
 
-###
-# @name			Define
-# @copyright	2015 by Tobias Reich
-###
-
 # Define root
 define('LYCHEE', substr(__DIR__, 0, -3));
 
diff --git a/php/helpers/fastImageCopyResampled.php b/php/helpers/fastImageCopyResampled.php
new file mode 100644
index 0000000..868337d
--- /dev/null
+++ b/php/helpers/fastImageCopyResampled.php
@@ -0,0 +1,35 @@
+<?php
+
+function fastImageCopyResampled(&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 4) {
+
+	###
+	# Plug-and-Play fastImageCopyResampled function replaces much slower imagecopyresampled.
+	# Just include this function and change all "imagecopyresampled" references to "fastImageCopyResampled".
+	# Typically from 30 to 60 times faster when reducing high resolution images down to thumbnail size using the default quality setting.
+	# Author: Tim Eckel - Date: 09/07/07 - Version: 1.1 - Project: FreeRingers.net - Freely distributable - These comments must remain.
+	#
+	# Optional "quality" parameter (defaults is 3). Fractional values are allowed, for example 1.5. Must be greater than zero.
+	# Between 0 and 1 = Fast, but mosaic results, closer to 0 increases the mosaic effect.
+	# 1 = Up to 350 times faster. Poor results, looks very similar to imagecopyresized.
+	# 2 = Up to 95 times faster.  Images appear a little sharp, some prefer this over a quality of 3.
+	# 3 = Up to 60 times faster.  Will give high quality smooth results very close to imagecopyresampled, just faster.
+	# 4 = Up to 25 times faster.  Almost identical to imagecopyresampled for most images.
+	# 5 = No speedup. Just uses imagecopyresampled, no advantage over imagecopyresampled.
+	###
+
+	if (empty($src_image) || empty($dst_image) || $quality <= 0) { return false; }
+
+	if ($quality < 5 && (($dst_w * $quality) < $src_w || ($dst_h * $quality) < $src_h)) {
+
+		$temp = imagecreatetruecolor($dst_w * $quality + 1, $dst_h * $quality + 1);
+		imagecopyresized($temp, $src_image, 0, 0, $src_x, $src_y, $dst_w * $quality + 1, $dst_h * $quality + 1, $src_w, $src_h);
+		imagecopyresampled($dst_image, $temp, $dst_x, $dst_y, 0, 0, $dst_w, $dst_h, $dst_w * $quality, $dst_h * $quality);
+		imagedestroy($temp);
+
+	} else imagecopyresampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+
+	return true;
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/helpers/getExtension.php b/php/helpers/getExtension.php
new file mode 100644
index 0000000..21089c0
--- /dev/null
+++ b/php/helpers/getExtension.php
@@ -0,0 +1,13 @@
+<?php
+
+function getExtension($filename) {
+
+	$extension = strpos($filename, '.') !== false
+		? strrchr($filename, '.')
+		: '';
+
+	return $extension;
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/helpers/getGraphHeader.php b/php/helpers/getGraphHeader.php
new file mode 100644
index 0000000..aec92aa
--- /dev/null
+++ b/php/helpers/getGraphHeader.php
@@ -0,0 +1,47 @@
+<?php
+
+function getGraphHeader($photoID) {
+
+	$photo = new Photo($photoID);
+	if ($photo->getPublic('')===false) return false;
+
+	$query	= Database::prepare(Database::get(), "SELECT title, description, url, medium FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photoID));
+	$result	= Database::get()->query($query);
+	$row	= $result->fetch_object();
+
+	if (!$result||!$row) return false;
+
+	if ($row->medium==='1')	$dir = 'medium';
+	else					$dir = 'big';
+
+	$parseUrl	= parse_url('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+	$url		= $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '?' . $parseUrl['query'];
+	$picture	= $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '/../uploads/' . $dir . '/' . $row->url;
+
+	$url		= htmlentities($url);
+	$picture	= htmlentities($picture);
+
+	$row->title			= htmlentities($row->title);
+	$row->description	= htmlentities($row->description);
+
+	$return = '<!-- General Meta Data -->';
+	$return .= '<meta name="title" content="' . $row->title . '">';
+	$return .= '<meta name="description" content="' . $row->description . ' - via Lychee">';
+	$return .= '<link rel="image_src" type="image/jpeg" href="' . $picture . '">';
+
+	$return .= '<!-- Twitter Meta Data -->';
+	$return .= '<meta name="twitter:card" content="photo">';
+	$return .= '<meta name="twitter:title" content="' . $row->title . '">';
+	$return .= '<meta name="twitter:image:src" content="' . $picture . '">';
+
+	$return .= '<!-- Facebook Meta Data -->';
+	$return .= '<meta property="og:title" content="' . $row->title . '">';
+	$return .= '<meta property="og:description" content="' . $row->description . ' - via Lychee">';
+	$return .= '<meta property="og:image" content="' . $picture . '">';
+	$return .= '<meta property="og:url" content="' . $url . '">';
+
+	return $return;
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/helpers/getHashedString.php b/php/helpers/getHashedString.php
new file mode 100644
index 0000000..1205586
--- /dev/null
+++ b/php/helpers/getHashedString.php
@@ -0,0 +1,31 @@
+<?php
+
+function getHashedString($password) {
+
+	# Inspired by http://alias.io/2010/01/store-passwords-safely-with-php-and-mysql/
+
+	# A higher $cost is more secure but consumes more processing power
+	$cost = 10;
+
+	# Create a random salt
+	if (extension_loaded('openssl')) {
+		$salt = strtr(substr(base64_encode(openssl_random_pseudo_bytes(17)),0,22), '+', '.');
+	} elseif (extension_loaded('mcrypt')) {
+		$salt = strtr(substr(base64_encode(mcrypt_create_iv(17, MCRYPT_DEV_URANDOM)),0,22), '+', '.');
+	} else {
+		$salt = "";
+		for ($i = 0; $i < 22; $i++) {
+			$salt .= substr("./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", mt_rand(0, 63), 1);
+		}
+	}
+
+	# Prefix information about the hash so PHP knows how to verify it later.
+	# "$2a$" Means we're using the Blowfish algorithm. The following two digits are the cost parameter.
+	$salt = sprintf("$2a$%02d$", $cost) . $salt;
+
+	# Hash the password with the salt
+	return crypt($password, $salt);
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/helpers/hasPermissions.php b/php/helpers/hasPermissions.php
new file mode 100644
index 0000000..f5f8bbd
--- /dev/null
+++ b/php/helpers/hasPermissions.php
@@ -0,0 +1,14 @@
+<?php
+
+function hasPermissions($path) {
+
+	// Check if the given path is readable and writable
+	// Both functions are also verifying that the path exists
+	if (is_readable($path)===true&&
+		is_writeable($path)===true) return true;
+
+	return false;
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/helpers/search.php b/php/helpers/search.php
new file mode 100755
index 0000000..5786b83
--- /dev/null
+++ b/php/helpers/search.php
@@ -0,0 +1,63 @@
+<?php
+
+function search($term) {
+
+	$return['albums'] = '';
+
+	# Initialize return var
+	$return = array(
+		'photos'	=> null,
+		'albums'	=> null,
+		'hash'		=> ''
+	);
+
+	###
+	# Photos
+	###
+
+	$query	= Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term));
+	$result	= Database::get()->query($query);
+
+	while($photo = $result->fetch_assoc()) {
+
+		$photo = Photo::prepareData($photo);
+		$return['photos'][$photo['id']] = $photo;
+
+	}
+
+	###
+	# Albums
+	###
+
+	$query	= Database::prepare(Database::get(), "SELECT id, title, public, sysstamp, password FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%'", array(LYCHEE_TABLE_ALBUMS, $term, $term));
+	$result = Database::get()->query($query);
+
+	while($album = $result->fetch_assoc()) {
+
+		# Turn data from the database into a front-end friendly format
+		$album = Album::prepareData($album);
+
+		# Thumbs
+		$query	= Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'] . " LIMIT 0, 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
+		$thumbs	= Database::get()->query($query);
+
+		# For each thumb
+		$k = 0;
+		while ($thumb = $thumbs->fetch_object()) {
+			$album['thumbs'][$k] = LYCHEE_URL_UPLOADS_THUMB . $thumb->thumbUrl;
+			$k++;
+		}
+
+		# Add to return
+		$return['albums'][$album['id']] = $album;
+
+	}
+
+	# Hash
+	$return['hash'] = md5(json_encode($return));
+
+	return $return;
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/api.php b/php/index.php
similarity index 76%
rename from php/api.php
rename to php/index.php
index 5f50dd9..b80c660 100755
--- a/php/api.php
+++ b/php/index.php
@@ -2,9 +2,29 @@
 
 ###
 # @name			API
+# @author		Tobias Reich
 # @copyright	2015 by Tobias Reich
 ###
 
+namespace Lychee;
+
+use Lychee\Modules\Config;
+use Lychee\Modules\Settings;
+
+use Lychee\Access\Installation;
+use Lychee\Access\Admin;
+use Lychee\Access\Guest;
+
+require(__DIR__ . '/define.php');
+require(__DIR__ . '/autoload.php');
+
+require(__DIR__ . '/helpers/fastImageCopyResampled.php');
+require(__DIR__ . '/helpers/getExtension.php');
+require(__DIR__ . '/helpers/getGraphHeader.php');
+require(__DIR__ . '/helpers/getHashedString.php');
+require(__DIR__ . '/helpers/hasPermissions.php');
+require(__DIR__ . '/helpers/search.php');
+
 # Define the called function
 if (isset($_POST['function']))		$fn = $_POST['function'];
 else if (isset($_GET['function']))	$fn = $_GET['function'];
@@ -17,11 +37,6 @@ if (!empty($fn)) {
 	session_start();
 	date_default_timezone_set('UTC');
 
-	# Load required files
-	require(__DIR__ . '/define.php');
-	require(__DIR__ . '/autoload.php');
-	require(__DIR__ . '/misc.php');
-
 	# Validate parameters
 	if (isset($_POST['albumIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['albumIDs'])!==1)	exit('Error: Wrong parameter type for albumIDs!');
 	if (isset($_POST['photoIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['photoIDs'])!==1)	exit('Error: Wrong parameter type for photoIDs!');
diff --git a/php/misc.php b/php/misc.php
deleted file mode 100755
index 07dde6b..0000000
--- a/php/misc.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-###
-# @name			Misc Module
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
-
-function search($term) {
-
-	$return['albums'] = '';
-
-	# Initialize return var
-	$return = array(
-		'photos'	=> null,
-		'albums'	=> null,
-		'hash'		=> ''
-	);
-
-	###
-	# Photos
-	###
-
-	$query	= Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term));
-	$result	= Database::get()->query($query);
-
-	while($photo = $result->fetch_assoc()) {
-
-		$photo = Photo::prepareData($photo);
-		$return['photos'][$photo['id']] = $photo;
-
-	}
-
-	###
-	# Albums
-	###
-
-	$query	= Database::prepare(Database::get(), "SELECT id, title, public, sysstamp, password FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%'", array(LYCHEE_TABLE_ALBUMS, $term, $term));
-	$result = Database::get()->query($query);
-
-	while($album = $result->fetch_assoc()) {
-
-		# Turn data from the database into a front-end friendly format
-		$album = Album::prepareData($album);
-
-		# Thumbs
-		$query	= Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'] . " LIMIT 0, 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
-		$thumbs	= Database::get()->query($query);
-
-		# For each thumb
-		$k = 0;
-		while ($thumb = $thumbs->fetch_object()) {
-			$album['thumbs'][$k] = LYCHEE_URL_UPLOADS_THUMB . $thumb->thumbUrl;
-			$k++;
-		}
-
-		# Add to return
-		$return['albums'][$album['id']] = $album;
-
-	}
-
-	# Hash
-	$return['hash'] = md5(json_encode($return));
-
-	return $return;
-
-}
-
-function getGraphHeader($photoID) {
-
-	$photo = new Photo($photoID);
-	if ($photo->getPublic('')===false) return false;
-
-	$query	= Database::prepare(Database::get(), "SELECT title, description, url, medium FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photoID));
-	$result	= Database::get()->query($query);
-	$row	= $result->fetch_object();
-
-	if (!$result||!$row) return false;
-
-	if ($row->medium==='1')	$dir = 'medium';
-	else					$dir = 'big';
-
-	$parseUrl	= parse_url('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-	$url		= $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '?' . $parseUrl['query'];
-	$picture	= $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '/../uploads/' . $dir . '/' . $row->url;
-
-	$url		= htmlentities($url);
-	$picture	= htmlentities($picture);
-
-	$row->title			= htmlentities($row->title);
-	$row->description	= htmlentities($row->description);
-
-	$return = '<!-- General Meta Data -->';
-	$return .= '<meta name="title" content="' . $row->title . '">';
-	$return .= '<meta name="description" content="' . $row->description . ' - via Lychee">';
-	$return .= '<link rel="image_src" type="image/jpeg" href="' . $picture . '">';
-
-	$return .= '<!-- Twitter Meta Data -->';
-	$return .= '<meta name="twitter:card" content="photo">';
-	$return .= '<meta name="twitter:title" content="' . $row->title . '">';
-	$return .= '<meta name="twitter:image:src" content="' . $picture . '">';
-
-	$return .= '<!-- Facebook Meta Data -->';
-	$return .= '<meta property="og:title" content="' . $row->title . '">';
-	$return .= '<meta property="og:description" content="' . $row->description . ' - via Lychee">';
-	$return .= '<meta property="og:image" content="' . $picture . '">';
-	$return .= '<meta property="og:url" content="' . $url . '">';
-
-	return $return;
-
-}
-
-function getExtension($filename) {
-
-	$extension = strpos($filename, '.') !== false
-		? strrchr($filename, '.')
-		: '';
-
-	return $extension;
-
-}
-
-function getHashedString($password) {
-
-	# Inspired by http://alias.io/2010/01/store-passwords-safely-with-php-and-mysql/
-
-	# A higher $cost is more secure but consumes more processing power
-	$cost = 10;
-
-	# Create a random salt
-	if (extension_loaded('openssl')) {
-		$salt = strtr(substr(base64_encode(openssl_random_pseudo_bytes(17)),0,22), '+', '.');
-	} elseif (extension_loaded('mcrypt')) {
-		$salt = strtr(substr(base64_encode(mcrypt_create_iv(17, MCRYPT_DEV_URANDOM)),0,22), '+', '.');
-	} else {
-		$salt = "";
-		for ($i = 0; $i < 22; $i++) {
-			$salt .= substr("./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", mt_rand(0, 63), 1);
-		}
-	}
-
-	# Prefix information about the hash so PHP knows how to verify it later.
-	# "$2a$" Means we're using the Blowfish algorithm. The following two digits are the cost parameter.
-	$salt = sprintf("$2a$%02d$", $cost) . $salt;
-
-	# Hash the password with the salt
-	return crypt($password, $salt);
-
-}
-
-function hasPermissions($path) {
-
-	// Check if the given path is readable and writable
-	// Both functions are also verifying that the path exists
-	if (is_readable($path)===true&&
-		is_writeable($path)===true) return true;
-
-	return false;
-
-}
-
-function fastimagecopyresampled(&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 4) {
-
-	###
-	# Plug-and-Play fastimagecopyresampled function replaces much slower imagecopyresampled.
-	# Just include this function and change all "imagecopyresampled" references to "fastimagecopyresampled".
-	# Typically from 30 to 60 times faster when reducing high resolution images down to thumbnail size using the default quality setting.
-	# Author: Tim Eckel - Date: 09/07/07 - Version: 1.1 - Project: FreeRingers.net - Freely distributable - These comments must remain.
-	#
-	# Optional "quality" parameter (defaults is 3). Fractional values are allowed, for example 1.5. Must be greater than zero.
-	# Between 0 and 1 = Fast, but mosaic results, closer to 0 increases the mosaic effect.
-	# 1 = Up to 350 times faster. Poor results, looks very similar to imagecopyresized.
-	# 2 = Up to 95 times faster.  Images appear a little sharp, some prefer this over a quality of 3.
-	# 3 = Up to 60 times faster.  Will give high quality smooth results very close to imagecopyresampled, just faster.
-	# 4 = Up to 25 times faster.  Almost identical to imagecopyresampled for most images.
-	# 5 = No speedup. Just uses imagecopyresampled, no advantage over imagecopyresampled.
-	###
-
-	if (empty($src_image) || empty($dst_image) || $quality <= 0) { return false; }
-
-	if ($quality < 5 && (($dst_w * $quality) < $src_w || ($dst_h * $quality) < $src_h)) {
-
-		$temp = imagecreatetruecolor($dst_w * $quality + 1, $dst_h * $quality + 1);
-		imagecopyresized($temp, $src_image, 0, 0, $src_x, $src_y, $dst_w * $quality + 1, $dst_h * $quality + 1, $src_w, $src_h);
-		imagecopyresampled($dst_image, $temp, $dst_x, $dst_y, 0, 0, $dst_w, $dst_h, $dst_w * $quality, $dst_h * $quality);
-		imagedestroy($temp);
-
-	} else imagecopyresampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-
-	return true;
-
-}
-
-?>
diff --git a/php/modules/Album.php b/php/modules/Album.php
index e74997e..34ef0fb 100644
--- a/php/modules/Album.php
+++ b/php/modules/Album.php
@@ -1,11 +1,6 @@
 <?php
 
-###
-# @name			Album Module
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+namespace Lychee\Modules;
 
 final class Album extends Module {
 
diff --git a/php/modules/Config.php b/php/modules/Config.php
index 317571f..85cd28f 100644
--- a/php/modules/Config.php
+++ b/php/modules/Config.php
@@ -1,11 +1,6 @@
 <?php
 
-###
-# @name			Database Module
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+namespace Lychee\Modules;
 
 final class Config extends Module {
 
diff --git a/php/modules/Database.php b/php/modules/Database.php
index 6ef3327..6804e80 100755
--- a/php/modules/Database.php
+++ b/php/modules/Database.php
@@ -1,11 +1,8 @@
 <?php
 
-###
-# @name			Database Module
-# @copyright	2015 by Tobias Reich
-###
+namespace Lychee\Modules;
 
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+use Mysqli;
 
 final class Database extends Module {
 
@@ -71,7 +68,7 @@ final class Database extends Module {
 	public static function connect($host = 'localhost', $user, $password) {
 
 		# Open a new connection to the MySQL server
-		$connection = new mysqli($host, $user, $password);
+		$connection = new Mysqli($host, $user, $password);
 
 		# Check if the connection was successful
 		if ($connection->connect_errno) return false;
diff --git a/php/modules/Import.php b/php/modules/Import.php
index ac1cc98..564948e 100644
--- a/php/modules/Import.php
+++ b/php/modules/Import.php
@@ -1,11 +1,6 @@
 <?php
 
-###
-# @name			Import Module
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+namespace Lychee\Modules;
 
 final class Import extends Module {
 
diff --git a/php/modules/Log.php b/php/modules/Log.php
index 889de39..4be35e8 100644
--- a/php/modules/Log.php
+++ b/php/modules/Log.php
@@ -1,11 +1,6 @@
 <?php
 
-###
-# @name			Log Module
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+namespace Lychee\Modules;
 
 final class Log extends Module {
 
diff --git a/php/modules/Module.php b/php/modules/Module.php
index 9a58de2..35a9d5d 100644
--- a/php/modules/Module.php
+++ b/php/modules/Module.php
@@ -1,11 +1,6 @@
 <?php
 
-###
-# @name			Module
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+namespace Lychee\Modules;
 
 abstract class Module {
 
diff --git a/php/modules/Photo.php b/php/modules/Photo.php
index ddc14a1..0dd2f5d 100755
--- a/php/modules/Photo.php
+++ b/php/modules/Photo.php
@@ -1,11 +1,6 @@
 <?php
 
-###
-# @name			Photo Module
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+namespace Lychee\Modules;
 
 final class Photo extends Module {
 
@@ -361,12 +356,12 @@ final class Photo extends Module {
 			}
 
 			# Create thumb
-			fastimagecopyresampled($thumb, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth, $newHeight, $newSize, $newSize);
+			fastImageCopyResampled($thumb, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth, $newHeight, $newSize, $newSize);
 			imagejpeg($thumb, $newUrl, Settings::get()['thumbQuality']);
 			imagedestroy($thumb);
 
 			# Create retina thumb
-			fastimagecopyresampled($thumb2x, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth*2, $newHeight*2, $newSize, $newSize);
+			fastImageCopyResampled($thumb2x, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth*2, $newHeight*2, $newSize, $newSize);
 			imagejpeg($thumb2x, $newUrl2x, Settings::get()['thumbQuality']);
 			imagedestroy($thumb2x);
 
diff --git a/php/modules/Plugins.php b/php/modules/Plugins.php
index c1fd4db..6377855 100644
--- a/php/modules/Plugins.php
+++ b/php/modules/Plugins.php
@@ -1,13 +1,10 @@
 <?php
 
-###
-# @name			Plugins Module
-# @copyright	2015 by Tobias Reich
-###
+namespace Lychee\Modules;
 
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+use SplSubject;
 
-final class Plugins implements \SplSubject {
+final class Plugins implements SplSubject {
 
 	private static $instance = null;
 
diff --git a/php/modules/Session.php b/php/modules/Session.php
index bd823ca..2a16b5b 100755
--- a/php/modules/Session.php
+++ b/php/modules/Session.php
@@ -1,11 +1,6 @@
 <?php
 
-###
-# @name			Session Module
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+namespace Lychee\Modules;
 
 final class Session extends Module {
 
diff --git a/php/modules/Settings.php b/php/modules/Settings.php
index 6c68373..2088870 100755
--- a/php/modules/Settings.php
+++ b/php/modules/Settings.php
@@ -1,11 +1,6 @@
 <?php
 
-###
-# @name			Settings Module
-# @copyright	2015 by Tobias Reich
-###
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+namespace Lychee\Modules;
 
 final class Settings extends Module {
 
@@ -31,6 +26,30 @@ final class Settings extends Module {
 
 	}
 
+	private static function set($key, $value, $row = false) {
+
+		if ($row===false) {
+
+			$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '?' WHERE `key` = '?'", array(LYCHEE_TABLE_SETTINGS, $value, $key));
+
+		} elseif ($row===true) {
+
+			# Do not prepare $value because it has already been escaped or is a true statement
+			$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$value' WHERE `key` = '?'", array(LYCHEE_TABLE_SETTINGS, $key));
+
+		} else {
+
+			return false;
+
+		}
+
+		$result = Database::get()->query($query);
+
+		if (!$result) return false;
+		return true;
+
+	}
+
 	public static function setLogin($oldPassword = '', $username, $password) {
 
 		# Check dependencies
@@ -63,10 +82,7 @@ final class Settings extends Module {
 		# Execute query
 		# Do not prepare $username because it is hashed and save
 		# Preparing (escaping) the username would destroy the hash
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$username' WHERE `key` = 'username'", array(LYCHEE_TABLE_SETTINGS));
-		$result	= Database::get()->query($query);
-
-		if (!$result) {
+		if (self::set('username', $username, true)===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -82,13 +98,9 @@ final class Settings extends Module {
 		# Hash password
 		$password = getHashedString($password);
 
-		# Execute query
 		# Do not prepare $password because it is hashed and save
 		# Preparing (escaping) the password would destroy the hash
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$password' WHERE `key` = 'password'", array(LYCHEE_TABLE_SETTINGS));
-		$result	= Database::get()->query($query);
-
-		if (!$result) {
+		if (self::set('password', $password, true)===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -96,21 +108,17 @@ final class Settings extends Module {
 
 	}
 
-	public static function setDropboxKey($key) {
+	public static function setDropboxKey($dropboxKey) {
 
 		# Check dependencies
-		self::dependencies(isset($key));
+		self::dependencies(isset($dropboxKey));
 
-		if (strlen($key)<1||strlen($key)>50) {
+		if (strlen($dropboxKey)<1||strlen($dropboxKey)>50) {
 			Log::notice(__METHOD__, __LINE__, 'Dropbox key is either too short or too long');
 			return false;
 		}
 
-		# Execute query
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '?' WHERE `key` = 'dropboxKey'", array(LYCHEE_TABLE_SETTINGS, $key));
-		$result = Database::get()->query($query);
-
-		if (!$result) {
+		if (self::set('dropboxKey', $dropboxKey)===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -168,14 +176,10 @@ final class Settings extends Module {
 
 		}
 
-		# Execute query
 		# Do not prepare $sorting because it is a true statement
 		# Preparing (escaping) the sorting would destroy it
 		# $sorting is save and can't contain user-input
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$sorting' WHERE `key` = 'sortingPhotos'", array(LYCHEE_TABLE_SETTINGS));
-		$result	= Database::get()->query($query);
-
-		if (!$result) {
+		if (self::set('sortingPhotos', $sorting, true)===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -224,14 +228,10 @@ final class Settings extends Module {
 
 		}
 
-		# Execute query
 		# Do not prepare $sorting because it is a true statement
 		# Preparing (escaping) the sorting would destroy it
 		# $sorting is save and can't contain user-input
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$sorting' WHERE `key` = 'sortingAlbums'", array(LYCHEE_TABLE_SETTINGS));
-		$result	= Database::get()->query($query);
-
-		if (!$result) {
+		if (self::set('sortingAlbums', $sorting, true)===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
diff --git a/plugins/check/index.php b/plugins/Diagnostics/index.php
similarity index 97%
rename from plugins/check/index.php
rename to plugins/Diagnostics/index.php
index 1a56c35..70a89ac 100644
--- a/plugins/check/index.php
+++ b/plugins/Diagnostics/index.php
@@ -7,13 +7,17 @@
 # @description	This file takes a look at your Lychee-configuration and displays all errors it can find.
 ###
 
-# Location
+namespace Diagnostics;
+
+use Mysqli;
+use Lychee\Modules\Settings;
+
 $lychee = __DIR__ . '/../../';
 
-# Load requirements
 require($lychee . 'php/define.php');
 require($lychee . 'php/autoload.php');
-require($lychee . 'php/misc.php');
+
+require($lychee . 'php/helpers/hasPermissions.php');
 
 # Start the session
 session_start();
@@ -59,18 +63,18 @@ if (!file_exists(LYCHEE_CONFIG_FILE))	exit('Error: Configuration not found. Plea
 else									require(LYCHEE_CONFIG_FILE);
 
 # Database
-$database = new mysqli($dbHost, $dbUser, $dbPassword, $dbName);
+$database = new Mysqli($dbHost, $dbUser, $dbPassword, $dbName);
 if (mysqli_connect_errno()!=0) $error .= ('Error: ' . mysqli_connect_errno() . ': ' . mysqli_connect_error() . '' . PHP_EOL);
 
-# Load settings
-$settings = Settings::get();
-
 # Config
 if (!isset($dbName)||$dbName==='')	$error .= ('Error: No property for $dbName in config.php' . PHP_EOL);
 if (!isset($dbUser)||$dbUser==='')	$error .= ('Error: No property for $dbUser in config.php' . PHP_EOL);
 if (!isset($dbPassword))			$error .= ('Error: No property for $dbPassword in config.php' . PHP_EOL);
 if (!isset($dbHost)||$dbHost==='')	$error .= ('Error: No property for $dbHost in config.php' . PHP_EOL);
 
+# Load settings
+$settings = Settings::get();
+
 # Settings
 if (!isset($settings['username'])||$settings['username']=='')				$error .= ('Error: Username empty or not set in database' . PHP_EOL);
 if (!isset($settings['password'])||$settings['password']=='')				$error .= ('Error: Password empty or not set in database' . PHP_EOL);
diff --git a/plugins/displaylog/index.php b/plugins/Log/index.php
similarity index 65%
rename from plugins/displaylog/index.php
rename to plugins/Log/index.php
index 0e36c5a..1ff92c6 100644
--- a/plugins/displaylog/index.php
+++ b/plugins/Log/index.php
@@ -1,23 +1,26 @@
 <?php
 
 ###
-# @name			Display Log Plugin
+# @name			Log
 # @author		Tobias Reich
 # @copyright	2015 by Tobias Reich
 # @description	This file queries the database for log messages and displays them if present.
 ###
 
-# Location
+namespace Log;
+
+use Mysqli;
+use Lychee\Modules\Database;
+use Lychee\Modules\Settings;
+
 $lychee = __DIR__ . '/../../';
 
+require($lychee . 'php/define.php');
+require($lychee . 'php/autoload.php');
+
 # Start the session
 session_start();
 
-# Load requirements
-require($lychee . 'php/define.php');
-require($lychee . 'php/autoload.php');
-require($lychee . 'php/misc.php');
-
 # Set content
 header('content-type: text/plain');
 
@@ -25,24 +28,13 @@ header('content-type: text/plain');
 if (!file_exists(LYCHEE_CONFIG_FILE)) exit('Error 001: Configuration not found. Please install Lychee first.');
 require(LYCHEE_CONFIG_FILE);
 
-# Database
-$database = new mysqli($dbHost, $dbUser, $dbPassword, $dbName);
-
-if (mysqli_connect_errno()!=0) {
-	echo 'Error 100: ' . mysqli_connect_errno() . ': ' . mysqli_connect_error() . '' . PHP_EOL;
-	exit();
-}
-
-# Load settings
-$settings = Settings::get();
-
 # Ensure that user is logged in
 if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
-	(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
+	(isset($_SESSION['identifier'])&&$_SESSION['identifier']===Settings::get()['identifier'])) {
 
 	# Result
-	$query	= Database::prepare($database, "SELECT FROM_UNIXTIME(time), type, function, line, text FROM ?", array(LYCHEE_TABLE_LOG));
-	$result	= $database->query($query);
+	$query	= Database::prepare(Database::get(), "SELECT FROM_UNIXTIME(time), type, function, line, text FROM ?", array(LYCHEE_TABLE_LOG));
+	$result	= Database::get()->query($query);
 
 	# Output
 	if ($result->num_rows===0) {
diff --git a/src/scripts/api.js b/src/scripts/api.js
index 264a7e6..1979d22 100644
--- a/src/scripts/api.js
+++ b/src/scripts/api.js
@@ -5,7 +5,7 @@
 
 api = {
 
-	path    : 'php/api.php',
+	path    : 'php/index.php',
 	onError : null
 
 }
diff --git a/src/scripts/contextMenu.js b/src/scripts/contextMenu.js
index cc036fd..dab6918 100644
--- a/src/scripts/contextMenu.js
+++ b/src/scripts/contextMenu.js
@@ -31,8 +31,8 @@ contextMenu.settings = function(e) {
 		{ title: build.iconic('dropbox', 'ionicons') + 'Set Dropbox', fn: settings.setDropboxKey },
 		{ },
 		{ title: build.iconic('info') + 'About Lychee', fn: () => window.open(lychee.website) },
-		{ title: build.iconic('wrench') + 'Diagnostics', fn: () => window.open('plugins/check/') },
-		{ title: build.iconic('align-left') + 'Show Log', fn: () => window.open('plugins/displaylog/') },
+		{ title: build.iconic('wrench') + 'Diagnostics', fn: () => window.open('plugins/Diagnostics/') },
+		{ title: build.iconic('align-left') + 'Show Log', fn: () => window.open('plugins/Log/') },
 		{ },
 		{ title: build.iconic('account-logout') + 'Sign Out', fn: lychee.logout }
 	]

From 8c76d340a7cbf3140d962fa5e4f6cb5d31e84fe2 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 26 Jan 2016 15:33:59 +0100
Subject: [PATCH 033/183] Renamed folder to Access

---
 php/{access => Access}/Access.php       | 0
 php/{access => Access}/Admin.php        | 0
 php/{access => Access}/Guest.php        | 0
 php/{access => Access}/Installation.php | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename php/{access => Access}/Access.php (100%)
 rename php/{access => Access}/Admin.php (100%)
 rename php/{access => Access}/Guest.php (100%)
 rename php/{access => Access}/Installation.php (100%)

diff --git a/php/access/Access.php b/php/Access/Access.php
similarity index 100%
rename from php/access/Access.php
rename to php/Access/Access.php
diff --git a/php/access/Admin.php b/php/Access/Admin.php
similarity index 100%
rename from php/access/Admin.php
rename to php/Access/Admin.php
diff --git a/php/access/Guest.php b/php/Access/Guest.php
similarity index 100%
rename from php/access/Guest.php
rename to php/Access/Guest.php
diff --git a/php/access/Installation.php b/php/Access/Installation.php
similarity index 100%
rename from php/access/Installation.php
rename to php/Access/Installation.php

From 6e7dccc03707b407fcab563f885e2cddc259d5c8 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 26 Jan 2016 15:34:51 +0100
Subject: [PATCH 034/183] Renamed folder to Modules

---
 php/{modules => Modules}/Album.php    | 0
 php/{modules => Modules}/Config.php   | 0
 php/{modules => Modules}/Database.php | 0
 php/{modules => Modules}/Import.php   | 0
 php/{modules => Modules}/Log.php      | 0
 php/{modules => Modules}/Module.php   | 0
 php/{modules => Modules}/Photo.php    | 0
 php/{modules => Modules}/Plugins.php  | 0
 php/{modules => Modules}/Session.php  | 0
 php/{modules => Modules}/Settings.php | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename php/{modules => Modules}/Album.php (100%)
 rename php/{modules => Modules}/Config.php (100%)
 rename php/{modules => Modules}/Database.php (100%)
 rename php/{modules => Modules}/Import.php (100%)
 rename php/{modules => Modules}/Log.php (100%)
 rename php/{modules => Modules}/Module.php (100%)
 rename php/{modules => Modules}/Photo.php (100%)
 rename php/{modules => Modules}/Plugins.php (100%)
 rename php/{modules => Modules}/Session.php (100%)
 rename php/{modules => Modules}/Settings.php (100%)

diff --git a/php/modules/Album.php b/php/Modules/Album.php
similarity index 100%
rename from php/modules/Album.php
rename to php/Modules/Album.php
diff --git a/php/modules/Config.php b/php/Modules/Config.php
similarity index 100%
rename from php/modules/Config.php
rename to php/Modules/Config.php
diff --git a/php/modules/Database.php b/php/Modules/Database.php
similarity index 100%
rename from php/modules/Database.php
rename to php/Modules/Database.php
diff --git a/php/modules/Import.php b/php/Modules/Import.php
similarity index 100%
rename from php/modules/Import.php
rename to php/Modules/Import.php
diff --git a/php/modules/Log.php b/php/Modules/Log.php
similarity index 100%
rename from php/modules/Log.php
rename to php/Modules/Log.php
diff --git a/php/modules/Module.php b/php/Modules/Module.php
similarity index 100%
rename from php/modules/Module.php
rename to php/Modules/Module.php
diff --git a/php/modules/Photo.php b/php/Modules/Photo.php
similarity index 100%
rename from php/modules/Photo.php
rename to php/Modules/Photo.php
diff --git a/php/modules/Plugins.php b/php/Modules/Plugins.php
similarity index 100%
rename from php/modules/Plugins.php
rename to php/Modules/Plugins.php
diff --git a/php/modules/Session.php b/php/Modules/Session.php
similarity index 100%
rename from php/modules/Session.php
rename to php/Modules/Session.php
diff --git a/php/modules/Settings.php b/php/Modules/Settings.php
similarity index 100%
rename from php/modules/Settings.php
rename to php/Modules/Settings.php

From 61fcaa57c026ab8af4827baa426bfad748397af5 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 00:07:22 +0100
Subject: [PATCH 035/183] Added "use SplObserver"

---
 php/Modules/Plugins.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/php/Modules/Plugins.php b/php/Modules/Plugins.php
index 6377855..ab69e83 100644
--- a/php/Modules/Plugins.php
+++ b/php/Modules/Plugins.php
@@ -3,6 +3,7 @@
 namespace Lychee\Modules;
 
 use SplSubject;
+use SplObserver;
 
 final class Plugins implements SplSubject {
 
@@ -42,7 +43,7 @@ final class Plugins implements SplSubject {
 
 	}
 
-	public function attach(\SplObserver $observer) {
+	public function attach(SplObserver $observer) {
 
 		if (!isset($observer)) return false;
 
@@ -53,7 +54,7 @@ final class Plugins implements SplSubject {
 
 	}
 
-	public function detach(\SplObserver $observer) {
+	public function detach(SplObserver $observer) {
 
 		if (!isset($observer)) return false;
 

From 4974adfed04747fb52cf8f4843203ff7d39f0643 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 00:27:50 +0100
Subject: [PATCH 036/183] Activate plugins directly without extending Module

---
 php/Modules/Album.php   | 52 +++++++++++++++++-----------------
 php/Modules/Import.php  |  8 +++---
 php/Modules/Module.php  | 14 ----------
 php/Modules/Photo.php   | 62 ++++++++++++++++++++---------------------
 php/Modules/Plugins.php |  8 ++++--
 php/Modules/Session.php | 12 ++++----
 6 files changed, 73 insertions(+), 83 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 34ef0fb..bdd540b 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -18,7 +18,7 @@ final class Album extends Module {
 	public function add($title = 'Untitled') {
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Parse
 		if (strlen($title)>50) $title = substr($title, 0, 50);
@@ -33,7 +33,7 @@ final class Album extends Module {
 		$result		= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -85,7 +85,7 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Get album information
 		switch ($this->albumIDs) {
@@ -160,7 +160,7 @@ final class Album extends Module {
 		$return['num']	= $photos->num_rows;
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $return;
 
@@ -172,7 +172,7 @@ final class Album extends Module {
 		self::dependencies(isset($public));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Initialize return var
 		$return = array(
@@ -227,7 +227,7 @@ final class Album extends Module {
 		$return['num'] = $albums->num_rows;
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $return;
 
@@ -334,7 +334,7 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Illicit chars
 		$badChars =	array_merge(
@@ -462,7 +462,7 @@ final class Album extends Module {
 		unlink($filename);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
 
@@ -474,14 +474,14 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Execute query
 		$query	= Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $title, $this->albumIDs));
 		$result = Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -497,14 +497,14 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Execute query
 		$query	= Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $description, $this->albumIDs));
 		$result	= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -520,7 +520,7 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		if ($this->albumIDs==='0'||$this->albumIDs==='s'||$this->albumIDs==='f') return false;
 
@@ -530,7 +530,7 @@ final class Album extends Module {
 		$album	= $albums->fetch_object();
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($album->public==1) return true;
 		return false;
@@ -543,7 +543,7 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		if ($this->albumIDs==='0'||$this->albumIDs==='s'||$this->albumIDs==='f'||$this->albumIDs==='r') return false;
 
@@ -553,7 +553,7 @@ final class Album extends Module {
 		$album	= $albums->fetch_object();
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($album->downloadable==1) return true;
 		return false;
@@ -566,7 +566,7 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Convert values
 		$public			= ($public==='1' ? 1 : 0);
@@ -592,7 +592,7 @@ final class Album extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		# Set password
 		if (isset($password)&&strlen($password)>0) return $this->setPassword($password);
@@ -607,7 +607,7 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		if (strlen($password)>0) {
 
@@ -630,7 +630,7 @@ final class Album extends Module {
 		$result	= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -646,7 +646,7 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Execute query
 		$query	= Database::prepare(Database::get(), "SELECT password FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
@@ -654,7 +654,7 @@ final class Album extends Module {
 		$album	= $albums->fetch_object();
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($album->password=='') return true;
 		else if ($album->password===crypt($password, $album->password)) return true;
@@ -668,7 +668,7 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Convert to array
 		$albumIDs = explode(',', $this->albumIDs);
@@ -693,7 +693,7 @@ final class Album extends Module {
 		$result	= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -709,7 +709,7 @@ final class Album extends Module {
 		self::dependencies(isset($this->albumIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Init vars
 		$error = false;
@@ -731,7 +731,7 @@ final class Album extends Module {
 		$result	= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($error) return false;
 		if (!$result) {
diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index 564948e..410d890 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -35,7 +35,7 @@ final class Import extends Module {
 		self::dependencies(isset($urls));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		$error = false;
 
@@ -84,7 +84,7 @@ final class Import extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($error===false) return true;
 		return false;
@@ -117,7 +117,7 @@ final class Import extends Module {
 		# Call plugins
 		# Note that updated albumId and path explicitly passed, rather
 		# than using func_get_args() which will only return original ones
-		$this->plugins(__METHOD__, 0, array($albumID, $path));
+		Plugins::get()->activate(__METHOD__, 0, array($albumID, $path));
 
 		# Get all files
 		$files = glob($path . '/*');
@@ -173,7 +173,7 @@ final class Import extends Module {
 		# Call plugins
 		# Note that updated albumId and path explicitly passed, rather
 		# than using func_get_args() which will only return original ones
-		$this->plugins(__METHOD__, 1, array($albumID, $path));
+		Plugins::get()->activate(__METHOD__, 1, array($albumID, $path));
 
 		# The following returns will be caught in the front-end
 		if ($contains['photos']===false&&$contains['albums']===false)	return 'Warning: Folder empty or no readable files to process!';
diff --git a/php/Modules/Module.php b/php/Modules/Module.php
index 35a9d5d..3d8d058 100644
--- a/php/Modules/Module.php
+++ b/php/Modules/Module.php
@@ -4,20 +4,6 @@ namespace Lychee\Modules;
 
 abstract class Module {
 
-	protected function plugins($name, $location, $args) {
-
-		self::dependencies(isset($name, $location, $args));
-
-		# Parse
-		$location = ($location===0 ? 'before' : 'after');
-
-		# Call plugins
-		Plugins::get()->activate($name . ":" . $location, $args);
-
-		return true;
-
-	}
-
 	final public static function dependencies($available = false) {
 
 		if ($available===false) exit('Error: Can not execute function. Missing parameters or variables.');
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 0dd2f5d..637f635 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -45,7 +45,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		switch($albumID) {
 
@@ -247,7 +247,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
 
@@ -294,7 +294,7 @@ final class Photo extends Module {
 		self::dependencies(isset($url, $filename, $type, $width, $height));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Size of the thumbnail
 		$newWidth	= 200;
@@ -371,7 +371,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
 
@@ -393,7 +393,7 @@ final class Photo extends Module {
 		self::dependencies(isset($url, $filename, $width, $height));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Set to true when creation of medium-photo failed
 		$error = false;
@@ -450,7 +450,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($error===true) return false;
 		return true;
@@ -471,7 +471,7 @@ final class Photo extends Module {
 		self::dependencies(isset($path, $info));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		$swapSize = false;
 
@@ -577,7 +577,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		# SwapSize should be true when the image has been rotated
 		# Return new dimensions in this case
@@ -648,7 +648,7 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Get photo
 		$query	= Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
@@ -689,7 +689,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $photo;
 
@@ -707,7 +707,7 @@ final class Photo extends Module {
 		self::dependencies(isset($url));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		$iptcArray	= array();
 		$info		= getimagesize($url, $iptcArray);
@@ -797,7 +797,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $return;
 
@@ -814,7 +814,7 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Get photo
 		$query	= Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
@@ -861,7 +861,7 @@ final class Photo extends Module {
 		readfile(LYCHEE_UPLOADS_BIG . $photo->url);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
 
@@ -880,14 +880,14 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Set title
 		$query	= Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $title, $this->photoIDs));
 		$result	= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -910,14 +910,14 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Set description
 		$query	= Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN ('?')", array(LYCHEE_TABLE_PHOTOS, $description, $this->photoIDs));
 		$result	= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -938,7 +938,7 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Init vars
 		$error	= false;
@@ -961,7 +961,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($error===true) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -983,7 +983,7 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Get photo
 		$query	= Database::prepare(Database::get(), "SELECT public, album FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
@@ -1012,7 +1012,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		# Photo private
 		return 0;
@@ -1030,7 +1030,7 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Get public
 		$query	= Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
@@ -1045,7 +1045,7 @@ final class Photo extends Module {
 		$result	= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -1066,14 +1066,14 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Set album
 		$query	= Database::prepare(Database::get(), "UPDATE ? SET album = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->photoIDs));
 		$result	= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -1096,7 +1096,7 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Parse tags
 		$tags = preg_replace('/(\ ,\ )|(\ ,)|(,\ )|(,{1,}\ {0,})|(,$|^,)/', ',', $tags);
@@ -1107,7 +1107,7 @@ final class Photo extends Module {
 		$result	= Database::get()->query($query);
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
@@ -1128,7 +1128,7 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Get photos
 		$query	= Database::prepare(Database::get(), "SELECT id, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
@@ -1171,7 +1171,7 @@ final class Photo extends Module {
 		self::dependencies(isset($this->photoIDs));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Get photos
 		$query	= Database::prepare(Database::get(), "SELECT id, url, thumbUrl, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
@@ -1229,7 +1229,7 @@ final class Photo extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
 
diff --git a/php/Modules/Plugins.php b/php/Modules/Plugins.php
index ab69e83..13bb55c 100644
--- a/php/Modules/Plugins.php
+++ b/php/Modules/Plugins.php
@@ -75,9 +75,13 @@ final class Plugins implements SplSubject {
 
 	}
 
-	public function activate($action, $args) {
+	public function activate($name, $location, array $args) {
 
-		if (!isset($action, $args)) return false;
+		if (!isset($name, $location, $args)) return false;
+
+		# Parse
+		$location	= ($location===0 ? 'before' : 'after');
+		$action		= $name . ":" . $location;
 
 		# Save vars
 		$this->action	= $action;
diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index 2a16b5b..be3e115 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -10,7 +10,7 @@ final class Session extends Module {
 		self::dependencies(isset($public));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		# Return settings
 		$return['config'] = Settings::get();
@@ -57,7 +57,7 @@ final class Session extends Module {
 		}
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $return;
 
@@ -69,7 +69,7 @@ final class Session extends Module {
 		self::dependencies(isset($username, $password));
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		$username = crypt($username, Settings::get()['username']);
 		$password = crypt($password, Settings::get()['password']);
@@ -86,7 +86,7 @@ final class Session extends Module {
 		if ($this->noLogin()===true) return true;
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return false;
 
@@ -109,7 +109,7 @@ final class Session extends Module {
 	public function logout() {
 
 		# Call plugins
-		$this->plugins(__METHOD__, 0, func_get_args());
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		$_SESSION['login']		= null;
 		$_SESSION['identifier']	= null;
@@ -117,7 +117,7 @@ final class Session extends Module {
 		session_destroy();
 
 		# Call plugins
-		$this->plugins(__METHOD__, 1, func_get_args());
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
 

From cafcc2165f00c9540ae41ee1d2651d1536dd65a0 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 01:06:21 +0100
Subject: [PATCH 037/183] Removed unnecessary self::dependencies checks

---
 php/Modules/Album.php   |  5 +----
 php/Modules/Photo.php   | 27 +++------------------------
 php/Modules/Session.php |  6 ------
 3 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index bdd540b..000df47 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -43,15 +43,12 @@ final class Album extends Module {
 
 	}
 
-	public static function prepareData($data) {
+	public static function prepareData(array $data) {
 
 		# This function requires the following album-attributes and turns them
 		# into a front-end friendly format: id, title, public, sysstamp, password
 		# Note that some attributes remain unchanged
 
-		# Check dependencies
-		self::dependencies(isset($data));
-
 		# Init
 		$album = null;
 
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 637f635..b862d78 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -28,14 +28,11 @@ final class Photo extends Module {
 
 	}
 
-	public function add($files, $albumID = 0, $description = '', $tags = '', $returnOnError = false) {
+	public function add(array $files, $albumID = 0, $description = '', $tags = '', $returnOnError = false) {
 
 		# Use $returnOnError if you want to handle errors by your own
 		# e.g. when calling this functions inside an if-condition
 
-		# Check dependencies
-		self::dependencies(isset($files));
-
 		# Check permissions
 		if (hasPermissions(LYCHEE_UPLOADS)===false||
 			hasPermissions(LYCHEE_UPLOADS_BIG)===false||
@@ -255,9 +252,6 @@ final class Photo extends Module {
 
 	private function exists($checksum, $photoID = null) {
 
-		# Check dependencies
-		self::dependencies(isset($checksum));
-
 		# Exclude $photoID from select when $photoID is set
 		if (isset($photoID)) $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' AND id <> '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum, $photoID));
 		else $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum));
@@ -290,9 +284,6 @@ final class Photo extends Module {
 
 	private function createThumb($url, $filename, $type, $width, $height) {
 
-		# Check dependencies
-		self::dependencies(isset($url, $filename, $type, $width, $height));
-
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
@@ -389,9 +380,6 @@ final class Photo extends Module {
 		# (boolean) true = Success
 		# (boolean) false = Failure
 
-		# Check dependencies
-		self::dependencies(isset($url, $filename, $width, $height));
-
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
@@ -457,7 +445,7 @@ final class Photo extends Module {
 
 	}
 
-	public function adjustFile($path, $info) {
+	public function adjustFile($path, array $info) {
 
 		# Function rotates and flips a photo based on its EXIF orientation
 		# Excepts the following:
@@ -467,9 +455,6 @@ final class Photo extends Module {
 		# (array) $info = ['orientation', 'width', 'height'] = Success
 		# (boolean) false = Failure
 
-		# Check dependencies
-		self::dependencies(isset($path, $info));
-
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
@@ -591,7 +576,7 @@ final class Photo extends Module {
 
 	}
 
-	public static function prepareData($data) {
+	public static function prepareData(array $data) {
 
 		# Function turns photo-attributes into a front-end friendly format. Note that some attributes remain unchanged.
 		# Excepts the following:
@@ -599,9 +584,6 @@ final class Photo extends Module {
 		# Returns the following:
 		# (array) $photo
 
-		# Check dependencies
-		self::dependencies(isset($data));
-
 		# Init
 		$photo = null;
 
@@ -703,9 +685,6 @@ final class Photo extends Module {
 		# Returns the following:
 		# (array) $return
 
-		# Check dependencies
-		self::dependencies(isset($url));
-
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index be3e115..b5ef689 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -6,9 +6,6 @@ final class Session extends Module {
 
 	public function init($public) {
 
-		# Check dependencies
-		self::dependencies(isset($public));
-
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
@@ -65,9 +62,6 @@ final class Session extends Module {
 
 	public function login($username, $password) {
 
-		# Check dependencies
-		self::dependencies(isset($username, $password));
-
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 

From 3287e27ccd33f02f2659db4e39d4f9d6a202eaaf Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 20:18:10 +0100
Subject: [PATCH 038/183] Default param for Session init

---
 php/Modules/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index b5ef689..b7fb8a2 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -4,7 +4,7 @@ namespace Lychee\Modules;
 
 final class Session extends Module {
 
-	public function init($public) {
+	public function init($public = true) {
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());

From c904b8e2a578793616a19574920587c4d854282c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 20:18:24 +0100
Subject: [PATCH 039/183] Remove skipDuplicates from init response when logged
 out

---
 php/Modules/Session.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index b7fb8a2..75f7322 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -41,6 +41,7 @@ final class Session extends Module {
 			$return['status'] = LYCHEE_STATUS_LOGGEDOUT;
 
 			# Unset unused vars
+			unset($return['config']['skipDuplicates']);
 			unset($return['config']['thumbQuality']);
 			unset($return['config']['sortingAlbums']);
 			unset($return['config']['sortingPhotos']);

From ad4fbf3ffdf670ecfef3117717320c3b6310afbd Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 20:22:28 +0100
Subject: [PATCH 040/183] Code style adjustment

---
 php/Modules/Album.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 000df47..486c456 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -4,7 +4,7 @@ namespace Lychee\Modules;
 
 final class Album extends Module {
 
-	private $albumIDs	= null;
+	private $albumIDs = null;
 
 	public function __construct($albumIDs) {
 

From b13283e4d47dfcd3c5b9c1e5c279b5610546b8fc Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 21:33:31 +0100
Subject: [PATCH 041/183] Added Validator, removed Module, changed Access
 classes

---
 php/Access/Access.php       |   8 +-
 php/Access/Admin.php        | 208 ++++++++++++++++++++----------------
 php/Access/Guest.php        |  65 +++++------
 php/Access/Installation.php |  17 +--
 php/Modules/Album.php       |  29 +++--
 php/Modules/Config.php      |   2 +-
 php/Modules/Database.php    |  20 ++--
 php/Modules/Import.php      |   8 +-
 php/Modules/Log.php         |   4 +-
 php/Modules/Module.php      |  15 ---
 php/Modules/Photo.php       |  24 ++---
 php/Modules/Session.php     |   2 +-
 php/Modules/Settings.php    |  18 +---
 php/Modules/Validator.php   |  55 ++++++++++
 php/index.php               |  33 +++---
 15 files changed, 280 insertions(+), 228 deletions(-)
 delete mode 100644 php/Modules/Module.php
 create mode 100644 php/Modules/Validator.php

diff --git a/php/Access/Access.php b/php/Access/Access.php
index 50551f7..b90f210 100644
--- a/php/Access/Access.php
+++ b/php/Access/Access.php
@@ -2,9 +2,13 @@
 
 namespace Lychee\Access;
 
-interface Access {
+abstract class Access {
 
-	public function check($fn);
+	final private static function fnNotFound() {
+
+		exit('Error: Function not found! Please check the spelling of the called function.');
+
+	}
 
 }
 
diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index 659e325..c4576d2 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -4,63 +4,62 @@ namespace Lychee\Access;
 
 use Lychee\Modules\Album;
 use Lychee\Modules\Import;
-use Lychee\Modules\Module;
 use Lychee\Modules\Photo;
 use Lychee\Modules\Session;
 use Lychee\Modules\Settings;
+use Lychee\Modules\Validator;
 
-final class Admin implements Access {
+final class Admin extends Access {
 
-	public function check($fn) {
+	public static function init($fn) {
 
 		switch ($fn) {
 
 			# Album functions
-			case 'Album::getAll':			$this->getAlbums(); break;
-			case 'Album::get':				$this->getAlbum(); break;
-			case 'Album::add':				$this->addAlbum(); break;
-			case 'Album::setTitle':			$this->setAlbumTitle(); break;
-			case 'Album::setDescription':	$this->setAlbumDescription(); break;
-			case 'Album::setPublic':		$this->setAlbumPublic(); break;
-			case 'Album::delete':			$this->deleteAlbum(); break;
-			case 'Album::merge':			$this->mergeAlbums(); break;
+			case 'Album::getAll':			self::getAlbumsAction(); break;
+			case 'Album::get':				self::getAlbumAction(); break;
+			case 'Album::add':				self::addAlbumAction(); break;
+			case 'Album::setTitle':			self::setAlbumTitleAction(); break;
+			case 'Album::setDescription':	self::setAlbumDescriptionAction(); break;
+			case 'Album::setPublic':		self::setAlbumPublicAction(); break;
+			case 'Album::delete':			self::deleteAlbumAction(); break;
+			case 'Album::merge':			self::mergeAlbumsAction(); break;
 
 			# Photo functions
-			case 'Photo::get':				$this->getPhoto(); break;
-			case 'Photo::setTitle':			$this->setPhotoTitle(); break;
-			case 'Photo::setDescription':	$this->setPhotoDescription(); break;
-			case 'Photo::setStar':			$this->setPhotoStar(); break;
-			case 'Photo::setPublic':		$this->setPhotoPublic(); break;
-			case 'Photo::setAlbum':			$this->setPhotoAlbum(); break;
-			case 'Photo::setTags':			$this->setPhotoTags(); break;
-			case 'Photo::duplicate':		$this->duplicatePhoto(); break;
-			case 'Photo::delete':			$this->deletePhoto(); break;
+			case 'Photo::get':				self::getPhotoAction(); break;
+			case 'Photo::setTitle':			self::setPhotoTitleAction(); break;
+			case 'Photo::setDescription':	self::setPhotoDescriptionAction(); break;
+			case 'Photo::setStar':			self::setPhotoStarAction(); break;
+			case 'Photo::setPublic':		self::setPhotoPublicAction(); break;
+			case 'Photo::setAlbum':			self::setPhotoAlbumAction(); break;
+			case 'Photo::setTags':			self::setPhotoTagsAction(); break;
+			case 'Photo::duplicate':		self::duplicatePhotoAction(); break;
+			case 'Photo::delete':			self::deletePhotoAction(); break;
 
 			# Add functions
-			case 'Photo::add':				$this->upload(); break;
-			case 'Import::url':				$this->importUrl(); break;
-			case 'Import::server':			$this->importServer(); break;
+			case 'Photo::add':				self::uploadAction(); break;
+			case 'Import::url':				self::importUrlAction(); break;
+			case 'Import::server':			self::importServerAction(); break;
 
 			# Search functions
-			case 'search':					$this->search(); break;
+			case 'search':					self::searchAction(); break;
 
 			# Session functions
-			case 'Session::init':			$this->init(); break;
-			case 'Session::login':			$this->login(); break;
-			case 'Session::logout':			$this->logout(); break;
+			case 'Session::init':			self::initAction(); break;
+			case 'Session::login':			self::loginAction(); break;
+			case 'Session::logout':			self::logoutAction(); break;
 
 			# Settings functions
-			case 'Settings::setLogin':		$this->setLogin(); break;
-			case 'Settings::setSorting':	$this->setSorting(); break;
-			case 'Settings::setDropboxKey':	$this->setDropboxKey(); break;
+			case 'Settings::setLogin':		self::setLoginAction(); break;
+			case 'Settings::setSorting':	self::setSortingAction(); break;
+			case 'Settings::setDropboxKey':	self::setDropboxKeyAction(); break;
 
 			# $_GET functions
-			case 'Album::getArchive':		$this->getAlbumArchive(); break;
-			case 'Photo::getArchive':		$this->getPhotoArchive(); break;
+			case 'Album::getArchive':		self::getAlbumArchiveAction(); break;
+			case 'Photo::getArchive':		self::getPhotoArchiveAction(); break;
 
 			# Error
-			default:						exit('Error: Function not found! Please check the spelling of the called function.');
-											return false; break;
+			default:						self::fnNotFound(); break;
 
 		}
 
@@ -70,64 +69,70 @@ final class Admin implements Access {
 
 	# Album functions
 
-	private function getAlbums() {
+	private static function getAlbumsAction() {
 
 		$album = new Album(null);
 		echo json_encode($album->getAll(false));
 
 	}
 
-	private function getAlbum() {
+	private static function getAlbumAction() {
+
+		Validator::required(isset($_POST['albumID']), __METHOD__);
 
-		Module::dependencies(isset($_POST['albumID']));
 		$album = new Album($_POST['albumID']);
 		echo json_encode($album->get());
 
 	}
 
-	private function addAlbum() {
+	private static function addAlbumAction() {
+
+		Validator::required(isset($_POST['title']), __METHOD__);
 
-		Module::dependencies(isset($_POST['title']));
 		$album = new Album(null);
 		echo $album->add($_POST['title']);
 
 	}
 
-	private function setAlbumTitle() {
+	private static function setAlbumTitleAction() {
+
+		Validator::required(isset($_POST['albumIDs'], $_POST['title']), __METHOD__);
 
-		Module::dependencies(isset($_POST['albumIDs'], $_POST['title']));
 		$album = new Album($_POST['albumIDs']);
 		echo $album->setTitle($_POST['title']);
 
 	}
 
-	private function setAlbumDescription() {
+	private static function setAlbumDescriptionAction() {
+
+		Validator::required(isset($_POST['albumID'], $_POST['description']), __METHOD__);
 
-		Module::dependencies(isset($_POST['albumID'], $_POST['description']));
 		$album = new Album($_POST['albumID']);
 		echo $album->setDescription($_POST['description']);
 
 	}
 
-	private function setAlbumPublic() {
+	private static function setAlbumPublicAction() {
+
+		Validator::required(isset($_POST['albumID'], $_POST['password'], $_POST['visible'], $_POST['downloadable']), __METHOD__);
 
-		Module::dependencies(isset($_POST['albumID'], $_POST['password'], $_POST['visible'], $_POST['downloadable']));
 		$album = new Album($_POST['albumID']);
 		echo $album->setPublic($_POST['public'], $_POST['password'], $_POST['visible'], $_POST['downloadable']);
 
 	}
 
-	private function deleteAlbum() {
+	private static function deleteAlbumAction() {
+
+		Validator::required(isset($_POST['albumIDs']), __METHOD__);
 
-		Module::dependencies(isset($_POST['albumIDs']));
 		$album = new Album($_POST['albumIDs']);
 		echo $album->delete();
 
 	}
 
-	private function mergeAlbums() {
+	private static function mergeAlbumsAction() {
 
-		Module::dependencies(isset($_POST['albumIDs']));
+		Validator::required(isset($_POST['albumIDs']));
 		$album = new Album($_POST['albumIDs']);
 		echo $album->merge();
 
@@ -135,73 +140,82 @@ final class Admin implements Access {
 
 	# Photo functions
 
-	private function getPhoto() {
+	private static function getPhotoAction() {
+
+		Validator::required(isset($_POST['photoID'], $_POST['albumID']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoID'], $_POST['albumID']));
 		$photo = new Photo($_POST['photoID']);
 		echo json_encode($photo->get($_POST['albumID']));
 
 	}
 
-	private function setPhotoTitle() {
+	private static function setPhotoTitleAction() {
+
+		Validator::required(isset($_POST['photoIDs'], $_POST['title']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoIDs'], $_POST['title']));
 		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->setTitle($_POST['title']);
 
 	}
 
-	private function setPhotoDescription() {
+	private static function setPhotoDescriptionAction() {
+
+		Validator::required(isset($_POST['photoID'], $_POST['description']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoID'], $_POST['description']));
 		$photo = new Photo($_POST['photoID']);
 		echo $photo->setDescription($_POST['description']);
 
 	}
 
-	private function setPhotoStar() {
+	private static function setPhotoStarAction() {
+
+		Validator::required(isset($_POST['photoIDs']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoIDs']));
 		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->setStar();
 
 	}
 
-	private function setPhotoPublic() {
+	private static function setPhotoPublicAction() {
+
+		Validator::required(isset($_POST['photoID']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoID']));
 		$photo = new Photo($_POST['photoID']);
 		echo $photo->setPublic();
 
 	}
 
-	private function setPhotoAlbum() {
+	private static function setPhotoAlbumAction() {
+
+		Validator::required(isset($_POST['photoIDs'], $_POST['albumID']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoIDs'], $_POST['albumID']));
 		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->setAlbum($_POST['albumID']);
 
 	}
 
-	private function setPhotoTags() {
+	private static function setPhotoTagsAction() {
+
+		Validator::required(isset($_POST['photoIDs'], $_POST['tags']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoIDs'], $_POST['tags']));
 		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->setTags($_POST['tags']);
 
 	}
 
-	private function duplicatePhoto() {
+	private static function duplicatePhotoAction() {
+
+		Validator::required(isset($_POST['photoIDs']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoIDs']));
 		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->duplicate();
 
 	}
 
-	private function deletePhoto() {
+	private static function deletePhotoAction() {
+
+		Validator::required(isset($_POST['photoIDs']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoIDs']));
 		$photo = new Photo($_POST['photoIDs']);
 		echo $photo->delete();
 
@@ -209,59 +223,62 @@ final class Admin implements Access {
 
 	# Add functions
 
-	private function upload() {
+	private static function uploadAction() {
+
+		Validator::required(isset($_FILES, $_POST['albumID'], $_POST['tags']), __METHOD__);
 
-		Module::dependencies(isset($_FILES, $_POST['albumID'], $_POST['tags']));
 		$photo = new Photo(null);
 		echo $photo->add($_FILES, $_POST['albumID'], '', $_POST['tags']);
 
 	}
 
-	private function importUrl() {
+	private static function importUrlAction() {
+
+		Validator::required(isset($_POST['url'], $_POST['albumID']), __METHOD__);
 
-		Module::dependencies(isset($_POST['url'], $_POST['albumID']));
 		$import = new Import();
 		echo $import->url($_POST['url'], $_POST['albumID']);
 
 	}
 
-	private function importServer() {
+	private static function importServerAction() {
+
+		Validator::required(isset($_POST['albumID'], $_POST['path']), __METHOD__);
 
-		Module::dependencies(isset($_POST['albumID'], $_POST['path']));
 		$import = new Import();
 		echo $import->server($_POST['path'], $_POST['albumID']);
 
 	}
 
-	# Search function
+	# Search functions
 
-	private function search() {
+	private static function searchAction() {
+
+		Validator::required(isset($_POST['term']), __METHOD__);
 
-		Module::dependencies(isset($_POST['term']));
 		echo json_encode(search($_POST['term']));
 
 	}
 
 	# Session functions
 
-	private function init() {
-
-		global $dbName;
+	private static function initAction() {
 
 		$session = new Session();
 		echo json_encode($session->init(false));
 
 	}
 
-	private function login() {
+	private static function loginAction() {
+
+		Validator::required(isset($_POST['user'], $_POST['password']), __METHOD__);
 
-		Module::dependencies(isset($_POST['user'], $_POST['password']));
 		$session = new Session();
 		echo $session->login($_POST['user'], $_POST['password']);
 
 	}
 
-	private function logout() {
+	private static function logoutAction() {
 
 		$session = new Session();
 		echo $session->logout();
@@ -270,17 +287,17 @@ final class Admin implements Access {
 
 	# Settings functions
 
-	private function setLogin() {
+	private static function setLoginAction() {
 
-		Module::dependencies(isset($_POST['username'], $_POST['password']));
-		if (!isset($_POST['oldPassword'])) $_POST['oldPassword'] = '';
-		echo Settings::setLogin($_POST['oldPassword'], $_POST['username'], $_POST['password']);
+		Validator::required(isset($_POST['username'], $_POST['password']), __METHOD__);
+
+		echo Settings::setLogin(@$_POST['oldPassword'], $_POST['username'], $_POST['password']);
 
 	}
 
-	private function setSorting() {
+	private static function setSortingAction() {
 
-		Module::dependencies(isset($_POST['typeAlbums'], $_POST['orderAlbums'], $_POST['typePhotos'], $_POST['orderPhotos']));
+		Validator::required(isset($_POST['typeAlbums'], $_POST['orderAlbums'], $_POST['typePhotos'], $_POST['orderPhotos']), __METHOD__);
 
 		$sA = Settings::setSortingAlbums($_POST['typeAlbums'], $_POST['orderAlbums']);
 		$sP = Settings::setSortingPhotos($_POST['typePhotos'], $_POST['orderPhotos']);
@@ -290,26 +307,29 @@ final class Admin implements Access {
 
 	}
 
-	private function setDropboxKey() {
+	private static function setDropboxKeyAction() {
+
+		Validator::required(isset($_POST['key']), __METHOD__);
 
-		Module::dependencies(isset($_POST['key']));
 		echo Settings::setDropboxKey($_POST['key']);
 
 	}
 
 	# Get functions
 
-	private function getAlbumArchive() {
+	private static function getAlbumArchiveAction() {
+
+		Validator::required(isset($_GET['albumID']), __METHOD__);
 
-		Module::dependencies(isset($_GET['albumID']));
 		$album = new Album($_GET['albumID']);
 		$album->getArchive();
 
 	}
 
-	private function getPhotoArchive() {
+	private static function getPhotoArchiveAction() {
+
+		Validator::required(isset($_GET['photoID']), __METHOD__);
 
-		Module::dependencies(isset($_GET['photoID']));
 		$photo = new Photo($_GET['photoID']);
 		$photo->getArchive();
 
diff --git a/php/Access/Guest.php b/php/Access/Guest.php
index e1050b4..73fca67 100644
--- a/php/Access/Guest.php
+++ b/php/Access/Guest.php
@@ -3,36 +3,35 @@
 namespace Lychee\Access;
 
 use Lychee\Modules\Album;
-use Lychee\Modules\Module;
 use Lychee\Modules\Photo;
 use Lychee\Modules\Session;
+use Lychee\Modules\Validator;
 
-final class Guest implements Access {
+final class Guest extends Access {
 
-	public function check($fn) {
+	public static function init($fn) {
 
 		switch ($fn) {
 
 			# Album functions
-			case 'Album::getAll':		$this->getAlbums(); break;
-			case 'Album::get':			$this->getAlbum(); break;
-			case 'Album::getPublic':	$this->checkAlbumAccess(); break;
+			case 'Album::getAll':		self::getAlbumsAction(); break;
+			case 'Album::get':			self::getAlbumAction(); break;
+			case 'Album::getPublic':	self::checkAlbumAccessAction(); break;
 
 			# Photo functions
-			case 'Photo::get':			$this->getPhoto(); break;
+			case 'Photo::get':			self::getPhotoAction(); break;
 
 			# Session functions
-			case 'Session::init':		$this->init(); break;
-			case 'Session::login':		$this->login(); break;
-			case 'Session::logout':		$this->logout(); break;
+			case 'Session::init':		self::initAction(); break;
+			case 'Session::login':		self::loginAction(); break;
+			case 'Session::logout':		self::logoutAction(); break;
 
 			# $_GET functions
-			case 'Album::getArchive':	$this->getAlbumArchive(); break;
-			case 'Photo::getArchive':	$this->getPhotoArchive(); break;
+			case 'Album::getArchive':	self::getAlbumArchiveAction(); break;
+			case 'Photo::getArchive':	self::getPhotoArchiveAction(); break;
 
 			# Error
-			default:					exit('Error: Function not found! Please check the spelling of the called function.');
-										break;
+			default:					self::fnNotFound(); break;
 
 		}
 
@@ -42,16 +41,17 @@ final class Guest implements Access {
 
 	# Album functions
 
-	private function getAlbums() {
+	private static function getAlbumsAction() {
 
 		$album = new Album(null);
 		echo json_encode($album->getAll(true));
 
 	}
 
-	private function getAlbum() {
+	private static function getAlbumAction() {
+
+		Validator::required(isset($_POST['albumID'], $_POST['password']), __METHOD__);
 
-		Module::dependencies(isset($_POST['albumID'], $_POST['password']));
 		$album = new Album($_POST['albumID']);
 
 		if ($album->getPublic()) {
@@ -69,9 +69,10 @@ final class Guest implements Access {
 
 	}
 
-	private function checkAlbumAccess() {
+	private static function checkAlbumAccessAction() {
+
+		Validator::required(isset($_POST['albumID'], $_POST['password']), __METHOD__);
 
-		Module::dependencies(isset($_POST['albumID'], $_POST['password']));
 		$album = new Album($_POST['albumID']);
 
 		if ($album->getPublic()) {
@@ -91,9 +92,10 @@ final class Guest implements Access {
 
 	# Photo functions
 
-	private function getPhoto() {
+	private static function getPhotoAction() {
+
+		Validator::required(isset($_POST['photoID'], $_POST['albumID'], $_POST['password']), __METHOD__);
 
-		Module::dependencies(isset($_POST['photoID'], $_POST['albumID'], $_POST['password']));
 		$photo = new Photo($_POST['photoID']);
 
 		$pgP = $photo->getPublic($_POST['password']);
@@ -106,24 +108,23 @@ final class Guest implements Access {
 
 	# Session functions
 
-	private function init() {
-
-		global $dbName;
+	private static function initAction() {
 
 		$session = new Session();
 		echo json_encode($session->init(true));
 
 	}
 
-	private function login() {
+	private static function loginAction() {
+
+		Validator::required(isset($_POST['user'], $_POST['password']), __METHOD__);
 
-		Module::dependencies(isset($_POST['user'], $_POST['password']));
 		$session = new Session();
 		echo $session->login($_POST['user'], $_POST['password']);
 
 	}
 
-	private function logout() {
+	private static function logoutAction() {
 
 		$session = new Session();
 		echo $session->logout();
@@ -132,9 +133,10 @@ final class Guest implements Access {
 
 	# $_GET functions
 
-	private function getAlbumArchive() {
+	private static function getAlbumArchiveAction() {
+
+		Validator::required(isset($_GET['albumID'], $_GET['password']), __METHOD__);
 
-		Module::dependencies(isset($_GET['albumID'], $_GET['password']));
 		$album = new Album($_GET['albumID']);
 
 		if ($album->getPublic()&&$album->getDownloadable()) {
@@ -152,9 +154,10 @@ final class Guest implements Access {
 
 	}
 
-	private function getPhotoArchive() {
+	private static function getPhotoArchiveAction() {
+
+		Validator::required(isset($_GET['photoID'], $_GET['password']), __METHOD__);
 
-		Module::dependencies(isset($_GET['photoID'], $_GET['password']));
 		$photo = new Photo($_GET['photoID']);
 
 		$pgP = $photo->getPublic($_GET['password']);
diff --git a/php/Access/Installation.php b/php/Access/Installation.php
index ec1cabb..982642f 100644
--- a/php/Access/Installation.php
+++ b/php/Access/Installation.php
@@ -3,18 +3,18 @@
 namespace Lychee\Access;
 
 use Lychee\Modules\Config;
-use Lychee\Modules\Module;
+use Lychee\Modules\Validator;
 
-final class Installation implements Access {
+final class Installation extends Access {
 
-	public function check($fn) {
+	public static function init($fn) {
 
 		switch ($fn) {
 
-			case 'Config::create':	$this->configCreate(); break;
+			case 'Config::create':	self::configCreateAction(); break;
 
 			# Error
-			default:				$this->init(); break;
+			default:				self::initAction(); break;
 
 		}
 
@@ -22,14 +22,15 @@ final class Installation implements Access {
 
 	}
 
-	private function configCreate() {
+	private static function configCreateAction() {
+
+		Validator::required(isset($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']));
 
-		Module::dependencies(isset($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']));
 		echo Config::create($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']);
 
 	}
 
-	private function init() {
+	private static function initAction() {
 
 		$return = array(
 			'status' => LYCHEE_STATUS_NOCONFIG
diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 486c456..b5b051a 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -2,7 +2,7 @@
 
 namespace Lychee\Modules;
 
-final class Album extends Module {
+final class Album {
 
 	private $albumIDs = null;
 
@@ -79,7 +79,7 @@ final class Album extends Module {
 	public function get() {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -163,10 +163,7 @@ final class Album extends Module {
 
 	}
 
-	public function getAll($public) {
-
-		# Check dependencies
-		self::dependencies(isset($public));
+	public function getAll($public = true) {
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -328,7 +325,7 @@ final class Album extends Module {
 	public function getArchive() {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -468,7 +465,7 @@ final class Album extends Module {
 	public function setTitle($title = 'Untitled') {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -491,7 +488,7 @@ final class Album extends Module {
 	public function setDescription($description = '') {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -514,7 +511,7 @@ final class Album extends Module {
 	public function getPublic() {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -537,7 +534,7 @@ final class Album extends Module {
 	public function getDownloadable() {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -560,7 +557,7 @@ final class Album extends Module {
 	public function setPublic($public, $password, $visible, $downloadable) {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -601,7 +598,7 @@ final class Album extends Module {
 	private function setPassword($password) {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -640,7 +637,7 @@ final class Album extends Module {
 	public function checkPassword($password) {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -662,7 +659,7 @@ final class Album extends Module {
 	public function merge() {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -703,7 +700,7 @@ final class Album extends Module {
 	public function delete() {
 
 		# Check dependencies
-		self::dependencies(isset($this->albumIDs));
+		Validator::required(isset($this->albumIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
diff --git a/php/Modules/Config.php b/php/Modules/Config.php
index 85cd28f..0c03786 100644
--- a/php/Modules/Config.php
+++ b/php/Modules/Config.php
@@ -2,7 +2,7 @@
 
 namespace Lychee\Modules;
 
-final class Config extends Module {
+final class Config {
 
 	public static function create($host, $user, $password, $name = 'lychee', $prefix = '') {
 
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 6804e80..770d62b 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -4,7 +4,7 @@ namespace Lychee\Modules;
 
 use Mysqli;
 
-final class Database extends Module {
+final class Database {
 
 	private $connection = null;
 	private static $instance = null;
@@ -39,7 +39,7 @@ final class Database extends Module {
 	private function __construct($host, $user, $password, $name = 'lychee', $dbTablePrefix) {
 
 		# Check dependencies
-		Module::dependencies(isset($host, $user, $password, $name));
+		Validator::required(isset($host, $user, $password, $name), __METHOD__);
 
 		# Define the table prefix
 		defineTablePrefix($dbTablePrefix);
@@ -79,6 +79,9 @@ final class Database extends Module {
 
 	private static function setCharset($connection) {
 
+		# Check dependencies
+		Validator::required(isset($connection), __METHOD__);
+
 		# Avoid sql injection on older MySQL versions by using GBK
 		if ($connection->server_version<50500) @$connection->set_charset('GBK');
 		else @$connection->set_charset('utf8');
@@ -93,7 +96,7 @@ final class Database extends Module {
 	public static function createDatabase($connection, $name = 'lychee') {
 
 		# Check dependencies
-		Module::dependencies(isset($connection, $name));
+		Validator::required(isset($connection), __METHOD__);
 
 		# Check if database exists
 		if ($connection->select_db($name)) return true;
@@ -110,7 +113,7 @@ final class Database extends Module {
 	private static function createTables($connection) {
 
 		# Check dependencies
-		Module::dependencies(isset($connection));
+		Validator::required(isset($connection), __METHOD__);
 
 		# Check if tables exist
 		$query = self::prepare($connection, 'SELECT * FROM ?, ?, ?, ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS, LYCHEE_TABLE_ALBUMS, LYCHEE_TABLE_SETTINGS, LYCHEE_TABLE_LOG));
@@ -229,7 +232,7 @@ final class Database extends Module {
 	private static function update($connection, $dbName) {
 
 		# Check dependencies
-		Module::dependencies(isset($connection));
+		Validator::required(isset($connection, $dbName), __METHOD__);
 
 		# Get current version
 		$query		= self::prepare($connection, "SELECT * FROM ? WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS));
@@ -253,6 +256,9 @@ final class Database extends Module {
 
 	public static function setVersion($connection, $version) {
 
+		# Check dependencies
+		Validator::required(isset($connection), __METHOD__);
+
 		$query	= self::prepare($connection, "UPDATE ? SET value = '?' WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS, $version));
 		$result = $connection->query($query);
 		if (!$result) {
@@ -262,10 +268,10 @@ final class Database extends Module {
 
 	}
 
-	public static function prepare($connection, $query, $data) {
+	public static function prepare($connection, $query, array $data) {
 
 		# Check dependencies
-		Module::dependencies(isset($connection, $query, $data));
+		Validator::required(isset($connection, $query), __METHOD__);
 
 		# Count the number of placeholders and compare it with the number of arguments
 		# If it doesn't match, calculate the difference and skip this number of placeholders before starting the replacement
diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index 410d890..dcc3041 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -2,13 +2,10 @@
 
 namespace Lychee\Modules;
 
-final class Import extends Module {
+final class Import {
 
 	private function photo($path, $albumID = 0, $description = '', $tags = '') {
 
-		# Check dependencies
-		self::dependencies(isset($path));
-
 		# No need to validate photo type and extension in this function.
 		# $photo->add will take care of it.
 
@@ -31,9 +28,6 @@ final class Import extends Module {
 
 	public function url($urls, $albumID = 0) {
 
-		# Check dependencies
-		self::dependencies(isset($urls));
-
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
diff --git a/php/Modules/Log.php b/php/Modules/Log.php
index 4be35e8..44e9696 100644
--- a/php/Modules/Log.php
+++ b/php/Modules/Log.php
@@ -2,7 +2,7 @@
 
 namespace Lychee\Modules;
 
-final class Log extends Module {
+final class Log {
 
 	public static function notice($function, $line, $text = '') {
 
@@ -25,7 +25,7 @@ final class Log extends Module {
 	private static function text($type, $function, $line, $text = '') {
 
 		# Check dependencies
-		Module::dependencies(isset($type, $function, $line, $text));
+		Validator::required(isset($type, $function, $line, $text), __METHOD__);
 
 		# Get time
 		$sysstamp = time();
diff --git a/php/Modules/Module.php b/php/Modules/Module.php
deleted file mode 100644
index 3d8d058..0000000
--- a/php/Modules/Module.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Lychee\Modules;
-
-abstract class Module {
-
-	final public static function dependencies($available = false) {
-
-		if ($available===false) exit('Error: Can not execute function. Missing parameters or variables.');
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index b862d78..4a069a9 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -2,7 +2,7 @@
 
 namespace Lychee\Modules;
 
-final class Photo extends Module {
+final class Photo {
 
 	private $photoIDs = null;
 
@@ -627,7 +627,7 @@ final class Photo extends Module {
 		# (array) $photo
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -790,7 +790,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -856,7 +856,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -886,7 +886,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -914,7 +914,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -959,7 +959,7 @@ final class Photo extends Module {
 		# (int) 2 = Photo public or album public and password correct
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -1006,7 +1006,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -1042,7 +1042,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -1072,7 +1072,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -1104,7 +1104,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -1147,7 +1147,7 @@ final class Photo extends Module {
 		# (boolean) false = Failure
 
 		# Check dependencies
-		self::dependencies(isset($this->photoIDs));
+		Validator::required(isset($this->photoIDs), __METHOD__);
 
 		# Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index 75f7322..580274e 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -2,7 +2,7 @@
 
 namespace Lychee\Modules;
 
-final class Session extends Module {
+final class Session {
 
 	public function init($public = true) {
 
diff --git a/php/Modules/Settings.php b/php/Modules/Settings.php
index 2088870..d916cce 100755
--- a/php/Modules/Settings.php
+++ b/php/Modules/Settings.php
@@ -2,7 +2,7 @@
 
 namespace Lychee\Modules;
 
-final class Settings extends Module {
+final class Settings {
 
 	private static $cache = null;
 
@@ -52,9 +52,6 @@ final class Settings extends Module {
 
 	public static function setLogin($oldPassword = '', $username, $password) {
 
-		# Check dependencies
-		self::dependencies(isset($oldPassword, $username, $password));
-
 		if ($oldPassword===self::get()['password']||self::get()['password']===crypt($oldPassword, self::get()['password'])) {
 
 			# Save username
@@ -74,7 +71,7 @@ final class Settings extends Module {
 	private static function setUsername($username) {
 
 		# Check dependencies
-		self::dependencies(isset($username));
+		Validator::required(isset($username), __METHOD__);
 
 		# Hash username
 		$username = getHashedString($username);
@@ -93,7 +90,7 @@ final class Settings extends Module {
 	private static function setPassword($password) {
 
 		# Check dependencies
-		self::dependencies(isset($password));
+		Validator::required(isset($password), __METHOD__);
 
 		# Hash password
 		$password = getHashedString($password);
@@ -110,9 +107,6 @@ final class Settings extends Module {
 
 	public static function setDropboxKey($dropboxKey) {
 
-		# Check dependencies
-		self::dependencies(isset($dropboxKey));
-
 		if (strlen($dropboxKey)<1||strlen($dropboxKey)>50) {
 			Log::notice(__METHOD__, __LINE__, 'Dropbox key is either too short or too long');
 			return false;
@@ -128,9 +122,6 @@ final class Settings extends Module {
 
 	public static function setSortingPhotos($type, $order) {
 
-		# Check dependencies
-		self::dependencies(isset($type, $order));
-
 		$sorting = 'ORDER BY ';
 
 		# Set row
@@ -189,9 +180,6 @@ final class Settings extends Module {
 
 	public static function setSortingAlbums($type, $order) {
 
-		# Check dependencies
-		self::dependencies(isset($type, $order));
-
 		$sorting = 'ORDER BY ';
 
 		# Set row
diff --git a/php/Modules/Validator.php b/php/Modules/Validator.php
new file mode 100644
index 0000000..6aee728
--- /dev/null
+++ b/php/Modules/Validator.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Lychee\Modules;
+
+final class Validator {
+
+	public static function required($available = false, $function) {
+
+		if ($available===false) exit("Error: Missing parameters. Can not execute function $function.");
+
+		return true;
+
+	}
+
+	public static function isNull() {
+
+		$args = func_get_args();
+
+		for ($i = 0; $i < count($args); $i++) {
+
+			if (is_null($args[$i])===true) return true;
+
+		}
+
+		return false;
+
+	}
+
+	public static function isAlbumIDs($albumIDs) {
+
+		return (preg_match('/^[0-9\,]{1,}$/', $albumIDs)===1 ? true : false);
+
+	}
+
+	public static function isAlbumID($albumID) {
+
+		return (preg_match('/^[0-9sfr]{1,}$/', $albumID)===1 ? true : false);
+
+	}
+
+	public static function isPhotoIDs($photoIDs) {
+
+		return (preg_match('/^[0-9\,]{1,}$/', $photoIDs)===1 ? true : false);
+
+	}
+
+	public static function isPhotoID($photoID) {
+
+		return (preg_match('/^[0-9]{14}$/', $photoID)===1 ? true : false);
+
+	}
+
+}
+
+?>
diff --git a/php/index.php b/php/index.php
index b80c660..2e72991 100755
--- a/php/index.php
+++ b/php/index.php
@@ -10,6 +10,7 @@ namespace Lychee;
 
 use Lychee\Modules\Config;
 use Lychee\Modules\Settings;
+use Lychee\Modules\Validator;
 
 use Lychee\Access\Installation;
 use Lychee\Access\Admin;
@@ -38,10 +39,10 @@ if (!empty($fn)) {
 	date_default_timezone_set('UTC');
 
 	# Validate parameters
-	if (isset($_POST['albumIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['albumIDs'])!==1)	exit('Error: Wrong parameter type for albumIDs!');
-	if (isset($_POST['photoIDs'])&&preg_match('/^[0-9\,]{1,}$/', $_POST['photoIDs'])!==1)	exit('Error: Wrong parameter type for photoIDs!');
-	if (isset($_POST['albumID'])&&preg_match('/^[0-9sfr]{1,}$/', $_POST['albumID'])!==1)	exit('Error: Wrong parameter type for albumID!');
-	if (isset($_POST['photoID'])&&preg_match('/^[0-9]{14}$/', $_POST['photoID'])!==1)		exit('Error: Wrong parameter type for photoID!');
+	if (isset($_POST['albumIDs'])&&Validator::isAlbumIDs($_POST['albumIDs'])===false)	exit('Error: Wrong parameter type for albumIDs!');
+	if (isset($_POST['photoIDs'])&&Validator::isPhotoIDs($_POST['photoIDs'])===false)	exit('Error: Wrong parameter type for photoIDs!');
+	if (isset($_POST['albumID'])&&Validator::isAlbumID($_POST['albumID'])==false)		exit('Error: Wrong parameter type for albumID!');
+	if (isset($_POST['photoID'])&&Validator::isPhotoID($_POST['photoID'])==false)		exit('Error: Wrong parameter type for photoID!');
 
 	# Check if a configuration exists
 	if (Config::exists()===false) {
@@ -51,9 +52,7 @@ if (!empty($fn)) {
 		# Limited access to configure Lychee. Only available when the config.php file is missing.
 		###
 
-		$installation = new Installation();
-		$installation->check($fn);
-
+		Installation::init($fn);
 		exit();
 
 	}
@@ -67,21 +66,21 @@ if (!empty($fn)) {
 		# Full access to Lychee. Only with correct password/session.
 		###
 
-		$admin = new Admin();
-		$admin->check($fn);
+		Admin::init($fn);
+		exit();
 
+	} else {
+
+		###
+		# Guest Access
+		# Access to view all public folders and photos in Lychee.
+		###
+
+		Guest::init($fn);
 		exit();
 
 	}
 
-	###
-	# Guest Access
-	# Access to view all public folders and photos in Lychee.
-	###
-
-	$guest = new Guest();
-	$guest->check($fn);
-
 } else {
 
 	exit('Error: No API function specified!');

From e89203bcb1ae1f35fa364f995d42a26372ffda9a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 21:43:57 +0100
Subject: [PATCH 042/183] // for comments and spaces for alignment

---
 php/Access/Admin.php                   |  94 +--
 php/Access/Guest.php                   |  74 +--
 php/Access/Installation.php            |   6 +-
 php/Modules/Album.php                  | 491 +++++++--------
 php/Modules/Config.php                 |  50 +-
 php/Modules/Database.php               | 162 ++---
 php/Modules/Import.php                 |  94 +--
 php/Modules/Log.php                    |  10 +-
 php/Modules/Photo.php                  | 806 ++++++++++++-------------
 php/Modules/Plugins.php                |  22 +-
 php/Modules/Session.php                |  46 +-
 php/Modules/Settings.php               | 126 ++--
 php/database/update_020700.php         |  32 +-
 php/database/update_030000.php         |  29 +-
 php/database/update_030001.php         |  49 +-
 php/database/update_030003.php         |  19 +-
 php/define.php                         |  22 +-
 php/helpers/fastImageCopyResampled.php |  28 +-
 php/helpers/getGraphHeader.php         |  24 +-
 php/helpers/getHashedString.php        |  21 +-
 php/helpers/hasPermissions.php         |   3 +-
 php/helpers/search.php                 |  42 +-
 php/index.php                          |  59 +-
 23 files changed, 1139 insertions(+), 1170 deletions(-)

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index c4576d2..84175d8 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -15,51 +15,51 @@ final class Admin extends Access {
 
 		switch ($fn) {
 
-			# Album functions
-			case 'Album::getAll':			self::getAlbumsAction(); break;
-			case 'Album::get':				self::getAlbumAction(); break;
-			case 'Album::add':				self::addAlbumAction(); break;
-			case 'Album::setTitle':			self::setAlbumTitleAction(); break;
-			case 'Album::setDescription':	self::setAlbumDescriptionAction(); break;
-			case 'Album::setPublic':		self::setAlbumPublicAction(); break;
-			case 'Album::delete':			self::deleteAlbumAction(); break;
-			case 'Album::merge':			self::mergeAlbumsAction(); break;
+			// Album functions
+			case 'Album::getAll':           self::getAlbumsAction(); break;
+			case 'Album::get':              self::getAlbumAction(); break;
+			case 'Album::add':              self::addAlbumAction(); break;
+			case 'Album::setTitle':         self::setAlbumTitleAction(); break;
+			case 'Album::setDescription':   self::setAlbumDescriptionAction(); break;
+			case 'Album::setPublic':        self::setAlbumPublicAction(); break;
+			case 'Album::delete':           self::deleteAlbumAction(); break;
+			case 'Album::merge':            self::mergeAlbumsAction(); break;
 
-			# Photo functions
-			case 'Photo::get':				self::getPhotoAction(); break;
-			case 'Photo::setTitle':			self::setPhotoTitleAction(); break;
-			case 'Photo::setDescription':	self::setPhotoDescriptionAction(); break;
-			case 'Photo::setStar':			self::setPhotoStarAction(); break;
-			case 'Photo::setPublic':		self::setPhotoPublicAction(); break;
-			case 'Photo::setAlbum':			self::setPhotoAlbumAction(); break;
-			case 'Photo::setTags':			self::setPhotoTagsAction(); break;
-			case 'Photo::duplicate':		self::duplicatePhotoAction(); break;
-			case 'Photo::delete':			self::deletePhotoAction(); break;
+			// Photo functions
+			case 'Photo::get':              self::getPhotoAction(); break;
+			case 'Photo::setTitle':         self::setPhotoTitleAction(); break;
+			case 'Photo::setDescription':   self::setPhotoDescriptionAction(); break;
+			case 'Photo::setStar':          self::setPhotoStarAction(); break;
+			case 'Photo::setPublic':        self::setPhotoPublicAction(); break;
+			case 'Photo::setAlbum':         self::setPhotoAlbumAction(); break;
+			case 'Photo::setTags':          self::setPhotoTagsAction(); break;
+			case 'Photo::duplicate':        self::duplicatePhotoAction(); break;
+			case 'Photo::delete':           self::deletePhotoAction(); break;
 
-			# Add functions
-			case 'Photo::add':				self::uploadAction(); break;
-			case 'Import::url':				self::importUrlAction(); break;
-			case 'Import::server':			self::importServerAction(); break;
+			// Add functions
+			case 'Photo::add':              self::uploadAction(); break;
+			case 'Import::url':             self::importUrlAction(); break;
+			case 'Import::server':          self::importServerAction(); break;
 
-			# Search functions
-			case 'search':					self::searchAction(); break;
+			// Search functions
+			case 'search':                  self::searchAction(); break;
 
-			# Session functions
-			case 'Session::init':			self::initAction(); break;
-			case 'Session::login':			self::loginAction(); break;
-			case 'Session::logout':			self::logoutAction(); break;
+			// Session functions
+			case 'Session::init':           self::initAction(); break;
+			case 'Session::login':          self::loginAction(); break;
+			case 'Session::logout':         self::logoutAction(); break;
 
-			# Settings functions
-			case 'Settings::setLogin':		self::setLoginAction(); break;
-			case 'Settings::setSorting':	self::setSortingAction(); break;
-			case 'Settings::setDropboxKey':	self::setDropboxKeyAction(); break;
+			// Settings functions
+			case 'Settings::setLogin':      self::setLoginAction(); break;
+			case 'Settings::setSorting':    self::setSortingAction(); break;
+			case 'Settings::setDropboxKey': self::setDropboxKeyAction(); break;
 
-			# $_GET functions
-			case 'Album::getArchive':		self::getAlbumArchiveAction(); break;
-			case 'Photo::getArchive':		self::getPhotoArchiveAction(); break;
+			// $_GET functions
+			case 'Album::getArchive':       self::getAlbumArchiveAction(); break;
+			case 'Photo::getArchive':       self::getPhotoArchiveAction(); break;
 
-			# Error
-			default:						self::fnNotFound(); break;
+			// Error
+			default:                        self::fnNotFound(); break;
 
 		}
 
@@ -67,7 +67,7 @@ final class Admin extends Access {
 
 	}
 
-	# Album functions
+	// Album functions
 
 	private static function getAlbumsAction() {
 
@@ -138,7 +138,7 @@ final class Admin extends Access {
 
 	}
 
-	# Photo functions
+	// Photo functions
 
 	private static function getPhotoAction() {
 
@@ -221,7 +221,7 @@ final class Admin extends Access {
 
 	}
 
-	# Add functions
+	// Add functions
 
 	private static function uploadAction() {
 
@@ -250,7 +250,7 @@ final class Admin extends Access {
 
 	}
 
-	# Search functions
+	// Search functions
 
 	private static function searchAction() {
 
@@ -260,7 +260,7 @@ final class Admin extends Access {
 
 	}
 
-	# Session functions
+	// Session functions
 
 	private static function initAction() {
 
@@ -285,7 +285,7 @@ final class Admin extends Access {
 
 	}
 
-	# Settings functions
+	// Settings functions
 
 	private static function setLoginAction() {
 
@@ -302,8 +302,8 @@ final class Admin extends Access {
 		$sA = Settings::setSortingAlbums($_POST['typeAlbums'], $_POST['orderAlbums']);
 		$sP = Settings::setSortingPhotos($_POST['typePhotos'], $_POST['orderPhotos']);
 
-		if ($sA===true&&$sP===true)	echo true;
-		else						echo false;
+		if ($sA===true&&$sP===true) echo true;
+		else                        echo false;
 
 	}
 
@@ -315,7 +315,7 @@ final class Admin extends Access {
 
 	}
 
-	# Get functions
+	// Get functions
 
 	private static function getAlbumArchiveAction() {
 
diff --git a/php/Access/Guest.php b/php/Access/Guest.php
index 73fca67..e8e2c9c 100644
--- a/php/Access/Guest.php
+++ b/php/Access/Guest.php
@@ -13,25 +13,25 @@ final class Guest extends Access {
 
 		switch ($fn) {
 
-			# Album functions
-			case 'Album::getAll':		self::getAlbumsAction(); break;
-			case 'Album::get':			self::getAlbumAction(); break;
-			case 'Album::getPublic':	self::checkAlbumAccessAction(); break;
+			// Album functions
+			case 'Album::getAll':     self::getAlbumsAction(); break;
+			case 'Album::get':        self::getAlbumAction(); break;
+			case 'Album::getPublic':  self::checkAlbumAccessAction(); break;
 
-			# Photo functions
-			case 'Photo::get':			self::getPhotoAction(); break;
+			// Photo functions
+			case 'Photo::get':        self::getPhotoAction(); break;
 
-			# Session functions
-			case 'Session::init':		self::initAction(); break;
-			case 'Session::login':		self::loginAction(); break;
-			case 'Session::logout':		self::logoutAction(); break;
+			// Session functions
+			case 'Session::init':     self::initAction(); break;
+			case 'Session::login':    self::loginAction(); break;
+			case 'Session::logout':   self::logoutAction(); break;
 
-			# $_GET functions
-			case 'Album::getArchive':	self::getAlbumArchiveAction(); break;
-			case 'Photo::getArchive':	self::getPhotoArchiveAction(); break;
+			// $_GET functions
+			case 'Album::getArchive': self::getAlbumArchiveAction(); break;
+			case 'Photo::getArchive': self::getPhotoArchiveAction(); break;
 
-			# Error
-			default:					self::fnNotFound(); break;
+			// Error
+			default:                  self::fnNotFound(); break;
 
 		}
 
@@ -39,7 +39,7 @@ final class Guest extends Access {
 
 	}
 
-	# Album functions
+	// Album functions
 
 	private static function getAlbumsAction() {
 
@@ -56,13 +56,13 @@ final class Guest extends Access {
 
 		if ($album->getPublic()) {
 
-			# Album public
-			if ($album->checkPassword($_POST['password']))	echo json_encode($album->get());
-			else											echo 'Warning: Wrong password!';
+			// Album public
+			if ($album->checkPassword($_POST['password'])) echo json_encode($album->get());
+			else                                           echo 'Warning: Wrong password!';
 
 		} else {
 
-			# Album private
+			// Album private
 			echo 'Warning: Album private!';
 
 		}
@@ -77,20 +77,20 @@ final class Guest extends Access {
 
 		if ($album->getPublic()) {
 
-			# Album public
-			if ($album->checkPassword($_POST['password']))	echo true;
-			else											echo false;
+			// Album public
+			if ($album->checkPassword($_POST['password'])) echo true;
+			else                                           echo false;
 
 		} else {
 
-			# Album private
+			// Album private
 			echo false;
 
 		}
 
 	}
 
-	# Photo functions
+	// Photo functions
 
 	private static function getPhotoAction() {
 
@@ -100,13 +100,13 @@ final class Guest extends Access {
 
 		$pgP = $photo->getPublic($_POST['password']);
 
-		if ($pgP===2)		echo json_encode($photo->get($_POST['albumID']));
-		else if ($pgP===1)	echo 'Warning: Wrong password!';
-		else if ($pgP===0)	echo 'Warning: Photo private!';
+		if ($pgP===2)      echo json_encode($photo->get($_POST['albumID']));
+		else if ($pgP===1) echo 'Warning: Wrong password!';
+		else if ($pgP===0) echo 'Warning: Photo private!';
 
 	}
 
-	# Session functions
+	// Session functions
 
 	private static function initAction() {
 
@@ -131,7 +131,7 @@ final class Guest extends Access {
 
 	}
 
-	# $_GET functions
+	// $_GET functions
 
 	private static function getAlbumArchiveAction() {
 
@@ -141,13 +141,13 @@ final class Guest extends Access {
 
 		if ($album->getPublic()&&$album->getDownloadable()) {
 
-			# Album Public
-			if ($album->checkPassword($_GET['password']))	$album->getArchive();
-			else											exit('Warning: Wrong password!');
+			// Album Public
+			if ($album->checkPassword($_GET['password'])) $album->getArchive();
+			else                                          exit('Warning: Wrong password!');
 
 		} else {
 
-			# Album Private
+			// Album Private
 			exit('Warning: Album private or not downloadable!');
 
 		}
@@ -162,15 +162,15 @@ final class Guest extends Access {
 
 		$pgP = $photo->getPublic($_GET['password']);
 
-		# Photo Download
+		// Photo Download
 		if ($pgP===2) {
 
-			# Photo Public
+			// Photo Public
 			$photo->getArchive();
 
 		} else {
 
-			# Photo Private
+			// Photo Private
 			exit('Warning: Photo private or password incorrect!');
 
 		}
diff --git a/php/Access/Installation.php b/php/Access/Installation.php
index 982642f..946f6bc 100644
--- a/php/Access/Installation.php
+++ b/php/Access/Installation.php
@@ -11,10 +11,10 @@ final class Installation extends Access {
 
 		switch ($fn) {
 
-			case 'Config::create':	self::configCreateAction(); break;
+			case 'Config::create': self::configCreateAction(); break;
 
-			# Error
-			default:				self::initAction(); break;
+			// Error
+			default:               self::initAction(); break;
 
 		}
 
diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index b5b051a..ebfe111 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -8,8 +8,8 @@ final class Album {
 
 	public function __construct($albumIDs) {
 
-		# Init vars
-		$this->albumIDs	= $albumIDs;
+		// Init vars
+		$this->albumIDs = $albumIDs;
 
 		return true;
 
@@ -17,22 +17,22 @@ final class Album {
 
 	public function add($title = 'Untitled') {
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Parse
+		// Parse
 		if (strlen($title)>50) $title = substr($title, 0, 50);
 
-		# Properties
-		$public		= 0;
-		$visible	= 1;
+		// Properties
+		$public  = 0;
+		$visible = 1;
 
-		# Database
-		$sysstamp	= time();
-		$query		= Database::prepare(Database::get(), "INSERT INTO ? (title, sysstamp, public, visible) VALUES ('?', '?', '?', '?')", array(LYCHEE_TABLE_ALBUMS, $title, $sysstamp, $public, $visible));
-		$result		= Database::get()->query($query);
+		// Database
+		$sysstamp = time();
+		$query    = Database::prepare(Database::get(), "INSERT INTO ? (title, sysstamp, public, visible) VALUES ('?', '?', '?', '?')", array(LYCHEE_TABLE_ALBUMS, $title, $sysstamp, $public, $visible));
+		$result   = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -45,31 +45,31 @@ final class Album {
 
 	public static function prepareData(array $data) {
 
-		# This function requires the following album-attributes and turns them
-		# into a front-end friendly format: id, title, public, sysstamp, password
-		# Note that some attributes remain unchanged
+		// This function requires the following album-attributes and turns them
+		// into a front-end friendly format: id, title, public, sysstamp, password
+		// Note that some attributes remain unchanged
 
-		# Init
+		// Init
 		$album = null;
 
-		# Set unchanged attributes
-		$album['id']		= $data['id'];
-		$album['title']		= $data['title'];
-		$album['public']	= $data['public'];
+		// Set unchanged attributes
+		$album['id']     = $data['id'];
+		$album['title']  = $data['title'];
+		$album['public'] = $data['public'];
 
-		# Additional attributes
-		# Only part of $album when available
-		if (isset($data['description']))	$album['description'] = $data['description'];
-		if (isset($data['visible']))		$album['visible'] = $data['visible'];
-		if (isset($data['downloadable']))	$album['downloadable'] = $data['downloadable'];
+		// Additional attributes
+		// Only part of $album when available
+		if (isset($data['description']))  $album['description'] = $data['description'];
+		if (isset($data['visible']))      $album['visible'] = $data['visible'];
+		if (isset($data['downloadable'])) $album['downloadable'] = $data['downloadable'];
 
-		# Parse date
+		// Parse date
 		$album['sysdate'] = date('F Y', $data['sysstamp']);
 
-		# Parse password
+		// Parse password
 		$album['password'] = ($data['password']=='' ? '0' : '1');
 
-		# Parse thumbs or set default value
+		// Parse thumbs or set default value
 		$album['thumbs'] = (isset($data['thumbs']) ? explode(',', $data['thumbs']) : array());
 
 		return $album;
@@ -78,85 +78,90 @@ final class Album {
 
 	public function get() {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Get album information
+		// Get album information
 		switch ($this->albumIDs) {
 
-			case 'f':	$return['public'] = '0';
-						$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE star = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-						break;
+			case 'f':
+				$return['public'] = '0';
+				$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE star = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+				break;
 
-			case 's':	$return['public'] = '0';
-						$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE public = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-						break;
+			case 's':
+				$return['public'] = '0';
+				$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE public = 1 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+				break;
 
-			case 'r':	$return['public'] = '0';
-						$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-						break;
+			case 'r':
+				$return['public'] = '0';
+				$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+				break;
 
-			case '0':	$return['public'] = '0';
-						$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = 0 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-						break;
+			case '0':
+				$return['public'] = '0';
+				$query = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = 0 " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+				break;
 
-			default:	$query	= Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-						$albums = Database::get()->query($query);
-						$return = $albums->fetch_assoc();
-						$return = Album::prepareData($return);
-						$query	= Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
-						break;
+			default:
+				$query  = Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+				$albums = Database::get()->query($query);
+				$return = $albums->fetch_assoc();
+				$return = Album::prepareData($return);
+				$query  = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
+				break;
 
 		}
 
-		# Get photos
-		$photos				= Database::get()->query($query);
-		$previousPhotoID	= '';
+		// Get photos
+		$photos          = Database::get()->query($query);
+		$previousPhotoID = '';
 		while ($photo = $photos->fetch_assoc()) {
 
-			# Turn data from the database into a front-end friendly format
+			// Turn data from the database into a front-end friendly format
 			$photo = Photo::prepareData($photo);
 
-			# Set previous and next photoID for navigation purposes
+			// Set previous and next photoID for navigation purposes
 			$photo['previousPhoto'] = $previousPhotoID;
-			$photo['nextPhoto']		= '';
+			$photo['nextPhoto']     = '';
 
-			# Set current photoID as nextPhoto of previous photo
+			// Set current photoID as nextPhoto of previous photo
 			if ($previousPhotoID!=='') $return['content'][$previousPhotoID]['nextPhoto'] = $photo['id'];
 			$previousPhotoID = $photo['id'];
 
-			# Add to return
+			// Add to return
 			$return['content'][$photo['id']] = $photo;
 
 		}
 
 		if ($photos->num_rows===0) {
 
-			# Album empty
+			// Album empty
 			$return['content'] = false;
 
 		} else {
 
-			# Enable next and previous for the first and last photo
-			$lastElement	= end($return['content']);
-			$lastElementId	= $lastElement['id'];
-			$firstElement	= reset($return['content']);
-			$firstElementId	= $firstElement['id'];
+			// Enable next and previous for the first and last photo
+			$lastElement    = end($return['content']);
+			$lastElementId  = $lastElement['id'];
+			$firstElement   = reset($return['content']);
+			$firstElementId = $firstElement['id'];
 
 			if ($lastElementId!==$firstElementId) {
-				$return['content'][$lastElementId]['nextPhoto']			= $firstElementId;
-				$return['content'][$firstElementId]['previousPhoto']	= $lastElementId;
+				$return['content'][$lastElementId]['nextPhoto']      = $firstElementId;
+				$return['content'][$firstElementId]['previousPhoto'] = $lastElementId;
 			}
 
 		}
 
-		$return['id']	= $this->albumIDs;
-		$return['num']	= $photos->num_rows;
+		$return['id']  = $this->albumIDs;
+		$return['num'] = $photos->num_rows;
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $return;
@@ -165,45 +170,45 @@ final class Album {
 
 	public function getAll($public = true) {
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Initialize return var
+		// Initialize return var
 		$return = array(
-			'smartalbums'	=> null,
-			'albums'		=> null,
-			'num'			=> 0
+			'smartalbums' => null,
+			'albums'      => null,
+			'num'         => 0
 		);
 
-		# Get SmartAlbums
+		// Get SmartAlbums
 		if ($public===false) $return['smartalbums'] = $this->getSmartInfo();
 
-		# Albums query
-		if ($public===false)	$query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
-		else					$query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? WHERE public = 1 AND visible <> 0 ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
+		// Albums query
+		if ($public===false) $query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
+		else                 $query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? WHERE public = 1 AND visible <> 0 ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
 
-		# Execute query
+		// Execute query
 		$albums = Database::get()->query($query);
 		if (!$albums) {
 			Log::error(__METHOD__, __LINE__, 'Could not get all albums (' . Database::get()->error . ')');
 			exit('Error: ' . Database::get()->error);
 		}
 
-		# For each album
+		// For each album
 		while ($album = $albums->fetch_assoc()) {
 
-			# Turn data from the database into a front-end friendly format
+			// Turn data from the database into a front-end friendly format
 			$album = Album::prepareData($album);
 
-			# Thumbs
+			// Thumbs
 			if (($public===true&&$album['password']==='0')||
 				($public===false)) {
 
-					# Execute query
-					$query	= Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr(Settings::get()['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
-					$thumbs	= Database::get()->query($query);
+					// Execute query
+					$query  = Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr(Settings::get()['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
+					$thumbs = Database::get()->query($query);
 
-					# For each thumb
+					// For each thumb
 					$k = 0;
 					while ($thumb = $thumbs->fetch_object()) {
 						$album['thumbs'][$k] = LYCHEE_URL_UPLOADS_THUMB . $thumb->thumbUrl;
@@ -212,15 +217,15 @@ final class Album {
 
 			}
 
-			# Add to return
+			// Add to return
 			$return['albums'][] = $album;
 
 		}
 
-		# Num of albums
+		// Num of albums
 		$return['num'] = $albums->num_rows;
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $return;
@@ -229,25 +234,25 @@ final class Album {
 
 	private function getSmartInfo() {
 
-		# Initialize return var
+		// Initialize return var
 		$return = array(
-			'unsorted'	=> null,
-			'public'	=> null,
-			'starred'	=> null,
-			'recent'	=> null
+			'unsorted' => null,
+			'public'   => null,
+			'starred'  => null,
+			'recent'   => null
 		);
 
-		###
-		# Unsorted
-		###
+		/**
+		 * Unsorted
+		 */
 
-		$query		= Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE album = 0 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$unsorted	= Database::get()->query($query);
-		$i			= 0;
+		$query    = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE album = 0 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$unsorted = Database::get()->query($query);
+		$i        = 0;
 
 		$return['unsorted'] = array(
-			'thumbs'	=> array(),
-			'num'		=> $unsorted->num_rows
+			'thumbs' => array(),
+			'num'    => $unsorted->num_rows
 		);
 
 		while($row = $unsorted->fetch_object()) {
@@ -257,17 +262,17 @@ final class Album {
 			} else break;
 		}
 
-		###
-		# Starred
-		###
+		/**
+		 * Starred
+		 */
 
-		$query		= Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE star = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$starred	= Database::get()->query($query);
-		$i			= 0;
+		$query   = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE star = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$starred = Database::get()->query($query);
+		$i       = 0;
 
 		$return['starred'] = array(
-			'thumbs'	=> array(),
-			'num'		=> $starred->num_rows
+			'thumbs' => array(),
+			'num'    => $starred->num_rows
 		);
 
 		while($row3 = $starred->fetch_object()) {
@@ -277,17 +282,17 @@ final class Album {
 			} else break;
 		}
 
-		###
-		# Public
-		###
+		/**
+		 * Public
+		 */
 
-		$query		= Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE public = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$public		= Database::get()->query($query);
-		$i			= 0;
+		$query  = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE public = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$public = Database::get()->query($query);
+		$i      = 0;
 
 		$return['public'] = array(
-			'thumbs'	=> array(),
-			'num'		=> $public->num_rows
+			'thumbs' => array(),
+			'num'    => $public->num_rows
 		);
 
 		while($row2 = $public->fetch_object()) {
@@ -297,17 +302,17 @@ final class Album {
 			} else break;
 		}
 
-		###
-		# Recent
-		###
+		/**
+		 * Recent
+		 */
 
-		$query		= Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$recent		= Database::get()->query($query);
-		$i			= 0;
+		$query  = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$recent = Database::get()->query($query);
+		$i      = 0;
 
 		$return['recent'] = array(
-			'thumbs'	=> array(),
-			'num'		=> $recent->num_rows
+			'thumbs' => array(),
+			'num'    => $recent->num_rows
 		);
 
 		while($row3 = $recent->fetch_object()) {
@@ -317,117 +322,117 @@ final class Album {
 			} else break;
 		}
 
-		# Return SmartAlbums
+		// Return SmartAlbums
 		return $return;
 
 	}
 
 	public function getArchive() {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Illicit chars
+		// Illicit chars
 		$badChars =	array_merge(
-						array_map('chr', range(0,31)),
-						array("<", ">", ":", '"', "/", "\\", "|", "?", "*")
-					);
+			array_map('chr', range(0,31)),
+			array("<", ">", ":", '"', "/", "\\", "|", "?", "*")
+		);
 
-		# Photos query
+		// Photos query
 		switch($this->albumIDs) {
 			case 's':
-				$photos		= Database::prepare(Database::get(), 'SELECT title, url FROM ? WHERE public = 1', array(LYCHEE_TABLE_PHOTOS));
-				$zipTitle	= 'Public';
+				$photos   = Database::prepare(Database::get(), 'SELECT title, url FROM ? WHERE public = 1', array(LYCHEE_TABLE_PHOTOS));
+				$zipTitle = 'Public';
 				break;
 			case 'f':
-				$photos		= Database::prepare(Database::get(), 'SELECT title, url FROM ? WHERE star = 1', array(LYCHEE_TABLE_PHOTOS));
-				$zipTitle	= 'Starred';
+				$photos   = Database::prepare(Database::get(), 'SELECT title, url FROM ? WHERE star = 1', array(LYCHEE_TABLE_PHOTOS));
+				$zipTitle = 'Starred';
 				break;
 			case 'r':
-				$photos		= Database::prepare(Database::get(), 'SELECT title, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) GROUP BY checksum', array(LYCHEE_TABLE_PHOTOS));
-				$zipTitle	= 'Recent';
+				$photos   = Database::prepare(Database::get(), 'SELECT title, url FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) GROUP BY checksum', array(LYCHEE_TABLE_PHOTOS));
+				$zipTitle = 'Recent';
 				break;
 			default:
-				$photos		= Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE album = '?'", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
-				$zipTitle	= 'Unsorted';
+				$photos   = Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE album = '?'", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
+				$zipTitle = 'Unsorted';
 		}
 
-		# Get title from database when album is not a SmartAlbum
+		// Get title from database when album is not a SmartAlbum
 		if ($this->albumIDs!=0&&is_numeric($this->albumIDs)) {
 
 			$query = Database::prepare(Database::get(), "SELECT title FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
 			$album = Database::get()->query($query);
 
-			# Error in database query
+			// Error in database query
 			if (!$album) {
 				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
 
-			# Fetch object
+			// Fetch object
 			$album = $album->fetch_object();
 
-			# Photo not found
+			// Photo not found
 			if ($album===null) {
 				Log::error(__METHOD__, __LINE__, 'Album not found. Cannot start download.');
 				return false;
 			}
 
-			# Set title
+			// Set title
 			$zipTitle = $album->title;
 
 		}
 
-		# Escape title
+		// Escape title
 		$zipTitle = str_replace($badChars, '', $zipTitle);
 
 		$filename = LYCHEE_DATA . $zipTitle . '.zip';
 
-		# Create zip
+		// Create zip
 		$zip = new ZipArchive();
 		if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) {
 			Log::error(__METHOD__, __LINE__, 'Could not create ZipArchive');
 			return false;
 		}
 
-		# Execute query
+		// Execute query
 		$photos = Database::get()->query($photos);
 
-		# Check if album empty
+		// Check if album empty
 		if ($photos->num_rows==0) {
 			Log::error(__METHOD__, __LINE__, 'Could not create ZipArchive without images');
 			return false;
 		}
 
-		# Parse each path
+		// Parse each path
 		$files = array();
 		while ($photo = $photos->fetch_object()) {
 
-			# Parse url
+			// Parse url
 			$photo->url = LYCHEE_UPLOADS_BIG . $photo->url;
 
-			# Parse title
+			// Parse title
 			$photo->title = str_replace($badChars, '', $photo->title);
 			if (!isset($photo->title)||$photo->title==='') $photo->title = 'Untitled';
 
-			# Check if readable
+			// Check if readable
 			if (!@is_readable($photo->url)) continue;
 
-			# Get extension of image
+			// Get extension of image
 			$extension = getExtension($photo->url);
 
-			# Set title for photo
+			// Set title for photo
 			$zipFileName = $zipTitle . '/' . $photo->title . $extension;
 
-			# Check for duplicates
+			// Check for duplicates
 			if (!empty($files)) {
 				$i = 1;
 				while (in_array($zipFileName, $files)) {
 
-					# Set new title for photo
+					// Set new title for photo
 					$zipFileName = $zipTitle . '/' . $photo->title . '-' . $i . $extension;
 
 					$i++;
@@ -435,27 +440,27 @@ final class Album {
 				}
 			}
 
-			# Add to array
+			// Add to array
 			$files[] = $zipFileName;
 
-			# Add photo to zip
+			// Add photo to zip
 			$zip->addFile($photo->url, $zipFileName);
 
 		}
 
-		# Finish zip
+		// Finish zip
 		$zip->close();
 
-		# Send zip
+		// Send zip
 		header("Content-Type: application/zip");
 		header("Content-Disposition: attachment; filename=\"$zipTitle.zip\"");
 		header("Content-Length: " . filesize($filename));
 		readfile($filename);
 
-		# Delete zip
+		// Delete zip
 		unlink($filename);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
@@ -464,17 +469,17 @@ final class Album {
 
 	public function setTitle($title = 'Untitled') {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Execute query
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $title, $this->albumIDs));
+		// Execute query
+		$query  = Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $title, $this->albumIDs));
 		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -487,17 +492,17 @@ final class Album {
 
 	public function setDescription($description = '') {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Execute query
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $description, $this->albumIDs));
-		$result	= Database::get()->query($query);
+		// Execute query
+		$query  = Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $description, $this->albumIDs));
+		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -510,20 +515,20 @@ final class Album {
 
 	public function getPublic() {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		if ($this->albumIDs==='0'||$this->albumIDs==='s'||$this->albumIDs==='f') return false;
 
-		# Execute query
-		$query	= Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$albums	= Database::get()->query($query);
-		$album	= $albums->fetch_object();
+		// Execute query
+		$query  = Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+		$albums = Database::get()->query($query);
+		$album  = $albums->fetch_object();
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($album->public==1) return true;
@@ -533,20 +538,20 @@ final class Album {
 
 	public function getDownloadable() {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		if ($this->albumIDs==='0'||$this->albumIDs==='s'||$this->albumIDs==='f'||$this->albumIDs==='r') return false;
 
-		# Execute query
-		$query	= Database::prepare(Database::get(), "SELECT downloadable FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$albums	= Database::get()->query($query);
-		$album	= $albums->fetch_object();
+		// Execute query
+		$query  = Database::prepare(Database::get(), "SELECT downloadable FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+		$albums = Database::get()->query($query);
+		$album  = $albums->fetch_object();
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($album->downloadable==1) return true;
@@ -556,39 +561,39 @@ final class Album {
 
 	public function setPublic($public, $password, $visible, $downloadable) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Convert values
-		$public			= ($public==='1' ? 1 : 0);
-		$visible		= ($visible==='1' ? 1 : 0);
-		$downloadable	= ($downloadable==='1' ? 1 : 0);
+		// Convert values
+		$public       = ($public==='1' ? 1 : 0);
+		$visible      = ($visible==='1' ? 1 : 0);
+		$downloadable = ($downloadable==='1' ? 1 : 0);
 
-		# Set public
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET public = '?', visible = '?', downloadable = '?', password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $public, $visible, $downloadable, $this->albumIDs));
-		$result	= Database::get()->query($query);
+		// Set public
+		$query  = Database::prepare(Database::get(), "UPDATE ? SET public = '?', visible = '?', downloadable = '?', password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $public, $visible, $downloadable, $this->albumIDs));
+		$result = Database::get()->query($query);
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
-		# Reset permissions for photos
+		// Reset permissions for photos
 		if ($public===1) {
-			$query	= Database::prepare(Database::get(), "UPDATE ? SET public = 0 WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
-			$result	= Database::get()->query($query);
+			$query  = Database::prepare(Database::get(), "UPDATE ? SET public = 0 WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
+			$result = Database::get()->query($query);
 			if (!$result) {
 				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		# Set password
+		// Set password
 		if (isset($password)&&strlen($password)>0) return $this->setPassword($password);
 
 		return true;
@@ -597,33 +602,33 @@ final class Album {
 
 	private function setPassword($password) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		if (strlen($password)>0) {
 
-			# Get hashed password
+			// Get hashed password
 			$password = getHashedString($password);
 
-			# Set hashed password
-			# Do not prepare $password because it is hashed and save
-			# Preparing (escaping) the password would destroy the hash
-			$query	= Database::prepare(Database::get(), "UPDATE ? SET password = '$password' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+			// Set hashed password
+			// Do not prepare $password because it is hashed and save
+			// Preparing (escaping) the password would destroy the hash
+			$query = Database::prepare(Database::get(), "UPDATE ? SET password = '$password' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
 
 		} else {
 
-			# Unset password
-			$query	= Database::prepare(Database::get(), "UPDATE ? SET password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+			// Unset password
+			$query = Database::prepare(Database::get(), "UPDATE ? SET password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
 
 		}
 
-		# Execute query
-		$result	= Database::get()->query($query);
+		// Execute query
+		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -636,18 +641,18 @@ final class Album {
 
 	public function checkPassword($password) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Execute query
-		$query	= Database::prepare(Database::get(), "SELECT password FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$albums	= Database::get()->query($query);
-		$album	= $albums->fetch_object();
+		// Execute query
+		$query  = Database::prepare(Database::get(), "SELECT password FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+		$albums = Database::get()->query($query);
+		$album  = $albums->fetch_object();
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($album->password=='') return true;
@@ -658,35 +663,35 @@ final class Album {
 
 	public function merge() {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Convert to array
+		// Convert to array
 		$albumIDs = explode(',', $this->albumIDs);
 
-		# Get first albumID
+		// Get first albumID
 		$albumID = array_splice($albumIDs, 0, 1);
 		$albumID = $albumID[0];
 
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET album = ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->albumIDs));
-		$result	= Database::get()->query($query);
+		$query  = Database::prepare(Database::get(), "UPDATE ? SET album = ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->albumIDs));
+		$result = Database::get()->query($query);
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
-		# $albumIDs contains all IDs without the first albumID
-		# Convert to string
+		// $albumIDs contains all IDs without the first albumID
+		// Convert to string
 		$filteredIDs = implode(',', $albumIDs);
 
-		$query	= Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $filteredIDs));
-		$result	= Database::get()->query($query);
+		$query  = Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $filteredIDs));
+		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -699,20 +704,20 @@ final class Album {
 
 	public function delete() {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->albumIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Init vars
+		// Init vars
 		$error = false;
 
-		# Execute query
-		$query	= Database::prepare(Database::get(), "SELECT id FROM ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
+		// Execute query
+		$query  = Database::prepare(Database::get(), "SELECT id FROM ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
 		$photos = Database::get()->query($query);
 
-		# For each album delete photo
+		// For each album delete photo
 		while ($row = $photos->fetch_object()) {
 
 			$photo = new Photo($row->id);
@@ -720,11 +725,11 @@ final class Album {
 
 		}
 
-		# Delete albums
-		$query	= Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$result	= Database::get()->query($query);
+		// Delete albums
+		$query  = Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
+		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($error) return false;
diff --git a/php/Modules/Config.php b/php/Modules/Config.php
index 0c03786..060b1df 100644
--- a/php/Modules/Config.php
+++ b/php/Modules/Config.php
@@ -6,43 +6,37 @@ final class Config {
 
 	public static function create($host, $user, $password, $name = 'lychee', $prefix = '') {
 
-		# Open a new connection to the MySQL server
+		// Open a new connection to the MySQL server
 		$connection = Database::connect($host, $user, $password);
 
-		# Check if the connection was successful
+		// Check if the connection was successful
 		if ($connection===false) return 'Warning: Connection failed!';
 
-		# Check if user can create the database before saving the configuration
+		// Check if user can create the database before saving the configuration
 		if (!Database::createDatabase($connection, $name)) return 'Warning: Creation failed!';
 
-		# Escape data
-		$host		= mysqli_real_escape_string($connection, $host);
-		$user		= mysqli_real_escape_string($connection, $user);
-		$password	= mysqli_real_escape_string($connection, $password);
-		$name		= mysqli_real_escape_string($connection, $name);
-		$prefix		= mysqli_real_escape_string($connection, $prefix);
+		// Escape data
+		$host     = mysqli_real_escape_string($connection, $host);
+		$user     = mysqli_real_escape_string($connection, $user);
+		$password = mysqli_real_escape_string($connection, $password);
+		$name     = mysqli_real_escape_string($connection, $name);
+		$prefix   = mysqli_real_escape_string($connection, $prefix);
 
-		# Save config.php
+		// Save config.php
 $config = "<?php
 
-###
-# @name			Configuration
-# @author		Tobias Reich
-# @copyright	2015 Tobias Reich
-###
-
 if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-# Database configuration
-\$dbHost = '$host'; # Host of the database
-\$dbUser = '$user'; # Username of the database
-\$dbPassword = '$password'; # Password of the database
-\$dbName = '$name'; # Database name
-\$dbTablePrefix = '$prefix'; # Table prefix
+// Database configuration
+\$dbHost = '$host'; // Host of the database
+\$dbUser = '$user'; // Username of the database
+\$dbPassword = '$password'; // Password of the database
+\$dbName = '$name'; // Database name
+\$dbTablePrefix = '$prefix'; // Table prefix
 
 ?>";
 
-		# Save file
+		// Save file
 		if (file_put_contents(LYCHEE_CONFIG_FILE, $config)===false) return 'Warning: Could not create file!';
 
 		return true;
@@ -60,11 +54,11 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 		require(LYCHEE_CONFIG_FILE);
 
 		return(array(
-			'host'		=> $dbHost,
-			'user'		=> $dbUser,
-			'password'	=> $dbPassword,
-			'name'		=> $dbName,
-			'prefix'	=> $dbTablePrefix
+			'host'     => $dbHost,
+			'user'     => $dbUser,
+			'password' => $dbPassword,
+			'name'     => $dbName,
+			'prefix'   => $dbTablePrefix
 		));
 
 	}
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 770d62b..bac8126 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -10,10 +10,10 @@ final class Database {
 	private static $instance = null;
 
 	private static $versions = array(
-		'020700', #2.7.0
-		'030000', #3.0.0
-		'030001', #3.0.1
-		'030003' #3.0.3
+		'020700', // 2.7.0
+		'030000', // 3.0.0
+		'030001', // 3.0.1
+		'030003' // 3.0.3
 	);
 
 	public static function get() {
@@ -38,27 +38,27 @@ final class Database {
 
 	private function __construct($host, $user, $password, $name = 'lychee', $dbTablePrefix) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($host, $user, $password, $name), __METHOD__);
 
-		# Define the table prefix
+		// Define the table prefix
 		defineTablePrefix($dbTablePrefix);
 
-		# Open a new connection to the MySQL server
+		// Open a new connection to the MySQL server
 		$connection = self::connect($host, $user, $password);
 
-		# Check if the connection was successful
+		// Check if the connection was successful
 		if ($connection===false) exit('Error: ' . $connection->connect_error);
 
 		if (!self::setCharset($connection)) exit('Error: Could not set database charset!');
 
-		# Create database
+		// Create database
 		if (!self::createDatabase($connection, $name)) exit('Error: Could not create database!');
 
-		# Create tables
+		// Create tables
 		if (!self::createTables($connection)) exit('Error: Could not create tables!');
 
-		# Update database
+		// Update database
 		if (!self::update($connection, $name)) exit('Error: Could not update database and tables!');
 
 		$this->connection = $connection;
@@ -67,10 +67,10 @@ final class Database {
 
 	public static function connect($host = 'localhost', $user, $password) {
 
-		# Open a new connection to the MySQL server
+		// Open a new connection to the MySQL server
 		$connection = new Mysqli($host, $user, $password);
 
-		# Check if the connection was successful
+		// Check if the connection was successful
 		if ($connection->connect_errno) return false;
 
 		return $connection;
@@ -79,14 +79,14 @@ final class Database {
 
 	private static function setCharset($connection) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($connection), __METHOD__);
 
-		# Avoid sql injection on older MySQL versions by using GBK
+		// Avoid sql injection on older MySQL versions by using GBK
 		if ($connection->server_version<50500) @$connection->set_charset('GBK');
 		else @$connection->set_charset('utf8');
 
-		# Set unicode
+		// Set unicode
 		$connection->query('SET NAMES utf8;');
 
 		return true;
@@ -95,14 +95,14 @@ final class Database {
 
 	public static function createDatabase($connection, $name = 'lychee') {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($connection), __METHOD__);
 
-		# Check if database exists
+		// Check if database exists
 		if ($connection->select_db($name)) return true;
 
-		# Create database
-		$query	= self::prepare($connection, 'CREATE DATABASE IF NOT EXISTS ?', array($name));
+		// Create database
+		$query  = self::prepare($connection, 'CREATE DATABASE IF NOT EXISTS ?', array($name));
 		$result = $connection->query($query);
 
 		if (!$connection->select_db($name)) return false;
@@ -112,68 +112,68 @@ final class Database {
 
 	private static function createTables($connection) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($connection), __METHOD__);
 
-		# Check if tables exist
+		// Check if tables exist
 		$query = self::prepare($connection, 'SELECT * FROM ?, ?, ?, ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS, LYCHEE_TABLE_ALBUMS, LYCHEE_TABLE_SETTINGS, LYCHEE_TABLE_LOG));
 		if ($connection->query($query)) return true;
 
-		# Create log
+		// Create log
 		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_LOG));
 		if (!$connection->query($exist)) {
 
-			# Read file
-			$file	= __DIR__ . '/../database/log_table.sql';
-			$query	= @file_get_contents($file);
+			// Read file
+			$file  = __DIR__ . '/../database/log_table.sql';
+			$query = @file_get_contents($file);
 
 			if (!isset($query)||$query===false) return false;
 
-			# Create table
+			// Create table
 			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_LOG));
 			if (!$connection->query($query)) return false;
 
 		}
 
-		# Create settings
+		// Create settings
 		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_SETTINGS));
 		if (!$connection->query($exist)) {
 
-			# Read file
-			$file	= __DIR__ . '/../database/settings_table.sql';
-			$query	= @file_get_contents($file);
+			// Read file
+			$file  = __DIR__ . '/../database/settings_table.sql';
+			$query = @file_get_contents($file);
 
 			if (!isset($query)||$query===false) {
 				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_settings');
 				return false;
 			}
 
-			# Create table
+			// Create table
 			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
 			if (!$connection->query($query)) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
 				return false;
 			}
 
-			# Read file
-			$file	= __DIR__ . '/../database/settings_content.sql';
-			$query	= @file_get_contents($file);
+			// Read file
+			$file  = __DIR__ . '/../database/settings_content.sql';
+			$query = @file_get_contents($file);
 
 			if (!isset($query)||$query===false) {
 				Log::error(__METHOD__, __LINE__, 'Could not load content-query for lychee_settings');
 				return false;
 			}
 
-			# Add content
+			// Add content
 			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
 			if (!$connection->query($query)) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
 				return false;
 			}
 
-			# Generate identifier
-			$identifier	= md5(microtime(true));
-			$query		= self::prepare($connection, "UPDATE `?` SET `value` = '?' WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS, $identifier));
+			// Generate identifier
+			$identifier = md5(microtime(true));
+			$query      = self::prepare($connection, "UPDATE `?` SET `value` = '?' WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS, $identifier));
 			if (!$connection->query($query)) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
 				return false;
@@ -181,20 +181,20 @@ final class Database {
 
 		}
 
-		# Create albums
+		// Create albums
 		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_ALBUMS));
 		if (!$connection->query($exist)) {
 
-			# Read file
-			$file	= __DIR__ . '/../database/albums_table.sql';
-			$query	= @file_get_contents($file);
+			// Read file
+			$file  = __DIR__ . '/../database/albums_table.sql';
+			$query = @file_get_contents($file);
 
 			if (!isset($query)||$query===false) {
 				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_albums');
 				return false;
 			}
 
-			# Create table
+			// Create table
 			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_ALBUMS));
 			if (!$connection->query($query)) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
@@ -203,20 +203,20 @@ final class Database {
 
 		}
 
-		# Create photos
+		// Create photos
 		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS));
 		if (!$connection->query($exist)) {
 
-			# Read file
-			$file	= __DIR__ . '/../database/photos_table.sql';
-			$query	= @file_get_contents($file);
+			// Read file
+			$file  = __DIR__ . '/../database/photos_table.sql';
+			$query = @file_get_contents($file);
 
 			if (!isset($query)||$query===false) {
 				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_photos');
 				return false;
 			}
 
-			# Create table
+			// Create table
 			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_PHOTOS));
 			if (!$connection->query($query)) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
@@ -231,21 +231,21 @@ final class Database {
 
 	private static function update($connection, $dbName) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($connection, $dbName), __METHOD__);
 
-		# Get current version
-		$query		= self::prepare($connection, "SELECT * FROM ? WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS));
-		$results	= $connection->query($query);
-		$current	= $results->fetch_object()->value;
+		// Get current version
+		$query   = self::prepare($connection, "SELECT * FROM ? WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS));
+		$results = $connection->query($query);
+		$current = $results->fetch_object()->value;
 
-		# For each update
+		// For each update
 		foreach (self::$versions as $version) {
 
-			# Only update when newer version available
+			// Only update when newer version available
 			if ($version<=$current) continue;
 
-			# Load update
+			// Load update
 			include(__DIR__ . '/../database/update_' . $version . '.php');
 
 		}
@@ -256,10 +256,10 @@ final class Database {
 
 	public static function setVersion($connection, $version) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($connection), __METHOD__);
 
-		$query	= self::prepare($connection, "UPDATE ? SET value = '?' WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS, $version));
+		$query  = self::prepare($connection, "UPDATE ? SET value = '?' WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS, $version));
 		$result = $connection->query($query);
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, 'Could not update database (' . $connection->error . ')');
@@ -270,62 +270,62 @@ final class Database {
 
 	public static function prepare($connection, $query, array $data) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($connection, $query), __METHOD__);
 
-		# Count the number of placeholders and compare it with the number of arguments
-		# If it doesn't match, calculate the difference and skip this number of placeholders before starting the replacement
-		# This avoids problems with placeholders in user-input
-		# $skip = Number of placeholders which need to be skipped
-		$skip	= 0;
-		$temp   = '';
-		$num	= array(
-			'placeholder'	=> substr_count($query, '?'),
-			'data'			=> count($data)
+		// Count the number of placeholders and compare it with the number of arguments
+		// If it doesn't match, calculate the difference and skip this number of placeholders before starting the replacement
+		// This avoids problems with placeholders in user-input
+		// $skip = Number of placeholders which need to be skipped
+		$skip = 0;
+		$temp = '';
+		$num  = array(
+			'placeholder' => substr_count($query, '?'),
+			'data'        => count($data)
 		);
 
 		if (($num['data']-$num['placeholder'])<0) Log::notice(__METHOD__, __LINE__, 'Could not completely prepare query. Query has more placeholders than values.');
 
 		foreach ($data as $value) {
 
-			# Escape
+			// Escape
 			$value = mysqli_real_escape_string($connection, $value);
 
-			# Recalculate number of placeholders
+			// Recalculate number of placeholders
 			$num['placeholder'] = substr_count($query, '?');
 
-			# Calculate number of skips
+			// Calculate number of skips
 			if ($num['placeholder']>$num['data']) $skip = $num['placeholder'] - $num['data'];
 
 			if ($skip>0) {
 
-				# Need to skip $skip placeholders, because the user input contained placeholders
-				# Calculate a substring which does not contain the user placeholders
-				# 1 or -1 is the length of the placeholder (placeholder = ?)
+				// Need to skip $skip placeholders, because the user input contained placeholders
+				// Calculate a substring which does not contain the user placeholders
+				// 1 or -1 is the length of the placeholder (placeholder = ?)
 
 				$pos = -1;
 				for ($i=$skip; $i>0; $i--) $pos = strpos($query, '?', $pos + 1);
 				$pos++;
 
-				$temp	= substr($query, 0, $pos); # First part of $query
-				$query	= substr($query, $pos); # Last part of $query
+				$temp  = substr($query, 0, $pos); // First part of $query
+				$query = substr($query, $pos); // Last part of $query
 
 			}
 
-			# Replace
+			// Replace
 			$query = preg_replace('/\?/', $value, $query, 1);
 
 			if ($skip>0) {
 
-				# Reassemble the parts of $query
+				// Reassemble the parts of $query
 				$query = $temp . $query;
 
 			}
 
-			# Reset skip
+			// Reset skip
 			$skip = 0;
 
-			# Decrease number of data elements
+			// Decrease number of data elements
 			$num['data']--;
 
 		}
diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index dcc3041..886e83b 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -6,20 +6,20 @@ final class Import {
 
 	private function photo($path, $albumID = 0, $description = '', $tags = '') {
 
-		# No need to validate photo type and extension in this function.
-		# $photo->add will take care of it.
+		// No need to validate photo type and extension in this function.
+		// $photo->add will take care of it.
 
-		$info	= getimagesize($path);
-		$size	= filesize($path);
-		$photo	= new Photo(null);
+		$info  = getimagesize($path);
+		$size  = filesize($path);
+		$photo = new Photo(null);
 
-		$nameFile					= array(array());
-		$nameFile[0]['name']		= $path;
-		$nameFile[0]['type']		= $info['mime'];
-		$nameFile[0]['tmp_name']	= $path;
-		$nameFile[0]['error']		= 0;
-		$nameFile[0]['size']		= $size;
-		$nameFile[0]['error']		= UPLOAD_ERR_OK;
+		$nameFile                = array(array());
+		$nameFile[0]['name']     = $path;
+		$nameFile[0]['type']     = $info['mime'];
+		$nameFile[0]['tmp_name'] = $path;
+		$nameFile[0]['error']    = 0;
+		$nameFile[0]['size']     = $size;
+		$nameFile[0]['error']    = UPLOAD_ERR_OK;
 
 		if (!$photo->add($nameFile, $albumID, $description, $tags, true)) return false;
 		return true;
@@ -28,21 +28,21 @@ final class Import {
 
 	public function url($urls, $albumID = 0) {
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		$error = false;
 
-		# Parse URLs
+		// Parse URLs
 		$urls = str_replace(' ', '%20', $urls);
 		$urls = explode(',', $urls);
 
 		foreach ($urls as &$url) {
 
-			# Validate photo type and extension even when $this->photo (=> $photo->add) will do the same.
-			# This prevents us from downloading invalid photos.
+			// Validate photo type and extension even when $this->photo (=> $photo->add) will do the same.
+			// This prevents us from downloading invalid photos.
 
-			# Verify extension
+			// Verify extension
 			$extension = getExtension($url);
 			if (!in_array(strtolower($extension), Photo::$validExtensions, true)) {
 				$error = true;
@@ -50,7 +50,7 @@ final class Import {
 				continue;
 			}
 
-			# Verify image
+			// Verify image
 			$type = @exif_imagetype($url);
 			if (!in_array($type, Photo::$validTypes, true)) {
 				$error = true;
@@ -58,9 +58,9 @@ final class Import {
 				continue;
 			}
 
-			$pathinfo	= pathinfo($url);
-			$filename	= $pathinfo['filename'] . '.' . $pathinfo['extension'];
-			$tmp_name	= LYCHEE_DATA . $filename;
+			$pathinfo = pathinfo($url);
+			$filename = $pathinfo['filename'] . '.' . $pathinfo['extension'];
+			$tmp_name = LYCHEE_DATA . $filename;
 
 			if (@copy($url, $tmp_name)===false) {
 				$error = true;
@@ -68,7 +68,7 @@ final class Import {
 				continue;
 			}
 
-			# Import photo
+			// Import photo
 			if (!$this->photo($tmp_name, $albumID)) {
 				$error = true;
 				Log::error(__METHOD__, __LINE__, 'Could not import file: ' . $tmp_name);
@@ -77,7 +77,7 @@ final class Import {
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($error===false) return true;
@@ -87,16 +87,16 @@ final class Import {
 
 	public function server($path, $albumID = 0) {
 
-		# Parse path
-		if (!isset($path))				$path = LYCHEE_UPLOADS_IMPORT;
-		if (substr($path, -1)==='/')	$path = substr($path, 0, -1);
+		// Parse path
+		if (!isset($path))           $path = LYCHEE_UPLOADS_IMPORT;
+		if (substr($path, -1)==='/') $path = substr($path, 0, -1);
 
 		if (is_dir($path)===false) {
 			Log::error(__METHOD__, __LINE__, 'Given path is not a directory (' . $path . ')');
 			return 'Error: Given path is not a directory!';
 		}
 
-		# Skip folders of Lychee
+		// Skip folders of Lychee
 		if ($path===LYCHEE_UPLOADS_BIG||($path . '/')===LYCHEE_UPLOADS_BIG||
 			$path===LYCHEE_UPLOADS_MEDIUM||($path . '/')===LYCHEE_UPLOADS_MEDIUM||
 			$path===LYCHEE_UPLOADS_THUMB||($path . '/')===LYCHEE_UPLOADS_THUMB) {
@@ -104,22 +104,22 @@ final class Import {
 				return 'Error: Given path is a reserved path of Lychee!';
 		}
 
-		$error				= false;
-		$contains['photos']	= false;
-		$contains['albums']	= false;
+		$error              = false;
+		$contains['photos'] = false;
+		$contains['albums'] = false;
 
-		# Call plugins
-		# Note that updated albumId and path explicitly passed, rather
-		# than using func_get_args() which will only return original ones
+		// Call plugins
+		// Note that updated albumId and path explicitly passed, rather
+		// than using func_get_args() which will only return original ones
 		Plugins::get()->activate(__METHOD__, 0, array($albumID, $path));
 
-		# Get all files
+		// Get all files
 		$files = glob($path . '/*');
 
 		foreach ($files as $file) {
 
-			# It is possible to move a file because of directory permissions but
-			# the file may still be unreadable by the user
+			// It is possible to move a file because of directory permissions but
+			// the file may still be unreadable by the user
 			if (!is_readable($file)) {
 				$error = true;
 				Log::error(__METHOD__, __LINE__, 'Could not read file or directory: ' . $file);
@@ -128,7 +128,7 @@ final class Import {
 
 			if (@exif_imagetype($file)!==false) {
 
-				# Photo
+				// Photo
 
 				$contains['photos'] = true;
 
@@ -140,11 +140,11 @@ final class Import {
 
 			} else if (is_dir($file)) {
 
-				# Folder
+				// Folder
 
-				$album				= new Album(null);
-				$newAlbumID			= $album->add('[Import] ' . basename($file));
-				$contains['albums']	= true;
+				$album              = new Album(null);
+				$newAlbumID         = $album->add('[Import] ' . basename($file));
+				$contains['albums'] = true;
 
 				if ($newAlbumID===false) {
 					$error = true;
@@ -164,14 +164,14 @@ final class Import {
 
 		}
 
-		# Call plugins
-		# Note that updated albumId and path explicitly passed, rather
-		# than using func_get_args() which will only return original ones
+		// Call plugins
+		// Note that updated albumId and path explicitly passed, rather
+		// than using func_get_args() which will only return original ones
 		Plugins::get()->activate(__METHOD__, 1, array($albumID, $path));
 
-		# The following returns will be caught in the front-end
-		if ($contains['photos']===false&&$contains['albums']===false)	return 'Warning: Folder empty or no readable files to process!';
-		if ($contains['photos']===false&&$contains['albums']===true)	return 'Notice: Import only contained albums!';
+		// The following returns will be caught in the front-end
+		if ($contains['photos']===false&&$contains['albums']===false) return 'Warning: Folder empty or no readable files to process!';
+		if ($contains['photos']===false&&$contains['albums']===true)  return 'Notice: Import only contained albums!';
 
 		if ($error===true) return false;
 		return true;
diff --git a/php/Modules/Log.php b/php/Modules/Log.php
index 44e9696..de49453 100644
--- a/php/Modules/Log.php
+++ b/php/Modules/Log.php
@@ -24,15 +24,15 @@ final class Log {
 
 	private static function text($type, $function, $line, $text = '') {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($type, $function, $line, $text), __METHOD__);
 
-		# Get time
+		// Get time
 		$sysstamp = time();
 
-		# Save in database
-		$query	= Database::prepare(Database::get(), "INSERT INTO ? (time, type, function, line, text) VALUES ('?', '?', '?', '?', '?')", array(LYCHEE_TABLE_LOG, $sysstamp, $type, $function, $line, $text));
-		$result	= Database::get()->query($query);
+		// Save in database
+		$query  = Database::prepare(Database::get(), "INSERT INTO ? (time, type, function, line, text) VALUES ('?', '?', '?', '?', '?')", array(LYCHEE_TABLE_LOG, $sysstamp, $type, $function, $line, $text));
+		$result = Database::get()->query($query);
 
 		if (!$result) return false;
 		return true;
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 4a069a9..039fe79 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -21,8 +21,8 @@ final class Photo {
 
 	public function __construct($photoIDs) {
 
-		# Init vars
-		$this->photoIDs	= $photoIDs;
+		// Init vars
+		$this->photoIDs = $photoIDs;
 
 		return true;
 
@@ -30,10 +30,10 @@ final class Photo {
 
 	public function add(array $files, $albumID = 0, $description = '', $tags = '', $returnOnError = false) {
 
-		# Use $returnOnError if you want to handle errors by your own
-		# e.g. when calling this functions inside an if-condition
+		// Use $returnOnError if you want to handle errors by your own
+		// e.g. when calling this functions inside an if-condition
 
-		# Check permissions
+		// Check permissions
 		if (hasPermissions(LYCHEE_UPLOADS)===false||
 			hasPermissions(LYCHEE_UPLOADS_BIG)===false||
 			hasPermissions(LYCHEE_UPLOADS_THUMB)===false) {
@@ -41,77 +41,77 @@ final class Photo {
 				exit('Error: An upload-folder is missing or not readable and writable!');
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		switch($albumID) {
 
 			case 's':
-				# s for public (share)
-				$public		= 1;
-				$star		= 0;
-				$albumID	= 0;
+				// s for public (share)
+				$public  = 1;
+				$star    = 0;
+				$albumID = 0;
 				break;
 
 			case 'f':
-				# f for starred (fav)
-				$star		= 1;
-				$public		= 0;
-				$albumID	= 0;
+				// f for starred (fav)
+				$star    = 1;
+				$public  = 0;
+				$albumID = 0;
 				break;
 
 			case 'r':
-				# r for recent
-				$public		= 0;
-				$star		= 0;
-				$albumID	= 0;
+				// r for recent
+				$public  = 0;
+				$star    = 0;
+				$albumID = 0;
 				break;
 
 			default:
-				$star		= 0;
-				$public		= 0;
+				$star   = 0;
+				$public = 0;
 				break;
 
 		}
 
 		foreach ($files as $file) {
 
-			# Check if file exceeds the upload_max_filesize directive
+			// Check if file exceeds the upload_max_filesize directive
 			if ($file['error']===UPLOAD_ERR_INI_SIZE) {
 				Log::error(__METHOD__, __LINE__, 'The uploaded file exceeds the upload_max_filesize directive in php.ini');
 				if ($returnOnError===true) return false;
 				exit('Error: The uploaded file exceeds the upload_max_filesize directive in php.ini!');
 			}
 
-			# Check if file was only partially uploaded
+			// Check if file was only partially uploaded
 			if ($file['error']===UPLOAD_ERR_PARTIAL) {
 				Log::error(__METHOD__, __LINE__, 'The uploaded file was only partially uploaded');
 				if ($returnOnError===true) return false;
 				exit('Error: The uploaded file was only partially uploaded!');
 			}
 
-			# Check if writing file to disk failed
+			// Check if writing file to disk failed
 			if ($file['error']===UPLOAD_ERR_CANT_WRITE) {
 				Log::error(__METHOD__, __LINE__, 'Failed to write photo to disk');
 				if ($returnOnError===true) return false;
 				exit('Error: Failed to write photo to disk!');
 			}
 
-			# Check if a extension stopped the file upload
+			// Check if a extension stopped the file upload
 			if ($file['error']===UPLOAD_ERR_EXTENSION) {
 				Log::error(__METHOD__, __LINE__, 'A PHP extension stopped the file upload');
 				if ($returnOnError===true) return false;
 				exit('Error: A PHP extension stopped the file upload!');
 			}
 
-			# Check if the upload was successful
+			// Check if the upload was successful
 			if ($file['error']!==UPLOAD_ERR_OK) {
 				Log::error(__METHOD__, __LINE__, 'Upload contains an error (' . $file['error'] . ')');
 				if ($returnOnError===true) return false;
 				exit('Error: Upload failed!');
 			}
 
-			# Verify extension
+			// Verify extension
 			$extension = getExtension($file['name']);
 			if (!in_array(strtolower($extension), self::$validExtensions, true)) {
 				Log::error(__METHOD__, __LINE__, 'Photo format not supported');
@@ -119,7 +119,7 @@ final class Photo {
 				exit('Error: Photo format not supported!');
 			}
 
-			# Verify image
+			// Verify image
 			$type = @exif_imagetype($file['tmp_name']);
 			if (!in_array($type, self::$validTypes, true)) {
 				Log::error(__METHOD__, __LINE__, 'Photo type not supported');
@@ -127,16 +127,16 @@ final class Photo {
 				exit('Error: Photo type not supported!');
 			}
 
-			# Generate id
+			// Generate id
 			$id = str_replace('.', '', microtime(true));
 			while(strlen($id)<14) $id .= 0;
 
-			# Set paths
-			$tmp_name	= $file['tmp_name'];
-			$photo_name	= md5($id) . $extension;
-			$path		= LYCHEE_UPLOADS_BIG . $photo_name;
+			// Set paths
+			$tmp_name   = $file['tmp_name'];
+			$photo_name = md5($id) . $extension;
+			$path       = LYCHEE_UPLOADS_BIG . $photo_name;
 
-			# Calculate checksum
+			// Calculate checksum
 			$checksum = sha1_file($tmp_name);
 			if ($checksum===false) {
 				Log::error(__METHOD__, __LINE__, 'Could not calculate checksum for photo');
@@ -144,29 +144,29 @@ final class Photo {
 				exit('Error: Could not calculate checksum for photo!');
 			}
 
-			# Check if image exists based on checksum
+			// Check if image exists based on checksum
 			if ($checksum===false) {
 
-				$checksum	= '';
-				$exists		= false;
+				$checksum = '';
+				$exists   = false;
 
 			} else {
 
 				$exists = $this->exists($checksum);
 
 				if ($exists!==false) {
-					$photo_name	= $exists['photo_name'];
-					$path		= $exists['path'];
-					$path_thumb	= $exists['path_thumb'];
-					$medium		= ($exists['medium']==='1' ? 1 : 0);
-					$exists		= true;
+					$photo_name = $exists['photo_name'];
+					$path       = $exists['path'];
+					$path_thumb = $exists['path_thumb'];
+					$medium     = ($exists['medium']==='1' ? 1 : 0);
+					$exists     = true;
 				}
 
 			}
 
 			if ($exists===false) {
 
-				# Import if not uploaded via web
+				// Import if not uploaded via web
 				if (!is_uploaded_file($tmp_name)) {
 					if (!@copy($tmp_name, $path)) {
 						Log::error(__METHOD__, __LINE__, 'Could not copy photo to uploads');
@@ -183,8 +183,8 @@ final class Photo {
 
 			} else {
 
-				# Photo already exists
-				# Check if the user wants to skip duplicates
+				// Photo already exists
+				// Check if the user wants to skip duplicates
 				if (Settings::get()['skipDuplicates']==='1') {
 					Log::notice(__METHOD__, __LINE__, 'Skipped upload of existing photo because skipDuplicates is activated');
 					if ($returnOnError===true) return false;
@@ -193,46 +193,46 @@ final class Photo {
 
 			}
 
-			# Read infos
+			// Read infos
 			$info = $this->getInfo($path);
 
-			# Use title of file if IPTC title missing
+			// Use title of file if IPTC title missing
 			if ($info['title']==='') $info['title'] = substr(basename($file['name'], $extension), 0, 30);
 
-			# Use description parameter if set
+			// Use description parameter if set
 			if ($description==='') $description = $info['description'];
 
 			if ($exists===false) {
 
-				# Set orientation based on EXIF data
+				// Set orientation based on EXIF data
 				if ($file['type']==='image/jpeg'&&isset($info['orientation'])&&$info['orientation']!=='') {
 					$adjustFile = $this->adjustFile($path, $info);
 					if ($adjustFile!==false) $info = $adjustFile;
 					else Log::notice(__METHOD__, __LINE__, 'Skipped adjustment of photo (' . $info['title'] . ')');
 				}
 
-				# Set original date
+				// Set original date
 				if ($info['takestamp']!==''&&$info['takestamp']!==0) @touch($path, $info['takestamp']);
 
-				# Create Thumb
+				// Create Thumb
 				if (!$this->createThumb($path, $photo_name, $info['type'], $info['width'], $info['height'])) {
 					Log::error(__METHOD__, __LINE__, 'Could not create thumbnail for photo');
 					if ($returnOnError===true) return false;
 					exit('Error: Could not create thumbnail for photo!');
 				}
 
-				# Create Medium
+				// Create Medium
 				if ($this->createMedium($path, $photo_name, $info['width'], $info['height'])) $medium = 1;
 				else $medium = 0;
 
-				# Set thumb url
+				// Set thumb url
 				$path_thumb = md5($id) . '.jpeg';
 
 			}
 
-			# Save to DB
-			$values	= array(LYCHEE_TABLE_PHOTOS, $id, $info['title'], $photo_name, $description, $tags, $info['type'], $info['width'], $info['height'], $info['size'], $info['iso'], $info['aperture'], $info['make'], $info['model'], $info['shutter'], $info['focal'], $info['takestamp'], $path_thumb, $albumID, $public, $star, $checksum, $medium);
-			$query	= Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum, medium) VALUES ('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?')", $values);
+			// Save to DB
+			$values = array(LYCHEE_TABLE_PHOTOS, $id, $info['title'], $photo_name, $description, $tags, $info['type'], $info['width'], $info['height'], $info['size'], $info['iso'], $info['aperture'], $info['make'], $info['model'], $info['shutter'], $info['focal'], $info['takestamp'], $path_thumb, $albumID, $public, $star, $checksum, $medium);
+			$query  = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum, medium) VALUES ('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?')", $values);
 			$result = Database::get()->query($query);
 
 			if (!$result) {
@@ -243,7 +243,7 @@ final class Photo {
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
@@ -252,11 +252,11 @@ final class Photo {
 
 	private function exists($checksum, $photoID = null) {
 
-		# Exclude $photoID from select when $photoID is set
+		// Exclude $photoID from select when $photoID is set
 		if (isset($photoID)) $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' AND id <> '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum, $photoID));
 		else $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum));
 
-		$result	= Database::get()->query($query);
+		$result = Database::get()->query($query);
 
 		if (!$result) {
 			Log::error(__METHOD__, __LINE__, 'Could not check for existing photos with the same checksum');
@@ -268,10 +268,10 @@ final class Photo {
 			$result = $result->fetch_object();
 
 			$return = array(
-				'photo_name'	=> $result->url,
-				'path'			=> LYCHEE_UPLOADS_BIG . $result->url,
-				'path_thumb'	=> $result->thumbUrl,
-				'medium'		=> $result->medium
+				'photo_name' => $result->url,
+				'path'       => LYCHEE_UPLOADS_BIG . $result->url,
+				'path_thumb' => $result->thumbUrl,
+				'medium'     => $result->medium
 			);
 
 			return $return;
@@ -284,36 +284,36 @@ final class Photo {
 
 	private function createThumb($url, $filename, $type, $width, $height) {
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Size of the thumbnail
-		$newWidth	= 200;
-		$newHeight	= 200;
+		// Size of the thumbnail
+		$newWidth  = 200;
+		$newHeight = 200;
 
-		$photoName	= explode('.', $filename);
-		$newUrl		= LYCHEE_UPLOADS_THUMB . $photoName[0] . '.jpeg';
-		$newUrl2x	= LYCHEE_UPLOADS_THUMB . $photoName[0] . '@2x.jpeg';
+		$photoName = explode('.', $filename);
+		$newUrl    = LYCHEE_UPLOADS_THUMB . $photoName[0] . '.jpeg';
+		$newUrl2x  = LYCHEE_UPLOADS_THUMB . $photoName[0] . '@2x.jpeg';
 
-		# Create thumbnails with Imagick
+		// Create thumbnails with Imagick
 		if(extension_loaded('imagick')&&Settings::get()['imagick']==='1') {
 
-			# Read image
+			// Read image
 			$thumb = new Imagick();
 			$thumb->readImage($url);
 			$thumb->setImageCompressionQuality(Settings::get()['thumbQuality']);
 			$thumb->setImageFormat('jpeg');
 
-			# Copy image for 2nd thumb version
+			// Copy image for 2nd thumb version
 			$thumb2x = clone $thumb;
 
-			# Create 1st version
+			// Create 1st version
 			$thumb->cropThumbnailImage($newWidth, $newHeight);
 			$thumb->writeImage($newUrl);
 			$thumb->clear();
 			$thumb->destroy();
 
-			# Create 2nd version
+			// Create 2nd version
 			$thumb2x->cropThumbnailImage($newWidth*2, $newHeight*2);
 			$thumb2x->writeImage($newUrl2x);
 			$thumb2x->clear();
@@ -321,47 +321,47 @@ final class Photo {
 
 		} else {
 
-			# Create image
-			$thumb		= imagecreatetruecolor($newWidth, $newHeight);
-			$thumb2x	= imagecreatetruecolor($newWidth*2, $newHeight*2);
+			// Create image
+			$thumb   = imagecreatetruecolor($newWidth, $newHeight);
+			$thumb2x = imagecreatetruecolor($newWidth*2, $newHeight*2);
 
-			# Set position
+			// Set position
 			if ($width<$height) {
-				$newSize		= $width;
-				$startWidth		= 0;
-				$startHeight	= $height/2 - $width/2;
+				$newSize     = $width;
+				$startWidth  = 0;
+				$startHeight = $height/2 - $width/2;
 			} else {
-				$newSize		= $height;
-				$startWidth		= $width/2 - $height/2;
-				$startHeight	= 0;
+				$newSize     = $height;
+				$startWidth  = $width/2 - $height/2;
+				$startHeight = 0;
 			}
 
-			# Create new image
+			// Create new image
 			switch($type) {
-				case 'image/jpeg':	$sourceImg = imagecreatefromjpeg($url); break;
-				case 'image/png':	$sourceImg = imagecreatefrompng($url); break;
-				case 'image/gif':	$sourceImg = imagecreatefromgif($url); break;
-				default:			Log::error(__METHOD__, __LINE__, 'Type of photo is not supported');
-									return false;
-									break;
+				case 'image/jpeg': $sourceImg = imagecreatefromjpeg($url); break;
+				case 'image/png':  $sourceImg = imagecreatefrompng($url); break;
+				case 'image/gif':  $sourceImg = imagecreatefromgif($url); break;
+				default:           Log::error(__METHOD__, __LINE__, 'Type of photo is not supported');
+				                   return false;
+				                   break;
 			}
 
-			# Create thumb
+			// Create thumb
 			fastImageCopyResampled($thumb, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth, $newHeight, $newSize, $newSize);
 			imagejpeg($thumb, $newUrl, Settings::get()['thumbQuality']);
 			imagedestroy($thumb);
 
-			# Create retina thumb
+			// Create retina thumb
 			fastImageCopyResampled($thumb2x, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth*2, $newHeight*2, $newSize, $newSize);
 			imagejpeg($thumb2x, $newUrl2x, Settings::get()['thumbQuality']);
 			imagedestroy($thumb2x);
 
-			# Free memory
+			// Free memory
 			imagedestroy($sourceImg);
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
@@ -370,40 +370,40 @@ final class Photo {
 
 	private function createMedium($url, $filename, $width, $height) {
 
-		# Function creates a smaller version of a photo when its size is bigger than a preset size
-		# Excepts the following:
-		# (string) $url = Path to the photo-file
-		# (string) $filename = Name of the photo-file
-		# (int) $width = Width of the photo
-		# (int) $height = Height of the photo
-		# Returns the following
-		# (boolean) true = Success
-		# (boolean) false = Failure
+		// Function creates a smaller version of a photo when its size is bigger than a preset size
+		// Excepts the following:
+		// (string) $url = Path to the photo-file
+		// (string) $filename = Name of the photo-file
+		// (int) $width = Width of the photo
+		// (int) $height = Height of the photo
+		// Returns the following
+		// (boolean) true = Success
+		// (boolean) false = Failure
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Set to true when creation of medium-photo failed
+		// Set to true when creation of medium-photo failed
 		$error = false;
 
-		# Size of the medium-photo
-		# When changing these values,
-		# also change the size detection in the front-end
-		$newWidth	= 1920;
-		$newHeight	= 1080;
+		// Size of the medium-photo
+		// When changing these values,
+		// also change the size detection in the front-end
+		$newWidth  = 1920;
+		$newHeight = 1080;
 
-		# Check permissions
+		// Check permissions
 		if (hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false) {
 
-			# Permissions are missing
+			// Permissions are missing
 			Log::notice(__METHOD__, __LINE__, 'Skipped creation of medium-photo, because uploads/medium/ is missing or not readable and writable.');
 			$error = true;
 
 		}
 
-		# Is photo big enough?
-		# Is medium activated?
-		# Is Imagick installed and activated?
+		// Is photo big enough?
+		// Is medium activated?
+		// Is Imagick installed and activated?
 		if (($error===false)&&
 			($width>$newWidth||$height>$newHeight)&&
 			(Settings::get()['medium']==='1')&&
@@ -411,14 +411,14 @@ final class Photo {
 
 			$newUrl = LYCHEE_UPLOADS_MEDIUM . $filename;
 
-			# Read image
+			// Read image
 			$medium = new Imagick();
 			$medium->readImage($url);
 
-			# Adjust image
+			// Adjust image
 			$medium->scaleImage($newWidth, $newHeight, true);
 
-			# Save image
+			// Save image
 			try { $medium->writeImage($newUrl); }
 			catch (ImagickException $err) {
 				Log::notice(__METHOD__, __LINE__, 'Could not save medium-photo: ' . $err->getMessage());
@@ -430,14 +430,14 @@ final class Photo {
 
 		} else {
 
-			# Photo too small or
-			# Medium is deactivated or
-			# Imagick not installed
+			// Photo too small or
+			// Medium is deactivated or
+			// Imagick not installed
 			$error = true;
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($error===true) return false;
@@ -447,15 +447,15 @@ final class Photo {
 
 	public function adjustFile($path, array $info) {
 
-		# Function rotates and flips a photo based on its EXIF orientation
-		# Excepts the following:
-		# (string) $path = Path to the photo-file
-		# (array) $info = ['orientation', 'width', 'height']
-		# Returns the following
-		# (array) $info = ['orientation', 'width', 'height'] = Success
-		# (boolean) false = Failure
+		// Function rotates and flips a photo based on its EXIF orientation
+		// Excepts the following:
+		// (string) $path = Path to the photo-file
+		// (array) $info = ['orientation', 'width', 'height']
+		// Returns the following
+		// (array) $info = ['orientation', 'width', 'height'] = Success
+		// (boolean) false = Failure
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		$swapSize = false;
@@ -469,13 +469,13 @@ final class Photo {
 					break;
 
 				case 6:
-					$rotateImage	= 90;
-					$swapSize		= true;
+					$rotateImage = 90;
+					$swapSize    = true;
 					break;
 
 				case 8:
-					$rotateImage	= 270;
-					$swapSize		= true;
+					$rotateImage = 270;
+					$swapSize    = true;
 					break;
 
 				default:
@@ -496,52 +496,52 @@ final class Photo {
 
 		} else {
 
-			$newWidth	= $info['width'];
-			$newHeight	= $info['height'];
-			$sourceImg	= imagecreatefromjpeg($path);
+			$newWidth  = $info['width'];
+			$newHeight = $info['height'];
+			$sourceImg = imagecreatefromjpeg($path);
 
 			switch ($info['orientation']) {
 
 				case 2:
-					# mirror
-					# not yet implemented
+					// mirror
+					// not yet implemented
 					return false;
 					break;
 
 				case 3:
-					$sourceImg	= imagerotate($sourceImg, -180, 0);
+					$sourceImg = imagerotate($sourceImg, -180, 0);
 					break;
 
 				case 4:
-					# rotate 180 and mirror
-					# not yet implemented
+					// rotate 180 and mirror
+					// not yet implemented
 					return false;
 					break;
 
 				case 5:
-					# rotate 90 and mirror
-					# not yet implemented
+					// rotate 90 and mirror
+					// not yet implemented
 					return false;
 					break;
 
 				case 6:
-					$sourceImg	= imagerotate($sourceImg, -90, 0);
-					$newWidth	= $info['height'];
-					$newHeight	= $info['width'];
-					$swapSize	= true;
+					$sourceImg = imagerotate($sourceImg, -90, 0);
+					$newWidth  = $info['height'];
+					$newHeight = $info['width'];
+					$swapSize  = true;
 					break;
 
 				case 7:
-					# rotate -90 and mirror
-					# not yet implemented
+					// rotate -90 and mirror
+					// not yet implemented
 					return false;
 					break;
 
 				case 8:
-					$sourceImg	= imagerotate($sourceImg, 90, 0);
-					$newWidth	= $info['height'];
-					$newHeight	= $info['width'];
-					$swapSize	= true;
+					$sourceImg = imagerotate($sourceImg, 90, 0);
+					$newWidth  = $info['height'];
+					$newHeight = $info['width'];
+					$swapSize  = true;
 					break;
 
 				default:
@@ -550,26 +550,26 @@ final class Photo {
 
 			}
 
-			# Recreate photo
+			// Recreate photo
 			$newSourceImg = imagecreatetruecolor($newWidth, $newHeight);
 			imagecopyresampled($newSourceImg, $sourceImg, 0, 0, 0, 0, $newWidth, $newHeight, $newWidth, $newHeight);
 			imagejpeg($newSourceImg, $path, 100);
 
-			# Free memory
+			// Free memory
 			imagedestroy($sourceImg);
 			imagedestroy($newSourceImg);
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		# SwapSize should be true when the image has been rotated
-		# Return new dimensions in this case
+		// SwapSize should be true when the image has been rotated
+		// Return new dimensions in this case
 		if ($swapSize===true) {
-			$swapSize		= $info['width'];
-			$info['width']	= $info['height'];
-			$info['height']	= $swapSize;
+			$swapSize       = $info['width'];
+			$info['width']  = $info['height'];
+			$info['height'] = $swapSize;
 		}
 
 		return $info;
@@ -578,39 +578,39 @@ final class Photo {
 
 	public static function prepareData(array $data) {
 
-		# Function turns photo-attributes into a front-end friendly format. Note that some attributes remain unchanged.
-		# Excepts the following:
-		# (array) $data = ['id', 'title', 'tags', 'public', 'star', 'album', 'thumbUrl', 'takestamp', 'url']
-		# Returns the following:
-		# (array) $photo
+		// Function turns photo-attributes into a front-end friendly format. Note that some attributes remain unchanged.
+		// Excepts the following:
+		// (array) $data = ['id', 'title', 'tags', 'public', 'star', 'album', 'thumbUrl', 'takestamp', 'url']
+		// Returns the following:
+		// (array) $photo
 
-		# Init
+		// Init
 		$photo = null;
 
-		# Set unchanged attributes
-		$photo['id']		= $data['id'];
-		$photo['title']		= $data['title'];
-		$photo['tags']		= $data['tags'];
-		$photo['public']	= $data['public'];
-		$photo['star']		= $data['star'];
-		$photo['album']		= $data['album'];
+		// Set unchanged attributes
+		$photo['id']     = $data['id'];
+		$photo['title']  = $data['title'];
+		$photo['tags']   = $data['tags'];
+		$photo['public'] = $data['public'];
+		$photo['star']   = $data['star'];
+		$photo['album']  = $data['album'];
 
-		# Parse urls
-		$photo['thumbUrl']	= LYCHEE_URL_UPLOADS_THUMB . $data['thumbUrl'];
-		$photo['url']		= LYCHEE_URL_UPLOADS_BIG . $data['url'];
+		// Parse urls
+		$photo['thumbUrl'] = LYCHEE_URL_UPLOADS_THUMB . $data['thumbUrl'];
+		$photo['url']      = LYCHEE_URL_UPLOADS_BIG . $data['url'];
 
-		# Use takestamp as sysdate when possible
+		// Use takestamp as sysdate when possible
 		if (isset($data['takestamp'])&&$data['takestamp']!=='0') {
 
-			# Use takestamp
-			$photo['cameraDate']	= '1';
-			$photo['sysdate']		= date('d F Y', $data['takestamp']);
+			// Use takestamp
+			$photo['cameraDate'] = '1';
+			$photo['sysdate']    = date('d F Y', $data['takestamp']);
 
 		} else {
 
-			# Use sysstamp from the id
-			$photo['cameraDate']	= '0';
-			$photo['sysdate']		= date('d F Y', substr($data['id'], 0, -4));
+			// Use sysstamp from the id
+			$photo['cameraDate'] = '0';
+			$photo['sysdate']    = date('d F Y', substr($data['id'], 0, -4));
 
 		}
 
@@ -620,57 +620,57 @@ final class Photo {
 
 	public function get($albumID) {
 
-		# Functions returns data of a photo
-		# Excepts the following:
-		# (string) $albumID = Album which is currently visible to the user
-		# Returns the following:
-		# (array) $photo
+		// Functions returns data of a photo
+		// Excepts the following:
+		// (string) $albumID = Album which is currently visible to the user
+		// Returns the following:
+		// (array) $photo
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Get photo
-		$query	= Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= Database::get()->query($query);
-		$photo	= $photos->fetch_assoc();
+		// Get photo
+		$query  = Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos = Database::get()->query($query);
+		$photo  = $photos->fetch_assoc();
 
-		# Parse photo
+		// Parse photo
 		$photo['sysdate'] = date('d M. Y', substr($photo['id'], 0, -4));
 		if (strlen($photo['takestamp'])>1) $photo['takedate'] = date('d M. Y', $photo['takestamp']);
 
-		# Parse medium
-		if ($photo['medium']==='1')	$photo['medium'] = LYCHEE_URL_UPLOADS_MEDIUM . $photo['url'];
-		else						$photo['medium'] = '';
+		// Parse medium
+		if ($photo['medium']==='1') $photo['medium'] = LYCHEE_URL_UPLOADS_MEDIUM . $photo['url'];
+		else                        $photo['medium'] = '';
 
-		# Parse paths
-		$photo['url']		= LYCHEE_URL_UPLOADS_BIG . $photo['url'];
-		$photo['thumbUrl']	= LYCHEE_URL_UPLOADS_THUMB . $photo['thumbUrl'];
+		// Parse paths
+		$photo['url']      = LYCHEE_URL_UPLOADS_BIG . $photo['url'];
+		$photo['thumbUrl'] = LYCHEE_URL_UPLOADS_THUMB . $photo['thumbUrl'];
 
 		if ($albumID!='false') {
 
-			# Only show photo as public when parent album is public
-			# Check if parent album is not 'Unsorted'
+			// Only show photo as public when parent album is public
+			// Check if parent album is not 'Unsorted'
 			if ($photo['album']!=='0') {
 
-				# Get album
-				$query	= Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $photo['album']));
-				$albums	= Database::get()->query($query);
-				$album	= $albums->fetch_assoc();
+				// Get album
+				$query  = Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $photo['album']));
+				$albums = Database::get()->query($query);
+				$album  = $albums->fetch_assoc();
 
-				# Parse album
+				// Parse album
 				$photo['public'] = ($album['public']==='1' ? '2' : $photo['public']);
 
 			}
 
-			$photo['original_album']	= $photo['album'];
-			$photo['album']				= $albumID;
+			$photo['original_album'] = $photo['album'];
+			$photo['album']          = $albumID;
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $photo;
@@ -679,33 +679,33 @@ final class Photo {
 
 	public function getInfo($url) {
 
-		# Functions returns information and metadata of a photo
-		# Excepts the following:
-		# (string) $url = Path to photo-file
-		# Returns the following:
-		# (array) $return
+		// Functions returns information and metadata of a photo
+		// Excepts the following:
+		// (string) $url = Path to photo-file
+		// Returns the following:
+		// (array) $return
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		$iptcArray	= array();
-		$info		= getimagesize($url, $iptcArray);
+		$iptcArray = array();
+		$info      = getimagesize($url, $iptcArray);
 
-		# General information
-		$return['type']		= $info['mime'];
-		$return['width']	= $info[0];
-		$return['height']	= $info[1];
+		// General information
+		$return['type']   = $info['mime'];
+		$return['width']  = $info[0];
+		$return['height'] = $info[1];
 
-		# Size
+		// Size
 		$size = filesize($url)/1024;
 		if ($size>=1024) $return['size'] = round($size/1024, 1) . ' MB';
 		else $return['size'] = round($size, 1) . ' KB';
 
-		# IPTC Metadata Fallback
-		$return['title']		= '';
-		$return['description']	= '';
+		// IPTC Metadata Fallback
+		$return['title']       = '';
+		$return['description'] = '';
 
-		# IPTC Metadata
+		// IPTC Metadata
 		if(isset($iptcArray['APP13'])) {
 
 			$iptcInfo = iptcparse($iptcArray['APP13']);
@@ -724,21 +724,21 @@ final class Photo {
 
 		}
 
-		# EXIF Metadata Fallback
-		$return['orientation']	= '';
-		$return['iso']			= '';
-		$return['aperture']		= '';
-		$return['make']			= '';
-		$return['model']		= '';
-		$return['shutter']		= '';
-		$return['focal']		= '';
-		$return['takestamp']	= 0;
+		// EXIF Metadata Fallback
+		$return['orientation'] = '';
+		$return['iso']         = '';
+		$return['aperture']    = '';
+		$return['make']        = '';
+		$return['model']       = '';
+		$return['shutter']     = '';
+		$return['focal']       = '';
+		$return['takestamp']   = 0;
 
-		# Read EXIF
+		// Read EXIF
 		if ($info['mime']=='image/jpeg') $exif = @exif_read_data($url, 'EXIF', 0);
 		else $exif = false;
 
-		# EXIF Metadata
+		// EXIF Metadata
 		if ($exif!==false) {
 
 			if (isset($exif['Orientation'])) $return['orientation'] = $exif['Orientation'];
@@ -775,7 +775,7 @@ final class Photo {
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $return;
@@ -784,62 +784,62 @@ final class Photo {
 
 	public function getArchive() {
 
-		# Functions starts a download of a photo
-		# Returns the following:
-		# (boolean + output) true = Success
-		# (boolean) false = Failure
+		// Functions starts a download of a photo
+		// Returns the following:
+		// (boolean + output) true = Success
+		// (boolean) false = Failure
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Get photo
-		$query	= Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= Database::get()->query($query);
-		$photo	= $photos->fetch_object();
+		// Get photo
+		$query  = Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos = Database::get()->query($query);
+		$photo  = $photos->fetch_object();
 
-		# Error in database query
+		// Error in database query
 		if (!$photos) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
-		# Photo not found
+		// Photo not found
 		if ($photo===null) {
 			Log::error(__METHOD__, __LINE__, 'Album not found. Cannot start download.');
 			return false;
 		}
 
-		# Get extension
+		// Get extension
 		$extension = getExtension($photo->url);
 		if ($extension===false) {
 			Log::error(__METHOD__, __LINE__, 'Invalid photo extension');
 			return false;
 		}
 
-		# Illicit chars
-		$badChars =	array_merge(
-						array_map('chr', range(0,31)),
-						array("<", ">", ":", '"', "/", "\\", "|", "?", "*")
-					);
+		// Illicit chars
+		$badChars = array_merge(
+			array_map('chr', range(0,31)),
+			array("<", ">", ":", '"', "/", "\\", "|", "?", "*")
+		);
 
-		# Parse title
+		// Parse title
 		if ($photo->title=='') $photo->title = 'Untitled';
 
-		# Escape title
+		// Escape title
 		$photo->title = str_replace($badChars, '', $photo->title);
 
-		# Set headers
+		// Set headers
 		header("Content-Type: application/octet-stream");
 		header("Content-Disposition: attachment; filename=\"" . $photo->title . $extension . "\"");
 		header("Content-Length: " . filesize(LYCHEE_UPLOADS_BIG . $photo->url));
 
-		# Send file
+		// Send file
 		readfile(LYCHEE_UPLOADS_BIG . $photo->url);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
@@ -848,24 +848,24 @@ final class Photo {
 
 	public function setTitle($title) {
 
-		# Functions sets the title of a photo
-		# Excepts the following:
-		# (string) $title = Title with a maximum length of 50 chars
-		# Returns the following:
-		# (boolean) true = Success
-		# (boolean) false = Failure
+		// Functions sets the title of a photo
+		// Excepts the following:
+		// (string) $title = Title with a maximum length of 50 chars
+		// Returns the following:
+		// (boolean) true = Success
+		// (boolean) false = Failure
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Set title
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $title, $this->photoIDs));
-		$result	= Database::get()->query($query);
+		// Set title
+		$query  = Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $title, $this->photoIDs));
+		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -878,24 +878,24 @@ final class Photo {
 
 	public function setDescription($description) {
 
-		# Functions sets the description of a photo
-		# Excepts the following:
-		# (string) $description = Description with a maximum length of 1000 chars
-		# Returns the following:
-		# (boolean) true = Success
-		# (boolean) false = Failure
+		// Functions sets the description of a photo
+		// Excepts the following:
+		// (string) $description = Description with a maximum length of 1000 chars
+		// Returns the following:
+		// (boolean) true = Success
+		// (boolean) false = Failure
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Set description
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN ('?')", array(LYCHEE_TABLE_PHOTOS, $description, $this->photoIDs));
-		$result	= Database::get()->query($query);
+		// Set description
+		$query  = Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN ('?')", array(LYCHEE_TABLE_PHOTOS, $description, $this->photoIDs));
+		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -908,38 +908,38 @@ final class Photo {
 
 	public function setStar() {
 
-		# Functions stars a photo
-		# Returns the following:
-		# (boolean) true = Success
-		# (boolean) false = Failure
+		// Functions stars a photo
+		// Returns the following:
+		// (boolean) true = Success
+		// (boolean) false = Failure
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Init vars
-		$error	= false;
+		// Init vars
+		$error = false;
 
-		# Get photos
-		$query	= Database::prepare(Database::get(), "SELECT id, star FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= Database::get()->query($query);
+		// Get photos
+		$query  = Database::prepare(Database::get(), "SELECT id, star FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos = Database::get()->query($query);
 
-		# For each photo
+		// For each photo
 		while ($photo = $photos->fetch_object()) {
 
-			# Invert star
+			// Invert star
 			$star = ($photo->star==0 ? 1 : 0);
 
-			# Set star
-			$query	= Database::prepare(Database::get(), "UPDATE ? SET star = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $star, $photo->id));
-			$star	= Database::get()->query($query);
+			// Set star
+			$query = Database::prepare(Database::get(), "UPDATE ? SET star = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $star, $photo->id));
+			$star  = Database::get()->query($query);
 			if (!$star) $error = true;
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($error===true) {
@@ -952,78 +952,78 @@ final class Photo {
 
 	public function getPublic($password) {
 
-		# Functions checks if photo or parent album is public
-		# Returns the following:
-		# (int) 0 = Photo private and parent album private
-		# (int) 1 = Album public, but password incorrect
-		# (int) 2 = Photo public or album public and password correct
+		// Functions checks if photo or parent album is public
+		// Returns the following:
+		// (int) 0 = Photo private and parent album private
+		// (int) 1 = Album public, but password incorrect
+		// (int) 2 = Photo public or album public and password correct
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Get photo
-		$query	= Database::prepare(Database::get(), "SELECT public, album FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= Database::get()->query($query);
-		$photo	= $photos->fetch_object();
+		// Get photo
+		$query  = Database::prepare(Database::get(), "SELECT public, album FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos = Database::get()->query($query);
+		$photo  = $photos->fetch_object();
 
-		# Check if public
+		// Check if public
 		if ($photo->public==='1') {
 
-			# Photo public
+			// Photo public
 			return 2;
 
 		} else {
 
-			# Check if album public
-			$album	= new Album($photo->album);
-			$agP	= $album->getPublic();
-			$acP	= $album->checkPassword($password);
+			// Check if album public
+			$album = new Album($photo->album);
+			$agP   = $album->getPublic();
+			$acP   = $album->checkPassword($password);
 
-			# Album public and password correct
+			// Album public and password correct
 			if ($agP===true&&$acP===true) return 2;
 
-			# Album public, but password incorrect
+			// Album public, but password incorrect
 			if ($agP===true&&$acP===false) return 1;
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		# Photo private
+		// Photo private
 		return 0;
 
 	}
 
 	public function setPublic() {
 
-		# Functions toggles the public property of a photo
-		# Returns the following:
-		# (boolean) true = Success
-		# (boolean) false = Failure
+		// Functions toggles the public property of a photo
+		// Returns the following:
+		// (boolean) true = Success
+		// (boolean) false = Failure
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Get public
-		$query	= Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= Database::get()->query($query);
-		$photo	= $photos->fetch_object();
+		// Get public
+		$query  = Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos = Database::get()->query($query);
+		$photo  = $photos->fetch_object();
 
-		# Invert public
+		// Invert public
 		$public = ($photo->public==0 ? 1 : 0);
 
-		# Set public
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET public = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $public, $this->photoIDs));
-		$result	= Database::get()->query($query);
+		// Set public
+		$query  = Database::prepare(Database::get(), "UPDATE ? SET public = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $public, $this->photoIDs));
+		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -1036,22 +1036,22 @@ final class Photo {
 
 	function setAlbum($albumID) {
 
-		# Functions sets the parent album of a photo
-		# Returns the following:
-		# (boolean) true = Success
-		# (boolean) false = Failure
+		// Functions sets the parent album of a photo
+		// Returns the following:
+		// (boolean) true = Success
+		// (boolean) false = Failure
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Set album
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET album = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->photoIDs));
-		$result	= Database::get()->query($query);
+		// Set album
+		$query  = Database::prepare(Database::get(), "UPDATE ? SET album = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->photoIDs));
+		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -1064,28 +1064,28 @@ final class Photo {
 
 	public function setTags($tags) {
 
-		# Functions sets the tags of a photo
-		# Excepts the following:
-		# (string) $tags = Comma separated list of tags with a maximum length of 1000 chars
-		# Returns the following:
-		# (boolean) true = Success
-		# (boolean) false = Failure
+		// Functions sets the tags of a photo
+		// Excepts the following:
+		// (string) $tags = Comma separated list of tags with a maximum length of 1000 chars
+		// Returns the following:
+		// (boolean) true = Success
+		// (boolean) false = Failure
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Parse tags
+		// Parse tags
 		$tags = preg_replace('/(\ ,\ )|(\ ,)|(,\ )|(,{1,}\ {0,})|(,$|^,)/', ',', $tags);
 		$tags = preg_replace('/,$|^,|(\ ){0,}$/', '', $tags);
 
-		# Set tags
-		$query	= Database::prepare(Database::get(), "UPDATE ? SET tags = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $tags, $this->photoIDs));
-		$result	= Database::get()->query($query);
+		// Set tags
+		$query  = Database::prepare(Database::get(), "UPDATE ? SET tags = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $tags, $this->photoIDs));
+		$result = Database::get()->query($query);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if (!$result) {
@@ -1098,36 +1098,36 @@ final class Photo {
 
 	public function duplicate() {
 
-		# Functions duplicates a photo
-		# Returns the following:
-		# (boolean) true = Success
-		# (boolean) false = Failure
+		// Functions duplicates a photo
+		// Returns the following:
+		// (boolean) true = Success
+		// (boolean) false = Failure
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Get photos
-		$query	= Database::prepare(Database::get(), "SELECT id, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= Database::get()->query($query);
+		// Get photos
+		$query  = Database::prepare(Database::get(), "SELECT id, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos = Database::get()->query($query);
 		if (!$photos) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
-		# For each photo
+		// For each photo
 		while ($photo = $photos->fetch_object()) {
 
-			# Generate id
+			// Generate id
 			$id = str_replace('.', '', microtime(true));
 			while(strlen($id)<14) $id .= 0;
 
-			# Duplicate entry
-			$values		= array(LYCHEE_TABLE_PHOTOS, $id, LYCHEE_TABLE_PHOTOS, $photo->id);
-			$query		= Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum) SELECT '?' AS id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum FROM ? WHERE id = '?'", $values);
-			$duplicate	= Database::get()->query($query);
+			// Duplicate entry
+			$values    = array(LYCHEE_TABLE_PHOTOS, $id, LYCHEE_TABLE_PHOTOS, $photo->id);
+			$query     = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum) SELECT '?' AS id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum FROM ? WHERE id = '?'", $values);
+			$duplicate = Database::get()->query($query);
 			if (!$duplicate) {
 				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
@@ -1141,65 +1141,65 @@ final class Photo {
 
 	public function delete() {
 
-		# Functions deletes a photo with all its data and files
-		# Returns the following:
-		# (boolean) true = Success
-		# (boolean) false = Failure
+		// Functions deletes a photo with all its data and files
+		// Returns the following:
+		// (boolean) true = Success
+		// (boolean) false = Failure
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Get photos
-		$query	= Database::prepare(Database::get(), "SELECT id, url, thumbUrl, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos	= Database::get()->query($query);
+		// Get photos
+		$query  = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
+		$photos = Database::get()->query($query);
 		if (!$photos) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
-		# For each photo
+		// For each photo
 		while ($photo = $photos->fetch_object()) {
 
-			# Check if other photos are referring to this images
-			# If so, only delete the db entry
+			// Check if other photos are referring to this images
+			// If so, only delete the db entry
 			if ($this->exists($photo->checksum, $photo->id)===false) {
 
-				# Get retina thumb url
+				// Get retina thumb url
 				$thumbUrl2x = explode(".", $photo->thumbUrl);
 				$thumbUrl2x = $thumbUrl2x[0] . '@2x.' . $thumbUrl2x[1];
 
-				# Delete big
+				// Delete big
 				if (file_exists(LYCHEE_UPLOADS_BIG . $photo->url)&&!unlink(LYCHEE_UPLOADS_BIG . $photo->url)) {
 					Log::error(__METHOD__, __LINE__, 'Could not delete photo in uploads/big/');
 					return false;
 				}
 
-				# Delete medium
+				// Delete medium
 				if (file_exists(LYCHEE_UPLOADS_MEDIUM . $photo->url)&&!unlink(LYCHEE_UPLOADS_MEDIUM . $photo->url)) {
 					Log::error(__METHOD__, __LINE__, 'Could not delete photo in uploads/medium/');
 					return false;
 				}
 
-				# Delete thumb
+				// Delete thumb
 				if (file_exists(LYCHEE_UPLOADS_THUMB . $photo->thumbUrl)&&!unlink(LYCHEE_UPLOADS_THUMB . $photo->thumbUrl)) {
 					Log::error(__METHOD__, __LINE__, 'Could not delete photo in uploads/thumb/');
 					return false;
 				}
 
-				# Delete thumb@2x
-				if (file_exists(LYCHEE_UPLOADS_THUMB . $thumbUrl2x)&&!unlink(LYCHEE_UPLOADS_THUMB . $thumbUrl2x))	 {
+				// Delete thumb@2x
+				if (file_exists(LYCHEE_UPLOADS_THUMB . $thumbUrl2x)&&!unlink(LYCHEE_UPLOADS_THUMB . $thumbUrl2x)) {
 					Log::error(__METHOD__, __LINE__, 'Could not delete high-res photo in uploads/thumb/');
 					return false;
 				}
 
 			}
 
-			# Delete db entry
-			$query	= Database::prepare(Database::get(), "DELETE FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photo->id));
-			$delete	= Database::get()->query($query);
+			// Delete db entry
+			$query  = Database::prepare(Database::get(), "DELETE FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photo->id));
+			$delete = Database::get()->query($query);
 			if (!$delete) {
 				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
@@ -1207,7 +1207,7 @@ final class Photo {
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
diff --git a/php/Modules/Plugins.php b/php/Modules/Plugins.php
index 13bb55c..ed17f02 100644
--- a/php/Modules/Plugins.php
+++ b/php/Modules/Plugins.php
@@ -30,7 +30,7 @@ final class Plugins implements SplSubject {
 
 	private function __construct(array $plugins) {
 
-		# Load plugins
+		// Load plugins
 		foreach ($plugins as $plugin) {
 
 			if ($plugin==='') continue;
@@ -47,7 +47,7 @@ final class Plugins implements SplSubject {
 
 		if (!isset($observer)) return false;
 
-		# Add observer
+		// Add observer
 		$this->observers[] = $observer;
 
 		return true;
@@ -58,7 +58,7 @@ final class Plugins implements SplSubject {
 
 		if (!isset($observer)) return false;
 
-		# Remove observer
+		// Remove observer
 		$key = array_search($observer, $this->observers, true);
 		if ($key) unset($this->observers[$key]);
 
@@ -68,7 +68,7 @@ final class Plugins implements SplSubject {
 
 	public function notify() {
 
-		# Notify each observer
+		// Notify each observer
 		foreach ($this->observers as $value) $value->update($this);
 
 		return true;
@@ -79,15 +79,15 @@ final class Plugins implements SplSubject {
 
 		if (!isset($name, $location, $args)) return false;
 
-		# Parse
-		$location	= ($location===0 ? 'before' : 'after');
-		$action		= $name . ":" . $location;
+		// Parse
+		$location = ($location===0 ? 'before' : 'after');
+		$action   = $name . ":" . $location;
 
-		# Save vars
-		$this->action	= $action;
-		$this->args		= $args;
+		// Save vars
+		$this->action = $action;
+		$this->args   = $args;
 
-		# Notify observers
+		// Notify observers
 		$this->notify();
 
 		return true;
diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index 580274e..94c4278 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -6,23 +6,23 @@ final class Session {
 
 	public function init($public = true) {
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		# Return settings
+		// Return settings
 		$return['config'] = Settings::get();
 
-		# Path to Lychee for the server-import dialog
+		// Path to Lychee for the server-import dialog
 		$return['config']['location'] = LYCHEE;
 
-		# Remove username and password from response
+		// Remove username and password from response
 		unset($return['config']['username']);
 		unset($return['config']['password']);
 
-		# Remove identifier from response
+		// Remove identifier from response
 		unset($return['config']['identifier']);
 
-		# Check if login credentials exist and login if they don't
+		// Check if login credentials exist and login if they don't
 		if ($this->noLogin()===true) {
 			$public = false;
 			$return['config']['login'] = false;
@@ -32,15 +32,15 @@ final class Session {
 
 		if ($public===false) {
 
-			# Logged in
+			// Logged in
 			$return['status'] = LYCHEE_STATUS_LOGGEDIN;
 
 		} else {
 
-			# Logged out
+			// Logged out
 			$return['status'] = LYCHEE_STATUS_LOGGEDOUT;
 
-			# Unset unused vars
+			// Unset unused vars
 			unset($return['config']['skipDuplicates']);
 			unset($return['config']['thumbQuality']);
 			unset($return['config']['sortingAlbums']);
@@ -54,7 +54,7 @@ final class Session {
 
 		}
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return $return;
@@ -63,24 +63,24 @@ final class Session {
 
 	public function login($username, $password) {
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		$username = crypt($username, Settings::get()['username']);
 		$password = crypt($password, Settings::get()['password']);
 
-		# Check login with crypted hash
+		// Check login with crypted hash
 		if (Settings::get()['username']===$username&&
 			Settings::get()['password']===$password) {
-				$_SESSION['login']		= true;
-				$_SESSION['identifier']	= Settings::get()['identifier'];
+				$_SESSION['login']      = true;
+				$_SESSION['identifier'] = Settings::get()['identifier'];
 				return true;
 		}
 
-		# No login
+		// No login
 		if ($this->noLogin()===true) return true;
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return false;
@@ -89,11 +89,11 @@ final class Session {
 
 	private function noLogin() {
 
-		# Check if login credentials exist and login if they don't
+		// Check if login credentials exist and login if they don't
 		if (Settings::get()['username']===''&&
 			Settings::get()['password']==='') {
-				$_SESSION['login']		= true;
-				$_SESSION['identifier']	= Settings::get()['identifier'];
+				$_SESSION['login']      = true;
+				$_SESSION['identifier'] = Settings::get()['identifier'];
 				return true;
 		}
 
@@ -103,15 +103,15 @@ final class Session {
 
 	public function logout() {
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		$_SESSION['login']		= null;
-		$_SESSION['identifier']	= null;
+		$_SESSION['login']      = null;
+		$_SESSION['identifier'] = null;
 
 		session_destroy();
 
-		# Call plugins
+		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		return true;
diff --git a/php/Modules/Settings.php b/php/Modules/Settings.php
index d916cce..9d22d99 100755
--- a/php/Modules/Settings.php
+++ b/php/Modules/Settings.php
@@ -10,14 +10,14 @@ final class Settings {
 
 		if (self::$cache) return self::$cache;
 
-		# Execute query
-		$query		= Database::prepare(Database::get(), "SELECT * FROM ?", array(LYCHEE_TABLE_SETTINGS));
-		$settings	= Database::get()->query($query);
+		// Execute query
+		$query    = Database::prepare(Database::get(), "SELECT * FROM ?", array(LYCHEE_TABLE_SETTINGS));
+		$settings = Database::get()->query($query);
 
-		# Add each to return
+		// Add each to return
 		while ($setting = $settings->fetch_object()) $return[$setting->key] = $setting->value;
 
-		# Convert plugins to array
+		// Convert plugins to array
 		$return['plugins'] = explode(';', $return['plugins']);
 
 		self::$cache = $return;
@@ -30,12 +30,12 @@ final class Settings {
 
 		if ($row===false) {
 
-			$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '?' WHERE `key` = '?'", array(LYCHEE_TABLE_SETTINGS, $value, $key));
+			$query = Database::prepare(Database::get(), "UPDATE ? SET value = '?' WHERE `key` = '?'", array(LYCHEE_TABLE_SETTINGS, $value, $key));
 
 		} elseif ($row===true) {
 
-			# Do not prepare $value because it has already been escaped or is a true statement
-			$query	= Database::prepare(Database::get(), "UPDATE ? SET value = '$value' WHERE `key` = '?'", array(LYCHEE_TABLE_SETTINGS, $key));
+			// Do not prepare $value because it has already been escaped or is a true statement
+			$query = Database::prepare(Database::get(), "UPDATE ? SET value = '$value' WHERE `key` = '?'", array(LYCHEE_TABLE_SETTINGS, $key));
 
 		} else {
 
@@ -54,10 +54,10 @@ final class Settings {
 
 		if ($oldPassword===self::get()['password']||self::get()['password']===crypt($oldPassword, self::get()['password'])) {
 
-			# Save username
+			// Save username
 			if (self::setUsername($username)!==true) exit('Error: Updating username failed!');
 
-			# Save password
+			// Save password
 			if (self::setPassword($password)!==true) exit('Error: Updating password failed!');
 
 			return true;
@@ -70,15 +70,15 @@ final class Settings {
 
 	private static function setUsername($username) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($username), __METHOD__);
 
-		# Hash username
+		// Hash username
 		$username = getHashedString($username);
 
-		# Execute query
-		# Do not prepare $username because it is hashed and save
-		# Preparing (escaping) the username would destroy the hash
+		// Execute query
+		// Do not prepare $username because it is hashed and save
+		// Preparing (escaping) the username would destroy the hash
 		if (self::set('username', $username, true)===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
@@ -89,14 +89,14 @@ final class Settings {
 
 	private static function setPassword($password) {
 
-		# Check dependencies
+		// Check dependencies
 		Validator::required(isset($password), __METHOD__);
 
-		# Hash password
+		// Hash password
 		$password = getHashedString($password);
 
-		# Do not prepare $password because it is hashed and save
-		# Preparing (escaping) the password would destroy the hash
+		// Do not prepare $password because it is hashed and save
+		// Preparing (escaping) the password would destroy the hash
 		if (self::set('password', $password, true)===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
@@ -124,52 +124,34 @@ final class Settings {
 
 		$sorting = 'ORDER BY ';
 
-		# Set row
+		// Set row
 		switch ($type) {
 
-			case 'id':			$sorting .= 'id';
-								break;
-
-			case 'title':		$sorting .= 'title';
-								break;
-
-			case 'description':	$sorting .= 'description';
-								break;
-
-			case 'public':		$sorting .= 'public';
-								break;
-
-			case 'type':		$sorting .= 'type';
-								break;
-
-			case 'star':		$sorting .= 'star';
-								break;
-
-			case 'takestamp':	$sorting .= 'takestamp';
-								break;
-
-			default:			exit('Error: Unknown type for sorting!');
+			case 'id':          $sorting .= 'id'; break;
+			case 'title':       $sorting .= 'title'; break;
+			case 'description': $sorting .= 'description'; break;
+			case 'public':      $sorting .= 'public'; break;
+			case 'type':        $sorting .= 'type'; break;
+			case 'star':        $sorting .= 'star'; break;
+			case 'takestamp':   $sorting .= 'takestamp'; break;
+			default:            exit('Error: Unknown type for sorting!');
 
 		}
 
 		$sorting .= ' ';
 
-		# Set order
+		// Set order
 		switch ($order) {
 
-			case 'ASC':		$sorting .= 'ASC';
-							break;
-
-			case 'DESC':	$sorting .= 'DESC';
-							break;
-
-			default:		exit('Error: Unknown order for sorting!');
+			case 'ASC':  $sorting .= 'ASC'; break;
+			case 'DESC': $sorting .= 'DESC'; break;
+			default:     exit('Error: Unknown order for sorting!');
 
 		}
 
-		# Do not prepare $sorting because it is a true statement
-		# Preparing (escaping) the sorting would destroy it
-		# $sorting is save and can't contain user-input
+		// Do not prepare $sorting because it is a true statement
+		// Preparing (escaping) the sorting would destroy it
+		// $sorting is save and can't contain user-input
 		if (self::set('sortingPhotos', $sorting, true)===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
@@ -182,43 +164,31 @@ final class Settings {
 
 		$sorting = 'ORDER BY ';
 
-		# Set row
+		// Set row
 		switch ($type) {
 
-			case 'id':			$sorting .= 'id';
-								break;
-
-			case 'title':		$sorting .= 'title';
-								break;
-
-			case 'description':	$sorting .= 'description';
-								break;
-
-			case 'public':		$sorting .= 'public';
-								break;
-
-			default:			exit('Error: Unknown type for sorting!');
+			case 'id':          $sorting .= 'id'; break;
+			case 'title':       $sorting .= 'title'; break;
+			case 'description': $sorting .= 'description'; break;
+			case 'public':      $sorting .= 'public'; break;
+			default:            exit('Error: Unknown type for sorting!');
 
 		}
 
 		$sorting .= ' ';
 
-		# Set order
+		// Set order
 		switch ($order) {
 
-			case 'ASC':		$sorting .= 'ASC';
-							break;
-
-			case 'DESC':	$sorting .= 'DESC';
-							break;
-
-			default:		exit('Error: Unknown order for sorting!');
+			case 'ASC':  $sorting .= 'ASC'; break;
+			case 'DESC': $sorting .= 'DESC'; break;
+			default:     exit('Error: Unknown order for sorting!');
 
 		}
 
-		# Do not prepare $sorting because it is a true statement
-		# Preparing (escaping) the sorting would destroy it
-		# $sorting is save and can't contain user-input
+		// Do not prepare $sorting because it is a true statement
+		// Preparing (escaping) the sorting would destroy it
+		// $sorting is save and can't contain user-input
 		if (self::set('sortingAlbums', $sorting, true)===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
diff --git a/php/database/update_020700.php b/php/database/update_020700.php
index c610054..292d9e6 100644
--- a/php/database/update_020700.php
+++ b/php/database/update_020700.php
@@ -1,43 +1,43 @@
 <?php
 
-###
-# @name			Update to version 2.7.0
-# @copyright	2015 by Tobias Reich
-###
+/**
+ * Update to version 2.7.0
+ */
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-# Add medium to photos
+// Add medium to photos
 $query = Database::prepare($connection, "SELECT `medium` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
 if (!$connection->query($query)) {
-	$query	= Database::prepare($connection, "ALTER TABLE `?` ADD `medium` TINYINT(1) NOT NULL DEFAULT 0", array(LYCHEE_TABLE_PHOTOS));
-	$result	= $connection->query($query);
+	$query  = Database::prepare($connection, "ALTER TABLE `?` ADD `medium` TINYINT(1) NOT NULL DEFAULT 0", array(LYCHEE_TABLE_PHOTOS));
+	$result = $connection->query($query);
 	if (!$result) {
 		Log::error('update_020700', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
 
-# Create medium folder
+// Create medium folder
 if (is_dir(LYCHEE_UPLOADS_MEDIUM)===false) {
-	# Only create the folder when it is missing
-	if (@mkdir(LYCHEE_UPLOADS_MEDIUM)===false)
+	// Only create the folder when it is missing
+	if (@mkdir(LYCHEE_UPLOADS_MEDIUM)===false) {
 		Log::error('update_020700', __LINE__, 'Could not create medium-folder');
+	}
 }
 
-# Add medium to settings
-$query	= Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'medium' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $connection->query($query);
+// Add medium to settings
+$query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'medium' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = $connection->query($query);
 if ($result->num_rows===0) {
-	$query	= Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('medium', '1')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $connection->query($query);
+	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('medium', '1')", array(LYCHEE_TABLE_SETTINGS));
+	$result = $connection->query($query);
 	if (!$result) {
 		Log::error('update_020700', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
 
-# Set version
+// Set version
 if (Database::setVersion($connection, '020700')===false) return false;
 
 ?>
\ No newline at end of file
diff --git a/php/database/update_030000.php b/php/database/update_030000.php
index 937f1d4..c5a5f2a 100644
--- a/php/database/update_030000.php
+++ b/php/database/update_030000.php
@@ -1,37 +1,36 @@
 <?php
 
-###
-# @name			Update to version 3.0.0
-# @copyright	2015 by Tobias Reich
-###
+/**
+ * Update to version 3.0.0
+ */
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-# Remove login
-# Login now saved as crypt without md5. Legacy code has been removed.
-$query			= Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'username' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$resetUsername	= $connection->query($query);
+// Remove login
+// Login now saved as crypt without md5. Legacy code has been removed.
+$query         = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'username' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$resetUsername = $connection->query($query);
 if (!$resetUsername) {
 	Log::error('update_030000', __LINE__, 'Could not reset username (' . $connection->error . ')');
 	return false;
 }
-$query			= Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'password' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$resetPassword	= $connection->query($query);
+$query         = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'password' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$resetPassword = $connection->query($query);
 if (!$resetPassword) {
 	Log::error('update_030000', __LINE__, 'Could not reset password (' . $connection->error . ')');
 	return false;
 }
 
-# Make public albums private and reset password
-# Password now saved as crypt without md5. Legacy code has been removed.
-$query			= Database::prepare($connection, "UPDATE `?` SET `public` = 0, `password` = NULL", array(LYCHEE_TABLE_ALBUMS));
-$resetPublic	= $connection->query($query);
+// Make public albums private and reset password
+// Password now saved as crypt without md5. Legacy code has been removed.
+$query       = Database::prepare($connection, "UPDATE `?` SET `public` = 0, `password` = NULL", array(LYCHEE_TABLE_ALBUMS));
+$resetPublic = $connection->query($query);
 if (!$resetPublic) {
 	Log::error('update_030000', __LINE__, 'Could not reset public albums (' . $connection->error . ')');
 	return false;
 }
 
-# Set version
+// Set version
 if (Database::setVersion($connection, '030000')===false) return false;
 
 ?>
\ No newline at end of file
diff --git a/php/database/update_030001.php b/php/database/update_030001.php
index c13505c..2e3309c 100644
--- a/php/database/update_030001.php
+++ b/php/database/update_030001.php
@@ -1,62 +1,61 @@
 <?php
 
-###
-# @name			Update to version 3.0.1
-# @copyright	2015 by Tobias Reich
-###
+/**
+ * Update to version 3.0.1
+ */
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-# Change length of photo title
-$query	= Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_PHOTOS));
-$result	= $connection->query($query);
+// Change length of photo title
+$query  = Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_PHOTOS));
+$result = $connection->query($query);
 if (!$result) {
 	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 	return false;
 }
 
-# Change length of album title
-$query	= Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_ALBUMS));
-$result	= $connection->query($query);
+// Change length of album title
+$query  = Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_ALBUMS));
+$result = $connection->query($query);
 if (!$result) {
 	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 	return false;
 }
 
-# Add album sorting to settings
-$query	= Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'sortingAlbums' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $connection->query($query);
+// Add album sorting to settings
+$query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'sortingAlbums' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = $connection->query($query);
 if ($result->num_rows===0) {
-	$query	= Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('sortingAlbums', 'ORDER BY id DESC')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $connection->query($query);
+	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('sortingAlbums', 'ORDER BY id DESC')", array(LYCHEE_TABLE_SETTINGS));
+	$result = $connection->query($query);
 	if (!$result) {
 		Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
 
-# Rename sorting to sortingPhotos
-$query	= Database::prepare($connection, "UPDATE ? SET `key` = 'sortingPhotos' WHERE `key` = 'sorting' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $connection->query($query);
+// Rename sorting to sortingPhotos
+$query  = Database::prepare($connection, "UPDATE ? SET `key` = 'sortingPhotos' WHERE `key` = 'sorting' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = $connection->query($query);
 if (!$result) {
 	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 	return false;
 }
 
-# Add identifier to settings
-$query	= Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $connection->query($query);
+// Add identifier to settings
+$query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = $connection->query($query);
 if ($result->num_rows===0) {
-	$identifier	= md5(microtime(true));
-	$query		= Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('identifier', '?')", array(LYCHEE_TABLE_SETTINGS, $identifier));
-	$result		= $connection->query($query);
+	$identifier = md5(microtime(true));
+	$query      = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('identifier', '?')", array(LYCHEE_TABLE_SETTINGS, $identifier));
+	$result     = $connection->query($query);
 	if (!$result) {
 		Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
 
-# Set version
+// Set version
 if (Database::setVersion($connection, '030001')===false) return false;
 
 ?>
\ No newline at end of file
diff --git a/php/database/update_030003.php b/php/database/update_030003.php
index dd09fe7..16b22b1 100644
--- a/php/database/update_030003.php
+++ b/php/database/update_030003.php
@@ -1,25 +1,24 @@
 <?php
 
-###
-# @name			Update to version 3.0.3
-# @copyright	2015 by Tobias Reich
-###
+/**
+ * Update to version 3.0.3
+ */
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
-# Add skipDuplicates to settings
-$query	= Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'skipDuplicates' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result	= $connection->query($query);
+// Add skipDuplicates to settings
+$query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'skipDuplicates' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = $connection->query($query);
 if ($result->num_rows===0) {
-	$query	= Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('skipDuplicates', '0')", array(LYCHEE_TABLE_SETTINGS));
-	$result	= $connection->query($query);
+	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('skipDuplicates', '0')", array(LYCHEE_TABLE_SETTINGS));
+	$result = $connection->query($query);
 	if (!$result) {
 		Log::error('update_030003', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
 }
 
-# Set version
+// Set version
 if (Database::setVersion($connection, '030003')===false) return false;
 
 ?>
\ No newline at end of file
diff --git a/php/define.php b/php/define.php
index cf35353..a215adc 100644
--- a/php/define.php
+++ b/php/define.php
@@ -1,14 +1,14 @@
 <?php
 
-# Define root
+// Define root
 define('LYCHEE', substr(__DIR__, 0, -3));
 
-# Define status
+// Define status
 define('LYCHEE_STATUS_NOCONFIG', 0);
 define('LYCHEE_STATUS_LOGGEDOUT', 1);
 define('LYCHEE_STATUS_LOGGEDIN', 2);
 
-# Define dirs
+// Define dirs
 define('LYCHEE_DATA', LYCHEE . 'data/');
 define('LYCHEE_SRC', LYCHEE . 'src/');
 define('LYCHEE_UPLOADS', LYCHEE . 'uploads/');
@@ -18,25 +18,25 @@ define('LYCHEE_UPLOADS_THUMB', LYCHEE_UPLOADS . 'thumb/');
 define('LYCHEE_UPLOADS_IMPORT', LYCHEE_UPLOADS . 'import/');
 define('LYCHEE_PLUGINS', LYCHEE . 'plugins/');
 
-# Define files
+// Define files
 define('LYCHEE_CONFIG_FILE', LYCHEE_DATA . 'config.php');
 
-# Define urls
+// Define urls
 define('LYCHEE_URL_UPLOADS_BIG', 'uploads/big/');
 define('LYCHEE_URL_UPLOADS_MEDIUM', 'uploads/medium/');
 define('LYCHEE_URL_UPLOADS_THUMB', 'uploads/thumb/');
 
 function defineTablePrefix($dbTablePrefix = '') {
 
-	# This part is wrapped into a function, because it needs to be called
-	# after the config-file has been loaded. Other defines are available
-	# before the config-file has been loaded.
+	// This part is wrapped into a function, because it needs to be called
+	// after the config-file has been loaded. Other defines are available
+	// before the config-file has been loaded.
 
-	# Parse table prefix
-	# Old users do not have the table prefix stored in their config-file
+	// Parse table prefix
+	// Old users do not have the table prefix stored in their config-file
 	if ($dbTablePrefix!=='') $dbTablePrefix .= '_';
 
-	# Define tables
+	// Define tables
 	define('LYCHEE_TABLE_ALBUMS', $dbTablePrefix . 'lychee_albums');
 	define('LYCHEE_TABLE_LOG', $dbTablePrefix . 'lychee_log');
 	define('LYCHEE_TABLE_PHOTOS', $dbTablePrefix . 'lychee_photos');
diff --git a/php/helpers/fastImageCopyResampled.php b/php/helpers/fastImageCopyResampled.php
index 868337d..9fa83da 100644
--- a/php/helpers/fastImageCopyResampled.php
+++ b/php/helpers/fastImageCopyResampled.php
@@ -2,20 +2,20 @@
 
 function fastImageCopyResampled(&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 4) {
 
-	###
-	# Plug-and-Play fastImageCopyResampled function replaces much slower imagecopyresampled.
-	# Just include this function and change all "imagecopyresampled" references to "fastImageCopyResampled".
-	# Typically from 30 to 60 times faster when reducing high resolution images down to thumbnail size using the default quality setting.
-	# Author: Tim Eckel - Date: 09/07/07 - Version: 1.1 - Project: FreeRingers.net - Freely distributable - These comments must remain.
-	#
-	# Optional "quality" parameter (defaults is 3). Fractional values are allowed, for example 1.5. Must be greater than zero.
-	# Between 0 and 1 = Fast, but mosaic results, closer to 0 increases the mosaic effect.
-	# 1 = Up to 350 times faster. Poor results, looks very similar to imagecopyresized.
-	# 2 = Up to 95 times faster.  Images appear a little sharp, some prefer this over a quality of 3.
-	# 3 = Up to 60 times faster.  Will give high quality smooth results very close to imagecopyresampled, just faster.
-	# 4 = Up to 25 times faster.  Almost identical to imagecopyresampled for most images.
-	# 5 = No speedup. Just uses imagecopyresampled, no advantage over imagecopyresampled.
-	###
+	/**
+	 * Plug-and-Play fastImageCopyResampled function replaces much slower imagecopyresampled.
+	 * Just include this function and change all "imagecopyresampled" references to "fastImageCopyResampled".
+	 * Typically from 30 to 60 times faster when reducing high resolution images down to thumbnail size using the default quality setting.
+	 * Author: Tim Eckel - Date: 09/07/07 - Version: 1.1 - Project: FreeRingers.net - Freely distributable - These comments must remain.
+	 *
+	 * Optional "quality" parameter (defaults is 3). Fractional values are allowed, for example 1.5. Must be greater than zero.
+	 * Between 0 and 1 = Fast, but mosaic results, closer to 0 increases the mosaic effect.
+	 * 1 = Up to 350 times faster. Poor results, looks very similar to imagecopyresized.
+	 * 2 = Up to 95 times faster.  Images appear a little sharp, some prefer this over a quality of 3.
+	 * 3 = Up to 60 times faster.  Will give high quality smooth results very close to imagecopyresampled, just faster.
+	 * 4 = Up to 25 times faster.  Almost identical to imagecopyresampled for most images.
+	 * 5 = No speedup. Just uses imagecopyresampled, no advantage over imagecopyresampled.
+	 */
 
 	if (empty($src_image) || empty($dst_image) || $quality <= 0) { return false; }
 
diff --git a/php/helpers/getGraphHeader.php b/php/helpers/getGraphHeader.php
index aec92aa..2453c3a 100644
--- a/php/helpers/getGraphHeader.php
+++ b/php/helpers/getGraphHeader.php
@@ -5,24 +5,24 @@ function getGraphHeader($photoID) {
 	$photo = new Photo($photoID);
 	if ($photo->getPublic('')===false) return false;
 
-	$query	= Database::prepare(Database::get(), "SELECT title, description, url, medium FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photoID));
-	$result	= Database::get()->query($query);
-	$row	= $result->fetch_object();
+	$query  = Database::prepare(Database::get(), "SELECT title, description, url, medium FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photoID));
+	$result = Database::get()->query($query);
+	$row    = $result->fetch_object();
 
 	if (!$result||!$row) return false;
 
-	if ($row->medium==='1')	$dir = 'medium';
-	else					$dir = 'big';
+	if ($row->medium==='1') $dir = 'medium';
+	else                    $dir = 'big';
 
-	$parseUrl	= parse_url('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-	$url		= $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '?' . $parseUrl['query'];
-	$picture	= $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '/../uploads/' . $dir . '/' . $row->url;
+	$parseUrl = parse_url('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+	$url      = $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '?' . $parseUrl['query'];
+	$picture  = $parseUrl['scheme'] . '://' . $parseUrl['host'] . $parseUrl['path'] . '/../uploads/' . $dir . '/' . $row->url;
 
-	$url		= htmlentities($url);
-	$picture	= htmlentities($picture);
+	$url     = htmlentities($url);
+	$picture = htmlentities($picture);
 
-	$row->title			= htmlentities($row->title);
-	$row->description	= htmlentities($row->description);
+	$row->title       = htmlentities($row->title);
+	$row->description = htmlentities($row->description);
 
 	$return = '<!-- General Meta Data -->';
 	$return .= '<meta name="title" content="' . $row->title . '">';
diff --git a/php/helpers/getHashedString.php b/php/helpers/getHashedString.php
index 1205586..3c5f890 100644
--- a/php/helpers/getHashedString.php
+++ b/php/helpers/getHashedString.php
@@ -2,28 +2,35 @@
 
 function getHashedString($password) {
 
-	# Inspired by http://alias.io/2010/01/store-passwords-safely-with-php-and-mysql/
+	// Inspired by http://alias.io/2010/01/store-passwords-safely-with-php-and-mysql/
 
-	# A higher $cost is more secure but consumes more processing power
+	// A higher $cost is more secure but consumes more processing power
 	$cost = 10;
 
-	# Create a random salt
+	// Create a random salt
 	if (extension_loaded('openssl')) {
+
 		$salt = strtr(substr(base64_encode(openssl_random_pseudo_bytes(17)),0,22), '+', '.');
+
 	} elseif (extension_loaded('mcrypt')) {
+
 		$salt = strtr(substr(base64_encode(mcrypt_create_iv(17, MCRYPT_DEV_URANDOM)),0,22), '+', '.');
+
 	} else {
-		$salt = "";
+
+		$salt = '';
+
 		for ($i = 0; $i < 22; $i++) {
 			$salt .= substr("./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", mt_rand(0, 63), 1);
 		}
+
 	}
 
-	# Prefix information about the hash so PHP knows how to verify it later.
-	# "$2a$" Means we're using the Blowfish algorithm. The following two digits are the cost parameter.
+	// Prefix information about the hash so PHP knows how to verify it later.
+	// "$2a$" Means we're using the Blowfish algorithm. The following two digits are the cost parameter.
 	$salt = sprintf("$2a$%02d$", $cost) . $salt;
 
-	# Hash the password with the salt
+	// Hash the password with the salt
 	return crypt($password, $salt);
 
 }
diff --git a/php/helpers/hasPermissions.php b/php/helpers/hasPermissions.php
index f5f8bbd..c862436 100644
--- a/php/helpers/hasPermissions.php
+++ b/php/helpers/hasPermissions.php
@@ -4,8 +4,7 @@ function hasPermissions($path) {
 
 	// Check if the given path is readable and writable
 	// Both functions are also verifying that the path exists
-	if (is_readable($path)===true&&
-		is_writeable($path)===true) return true;
+	if (is_readable($path)===true&&is_writeable($path)===true) return true;
 
 	return false;
 
diff --git a/php/helpers/search.php b/php/helpers/search.php
index 5786b83..f975577 100755
--- a/php/helpers/search.php
+++ b/php/helpers/search.php
@@ -2,21 +2,19 @@
 
 function search($term) {
 
-	$return['albums'] = '';
-
-	# Initialize return var
+	// Initialize return var
 	$return = array(
-		'photos'	=> null,
-		'albums'	=> null,
-		'hash'		=> ''
+		'photos' => null,
+		'albums' => null,
+		'hash'   => ''
 	);
 
-	###
-	# Photos
-	###
+	/**
+	 * Photos
+	 */
 
-	$query	= Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term));
-	$result	= Database::get()->query($query);
+	$query  = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term));
+	$result = Database::get()->query($query);
 
 	while($photo = $result->fetch_assoc()) {
 
@@ -25,35 +23,35 @@ function search($term) {
 
 	}
 
-	###
-	# Albums
-	###
+	/**
+	 * Albums
+	 */
 
-	$query	= Database::prepare(Database::get(), "SELECT id, title, public, sysstamp, password FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%'", array(LYCHEE_TABLE_ALBUMS, $term, $term));
+	$query  = Database::prepare(Database::get(), "SELECT id, title, public, sysstamp, password FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%'", array(LYCHEE_TABLE_ALBUMS, $term, $term));
 	$result = Database::get()->query($query);
 
 	while($album = $result->fetch_assoc()) {
 
-		# Turn data from the database into a front-end friendly format
+		// Turn data from the database into a front-end friendly format
 		$album = Album::prepareData($album);
 
-		# Thumbs
-		$query	= Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'] . " LIMIT 0, 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
-		$thumbs	= Database::get()->query($query);
+		// Thumbs
+		$query  = Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'] . " LIMIT 0, 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
+		$thumbs = Database::get()->query($query);
 
-		# For each thumb
+		// For each thumb
 		$k = 0;
 		while ($thumb = $thumbs->fetch_object()) {
 			$album['thumbs'][$k] = LYCHEE_URL_UPLOADS_THUMB . $thumb->thumbUrl;
 			$k++;
 		}
 
-		# Add to return
+		// Add to return
 		$return['albums'][$album['id']] = $album;
 
 	}
 
-	# Hash
+	// Hash
 	$return['hash'] = md5(json_encode($return));
 
 	return $return;
diff --git a/php/index.php b/php/index.php
index 2e72991..04b9858 100755
--- a/php/index.php
+++ b/php/index.php
@@ -1,10 +1,9 @@
 <?php
 
-###
-# @name			API
-# @author		Tobias Reich
-# @copyright	2015 by Tobias Reich
-###
+/**
+ * @author    Tobias Reich
+ * @copyright 2016 by Tobias Reich
+ */
 
 namespace Lychee;
 
@@ -26,55 +25,55 @@ require(__DIR__ . '/helpers/getHashedString.php');
 require(__DIR__ . '/helpers/hasPermissions.php');
 require(__DIR__ . '/helpers/search.php');
 
-# Define the called function
-if (isset($_POST['function']))		$fn = $_POST['function'];
-else if (isset($_GET['function']))	$fn = $_GET['function'];
-else								$fn = null;
+// Define the called function
+if (isset($_POST['function']))     $fn = $_POST['function'];
+else if (isset($_GET['function'])) $fn = $_GET['function'];
+else                               $fn = null;
 
-# Check if a function has been specified
+// Check if a function has been specified
 if (!empty($fn)) {
 
-	# Start the session and set the default timezone
+	// Start the session and set the default timezone
 	session_start();
 	date_default_timezone_set('UTC');
 
-	# Validate parameters
-	if (isset($_POST['albumIDs'])&&Validator::isAlbumIDs($_POST['albumIDs'])===false)	exit('Error: Wrong parameter type for albumIDs!');
-	if (isset($_POST['photoIDs'])&&Validator::isPhotoIDs($_POST['photoIDs'])===false)	exit('Error: Wrong parameter type for photoIDs!');
-	if (isset($_POST['albumID'])&&Validator::isAlbumID($_POST['albumID'])==false)		exit('Error: Wrong parameter type for albumID!');
-	if (isset($_POST['photoID'])&&Validator::isPhotoID($_POST['photoID'])==false)		exit('Error: Wrong parameter type for photoID!');
+	// Validate parameters
+	if (isset($_POST['albumIDs'])&&Validator::isAlbumIDs($_POST['albumIDs'])===false) exit('Error: Wrong parameter type for albumIDs!');
+	if (isset($_POST['photoIDs'])&&Validator::isPhotoIDs($_POST['photoIDs'])===false) exit('Error: Wrong parameter type for photoIDs!');
+	if (isset($_POST['albumID'])&&Validator::isAlbumID($_POST['albumID'])==false)     exit('Error: Wrong parameter type for albumID!');
+	if (isset($_POST['photoID'])&&Validator::isPhotoID($_POST['photoID'])==false)     exit('Error: Wrong parameter type for photoID!');
 
-	# Check if a configuration exists
+	// Check if a configuration exists
 	if (Config::exists()===false) {
 
-		###
-		# Installation Access
-		# Limited access to configure Lychee. Only available when the config.php file is missing.
-		###
+		/**
+		 * Installation Access
+		 * Limited access to configure Lychee. Only available when the config.php file is missing.
+		 */
 
 		Installation::init($fn);
 		exit();
 
 	}
 
-	# Check if user is logged
+	// Check if user is logged
 	if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 		(isset($_SESSION['identifier'])&&$_SESSION['identifier']===Settings::get()['identifier'])) {
 
-		###
-		# Admin Access
-		# Full access to Lychee. Only with correct password/session.
-		###
+		/**
+		 * Admin Access
+		 * Full access to Lychee. Only with correct password/session.
+		 */
 
 		Admin::init($fn);
 		exit();
 
 	} else {
 
-		###
-		# Guest Access
-		# Access to view all public folders and photos in Lychee.
-		###
+		/**
+		 * Guest Access
+		 * Access to view all public folders and photos in Lychee.
+		 */
 
 		Guest::init($fn);
 		exit();

From fe2c56422d9465bc53fa66ef3e8990f26e22e14a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:07:59 +0100
Subject: [PATCH 043/183] Fixed database updates

---
 php/database/update_020700.php | 4 ++++
 php/database/update_030000.php | 4 ++++
 php/database/update_030001.php | 4 ++++
 php/database/update_030003.php | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/php/database/update_020700.php b/php/database/update_020700.php
index 292d9e6..757276b 100644
--- a/php/database/update_020700.php
+++ b/php/database/update_020700.php
@@ -4,6 +4,10 @@
  * Update to version 2.7.0
  */
 
+namespace Lychee\Database;
+
+use Lychee\Modules\Database;
+
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 // Add medium to photos
diff --git a/php/database/update_030000.php b/php/database/update_030000.php
index c5a5f2a..b3a58d8 100644
--- a/php/database/update_030000.php
+++ b/php/database/update_030000.php
@@ -4,6 +4,10 @@
  * Update to version 3.0.0
  */
 
+namespace Lychee\Database;
+
+use Lychee\Modules\Database;
+
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 // Remove login
diff --git a/php/database/update_030001.php b/php/database/update_030001.php
index 2e3309c..5555e7d 100644
--- a/php/database/update_030001.php
+++ b/php/database/update_030001.php
@@ -4,6 +4,10 @@
  * Update to version 3.0.1
  */
 
+namespace Lychee\Database;
+
+use Lychee\Modules\Database;
+
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 // Change length of photo title
diff --git a/php/database/update_030003.php b/php/database/update_030003.php
index 16b22b1..ae73e44 100644
--- a/php/database/update_030003.php
+++ b/php/database/update_030003.php
@@ -4,6 +4,10 @@
  * Update to version 3.0.3
  */
 
+namespace Lychee\Database;
+
+use Lychee\Modules\Database;
+
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 // Add skipDuplicates to settings

From b89b82fa36468165efe68f9de8a85eedccd416a4 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:16:42 +0100
Subject: [PATCH 044/183] Fixed search

---
 php/helpers/search.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/php/helpers/search.php b/php/helpers/search.php
index f975577..e1a4e97 100755
--- a/php/helpers/search.php
+++ b/php/helpers/search.php
@@ -1,5 +1,7 @@
 <?php
 
+use Lychee\Modules\Database;
+
 function search($term) {
 
 	// Initialize return var

From 4c3df96e9eee7b6437e46acda9b96159afe4bbc7 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:16:59 +0100
Subject: [PATCH 045/183] Removed unnecessary namespace

---
 php/database/update_020700.php | 2 --
 php/database/update_030000.php | 2 --
 php/database/update_030001.php | 2 --
 php/database/update_030003.php | 2 --
 4 files changed, 8 deletions(-)

diff --git a/php/database/update_020700.php b/php/database/update_020700.php
index 757276b..ea87e45 100644
--- a/php/database/update_020700.php
+++ b/php/database/update_020700.php
@@ -4,8 +4,6 @@
  * Update to version 2.7.0
  */
 
-namespace Lychee\Database;
-
 use Lychee\Modules\Database;
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
diff --git a/php/database/update_030000.php b/php/database/update_030000.php
index b3a58d8..2062203 100644
--- a/php/database/update_030000.php
+++ b/php/database/update_030000.php
@@ -4,8 +4,6 @@
  * Update to version 3.0.0
  */
 
-namespace Lychee\Database;
-
 use Lychee\Modules\Database;
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
diff --git a/php/database/update_030001.php b/php/database/update_030001.php
index 5555e7d..575f02c 100644
--- a/php/database/update_030001.php
+++ b/php/database/update_030001.php
@@ -4,8 +4,6 @@
  * Update to version 3.0.1
  */
 
-namespace Lychee\Database;
-
 use Lychee\Modules\Database;
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
diff --git a/php/database/update_030003.php b/php/database/update_030003.php
index ae73e44..d204ad5 100644
--- a/php/database/update_030003.php
+++ b/php/database/update_030003.php
@@ -4,8 +4,6 @@
  * Update to version 3.0.3
  */
 
-namespace Lychee\Database;
-
 use Lychee\Modules\Database;
 
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');

From e8387e8794a441834099e674c50cb4c8a87caca7 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:17:23 +0100
Subject: [PATCH 046/183] Fixed missing Database and Photo in getGraphHeader

---
 php/helpers/getGraphHeader.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/php/helpers/getGraphHeader.php b/php/helpers/getGraphHeader.php
index 2453c3a..e601fcc 100644
--- a/php/helpers/getGraphHeader.php
+++ b/php/helpers/getGraphHeader.php
@@ -1,5 +1,8 @@
 <?php
 
+use Lychee\Modules\Database;
+use Lychee\Modules\Photo;
+
 function getGraphHeader($photoID) {
 
 	$photo = new Photo($photoID);

From 007cecc1d5ca579879006862a6ab05c54ce95612 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:17:46 +0100
Subject: [PATCH 047/183] Fixed set login of initial username and password

---
 php/Access/Admin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index 84175d8..54f6e12 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -291,7 +291,8 @@ final class Admin extends Access {
 
 		Validator::required(isset($_POST['username'], $_POST['password']), __METHOD__);
 
-		echo Settings::setLogin(@$_POST['oldPassword'], $_POST['username'], $_POST['password']);
+		if (isset($_POST['oldPassword'])===false) $_POST['oldPassword'] = '';
+		echo Settings::setLogin($_POST['oldPassword'], $_POST['username'], $_POST['password']);
 
 	}
 

From e2eaa38b9c5abfbd7bc9fd517255d9502c94fb4c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:23:58 +0100
Subject: [PATCH 048/183] Added missing argument

---
 php/Access/Admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index 54f6e12..fe84782 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -132,7 +132,7 @@ final class Admin extends Access {
 
 	private static function mergeAlbumsAction() {
 
-		Validator::required(isset($_POST['albumIDs']));
+		Validator::required(isset($_POST['albumIDs']), __METHOD__);
 		$album = new Album($_POST['albumIDs']);
 		echo $album->merge();
 

From b78cc31127797b42192828d6901be721b4cf1485 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:24:08 +0100
Subject: [PATCH 049/183] Fixed ZipArchive not found

---
 php/Modules/Album.php | 2 ++
 php/Modules/Photo.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index ebfe111..fa38eb0 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -2,6 +2,8 @@
 
 namespace Lychee\Modules;
 
+use ZipArchive;
+
 final class Album {
 
 	private $albumIDs = null;
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 039fe79..c677007 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -2,6 +2,8 @@
 
 namespace Lychee\Modules;
 
+use ZipArchive;
+
 final class Photo {
 
 	private $photoIDs = null;

From 76d1b227bf0c970da6cca138d5ecf1478d80f690 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:57:20 +0100
Subject: [PATCH 050/183] Fixed outdated require in view.php

---
 view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view.php b/view.php
index 0b0e001..638af87 100644
--- a/view.php
+++ b/view.php
@@ -25,7 +25,7 @@
 				# Load required files
 				require(__DIR__ . '/php/define.php');
 				require(__DIR__ . '/php/autoload.php');
-				require(__DIR__ . '/php/misc.php');
+				require(__DIR__ . '/php/helpers/getGraphHeader.php');
 
 				echo getGraphHeader($_GET['p']);
 

From 36dd48ec2762db7d675dc6d745a32420979c772c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:58:08 +0100
Subject: [PATCH 051/183] Fixed link check when sharing a photo

---
 src/scripts/photo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index 7c73d44..5ca7bac 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -621,7 +621,7 @@ photo.share = function(photoID, service) {
 			break
 	}
 
-	if (link.length!=='') location.href = link
+	if (link!=='') location.href = link
 
 }
 

From 7dd82fc516612cf6bf9489e7f84fcfdb61321696 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:58:24 +0100
Subject: [PATCH 052/183] Improved lychee.dropbox and lychee.dropboxKey check

---
 src/scripts/lychee.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 1efc4eb..1f88917 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -330,7 +330,7 @@ lychee.retinize = function(path = '') {
 
 lychee.loadDropbox = function(callback) {
 
-	if (!lychee.dropbox && lychee.dropboxKey) {
+	if (lychee.dropbox===false && lychee.dropboxKey!=null && lychee.dropboxKey!=='') {
 
 		loadingBar.show()
 
@@ -351,7 +351,7 @@ lychee.loadDropbox = function(callback) {
 		}
 		s.parentNode.insertBefore(g, s)
 
-	} else if (lychee.dropbox&&lychee.dropboxKey) {
+	} else if (lychee.dropbox===true && lychee.dropboxKey!=null && lychee.dropboxKey!=='') {
 
 		callback()
 

From 00cd60a58884c95f18bfe7cb8c097a0976ea3422 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 30 Jan 2016 23:58:29 +0100
Subject: [PATCH 053/183] Rebuild

---
 dist/main.js | Bin 192542 -> 192604 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 56ab19262be169576c9846f89d20c48a12d4af93..fb1b9858be5599778086302b0d507decbb98683a 100644
GIT binary patch
delta 163
zcmbRDfcwq^?uHh|Ele9cjB_fJGg4FaQi}2mlJYBTZEY0|)ztDzb8-}IQKh_7E7jDL
zloV}kw;%Liy1}RlQfoj^?QAcmnQBa2`O_0CnZ&326fzl1Uzp4!ynR9;lK|iL<@HR{
Y@))_M+rDE8oqqNO6Z`gA@0eN`0eCey{r~^~

delta 102
zcmV-s0Ga>X;0vDM3xI?Hv;we55g}}OV`yb%E@X0VaAI$GCMLJzNCMaa0wyN6;7S6S
zCIN4k!Ri7OmydA*GXV;h@aX~-mw)O44yWaD0uBc*Y-Mg|bZEEbe*%_nmwfI5RRIdO
I(e46^0UG!yR{#J2


From 84afba9548c234cbe4809865f96b9cb3628f3b2f Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 00:01:42 +0100
Subject: [PATCH 054/183] Added missing Album and Photo class to search

---
 php/helpers/search.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/php/helpers/search.php b/php/helpers/search.php
index e1a4e97..6b17fd9 100755
--- a/php/helpers/search.php
+++ b/php/helpers/search.php
@@ -1,6 +1,8 @@
 <?php
 
+use Lychee\Modules\Album;
 use Lychee\Modules\Database;
+use Lychee\Modules\Photo;
 
 function search($term) {
 

From 026702114dda09f2093167d4269993e63c767609 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 00:56:16 +0100
Subject: [PATCH 055/183] Missing parameter

---
 php/Access/Installation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Access/Installation.php b/php/Access/Installation.php
index 946f6bc..0a4a2e2 100644
--- a/php/Access/Installation.php
+++ b/php/Access/Installation.php
@@ -24,7 +24,7 @@ final class Installation extends Access {
 
 	private static function configCreateAction() {
 
-		Validator::required(isset($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']));
+		Validator::required(isset($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']), __METHOD__);
 
 		echo Config::create($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']);
 

From 207e98a81ccbe8bed2a46b7f34c024758585e21d Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 00:56:42 +0100
Subject: [PATCH 056/183] fnNotFound was not callable from extending class

---
 php/Access/Access.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Access/Access.php b/php/Access/Access.php
index b90f210..6b471fe 100644
--- a/php/Access/Access.php
+++ b/php/Access/Access.php
@@ -4,7 +4,7 @@ namespace Lychee\Access;
 
 abstract class Access {
 
-	final private static function fnNotFound() {
+	final protected static function fnNotFound() {
 
 		exit('Error: Function not found! Please check the spelling of the called function.');
 

From f90e171e9c7a73ca60c701413425b1d823f13573 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 12:28:22 +0100
Subject: [PATCH 057/183] Added lychee-create-medium #453

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 388ed11..77886e4 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@ Here's a list of all available Plugins and Extensions:
 | lychee-rss | Creates a RSS-Feed out of your photos | [More &#187;](https://github.com/cternes/Lychee-RSS) |
 | lychee-FlashAir | Import from a Toshiba FlashAir WiFi SD card | [More &#187;](https://github.com/mhp/Lychee-FlashAir) |
 | lychee-webroot | Controls photos accessibility and keeps Lychee files hidden | [More &#187;](https://github.com/Bramas/lychee-webroot) |
+| lychee-create-medium | Generate missing medium size photos | [More &#187;](https://github.com/Bramas/lychee-create-medium) |
 
 ## Troubleshooting
 

From 4328b516a52497e3547a3859b98ff970e264010a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 12:46:43 +0100
Subject: [PATCH 058/183] Updated path to the diagnostics

---
 docs/FAQ.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index d0874dd..d0764a4 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -1,5 +1,5 @@
 #### Lychee is not working
-If Lychee is not working properly, try to open `plugins/check/index.php`. This script will display all errors it can find.
+If Lychee is not working properly, try to open `plugins/Diagnostics/index.php`. This script will display all errors it can find.
 
 #### What do I need to run Lychee on my server?
 To run Lychee, everything you need is a web-server with PHP 5.3 or later and a MySQL-Database.
@@ -38,7 +38,7 @@ To backup your Lychee installation you need to do the following steps:
 	- INSERT INTO lychee_photos_backup SELECT * FROM lychee_photos;
 	- CREATE TABLE lychee_settings_backup LIKE lychee_settings;
 	- INSERT INTO lychee_settings_backup SELECT * FROM lychee_settings;
-	
+
 #### Can I use my existing folder-structure?
 No. Lychee has it's own folder-structure and database. Please upload or import all your photos to use them.
 

From a5437a3e6613036bbc3c50f2b46a7b0bb8d7ab1d Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 12:47:00 +0100
Subject: [PATCH 059/183] Updated contributing guidelines

---
 CONTRIBUTING.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc00b9f..86eed15 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,8 +2,8 @@
 
 Read the following before reporting a bug on GitHub:
 
-1. Update to the newest version of Lychee
-2. Update your Browser to the newest version
+1. Update Lychee to the newest version
+2. Update your browser to the newest version
 2. Take a look in the [FAQ](https://github.com/electerious/Lychee/blob/master/docs/FAQ.md)
 3. Check if someone has [already reported](https://github.com/electerious/Lychee/issues) the same bug
 
@@ -12,7 +12,7 @@ When reporting a bug on GitHub, make sure you include the following information:
 - Detailed description of the problem
 - How to reproduce the issue (step-by-step)
 - What you have already tried
-- Output of the diagnostics (`plugins/check/index.php`)
+- Output of the diagnostics (`plugins/Diagnostics/index.php`)
 - Browser and system version
 - Attach files when you have problems which specific photos
 
@@ -23,15 +23,15 @@ Check if there are branches newer than `master`. Always fork the newest availabl
 Please follow the conventions already established in the code.
 
 - **Spacing**:<br>
-  Use tabs for indentation. No spaces.
+  Use tabs for indentation. Spaces for alignment.
 
 - **Naming**:<br>
   Keep variable and method names concise and descriptive.
 
 - **Quotes**:<br>
   Single-quoted strings are preferred to double-quoted strings
-  
+
 - **Comments**:<br>
-  Please use single-line comments to annotate significant additions. Use `#` for comments in PHP; `//` for comments in JS and CSS.
-  
-Merge your changes when the forked branch has been updated in the meanwhile. Make sure your code is 100% working before creating a Pull-Request on GitHub.
+  Please use single-line comments to annotate significant additions. Use `//` for comments in PHP, JS and CSS.
+
+Merge your changes when the forked branch has been updated in the meanwhile. Make sure your code is 100% working before creating a Pull-Request on GitHub.
\ No newline at end of file

From 0b5d605860b2aeb540925dec598cc6fa38ad4f1a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 13:53:32 +0100
Subject: [PATCH 060/183] Removed unused function

---
 php/Modules/Validator.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/php/Modules/Validator.php b/php/Modules/Validator.php
index 6aee728..759969a 100644
--- a/php/Modules/Validator.php
+++ b/php/Modules/Validator.php
@@ -12,20 +12,6 @@ final class Validator {
 
 	}
 
-	public static function isNull() {
-
-		$args = func_get_args();
-
-		for ($i = 0; $i < count($args); $i++) {
-
-			if (is_null($args[$i])===true) return true;
-
-		}
-
-		return false;
-
-	}
-
 	public static function isAlbumIDs($albumIDs) {
 
 		return (preg_match('/^[0-9\,]{1,}$/', $albumIDs)===1 ? true : false);

From 34839d38052945d4ce6378269665c8bdf4d93617 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 13:55:23 +0100
Subject: [PATCH 061/183] Added error handling to getGraphHeader

---
 php/helpers/getGraphHeader.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/php/helpers/getGraphHeader.php b/php/helpers/getGraphHeader.php
index e601fcc..8843a96 100644
--- a/php/helpers/getGraphHeader.php
+++ b/php/helpers/getGraphHeader.php
@@ -10,9 +10,18 @@ function getGraphHeader($photoID) {
 
 	$query  = Database::prepare(Database::get(), "SELECT title, description, url, medium FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photoID));
 	$result = Database::get()->query($query);
-	$row    = $result->fetch_object();
 
-	if (!$result||!$row) return false;
+	if ($result===false) {
+		Log::error(__METHOD__, __LINE__, Database::get()->error);
+		return false;
+	}
+
+	$row = $result->fetch_object();
+
+	if ($row===null) {
+		Log::error(__METHOD__, __LINE__, 'Could not find photo in database');
+		return false;
+	}
 
 	if ($row->medium==='1') $dir = 'medium';
 	else                    $dir = 'big';

From 64e0d66d83760e6710e11706f85b82162e769ee6 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 15:44:54 +0100
Subject: [PATCH 062/183] Improved if conditions

---
 php/Modules/Album.php          | 33 ++++++++++--------
 php/Modules/Database.php       | 64 ++++++++++++++++++++--------------
 php/Modules/Log.php            |  2 +-
 php/Modules/Photo.php          | 50 ++++++++++++++------------
 php/Modules/Settings.php       |  2 +-
 php/database/update_020700.php |  9 ++---
 php/database/update_030000.php | 18 +++++-----
 php/database/update_030001.php | 10 +++---
 php/database/update_030003.php |  2 +-
 9 files changed, 106 insertions(+), 84 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index fa38eb0..57620ea 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -37,7 +37,7 @@ final class Album {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -191,9 +191,10 @@ final class Album {
 
 		// Execute query
 		$albums = Database::get()->query($query);
-		if (!$albums) {
-			Log::error(__METHOD__, __LINE__, 'Could not get all albums (' . Database::get()->error . ')');
-			exit('Error: ' . Database::get()->error);
+
+		if ($albums===false) {
+			Log::error(__METHOD__, __LINE__, 'Could not get albums from database (' . Database::get()->error . ')');
+			exit('Error: Could not get albums from database!');
 		}
 
 		// For each album
@@ -210,6 +211,11 @@ final class Album {
 					$query  = Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr(Settings::get()['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
 					$thumbs = Database::get()->query($query);
 
+					if ($thumbs===false) {
+						Log::error(__METHOD__, __LINE__, 'Could not get thumbs of album from database (' . Database::get()->error . ')');
+						exit('Error: Could not get thumbs of album from database!');
+					}
+
 					// For each thumb
 					$k = 0;
 					while ($thumb = $thumbs->fetch_object()) {
@@ -368,8 +374,7 @@ final class Album {
 			$query = Database::prepare(Database::get(), "SELECT title FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
 			$album = Database::get()->query($query);
 
-			// Error in database query
-			if (!$album) {
+			if ($album===false) {
 				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
@@ -484,7 +489,7 @@ final class Album {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -507,7 +512,7 @@ final class Album {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -577,7 +582,7 @@ final class Album {
 		// Set public
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET public = '?', visible = '?', downloadable = '?', password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $public, $visible, $downloadable, $this->albumIDs));
 		$result = Database::get()->query($query);
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -586,7 +591,7 @@ final class Album {
 		if ($public===1) {
 			$query  = Database::prepare(Database::get(), "UPDATE ? SET public = 0 WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
 			$result = Database::get()->query($query);
-			if (!$result) {
+			if ($result===false) {
 				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
@@ -633,7 +638,7 @@ final class Album {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -681,7 +686,7 @@ final class Album {
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET album = ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->albumIDs));
 		$result = Database::get()->query($query);
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -696,7 +701,7 @@ final class Album {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -735,7 +740,7 @@ final class Album {
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($error) return false;
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index bac8126..eec4be8 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -99,13 +99,13 @@ final class Database {
 		Validator::required(isset($connection), __METHOD__);
 
 		// Check if database exists
-		if ($connection->select_db($name)) return true;
+		if ($connection->select_db($name)===true) return true;
 
 		// Create database
 		$query  = self::prepare($connection, 'CREATE DATABASE IF NOT EXISTS ?', array($name));
 		$result = $connection->query($query);
 
-		if (!$connection->select_db($name)) return false;
+		if ($connection->select_db($name)===false) return false;
 		return true;
 
 	}
@@ -120,37 +120,41 @@ final class Database {
 		if ($connection->query($query)) return true;
 
 		// Create log
-		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_LOG));
-		if (!$connection->query($exist)) {
+		$exist  = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_LOG));
+		$result = $connection->query($exist);
+		if ($result===false) {
 
 			// Read file
 			$file  = __DIR__ . '/../database/log_table.sql';
 			$query = @file_get_contents($file);
 
-			if (!isset($query)||$query===false) return false;
+			if ($query===false) return false;
 
 			// Create table
-			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_LOG));
-			if (!$connection->query($query)) return false;
+			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_LOG));
+			$result = $connection->query($exist);
+			if ($result===false) return false;
 
 		}
 
 		// Create settings
-		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_SETTINGS));
-		if (!$connection->query($exist)) {
+		$exist  = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_SETTINGS));
+		$result = $connection->query($exist);
+		if ($result===false) {
 
 			// Read file
 			$file  = __DIR__ . '/../database/settings_table.sql';
 			$query = @file_get_contents($file);
 
-			if (!isset($query)||$query===false) {
+			if ($query===false) {
 				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_settings');
 				return false;
 			}
 
 			// Create table
-			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
-			if (!$connection->query($query)) {
+			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
+			$result = $connection->query($exist);
+			if ($result===false) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
 				return false;
 			}
@@ -159,14 +163,15 @@ final class Database {
 			$file  = __DIR__ . '/../database/settings_content.sql';
 			$query = @file_get_contents($file);
 
-			if (!isset($query)||$query===false) {
+			if ($query===false) {
 				Log::error(__METHOD__, __LINE__, 'Could not load content-query for lychee_settings');
 				return false;
 			}
 
 			// Add content
-			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
-			if (!$connection->query($query)) {
+			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
+			$result = $connection->query($exist);
+			if ($result===false) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
 				return false;
 			}
@@ -174,7 +179,8 @@ final class Database {
 			// Generate identifier
 			$identifier = md5(microtime(true));
 			$query      = self::prepare($connection, "UPDATE `?` SET `value` = '?' WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS, $identifier));
-			if (!$connection->query($query)) {
+			$result     = $connection->query($exist);
+			if ($result===false) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
 				return false;
 			}
@@ -182,21 +188,23 @@ final class Database {
 		}
 
 		// Create albums
-		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_ALBUMS));
-		if (!$connection->query($exist)) {
+		$exist  = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_ALBUMS));
+		$result = $connection->query($exist);
+		if ($result===false) {
 
 			// Read file
 			$file  = __DIR__ . '/../database/albums_table.sql';
 			$query = @file_get_contents($file);
 
-			if (!isset($query)||$query===false) {
+			if ($query===false) {
 				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_albums');
 				return false;
 			}
 
 			// Create table
-			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_ALBUMS));
-			if (!$connection->query($query)) {
+			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_ALBUMS));
+			$result = $connection->query($exist);
+			if ($result===false) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
 				return false;
 			}
@@ -204,21 +212,23 @@ final class Database {
 		}
 
 		// Create photos
-		$exist = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS));
-		if (!$connection->query($exist)) {
+		$exist  = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS));
+		$result = $connection->query($exist);
+		if ($result===false) {
 
 			// Read file
 			$file  = __DIR__ . '/../database/photos_table.sql';
 			$query = @file_get_contents($file);
 
-			if (!isset($query)||$query===false) {
+			if ($query===false) {
 				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_photos');
 				return false;
 			}
 
 			// Create table
-			$query = self::prepare($connection, $query, array(LYCHEE_TABLE_PHOTOS));
-			if (!$connection->query($query)) {
+			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_PHOTOS));
+			$result = $connection->query($exist);
+			if ($result===false) {
 				Log::error(__METHOD__, __LINE__, $connection->error);
 				return false;
 			}
@@ -261,7 +271,7 @@ final class Database {
 
 		$query  = self::prepare($connection, "UPDATE ? SET value = '?' WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS, $version));
 		$result = $connection->query($query);
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, 'Could not update database (' . $connection->error . ')');
 			return false;
 		}
diff --git a/php/Modules/Log.php b/php/Modules/Log.php
index de49453..55c4a90 100644
--- a/php/Modules/Log.php
+++ b/php/Modules/Log.php
@@ -34,7 +34,7 @@ final class Log {
 		$query  = Database::prepare(Database::get(), "INSERT INTO ? (time, type, function, line, text) VALUES ('?', '?', '?', '?', '?')", array(LYCHEE_TABLE_LOG, $sysstamp, $type, $function, $line, $text));
 		$result = Database::get()->query($query);
 
-		if (!$result) return false;
+		if ($result===false) return false;
 		return true;
 
 	}
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index c677007..9f747f5 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -237,7 +237,7 @@ final class Photo {
 			$query  = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum, medium) VALUES ('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?')", $values);
 			$result = Database::get()->query($query);
 
-			if (!$result) {
+			if ($result===false) {
 				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				if ($returnOnError===true) return false;
 				exit('Error: Could not save photo in database!');
@@ -260,8 +260,8 @@ final class Photo {
 
 		$result = Database::get()->query($query);
 
-		if (!$result) {
-			Log::error(__METHOD__, __LINE__, 'Could not check for existing photos with the same checksum');
+		if ($result===false) {
+			Log::error(__METHOD__, __LINE__, 'Could not check for existing photos with the same checksum (' . Database::get()->error . ')');
 			return false;
 		}
 
@@ -800,14 +800,15 @@ final class Photo {
 		// Get photo
 		$query  = Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
 		$photos = Database::get()->query($query);
-		$photo  = $photos->fetch_object();
 
-		// Error in database query
-		if (!$photos) {
+		if ($photos===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
 
+		// Get photo object
+		$photo = $photos->fetch_object();
+
 		// Photo not found
 		if ($photo===null) {
 			Log::error(__METHOD__, __LINE__, 'Album not found. Cannot start download.');
@@ -870,7 +871,7 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -900,7 +901,7 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -935,9 +936,10 @@ final class Photo {
 			$star = ($photo->star==0 ? 1 : 0);
 
 			// Set star
-			$query = Database::prepare(Database::get(), "UPDATE ? SET star = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $star, $photo->id));
-			$star  = Database::get()->query($query);
-			if (!$star) $error = true;
+			$query  = Database::prepare(Database::get(), "UPDATE ? SET star = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $star, $photo->id));
+			$result = Database::get()->query($query);
+
+			if ($result===false) $error = true;
 
 		}
 
@@ -1028,7 +1030,7 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -1056,7 +1058,7 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -1090,7 +1092,7 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if (!$result) {
+		if ($result===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -1114,7 +1116,8 @@ final class Photo {
 		// Get photos
 		$query  = Database::prepare(Database::get(), "SELECT id, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
 		$photos = Database::get()->query($query);
-		if (!$photos) {
+
+		if ($photos===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -1127,10 +1130,11 @@ final class Photo {
 			while(strlen($id)<14) $id .= 0;
 
 			// Duplicate entry
-			$values    = array(LYCHEE_TABLE_PHOTOS, $id, LYCHEE_TABLE_PHOTOS, $photo->id);
-			$query     = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum) SELECT '?' AS id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum FROM ? WHERE id = '?'", $values);
-			$duplicate = Database::get()->query($query);
-			if (!$duplicate) {
+			$values = array(LYCHEE_TABLE_PHOTOS, $id, LYCHEE_TABLE_PHOTOS, $photo->id);
+			$query  = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum) SELECT '?' AS id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum FROM ? WHERE id = '?'", $values);
+			$result = Database::get()->query($query);
+
+			if ($result===false) {
 				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
@@ -1157,7 +1161,8 @@ final class Photo {
 		// Get photos
 		$query  = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
 		$photos = Database::get()->query($query);
-		if (!$photos) {
+
+		if ($photos===false) {
 			Log::error(__METHOD__, __LINE__, Database::get()->error);
 			return false;
 		}
@@ -1201,8 +1206,9 @@ final class Photo {
 
 			// Delete db entry
 			$query  = Database::prepare(Database::get(), "DELETE FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photo->id));
-			$delete = Database::get()->query($query);
-			if (!$delete) {
+			$result = Database::get()->query($query);
+
+			if ($result===false) {
 				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				return false;
 			}
diff --git a/php/Modules/Settings.php b/php/Modules/Settings.php
index 9d22d99..17cef65 100755
--- a/php/Modules/Settings.php
+++ b/php/Modules/Settings.php
@@ -45,7 +45,7 @@ final class Settings {
 
 		$result = Database::get()->query($query);
 
-		if (!$result) return false;
+		if ($result===false) return false;
 		return true;
 
 	}
diff --git a/php/database/update_020700.php b/php/database/update_020700.php
index ea87e45..5720970 100644
--- a/php/database/update_020700.php
+++ b/php/database/update_020700.php
@@ -9,11 +9,12 @@ use Lychee\Modules\Database;
 if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 // Add medium to photos
-$query = Database::prepare($connection, "SELECT `medium` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
-if (!$connection->query($query)) {
+$query  = Database::prepare($connection, "SELECT `medium` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
+$result = $connection->query($query);
+if ($result===false) {
 	$query  = Database::prepare($connection, "ALTER TABLE `?` ADD `medium` TINYINT(1) NOT NULL DEFAULT 0", array(LYCHEE_TABLE_PHOTOS));
 	$result = $connection->query($query);
-	if (!$result) {
+	if ($result===false) {
 		Log::error('update_020700', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
@@ -33,7 +34,7 @@ $result = $connection->query($query);
 if ($result->num_rows===0) {
 	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('medium', '1')", array(LYCHEE_TABLE_SETTINGS));
 	$result = $connection->query($query);
-	if (!$result) {
+	if ($result===false) {
 		Log::error('update_020700', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
diff --git a/php/database/update_030000.php b/php/database/update_030000.php
index 2062203..1600659 100644
--- a/php/database/update_030000.php
+++ b/php/database/update_030000.php
@@ -10,24 +10,24 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 // Remove login
 // Login now saved as crypt without md5. Legacy code has been removed.
-$query         = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'username' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$resetUsername = $connection->query($query);
-if (!$resetUsername) {
+$query  = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'username' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = $connection->query($query);
+if ($result===false) {
 	Log::error('update_030000', __LINE__, 'Could not reset username (' . $connection->error . ')');
 	return false;
 }
-$query         = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'password' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$resetPassword = $connection->query($query);
-if (!$resetPassword) {
+$query  = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'password' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = $connection->query($query);
+if ($result===false) {
 	Log::error('update_030000', __LINE__, 'Could not reset password (' . $connection->error . ')');
 	return false;
 }
 
 // Make public albums private and reset password
 // Password now saved as crypt without md5. Legacy code has been removed.
-$query       = Database::prepare($connection, "UPDATE `?` SET `public` = 0, `password` = NULL", array(LYCHEE_TABLE_ALBUMS));
-$resetPublic = $connection->query($query);
-if (!$resetPublic) {
+$query  = Database::prepare($connection, "UPDATE `?` SET `public` = 0, `password` = NULL", array(LYCHEE_TABLE_ALBUMS));
+$result = $connection->query($query);
+if ($result===false) {
 	Log::error('update_030000', __LINE__, 'Could not reset public albums (' . $connection->error . ')');
 	return false;
 }
diff --git a/php/database/update_030001.php b/php/database/update_030001.php
index 575f02c..932effb 100644
--- a/php/database/update_030001.php
+++ b/php/database/update_030001.php
@@ -11,7 +11,7 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 // Change length of photo title
 $query  = Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_PHOTOS));
 $result = $connection->query($query);
-if (!$result) {
+if ($result===false) {
 	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 	return false;
 }
@@ -19,7 +19,7 @@ if (!$result) {
 // Change length of album title
 $query  = Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_ALBUMS));
 $result = $connection->query($query);
-if (!$result) {
+if ($result===false) {
 	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 	return false;
 }
@@ -30,7 +30,7 @@ $result = $connection->query($query);
 if ($result->num_rows===0) {
 	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('sortingAlbums', 'ORDER BY id DESC')", array(LYCHEE_TABLE_SETTINGS));
 	$result = $connection->query($query);
-	if (!$result) {
+	if ($result===false) {
 		Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
@@ -39,7 +39,7 @@ if ($result->num_rows===0) {
 // Rename sorting to sortingPhotos
 $query  = Database::prepare($connection, "UPDATE ? SET `key` = 'sortingPhotos' WHERE `key` = 'sorting' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
 $result = $connection->query($query);
-if (!$result) {
+if ($result===false) {
 	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 	return false;
 }
@@ -51,7 +51,7 @@ if ($result->num_rows===0) {
 	$identifier = md5(microtime(true));
 	$query      = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('identifier', '?')", array(LYCHEE_TABLE_SETTINGS, $identifier));
 	$result     = $connection->query($query);
-	if (!$result) {
+	if ($result===false) {
 		Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}
diff --git a/php/database/update_030003.php b/php/database/update_030003.php
index d204ad5..8145323 100644
--- a/php/database/update_030003.php
+++ b/php/database/update_030003.php
@@ -14,7 +14,7 @@ $result = $connection->query($query);
 if ($result->num_rows===0) {
 	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('skipDuplicates', '0')", array(LYCHEE_TABLE_SETTINGS));
 	$result = $connection->query($query);
-	if (!$result) {
+	if ($result===false) {
 		Log::error('update_030003', __LINE__, 'Could not update database (' . $connection->error . ')');
 		return false;
 	}

From f650de8967b937b02e47286dbb7e63e735363f2b Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 15:53:44 +0100
Subject: [PATCH 063/183] Removed newline at end of file

---
 php/Access/Admin.php      | 4 +++-
 php/Access/Guest.php      | 2 +-
 php/Modules/Album.php     | 2 +-
 php/Modules/Config.php    | 2 +-
 php/Modules/Database.php  | 2 +-
 php/Modules/Import.php    | 2 +-
 php/Modules/Photo.php     | 2 +-
 php/Modules/Validator.php | 2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index fe84782..2a5b3f5 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -336,4 +336,6 @@ final class Admin extends Access {
 
 	}
 
-}
\ No newline at end of file
+}
+
+?>
\ No newline at end of file
diff --git a/php/Access/Guest.php b/php/Access/Guest.php
index e8e2c9c..de30713 100644
--- a/php/Access/Guest.php
+++ b/php/Access/Guest.php
@@ -179,4 +179,4 @@ final class Guest extends Access {
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 57620ea..ead3348 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -750,4 +750,4 @@ final class Album {
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/php/Modules/Config.php b/php/Modules/Config.php
index 060b1df..8ce5dc5 100644
--- a/php/Modules/Config.php
+++ b/php/Modules/Config.php
@@ -65,4 +65,4 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index eec4be8..7659fbb 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -346,4 +346,4 @@ final class Database {
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index 886e83b..17b73b4 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -180,4 +180,4 @@ final class Import {
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 9f747f5..1423b6d 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -1224,4 +1224,4 @@ final class Photo {
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/php/Modules/Validator.php b/php/Modules/Validator.php
index 759969a..c20e598 100644
--- a/php/Modules/Validator.php
+++ b/php/Modules/Validator.php
@@ -38,4 +38,4 @@ final class Validator {
 
 }
 
-?>
+?>
\ No newline at end of file

From 83e3271f434b286ea090f303addc3ce3a2413115 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 17:51:17 +0100
Subject: [PATCH 064/183] Code style adjustment

---
 src/scripts/photo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index 5ca7bac..a636938 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -553,7 +553,7 @@ photo.editTags = function(photoIDs) {
 photo.setTags = function(photoIDs, tags) {
 
 	if (!photoIDs) return false
-	if (photoIDs instanceof Array===false) photoIDs = [photoIDs]
+	if (photoIDs instanceof Array===false) photoIDs = [ photoIDs ]
 
 	// Parse tags
 	tags = tags.replace(/(\ ,\ )|(\ ,)|(,\ )|(,{1,}\ {0,})|(,$|^,)/g, ',')

From 7dc4e01313126bf29bb34a95d86f7868a0668cad Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 17:51:42 +0100
Subject: [PATCH 065/183] Fixed missing params var when Album::add returns and
 error

---
 src/scripts/album.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index 6f3a9b7..0eeb637 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -112,7 +112,11 @@ album.add = function() {
 
 		if (title.length===0) title = 'Untitled'
 
-		api.post('Album::add', { title }, function(data) {
+		let params = {
+			title
+		}
+
+		api.post('Album::add', params, function(data) {
 
 			// Avoid first album to be true
 			if (data===true) data = 1

From 7b86a737af15b0a34a3b376cae4b503632838d07 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 18:49:31 +0100
Subject: [PATCH 066/183] Added Database::execute to run a query

Database::execute automatically logs errors
---
 php/Modules/Album.php          | 177 +++++++++++++++----------------
 php/Modules/Database.php       | 124 +++++++++++++---------
 php/Modules/Import.php         |  20 ++--
 php/Modules/Log.php            |  20 ++--
 php/Modules/Photo.php          | 187 ++++++++++++++++-----------------
 php/Modules/Settings.php       |  31 ++----
 php/database/update_020700.php |  30 +++---
 php/database/update_030000.php |  25 ++---
 php/database/update_030001.php |  54 +++++-----
 php/database/update_030003.php |  15 +--
 php/helpers/getGraphHeader.php |   9 +-
 php/helpers/search.php         |  12 ++-
 12 files changed, 353 insertions(+), 351 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index ead3348..9007032 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -32,15 +32,12 @@ final class Album {
 		// Database
 		$sysstamp = time();
 		$query    = Database::prepare(Database::get(), "INSERT INTO ? (title, sysstamp, public, visible) VALUES ('?', '?', '?', '?')", array(LYCHEE_TABLE_ALBUMS, $title, $sysstamp, $public, $visible));
-		$result   = Database::get()->query($query);
+		$result   = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return Database::get()->insert_id;
 
 	}
@@ -111,7 +108,7 @@ final class Album {
 
 			default:
 				$query  = Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-				$albums = Database::get()->query($query);
+				$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 				$return = $albums->fetch_assoc();
 				$return = Album::prepareData($return);
 				$query  = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
@@ -120,8 +117,11 @@ final class Album {
 		}
 
 		// Get photos
-		$photos          = Database::get()->query($query);
+		$photos          = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$previousPhotoID = '';
+
+		if ($photos===false) exit('Error: Could not get photos of album from database!');
+
 		while ($photo = $photos->fetch_assoc()) {
 
 			// Turn data from the database into a front-end friendly format
@@ -190,12 +190,9 @@ final class Album {
 		else                 $query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? WHERE public = 1 AND visible <> 0 ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
 
 		// Execute query
-		$albums = Database::get()->query($query);
+		$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($albums===false) {
-			Log::error(__METHOD__, __LINE__, 'Could not get albums from database (' . Database::get()->error . ')');
-			exit('Error: Could not get albums from database!');
-		}
+		if ($albums===false) exit('Error: Could not get albums from database!');
 
 		// For each album
 		while ($album = $albums->fetch_assoc()) {
@@ -209,12 +206,9 @@ final class Album {
 
 					// Execute query
 					$query  = Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr(Settings::get()['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
-					$thumbs = Database::get()->query($query);
+					$thumbs = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-					if ($thumbs===false) {
-						Log::error(__METHOD__, __LINE__, 'Could not get thumbs of album from database (' . Database::get()->error . ')');
-						exit('Error: Could not get thumbs of album from database!');
-					}
+					if ($thumbs===false) exit('Error: Could not get thumbs of album from database!');
 
 					// For each thumb
 					$k = 0;
@@ -255,9 +249,11 @@ final class Album {
 		 */
 
 		$query    = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE album = 0 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$unsorted = Database::get()->query($query);
+		$unsorted = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i        = 0;
 
+		if ($unsorted===false) exit('Error: Could not get unsorted photos from database!');
+
 		$return['unsorted'] = array(
 			'thumbs' => array(),
 			'num'    => $unsorted->num_rows
@@ -275,9 +271,11 @@ final class Album {
 		 */
 
 		$query   = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE star = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$starred = Database::get()->query($query);
+		$starred = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i       = 0;
 
+		if ($starred===false) exit('Error: Could not get starred photos from database!');
+
 		$return['starred'] = array(
 			'thumbs' => array(),
 			'num'    => $starred->num_rows
@@ -295,9 +293,11 @@ final class Album {
 		 */
 
 		$query  = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE public = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$public = Database::get()->query($query);
+		$public = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i      = 0;
 
+		if ($public===false) exit('Error: Could not get public photos from database!');
+
 		$return['public'] = array(
 			'thumbs' => array(),
 			'num'    => $public->num_rows
@@ -315,9 +315,11 @@ final class Album {
 		 */
 
 		$query  = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$recent = Database::get()->query($query);
+		$recent = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i      = 0;
 
+		if ($recent===false) exit('Error: Could not get recent photos from database!');
+
 		$return['recent'] = array(
 			'thumbs' => array(),
 			'num'    => $recent->num_rows
@@ -372,20 +374,17 @@ final class Album {
 		if ($this->albumIDs!=0&&is_numeric($this->albumIDs)) {
 
 			$query = Database::prepare(Database::get(), "SELECT title FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-			$album = Database::get()->query($query);
+			$album = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-			if ($album===false) {
-				Log::error(__METHOD__, __LINE__, Database::get()->error);
-				return false;
-			}
+			if ($album===false) exit('Error: Could not get album from database!');
 
-			// Fetch object
+			// Get album object
 			$album = $album->fetch_object();
 
 			// Photo not found
 			if ($album===null) {
-				Log::error(__METHOD__, __LINE__, 'Album not found. Cannot start download.');
-				return false;
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified album');
+				exit('Error: Could not find specified album!');
 			}
 
 			// Set title
@@ -401,17 +400,19 @@ final class Album {
 		// Create zip
 		$zip = new ZipArchive();
 		if ($zip->open($filename, ZIPARCHIVE::CREATE)!==TRUE) {
-			Log::error(__METHOD__, __LINE__, 'Could not create ZipArchive');
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create ZipArchive');
 			return false;
 		}
 
 		// Execute query
-		$photos = Database::get()->query($photos);
+		$photos = Database::execute(Database::get(), $photos, __METHOD__, __LINE__);
+
+		if ($album===null) exit('Error: Could not get photos from database!');
 
 		// Check if album empty
 		if ($photos->num_rows==0) {
-			Log::error(__METHOD__, __LINE__, 'Could not create ZipArchive without images');
-			return false;
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create ZipArchive without images');
+			exit('Error: Could not create ZipArchive without images!');
 		}
 
 		// Parse each path
@@ -484,15 +485,12 @@ final class Album {
 
 		// Execute query
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $title, $this->albumIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -507,15 +505,12 @@ final class Album {
 
 		// Execute query
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $description, $this->albumIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -532,8 +527,12 @@ final class Album {
 
 		// Execute query
 		$query  = Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$albums = Database::get()->query($query);
-		$album  = $albums->fetch_object();
+		$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($albums===false) return false;
+
+		// Get album object
+		$album = $albums->fetch_object();
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
@@ -555,8 +554,12 @@ final class Album {
 
 		// Execute query
 		$query  = Database::prepare(Database::get(), "SELECT downloadable FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$albums = Database::get()->query($query);
-		$album  = $albums->fetch_object();
+		$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($albums===false) return false;
+
+		// Get album object
+		$album = $albums->fetch_object();
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
@@ -581,20 +584,18 @@ final class Album {
 
 		// Set public
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET public = '?', visible = '?', downloadable = '?', password = NULL WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $public, $visible, $downloadable, $this->albumIDs));
-		$result = Database::get()->query($query);
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($result===false) return false;
 
 		// Reset permissions for photos
 		if ($public===1) {
+
 			$query  = Database::prepare(Database::get(), "UPDATE ? SET public = 0 WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
-			$result = Database::get()->query($query);
-			if ($result===false) {
-				Log::error(__METHOD__, __LINE__, Database::get()->error);
-				return false;
-			}
+			$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+			if ($result===false) return false;
+
 		}
 
 		// Call plugins
@@ -602,7 +603,6 @@ final class Album {
 
 		// Set password
 		if (isset($password)&&strlen($password)>0) return $this->setPassword($password);
-
 		return true;
 
 	}
@@ -633,15 +633,12 @@ final class Album {
 		}
 
 		// Execute query
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -656,14 +653,19 @@ final class Album {
 
 		// Execute query
 		$query  = Database::prepare(Database::get(), "SELECT password FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$albums = Database::get()->query($query);
-		$album  = $albums->fetch_object();
+		$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($albums===false) return false;
+
+		// Get album object
+		$album = $albums->fetch_object();
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
+		// Check if password is correct
 		if ($album->password=='') return true;
-		else if ($album->password===crypt($password, $album->password)) return true;
+		if ($album->password===crypt($password, $album->password)) return true;
 		return false;
 
 	}
@@ -684,27 +686,21 @@ final class Album {
 		$albumID = $albumID[0];
 
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET album = ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->albumIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 
 		// $albumIDs contains all IDs without the first albumID
 		// Convert to string
 		$filteredIDs = implode(',', $albumIDs);
 
 		$query  = Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $filteredIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -718,32 +714,37 @@ final class Album {
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		// Init vars
-		$error = false;
+		$photoIDs = array();
 
 		// Execute query
 		$query  = Database::prepare(Database::get(), "SELECT id FROM ? WHERE album IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
-		$photos = Database::get()->query($query);
+		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		// For each album delete photo
-		while ($row = $photos->fetch_object()) {
+		if ($photos===false) return false;
 
-			$photo = new Photo($row->id);
-			if (!$photo->delete($row->id)) $error = true;
+		// Only delete photos when albums contain photos
+		if ($photos->num_rows>0) {
+
+			// Add each id to photoIDs
+			while ($row = $photos->fetch_object()) $photoIDs[] = $row->id;
+
+			// Convert photoIDs to a string
+			$photoIDs = implode(',', $photoIDs);
+
+			// Delete all photos
+			$photo = new Photo($photoIDs);
+			if ($photo->delete()!==true) return false;
 
 		}
 
 		// Delete albums
 		$query  = Database::prepare(Database::get(), "DELETE FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($error) return false;
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 7659fbb..5177b75 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -87,8 +87,10 @@ final class Database {
 		else @$connection->set_charset('utf8');
 
 		// Set unicode
-		$connection->query('SET NAMES utf8;');
+		$query  = 'SET NAMES utf8';
+		$result = self::execute($connection, $query, null, null);
 
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -103,8 +105,9 @@ final class Database {
 
 		// Create database
 		$query  = self::prepare($connection, 'CREATE DATABASE IF NOT EXISTS ?', array($name));
-		$result = $connection->query($query);
+		$result = self::execute($connection, $query, null, null);
 
+		if ($result===false) return false;
 		if ($connection->select_db($name)===false) return false;
 		return true;
 
@@ -116,12 +119,14 @@ final class Database {
 		Validator::required(isset($connection), __METHOD__);
 
 		// Check if tables exist
-		$query = self::prepare($connection, 'SELECT * FROM ?, ?, ?, ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS, LYCHEE_TABLE_ALBUMS, LYCHEE_TABLE_SETTINGS, LYCHEE_TABLE_LOG));
-		if ($connection->query($query)) return true;
+		$query  = self::prepare($connection, 'SELECT * FROM ?, ?, ?, ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS, LYCHEE_TABLE_ALBUMS, LYCHEE_TABLE_SETTINGS, LYCHEE_TABLE_LOG));
+		$result = self::execute($connection, $query, null, null);
+		if ($result!==false) return true;
 
-		// Create log
+		// Check if log table exists
 		$exist  = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_LOG));
-		$result = $connection->query($exist);
+		$result = self::execute($connection, $exist, null, null);
+
 		if ($result===false) {
 
 			// Read file
@@ -132,14 +137,16 @@ final class Database {
 
 			// Create table
 			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_LOG));
-			$result = $connection->query($exist);
+			$result = self::execute($connection, $query, null, null);
+
 			if ($result===false) return false;
 
 		}
 
-		// Create settings
+		// Check if settings table exists
 		$exist  = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_SETTINGS));
-		$result = $connection->query($exist);
+		$result = self::execute($connection, $exist, __METHOD__, __LINE__);
+
 		if ($result===false) {
 
 			// Read file
@@ -147,49 +154,44 @@ final class Database {
 			$query = @file_get_contents($file);
 
 			if ($query===false) {
-				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_settings');
+				Log::error($connection, __METHOD__, __LINE__, 'Could not load query for lychee_settings');
 				return false;
 			}
 
 			// Create table
 			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
-			$result = $connection->query($exist);
-			if ($result===false) {
-				Log::error(__METHOD__, __LINE__, $connection->error);
-				return false;
-			}
+			$result = self::execute($connection, $query, __METHOD__, __LINE__);
+
+			if ($result===false) return false;
 
 			// Read file
 			$file  = __DIR__ . '/../database/settings_content.sql';
 			$query = @file_get_contents($file);
 
 			if ($query===false) {
-				Log::error(__METHOD__, __LINE__, 'Could not load content-query for lychee_settings');
+				Log::error($connection, __METHOD__, __LINE__, 'Could not load content-query for lychee_settings');
 				return false;
 			}
 
 			// Add content
 			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_SETTINGS));
-			$result = $connection->query($exist);
-			if ($result===false) {
-				Log::error(__METHOD__, __LINE__, $connection->error);
-				return false;
-			}
+			$result = self::execute($connection, $query, __METHOD__, __LINE__);
+
+			if ($result===false) return false;
 
 			// Generate identifier
 			$identifier = md5(microtime(true));
 			$query      = self::prepare($connection, "UPDATE `?` SET `value` = '?' WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS, $identifier));
-			$result     = $connection->query($exist);
-			if ($result===false) {
-				Log::error(__METHOD__, __LINE__, $connection->error);
-				return false;
-			}
+			$result     = self::execute($connection, $query, __METHOD__, __LINE__);
+
+			if ($result===false) return false;
 
 		}
 
-		// Create albums
+		// Check if albums table exists
 		$exist  = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_ALBUMS));
-		$result = $connection->query($exist);
+		$result = self::execute($connection, $exist, __METHOD__, __LINE__);
+
 		if ($result===false) {
 
 			// Read file
@@ -197,23 +199,22 @@ final class Database {
 			$query = @file_get_contents($file);
 
 			if ($query===false) {
-				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_albums');
+				Log::error($connection, __METHOD__, __LINE__, 'Could not load query for lychee_albums');
 				return false;
 			}
 
 			// Create table
 			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_ALBUMS));
-			$result = $connection->query($exist);
-			if ($result===false) {
-				Log::error(__METHOD__, __LINE__, $connection->error);
-				return false;
-			}
+			$result = self::execute($connection, $query, __METHOD__, __LINE__);
+
+			if ($result===false) return false;
 
 		}
 
-		// Create photos
+		// Check if photos table exists
 		$exist  = self::prepare($connection, 'SELECT * FROM ? LIMIT 0', array(LYCHEE_TABLE_PHOTOS));
-		$result = $connection->query($exist);
+		$result = self::execute($connection, $exist, __METHOD__, __LINE__);
+
 		if ($result===false) {
 
 			// Read file
@@ -221,17 +222,15 @@ final class Database {
 			$query = @file_get_contents($file);
 
 			if ($query===false) {
-				Log::error(__METHOD__, __LINE__, 'Could not load query for lychee_photos');
+				Log::error($connection, __METHOD__, __LINE__, 'Could not load query for lychee_photos');
 				return false;
 			}
 
 			// Create table
 			$query  = self::prepare($connection, $query, array(LYCHEE_TABLE_PHOTOS));
-			$result = $connection->query($exist);
-			if ($result===false) {
-				Log::error(__METHOD__, __LINE__, $connection->error);
-				return false;
-			}
+			$result = self::execute($connection, $query, __METHOD__, __LINE__);
+
+			if ($result===false) return false;
 
 		}
 
@@ -245,9 +244,13 @@ final class Database {
 		Validator::required(isset($connection, $dbName), __METHOD__);
 
 		// Get current version
-		$query   = self::prepare($connection, "SELECT * FROM ? WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS));
-		$results = $connection->query($query);
-		$current = $results->fetch_object()->value;
+		$query  = self::prepare($connection, "SELECT * FROM ? WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS));
+		$result = self::execute($connection, $query, __METHOD__, __LINE__);
+
+		if ($result===false) return false;
+
+		// Extract current version
+		$current = $result->fetch_object()->value;
 
 		// For each update
 		foreach (self::$versions as $version) {
@@ -270,11 +273,9 @@ final class Database {
 		Validator::required(isset($connection), __METHOD__);
 
 		$query  = self::prepare($connection, "UPDATE ? SET value = '?' WHERE `key` = 'version'", array(LYCHEE_TABLE_SETTINGS, $version));
-		$result = $connection->query($query);
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, 'Could not update database (' . $connection->error . ')');
-			return false;
-		}
+		$result = self::execute($connection, $query, __METHOD__, __LINE__);
+
+		if ($result===false) return false;
 
 	}
 
@@ -294,7 +295,7 @@ final class Database {
 			'data'        => count($data)
 		);
 
-		if (($num['data']-$num['placeholder'])<0) Log::notice(__METHOD__, __LINE__, 'Could not completely prepare query. Query has more placeholders than values.');
+		if (($num['data']-$num['placeholder'])<0) Log::notice($connection, __METHOD__, __LINE__, 'Could not completely prepare query. Query has more placeholders than values.');
 
 		foreach ($data as $value) {
 
@@ -344,6 +345,27 @@ final class Database {
 
 	}
 
+	public static function execute($connection, $query, $function, $line) {
+
+		// Check dependencies
+		Validator::required(isset($connection, $query), __METHOD__);
+
+		// Only activate logging when $function and $line is set
+		$logging = ($function===null||$line===null ? false : true);
+
+		// Execute query
+		$result = $connection->query($query);
+
+		// Check if execution failed
+		if ($result===false) {
+			if ($logging===true) Log::error($connection, $function, $line, $connection->error);
+			return false;
+		}
+
+		return $result;
+
+	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index 17b73b4..37838ab 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -46,7 +46,7 @@ final class Import {
 			$extension = getExtension($url);
 			if (!in_array(strtolower($extension), Photo::$validExtensions, true)) {
 				$error = true;
-				Log::error(__METHOD__, __LINE__, 'Photo format not supported (' . $url . ')');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Photo format not supported (' . $url . ')');
 				continue;
 			}
 
@@ -54,7 +54,7 @@ final class Import {
 			$type = @exif_imagetype($url);
 			if (!in_array($type, Photo::$validTypes, true)) {
 				$error = true;
-				Log::error(__METHOD__, __LINE__, 'Photo type not supported (' . $url . ')');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Photo type not supported (' . $url . ')');
 				continue;
 			}
 
@@ -64,14 +64,14 @@ final class Import {
 
 			if (@copy($url, $tmp_name)===false) {
 				$error = true;
-				Log::error(__METHOD__, __LINE__, 'Could not copy file (' . $tmp_name . ') to temp-folder (' . $tmp_name . ')');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not copy file (' . $tmp_name . ') to temp-folder (' . $tmp_name . ')');
 				continue;
 			}
 
 			// Import photo
 			if (!$this->photo($tmp_name, $albumID)) {
 				$error = true;
-				Log::error(__METHOD__, __LINE__, 'Could not import file: ' . $tmp_name);
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not import file (' . $tmp_name . ')');
 				continue;
 			}
 
@@ -92,7 +92,7 @@ final class Import {
 		if (substr($path, -1)==='/') $path = substr($path, 0, -1);
 
 		if (is_dir($path)===false) {
-			Log::error(__METHOD__, __LINE__, 'Given path is not a directory (' . $path . ')');
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Given path is not a directory (' . $path . ')');
 			return 'Error: Given path is not a directory!';
 		}
 
@@ -100,7 +100,7 @@ final class Import {
 		if ($path===LYCHEE_UPLOADS_BIG||($path . '/')===LYCHEE_UPLOADS_BIG||
 			$path===LYCHEE_UPLOADS_MEDIUM||($path . '/')===LYCHEE_UPLOADS_MEDIUM||
 			$path===LYCHEE_UPLOADS_THUMB||($path . '/')===LYCHEE_UPLOADS_THUMB) {
-				Log::error(__METHOD__, __LINE__, 'The given path is a reserved path of Lychee (' . $path . ')');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'The given path is a reserved path of Lychee (' . $path . ')');
 				return 'Error: Given path is a reserved path of Lychee!';
 		}
 
@@ -122,7 +122,7 @@ final class Import {
 			// the file may still be unreadable by the user
 			if (!is_readable($file)) {
 				$error = true;
-				Log::error(__METHOD__, __LINE__, 'Could not read file or directory: ' . $file);
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not read file or directory (' . $file . ')');
 				continue;
 			}
 
@@ -134,7 +134,7 @@ final class Import {
 
 				if (!$this->photo($file, $albumID)) {
 					$error = true;
-					Log::error(__METHOD__, __LINE__, 'Could not import file: ' . $file);
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not import file (' . $file . ')');
 					continue;
 				}
 
@@ -148,7 +148,7 @@ final class Import {
 
 				if ($newAlbumID===false) {
 					$error = true;
-					Log::error(__METHOD__, __LINE__, 'Could not create album in Lychee (' . $newAlbumID . ')');
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create album in Lychee (' . $newAlbumID . ')');
 					continue;
 				}
 
@@ -156,7 +156,7 @@ final class Import {
 
 				if ($import!==true&&$import!=='Notice: Import only contains albums!') {
 					$error = true;
-					Log::error(__METHOD__, __LINE__, 'Could not import folder. Function returned warning.');
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not import folder. Function returned warning.');
 					continue;
 				}
 
diff --git a/php/Modules/Log.php b/php/Modules/Log.php
index 55c4a90..954e0ab 100644
--- a/php/Modules/Log.php
+++ b/php/Modules/Log.php
@@ -4,35 +4,35 @@ namespace Lychee\Modules;
 
 final class Log {
 
-	public static function notice($function, $line, $text = '') {
+	public static function notice($connection, $function, $line, $text = '') {
 
-		return Log::text('notice', $function, $line, $text);
+		return Log::text($connection, 'notice', $function, $line, $text);
 
 	}
 
-	public static function warning($function, $line, $text = '') {
+	public static function warning($connection, $function, $line, $text = '') {
 
-		return Log::text('warning', $function, $line, $text);
+		return Log::text($connection, 'warning', $function, $line, $text);
 
 	}
 
-	public static function error($function, $line, $text = '') {
+	public static function error($connection, $function, $line, $text = '') {
 
-		return Log::text('error', $function, $line, $text);
+		return Log::text($connection, 'error', $function, $line, $text);
 
 	}
 
-	private static function text($type, $function, $line, $text = '') {
+	private static function text($connection, $type, $function, $line, $text = '') {
 
 		// Check dependencies
-		Validator::required(isset($type, $function, $line, $text), __METHOD__);
+		Validator::required(isset($connection, $type, $function, $line, $text), __METHOD__);
 
 		// Get time
 		$sysstamp = time();
 
 		// Save in database
-		$query  = Database::prepare(Database::get(), "INSERT INTO ? (time, type, function, line, text) VALUES ('?', '?', '?', '?', '?')", array(LYCHEE_TABLE_LOG, $sysstamp, $type, $function, $line, $text));
-		$result = Database::get()->query($query);
+		$query  = Database::prepare($connection, "INSERT INTO ? (time, type, function, line, text) VALUES ('?', '?', '?', '?', '?')", array(LYCHEE_TABLE_LOG, $sysstamp, $type, $function, $line, $text));
+		$result = Database::execute($connection, $query, null, null);
 
 		if ($result===false) return false;
 		return true;
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 1423b6d..fbf7854 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -39,7 +39,7 @@ final class Photo {
 		if (hasPermissions(LYCHEE_UPLOADS)===false||
 			hasPermissions(LYCHEE_UPLOADS_BIG)===false||
 			hasPermissions(LYCHEE_UPLOADS_THUMB)===false) {
-				Log::error(__METHOD__, __LINE__, 'An upload-folder is missing or not readable and writable');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'An upload-folder is missing or not readable and writable');
 				exit('Error: An upload-folder is missing or not readable and writable!');
 		}
 
@@ -80,35 +80,35 @@ final class Photo {
 
 			// Check if file exceeds the upload_max_filesize directive
 			if ($file['error']===UPLOAD_ERR_INI_SIZE) {
-				Log::error(__METHOD__, __LINE__, 'The uploaded file exceeds the upload_max_filesize directive in php.ini');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'The uploaded file exceeds the upload_max_filesize directive in php.ini');
 				if ($returnOnError===true) return false;
 				exit('Error: The uploaded file exceeds the upload_max_filesize directive in php.ini!');
 			}
 
 			// Check if file was only partially uploaded
 			if ($file['error']===UPLOAD_ERR_PARTIAL) {
-				Log::error(__METHOD__, __LINE__, 'The uploaded file was only partially uploaded');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'The uploaded file was only partially uploaded');
 				if ($returnOnError===true) return false;
 				exit('Error: The uploaded file was only partially uploaded!');
 			}
 
 			// Check if writing file to disk failed
 			if ($file['error']===UPLOAD_ERR_CANT_WRITE) {
-				Log::error(__METHOD__, __LINE__, 'Failed to write photo to disk');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Failed to write photo to disk');
 				if ($returnOnError===true) return false;
 				exit('Error: Failed to write photo to disk!');
 			}
 
 			// Check if a extension stopped the file upload
 			if ($file['error']===UPLOAD_ERR_EXTENSION) {
-				Log::error(__METHOD__, __LINE__, 'A PHP extension stopped the file upload');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'A PHP extension stopped the file upload');
 				if ($returnOnError===true) return false;
 				exit('Error: A PHP extension stopped the file upload!');
 			}
 
 			// Check if the upload was successful
 			if ($file['error']!==UPLOAD_ERR_OK) {
-				Log::error(__METHOD__, __LINE__, 'Upload contains an error (' . $file['error'] . ')');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Upload contains an error (' . $file['error'] . ')');
 				if ($returnOnError===true) return false;
 				exit('Error: Upload failed!');
 			}
@@ -116,7 +116,7 @@ final class Photo {
 			// Verify extension
 			$extension = getExtension($file['name']);
 			if (!in_array(strtolower($extension), self::$validExtensions, true)) {
-				Log::error(__METHOD__, __LINE__, 'Photo format not supported');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Photo format not supported');
 				if ($returnOnError===true) return false;
 				exit('Error: Photo format not supported!');
 			}
@@ -124,7 +124,7 @@ final class Photo {
 			// Verify image
 			$type = @exif_imagetype($file['tmp_name']);
 			if (!in_array($type, self::$validTypes, true)) {
-				Log::error(__METHOD__, __LINE__, 'Photo type not supported');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Photo type not supported');
 				if ($returnOnError===true) return false;
 				exit('Error: Photo type not supported!');
 			}
@@ -141,7 +141,7 @@ final class Photo {
 			// Calculate checksum
 			$checksum = sha1_file($tmp_name);
 			if ($checksum===false) {
-				Log::error(__METHOD__, __LINE__, 'Could not calculate checksum for photo');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not calculate checksum for photo');
 				if ($returnOnError===true) return false;
 				exit('Error: Could not calculate checksum for photo!');
 			}
@@ -171,13 +171,13 @@ final class Photo {
 				// Import if not uploaded via web
 				if (!is_uploaded_file($tmp_name)) {
 					if (!@copy($tmp_name, $path)) {
-						Log::error(__METHOD__, __LINE__, 'Could not copy photo to uploads');
+						Log::error(Database::get(), __METHOD__, __LINE__, 'Could not copy photo to uploads');
 						if ($returnOnError===true) return false;
 						exit('Error: Could not copy photo to uploads!');
 					} else @unlink($tmp_name);
 				} else {
 					if (!@move_uploaded_file($tmp_name, $path)) {
-						Log::error(__METHOD__, __LINE__, 'Could not move photo to uploads');
+						Log::error(Database::get(), __METHOD__, __LINE__, 'Could not move photo to uploads');
 						if ($returnOnError===true) return false;
 						exit('Error: Could not move photo to uploads!');
 					}
@@ -188,7 +188,7 @@ final class Photo {
 				// Photo already exists
 				// Check if the user wants to skip duplicates
 				if (Settings::get()['skipDuplicates']==='1') {
-					Log::notice(__METHOD__, __LINE__, 'Skipped upload of existing photo because skipDuplicates is activated');
+					Log::notice(Database::get(), __METHOD__, __LINE__, 'Skipped upload of existing photo because skipDuplicates is activated');
 					if ($returnOnError===true) return false;
 					exit('Warning: This photo has been skipped because it\'s already in your library.');
 				}
@@ -210,7 +210,7 @@ final class Photo {
 				if ($file['type']==='image/jpeg'&&isset($info['orientation'])&&$info['orientation']!=='') {
 					$adjustFile = $this->adjustFile($path, $info);
 					if ($adjustFile!==false) $info = $adjustFile;
-					else Log::notice(__METHOD__, __LINE__, 'Skipped adjustment of photo (' . $info['title'] . ')');
+					else Log::notice(Database::get(), __METHOD__, __LINE__, 'Skipped adjustment of photo (' . $info['title'] . ')');
 				}
 
 				// Set original date
@@ -218,7 +218,7 @@ final class Photo {
 
 				// Create Thumb
 				if (!$this->createThumb($path, $photo_name, $info['type'], $info['width'], $info['height'])) {
-					Log::error(__METHOD__, __LINE__, 'Could not create thumbnail for photo');
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create thumbnail for photo');
 					if ($returnOnError===true) return false;
 					exit('Error: Could not create thumbnail for photo!');
 				}
@@ -235,10 +235,9 @@ final class Photo {
 			// Save to DB
 			$values = array(LYCHEE_TABLE_PHOTOS, $id, $info['title'], $photo_name, $description, $tags, $info['type'], $info['width'], $info['height'], $info['size'], $info['iso'], $info['aperture'], $info['make'], $info['model'], $info['shutter'], $info['focal'], $info['takestamp'], $path_thumb, $albumID, $public, $star, $checksum, $medium);
 			$query  = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum, medium) VALUES ('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?')", $values);
-			$result = Database::get()->query($query);
+			$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 			if ($result===false) {
-				Log::error(__METHOD__, __LINE__, Database::get()->error);
 				if ($returnOnError===true) return false;
 				exit('Error: Could not save photo in database!');
 			}
@@ -258,12 +257,9 @@ final class Photo {
 		if (isset($photoID)) $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' AND id <> '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum, $photoID));
 		else $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum));
 
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, 'Could not check for existing photos with the same checksum (' . Database::get()->error . ')');
-			return false;
-		}
+		if ($result===false) return false;
 
 		if ($result->num_rows===1) {
 
@@ -343,7 +339,7 @@ final class Photo {
 				case 'image/jpeg': $sourceImg = imagecreatefromjpeg($url); break;
 				case 'image/png':  $sourceImg = imagecreatefrompng($url); break;
 				case 'image/gif':  $sourceImg = imagecreatefromgif($url); break;
-				default:           Log::error(__METHOD__, __LINE__, 'Type of photo is not supported');
+				default:           Log::error(Database::get(), __METHOD__, __LINE__, 'Type of photo is not supported');
 				                   return false;
 				                   break;
 			}
@@ -398,7 +394,7 @@ final class Photo {
 		if (hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false) {
 
 			// Permissions are missing
-			Log::notice(__METHOD__, __LINE__, 'Skipped creation of medium-photo, because uploads/medium/ is missing or not readable and writable.');
+			Log::notice(Database::get(), __METHOD__, __LINE__, 'Skipped creation of medium-photo, because uploads/medium/ is missing or not readable and writable.');
 			$error = true;
 
 		}
@@ -423,7 +419,7 @@ final class Photo {
 			// Save image
 			try { $medium->writeImage($newUrl); }
 			catch (ImagickException $err) {
-				Log::notice(__METHOD__, __LINE__, 'Could not save medium-photo: ' . $err->getMessage());
+				Log::notice(Database::get(), __METHOD__, __LINE__, 'Could not save medium-photo: ' . $err->getMessage());
 				$error = true;
 			}
 
@@ -636,8 +632,12 @@ final class Photo {
 
 		// Get photo
 		$query  = Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos = Database::get()->query($query);
-		$photo  = $photos->fetch_assoc();
+		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($photos===false) exit('Error: Could not get photo from database!');
+
+		// Get photo object
+		$photo = $photos->fetch_assoc();
 
 		// Parse photo
 		$photo['sysdate'] = date('d M. Y', substr($photo['id'], 0, -4));
@@ -659,8 +659,12 @@ final class Photo {
 
 				// Get album
 				$query  = Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $photo['album']));
-				$albums = Database::get()->query($query);
-				$album  = $albums->fetch_assoc();
+				$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+				if ($albums===false) exit('Error: Could not get album of photo from database!');
+
+				// Get album object
+				$album = $albums->fetch_assoc();
 
 				// Parse album
 				$photo['public'] = ($album['public']==='1' ? '2' : $photo['public']);
@@ -799,26 +803,23 @@ final class Photo {
 
 		// Get photo
 		$query  = Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos = Database::get()->query($query);
+		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($photos===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($photos===false) exit('Error: Could not get photo from database!');
 
 		// Get photo object
 		$photo = $photos->fetch_object();
 
 		// Photo not found
 		if ($photo===null) {
-			Log::error(__METHOD__, __LINE__, 'Album not found. Cannot start download.');
-			return false;
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified photo');
+			exit('Error: Could not find specified photo!');
 		}
 
 		// Get extension
 		$extension = getExtension($photo->url);
 		if ($extension===false) {
-			Log::error(__METHOD__, __LINE__, 'Invalid photo extension');
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Invalid photo extension');
 			return false;
 		}
 
@@ -866,15 +867,12 @@ final class Photo {
 
 		// Set title
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET title = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $title, $this->photoIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -896,15 +894,12 @@ final class Photo {
 
 		// Set description
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET description = '?' WHERE id IN ('?')", array(LYCHEE_TABLE_PHOTOS, $description, $this->photoIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -927,7 +922,9 @@ final class Photo {
 
 		// Get photos
 		$query  = Database::prepare(Database::get(), "SELECT id, star FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos = Database::get()->query($query);
+		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($photos===false) return false;
 
 		// For each photo
 		while ($photo = $photos->fetch_object()) {
@@ -937,7 +934,7 @@ final class Photo {
 
 			// Set star
 			$query  = Database::prepare(Database::get(), "UPDATE ? SET star = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $star, $photo->id));
-			$result = Database::get()->query($query);
+			$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 			if ($result===false) $error = true;
 
@@ -946,10 +943,7 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($error===true) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($error===true) return false;
 		return true;
 
 	}
@@ -970,8 +964,12 @@ final class Photo {
 
 		// Get photo
 		$query  = Database::prepare(Database::get(), "SELECT public, album FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos = Database::get()->query($query);
-		$photo  = $photos->fetch_object();
+		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($photos===false) return 0;
+
+		// Get photo object
+		$photo = $photos->fetch_object();
 
 		// Check if public
 		if ($photo->public==='1') {
@@ -1017,23 +1015,24 @@ final class Photo {
 
 		// Get public
 		$query  = Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos = Database::get()->query($query);
-		$photo  = $photos->fetch_object();
+		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($photos===false) return false;
+
+		// Get photo object
+		$photo = $photos->fetch_object();
 
 		// Invert public
 		$public = ($photo->public==0 ? 1 : 0);
 
 		// Set public
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET public = '?' WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $public, $this->photoIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -1053,15 +1052,12 @@ final class Photo {
 
 		// Set album
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET album = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $albumID, $this->photoIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -1087,15 +1083,12 @@ final class Photo {
 
 		// Set tags
 		$query  = Database::prepare(Database::get(), "UPDATE ? SET tags = '?' WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $tags, $this->photoIDs));
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		if ($result===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($result===false) return false;
 		return true;
 
 	}
@@ -1113,14 +1106,14 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
+		// Init vars
+		$error = false;
+
 		// Get photos
 		$query  = Database::prepare(Database::get(), "SELECT id, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos = Database::get()->query($query);
+		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($photos===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($photos===false) return false;
 
 		// For each photo
 		while ($photo = $photos->fetch_object()) {
@@ -1132,15 +1125,13 @@ final class Photo {
 			// Duplicate entry
 			$values = array(LYCHEE_TABLE_PHOTOS, $id, LYCHEE_TABLE_PHOTOS, $photo->id);
 			$query  = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum) SELECT '?' AS id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum FROM ? WHERE id = '?'", $values);
-			$result = Database::get()->query($query);
+			$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-			if ($result===false) {
-				Log::error(__METHOD__, __LINE__, Database::get()->error);
-				return false;
-			}
+			if ($result===false) $error = true;
 
 		}
 
+		if ($error===true) return false;
 		return true;
 
 	}
@@ -1158,14 +1149,14 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
+		// Init vars
+		$error = false;
+
 		// Get photos
 		$query  = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, checksum FROM ? WHERE id IN (?)", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
-		$photos = Database::get()->query($query);
+		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($photos===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if ($photos===false) return false;
 
 		// For each photo
 		while ($photo = $photos->fetch_object()) {
@@ -1180,44 +1171,42 @@ final class Photo {
 
 				// Delete big
 				if (file_exists(LYCHEE_UPLOADS_BIG . $photo->url)&&!unlink(LYCHEE_UPLOADS_BIG . $photo->url)) {
-					Log::error(__METHOD__, __LINE__, 'Could not delete photo in uploads/big/');
-					return false;
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not delete photo in uploads/big/');
+					$error = true;
 				}
 
 				// Delete medium
 				if (file_exists(LYCHEE_UPLOADS_MEDIUM . $photo->url)&&!unlink(LYCHEE_UPLOADS_MEDIUM . $photo->url)) {
-					Log::error(__METHOD__, __LINE__, 'Could not delete photo in uploads/medium/');
-					return false;
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not delete photo in uploads/medium/');
+					$error = true;
 				}
 
 				// Delete thumb
 				if (file_exists(LYCHEE_UPLOADS_THUMB . $photo->thumbUrl)&&!unlink(LYCHEE_UPLOADS_THUMB . $photo->thumbUrl)) {
-					Log::error(__METHOD__, __LINE__, 'Could not delete photo in uploads/thumb/');
-					return false;
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not delete photo in uploads/thumb/');
+					$error = true;
 				}
 
 				// Delete thumb@2x
 				if (file_exists(LYCHEE_UPLOADS_THUMB . $thumbUrl2x)&&!unlink(LYCHEE_UPLOADS_THUMB . $thumbUrl2x)) {
-					Log::error(__METHOD__, __LINE__, 'Could not delete high-res photo in uploads/thumb/');
-					return false;
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not delete high-res photo in uploads/thumb/');
+					$error = true;
 				}
 
 			}
 
 			// Delete db entry
 			$query  = Database::prepare(Database::get(), "DELETE FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photo->id));
-			$result = Database::get()->query($query);
+			$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-			if ($result===false) {
-				Log::error(__METHOD__, __LINE__, Database::get()->error);
-				return false;
-			}
+			if ($result===false) $error = true;
 
 		}
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
+		if ($error===true) return false;
 		return true;
 
 	}
diff --git a/php/Modules/Settings.php b/php/Modules/Settings.php
index 17cef65..c3e1f1c 100755
--- a/php/Modules/Settings.php
+++ b/php/Modules/Settings.php
@@ -12,7 +12,7 @@ final class Settings {
 
 		// Execute query
 		$query    = Database::prepare(Database::get(), "SELECT * FROM ?", array(LYCHEE_TABLE_SETTINGS));
-		$settings = Database::get()->query($query);
+		$settings = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Add each to return
 		while ($setting = $settings->fetch_object()) $return[$setting->key] = $setting->value;
@@ -43,7 +43,7 @@ final class Settings {
 
 		}
 
-		$result = Database::get()->query($query);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		if ($result===false) return false;
 		return true;
@@ -79,10 +79,7 @@ final class Settings {
 		// Execute query
 		// Do not prepare $username because it is hashed and save
 		// Preparing (escaping) the username would destroy the hash
-		if (self::set('username', $username, true)===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if (self::set('username', $username, true)===false) return false;
 		return true;
 
 	}
@@ -97,10 +94,7 @@ final class Settings {
 
 		// Do not prepare $password because it is hashed and save
 		// Preparing (escaping) the password would destroy the hash
-		if (self::set('password', $password, true)===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if (self::set('password', $password, true)===false) return false;
 		return true;
 
 	}
@@ -108,14 +102,11 @@ final class Settings {
 	public static function setDropboxKey($dropboxKey) {
 
 		if (strlen($dropboxKey)<1||strlen($dropboxKey)>50) {
-			Log::notice(__METHOD__, __LINE__, 'Dropbox key is either too short or too long');
+			Log::notice(Database::get(), __METHOD__, __LINE__, 'Dropbox key is either too short or too long');
 			return false;
 		}
 
-		if (self::set('dropboxKey', $dropboxKey)===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if (self::set('dropboxKey', $dropboxKey)===false) return false;
 		return true;
 
 	}
@@ -152,10 +143,7 @@ final class Settings {
 		// Do not prepare $sorting because it is a true statement
 		// Preparing (escaping) the sorting would destroy it
 		// $sorting is save and can't contain user-input
-		if (self::set('sortingPhotos', $sorting, true)===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if (self::set('sortingPhotos', $sorting, true)===false) return false;
 		return true;
 
 	}
@@ -189,10 +177,7 @@ final class Settings {
 		// Do not prepare $sorting because it is a true statement
 		// Preparing (escaping) the sorting would destroy it
 		// $sorting is save and can't contain user-input
-		if (self::set('sortingAlbums', $sorting, true)===false) {
-			Log::error(__METHOD__, __LINE__, Database::get()->error);
-			return false;
-		}
+		if (self::set('sortingAlbums', $sorting, true)===false) return false;
 		return true;
 
 	}
diff --git a/php/database/update_020700.php b/php/database/update_020700.php
index 5720970..d59ea7f 100644
--- a/php/database/update_020700.php
+++ b/php/database/update_020700.php
@@ -10,34 +10,38 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 // Add medium to photos
 $query  = Database::prepare($connection, "SELECT `medium` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
-$result = $connection->query($query);
+$result = Database::execute($connection, $query, 'update_020700', __LINE__);
+
 if ($result===false) {
+
 	$query  = Database::prepare($connection, "ALTER TABLE `?` ADD `medium` TINYINT(1) NOT NULL DEFAULT 0", array(LYCHEE_TABLE_PHOTOS));
-	$result = $connection->query($query);
-	if ($result===false) {
-		Log::error('update_020700', __LINE__, 'Could not update database (' . $connection->error . ')');
-		return false;
-	}
+	$result = Database::execute($connection, $query, 'update_020700', __LINE__);
+
+	if ($result===false) return false;
+
 }
 
 // Create medium folder
 if (is_dir(LYCHEE_UPLOADS_MEDIUM)===false) {
+
 	// Only create the folder when it is missing
 	if (@mkdir(LYCHEE_UPLOADS_MEDIUM)===false) {
-		Log::error('update_020700', __LINE__, 'Could not create medium-folder');
+		Log::error($connection, 'update_020700', __LINE__, 'Could not create medium-folder');
 	}
+
 }
 
 // Add medium to settings
 $query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'medium' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result = $connection->query($query);
+$result = Database::execute($connection, $query, 'update_020700', __LINE__);
+
 if ($result->num_rows===0) {
+
 	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('medium', '1')", array(LYCHEE_TABLE_SETTINGS));
-	$result = $connection->query($query);
-	if ($result===false) {
-		Log::error('update_020700', __LINE__, 'Could not update database (' . $connection->error . ')');
-		return false;
-	}
+	$result = Database::execute($connection, $query, 'update_020700', __LINE__);
+
+	if ($result===false) return false;
+
 }
 
 // Set version
diff --git a/php/database/update_030000.php b/php/database/update_030000.php
index 1600659..3557be3 100644
--- a/php/database/update_030000.php
+++ b/php/database/update_030000.php
@@ -11,26 +11,21 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 // Remove login
 // Login now saved as crypt without md5. Legacy code has been removed.
 $query  = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'username' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result = $connection->query($query);
-if ($result===false) {
-	Log::error('update_030000', __LINE__, 'Could not reset username (' . $connection->error . ')');
-	return false;
-}
+$result = Database::execute($connection, $query, 'update_030000', __LINE__);
+
+if ($result===false) return false;
+
 $query  = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'password' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result = $connection->query($query);
-if ($result===false) {
-	Log::error('update_030000', __LINE__, 'Could not reset password (' . $connection->error . ')');
-	return false;
-}
+$result = Database::execute($connection, $query, 'update_030000', __LINE__);
+
+if ($result===false) return false;
 
 // Make public albums private and reset password
 // Password now saved as crypt without md5. Legacy code has been removed.
 $query  = Database::prepare($connection, "UPDATE `?` SET `public` = 0, `password` = NULL", array(LYCHEE_TABLE_ALBUMS));
-$result = $connection->query($query);
-if ($result===false) {
-	Log::error('update_030000', __LINE__, 'Could not reset public albums (' . $connection->error . ')');
-	return false;
-}
+$result = Database::execute($connection, $query, 'update_030000', __LINE__);
+
+if ($result===false) return false;
 
 // Set version
 if (Database::setVersion($connection, '030000')===false) return false;
diff --git a/php/database/update_030001.php b/php/database/update_030001.php
index 932effb..9193fef 100644
--- a/php/database/update_030001.php
+++ b/php/database/update_030001.php
@@ -10,51 +10,51 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 // Change length of photo title
 $query  = Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_PHOTOS));
-$result = $connection->query($query);
-if ($result===false) {
-	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
-	return false;
-}
+$result = Database::execute($connection, $query, 'update_030001', __LINE__);
+
+if ($result===false) return false;
 
 // Change length of album title
 $query  = Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_ALBUMS));
-$result = $connection->query($query);
-if ($result===false) {
-	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
-	return false;
-}
+$result = Database::execute($connection, $query, 'update_030001', __LINE__);
+
+if ($result===false) return false;
 
 // Add album sorting to settings
 $query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'sortingAlbums' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result = $connection->query($query);
+$result = Database::execute($connection, $query, 'update_030001', __LINE__);
+
+if ($result===false) return false;
+
 if ($result->num_rows===0) {
+
 	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('sortingAlbums', 'ORDER BY id DESC')", array(LYCHEE_TABLE_SETTINGS));
-	$result = $connection->query($query);
-	if ($result===false) {
-		Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
-		return false;
-	}
+	$result = Database::execute($connection, $query, 'update_030001', __LINE__);
+
+	if ($result===false) return false;
+
 }
 
 // Rename sorting to sortingPhotos
 $query  = Database::prepare($connection, "UPDATE ? SET `key` = 'sortingPhotos' WHERE `key` = 'sorting' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result = $connection->query($query);
-if ($result===false) {
-	Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
-	return false;
-}
+$result = Database::execute($connection, $query, 'update_030001', __LINE__);
+
+if ($result===false) return false;
 
 // Add identifier to settings
 $query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result = $connection->query($query);
+$result = Database::execute($connection, $query, 'update_030001', __LINE__);
+
+if ($result===false) return false;
+
 if ($result->num_rows===0) {
+
 	$identifier = md5(microtime(true));
 	$query      = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('identifier', '?')", array(LYCHEE_TABLE_SETTINGS, $identifier));
-	$result     = $connection->query($query);
-	if ($result===false) {
-		Log::error('update_030001', __LINE__, 'Could not update database (' . $connection->error . ')');
-		return false;
-	}
+	$result     = Database::execute($connection, $query, 'update_030001', __LINE__);
+
+	if ($result===false) return false;
+
 }
 
 // Set version
diff --git a/php/database/update_030003.php b/php/database/update_030003.php
index 8145323..95876d1 100644
--- a/php/database/update_030003.php
+++ b/php/database/update_030003.php
@@ -10,14 +10,17 @@ if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
 
 // Add skipDuplicates to settings
 $query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'skipDuplicates' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result = $connection->query($query);
+$result = Database::execute($connection, $query, 'update_030003', __LINE__);
+
+if ($result===false) return false;
+
 if ($result->num_rows===0) {
+
 	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('skipDuplicates', '0')", array(LYCHEE_TABLE_SETTINGS));
-	$result = $connection->query($query);
-	if ($result===false) {
-		Log::error('update_030003', __LINE__, 'Could not update database (' . $connection->error . ')');
-		return false;
-	}
+	$result = Database::execute($connection, $query, 'update_030003', __LINE__);
+
+	if ($result===false) return false;
+
 }
 
 // Set version
diff --git a/php/helpers/getGraphHeader.php b/php/helpers/getGraphHeader.php
index 8843a96..77e48a7 100644
--- a/php/helpers/getGraphHeader.php
+++ b/php/helpers/getGraphHeader.php
@@ -9,17 +9,14 @@ function getGraphHeader($photoID) {
 	if ($photo->getPublic('')===false) return false;
 
 	$query  = Database::prepare(Database::get(), "SELECT title, description, url, medium FROM ? WHERE id = '?'", array(LYCHEE_TABLE_PHOTOS, $photoID));
-	$result = Database::get()->query($query);
+	$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-	if ($result===false) {
-		Log::error(__METHOD__, __LINE__, Database::get()->error);
-		return false;
-	}
+	if ($result===false) return false;
 
 	$row = $result->fetch_object();
 
 	if ($row===null) {
-		Log::error(__METHOD__, __LINE__, 'Could not find photo in database');
+		Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find photo in database');
 		return false;
 	}
 
diff --git a/php/helpers/search.php b/php/helpers/search.php
index 6b17fd9..75b46b0 100755
--- a/php/helpers/search.php
+++ b/php/helpers/search.php
@@ -18,7 +18,9 @@ function search($term) {
 	 */
 
 	$query  = Database::prepare(Database::get(), "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term));
-	$result = Database::get()->query($query);
+	$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+	if ($result===false) return false;
 
 	while($photo = $result->fetch_assoc()) {
 
@@ -32,7 +34,9 @@ function search($term) {
 	 */
 
 	$query  = Database::prepare(Database::get(), "SELECT id, title, public, sysstamp, password FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%'", array(LYCHEE_TABLE_ALBUMS, $term, $term));
-	$result = Database::get()->query($query);
+	$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+	if ($result===false) return false;
 
 	while($album = $result->fetch_assoc()) {
 
@@ -41,7 +45,9 @@ function search($term) {
 
 		// Thumbs
 		$query  = Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' " . Settings::get()['sortingPhotos'] . " LIMIT 0, 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
-		$thumbs = Database::get()->query($query);
+		$thumbs = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($thumbs===false) return false;
 
 		// For each thumb
 		$k = 0;

From 861c010cb722e23846539819f4bd9922a592fa0a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 31 Jan 2016 19:19:03 +0100
Subject: [PATCH 067/183] Rebuild

---
 dist/main.js | Bin 192604 -> 192607 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index fb1b9858be5599778086302b0d507decbb98683a..ae6dcd81bebd31692233c09c4b8184c18d8fddcd 100644
GIT binary patch
delta 77
zcmV-T0J8tw;0xd23xKo%<HaaDc42ZLZ#{c-X>@F5I&^(IVQ^_KaBp*TC?Y{@Vs&jg
jI$>mFA}nv01I7Vgmu<}f2bZ7E0T+jb#sRm5#sb$V>Pa6u

delta 74
zcmV-Q0JZ<$;0xT~3xKo%<HaB>VQ^_KaBp*TC?Y{@Vs&jgI$>mFA}o7!X>@F5I&^)P
g3&sIomk4(P440zM0T-9RbOHp2jK%@CjK%`fDR)L4l>h($


From c4c2e9169edd8820f101dfab3ed0b3a125d97a7a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Mon, 1 Feb 2016 09:44:23 +0100
Subject: [PATCH 068/183] Removed thumb quality setting

---
 docs/Settings.md                  | 6 ------
 php/Modules/Photo.php             | 9 ++++++---
 php/Modules/Session.php           | 1 -
 php/database/settings_content.sql | 1 -
 plugins/Diagnostics/index.php     | 1 -
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/docs/Settings.md b/docs/Settings.md
index b91c0f4..6bcd95f 100644
--- a/docs/Settings.md
+++ b/docs/Settings.md
@@ -22,12 +22,6 @@ All settings are stored in the database. You can change the properties manually,
 
 Your photos and albums are protected by a username and password. If both rows are empty, Lychee will prompt you to set them.
 
-#### Thumb Quality
-
-	thumbQuality = [0-100]
-
-Less means an inferiority quality of your thumbs, but faster loading. More means a better quality of your thumbs, but slower loading. The default value is 90. The allowed values are between 0 and 100.
-
 #### Check For Updates
 
 	checkForUpdates = [0|1]
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index fbf7854..e47712b 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -285,6 +285,9 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
+		// Quality of thumbnails
+		$thumbQuality = 90;
+
 		// Size of the thumbnail
 		$newWidth  = 200;
 		$newHeight = 200;
@@ -299,7 +302,7 @@ final class Photo {
 			// Read image
 			$thumb = new Imagick();
 			$thumb->readImage($url);
-			$thumb->setImageCompressionQuality(Settings::get()['thumbQuality']);
+			$thumb->setImageCompressionQuality($thumbQuality);
 			$thumb->setImageFormat('jpeg');
 
 			// Copy image for 2nd thumb version
@@ -346,12 +349,12 @@ final class Photo {
 
 			// Create thumb
 			fastImageCopyResampled($thumb, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth, $newHeight, $newSize, $newSize);
-			imagejpeg($thumb, $newUrl, Settings::get()['thumbQuality']);
+			imagejpeg($thumb, $newUrl, $thumbQuality);
 			imagedestroy($thumb);
 
 			// Create retina thumb
 			fastImageCopyResampled($thumb2x, $sourceImg, 0, 0, $startWidth, $startHeight, $newWidth*2, $newHeight*2, $newSize, $newSize);
-			imagejpeg($thumb2x, $newUrl2x, Settings::get()['thumbQuality']);
+			imagejpeg($thumb2x, $newUrl2x, $thumbQuality);
 			imagedestroy($thumb2x);
 
 			// Free memory
diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index 94c4278..126fb28 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -42,7 +42,6 @@ final class Session {
 
 			// Unset unused vars
 			unset($return['config']['skipDuplicates']);
-			unset($return['config']['thumbQuality']);
 			unset($return['config']['sortingAlbums']);
 			unset($return['config']['sortingPhotos']);
 			unset($return['config']['dropboxKey']);
diff --git a/php/database/settings_content.sql b/php/database/settings_content.sql
index 907e6c4..4074590 100644
--- a/php/database/settings_content.sql
+++ b/php/database/settings_content.sql
@@ -6,7 +6,6 @@ VALUES
   ('version',''),
   ('username',''),
   ('password',''),
-  ('thumbQuality','90'),
   ('checkForUpdates','1'),
   ('sortingPhotos','ORDER BY id DESC'),
   ('sortingAlbums','ORDER BY id DESC'),
diff --git a/plugins/Diagnostics/index.php b/plugins/Diagnostics/index.php
index 70a89ac..9369c4d 100644
--- a/plugins/Diagnostics/index.php
+++ b/plugins/Diagnostics/index.php
@@ -78,7 +78,6 @@ $settings = Settings::get();
 # Settings
 if (!isset($settings['username'])||$settings['username']=='')				$error .= ('Error: Username empty or not set in database' . PHP_EOL);
 if (!isset($settings['password'])||$settings['password']=='')				$error .= ('Error: Password empty or not set in database' . PHP_EOL);
-if (!isset($settings['thumbQuality'])||$settings['thumbQuality']=='')		$error .= ('Error: No or wrong property for thumbQuality in database' . PHP_EOL);
 if (!isset($settings['sortingPhotos'])||$settings['sortingPhotos']=='')		$error .= ('Error: Wrong property for sortingPhotos in database' . PHP_EOL);
 if (!isset($settings['sortingAlbums'])||$settings['sortingAlbums']=='')		$error .= ('Error: Wrong property for sortingAlbums in database' . PHP_EOL);
 if (!isset($settings['plugins']))											$error .= ('Error: No property for plugins in database' . PHP_EOL);

From 8d53d9e689c189e0eb33a840d84978c9af51d58f Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Mon, 1 Feb 2016 09:49:05 +0100
Subject: [PATCH 069/183] Added "How to change the title of the site?" to the
 FAQ #455

---
 docs/FAQ.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index d0764a4..5c1dadb 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -53,3 +53,6 @@ Yes. Lychee uses ImageMagick when available.
 
 #### Blank screen when viewing a photo using iOS
 There's a problem with images compressed by ImageOptim. [Read more.](https://github.com/electerious/Lychee/issues/175#issuecomment-47403992)
+
+#### How to change the title of the site?
+[#455](https://github.com/electerious/Lychee/issues/455)
\ No newline at end of file

From 8edb9902131b67dd4575f1ece3f3e2151612e30a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 6 Feb 2016 23:23:10 +0100
Subject: [PATCH 070/183] Updated notice message

---
 php/Modules/Photo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index e47712b..6c0ac3c 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -422,7 +422,7 @@ final class Photo {
 			// Save image
 			try { $medium->writeImage($newUrl); }
 			catch (ImagickException $err) {
-				Log::notice(Database::get(), __METHOD__, __LINE__, 'Could not save medium-photo: ' . $err->getMessage());
+				Log::notice(Database::get(), __METHOD__, __LINE__, 'Could not save medium-photo (' . $err->getMessage() . ')');
 				$error = true;
 			}
 

From be5bb7ee6efee2674c5dfcdbfc7c3dec45d5abd4 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 6 Feb 2016 23:23:25 +0100
Subject: [PATCH 071/183] Removed unused Log::warning

---
 php/Modules/Log.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/php/Modules/Log.php b/php/Modules/Log.php
index 954e0ab..83408e7 100644
--- a/php/Modules/Log.php
+++ b/php/Modules/Log.php
@@ -10,12 +10,6 @@ final class Log {
 
 	}
 
-	public static function warning($connection, $function, $line, $text = '') {
-
-		return Log::text($connection, 'warning', $function, $line, $text);
-
-	}
-
 	public static function error($connection, $function, $line, $text = '') {
 
 		return Log::text($connection, 'error', $function, $line, $text);

From 34f87367e369a362358561a6aa836deacb3330ad Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 6 Feb 2016 23:53:17 +0100
Subject: [PATCH 072/183] Updated code syntax of Log and Diagnostics

---
 plugins/Diagnostics/index.php | 135 +++++++++++++++++-----------------
 plugins/Log/index.php         |  37 +++++-----
 2 files changed, 85 insertions(+), 87 deletions(-)

diff --git a/plugins/Diagnostics/index.php b/plugins/Diagnostics/index.php
index 9369c4d..a17f428 100644
--- a/plugins/Diagnostics/index.php
+++ b/plugins/Diagnostics/index.php
@@ -1,11 +1,10 @@
 <?php
 
-###
-# @name			Check Plugin
-# @author		Tobias Reich
-# @copyright	2015 by Tobias Reich
-# @description	This file takes a look at your Lychee-configuration and displays all errors it can find.
-###
+/**
+ * @author      Tobias Reich
+ * @copyright   2015 by Tobias Reich
+ * @description This file takes a look at your Lychee-configuration and displays all errors it can find.
+ */
 
 namespace Diagnostics;
 
@@ -19,107 +18,107 @@ require($lychee . 'php/autoload.php');
 
 require($lychee . 'php/helpers/hasPermissions.php');
 
-# Start the session
+// Start the session
 session_start();
 
-# Set content
+// Set content
 header('content-type: text/plain');
 
-# Declare
+// Declare
 $error = '';
 
-# Show separator
+// Show separator
 echo('Diagnostics' . PHP_EOL);
 echo('-----------' . PHP_EOL);
 
-# PHP Version
-if (floatval(phpversion())<5.5)		$error .= ('Error: Upgrade to PHP 5.5 or higher' . PHP_EOL);
+// PHP Version
+if (floatval(phpversion())<5.5)    $error .= ('Error: Upgrade to PHP 5.5 or higher' . PHP_EOL);
 
-# Extensions
-if (!extension_loaded('session'))	$error .= ('Error: PHP session extension not activated' . PHP_EOL);
-if (!extension_loaded('exif'))		$error .= ('Error: PHP exif extension not activated' . PHP_EOL);
-if (!extension_loaded('mbstring'))	$error .= ('Error: PHP mbstring extension not activated' . PHP_EOL);
-if (!extension_loaded('gd'))		$error .= ('Error: PHP gd extension not activated' . PHP_EOL);
-if (!extension_loaded('mysqli'))	$error .= ('Error: PHP mysqli extension not activated' . PHP_EOL);
-if (!extension_loaded('json'))		$error .= ('Error: PHP json extension not activated' . PHP_EOL);
-if (!extension_loaded('zip'))		$error .= ('Error: PHP zip extension not activated' . PHP_EOL);
+// Extensions
+if (!extension_loaded('session'))  $error .= ('Error: PHP session extension not activated' . PHP_EOL);
+if (!extension_loaded('exif'))     $error .= ('Error: PHP exif extension not activated' . PHP_EOL);
+if (!extension_loaded('mbstring')) $error .= ('Error: PHP mbstring extension not activated' . PHP_EOL);
+if (!extension_loaded('gd'))       $error .= ('Error: PHP gd extension not activated' . PHP_EOL);
+if (!extension_loaded('mysqli'))   $error .= ('Error: PHP mysqli extension not activated' . PHP_EOL);
+if (!extension_loaded('json'))     $error .= ('Error: PHP json extension not activated' . PHP_EOL);
+if (!extension_loaded('zip'))      $error .= ('Error: PHP zip extension not activated' . PHP_EOL);
 
-# Permissions
-if (hasPermissions(LYCHEE_UPLOADS_BIG)===false)			$error .= ('Error: \'uploads/big\' is missing or has insufficient read/write privileges' . PHP_EOL);
-if (hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false)		$error .= ('Error: \'uploads/medium\' is missing or has insufficient read/write privileges' . PHP_EOL);
-if (hasPermissions(LYCHEE_UPLOADS_THUMB)===false)		$error .= ('Error: \'uploads/thumb\' is missing or has insufficient read/write privileges' . PHP_EOL);
-if (hasPermissions(LYCHEE_UPLOADS_IMPORT)===false)		$error .= ('Error: \'uploads/import\' is missing or has insufficient read/write privileges' . PHP_EOL);
-if (hasPermissions(LYCHEE_UPLOADS)===false)				$error .= ('Error: \'uploads/\' is missing or has insufficient read/write privileges' . PHP_EOL);
-if (hasPermissions(LYCHEE_DATA)===false)				$error .= ('Error: \'data/\' is missing or has insufficient read/write privileges' . PHP_EOL);
+// Permissions
+if (hasPermissions(LYCHEE_UPLOADS_BIG)===false)    $error .= ('Error: \'uploads/big\' is missing or has insufficient read/write privileges' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS_MEDIUM)===false) $error .= ('Error: \'uploads/medium\' is missing or has insufficient read/write privileges' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS_THUMB)===false)  $error .= ('Error: \'uploads/thumb\' is missing or has insufficient read/write privileges' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS_IMPORT)===false) $error .= ('Error: \'uploads/import\' is missing or has insufficient read/write privileges' . PHP_EOL);
+if (hasPermissions(LYCHEE_UPLOADS)===false)        $error .= ('Error: \'uploads/\' is missing or has insufficient read/write privileges' . PHP_EOL);
+if (hasPermissions(LYCHEE_DATA)===false)           $error .= ('Error: \'data/\' is missing or has insufficient read/write privileges' . PHP_EOL);
 
-# About GD
+// About GD
 $gdVersion = gd_info();
-if (!$gdVersion['JPEG Support'])											$error .= ('Error: PHP gd extension without jpeg support' . PHP_EOL);
-if (!$gdVersion['PNG Support'])												$error .= ('Error: PHP gd extension without png support' . PHP_EOL);
-if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support'])	$error .= ('Error: PHP gd extension without full gif support' . PHP_EOL);
+if (!$gdVersion['JPEG Support'])                                          $error .= ('Error: PHP gd extension without jpeg support' . PHP_EOL);
+if (!$gdVersion['PNG Support'])                                           $error .= ('Error: PHP gd extension without png support' . PHP_EOL);
+if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support']) $error .= ('Error: PHP gd extension without full gif support' . PHP_EOL);
 
-# Load config
-if (!file_exists(LYCHEE_CONFIG_FILE))	exit('Error: Configuration not found. Please install Lychee for additional tests');
-else									require(LYCHEE_CONFIG_FILE);
+// Load config
+if (!file_exists(LYCHEE_CONFIG_FILE)) exit('Error: Configuration not found. Please install Lychee for additional tests');
+require(LYCHEE_CONFIG_FILE);
 
-# Database
+// Database
 $database = new Mysqli($dbHost, $dbUser, $dbPassword, $dbName);
 if (mysqli_connect_errno()!=0) $error .= ('Error: ' . mysqli_connect_errno() . ': ' . mysqli_connect_error() . '' . PHP_EOL);
 
-# Config
-if (!isset($dbName)||$dbName==='')	$error .= ('Error: No property for $dbName in config.php' . PHP_EOL);
-if (!isset($dbUser)||$dbUser==='')	$error .= ('Error: No property for $dbUser in config.php' . PHP_EOL);
-if (!isset($dbPassword))			$error .= ('Error: No property for $dbPassword in config.php' . PHP_EOL);
-if (!isset($dbHost)||$dbHost==='')	$error .= ('Error: No property for $dbHost in config.php' . PHP_EOL);
+// Config
+if (!isset($dbName)||$dbName==='') $error .= ('Error: No property for $dbName in config.php' . PHP_EOL);
+if (!isset($dbUser)||$dbUser==='') $error .= ('Error: No property for $dbUser in config.php' . PHP_EOL);
+if (!isset($dbPassword))           $error .= ('Error: No property for $dbPassword in config.php' . PHP_EOL);
+if (!isset($dbHost)||$dbHost==='') $error .= ('Error: No property for $dbHost in config.php' . PHP_EOL);
 
-# Load settings
+// Load settings
 $settings = Settings::get();
 
-# Settings
-if (!isset($settings['username'])||$settings['username']=='')				$error .= ('Error: Username empty or not set in database' . PHP_EOL);
-if (!isset($settings['password'])||$settings['password']=='')				$error .= ('Error: Password empty or not set in database' . PHP_EOL);
-if (!isset($settings['sortingPhotos'])||$settings['sortingPhotos']=='')		$error .= ('Error: Wrong property for sortingPhotos in database' . PHP_EOL);
-if (!isset($settings['sortingAlbums'])||$settings['sortingAlbums']=='')		$error .= ('Error: Wrong property for sortingAlbums in database' . PHP_EOL);
-if (!isset($settings['plugins']))											$error .= ('Error: No property for plugins in database' . PHP_EOL);
-if (!isset($settings['imagick'])||$settings['imagick']=='')					$error .= ('Error: No or wrong property for imagick in database' . PHP_EOL);
-if (!isset($settings['identifier'])||$settings['identifier']=='')			$error .= ('Error: No or wrong property for identifier in database' . PHP_EOL);
-if (!isset($settings['skipDuplicates'])||$settings['skipDuplicates']=='')	$error .= ('Error: No or wrong property for skipDuplicates in database' . PHP_EOL);
+// Settings
+if (!isset($settings['username'])||$settings['username']=='')             $error .= ('Error: Username empty or not set in database' . PHP_EOL);
+if (!isset($settings['password'])||$settings['password']=='')             $error .= ('Error: Password empty or not set in database' . PHP_EOL);
+if (!isset($settings['sortingPhotos'])||$settings['sortingPhotos']=='')   $error .= ('Error: Wrong property for sortingPhotos in database' . PHP_EOL);
+if (!isset($settings['sortingAlbums'])||$settings['sortingAlbums']=='')   $error .= ('Error: Wrong property for sortingAlbums in database' . PHP_EOL);
+if (!isset($settings['plugins']))                                         $error .= ('Error: No property for plugins in database' . PHP_EOL);
+if (!isset($settings['imagick'])||$settings['imagick']=='')               $error .= ('Error: No or wrong property for imagick in database' . PHP_EOL);
+if (!isset($settings['identifier'])||$settings['identifier']=='')         $error .= ('Error: No or wrong property for identifier in database' . PHP_EOL);
+if (!isset($settings['skipDuplicates'])||$settings['skipDuplicates']=='') $error .= ('Error: No or wrong property for skipDuplicates in database' . PHP_EOL);
 if (!isset($settings['checkForUpdates'])||($settings['checkForUpdates']!='0'&&$settings['checkForUpdates']!='1')) $error .= ('Error: No or wrong property for checkForUpdates in database' . PHP_EOL);
 
-# Check dropboxKey
-if (!$settings['dropboxKey']) echo('Warning: Dropbox import not working. No property for dropboxKey' . PHP_EOL);
+// Check dropboxKey
+if (!$settings['dropboxKey']) echo('Warning: Dropbox import not working. No property for dropboxKey.' . PHP_EOL);
 
-# Check php.ini Settings
+// Check php.ini Settings
 if (ini_get('max_execution_time')<200&&ini_set('upload_max_filesize', '20M')===false) echo('Warning: You may experience problems when uploading a large amount of photos. Take a look in the FAQ for details.' . PHP_EOL);
 if (!ini_get('allow_url_fopen')) echo('Warning: You may experience problems with the Dropbox- and URL-Import. Edit your php.ini and set allow_url_fopen to 1.' . PHP_EOL);
 
-# Check mysql version
+// Check mysql version
 if ($database->server_version<50500) echo('Warning: Lychee uses the GBK charset to avoid sql injections on your MySQL version. Please update to MySQL 5.5 or higher to enable UTF-8 support.' . PHP_EOL);
 
-# Output
-if ($error==='')	echo('No critical problems found. Lychee should work without problems!' . PHP_EOL);
-else				echo $error;
+// Output
+if ($error==='') echo('No critical problems found. Lychee should work without problems!' . PHP_EOL);
+else             echo $error;
 
-# Show separator
+// Show separator
 echo(PHP_EOL . PHP_EOL . 'System Information' . PHP_EOL);
 echo('------------------' . PHP_EOL);
 
-# Ensure that user is logged in
+// Ensure that user is logged in
 if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 	(isset($_SESSION['identifier'])&&$_SESSION['identifier']===$settings['identifier'])) {
 
-	# Load json
+	// Load json
 	$json = file_get_contents(LYCHEE_SRC . 'package.json');
 	$json = json_decode($json, true);
 
-	# About imagick
+	// About imagick
 	$imagick = extension_loaded('imagick');
-	if ($imagick===true)	$imagickVersion = @Imagick::getVersion();
-	else					$imagick = '-';
-	if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='')	$imagickVersion = '-';
-	else																					$imagickVersion = $imagickVersion['versionNumber'];
+	if ($imagick===true) $imagickVersion = @Imagick::getVersion();
+	else                 $imagick = '-';
+	if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='') $imagickVersion = '-';
+	else                                                                                 $imagickVersion = $imagickVersion['versionNumber'];
 
-	# Output system information
+	// Output system information
 	echo('Lychee Version:  ' . $json['version'] . PHP_EOL);
 	echo('DB Version:      ' . $settings['version'] . PHP_EOL);
 	echo('System:          ' . PHP_OS . PHP_EOL);
@@ -133,10 +132,10 @@ if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 
 } else {
 
-	# Don't go further if the user is not logged in
+	// Don't go further if the user is not logged in
 	echo('You have to be logged in to see more information.');
 	exit();
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/plugins/Log/index.php b/plugins/Log/index.php
index 1ff92c6..b20da7e 100644
--- a/plugins/Log/index.php
+++ b/plugins/Log/index.php
@@ -1,11 +1,10 @@
 <?php
 
-###
-# @name			Log
-# @author		Tobias Reich
-# @copyright	2015 by Tobias Reich
-# @description	This file queries the database for log messages and displays them if present.
-###
+/**
+ * @author      Tobias Reich
+ * @copyright   2015 by Tobias Reich
+ * @description This file queries the database for log messages and displays them if present.
+ */
 
 namespace Log;
 
@@ -18,25 +17,25 @@ $lychee = __DIR__ . '/../../';
 require($lychee . 'php/define.php');
 require($lychee . 'php/autoload.php');
 
-# Start the session
+// Start the session
 session_start();
 
-# Set content
+// Set content
 header('content-type: text/plain');
 
-# Load config
+// Load config
 if (!file_exists(LYCHEE_CONFIG_FILE)) exit('Error 001: Configuration not found. Please install Lychee first.');
 require(LYCHEE_CONFIG_FILE);
 
-# Ensure that user is logged in
+// Ensure that user is logged in
 if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 	(isset($_SESSION['identifier'])&&$_SESSION['identifier']===Settings::get()['identifier'])) {
 
-	# Result
-	$query	= Database::prepare(Database::get(), "SELECT FROM_UNIXTIME(time), type, function, line, text FROM ?", array(LYCHEE_TABLE_LOG));
-	$result	= Database::get()->query($query);
+	// Result
+	$query  = Database::prepare(Database::get(), "SELECT FROM_UNIXTIME(time), type, function, line, text FROM ?", array(LYCHEE_TABLE_LOG));
+	$result = Database::get()->query($query);
 
-	# Output
+	// Output
 	if ($result->num_rows===0) {
 
 		echo('Everything looks fine, Lychee has not reported any problems!');
@@ -45,11 +44,11 @@ if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 
 		while($row = $result->fetch_row()) {
 
-			# Encode result before printing
+			// Encode result before printing
 			$row = array_map('htmlentities', $row);
 
-			# Format: time TZ - type - function(line) - text
-			printf ("%s - %s - %s (%s) \t- %s\n", $row[0], $row[1], $row[2], $row[3], $row[4]);
+			// Format: time TZ - type - function(line) - text
+			printf("%s - %s - %s (%s) \t- %s\n", $row[0], $row[1], $row[2], $row[3], $row[4]);
 
 		}
 
@@ -57,10 +56,10 @@ if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 
 } else {
 
-	# Don't go further if the user is not logged in
+	// Don't go further if the user is not logged in
 	echo('You have to be logged in to see the log.');
 	exit();
 
 }
 
-?>
+?>
\ No newline at end of file

From 87350448e0c2e40c5d52f21899cc764e3bd3e9a2 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 6 Feb 2016 23:54:21 +0100
Subject: [PATCH 073/183] Updated plugin docs with namespaces

---
 docs/Plugins.md | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/docs/Plugins.md b/docs/Plugins.md
index e47a7ce..046c2f4 100644
--- a/docs/Plugins.md
+++ b/docs/Plugins.md
@@ -17,31 +17,41 @@ The plugin-system of Lychee allows you to execute scripts, when a certain action
 ```php
 <?php
 
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+namespace ExamplePlugin;
+
+use SplObserver;
+use SplSubject;
 
 class ExamplePlugin implements SplObserver {
 
 	public function __construct() {
 
-		# Add code here if wanted
-		# __construct() will be called every time Lychee gets called
-		# Make sure this part is performant
+		/**
+		 * Add code here if wanted
+		 * __construct() will be called every time Lychee gets called
+		 * Make sure this part is performant
+		 */
 
 		return true;
 
 	}
 
-	public function update(\SplSubject $subject) {
+	public function update(SplSubject $subject) {
+
+		/**
+		 * Check if the called hook is the hook you are waiting for
+		 * A list of all hooks is available online
+		 */
 
-		# Check if the called hook is the hook you are waiting for
-		# A list of all hooks is available online
 		if ($subject->action!=='Photo::add:before') return false;
 
-		# Do something when Photo::add:before gets called
-		# Database::get() => Database connection of Lychee
-		# Settings::get() => Settings of Lychee
-		# $subject->action => Called hook
-		# $subject->args => Params passed to the original function
+		/**
+		 * Do something when Photo::add:before gets called
+		 * Database::get() => Database connection of Lychee
+		 * Settings::get() => Settings of Lychee
+		 * $subject->action => Called hook
+		 * $subject->args => Params passed to the original function
+		 */
 
 		return true;
 
@@ -54,9 +64,9 @@ class ExamplePlugin implements SplObserver {
 
 3. Add the class name to the database of Lychee
 
-Select the table `lychee_settings` and add the name of the class to the value of `plugins` (e.g. `ExamplePlugin`). Please ensure that the folder has the same name as the class and as the file.
+Select the table `lychee_settings` and add the [external fully qualified name](http://php.net/manual/en/language.namespaces.importing.php) to the value of `plugins` (e.g. `ExamplePlugin\ExamplePlugin`). Please ensure that the folder has the same name as the namespace and the file the same name as the class.
 
-Divide multiple plugins with semicolons: `ExamplePlugin;ExampleTwoPlugin`.
+Divide multiple plugins with semicolons: `ExamplePlugin\ExamplePlugin;ExampleTwoPlugin\ExampleTwoPlugin`.
 
 ### Available hooks
 

From 64a7972cb5f8391416dd7f869e20273a2f504990 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 7 Feb 2016 00:12:28 +0100
Subject: [PATCH 074/183] Replaced echo with exit

---
 plugins/Diagnostics/index.php | 3 +--
 plugins/Log/index.php         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/Diagnostics/index.php b/plugins/Diagnostics/index.php
index a17f428..3e7124b 100644
--- a/plugins/Diagnostics/index.php
+++ b/plugins/Diagnostics/index.php
@@ -133,8 +133,7 @@ if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 } else {
 
 	// Don't go further if the user is not logged in
-	echo('You have to be logged in to see more information.');
-	exit();
+	exit('You have to be logged in to see more information.');
 
 }
 
diff --git a/plugins/Log/index.php b/plugins/Log/index.php
index b20da7e..4964eb5 100644
--- a/plugins/Log/index.php
+++ b/plugins/Log/index.php
@@ -57,8 +57,7 @@ if ((isset($_SESSION['login'])&&$_SESSION['login']===true)&&
 } else {
 
 	// Don't go further if the user is not logged in
-	echo('You have to be logged in to see the log.');
-	exit();
+	exit('You have to be logged in to see the log.');
 
 }
 

From f4e909895f6daa24bac9bf6695539c50dfe2c169 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 7 Feb 2016 00:16:48 +0100
Subject: [PATCH 075/183] Added Response class to handle exit() responses

---
 php/Modules/Album.php     | 22 +++++++++++-----------
 php/Modules/Config.php    |  2 +-
 php/Modules/Database.php  | 10 +++++-----
 php/Modules/Photo.php     | 36 ++++++++++++++++++------------------
 php/Modules/Response.php  | 25 +++++++++++++++++++++++++
 php/Modules/Settings.php  | 14 +++++++-------
 php/Modules/Validator.php |  2 +-
 php/index.php             | 11 ++++++-----
 8 files changed, 74 insertions(+), 48 deletions(-)
 create mode 100644 php/Modules/Response.php

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 9007032..5537450 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -120,7 +120,7 @@ final class Album {
 		$photos          = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$previousPhotoID = '';
 
-		if ($photos===false) exit('Error: Could not get photos of album from database!');
+		if ($photos===false) Response::error('Could not get photos of album from database!');
 
 		while ($photo = $photos->fetch_assoc()) {
 
@@ -192,7 +192,7 @@ final class Album {
 		// Execute query
 		$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($albums===false) exit('Error: Could not get albums from database!');
+		if ($albums===false) Response::error('Could not get albums from database!');
 
 		// For each album
 		while ($album = $albums->fetch_assoc()) {
@@ -208,7 +208,7 @@ final class Album {
 					$query  = Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr(Settings::get()['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
 					$thumbs = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-					if ($thumbs===false) exit('Error: Could not get thumbs of album from database!');
+					if ($thumbs===false) Response::error('Could not get thumbs of album from database!');
 
 					// For each thumb
 					$k = 0;
@@ -252,7 +252,7 @@ final class Album {
 		$unsorted = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i        = 0;
 
-		if ($unsorted===false) exit('Error: Could not get unsorted photos from database!');
+		if ($unsorted===false) Response::error('Could not get unsorted photos from database!');
 
 		$return['unsorted'] = array(
 			'thumbs' => array(),
@@ -274,7 +274,7 @@ final class Album {
 		$starred = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i       = 0;
 
-		if ($starred===false) exit('Error: Could not get starred photos from database!');
+		if ($starred===false) Response::error('Could not get starred photos from database!');
 
 		$return['starred'] = array(
 			'thumbs' => array(),
@@ -296,7 +296,7 @@ final class Album {
 		$public = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i      = 0;
 
-		if ($public===false) exit('Error: Could not get public photos from database!');
+		if ($public===false) Response::error('Could not get public photos from database!');
 
 		$return['public'] = array(
 			'thumbs' => array(),
@@ -318,7 +318,7 @@ final class Album {
 		$recent = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i      = 0;
 
-		if ($recent===false) exit('Error: Could not get recent photos from database!');
+		if ($recent===false) Response::error('Could not get recent photos from database!');
 
 		$return['recent'] = array(
 			'thumbs' => array(),
@@ -376,7 +376,7 @@ final class Album {
 			$query = Database::prepare(Database::get(), "SELECT title FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
 			$album = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-			if ($album===false) exit('Error: Could not get album from database!');
+			if ($album===false) Response::error('Could not get album from database!');
 
 			// Get album object
 			$album = $album->fetch_object();
@@ -384,7 +384,7 @@ final class Album {
 			// Photo not found
 			if ($album===null) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified album');
-				exit('Error: Could not find specified album!');
+				Response::error('Could not find specified album!');
 			}
 
 			// Set title
@@ -407,12 +407,12 @@ final class Album {
 		// Execute query
 		$photos = Database::execute(Database::get(), $photos, __METHOD__, __LINE__);
 
-		if ($album===null) exit('Error: Could not get photos from database!');
+		if ($album===null) Response::error('Could not get photos from database!');
 
 		// Check if album empty
 		if ($photos->num_rows==0) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create ZipArchive without images');
-			exit('Error: Could not create ZipArchive without images!');
+			Response::error('Could not create ZipArchive without images!');
 		}
 
 		// Parse each path
diff --git a/php/Modules/Config.php b/php/Modules/Config.php
index 8ce5dc5..d7f3914 100644
--- a/php/Modules/Config.php
+++ b/php/Modules/Config.php
@@ -25,7 +25,7 @@ final class Config {
 		// Save config.php
 $config = "<?php
 
-if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+if(!defined('LYCHEE')) Response::error('Direct access is not allowed!');
 
 // Database configuration
 \$dbHost = '$host'; // Host of the database
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 5177b75..9c4e711 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -48,18 +48,18 @@ final class Database {
 		$connection = self::connect($host, $user, $password);
 
 		// Check if the connection was successful
-		if ($connection===false) exit('Error: ' . $connection->connect_error);
+		if ($connection===false) Response::error('' . $connection->connect_error);
 
-		if (!self::setCharset($connection)) exit('Error: Could not set database charset!');
+		if (!self::setCharset($connection)) Response::error('Could not set database charset!');
 
 		// Create database
-		if (!self::createDatabase($connection, $name)) exit('Error: Could not create database!');
+		if (!self::createDatabase($connection, $name)) Response::error('Could not create database!');
 
 		// Create tables
-		if (!self::createTables($connection)) exit('Error: Could not create tables!');
+		if (!self::createTables($connection)) Response::error('Could not create tables!');
 
 		// Update database
-		if (!self::update($connection, $name)) exit('Error: Could not update database and tables!');
+		if (!self::update($connection, $name)) Response::error('Could not update database and tables!');
 
 		$this->connection = $connection;
 
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 6c0ac3c..59d23e9 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -40,7 +40,7 @@ final class Photo {
 			hasPermissions(LYCHEE_UPLOADS_BIG)===false||
 			hasPermissions(LYCHEE_UPLOADS_THUMB)===false) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'An upload-folder is missing or not readable and writable');
-				exit('Error: An upload-folder is missing or not readable and writable!');
+				Response::error('An upload-folder is missing or not readable and writable!');
 		}
 
 		// Call plugins
@@ -82,35 +82,35 @@ final class Photo {
 			if ($file['error']===UPLOAD_ERR_INI_SIZE) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'The uploaded file exceeds the upload_max_filesize directive in php.ini');
 				if ($returnOnError===true) return false;
-				exit('Error: The uploaded file exceeds the upload_max_filesize directive in php.ini!');
+				Response::error('The uploaded file exceeds the upload_max_filesize directive in php.ini!');
 			}
 
 			// Check if file was only partially uploaded
 			if ($file['error']===UPLOAD_ERR_PARTIAL) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'The uploaded file was only partially uploaded');
 				if ($returnOnError===true) return false;
-				exit('Error: The uploaded file was only partially uploaded!');
+				Response::error('The uploaded file was only partially uploaded!');
 			}
 
 			// Check if writing file to disk failed
 			if ($file['error']===UPLOAD_ERR_CANT_WRITE) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'Failed to write photo to disk');
 				if ($returnOnError===true) return false;
-				exit('Error: Failed to write photo to disk!');
+				Response::error('Failed to write photo to disk!');
 			}
 
 			// Check if a extension stopped the file upload
 			if ($file['error']===UPLOAD_ERR_EXTENSION) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'A PHP extension stopped the file upload');
 				if ($returnOnError===true) return false;
-				exit('Error: A PHP extension stopped the file upload!');
+				Response::error('A PHP extension stopped the file upload!');
 			}
 
 			// Check if the upload was successful
 			if ($file['error']!==UPLOAD_ERR_OK) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'Upload contains an error (' . $file['error'] . ')');
 				if ($returnOnError===true) return false;
-				exit('Error: Upload failed!');
+				Response::error('Upload failed!');
 			}
 
 			// Verify extension
@@ -118,7 +118,7 @@ final class Photo {
 			if (!in_array(strtolower($extension), self::$validExtensions, true)) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'Photo format not supported');
 				if ($returnOnError===true) return false;
-				exit('Error: Photo format not supported!');
+				Response::error('Photo format not supported!');
 			}
 
 			// Verify image
@@ -126,7 +126,7 @@ final class Photo {
 			if (!in_array($type, self::$validTypes, true)) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'Photo type not supported');
 				if ($returnOnError===true) return false;
-				exit('Error: Photo type not supported!');
+				Response::error('Photo type not supported!');
 			}
 
 			// Generate id
@@ -143,7 +143,7 @@ final class Photo {
 			if ($checksum===false) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not calculate checksum for photo');
 				if ($returnOnError===true) return false;
-				exit('Error: Could not calculate checksum for photo!');
+				Response::error('Could not calculate checksum for photo!');
 			}
 
 			// Check if image exists based on checksum
@@ -173,13 +173,13 @@ final class Photo {
 					if (!@copy($tmp_name, $path)) {
 						Log::error(Database::get(), __METHOD__, __LINE__, 'Could not copy photo to uploads');
 						if ($returnOnError===true) return false;
-						exit('Error: Could not copy photo to uploads!');
+						Response::error('Could not copy photo to uploads!');
 					} else @unlink($tmp_name);
 				} else {
 					if (!@move_uploaded_file($tmp_name, $path)) {
 						Log::error(Database::get(), __METHOD__, __LINE__, 'Could not move photo to uploads');
 						if ($returnOnError===true) return false;
-						exit('Error: Could not move photo to uploads!');
+						Response::error('Could not move photo to uploads!');
 					}
 				}
 
@@ -190,7 +190,7 @@ final class Photo {
 				if (Settings::get()['skipDuplicates']==='1') {
 					Log::notice(Database::get(), __METHOD__, __LINE__, 'Skipped upload of existing photo because skipDuplicates is activated');
 					if ($returnOnError===true) return false;
-					exit('Warning: This photo has been skipped because it\'s already in your library.');
+					Response::warning('This photo has been skipped because it\'s already in your library.');
 				}
 
 			}
@@ -220,7 +220,7 @@ final class Photo {
 				if (!$this->createThumb($path, $photo_name, $info['type'], $info['width'], $info['height'])) {
 					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create thumbnail for photo');
 					if ($returnOnError===true) return false;
-					exit('Error: Could not create thumbnail for photo!');
+					Response::error('Could not create thumbnail for photo!');
 				}
 
 				// Create Medium
@@ -239,7 +239,7 @@ final class Photo {
 
 			if ($result===false) {
 				if ($returnOnError===true) return false;
-				exit('Error: Could not save photo in database!');
+				Response::error('Could not save photo in database!');
 			}
 
 		}
@@ -637,7 +637,7 @@ final class Photo {
 		$query  = Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
 		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($photos===false) exit('Error: Could not get photo from database!');
+		if ($photos===false) Response::error('Could not get photo from database!');
 
 		// Get photo object
 		$photo = $photos->fetch_assoc();
@@ -664,7 +664,7 @@ final class Photo {
 				$query  = Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $photo['album']));
 				$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-				if ($albums===false) exit('Error: Could not get album of photo from database!');
+				if ($albums===false) Response::error('Could not get album of photo from database!');
 
 				// Get album object
 				$album = $albums->fetch_assoc();
@@ -808,7 +808,7 @@ final class Photo {
 		$query  = Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
 		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($photos===false) exit('Error: Could not get photo from database!');
+		if ($photos===false) Response::error('Could not get photo from database!');
 
 		// Get photo object
 		$photo = $photos->fetch_object();
@@ -816,7 +816,7 @@ final class Photo {
 		// Photo not found
 		if ($photo===null) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified photo');
-			exit('Error: Could not find specified photo!');
+			Response::error('Could not find specified photo!');
 		}
 
 		// Get extension
diff --git a/php/Modules/Response.php b/php/Modules/Response.php
new file mode 100644
index 0000000..01c4c10
--- /dev/null
+++ b/php/Modules/Response.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Lychee\Modules;
+
+final class Response {
+
+	public static function warning($msg) {
+
+		exit('Warning: ' . $msg);
+
+	}
+
+	public static function error($msg) {
+
+		exit('Error: ' . $msg);
+
+	}
+
+	public static function json($str) {
+
+		exit(json_encode($str));
+
+	}
+
+}
\ No newline at end of file
diff --git a/php/Modules/Settings.php b/php/Modules/Settings.php
index c3e1f1c..acdfa55 100755
--- a/php/Modules/Settings.php
+++ b/php/Modules/Settings.php
@@ -55,16 +55,16 @@ final class Settings {
 		if ($oldPassword===self::get()['password']||self::get()['password']===crypt($oldPassword, self::get()['password'])) {
 
 			// Save username
-			if (self::setUsername($username)!==true) exit('Error: Updating username failed!');
+			if (self::setUsername($username)!==true) Response::error('Updating username failed!');
 
 			// Save password
-			if (self::setPassword($password)!==true) exit('Error: Updating password failed!');
+			if (self::setPassword($password)!==true) Response::error('Updating password failed!');
 
 			return true;
 
 		}
 
-		exit('Error: Current password entered incorrectly!');
+		Response::error('Current password entered incorrectly!');
 
 	}
 
@@ -125,7 +125,7 @@ final class Settings {
 			case 'type':        $sorting .= 'type'; break;
 			case 'star':        $sorting .= 'star'; break;
 			case 'takestamp':   $sorting .= 'takestamp'; break;
-			default:            exit('Error: Unknown type for sorting!');
+			default:            Response::error('Unknown type for sorting!');
 
 		}
 
@@ -136,7 +136,7 @@ final class Settings {
 
 			case 'ASC':  $sorting .= 'ASC'; break;
 			case 'DESC': $sorting .= 'DESC'; break;
-			default:     exit('Error: Unknown order for sorting!');
+			default:     Response::error('Unknown order for sorting!');
 
 		}
 
@@ -159,7 +159,7 @@ final class Settings {
 			case 'title':       $sorting .= 'title'; break;
 			case 'description': $sorting .= 'description'; break;
 			case 'public':      $sorting .= 'public'; break;
-			default:            exit('Error: Unknown type for sorting!');
+			default:            Response::error('Unknown type for sorting!');
 
 		}
 
@@ -170,7 +170,7 @@ final class Settings {
 
 			case 'ASC':  $sorting .= 'ASC'; break;
 			case 'DESC': $sorting .= 'DESC'; break;
-			default:     exit('Error: Unknown order for sorting!');
+			default:     Response::error('Unknown order for sorting!');
 
 		}
 
diff --git a/php/Modules/Validator.php b/php/Modules/Validator.php
index c20e598..2090fa2 100644
--- a/php/Modules/Validator.php
+++ b/php/Modules/Validator.php
@@ -6,7 +6,7 @@ final class Validator {
 
 	public static function required($available = false, $function) {
 
-		if ($available===false) exit("Error: Missing parameters. Can not execute function $function.");
+		if ($available===false) Response::error('Missing parameters. Can not execute function ' . $function);
 
 		return true;
 
diff --git a/php/index.php b/php/index.php
index 04b9858..be39f8f 100755
--- a/php/index.php
+++ b/php/index.php
@@ -8,6 +8,7 @@
 namespace Lychee;
 
 use Lychee\Modules\Config;
+use Lychee\Modules\Response;
 use Lychee\Modules\Settings;
 use Lychee\Modules\Validator;
 
@@ -38,10 +39,10 @@ if (!empty($fn)) {
 	date_default_timezone_set('UTC');
 
 	// Validate parameters
-	if (isset($_POST['albumIDs'])&&Validator::isAlbumIDs($_POST['albumIDs'])===false) exit('Error: Wrong parameter type for albumIDs!');
-	if (isset($_POST['photoIDs'])&&Validator::isPhotoIDs($_POST['photoIDs'])===false) exit('Error: Wrong parameter type for photoIDs!');
-	if (isset($_POST['albumID'])&&Validator::isAlbumID($_POST['albumID'])==false)     exit('Error: Wrong parameter type for albumID!');
-	if (isset($_POST['photoID'])&&Validator::isPhotoID($_POST['photoID'])==false)     exit('Error: Wrong parameter type for photoID!');
+	if (isset($_POST['albumIDs'])&&Validator::isAlbumIDs($_POST['albumIDs'])===false) Response::error('Wrong parameter type for albumIDs!');
+	if (isset($_POST['photoIDs'])&&Validator::isPhotoIDs($_POST['photoIDs'])===false) Response::error('Wrong parameter type for photoIDs!');
+	if (isset($_POST['albumID'])&&Validator::isAlbumID($_POST['albumID'])==false)     Response::error('Wrong parameter type for albumID!');
+	if (isset($_POST['photoID'])&&Validator::isPhotoID($_POST['photoID'])==false)     Response::error('Wrong parameter type for photoID!');
 
 	// Check if a configuration exists
 	if (Config::exists()===false) {
@@ -82,7 +83,7 @@ if (!empty($fn)) {
 
 } else {
 
-	exit('Error: No API function specified!');
+	Response::error('No API function specified!');
 
 }
 

From e9accae2a7dfda2c1e2151e3aa4eb2d437d263f4 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 7 Feb 2016 14:32:46 +0100
Subject: [PATCH 076/183] Use Response in Access

---
 php/Access/Access.php       |  4 +++-
 php/Access/Admin.php        | 11 ++++++-----
 php/Access/Guest.php        | 23 ++++++++++++-----------
 php/Access/Installation.php |  3 ++-
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/php/Access/Access.php b/php/Access/Access.php
index 6b471fe..43b8bab 100644
--- a/php/Access/Access.php
+++ b/php/Access/Access.php
@@ -2,11 +2,13 @@
 
 namespace Lychee\Access;
 
+use Lychee\Modules\Response;
+
 abstract class Access {
 
 	final protected static function fnNotFound() {
 
-		exit('Error: Function not found! Please check the spelling of the called function.');
+		Response::error('Function not found! Please check the spelling of the called function.');
 
 	}
 
diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index 2a5b3f5..1de45a3 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -5,6 +5,7 @@ namespace Lychee\Access;
 use Lychee\Modules\Album;
 use Lychee\Modules\Import;
 use Lychee\Modules\Photo;
+use Lychee\Modules\Response;
 use Lychee\Modules\Session;
 use Lychee\Modules\Settings;
 use Lychee\Modules\Validator;
@@ -72,7 +73,7 @@ final class Admin extends Access {
 	private static function getAlbumsAction() {
 
 		$album = new Album(null);
-		echo json_encode($album->getAll(false));
+		Response::json($album->getAll(false));
 
 	}
 
@@ -81,7 +82,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['albumID']), __METHOD__);
 
 		$album = new Album($_POST['albumID']);
-		echo json_encode($album->get());
+		Response::json($album->get());
 
 	}
 
@@ -145,7 +146,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['photoID'], $_POST['albumID']), __METHOD__);
 
 		$photo = new Photo($_POST['photoID']);
-		echo json_encode($photo->get($_POST['albumID']));
+		Response::json($photo->get($_POST['albumID']));
 
 	}
 
@@ -256,7 +257,7 @@ final class Admin extends Access {
 
 		Validator::required(isset($_POST['term']), __METHOD__);
 
-		echo json_encode(search($_POST['term']));
+		Response::json(search($_POST['term']));
 
 	}
 
@@ -265,7 +266,7 @@ final class Admin extends Access {
 	private static function initAction() {
 
 		$session = new Session();
-		echo json_encode($session->init(false));
+		Response::json($session->init(false));
 
 	}
 
diff --git a/php/Access/Guest.php b/php/Access/Guest.php
index de30713..88abf02 100644
--- a/php/Access/Guest.php
+++ b/php/Access/Guest.php
@@ -4,6 +4,7 @@ namespace Lychee\Access;
 
 use Lychee\Modules\Album;
 use Lychee\Modules\Photo;
+use Lychee\Modules\Response;
 use Lychee\Modules\Session;
 use Lychee\Modules\Validator;
 
@@ -44,7 +45,7 @@ final class Guest extends Access {
 	private static function getAlbumsAction() {
 
 		$album = new Album(null);
-		echo json_encode($album->getAll(true));
+		Response::json($album->getAll(true));
 
 	}
 
@@ -57,13 +58,13 @@ final class Guest extends Access {
 		if ($album->getPublic()) {
 
 			// Album public
-			if ($album->checkPassword($_POST['password'])) echo json_encode($album->get());
-			else                                           echo 'Warning: Wrong password!';
+			if ($album->checkPassword($_POST['password'])) Response::json($album->get());
+			else                                           Response::warning('Wrong password!');
 
 		} else {
 
 			// Album private
-			echo 'Warning: Album private!';
+			Response::warning('Album private!');
 
 		}
 
@@ -100,9 +101,9 @@ final class Guest extends Access {
 
 		$pgP = $photo->getPublic($_POST['password']);
 
-		if ($pgP===2)      echo json_encode($photo->get($_POST['albumID']));
-		else if ($pgP===1) echo 'Warning: Wrong password!';
-		else if ($pgP===0) echo 'Warning: Photo private!';
+		if ($pgP===2)      Response::json($photo->get($_POST['albumID']));
+		else if ($pgP===1) Response::warning('Wrong password!');
+		else if ($pgP===0) Response::warning('Photo private!');
 
 	}
 
@@ -111,7 +112,7 @@ final class Guest extends Access {
 	private static function initAction() {
 
 		$session = new Session();
-		echo json_encode($session->init(true));
+		Response::json($session->init(true));
 
 	}
 
@@ -143,12 +144,12 @@ final class Guest extends Access {
 
 			// Album Public
 			if ($album->checkPassword($_GET['password'])) $album->getArchive();
-			else                                          exit('Warning: Wrong password!');
+			else                                          Response::warning('Wrong password!');
 
 		} else {
 
 			// Album Private
-			exit('Warning: Album private or not downloadable!');
+			Response::warning('Album private or not downloadable!');
 
 		}
 
@@ -171,7 +172,7 @@ final class Guest extends Access {
 		} else {
 
 			// Photo Private
-			exit('Warning: Photo private or password incorrect!');
+			Response::warning('Photo private or password incorrect!');
 
 		}
 
diff --git a/php/Access/Installation.php b/php/Access/Installation.php
index 0a4a2e2..370d0d0 100644
--- a/php/Access/Installation.php
+++ b/php/Access/Installation.php
@@ -3,6 +3,7 @@
 namespace Lychee\Access;
 
 use Lychee\Modules\Config;
+use Lychee\Modules\Response;
 use Lychee\Modules\Validator;
 
 final class Installation extends Access {
@@ -36,7 +37,7 @@ final class Installation extends Access {
 			'status' => LYCHEE_STATUS_NOCONFIG
 		);
 
-		echo json_encode($return);
+		Response::json($return);
 
 	}
 

From 9a1e51c8bd4c40965ce86446a7afcf15986be62a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Mon, 8 Feb 2016 22:11:39 +0100
Subject: [PATCH 077/183] Added partial php documentation to the Log class

---
 php/Modules/Log.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/php/Modules/Log.php b/php/Modules/Log.php
index 83408e7..bd3fa65 100644
--- a/php/Modules/Log.php
+++ b/php/Modules/Log.php
@@ -4,18 +4,27 @@ namespace Lychee\Modules;
 
 final class Log {
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public static function notice($connection, $function, $line, $text = '') {
 
 		return Log::text($connection, 'notice', $function, $line, $text);
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public static function error($connection, $function, $line, $text = '') {
 
 		return Log::text($connection, 'error', $function, $line, $text);
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	private static function text($connection, $type, $function, $line, $text = '') {
 
 		// Check dependencies

From 66edea4d71c971f5db469b875214f927e0cf7260 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Mon, 8 Feb 2016 22:12:03 +0100
Subject: [PATCH 078/183] Added partial php documentation to the Config class

---
 php/Modules/Config.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/php/Modules/Config.php b/php/Modules/Config.php
index d7f3914..4a00ce6 100644
--- a/php/Modules/Config.php
+++ b/php/Modules/Config.php
@@ -43,12 +43,18 @@ if(!defined('LYCHEE')) Response::error('Direct access is not allowed!');
 
 	}
 
+	/**
+	 * @return boolean Returns true when the config exists.
+	 */
 	public static function exists() {
 
 		return file_exists(LYCHEE_CONFIG_FILE);
 
 	}
 
+	/**
+	 * @return array Returns the config.
+	 */
 	public static function get() {
 
 		require(LYCHEE_CONFIG_FILE);

From aa00ebc77be0ed53e9faebbaad18c3b00ca8db6d Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Mon, 8 Feb 2016 22:16:09 +0100
Subject: [PATCH 079/183] Removed unnecessary title trimming

---
 php/Modules/Album.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 5537450..5928df6 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -22,9 +22,6 @@ final class Album {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		// Parse
-		if (strlen($title)>50) $title = substr($title, 0, 50);
-
 		// Properties
 		$public  = 0;
 		$visible = 1;

From 025f6e974b7107e454745e8e9a537ae3e4a1f73f Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 17:32:44 +0100
Subject: [PATCH 080/183] Added phpDoc comments

---
 php/Modules/Album.php    |  72 ++++++++++++++++---
 php/Modules/Import.php   |  12 +++-
 php/Modules/Photo.php    | 149 ++++++++++++++++++++-------------------
 php/Modules/Session.php  |  24 +++++--
 php/Modules/Settings.php |  47 ++++++++++--
 php/helpers/search.php   |   3 +
 6 files changed, 211 insertions(+), 96 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 5928df6..b678241 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -8,6 +8,9 @@ final class Album {
 
 	private $albumIDs = null;
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public function __construct($albumIDs) {
 
 		// Init vars
@@ -17,6 +20,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return integer|false ID of the created album.
+	 */
 	public function add($title = 'Untitled') {
 
 		// Call plugins
@@ -39,6 +45,10 @@ final class Album {
 
 	}
 
+	/**
+	 * Rurns album-attributes into a front-end friendly format. Note that some attributes remain unchanged.
+	 * @return array Returns album-attributes in a normalized structure.
+	 */
 	public static function prepareData(array $data) {
 
 		// This function requires the following album-attributes and turns them
@@ -72,6 +82,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return array|false Returns an array of photos and album information or false on failure.
+	 */
 	public function get() {
 
 		// Check dependencies
@@ -117,7 +130,7 @@ final class Album {
 		$photos          = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$previousPhotoID = '';
 
-		if ($photos===false) Response::error('Could not get photos of album from database!');
+		if ($photos===false) return false;
 
 		while ($photo = $photos->fetch_assoc()) {
 
@@ -167,6 +180,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return array|false Returns an array of albums or false on failure.
+	 */
 	public function getAll($public = true) {
 
 		// Call plugins
@@ -189,7 +205,7 @@ final class Album {
 		// Execute query
 		$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($albums===false) Response::error('Could not get albums from database!');
+		if ($albums===false) return false;
 
 		// For each album
 		while ($album = $albums->fetch_assoc()) {
@@ -205,7 +221,7 @@ final class Album {
 					$query  = Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr(Settings::get()['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
 					$thumbs = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-					if ($thumbs===false) Response::error('Could not get thumbs of album from database!');
+					if ($thumbs===false) return false;
 
 					// For each thumb
 					$k = 0;
@@ -231,6 +247,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return array|false Returns an array of smart albums or false on failure.
+	 */
 	private function getSmartInfo() {
 
 		// Initialize return var
@@ -249,7 +268,7 @@ final class Album {
 		$unsorted = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i        = 0;
 
-		if ($unsorted===false) Response::error('Could not get unsorted photos from database!');
+		if ($unsorted===false) return false;
 
 		$return['unsorted'] = array(
 			'thumbs' => array(),
@@ -271,7 +290,7 @@ final class Album {
 		$starred = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i       = 0;
 
-		if ($starred===false) Response::error('Could not get starred photos from database!');
+		if ($starred===false) return false;
 
 		$return['starred'] = array(
 			'thumbs' => array(),
@@ -293,7 +312,7 @@ final class Album {
 		$public = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i      = 0;
 
-		if ($public===false) Response::error('Could not get public photos from database!');
+		if ($public===false) return false;
 
 		$return['public'] = array(
 			'thumbs' => array(),
@@ -315,7 +334,7 @@ final class Album {
 		$recent = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 		$i      = 0;
 
-		if ($recent===false) Response::error('Could not get recent photos from database!');
+		if ($recent===false) return false;
 
 		$return['recent'] = array(
 			'thumbs' => array(),
@@ -334,6 +353,10 @@ final class Album {
 
 	}
 
+	/**
+	 * Starts a download of an album.
+	 * @return resource|boolean Sends a ZIP-file or returns false on failure.
+	 */
 	public function getArchive() {
 
 		// Check dependencies
@@ -373,7 +396,7 @@ final class Album {
 			$query = Database::prepare(Database::get(), "SELECT title FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $this->albumIDs));
 			$album = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-			if ($album===false) Response::error('Could not get album from database!');
+			if ($album===false) return false;
 
 			// Get album object
 			$album = $album->fetch_object();
@@ -381,7 +404,7 @@ final class Album {
 			// Photo not found
 			if ($album===null) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified album');
-				Response::error('Could not find specified album!');
+				return false;
 			}
 
 			// Set title
@@ -404,12 +427,12 @@ final class Album {
 		// Execute query
 		$photos = Database::execute(Database::get(), $photos, __METHOD__, __LINE__);
 
-		if ($album===null) Response::error('Could not get photos from database!');
+		if ($album===null) return false;
 
 		// Check if album empty
 		if ($photos->num_rows==0) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create ZipArchive without images');
-			Response::error('Could not create ZipArchive without images!');
+			return false;
 		}
 
 		// Parse each path
@@ -472,6 +495,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public function setTitle($title = 'Untitled') {
 
 		// Check dependencies
@@ -492,6 +518,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public function setDescription($description = '') {
 
 		// Check dependencies
@@ -512,6 +541,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return boolean Returns true when the album is public.
+	 */
 	public function getPublic() {
 
 		// Check dependencies
@@ -539,6 +571,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return boolean Returns true when the album is downloadable.
+	 */
 	public function getDownloadable() {
 
 		// Check dependencies
@@ -566,6 +601,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public function setPublic($public, $password, $visible, $downloadable) {
 
 		// Check dependencies
@@ -604,6 +642,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	private function setPassword($password) {
 
 		// Check dependencies
@@ -640,6 +681,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return boolean Returns when album is public.
+	 */
 	public function checkPassword($password) {
 
 		// Check dependencies
@@ -667,6 +711,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public function merge() {
 
 		// Check dependencies
@@ -702,6 +749,9 @@ final class Album {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public function delete() {
 
 		// Check dependencies
diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index 37838ab..e21b0ef 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -26,6 +26,9 @@ final class Import {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public function url($urls, $albumID = 0) {
 
 		// Call plugins
@@ -85,6 +88,11 @@ final class Import {
 
 	}
 
+	/**
+	 * @return boolean|string Returns true when successful.
+	 *                        Warning: Folder empty or no readable files to process!
+	 *                        Notice: Import only contained albums!
+	 */
 	public function server($path, $albumID = 0) {
 
 		// Parse path
@@ -93,7 +101,7 @@ final class Import {
 
 		if (is_dir($path)===false) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Given path is not a directory (' . $path . ')');
-			return 'Error: Given path is not a directory!';
+			return false;
 		}
 
 		// Skip folders of Lychee
@@ -101,7 +109,7 @@ final class Import {
 			$path===LYCHEE_UPLOADS_MEDIUM||($path . '/')===LYCHEE_UPLOADS_MEDIUM||
 			$path===LYCHEE_UPLOADS_THUMB||($path . '/')===LYCHEE_UPLOADS_THUMB) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'The given path is a reserved path of Lychee (' . $path . ')');
-				return 'Error: Given path is a reserved path of Lychee!';
+				return false;
 		}
 
 		$error              = false;
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 59d23e9..9403624 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -21,6 +21,9 @@ final class Photo {
 		'.gif'
 	);
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public function __construct($photoIDs) {
 
 		// Init vars
@@ -251,11 +254,14 @@ final class Photo {
 
 	}
 
+	/**
+	 * @return array|false Returns a subset of a photo when same photo exists or returns false on failure.
+	 */
 	private function exists($checksum, $photoID = null) {
 
 		// Exclude $photoID from select when $photoID is set
 		if (isset($photoID)) $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' AND id <> '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum, $photoID));
-		else $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum));
+		else                 $query = Database::prepare(Database::get(), "SELECT id, url, thumbUrl, medium FROM ? WHERE checksum = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $checksum));
 
 		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
@@ -280,6 +286,9 @@ final class Photo {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	private function createThumb($url, $filename, $type, $width, $height) {
 
 		// Call plugins
@@ -369,17 +378,18 @@ final class Photo {
 
 	}
 
+	/**
+	 * Creates a smaller version of a photo when its size is bigger than a preset size.
+	 * Photo must be big enough, medium must be activated and Imagick must be installed and activated.
+	 * @return boolean Returns true when successful.
+	 */
 	private function createMedium($url, $filename, $width, $height) {
 
-		// Function creates a smaller version of a photo when its size is bigger than a preset size
 		// Excepts the following:
 		// (string) $url = Path to the photo-file
 		// (string) $filename = Name of the photo-file
 		// (int) $width = Width of the photo
 		// (int) $height = Height of the photo
-		// Returns the following
-		// (boolean) true = Success
-		// (boolean) false = Failure
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -446,15 +456,15 @@ final class Photo {
 
 	}
 
+	/**
+	 * Rotates and flips a photo based on its EXIF orientation.
+	 * @return array|false Returns an array with the new orientation, width, height or false on failure.
+	 */
 	public function adjustFile($path, array $info) {
 
-		// Function rotates and flips a photo based on its EXIF orientation
 		// Excepts the following:
 		// (string) $path = Path to the photo-file
 		// (array) $info = ['orientation', 'width', 'height']
-		// Returns the following
-		// (array) $info = ['orientation', 'width', 'height'] = Success
-		// (boolean) false = Failure
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
@@ -577,13 +587,14 @@ final class Photo {
 
 	}
 
+	/**
+	 * Rurns photo-attributes into a front-end friendly format. Note that some attributes remain unchanged.
+	 * @return array Returns photo-attributes in a normalized structure.
+	 */
 	public static function prepareData(array $data) {
 
-		// Function turns photo-attributes into a front-end friendly format. Note that some attributes remain unchanged.
 		// Excepts the following:
 		// (array) $data = ['id', 'title', 'tags', 'public', 'star', 'album', 'thumbUrl', 'takestamp', 'url']
-		// Returns the following:
-		// (array) $photo
 
 		// Init
 		$photo = null;
@@ -619,13 +630,13 @@ final class Photo {
 
 	}
 
+	/**
+	 * @return array|false Returns an array with information about the photo or false on failure.
+	 */
 	public function get($albumID) {
 
-		// Functions returns data of a photo
 		// Excepts the following:
 		// (string) $albumID = Album which is currently visible to the user
-		// Returns the following:
-		// (array) $photo
 
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
@@ -637,7 +648,7 @@ final class Photo {
 		$query  = Database::prepare(Database::get(), "SELECT * FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
 		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($photos===false) Response::error('Could not get photo from database!');
+		if ($photos===false) return false;
 
 		// Get photo object
 		$photo = $photos->fetch_assoc();
@@ -664,7 +675,7 @@ final class Photo {
 				$query  = Database::prepare(Database::get(), "SELECT public FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_ALBUMS, $photo['album']));
 				$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-				if ($albums===false) Response::error('Could not get album of photo from database!');
+				if ($albums===false) return false;
 
 				// Get album object
 				$album = $albums->fetch_assoc();
@@ -686,6 +697,10 @@ final class Photo {
 
 	}
 
+	/**
+	 * Reads and parses information and metadata out of a photo.
+	 * @return array Returns an array of photo information and metadata.
+	 */
 	public function getInfo($url) {
 
 		// Functions returns information and metadata of a photo
@@ -791,13 +806,12 @@ final class Photo {
 
 	}
 
+	/**
+	 * Starts a download of a photo.
+	 * @return resource|boolean Sends a ZIP-file or returns false on failure.
+	 */
 	public function getArchive() {
 
-		// Functions starts a download of a photo
-		// Returns the following:
-		// (boolean + output) true = Success
-		// (boolean) false = Failure
-
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
@@ -808,7 +822,7 @@ final class Photo {
 		$query  = Database::prepare(Database::get(), "SELECT title, url FROM ? WHERE id = '?' LIMIT 1", array(LYCHEE_TABLE_PHOTOS, $this->photoIDs));
 		$photos = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
-		if ($photos===false) Response::error('Could not get photo from database!');
+		if ($photos===false) return false;
 
 		// Get photo object
 		$photo = $photos->fetch_object();
@@ -816,7 +830,7 @@ final class Photo {
 		// Photo not found
 		if ($photo===null) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified photo');
-			Response::error('Could not find specified photo!');
+			return false;
 		}
 
 		// Get extension
@@ -853,15 +867,12 @@ final class Photo {
 
 	}
 
+	/**
+	 * Sets the title of a photo.
+	 * @return boolean Returns true when successful.
+	 */
 	public function setTitle($title) {
 
-		// Functions sets the title of a photo
-		// Excepts the following:
-		// (string) $title = Title with a maximum length of 50 chars
-		// Returns the following:
-		// (boolean) true = Success
-		// (boolean) false = Failure
-
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
@@ -880,15 +891,12 @@ final class Photo {
 
 	}
 
+	/**
+	 * Sets the description of a photo.
+	 * @return boolean Returns true when successful.
+	 */
 	public function setDescription($description) {
 
-		// Functions sets the description of a photo
-		// Excepts the following:
-		// (string) $description = Description with a maximum length of 1000 chars
-		// Returns the following:
-		// (boolean) true = Success
-		// (boolean) false = Failure
-
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
@@ -907,13 +915,12 @@ final class Photo {
 
 	}
 
+	/**
+	 * Toggles the star property of a photo.
+	 * @return boolean Returns true when successful.
+	 */
 	public function setStar() {
 
-		// Functions stars a photo
-		// Returns the following:
-		// (boolean) true = Success
-		// (boolean) false = Failure
-
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
@@ -951,14 +958,14 @@ final class Photo {
 
 	}
 
+	/**
+	 * Checks if photo or parent album is public.
+	 * @return integer 0 = Photo private and parent album private
+	 *                 1 = Album public, but password incorrect
+	 *                 2 = Photo public or album public and password correct
+	 */
 	public function getPublic($password) {
 
-		// Functions checks if photo or parent album is public
-		// Returns the following:
-		// (int) 0 = Photo private and parent album private
-		// (int) 1 = Album public, but password incorrect
-		// (int) 2 = Photo public or album public and password correct
-
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
@@ -1003,13 +1010,12 @@ final class Photo {
 
 	}
 
+	/**
+	 * Toggles the public property of a photo.
+	 * @return boolean Returns true when successful.
+	 */
 	public function setPublic() {
 
-		// Functions toggles the public property of a photo
-		// Returns the following:
-		// (boolean) true = Success
-		// (boolean) false = Failure
-
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
@@ -1040,13 +1046,12 @@ final class Photo {
 
 	}
 
+	/**
+	 * Sets the parent album of a photo.
+	 * @return boolean Returns true when successful.
+	 */
 	function setAlbum($albumID) {
 
-		// Functions sets the parent album of a photo
-		// Returns the following:
-		// (boolean) true = Success
-		// (boolean) false = Failure
-
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
@@ -1065,14 +1070,14 @@ final class Photo {
 
 	}
 
+	/**
+	 * Sets the tags of a photo.
+	 * @return boolean Returns true when successful.
+	 */
 	public function setTags($tags) {
 
-		// Functions sets the tags of a photo
 		// Excepts the following:
 		// (string) $tags = Comma separated list of tags with a maximum length of 1000 chars
-		// Returns the following:
-		// (boolean) true = Success
-		// (boolean) false = Failure
 
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
@@ -1096,13 +1101,12 @@ final class Photo {
 
 	}
 
+	/**
+	 * Duplicates a photo.
+	 * @return boolean Returns true when successful.
+	 */
 	public function duplicate() {
 
-		// Functions duplicates a photo
-		// Returns the following:
-		// (boolean) true = Success
-		// (boolean) false = Failure
-
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
@@ -1139,13 +1143,12 @@ final class Photo {
 
 	}
 
+	/**
+	 * Deletes a photo with all its data and files.
+	 * @return boolean Returns true when successful.
+	 */
 	public function delete() {
 
-		// Functions deletes a photo with all its data and files
-		// Returns the following:
-		// (boolean) true = Success
-		// (boolean) false = Failure
-
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);
 
diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index 126fb28..7b6d105 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -4,6 +4,10 @@ namespace Lychee\Modules;
 
 final class Session {
 
+	/**
+	 * Reads and returns information about the Lychee installation.
+	 * @return array Returns an array with the login status and configuration.
+	 */
 	public function init($public = true) {
 
 		// Call plugins
@@ -15,11 +19,9 @@ final class Session {
 		// Path to Lychee for the server-import dialog
 		$return['config']['location'] = LYCHEE;
 
-		// Remove username and password from response
+		// Remove sensitive from response
 		unset($return['config']['username']);
 		unset($return['config']['password']);
-
-		// Remove identifier from response
 		unset($return['config']['identifier']);
 
 		// Check if login credentials exist and login if they don't
@@ -60,6 +62,10 @@ final class Session {
 
 	}
 
+	/**
+	 * Sets the session values when username and password correct.
+	 * @return boolean Returns true when login was successful.
+	 */
 	public function login($username, $password) {
 
 		// Call plugins
@@ -86,6 +92,10 @@ final class Session {
 
 	}
 
+	/**
+	 * Sets the session values when no there is no username and password in the database.
+	 * @return boolean Returns true when no login was found.
+	 */
 	private function noLogin() {
 
 		// Check if login credentials exist and login if they don't
@@ -100,14 +110,16 @@ final class Session {
 
 	}
 
+	/**
+	 * Unsets the session values.
+	 * @return boolean Returns true when logout was successful.
+	 */
 	public function logout() {
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		$_SESSION['login']      = null;
-		$_SESSION['identifier'] = null;
-
+		session_unset();
 		session_destroy();
 
 		// Call plugins
diff --git a/php/Modules/Settings.php b/php/Modules/Settings.php
index acdfa55..3f07e12 100755
--- a/php/Modules/Settings.php
+++ b/php/Modules/Settings.php
@@ -6,6 +6,9 @@ final class Settings {
 
 	private static $cache = null;
 
+	/**
+	 * @return array Returns the settings of Lychee.
+	 */
 	public static function get() {
 
 		if (self::$cache) return self::$cache;
@@ -26,6 +29,9 @@ final class Settings {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	private static function set($key, $value, $row = false) {
 
 		if ($row===false) {
@@ -50,6 +56,11 @@ final class Settings {
 
 	}
 
+	/**
+	 * Sets the username and password when current password is correct.
+	 * Exits on error.
+	 * @return true Returns true when successful.
+	 */
 	public static function setLogin($oldPassword = '', $username, $password) {
 
 		if ($oldPassword===self::get()['password']||self::get()['password']===crypt($oldPassword, self::get()['password'])) {
@@ -68,6 +79,10 @@ final class Settings {
 
 	}
 
+	/**
+	 * Sets a new username.
+	 * @return boolean Returns true when successful.
+	 */
 	private static function setUsername($username) {
 
 		// Check dependencies
@@ -84,6 +99,10 @@ final class Settings {
 
 	}
 
+	/**
+	 * Sets a new username.
+	 * @return boolean Returns true when successful.
+	 */
 	private static function setPassword($password) {
 
 		// Check dependencies
@@ -99,6 +118,10 @@ final class Settings {
 
 	}
 
+	/**
+	 * Sets a new dropboxKey.
+	 * @return boolean Returns true when successful.
+	 */
 	public static function setDropboxKey($dropboxKey) {
 
 		if (strlen($dropboxKey)<1||strlen($dropboxKey)>50) {
@@ -111,6 +134,10 @@ final class Settings {
 
 	}
 
+	/**
+	 * Sets a new sorting for the photos.
+	 * @return boolean Returns true when successful.
+	 */
 	public static function setSortingPhotos($type, $order) {
 
 		$sorting = 'ORDER BY ';
@@ -125,7 +152,9 @@ final class Settings {
 			case 'type':        $sorting .= 'type'; break;
 			case 'star':        $sorting .= 'star'; break;
 			case 'takestamp':   $sorting .= 'takestamp'; break;
-			default:            Response::error('Unknown type for sorting!');
+			default:            Log::error(Database::get(), __METHOD__, __LINE__, 'Could not update settings. Unknown type for sorting.');
+			                    return false;
+			                    break;
 
 		}
 
@@ -136,7 +165,9 @@ final class Settings {
 
 			case 'ASC':  $sorting .= 'ASC'; break;
 			case 'DESC': $sorting .= 'DESC'; break;
-			default:     Response::error('Unknown order for sorting!');
+			default:     Log::error(Database::get(), __METHOD__, __LINE__, 'Could not update settings. Unknown order for sorting.');
+			             return false;
+			             break;
 
 		}
 
@@ -148,6 +179,10 @@ final class Settings {
 
 	}
 
+	/**
+	 * Sets a new sorting for the albums.
+	 * @return boolean Returns true when successful.
+	 */
 	public static function setSortingAlbums($type, $order) {
 
 		$sorting = 'ORDER BY ';
@@ -159,7 +194,9 @@ final class Settings {
 			case 'title':       $sorting .= 'title'; break;
 			case 'description': $sorting .= 'description'; break;
 			case 'public':      $sorting .= 'public'; break;
-			default:            Response::error('Unknown type for sorting!');
+			default:            Log::error(Database::get(), __METHOD__, __LINE__, 'Could not update settings. Unknown type for sorting.');
+			                    return false;
+			                    break;
 
 		}
 
@@ -170,7 +207,9 @@ final class Settings {
 
 			case 'ASC':  $sorting .= 'ASC'; break;
 			case 'DESC': $sorting .= 'DESC'; break;
-			default:     Response::error('Unknown order for sorting!');
+			default:     Log::error(Database::get(), __METHOD__, __LINE__, 'Could not update settings. Unknown order for sorting.');
+			             return false;
+			             break;
 
 		}
 
diff --git a/php/helpers/search.php b/php/helpers/search.php
index 75b46b0..50638f9 100755
--- a/php/helpers/search.php
+++ b/php/helpers/search.php
@@ -4,6 +4,9 @@ use Lychee\Modules\Album;
 use Lychee\Modules\Database;
 use Lychee\Modules\Photo;
 
+/**
+ * @return array|false Returns an array with albums and photos.
+ */
 function search($term) {
 
 	// Initialize return var

From 4e1e3cb2ee7068b14237617aa71dd3f8fbe634b3 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:31:51 +0100
Subject: [PATCH 081/183] Removed debug mode

---
 src/scripts/api.js    | 3 ---
 src/scripts/lychee.js | 1 -
 2 files changed, 4 deletions(-)

diff --git a/src/scripts/api.js b/src/scripts/api.js
index 1979d22..85de71c 100644
--- a/src/scripts/api.js
+++ b/src/scripts/api.js
@@ -35,9 +35,6 @@ api.post = function(fn, params, callback) {
 			data = $.parseJSON(data)
 		}
 
-		// Output response when debug mode is enabled
-		if (lychee.debugMode) console.log(data)
-
 		callback(data)
 
 	}
diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 1f88917..c92699e 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -15,7 +15,6 @@ lychee = {
 
 	publicMode      : false,
 	viewMode        : false,
-	debugMode       : false,
 
 	checkForUpdates : '1',
 	sortingPhotos   : '',

From 60e4a06df887fbca7a5cc3eca141c10be6dac1a6 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:32:13 +0100
Subject: [PATCH 082/183] Removed unnecessary anonymous function

---
 src/scripts/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/api.js b/src/scripts/api.js
index 85de71c..6ed4d2b 100644
--- a/src/scripts/api.js
+++ b/src/scripts/api.js
@@ -18,7 +18,7 @@ api.post = function(fn, params, callback) {
 
 	const success = (data) => {
 
-		setTimeout(() => loadingBar.hide(), 100)
+		setTimeout(loadingBar.hide, 100)
 
 		// Catch errors
 		if (typeof data==='string' && data.substring(0, 7)==='Error: ') {

From 36f43c3e2722e93d1c10dcbe062b463ca267306a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:33:39 +0100
Subject: [PATCH 083/183] Strict if condition

---
 php/Access/Guest.php     | 4 ++--
 php/Modules/Config.php   | 2 +-
 php/Modules/Database.php | 8 ++++----
 php/Modules/Settings.php | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/php/Access/Guest.php b/php/Access/Guest.php
index 88abf02..a4a0d48 100644
--- a/php/Access/Guest.php
+++ b/php/Access/Guest.php
@@ -55,7 +55,7 @@ final class Guest extends Access {
 
 		$album = new Album($_POST['albumID']);
 
-		if ($album->getPublic()) {
+		if ($album->getPublic()===true) {
 
 			// Album public
 			if ($album->checkPassword($_POST['password'])) Response::json($album->get());
@@ -76,7 +76,7 @@ final class Guest extends Access {
 
 		$album = new Album($_POST['albumID']);
 
-		if ($album->getPublic()) {
+		if ($album->getPublic()===true) {
 
 			// Album public
 			if ($album->checkPassword($_POST['password'])) echo true;
diff --git a/php/Modules/Config.php b/php/Modules/Config.php
index 4a00ce6..d68a257 100644
--- a/php/Modules/Config.php
+++ b/php/Modules/Config.php
@@ -13,7 +13,7 @@ final class Config {
 		if ($connection===false) return 'Warning: Connection failed!';
 
 		// Check if user can create the database before saving the configuration
-		if (!Database::createDatabase($connection, $name)) return 'Warning: Creation failed!';
+		if (Database::createDatabase($connection, $name)===false) return 'Warning: Creation failed!';
 
 		// Escape data
 		$host     = mysqli_real_escape_string($connection, $host);
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 9c4e711..1a2a3c8 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -50,16 +50,16 @@ final class Database {
 		// Check if the connection was successful
 		if ($connection===false) Response::error('' . $connection->connect_error);
 
-		if (!self::setCharset($connection)) Response::error('Could not set database charset!');
+		if (self::setCharset($connection)===false) Response::error('Could not set database charset!');
 
 		// Create database
-		if (!self::createDatabase($connection, $name)) Response::error('Could not create database!');
+		if (self::createDatabase($connection, $name)===false) Response::error('Could not create database!');
 
 		// Create tables
-		if (!self::createTables($connection)) Response::error('Could not create tables!');
+		if (self::createTables($connection)===false) Response::error('Could not create tables!');
 
 		// Update database
-		if (!self::update($connection, $name)) Response::error('Could not update database and tables!');
+		if (self::update($connection, $name)===false) Response::error('Could not update database and tables!');
 
 		$this->connection = $connection;
 
diff --git a/php/Modules/Settings.php b/php/Modules/Settings.php
index 3f07e12..018dc7c 100755
--- a/php/Modules/Settings.php
+++ b/php/Modules/Settings.php
@@ -66,10 +66,10 @@ final class Settings {
 		if ($oldPassword===self::get()['password']||self::get()['password']===crypt($oldPassword, self::get()['password'])) {
 
 			// Save username
-			if (self::setUsername($username)!==true) Response::error('Updating username failed!');
+			if (self::setUsername($username)===false) Response::error('Updating username failed!');
 
 			// Save password
-			if (self::setPassword($password)!==true) Response::error('Updating password failed!');
+			if (self::setPassword($password)===false) Response::error('Updating password failed!');
 
 			return true;
 

From fcb80c9f322b0d06982d537be510e248799f94c7 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:34:24 +0100
Subject: [PATCH 084/183] Run self::fnNotFound() when no match found in access
 class

---
 php/Access/Admin.php        | 5 +----
 php/Access/Guest.php        | 5 +----
 php/Access/Installation.php | 3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index 1de45a3..ea54194 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -59,12 +59,9 @@ final class Admin extends Access {
 			case 'Album::getArchive':       self::getAlbumArchiveAction(); break;
 			case 'Photo::getArchive':       self::getPhotoArchiveAction(); break;
 
-			// Error
-			default:                        self::fnNotFound(); break;
-
 		}
 
-		return true;
+		self::fnNotFound();
 
 	}
 
diff --git a/php/Access/Guest.php b/php/Access/Guest.php
index a4a0d48..269fef3 100644
--- a/php/Access/Guest.php
+++ b/php/Access/Guest.php
@@ -31,12 +31,9 @@ final class Guest extends Access {
 			case 'Album::getArchive': self::getAlbumArchiveAction(); break;
 			case 'Photo::getArchive': self::getPhotoArchiveAction(); break;
 
-			// Error
-			default:                  self::fnNotFound(); break;
-
 		}
 
-		return true;
+		self::fnNotFound();
 
 	}
 
diff --git a/php/Access/Installation.php b/php/Access/Installation.php
index 370d0d0..ce3863c 100644
--- a/php/Access/Installation.php
+++ b/php/Access/Installation.php
@@ -14,12 +14,11 @@ final class Installation extends Access {
 
 			case 'Config::create': self::configCreateAction(); break;
 
-			// Error
 			default:               self::initAction(); break;
 
 		}
 
-		return true;
+		self::fnNotFound();
 
 	}
 

From 3c45bbf4d14dd84196c3007711666a3ab7b9950a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:35:13 +0100
Subject: [PATCH 085/183] Added phpDoc comments

---
 php/Modules/Config.php   |  9 +++++++--
 php/Modules/Database.php | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/php/Modules/Config.php b/php/Modules/Config.php
index d68a257..60276ff 100644
--- a/php/Modules/Config.php
+++ b/php/Modules/Config.php
@@ -4,6 +4,13 @@ namespace Lychee\Modules;
 
 final class Config {
 
+	/**
+	 * Creates the configuration file.
+	 * @return true|string Returns true when successful.
+	 *                     Warning: Connection failed!
+	 *                     Warning: Creation failed!
+	 *                     Warning: Could not create file!
+	 */
 	public static function create($host, $user, $password, $name = 'lychee', $prefix = '') {
 
 		// Open a new connection to the MySQL server
@@ -25,8 +32,6 @@ final class Config {
 		// Save config.php
 $config = "<?php
 
-if(!defined('LYCHEE')) Response::error('Direct access is not allowed!');
-
 // Database configuration
 \$dbHost = '$host'; // Host of the database
 \$dbUser = '$user'; // Username of the database
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 1a2a3c8..91d9df7 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -16,6 +16,9 @@ final class Database {
 		'030003' // 3.0.3
 	);
 
+	/**
+	 * @return object Returns a new or cached connection.
+	 */
 	public static function get() {
 
 		if (!self::$instance) {
@@ -36,6 +39,10 @@ final class Database {
 
 	}
 
+	/**
+	 * Exits on error.
+	 * @return boolean Returns true when successful.
+	 */
 	private function __construct($host, $user, $password, $name = 'lychee', $dbTablePrefix) {
 
 		// Check dependencies
@@ -63,8 +70,13 @@ final class Database {
 
 		$this->connection = $connection;
 
+		return true;
+
 	}
 
+	/**
+	 * @return object|false Returns the connection when successful.
+	 */
 	public static function connect($host = 'localhost', $user, $password) {
 
 		// Open a new connection to the MySQL server
@@ -77,6 +89,9 @@ final class Database {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	private static function setCharset($connection) {
 
 		// Check dependencies
@@ -95,6 +110,9 @@ final class Database {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public static function createDatabase($connection, $name = 'lychee') {
 
 		// Check dependencies
@@ -113,6 +131,9 @@ final class Database {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	private static function createTables($connection) {
 
 		// Check dependencies
@@ -238,6 +259,10 @@ final class Database {
 
 	}
 
+	/**
+	 * Exits when an update fails.
+	 * @return boolean Returns true when successful.
+	 */
 	private static function update($connection, $dbName) {
 
 		// Check dependencies
@@ -267,6 +292,9 @@ final class Database {
 
 	}
 
+	/**
+	 * @return boolean Returns true when successful.
+	 */
 	public static function setVersion($connection, $version) {
 
 		// Check dependencies
@@ -276,9 +304,13 @@ final class Database {
 		$result = self::execute($connection, $query, __METHOD__, __LINE__);
 
 		if ($result===false) return false;
+		return true;
 
 	}
 
+	/**
+	 * @return string Returns a escaped query.
+	 */
 	public static function prepare($connection, $query, array $data) {
 
 		// Check dependencies
@@ -345,6 +377,9 @@ final class Database {
 
 	}
 
+	/**
+	 * @return object|false Returns the results on success.
+	 */
 	public static function execute($connection, $query, $function, $line) {
 
 		// Check dependencies

From 109880475adf2b7c94337c118ba20404dd1d162c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:36:34 +0100
Subject: [PATCH 086/183] Photo add function only adds the first file in the
 array

---
 php/Modules/Import.php |  10 +-
 php/Modules/Photo.php  | 300 ++++++++++++++++++++---------------------
 2 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index e21b0ef..3bf0df1 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -4,7 +4,11 @@ namespace Lychee\Modules;
 
 final class Import {
 
-	private function photo($path, $albumID = 0, $description = '', $tags = '') {
+	/**
+	 * Creates an array similar to a file upload array and adds the photo to Lychee.
+	 * @return boolean Returns true when photo import was successful.
+	 */
+	private function photo($path, $albumID = 0) {
 
 		// No need to validate photo type and extension in this function.
 		// $photo->add will take care of it.
@@ -21,7 +25,7 @@ final class Import {
 		$nameFile[0]['size']     = $size;
 		$nameFile[0]['error']    = UPLOAD_ERR_OK;
 
-		if (!$photo->add($nameFile, $albumID, $description, $tags, true)) return false;
+		if ($photo->add($nameFile, $albumID, true)===false) return false;
 		return true;
 
 	}
@@ -140,7 +144,7 @@ final class Import {
 
 				$contains['photos'] = true;
 
-				if (!$this->photo($file, $albumID)) {
+				if ($this->photo($file, $albumID)===false) {
 					$error = true;
 					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not import file (' . $file . ')');
 					continue;
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 9403624..d3b0016 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -79,174 +79,170 @@ final class Photo {
 
 		}
 
-		foreach ($files as $file) {
+		// Only process the first photo in the array
+		$file = $files[0];
 
-			// Check if file exceeds the upload_max_filesize directive
-			if ($file['error']===UPLOAD_ERR_INI_SIZE) {
-				Log::error(Database::get(), __METHOD__, __LINE__, 'The uploaded file exceeds the upload_max_filesize directive in php.ini');
-				if ($returnOnError===true) return false;
-				Response::error('The uploaded file exceeds the upload_max_filesize directive in php.ini!');
+		// Check if file exceeds the upload_max_filesize directive
+		if ($file['error']===UPLOAD_ERR_INI_SIZE) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'The uploaded file exceeds the upload_max_filesize directive in php.ini');
+			if ($returnOnError===true) return false;
+			Response::error('The uploaded file exceeds the upload_max_filesize directive in php.ini!');
+		}
+
+		// Check if file was only partially uploaded
+		if ($file['error']===UPLOAD_ERR_PARTIAL) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'The uploaded file was only partially uploaded');
+			if ($returnOnError===true) return false;
+			Response::error('The uploaded file was only partially uploaded!');
+		}
+
+		// Check if writing file to disk failed
+		if ($file['error']===UPLOAD_ERR_CANT_WRITE) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Failed to write photo to disk');
+			if ($returnOnError===true) return false;
+			Response::error('Failed to write photo to disk!');
+		}
+
+		// Check if a extension stopped the file upload
+		if ($file['error']===UPLOAD_ERR_EXTENSION) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'A PHP extension stopped the file upload');
+			if ($returnOnError===true) return false;
+			Response::error('A PHP extension stopped the file upload!');
+		}
+
+		// Check if the upload was successful
+		if ($file['error']!==UPLOAD_ERR_OK) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Upload contains an error (' . $file['error'] . ')');
+			if ($returnOnError===true) return false;
+			Response::error('Upload failed!');
+		}
+
+		// Verify extension
+		$extension = getExtension($file['name']);
+		if (!in_array(strtolower($extension), self::$validExtensions, true)) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Photo format not supported');
+			if ($returnOnError===true) return false;
+			Response::error('Photo format not supported!');
+		}
+
+		// Verify image
+		$type = @exif_imagetype($file['tmp_name']);
+		if (!in_array($type, self::$validTypes, true)) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Photo type not supported');
+			if ($returnOnError===true) return false;
+			Response::error('Photo type not supported!');
+		}
+
+		// Generate id
+		$id = str_replace('.', '', microtime(true));
+		while(strlen($id)<14) $id .= 0;
+
+		// Set paths
+		$tmp_name   = $file['tmp_name'];
+		$photo_name = md5($id) . $extension;
+		$path       = LYCHEE_UPLOADS_BIG . $photo_name;
+
+		// Calculate checksum
+		$checksum = sha1_file($tmp_name);
+		if ($checksum===false) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not calculate checksum for photo');
+			if ($returnOnError===true) return false;
+			Response::error('Could not calculate checksum for photo!');
+		}
+
+		// Check if image exists based on checksum
+		if ($checksum===false) {
+
+			$checksum = '';
+			$exists   = false;
+
+		} else {
+
+			$exists = $this->exists($checksum);
+
+			if ($exists!==false) {
+				$photo_name = $exists['photo_name'];
+				$path       = $exists['path'];
+				$path_thumb = $exists['path_thumb'];
+				$medium     = ($exists['medium']==='1' ? 1 : 0);
+				$exists     = true;
 			}
 
-			// Check if file was only partially uploaded
-			if ($file['error']===UPLOAD_ERR_PARTIAL) {
-				Log::error(Database::get(), __METHOD__, __LINE__, 'The uploaded file was only partially uploaded');
-				if ($returnOnError===true) return false;
-				Response::error('The uploaded file was only partially uploaded!');
-			}
+		}
 
-			// Check if writing file to disk failed
-			if ($file['error']===UPLOAD_ERR_CANT_WRITE) {
-				Log::error(Database::get(), __METHOD__, __LINE__, 'Failed to write photo to disk');
-				if ($returnOnError===true) return false;
-				Response::error('Failed to write photo to disk!');
-			}
+		if ($exists===false) {
 
-			// Check if a extension stopped the file upload
-			if ($file['error']===UPLOAD_ERR_EXTENSION) {
-				Log::error(Database::get(), __METHOD__, __LINE__, 'A PHP extension stopped the file upload');
-				if ($returnOnError===true) return false;
-				Response::error('A PHP extension stopped the file upload!');
-			}
-
-			// Check if the upload was successful
-			if ($file['error']!==UPLOAD_ERR_OK) {
-				Log::error(Database::get(), __METHOD__, __LINE__, 'Upload contains an error (' . $file['error'] . ')');
-				if ($returnOnError===true) return false;
-				Response::error('Upload failed!');
-			}
-
-			// Verify extension
-			$extension = getExtension($file['name']);
-			if (!in_array(strtolower($extension), self::$validExtensions, true)) {
-				Log::error(Database::get(), __METHOD__, __LINE__, 'Photo format not supported');
-				if ($returnOnError===true) return false;
-				Response::error('Photo format not supported!');
-			}
-
-			// Verify image
-			$type = @exif_imagetype($file['tmp_name']);
-			if (!in_array($type, self::$validTypes, true)) {
-				Log::error(Database::get(), __METHOD__, __LINE__, 'Photo type not supported');
-				if ($returnOnError===true) return false;
-				Response::error('Photo type not supported!');
-			}
-
-			// Generate id
-			$id = str_replace('.', '', microtime(true));
-			while(strlen($id)<14) $id .= 0;
-
-			// Set paths
-			$tmp_name   = $file['tmp_name'];
-			$photo_name = md5($id) . $extension;
-			$path       = LYCHEE_UPLOADS_BIG . $photo_name;
-
-			// Calculate checksum
-			$checksum = sha1_file($tmp_name);
-			if ($checksum===false) {
-				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not calculate checksum for photo');
-				if ($returnOnError===true) return false;
-				Response::error('Could not calculate checksum for photo!');
-			}
-
-			// Check if image exists based on checksum
-			if ($checksum===false) {
-
-				$checksum = '';
-				$exists   = false;
-
-			} else {
-
-				$exists = $this->exists($checksum);
-
-				if ($exists!==false) {
-					$photo_name = $exists['photo_name'];
-					$path       = $exists['path'];
-					$path_thumb = $exists['path_thumb'];
-					$medium     = ($exists['medium']==='1' ? 1 : 0);
-					$exists     = true;
-				}
-
-			}
-
-			if ($exists===false) {
-
-				// Import if not uploaded via web
-				if (!is_uploaded_file($tmp_name)) {
-					if (!@copy($tmp_name, $path)) {
-						Log::error(Database::get(), __METHOD__, __LINE__, 'Could not copy photo to uploads');
-						if ($returnOnError===true) return false;
-						Response::error('Could not copy photo to uploads!');
-					} else @unlink($tmp_name);
-				} else {
-					if (!@move_uploaded_file($tmp_name, $path)) {
-						Log::error(Database::get(), __METHOD__, __LINE__, 'Could not move photo to uploads');
-						if ($returnOnError===true) return false;
-						Response::error('Could not move photo to uploads!');
-					}
-				}
-
-			} else {
-
-				// Photo already exists
-				// Check if the user wants to skip duplicates
-				if (Settings::get()['skipDuplicates']==='1') {
-					Log::notice(Database::get(), __METHOD__, __LINE__, 'Skipped upload of existing photo because skipDuplicates is activated');
+			// Import if not uploaded via web
+			if (!is_uploaded_file($tmp_name)) {
+				if (!@copy($tmp_name, $path)) {
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not copy photo to uploads');
 					if ($returnOnError===true) return false;
-					Response::warning('This photo has been skipped because it\'s already in your library.');
-				}
-
-			}
-
-			// Read infos
-			$info = $this->getInfo($path);
-
-			// Use title of file if IPTC title missing
-			if ($info['title']==='') $info['title'] = substr(basename($file['name'], $extension), 0, 30);
-
-			// Use description parameter if set
-			if ($description==='') $description = $info['description'];
-
-			if ($exists===false) {
-
-				// Set orientation based on EXIF data
-				if ($file['type']==='image/jpeg'&&isset($info['orientation'])&&$info['orientation']!=='') {
-					$adjustFile = $this->adjustFile($path, $info);
-					if ($adjustFile!==false) $info = $adjustFile;
-					else Log::notice(Database::get(), __METHOD__, __LINE__, 'Skipped adjustment of photo (' . $info['title'] . ')');
-				}
-
-				// Set original date
-				if ($info['takestamp']!==''&&$info['takestamp']!==0) @touch($path, $info['takestamp']);
-
-				// Create Thumb
-				if (!$this->createThumb($path, $photo_name, $info['type'], $info['width'], $info['height'])) {
-					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create thumbnail for photo');
+					Response::error('Could not copy photo to uploads!');
+				} else @unlink($tmp_name);
+			} else {
+				if (!@move_uploaded_file($tmp_name, $path)) {
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not move photo to uploads');
 					if ($returnOnError===true) return false;
-					Response::error('Could not create thumbnail for photo!');
+					Response::error('Could not move photo to uploads!');
 				}
-
-				// Create Medium
-				if ($this->createMedium($path, $photo_name, $info['width'], $info['height'])) $medium = 1;
-				else $medium = 0;
-
-				// Set thumb url
-				$path_thumb = md5($id) . '.jpeg';
-
 			}
 
-			// Save to DB
-			$values = array(LYCHEE_TABLE_PHOTOS, $id, $info['title'], $photo_name, $description, $tags, $info['type'], $info['width'], $info['height'], $info['size'], $info['iso'], $info['aperture'], $info['make'], $info['model'], $info['shutter'], $info['focal'], $info['takestamp'], $path_thumb, $albumID, $public, $star, $checksum, $medium);
-			$query  = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum, medium) VALUES ('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?')", $values);
-			$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+		} else {
 
-			if ($result===false) {
+			// Photo already exists
+			// Check if the user wants to skip duplicates
+			if (Settings::get()['skipDuplicates']==='1') {
+				Log::notice(Database::get(), __METHOD__, __LINE__, 'Skipped upload of existing photo because skipDuplicates is activated');
 				if ($returnOnError===true) return false;
-				Response::error('Could not save photo in database!');
+				Response::warning('This photo has been skipped because it\'s already in your library.');
 			}
 
 		}
 
+		// Read infos
+		$info = $this->getInfo($path);
+
+		// Use title of file if IPTC title missing
+		if ($info['title']==='') $info['title'] = substr(basename($file['name'], $extension), 0, 30);
+
+		if ($exists===false) {
+
+			// Set orientation based on EXIF data
+			if ($file['type']==='image/jpeg'&&isset($info['orientation'])&&$info['orientation']!=='') {
+				$adjustFile = $this->adjustFile($path, $info);
+				if ($adjustFile!==false) $info = $adjustFile;
+				else Log::notice(Database::get(), __METHOD__, __LINE__, 'Skipped adjustment of photo (' . $info['title'] . ')');
+			}
+
+			// Set original date
+			if ($info['takestamp']!==''&&$info['takestamp']!==0) @touch($path, $info['takestamp']);
+
+			// Create Thumb
+			if (!$this->createThumb($path, $photo_name, $info['type'], $info['width'], $info['height'])) {
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create thumbnail for photo');
+				if ($returnOnError===true) return false;
+				Response::error('Could not create thumbnail for photo!');
+			}
+
+			// Create Medium
+			if ($this->createMedium($path, $photo_name, $info['width'], $info['height'])) $medium = 1;
+			else $medium = 0;
+
+			// Set thumb url
+			$path_thumb = md5($id) . '.jpeg';
+
+		}
+
+		// Save to DB
+		$values = array(LYCHEE_TABLE_PHOTOS, $id, $info['title'], $photo_name, $info['description'], '', $info['type'], $info['width'], $info['height'], $info['size'], $info['iso'], $info['aperture'], $info['make'], $info['model'], $info['shutter'], $info['focal'], $info['takestamp'], $path_thumb, $albumID, $public, $star, $checksum, $medium);
+		$query  = Database::prepare(Database::get(), "INSERT INTO ? (id, title, url, description, tags, type, width, height, size, iso, aperture, make, model, shutter, focal, takestamp, thumbUrl, album, public, star, checksum, medium) VALUES ('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?')", $values);
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($result===false) {
+			if ($returnOnError===true) return false;
+			Response::error('Could not save photo in database!');
+		}
+
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 

From a02ba0143f0f695c8b29420b7495210c78b10d9f Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:37:25 +0100
Subject: [PATCH 087/183] Improved error handling when album/photo not found

---
 php/Modules/Album.php | 20 +++++++++++++++++++-
 php/Modules/Photo.php | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index b678241..ebeeb50 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -401,7 +401,7 @@ final class Album {
 			// Get album object
 			$album = $album->fetch_object();
 
-			// Photo not found
+			// Album not found?
 			if ($album===null) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified album');
 				return false;
@@ -563,6 +563,12 @@ final class Album {
 		// Get album object
 		$album = $albums->fetch_object();
 
+		// Album not found?
+		if ($album===null) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified album');
+			return false;
+		}
+
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
@@ -593,6 +599,12 @@ final class Album {
 		// Get album object
 		$album = $albums->fetch_object();
 
+		// Album not found?
+		if ($album===null) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified album');
+			return false;
+		}
+
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
@@ -701,6 +713,12 @@ final class Album {
 		// Get album object
 		$album = $albums->fetch_object();
 
+		// Album not found?
+		if ($album===null) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified album');
+			return false;
+		}
+
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index d3b0016..5ecf2b3 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -33,16 +33,20 @@ final class Photo {
 
 	}
 
-	public function add(array $files, $albumID = 0, $description = '', $tags = '', $returnOnError = false) {
-
-		// Use $returnOnError if you want to handle errors by your own
-		// e.g. when calling this functions inside an if-condition
+	/**
+	 * Creats new photo(s).
+	 * Exits on error.
+	 * Use $returnOnError if you want to handle errors by your own.
+	 * @return boolean Returns true when successful.
+	 */
+	public function add(array $files, $albumID = 0, $returnOnError = false) {
 
 		// Check permissions
 		if (hasPermissions(LYCHEE_UPLOADS)===false||
 			hasPermissions(LYCHEE_UPLOADS_BIG)===false||
 			hasPermissions(LYCHEE_UPLOADS_THUMB)===false) {
 				Log::error(Database::get(), __METHOD__, __LINE__, 'An upload-folder is missing or not readable and writable');
+				if ($returnOnError===true) return false;
 				Response::error('An upload-folder is missing or not readable and writable!');
 		}
 
@@ -649,6 +653,12 @@ final class Photo {
 		// Get photo object
 		$photo = $photos->fetch_assoc();
 
+		// Photo not found?
+		if ($photo===null) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified photo');
+			return false;
+		}
+
 		// Parse photo
 		$photo['sysdate'] = date('d M. Y', substr($photo['id'], 0, -4));
 		if (strlen($photo['takestamp'])>1) $photo['takedate'] = date('d M. Y', $photo['takestamp']);
@@ -676,6 +686,12 @@ final class Photo {
 				// Get album object
 				$album = $albums->fetch_assoc();
 
+				// Photo not found?
+				if ($photo===null) {
+					Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified album');
+					return false;
+				}
+
 				// Parse album
 				$photo['public'] = ($album['public']==='1' ? '2' : $photo['public']);
 
@@ -823,7 +839,7 @@ final class Photo {
 		// Get photo object
 		$photo = $photos->fetch_object();
 
-		// Photo not found
+		// Photo not found?
 		if ($photo===null) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified photo');
 			return false;
@@ -977,6 +993,12 @@ final class Photo {
 		// Get photo object
 		$photo = $photos->fetch_object();
 
+		// Photo not found?
+		if ($photo===null) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified photo');
+			return false;
+		}
+
 		// Check if public
 		if ($photo->public==='1') {
 
@@ -1027,6 +1049,12 @@ final class Photo {
 		// Get photo object
 		$photo = $photos->fetch_object();
 
+		// Photo not found?
+		if ($photo===null) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not find specified photo');
+			return false;
+		}
+
 		// Invert public
 		$public = ($photo->public==0 ? 1 : 0);
 

From 72b4321c0c019a7641e9b65d4fb2e1000301d637 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:38:04 +0100
Subject: [PATCH 088/183] Always response with Response::()

---
 php/Access/Admin.php  | 46 +++++++++++++++++++++----------------------
 php/Access/Guest.php  | 14 ++++++-------
 src/scripts/api.js    |  4 ++--
 src/scripts/upload.js |  3 +--
 4 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index ea54194..99bbb35 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -88,7 +88,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['title']), __METHOD__);
 
 		$album = new Album(null);
-		echo $album->add($_POST['title']);
+		Response::json($album->add($_POST['title']));
 
 	}
 
@@ -97,7 +97,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['albumIDs'], $_POST['title']), __METHOD__);
 
 		$album = new Album($_POST['albumIDs']);
-		echo $album->setTitle($_POST['title']);
+		Response::json($album->setTitle($_POST['title']));
 
 	}
 
@@ -106,7 +106,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['albumID'], $_POST['description']), __METHOD__);
 
 		$album = new Album($_POST['albumID']);
-		echo $album->setDescription($_POST['description']);
+		Response::json($album->setDescription($_POST['description']));
 
 	}
 
@@ -115,7 +115,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['albumID'], $_POST['password'], $_POST['visible'], $_POST['downloadable']), __METHOD__);
 
 		$album = new Album($_POST['albumID']);
-		echo $album->setPublic($_POST['public'], $_POST['password'], $_POST['visible'], $_POST['downloadable']);
+		Response::json($album->setPublic($_POST['public'], $_POST['password'], $_POST['visible'], $_POST['downloadable']));
 
 	}
 
@@ -124,7 +124,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['albumIDs']), __METHOD__);
 
 		$album = new Album($_POST['albumIDs']);
-		echo $album->delete();
+		Response::json($album->delete());
 
 	}
 
@@ -132,7 +132,7 @@ final class Admin extends Access {
 
 		Validator::required(isset($_POST['albumIDs']), __METHOD__);
 		$album = new Album($_POST['albumIDs']);
-		echo $album->merge();
+		Response::json($album->merge());
 
 	}
 
@@ -152,7 +152,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['photoIDs'], $_POST['title']), __METHOD__);
 
 		$photo = new Photo($_POST['photoIDs']);
-		echo $photo->setTitle($_POST['title']);
+		Response::json($photo->setTitle($_POST['title']));
 
 	}
 
@@ -161,7 +161,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['photoID'], $_POST['description']), __METHOD__);
 
 		$photo = new Photo($_POST['photoID']);
-		echo $photo->setDescription($_POST['description']);
+		Response::json($photo->setDescription($_POST['description']));
 
 	}
 
@@ -170,7 +170,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['photoIDs']), __METHOD__);
 
 		$photo = new Photo($_POST['photoIDs']);
-		echo $photo->setStar();
+		Response::json($photo->setStar());
 
 	}
 
@@ -179,7 +179,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['photoID']), __METHOD__);
 
 		$photo = new Photo($_POST['photoID']);
-		echo $photo->setPublic();
+		Response::json($photo->setPublic());
 
 	}
 
@@ -188,7 +188,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['photoIDs'], $_POST['albumID']), __METHOD__);
 
 		$photo = new Photo($_POST['photoIDs']);
-		echo $photo->setAlbum($_POST['albumID']);
+		Response::json($photo->setAlbum($_POST['albumID']));
 
 	}
 
@@ -197,7 +197,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['photoIDs'], $_POST['tags']), __METHOD__);
 
 		$photo = new Photo($_POST['photoIDs']);
-		echo $photo->setTags($_POST['tags']);
+		Response::json($photo->setTags($_POST['tags']));
 
 	}
 
@@ -206,7 +206,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['photoIDs']), __METHOD__);
 
 		$photo = new Photo($_POST['photoIDs']);
-		echo $photo->duplicate();
+		Response::json($photo->duplicate());
 
 	}
 
@@ -215,7 +215,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['photoIDs']), __METHOD__);
 
 		$photo = new Photo($_POST['photoIDs']);
-		echo $photo->delete();
+		Response::json($photo->delete());
 
 	}
 
@@ -223,10 +223,10 @@ final class Admin extends Access {
 
 	private static function uploadAction() {
 
-		Validator::required(isset($_FILES, $_POST['albumID'], $_POST['tags']), __METHOD__);
+		Validator::required(isset($_FILES, $_POST['albumID']), __METHOD__);
 
 		$photo = new Photo(null);
-		echo $photo->add($_FILES, $_POST['albumID'], '', $_POST['tags']);
+		Response::json($photo->add($_FILES, $_POST['albumID']));
 
 	}
 
@@ -235,7 +235,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['url'], $_POST['albumID']), __METHOD__);
 
 		$import = new Import();
-		echo $import->url($_POST['url'], $_POST['albumID']);
+		Response::json($import->url($_POST['url'], $_POST['albumID']));
 
 	}
 
@@ -272,14 +272,14 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['user'], $_POST['password']), __METHOD__);
 
 		$session = new Session();
-		echo $session->login($_POST['user'], $_POST['password']);
+		Response::json($session->login($_POST['user'], $_POST['password']));
 
 	}
 
 	private static function logoutAction() {
 
 		$session = new Session();
-		echo $session->logout();
+		Response::json($session->logout());
 
 	}
 
@@ -290,7 +290,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['username'], $_POST['password']), __METHOD__);
 
 		if (isset($_POST['oldPassword'])===false) $_POST['oldPassword'] = '';
-		echo Settings::setLogin($_POST['oldPassword'], $_POST['username'], $_POST['password']);
+		Response::json(Settings::setLogin($_POST['oldPassword'], $_POST['username'], $_POST['password']));
 
 	}
 
@@ -301,8 +301,8 @@ final class Admin extends Access {
 		$sA = Settings::setSortingAlbums($_POST['typeAlbums'], $_POST['orderAlbums']);
 		$sP = Settings::setSortingPhotos($_POST['typePhotos'], $_POST['orderPhotos']);
 
-		if ($sA===true&&$sP===true) echo true;
-		else                        echo false;
+		if ($sA===true&&$sP===true) Response::json(true);
+		else                        Response::json(false);
 
 	}
 
@@ -310,7 +310,7 @@ final class Admin extends Access {
 
 		Validator::required(isset($_POST['key']), __METHOD__);
 
-		echo Settings::setDropboxKey($_POST['key']);
+		Response::json(Settings::setDropboxKey($_POST['key']));
 
 	}
 
diff --git a/php/Access/Guest.php b/php/Access/Guest.php
index 269fef3..64a764b 100644
--- a/php/Access/Guest.php
+++ b/php/Access/Guest.php
@@ -55,8 +55,8 @@ final class Guest extends Access {
 		if ($album->getPublic()===true) {
 
 			// Album public
-			if ($album->checkPassword($_POST['password'])) Response::json($album->get());
-			else                                           Response::warning('Wrong password!');
+			if ($album->checkPassword($_POST['password'])===true) Response::json($album->get());
+			else                                                  Response::warning('Wrong password!');
 
 		} else {
 
@@ -76,13 +76,13 @@ final class Guest extends Access {
 		if ($album->getPublic()===true) {
 
 			// Album public
-			if ($album->checkPassword($_POST['password'])) echo true;
-			else                                           echo false;
+			if ($album->checkPassword($_POST['password'])===true) Response::json(true);
+			else                                                  Response::json(false);
 
 		} else {
 
 			// Album private
-			echo false;
+			Response::json(false);
 
 		}
 
@@ -118,14 +118,14 @@ final class Guest extends Access {
 		Validator::required(isset($_POST['user'], $_POST['password']), __METHOD__);
 
 		$session = new Session();
-		echo $session->login($_POST['user'], $_POST['password']);
+		Response::json($session->login($_POST['user'], $_POST['password']));
 
 	}
 
 	private static function logoutAction() {
 
 		$session = new Session();
-		echo $session->logout();
+		Response::json($session->logout());
 
 	}
 
diff --git a/src/scripts/api.js b/src/scripts/api.js
index 6ed4d2b..d45a007 100644
--- a/src/scripts/api.js
+++ b/src/scripts/api.js
@@ -27,8 +27,8 @@ api.post = function(fn, params, callback) {
 		}
 
 		// Convert 1 to true and an empty string to false
-		if (data==='1')     data = true
-		else if (data==='') data = false
+		if (data==='true')       data = true
+		else if (data==='false') data = false
 
 		// Convert to JSON if string start with '{' and ends with '}'
 		if (typeof data==='string' && data.substring(0, 1)==='{' && data.substring(data.length - 1, data.length)==='}') {
diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index 9f546e7..45eb106 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -115,7 +115,6 @@ upload.start = {
 
 			formData.append('function', 'Photo::add')
 			formData.append('albumID', albumID)
-			formData.append('tags', '')
 			formData.append(0, file)
 
 			xhr.open('POST', api.path)
@@ -128,7 +127,7 @@ upload.start = {
 				file.ready = true
 
 				// Set status
-				if (xhr.status===200 && xhr.responseText==='1') {
+				if (xhr.status===200 && xhr.responseText==='true') {
 
 					// Success
 					$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status')

From f00a3ddf92fe56b85343cb36f52963447541b35f Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:38:09 +0100
Subject: [PATCH 089/183] Rebuild

---
 dist/main.js | Bin 192607 -> 192577 bytes
 dist/view.js | Bin 107011 -> 106998 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 dist/main.js

diff --git a/dist/main.js b/dist/main.js
old mode 100644
new mode 100755
index ae6dcd81bebd31692233c09c4b8184c18d8fddcd..3938a3c038e9374fcf9c5236849cdba0082ace70
GIT binary patch
delta 97
zcmccrfcxMB?uIRlzhCj^<R_+N=A}C&7U^YVrld}nf6bUKT2fS+s$^?xn`)nGt7u@Q
zl$MxNoVtDTYsPQBj0W4gESWr7ra#-u6wLxsxZP<Vla0aj`gcrHj9lAizGFJZ2mr0%
BCbR$m

delta 102
zcmV-s0Ga>6;0xd23xKo%`|6jhX95zJYB&N52WV+zWhg0qmkR3vXALnTJv}{TKV>~3
zFghZ)hU)?LO#v~teK`V1gb5;aVP|t9EFvP8y1fEs0Wr5Ez5+Zj0ScF3?gAQ<yxt49
IhVBBp0jtU-BLDyZ

diff --git a/dist/view.js b/dist/view.js
index 75fb8cf31bb8e951224353713b1ec8288fb26b5c..c90f9b18ee606692552e94189d1d3058cd821c2f 100644
GIT binary patch
delta 60
zcmZoZ!uIVjTf-K{h+_Vn{KS;ZymY6;BE5{vl+@`p#f<5qB}JvFO18GPsrIS1iUw9n
QX^A<-soOskGYabg0Kz&I%>V!Z

delta 82
zcmex%n63E;Tf-K{h+>Vj(!Au7%=|nJ&FZ4mlG36)g`E7vl+3(zr^F(?jLei&4b55|
mLj!~9?~575r#BTd`tTYm+1lEs+Nato8dxc9e_YHctOo!Sg&eQ|


From c065d6100124e16e13b74c877d03bc8fe64bd00a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:47:30 +0100
Subject: [PATCH 090/183] Updated deps

---
 src/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/package.json b/src/package.json
index fecdb82..2a8a0aa 100644
--- a/src/package.json
+++ b/src/package.json
@@ -14,19 +14,19 @@
     "watch": "gulp watch"
   },
   "devDependencies": {
-    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-es2015": "^6.5.0",
     "basiccontext": "^3.5.1",
-    "basicmodal": "^3.3.2",
-    "gulp": "^3.9.0",
+    "basicmodal": "^3.3.3",
+    "gulp": "^3.9.1",
     "gulp-autoprefixer": "3.1.0",
-    "gulp-babel": "^6.1.1",
+    "gulp-babel": "^6.1.2",
     "gulp-concat": "^2.6.0",
     "gulp-inject": "^3.0.0",
     "gulp-load-plugins": "^1.2.0",
     "gulp-minify-css": "^1.2.3",
     "gulp-rimraf": "^0.2.0",
-    "gulp-sass": "^2.1.1",
-    "gulp-uglify": "^1.5.1",
+    "gulp-sass": "^2.2.0",
+    "gulp-uglify": "^1.5.2",
     "jquery": "^2.2.0",
     "mousetrap": "^1.5.3"
   }

From 5aecee48738cd75f6374fec7710ed191ccabeee1 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 13 Feb 2016 23:47:35 +0100
Subject: [PATCH 091/183] Rebuild

---
 dist/main.js | Bin 192577 -> 192532 bytes
 dist/view.js | Bin 106998 -> 106965 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 dist/main.js

diff --git a/dist/main.js b/dist/main.js
old mode 100755
new mode 100644
index 3938a3c038e9374fcf9c5236849cdba0082ace70..e7d74292cd8ae463b81fc72de8a01a2fb7753e0a
GIT binary patch
delta 72
zcmV-O0Js0a;0u)C3xKo%`|GzH>;Xmymww;@2$yU00c8OSx6t$fp+vWSIRf!FmvC_c
eZvhIo-*Ez)e3QK13zvrO0%8I?3b*L)0$BmFfFGU!

delta 107
zcmbR8fcxMB?uIRlzhBGeR3>Mnrs}1nCY7f9=BK2psU_#<73b%q>gD98You=f`I^y#
zgOO{x;}^!<?d!iVE_C66tF=-z*zRx1^vN6~U&xfdePbch>>41)=N(h-_TBH8A{hZ#
CRVtDI

diff --git a/dist/view.js b/dist/view.js
index c90f9b18ee606692552e94189d1d3058cd821c2f..8ecd07366b8e27e34a630a8a01aa963e8341c36f 100644
GIT binary patch
delta 201
zcmex%nC<FewhePQ83Q)Y<!lpS44AI%#wfknUhWYKqwi)VWg8F`uP!MGq$(YB1egPK
zd^fKMh!JEAn9Q2gAsC>SoS2iNk*cGVl3AvtsS_}HUeXkxTH|D6CPv@M>8YwfPH(Ck
z6Hxt?^u0jNqzpqJplwICOkxD`!nf)11F5#7y*g|Gu{s4ssgoNHi!Rpt6bN*RzB8je
scR-0|QEEwPQJzA;_DW~QY+gp+=}!X~GZ}ri`v)>|DsQhWVXV~!09vd=X#fBK

delta 233
zcmcb5nC;tPwhePQ8GSd;<!lpS^qsEl#wfknUhWYKW58x5Wg8F`uP!MGq$(YB1ekqw
z0yeJ*h!JG;oy?llA?T}@oS2iNk*cGVl3AvtspC6&UeXkxTH|D6CdPot>8YwfPH(Ck
z6Hxt?^u0jNqzpqJplwICOkxD`!nf)11F5#7y*g~Zu{s4ssgoNHi!Rpt6bN*RzB8je
zw{MANQEEwPQJ#YD_DW~QY+lBI=}!X~GZ_Q6`v)>|D$D0oCTFCk>ZPP6m8SdVr=+T>
YCFkcA=jWvA<>aSpq;3x@VXW5$0D%8a*8l(j


From 46f520e1fe3d6b05f87c935d79b36859cde78af0 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 14 Feb 2016 14:09:49 +0100
Subject: [PATCH 092/183] Removed medium option

Lychee will automatically create medium-sized photos when the photo ist big enough and Imagick installed and activated. It's no longer possible to deactivate it.
---
 docs/Settings.md                  |  6 ------
 php/Modules/Photo.php             |  4 +---
 php/Modules/Session.php           |  1 -
 php/database/settings_content.sql |  1 -
 php/database/update_020700.php    | 13 -------------
 5 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/docs/Settings.md b/docs/Settings.md
index 6bcd95f..c762708 100644
--- a/docs/Settings.md
+++ b/docs/Settings.md
@@ -52,12 +52,6 @@ This key is required to use the Dropbox import feature from your server. Lychee
 
 If `1`, Lychee will use Imagick when available. Disable [Imagick](http://www.imagemagick.org) if you have problems or if you are using an outdated version. Lychee will use [GD](http://php.net/manual/en/book.image.php) when Imagick is disabled or not available.
 
-#### Medium
-
-	medium = [0|1]
-
-If `1`, Lychee will create a second, smaller version of your photo. This feature requires [Imagick](http://www.imagemagick.org) on your server and an activated `imagick` option the the settings table.
-
 #### Skip Duplicates on Upload
 
 	skipDuplicates = [0|1]
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 5ecf2b3..a39202c 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -380,7 +380,7 @@ final class Photo {
 
 	/**
 	 * Creates a smaller version of a photo when its size is bigger than a preset size.
-	 * Photo must be big enough, medium must be activated and Imagick must be installed and activated.
+	 * Photo must be big enough and Imagick must be installed and activated.
 	 * @return boolean Returns true when successful.
 	 */
 	private function createMedium($url, $filename, $width, $height) {
@@ -413,11 +413,9 @@ final class Photo {
 		}
 
 		// Is photo big enough?
-		// Is medium activated?
 		// Is Imagick installed and activated?
 		if (($error===false)&&
 			($width>$newWidth||$height>$newHeight)&&
-			(Settings::get()['medium']==='1')&&
 			(extension_loaded('imagick')&&Settings::get()['imagick']==='1')) {
 
 			$newUrl = LYCHEE_UPLOADS_MEDIUM . $filename;
diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index 7b6d105..0b846ad 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -50,7 +50,6 @@ final class Session {
 			unset($return['config']['login']);
 			unset($return['config']['location']);
 			unset($return['config']['imagick']);
-			unset($return['config']['medium']);
 			unset($return['config']['plugins']);
 
 		}
diff --git a/php/database/settings_content.sql b/php/database/settings_content.sql
index 4074590..18067ff 100644
--- a/php/database/settings_content.sql
+++ b/php/database/settings_content.sql
@@ -9,7 +9,6 @@ VALUES
   ('checkForUpdates','1'),
   ('sortingPhotos','ORDER BY id DESC'),
   ('sortingAlbums','ORDER BY id DESC'),
-  ('medium','1'),
   ('imagick','1'),
   ('dropboxKey',''),
   ('identifier',''),
diff --git a/php/database/update_020700.php b/php/database/update_020700.php
index d59ea7f..eed5fd7 100644
--- a/php/database/update_020700.php
+++ b/php/database/update_020700.php
@@ -31,19 +31,6 @@ if (is_dir(LYCHEE_UPLOADS_MEDIUM)===false) {
 
 }
 
-// Add medium to settings
-$query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'medium' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
-$result = Database::execute($connection, $query, 'update_020700', __LINE__);
-
-if ($result->num_rows===0) {
-
-	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('medium', '1')", array(LYCHEE_TABLE_SETTINGS));
-	$result = Database::execute($connection, $query, 'update_020700', __LINE__);
-
-	if ($result===false) return false;
-
-}
-
 // Set version
 if (Database::setVersion($connection, '020700')===false) return false;
 

From 4c130211b1579a65ca406b31dd29601291c84903 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 14 Feb 2016 14:26:05 +0100
Subject: [PATCH 093/183] Replaced return false in database updates with error
 messages

---
 php/database/update_020700.php |  8 ++++----
 php/database/update_030000.php | 11 +++++------
 php/database/update_030001.php | 19 +++++++++----------
 php/database/update_030003.php |  9 ++++-----
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/php/database/update_020700.php b/php/database/update_020700.php
index eed5fd7..5575d46 100644
--- a/php/database/update_020700.php
+++ b/php/database/update_020700.php
@@ -5,8 +5,7 @@
  */
 
 use Lychee\Modules\Database;
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+use Lychee\Modules\Response;
 
 // Add medium to photos
 $query  = Database::prepare($connection, "SELECT `medium` FROM `?` LIMIT 1", array(LYCHEE_TABLE_PHOTOS));
@@ -17,7 +16,7 @@ if ($result===false) {
 	$query  = Database::prepare($connection, "ALTER TABLE `?` ADD `medium` TINYINT(1) NOT NULL DEFAULT 0", array(LYCHEE_TABLE_PHOTOS));
 	$result = Database::execute($connection, $query, 'update_020700', __LINE__);
 
-	if ($result===false) return false;
+	if ($result===false) Response::error('Could not add medium-field to database!');
 
 }
 
@@ -27,11 +26,12 @@ if (is_dir(LYCHEE_UPLOADS_MEDIUM)===false) {
 	// Only create the folder when it is missing
 	if (@mkdir(LYCHEE_UPLOADS_MEDIUM)===false) {
 		Log::error($connection, 'update_020700', __LINE__, 'Could not create medium-folder');
+		Response::error('Could not create medium-folder!');
 	}
 
 }
 
 // Set version
-if (Database::setVersion($connection, '020700')===false) return false;
+if (Database::setVersion($connection, '020700')===false) Response::error('Could not update version of database!');
 
 ?>
\ No newline at end of file
diff --git a/php/database/update_030000.php b/php/database/update_030000.php
index 3557be3..1832627 100644
--- a/php/database/update_030000.php
+++ b/php/database/update_030000.php
@@ -5,29 +5,28 @@
  */
 
 use Lychee\Modules\Database;
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+use Lychee\Modules\Response;
 
 // Remove login
 // Login now saved as crypt without md5. Legacy code has been removed.
 $query  = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'username' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
 $result = Database::execute($connection, $query, 'update_030000', __LINE__);
 
-if ($result===false) return false;
+if ($result===false) Response::error('Could not reset username in database!');
 
 $query  = Database::prepare($connection, "UPDATE `?` SET `value` = '' WHERE `key` = 'password' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
 $result = Database::execute($connection, $query, 'update_030000', __LINE__);
 
-if ($result===false) return false;
+if ($result===false) Response::error('Could not reset password in database!');
 
 // Make public albums private and reset password
 // Password now saved as crypt without md5. Legacy code has been removed.
 $query  = Database::prepare($connection, "UPDATE `?` SET `public` = 0, `password` = NULL", array(LYCHEE_TABLE_ALBUMS));
 $result = Database::execute($connection, $query, 'update_030000', __LINE__);
 
-if ($result===false) return false;
+if ($result===false) Response::error('Could not reset publicity of photos in database!');
 
 // Set version
-if (Database::setVersion($connection, '030000')===false) return false;
+if (Database::setVersion($connection, '030000')===false) Response::error('Could not update version of database!');
 
 ?>
\ No newline at end of file
diff --git a/php/database/update_030001.php b/php/database/update_030001.php
index 9193fef..b3a0e25 100644
--- a/php/database/update_030001.php
+++ b/php/database/update_030001.php
@@ -5,33 +5,32 @@
  */
 
 use Lychee\Modules\Database;
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+use Lychee\Modules\Response;
 
 // Change length of photo title
 $query  = Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_PHOTOS));
 $result = Database::execute($connection, $query, 'update_030001', __LINE__);
 
-if ($result===false) return false;
+if ($result===false) Response::error('Could not change length of photo title in database!');
 
 // Change length of album title
 $query  = Database::prepare($connection, "ALTER TABLE `?` CHANGE `title` `title` VARCHAR( 100 ) NOT NULL DEFAULT ''", array(LYCHEE_TABLE_ALBUMS));
 $result = Database::execute($connection, $query, 'update_030001', __LINE__);
 
-if ($result===false) return false;
+if ($result===false) Response::error('Could not change length of album title in database!');
 
 // Add album sorting to settings
 $query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'sortingAlbums' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
 $result = Database::execute($connection, $query, 'update_030001', __LINE__);
 
-if ($result===false) return false;
+if ($result===false) Response::error('Could not get current album sorting from database!');
 
 if ($result->num_rows===0) {
 
 	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('sortingAlbums', 'ORDER BY id DESC')", array(LYCHEE_TABLE_SETTINGS));
 	$result = Database::execute($connection, $query, 'update_030001', __LINE__);
 
-	if ($result===false) return false;
+	if ($result===false) Response::error('Could not add album sorting to database!');
 
 }
 
@@ -39,13 +38,13 @@ if ($result->num_rows===0) {
 $query  = Database::prepare($connection, "UPDATE ? SET `key` = 'sortingPhotos' WHERE `key` = 'sorting' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
 $result = Database::execute($connection, $query, 'update_030001', __LINE__);
 
-if ($result===false) return false;
+if ($result===false) Response::error('Could not rename photo sorting row in database!');
 
 // Add identifier to settings
 $query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'identifier' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
 $result = Database::execute($connection, $query, 'update_030001', __LINE__);
 
-if ($result===false) return false;
+if ($result===false) Response::error('Could not get current identifier from database!');
 
 if ($result->num_rows===0) {
 
@@ -53,11 +52,11 @@ if ($result->num_rows===0) {
 	$query      = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('identifier', '?')", array(LYCHEE_TABLE_SETTINGS, $identifier));
 	$result     = Database::execute($connection, $query, 'update_030001', __LINE__);
 
-	if ($result===false) return false;
+	if ($result===false) Response::error('Could not add identifier to database!');
 
 }
 
 // Set version
-if (Database::setVersion($connection, '030001')===false) return false;
+if (Database::setVersion($connection, '030001')===false) Response::error('Could not update version of database!');
 
 ?>
\ No newline at end of file
diff --git a/php/database/update_030003.php b/php/database/update_030003.php
index 95876d1..4e73862 100644
--- a/php/database/update_030003.php
+++ b/php/database/update_030003.php
@@ -5,25 +5,24 @@
  */
 
 use Lychee\Modules\Database;
-
-if (!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
+use Lychee\Modules\Response;
 
 // Add skipDuplicates to settings
 $query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'skipDuplicates' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
 $result = Database::execute($connection, $query, 'update_030003', __LINE__);
 
-if ($result===false) return false;
+if ($result===false) Response::error('Could not get current skipDuplicates from database!');
 
 if ($result->num_rows===0) {
 
 	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('skipDuplicates', '0')", array(LYCHEE_TABLE_SETTINGS));
 	$result = Database::execute($connection, $query, 'update_030003', __LINE__);
 
-	if ($result===false) return false;
+	if ($result===false) Response::error('Could not add skipDuplicates to database!');
 
 }
 
 // Set version
-if (Database::setVersion($connection, '030003')===false) return false;
+if (Database::setVersion($connection, '030003')===false) Response::error('Could not update version of database!');
 
 ?>
\ No newline at end of file

From bad7819ff6b27575b3fa742a4f5abb69595e235f Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 14 Feb 2016 14:49:51 +0100
Subject: [PATCH 094/183] Moved Album::getAll into a separated file

---
 php/Access/Admin.php       |  13 ++-
 php/Access/Guest.php       |  13 ++-
 php/Modules/Album.php      | 173 ---------------------------------
 php/Modules/Albums.php     | 191 +++++++++++++++++++++++++++++++++++++
 src/scripts/albums.js      |   2 +-
 src/scripts/contextMenu.js |   6 +-
 6 files changed, 213 insertions(+), 185 deletions(-)
 create mode 100644 php/Modules/Albums.php

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index 99bbb35..927198b 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -3,6 +3,7 @@
 namespace Lychee\Access;
 
 use Lychee\Modules\Album;
+use Lychee\Modules\Albums;
 use Lychee\Modules\Import;
 use Lychee\Modules\Photo;
 use Lychee\Modules\Response;
@@ -16,8 +17,10 @@ final class Admin extends Access {
 
 		switch ($fn) {
 
+			// Albums functions
+			case 'Albums::get':             self::getAlbumsAction(); break;
+
 			// Album functions
-			case 'Album::getAll':           self::getAlbumsAction(); break;
 			case 'Album::get':              self::getAlbumAction(); break;
 			case 'Album::add':              self::addAlbumAction(); break;
 			case 'Album::setTitle':         self::setAlbumTitleAction(); break;
@@ -65,15 +68,17 @@ final class Admin extends Access {
 
 	}
 
-	// Album functions
+	// Albums functions
 
 	private static function getAlbumsAction() {
 
-		$album = new Album(null);
-		Response::json($album->getAll(false));
+		$albums = new Albums();
+		Response::json($albums->get(false));
 
 	}
 
+	// Album functions
+
 	private static function getAlbumAction() {
 
 		Validator::required(isset($_POST['albumID']), __METHOD__);
diff --git a/php/Access/Guest.php b/php/Access/Guest.php
index 64a764b..84e3f69 100644
--- a/php/Access/Guest.php
+++ b/php/Access/Guest.php
@@ -3,6 +3,7 @@
 namespace Lychee\Access;
 
 use Lychee\Modules\Album;
+use Lychee\Modules\Albums;
 use Lychee\Modules\Photo;
 use Lychee\Modules\Response;
 use Lychee\Modules\Session;
@@ -14,8 +15,10 @@ final class Guest extends Access {
 
 		switch ($fn) {
 
+			// Albums functions
+			case 'Albums::get':       self::getAlbumsAction(); break;
+
 			// Album functions
-			case 'Album::getAll':     self::getAlbumsAction(); break;
 			case 'Album::get':        self::getAlbumAction(); break;
 			case 'Album::getPublic':  self::checkAlbumAccessAction(); break;
 
@@ -37,15 +40,17 @@ final class Guest extends Access {
 
 	}
 
-	// Album functions
+	// Albums functions
 
 	private static function getAlbumsAction() {
 
-		$album = new Album(null);
-		Response::json($album->getAll(true));
+		$albums = new Albums();
+		Response::json($albums->get(true));
 
 	}
 
+	// Album functions
+
 	private static function getAlbumAction() {
 
 		Validator::required(isset($_POST['albumID'], $_POST['password']), __METHOD__);
diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index ebeeb50..e4915a1 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -180,179 +180,6 @@ final class Album {
 
 	}
 
-	/**
-	 * @return array|false Returns an array of albums or false on failure.
-	 */
-	public function getAll($public = true) {
-
-		// Call plugins
-		Plugins::get()->activate(__METHOD__, 0, func_get_args());
-
-		// Initialize return var
-		$return = array(
-			'smartalbums' => null,
-			'albums'      => null,
-			'num'         => 0
-		);
-
-		// Get SmartAlbums
-		if ($public===false) $return['smartalbums'] = $this->getSmartInfo();
-
-		// Albums query
-		if ($public===false) $query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
-		else                 $query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? WHERE public = 1 AND visible <> 0 ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
-
-		// Execute query
-		$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
-
-		if ($albums===false) return false;
-
-		// For each album
-		while ($album = $albums->fetch_assoc()) {
-
-			// Turn data from the database into a front-end friendly format
-			$album = Album::prepareData($album);
-
-			// Thumbs
-			if (($public===true&&$album['password']==='0')||
-				($public===false)) {
-
-					// Execute query
-					$query  = Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr(Settings::get()['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
-					$thumbs = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
-
-					if ($thumbs===false) return false;
-
-					// For each thumb
-					$k = 0;
-					while ($thumb = $thumbs->fetch_object()) {
-						$album['thumbs'][$k] = LYCHEE_URL_UPLOADS_THUMB . $thumb->thumbUrl;
-						$k++;
-					}
-
-			}
-
-			// Add to return
-			$return['albums'][] = $album;
-
-		}
-
-		// Num of albums
-		$return['num'] = $albums->num_rows;
-
-		// Call plugins
-		Plugins::get()->activate(__METHOD__, 1, func_get_args());
-
-		return $return;
-
-	}
-
-	/**
-	 * @return array|false Returns an array of smart albums or false on failure.
-	 */
-	private function getSmartInfo() {
-
-		// Initialize return var
-		$return = array(
-			'unsorted' => null,
-			'public'   => null,
-			'starred'  => null,
-			'recent'   => null
-		);
-
-		/**
-		 * Unsorted
-		 */
-
-		$query    = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE album = 0 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$unsorted = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
-		$i        = 0;
-
-		if ($unsorted===false) return false;
-
-		$return['unsorted'] = array(
-			'thumbs' => array(),
-			'num'    => $unsorted->num_rows
-		);
-
-		while($row = $unsorted->fetch_object()) {
-			if ($i<3) {
-				$return['unsorted']['thumbs'][$i] = LYCHEE_URL_UPLOADS_THUMB . $row->thumbUrl;
-				$i++;
-			} else break;
-		}
-
-		/**
-		 * Starred
-		 */
-
-		$query   = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE star = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$starred = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
-		$i       = 0;
-
-		if ($starred===false) return false;
-
-		$return['starred'] = array(
-			'thumbs' => array(),
-			'num'    => $starred->num_rows
-		);
-
-		while($row3 = $starred->fetch_object()) {
-			if ($i<3) {
-				$return['starred']['thumbs'][$i] = LYCHEE_URL_UPLOADS_THUMB . $row3->thumbUrl;
-				$i++;
-			} else break;
-		}
-
-		/**
-		 * Public
-		 */
-
-		$query  = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE public = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$public = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
-		$i      = 0;
-
-		if ($public===false) return false;
-
-		$return['public'] = array(
-			'thumbs' => array(),
-			'num'    => $public->num_rows
-		);
-
-		while($row2 = $public->fetch_object()) {
-			if ($i<3) {
-				$return['public']['thumbs'][$i] = LYCHEE_URL_UPLOADS_THUMB . $row2->thumbUrl;
-				$i++;
-			} else break;
-		}
-
-		/**
-		 * Recent
-		 */
-
-		$query  = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
-		$recent = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
-		$i      = 0;
-
-		if ($recent===false) return false;
-
-		$return['recent'] = array(
-			'thumbs' => array(),
-			'num'    => $recent->num_rows
-		);
-
-		while($row3 = $recent->fetch_object()) {
-			if ($i<3) {
-				$return['recent']['thumbs'][$i] = LYCHEE_URL_UPLOADS_THUMB . $row3->thumbUrl;
-				$i++;
-			} else break;
-		}
-
-		// Return SmartAlbums
-		return $return;
-
-	}
-
 	/**
 	 * Starts a download of an album.
 	 * @return resource|boolean Sends a ZIP-file or returns false on failure.
diff --git a/php/Modules/Albums.php b/php/Modules/Albums.php
new file mode 100644
index 0000000..e57ee84
--- /dev/null
+++ b/php/Modules/Albums.php
@@ -0,0 +1,191 @@
+<?php
+
+namespace Lychee\Modules;
+
+final class Albums {
+
+	/**
+	 * @return boolean Returns true when successful.
+	 */
+	public function __construct() {
+
+		return true;
+
+	}
+
+	/**
+	 * @return array|false Returns an array of albums or false on failure.
+	 */
+	public function get($public = true) {
+
+		// Call plugins
+		Plugins::get()->activate(__METHOD__, 0, func_get_args());
+
+		// Initialize return var
+		$return = array(
+			'smartalbums' => null,
+			'albums'      => null,
+			'num'         => 0
+		);
+
+		// Get SmartAlbums
+		if ($public===false) $return['smartalbums'] = $this->getSmartAlbums();
+
+		// Albums query
+		if ($public===false) $query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
+		else                 $query = Database::prepare(Database::get(), 'SELECT id, title, public, sysstamp, password FROM ? WHERE public = 1 AND visible <> 0 ' . Settings::get()['sortingAlbums'], array(LYCHEE_TABLE_ALBUMS));
+
+		// Execute query
+		$albums = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+		if ($albums===false) return false;
+
+		// For each album
+		while ($album = $albums->fetch_assoc()) {
+
+			// Turn data from the database into a front-end friendly format
+			$album = Album::prepareData($album);
+
+			// Thumbs
+			if (($public===true&&$album['password']==='0')||
+				($public===false)) {
+
+					// Execute query
+					$query  = Database::prepare(Database::get(), "SELECT thumbUrl FROM ? WHERE album = '?' ORDER BY star DESC, " . substr(Settings::get()['sortingPhotos'], 9) . " LIMIT 3", array(LYCHEE_TABLE_PHOTOS, $album['id']));
+					$thumbs = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+
+					if ($thumbs===false) return false;
+
+					// For each thumb
+					$k = 0;
+					while ($thumb = $thumbs->fetch_object()) {
+						$album['thumbs'][$k] = LYCHEE_URL_UPLOADS_THUMB . $thumb->thumbUrl;
+						$k++;
+					}
+
+			}
+
+			// Add to return
+			$return['albums'][] = $album;
+
+		}
+
+		// Num of albums
+		$return['num'] = $albums->num_rows;
+
+		// Call plugins
+		Plugins::get()->activate(__METHOD__, 1, func_get_args());
+
+		return $return;
+
+	}
+
+	/**
+	 * @return array|false Returns an array of smart albums or false on failure.
+	 */
+	private function getSmartAlbums() {
+
+		// Initialize return var
+		$return = array(
+			'unsorted' => null,
+			'public'   => null,
+			'starred'  => null,
+			'recent'   => null
+		);
+
+		/**
+		 * Unsorted
+		 */
+
+		$query    = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE album = 0 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$unsorted = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+		$i        = 0;
+
+		if ($unsorted===false) return false;
+
+		$return['unsorted'] = array(
+			'thumbs' => array(),
+			'num'    => $unsorted->num_rows
+		);
+
+		while($row = $unsorted->fetch_object()) {
+			if ($i<3) {
+				$return['unsorted']['thumbs'][$i] = LYCHEE_URL_UPLOADS_THUMB . $row->thumbUrl;
+				$i++;
+			} else break;
+		}
+
+		/**
+		 * Starred
+		 */
+
+		$query   = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE star = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$starred = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+		$i       = 0;
+
+		if ($starred===false) return false;
+
+		$return['starred'] = array(
+			'thumbs' => array(),
+			'num'    => $starred->num_rows
+		);
+
+		while($row3 = $starred->fetch_object()) {
+			if ($i<3) {
+				$return['starred']['thumbs'][$i] = LYCHEE_URL_UPLOADS_THUMB . $row3->thumbUrl;
+				$i++;
+			} else break;
+		}
+
+		/**
+		 * Public
+		 */
+
+		$query  = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE public = 1 ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$public = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+		$i      = 0;
+
+		if ($public===false) return false;
+
+		$return['public'] = array(
+			'thumbs' => array(),
+			'num'    => $public->num_rows
+		);
+
+		while($row2 = $public->fetch_object()) {
+			if ($i<3) {
+				$return['public']['thumbs'][$i] = LYCHEE_URL_UPLOADS_THUMB . $row2->thumbUrl;
+				$i++;
+			} else break;
+		}
+
+		/**
+		 * Recent
+		 */
+
+		$query  = Database::prepare(Database::get(), 'SELECT thumbUrl FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) ' . Settings::get()['sortingPhotos'], array(LYCHEE_TABLE_PHOTOS));
+		$recent = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+		$i      = 0;
+
+		if ($recent===false) return false;
+
+		$return['recent'] = array(
+			'thumbs' => array(),
+			'num'    => $recent->num_rows
+		);
+
+		while($row3 = $recent->fetch_object()) {
+			if ($i<3) {
+				$return['recent']['thumbs'][$i] = LYCHEE_URL_UPLOADS_THUMB . $row3->thumbUrl;
+				$i++;
+			} else break;
+		}
+
+		// Return SmartAlbums
+		return $return;
+
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/scripts/albums.js b/src/scripts/albums.js
index 846046c..26f8ea7 100644
--- a/src/scripts/albums.js
+++ b/src/scripts/albums.js
@@ -17,7 +17,7 @@ albums.load = function() {
 
 	if (albums.json===null) {
 
-		api.post('Album::getAll', {}, function(data) {
+		api.post('Albums::get', {}, function(data) {
 
 			let waitTime = 0
 
diff --git a/src/scripts/contextMenu.js b/src/scripts/contextMenu.js
index dab6918..fc1f245 100644
--- a/src/scripts/contextMenu.js
+++ b/src/scripts/contextMenu.js
@@ -90,7 +90,7 @@ contextMenu.albumMulti = function(albumIDs, e) {
 
 contextMenu.albumTitle = function(albumID, e) {
 
-	api.post('Album::getAll', {}, function(data) {
+	api.post('Albums::get', {}, function(data) {
 
 		let items = []
 
@@ -121,7 +121,7 @@ contextMenu.albumTitle = function(albumID, e) {
 
 contextMenu.mergeAlbum = function(albumID, e) {
 
-	api.post('Album::getAll', {}, function(data) {
+	api.post('Albums::get', {}, function(data) {
 
 		let items = []
 
@@ -238,7 +238,7 @@ contextMenu.move = function(photoIDs, e) {
 
 	let items = []
 
-	api.post('Album::getAll', {}, function(data) {
+	api.post('Albums::get', {}, function(data) {
 
 		if (data.num===0) {
 

From 78b42d0182e27f99a0d412757ac475acc0f72628 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 14 Feb 2016 18:33:55 +0100
Subject: [PATCH 095/183] Rebuild

---
 dist/main.js | Bin 192532 -> 192523 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index e7d74292cd8ae463b81fc72de8a01a2fb7753e0a..afaa59ea6c77080a4bd7eebf12f5d44596da6dd1 100644
GIT binary patch
delta 94
zcmbR8fV=wvcf%IO^2cn&R#xe$CEM#CGhUE|al#pyJ~P5NLCj2VIAI(&UZ$*+=^G1~
hWEr`(pDSc~T{C_6J0@jDuIYtZOyb+WzGISS1OT+bBHI7}

delta 118
zcmeBvz&+&wcf%IO^2Z!jR_UoFjyXBoYacUSkcD%n`!F*}ZO>(7y2%I^+YS_a!-?S9
z@iJwlFmg>lo5kcmJ-?WVb^G5!rY$v0)?Cv!zGG6J9xKblKD|JTNnrb%cTDn(0Qbo$
AV*mgE


From c662e56ed9c2d281ea4f2e6dafc09df506c27100 Mon Sep 17 00:00:00 2001
From: klikini <klikini@robiotic.net>
Date: Thu, 25 Feb 2016 19:44:45 -0600
Subject: [PATCH 096/183] Use a <form> for the login window

---
 src/scripts/lychee.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index c92699e..39b4f75 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -115,10 +115,10 @@ lychee.login = function(data) {
 lychee.loginDialog = function() {
 
 	let msg = lychee.html`
-	          <p class='signIn'>
+	          <form class='signIn'>
 	              <input class='text' name='username' autocomplete='username' type='text' value='' placeholder='username' autocapitalize='off' autocorrect='off'>
 	              <input class='text' name='password' autocomplete='current-password' type='password' value='' placeholder='password'>
-	          </p>
+	          </form>
 	          <p class='version'>Lychee $${ lychee.version }<span> &#8211; <a target='_blank' href='$${ lychee.updateURL }'>Update available!</a><span></p>
 	          `
 

From dd5e2128d925773b04401e23ac15c0a5b20876d6 Mon Sep 17 00:00:00 2001
From: klikini <klikini@robiotic.net>
Date: Thu, 25 Feb 2016 19:53:41 -0600
Subject: [PATCH 097/183] Add form attributes

---
 src/scripts/lychee.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 39b4f75..31e27fe 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -115,7 +115,7 @@ lychee.login = function(data) {
 lychee.loginDialog = function() {
 
 	let msg = lychee.html`
-	          <form class='signIn'>
+	          <form class='signIn' action='#'>
 	              <input class='text' name='username' autocomplete='username' type='text' value='' placeholder='username' autocapitalize='off' autocorrect='off'>
 	              <input class='text' name='password' autocomplete='current-password' type='password' value='' placeholder='password'>
 	          </form>

From 180b1397738988618fc615cf02e8b26399f3468d Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 28 Feb 2016 12:10:29 +0100
Subject: [PATCH 098/183] Updated deps and build commands

---
 docs/Build.md    |  6 +++---
 src/package.json | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/Build.md b/docs/Build.md
index acb0a09..678f2a6 100644
--- a/docs/Build.md
+++ b/docs/Build.md
@@ -2,7 +2,7 @@
 
 First you have to install the following dependencies:
 
-- `node` [Node.js](http://nodejs.org) v0.10 or later
+- `node` [Node.js](http://nodejs.org) v5.7.0 or later
 - `npm` [Node Packaged Modules](https://www.npmjs.org)
 
 After [installing Node.js](http://nodejs.org) you can use the included `npm` package manager to download all dependencies:
@@ -12,10 +12,10 @@ After [installing Node.js](http://nodejs.org) you can use the included `npm` pac
 
 ### Build
 
-The Gulpfile is located in `src/` and can be executed using the `npm start` command.
+The Gulpfile is located in `src/` and can be executed using the `npm run compile` command.
 
 ### Watch for changes
 
 While developing, you might want to use the following command to automatically build Lychee everytime you save a file:
 
-	npm run watch
+	npm start
\ No newline at end of file
diff --git a/src/package.json b/src/package.json
index 2a8a0aa..0030bd2 100644
--- a/src/package.json
+++ b/src/package.json
@@ -10,8 +10,8 @@
     "url": "https://github.com/electerious/Lychee.git"
   },
   "scripts": {
-    "start": "gulp",
-    "watch": "gulp watch"
+    "start": "gulp watch",
+    "compile": "gulp"
   },
   "devDependencies": {
     "babel-preset-es2015": "^6.5.0",
@@ -23,11 +23,11 @@
     "gulp-concat": "^2.6.0",
     "gulp-inject": "^3.0.0",
     "gulp-load-plugins": "^1.2.0",
-    "gulp-minify-css": "^1.2.3",
+    "gulp-minify-css": "^1.2.4",
     "gulp-rimraf": "^0.2.0",
     "gulp-sass": "^2.2.0",
-    "gulp-uglify": "^1.5.2",
-    "jquery": "^2.2.0",
+    "gulp-uglify": "^1.5.3",
+    "jquery": "^2.2.1",
     "mousetrap": "^1.5.3"
   }
 }

From d90707c49fa0e08724b9b94ee46d18468f232ada Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 28 Feb 2016 12:14:44 +0100
Subject: [PATCH 099/183] Reverted #462

---
 src/scripts/lychee.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 31e27fe..c92699e 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -115,10 +115,10 @@ lychee.login = function(data) {
 lychee.loginDialog = function() {
 
 	let msg = lychee.html`
-	          <form class='signIn' action='#'>
+	          <p class='signIn'>
 	              <input class='text' name='username' autocomplete='username' type='text' value='' placeholder='username' autocapitalize='off' autocorrect='off'>
 	              <input class='text' name='password' autocomplete='current-password' type='password' value='' placeholder='password'>
-	          </form>
+	          </p>
 	          <p class='version'>Lychee $${ lychee.version }<span> &#8211; <a target='_blank' href='$${ lychee.updateURL }'>Update available!</a><span></p>
 	          `
 

From e8ebf13d091f42a2b3a0174c571ce5d2f2b53c81 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Fri, 4 Mar 2016 23:03:35 +0100
Subject: [PATCH 100/183] Fixed incorrect Imagick namespace #471

---
 php/Modules/Photo.php         | 1 +
 plugins/Diagnostics/index.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index a39202c..9fabc8d 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -3,6 +3,7 @@
 namespace Lychee\Modules;
 
 use ZipArchive;
+use Imagick;
 
 final class Photo {
 
diff --git a/plugins/Diagnostics/index.php b/plugins/Diagnostics/index.php
index 3e7124b..307a774 100644
--- a/plugins/Diagnostics/index.php
+++ b/plugins/Diagnostics/index.php
@@ -9,6 +9,7 @@
 namespace Diagnostics;
 
 use Mysqli;
+use Imagick;
 use Lychee\Modules\Settings;
 
 $lychee = __DIR__ . '/../../';

From 2fb8ace3343cf8d29498915509b02e94de88fa52 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 5 Mar 2016 11:54:55 +0100
Subject: [PATCH 101/183] Updated PHP version in main readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 77886e4..e7d1b2a 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Lychee is a free photo-management tool, which runs on your server or web-space.
 
 ## Installation
 
-To run Lychee, everything you need is a web-server with PHP 5.3 or later and a MySQL-Database. Follow the instructions to install Lychee on your server. [Installation &#187;](docs/Installation.md)
+To run Lychee, everything you need is a web-server with PHP 5.5 or later and a MySQL-Database. Follow the instructions to install Lychee on your server. [Installation &#187;](docs/Installation.md)
 
 ## How to use
 

From c7751f02310eececfeaa086ed43998b3d9eca4af Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 16:36:22 +0100
Subject: [PATCH 102/183] Move to next photo after after moving a picture #437

---
 src/scripts/photo.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index a636938..92bd026 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -335,14 +335,12 @@ photo.setTitle = function(photoIDs) {
 
 photo.setAlbum = function(photoIDs, albumID) {
 
-	let nextPhoto
-	let previousPhoto
+	let nextPhoto = null
+	let previousPhoto = null
 
 	if (!photoIDs) return false
 	if (photoIDs instanceof Array===false) photoIDs = [ photoIDs ]
 
-	if (visible.photo) lychee.goto(album.getID())
-
 	photoIDs.forEach(function(id, index, array) {
 
 		// Change reference for the next and previous photo
@@ -363,6 +361,11 @@ photo.setAlbum = function(photoIDs, albumID) {
 
 	albums.refresh()
 
+	// Go to next photo if there is a next photo and
+	// next photo is not the current one. Show album otherwise.
+	if (visible.photo() && nextPhoto!=null && nextPhoto!==photo.getID()) lychee.goto(album.getID() + '/' + nextPhoto)
+	else if (!visible.albums())                                          lychee.goto(album.getID())
+
 	let params = {
 		photoIDs: photoIDs.join(),
 		albumID

From 84c37b9b35ddeed9d30653eae87cfaab40b26ef4 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 16:40:40 +0100
Subject: [PATCH 103/183] Fixed error when deleting last open photo in album

---
 src/scripts/photo.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index 92bd026..34e4d1c 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -192,8 +192,8 @@ photo.delete = function(photoIDs) {
 
 	action.fn = function() {
 
-		let nextPhoto
-		let previousPhoto
+		let nextPhoto = null
+		let previousPhoto = null
 
 		basicModal.close()
 
@@ -219,8 +219,8 @@ photo.delete = function(photoIDs) {
 
 		// Go to next photo if there is a next photo and
 		// next photo is not the current one. Show album otherwise.
-		if (visible.photo() && nextPhoto!=='' && nextPhoto!==photo.getID()) lychee.goto(album.getID() + '/' + nextPhoto)
-		else if (!visible.albums())                                         lychee.goto(album.getID())
+		if (visible.photo() && nextPhoto!=null && nextPhoto!==photo.getID()) lychee.goto(album.getID() + '/' + nextPhoto)
+		else if (!visible.albums())                                          lychee.goto(album.getID())
 
 		let params = {
 			photoIDs: photoIDs.join()

From b6b568b1467d2193bf4283b0fecfe91ee178f307 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 16:40:46 +0100
Subject: [PATCH 104/183] Rebuild

---
 dist/main.js | Bin 192523 -> 192553 bytes
 dist/view.js | Bin 106965 -> 106957 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index afaa59ea6c77080a4bd7eebf12f5d44596da6dd1..732153168dd81d8d0fbfa702a225897f262dc9c2 100644
GIT binary patch
delta 11329
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

delta 11433
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

diff --git a/dist/view.js b/dist/view.js
index 8ecd07366b8e27e34a630a8a01aa963e8341c36f..321d6b1b15b841469e83780e1f3c7431a7267f29 100644
GIT binary patch
delta 337
zcmcb5nC<LgwheE17*jWY;8A5X(Mv2SNX<)e&dAJ3(MZ+HFV9OYa>-9F%}vcK(Mv8$
zO)N=u%}E9EG?Yq`@>436G&MJi^5wC!B--ZLPwo_z7PBhL&rDG;&{0xSw6#rCQ-g3P
zFBi37&QnvHd|!0&=4P>GDON)zo&40v4^N0~Ry2IXCZL$Amz<whTvAk;T#{c@Q!`oE
z!eFzfMc*POHMPyxZq?>bPxNBc+CIyR@u1H1m~zH6CTp(g`zsm6x8E#hyvfI;s5pH=
z3!~ih3vG<L)0x{D6_G_)r+c(Bs!uO%XLOvtr=8Jc`nPsQ&*`omjJC{*iW<|KIv6b(
zHK!l!VDw@JI(oWDCu7t0Ih~9utb%!^IXQ~9C2DG5@08TkY`@&cxPwy=%mw-fBA*8o
KpErZioD%?(p>z2F

delta 390
zcmX?mnC<FewheE1SV}T7i#NaJQDxlh#+S#gm8Yhrk!YKzm!4V@P?TSgT2xXQmY7qT
zs!^g@Q<E26604)6q-blKSW`3EakJcHUNMo$Dq@Q_9}{blVlhzC$)9|{P<(T$;UhMI
zRK4W<yyB9g(&Uo-A~iL|$>A0TZ1#$VR*D9j+b#MQZI-xQlh3Q0s#ly`l%JCml3$=P
zeX<v$HXmHbCpE1^WBXn&#zQ)cT+{2z8PldaRWgci|5wg<lW+ROCPwAyf7%!|fQA}a
zDH={!X=hZN{<?#aXZoBbM(OFf?Tjigsfq23jxhG6c19Bzo2`S<6UO%MV6>gy-@#}J
z6FAwy=*4MkYpZAga`kkvPR1sv)b<&jj4G_c8hNETIkvVXH8n~~Ky@XWYHHih_A&0@
ll+geS<N-qrtRfF6qmgH;q^qQ<lQ&&)CZp{3Ju?^uIRRS;eJcO}


From 071d0c25ec189f0e1b3bf504c23e1ad92d4f1a5a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 16:50:56 +0100
Subject: [PATCH 105/183] Default photo title now "Untitled"

---
 php/Modules/Photo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 9fabc8d..deb5953 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -882,7 +882,7 @@ final class Photo {
 	 * Sets the title of a photo.
 	 * @return boolean Returns true when successful.
 	 */
-	public function setTitle($title) {
+	public function setTitle($title = 'Untitled') {
 
 		// Check dependencies
 		Validator::required(isset($this->photoIDs), __METHOD__);

From e1dca6205aa2cae654e9cb5b3e5b58afe1ca6301 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 16:51:12 +0100
Subject: [PATCH 106/183] Removed Untitled fallback for empty album titles

---
 src/scripts/album.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index 0eeb637..74eb318 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -110,8 +110,6 @@ album.add = function() {
 
 		basicModal.close()
 
-		if (title.length===0) title = 'Untitled'
-
 		let params = {
 			title
 		}

From e69c9acd1862a448021105c6c8a3597e8c7bc16f Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 16:51:17 +0100
Subject: [PATCH 107/183] Rebuild

---
 dist/main.js | Bin 192553 -> 192524 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 732153168dd81d8d0fbfa702a225897f262dc9c2..7654f70c8606ddf4baaa96718cf127a386842b61 100644
GIT binary patch
delta 5626
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

delta 5637
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


From 93a006600ca49672fb2e1eef32ed24452bc32858 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 17:38:13 +0100
Subject: [PATCH 108/183] Removed unused animation

---
 src/styles/_animations.scss | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/styles/_animations.scss b/src/styles/_animations.scss
index d104dd9..7f8b3d5 100755
--- a/src/styles/_animations.scss
+++ b/src/styles/_animations.scss
@@ -65,18 +65,6 @@
 	}
 }
 
-// PopIn -------------------------------------------------------------- //
-@keyframes popIn {
-	0% {
-		opacity: 0;
-		transform: scale(0);
-	}
-	100% {
-		opacity: 1;
-		transform: scale(1);
-	}
-}
-
 // Pulse -------------------------------------------------------------- //
 @keyframes pulse {
 	0% {

From 2bf985cd790570f9c3a92543f2071d38feff5f14 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 17:38:34 +0100
Subject: [PATCH 109/183] Code style adjustment

---
 src/scripts/password.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/scripts/password.js b/src/scripts/password.js
index 6b28601..e3bf696 100644
--- a/src/scripts/password.js
+++ b/src/scripts/password.js
@@ -23,6 +23,7 @@ password.get = function(albumID, callback, passwd) {
 	} else if (passwd==null) {
 
 		// Request password
+
 		password.getDialog(albumID, callback)
 
 	} else {

From a0fdea6c4baaec5348fc13e715f823c49d63d461 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 17:38:50 +0100
Subject: [PATCH 110/183] Removed unused transitions

---
 src/styles/_imageview.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/_imageview.scss b/src/styles/_imageview.scss
index 31ccd57..b376386 100644
--- a/src/styles/_imageview.scss
+++ b/src/styles/_imageview.scss
@@ -21,7 +21,7 @@
 		right: 30px;
 		bottom: 30px;
 		left: 30px;
-		transition: top .3s, right .3s, bottom .3s, left .3s, opacity .2s, transform .2s;
+		transition: top .3s, right .3s, bottom .3s, left .3s;
 		will-change: transform;
 
 		display: flex;

From 48931fde5b41ea933b7cde877c6e20c8b79002c1 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 17:48:40 +0100
Subject: [PATCH 111/183] Unnamed albums/photos now named "Untitled" in move
 album, merge album and switch album/photo menus

---
 src/scripts/contextMenu.js | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/scripts/contextMenu.js b/src/scripts/contextMenu.js
index fc1f245..1782cc0 100644
--- a/src/scripts/contextMenu.js
+++ b/src/scripts/contextMenu.js
@@ -100,10 +100,14 @@ contextMenu.albumTitle = function(albumID, e) {
 			$.each(data.albums, function() {
 
 				if (!this.thumbs[0]) this.thumbs[0] = 'src/images/no_cover.svg'
+				if (this.title==='') this.title = 'Untitled'
 
-				let title = lychee.html`<img class='cover' width='16' height='16' src='$${ this.thumbs[0] }'><div class='title'>$${ this.title }</div>`
+				let html = lychee.html`<img class='cover' width='16' height='16' src='$${ this.thumbs[0] }'><div class='title'>$${ this.title }</div>`
 
-				if (this.id!=albumID) items.push({ title, fn: () => lychee.goto(this.id) })
+				if (this.id!=albumID) items.push({
+					title: html,
+					fn: () => lychee.goto(this.id)
+				})
 
 			})
 
@@ -130,10 +134,14 @@ contextMenu.mergeAlbum = function(albumID, e) {
 			$.each(data.albums, function() {
 
 				if (!this.thumbs[0]) this.thumbs[0] = 'src/images/no_cover.svg'
+				if (this.title==='') this.title = 'Untitled'
 
-				let title = lychee.html`<img class='cover' width='16' height='16' src='$${ this.thumbs[0] }'><div class='title'>$${ this.title }</div>`
+				let html = lychee.html`<img class='cover' width='16' height='16' src='$${ this.thumbs[0] }'><div class='title'>$${ this.title }</div>`
 
-				if (this.id!=albumID) items.push({ title, fn: () => album.merge([ albumID, this.id ]) })
+				if (this.id!=albumID) items.push({
+					title: html,
+					fn: () => album.merge([ albumID, this.id ])
+				})
 
 			})
 
@@ -206,9 +214,14 @@ contextMenu.photoTitle = function(albumID, photoID, e) {
 		// Generate list of albums
 		$.each(data.content, function(index) {
 
-			let title = lychee.html`<img class='cover' width='16' height='16' src='$${ this.thumbUrl }'><div class='title'>$${ this.title }</div>`
+			if (this.title==='') this.title = 'Untitled'
 
-			if (this.id!=photoID) items.push({ title, fn: () => lychee.goto(albumID + '/' + this.id) })
+			let html = lychee.html`<img class='cover' width='16' height='16' src='$${ this.thumbUrl }'><div class='title'>$${ this.title }</div>`
+
+			if (this.id!=photoID) items.push({
+				title: html,
+				fn: () => lychee.goto(albumID + '/' + this.id)
+			})
 
 		})
 
@@ -253,10 +266,14 @@ contextMenu.move = function(photoIDs, e) {
 			$.each(data.albums, function() {
 
 				if (!this.thumbs[0]) this.thumbs[0] = 'src/images/no_cover.svg'
+				if (this.title==='') this.title = 'Untitled'
 
-				let title = lychee.html`<img class='cover' width='16' height='16' src='$${ this.thumbs[0] }'><div class='title'>$${ this.title }</div>`
+				let html = lychee.html`<img class='cover' width='16' height='16' src='$${ this.thumbs[0] }'><div class='title'>$${ this.title }</div>`
 
-				if (this.id!=album.getID()) items.push({ title, fn: () => photo.setAlbum(photoIDs, this.id) })
+				if (this.id!=album.getID()) items.push({
+					title: html,
+					fn: () => photo.setAlbum(photoIDs, this.id)
+				})
 
 			})
 

From c59421057957e9e803d31b9b29e38b3890ce6468 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 17:57:41 +0100
Subject: [PATCH 112/183] Albums with empty titles are now allowed

---
 src/scripts/album.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index 74eb318..e33e19a 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -206,6 +206,9 @@ album.delete = function(albumIDs) {
 		if (album.json)       albumTitle = album.json.title
 		else if (albums.json) albumTitle = albums.getByID(albumIDs).title
 
+		// Fallback for album without a title
+		if (albumTitle==='') albumTitle = 'Untitled'
+
 		msg = lychee.html`<p>Are you sure you want to delete the album '$${ albumTitle }' and all of the photos it contains? This action can't be undone!</p>`
 
 	} else {
@@ -248,18 +251,13 @@ album.setTitle = function(albumIDs) {
 		if (album.json)       oldTitle = album.json.title
 		else if (albums.json) oldTitle = albums.getByID(albumIDs).title
 
-		if (!oldTitle) oldTitle = ''
-
 	}
 
 	const action = function(data) {
 
-		let newTitle = data.title
-
 		basicModal.close()
 
-		// Set title to Untitled when empty
-		newTitle = (newTitle==='') ? 'Untitled' : newTitle
+		let newTitle = data.title
 
 		if (visible.album()) {
 
@@ -317,7 +315,7 @@ album.setTitle = function(albumIDs) {
 
 album.setDescription = function(albumID) {
 
-	let oldDescription = album.json.description.replace(/'/g, '&apos;')
+	let oldDescription = album.json.description
 
 	const action = function(data) {
 
@@ -564,17 +562,17 @@ album.merge = function(albumIDs) {
 
 	// Get title of first album
 	if (albums.json) title = albums.getByID(albumIDs[0]).title
-	if (!title)      title = ''
 
-	title = title.replace(/'/g, '&apos;')
+	// Fallback for first album without a title
+	if (title==='') title = 'Untitled'
 
 	if (albumIDs.length===2) {
 
 		// Get title of second album
 		if (albums.json) sTitle = albums.getByID(albumIDs[1]).title
 
-		if (!sTitle) sTitle = ''
-		sTitle = sTitle.replace(/'/g, '&apos;')
+		// Fallback for second album without a title
+		if (sTitle==='') sTitle = 'Untitled'
 
 		msg = lychee.html`<p>Are you sure you want to merge the album '$${ sTitle }' into the album '$${ title }'?</p>`
 

From 20963ac46316de7f7266d685d3d0879931e02d11 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 18:19:27 +0100
Subject: [PATCH 113/183] Replaced lychee.goto('') with lychee.goto()

---
 src/scripts/album.js  | 4 ++--
 src/scripts/header.js | 2 +-
 src/scripts/init.js   | 2 +-
 src/scripts/lychee.js | 5 ++---
 src/scripts/upload.js | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index e33e19a..15df334 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -55,7 +55,7 @@ album.load = function(albumID, refresh = false) {
 				} else {
 					// Album not public
 					lychee.content.show()
-					lychee.goto('')
+					lychee.goto()
 				}
 				return false
 			}
@@ -178,7 +178,7 @@ album.delete = function(albumIDs) {
 			} else {
 
 				albums.refresh()
-				lychee.goto('')
+				lychee.goto()
 
 			}
 
diff --git a/src/scripts/header.js b/src/scripts/header.js
index c8a9672..6c4b81c 100644
--- a/src/scripts/header.js
+++ b/src/scripts/header.js
@@ -52,7 +52,7 @@ header.bind = function() {
 	header.dom('#button_trash')       .on(eventName, function() { photo.delete([ photo.getID() ]) })
 	header.dom('#button_archive')     .on(eventName, function() { album.getArchive(album.getID()) })
 	header.dom('#button_star')        .on(eventName, function() { photo.setStar([ photo.getID() ]) })
-	header.dom('#button_back_home')   .on(eventName, function() { lychee.goto('') })
+	header.dom('#button_back_home')   .on(eventName, function() { lychee.goto() })
 	header.dom('#button_back')        .on(eventName, function() { lychee.goto(album.getID()) })
 
 	header.dom('.header__search').on('keyup click', function() { search.find($(this).val()) })
diff --git a/src/scripts/init.js b/src/scripts/init.js
index 612eeff..71520e5 100755
--- a/src/scripts/init.js
+++ b/src/scripts/init.js
@@ -68,7 +68,7 @@ $(document).ready(function() {
 		if (basicModal.visible()===true)                                             basicModal.cancel()
 		else if (visible.contextMenu())                                              contextMenu.close()
 		else if (visible.photo())                                                    lychee.goto(album.getID())
-		else if (visible.album())                                                    lychee.goto('')
+		else if (visible.album())                                                    lychee.goto()
 		else if (visible.albums() && header.dom('.header__search').val().length!==0) search.reset()
 		return false
 	})
diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index c92699e..78c4c53 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -156,10 +156,9 @@ lychee.logout = function() {
 
 }
 
-lychee.goto = function(url) {
+lychee.goto = function(url = '') {
 
-	if (url===undefined) url = '#'
-	else                 url = '#' + url
+	url = '#' + url
 
 	history.pushState(null, null, url)
 	lychee.load()
diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index 45eb106..d99d6c1 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -386,7 +386,7 @@ upload.start = {
 
 						// Go back to the album overview to show the imported albums
 						if (visible.albums()) lychee.load()
-						else                  lychee.goto('')
+						else                  lychee.goto()
 
 						basicModal.close()
 

From 827f48c5a7047bef9f9f3b9d04cdf01a432459ce Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 18:19:35 +0100
Subject: [PATCH 114/183] Code style adjustment

---
 src/scripts/album.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index 15df334..78650ad 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -157,11 +157,9 @@ album.delete = function(albumIDs) {
 
 	action.fn = function() {
 
-		let params
-
 		basicModal.close()
 
-		params = {
+		let params = {
 			albumIDs: albumIDs.join()
 		}
 

From b63c47cf9283f2b0ec94fecc1d01343d65c2aac3 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 18:19:41 +0100
Subject: [PATCH 115/183] Updated deps

---
 src/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/package.json b/src/package.json
index 0030bd2..fd19306 100644
--- a/src/package.json
+++ b/src/package.json
@@ -14,7 +14,7 @@
     "compile": "gulp"
   },
   "devDependencies": {
-    "babel-preset-es2015": "^6.5.0",
+    "babel-preset-es2015": "^6.6.0",
     "basiccontext": "^3.5.1",
     "basicmodal": "^3.3.3",
     "gulp": "^3.9.1",

From 45f8ff053e8af28c2d2e172712ea384d152ab6c3 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 18:26:23 +0100
Subject: [PATCH 116/183] Replaced albums.load() with lychee.goto()

---
 src/scripts/album.js  | 2 +-
 src/scripts/search.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index 78650ad..60c503a 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -594,7 +594,7 @@ album.merge = function(albumIDs) {
 				lychee.error(null, params, data)
 			} else {
 				albums.refresh()
-				albums.load()
+				lychee.goto()
 			}
 
 		})
diff --git a/src/scripts/search.js b/src/scripts/search.js
index a723a1c..a75e613 100755
--- a/src/scripts/search.js
+++ b/src/scripts/search.js
@@ -94,7 +94,7 @@ search.reset = function() {
 		search.hash = null
 
 		lychee.animate('.divider', 'fadeOut')
-		albums.load()
+		lychee.goto()
 
 	}
 

From d31bbefbdc48ae866255ca6eda7cefeecfd44c67 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 18:32:03 +0100
Subject: [PATCH 117/183] Replaced lychee.goto('') with lychee.goto()

---
 src/scripts/photo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index 34e4d1c..5c54fb9 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -39,7 +39,7 @@ photo.load = function(photoID, albumID) {
 
 		if (data==='Warning: Photo private!') {
 			lychee.content.show()
-			lychee.goto('')
+			lychee.goto()
 			return false
 		}
 

From 0096e2769f69bda37025932409e7a3943dde79dc Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 18:32:20 +0100
Subject: [PATCH 118/183] Wait for content to be loaded before showing photo

---
 src/scripts/photo.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index 5c54fb9..a758948 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -24,6 +24,21 @@ photo.getID = function() {
 
 photo.load = function(photoID, albumID) {
 
+	const checkContent = function() {
+		if (album.json!=null) photo.load(photoID, albumID)
+		else                  setTimeout(checkContent, 100)
+	}
+
+	const checkPasswd = function() {
+		if (password.value!=='') photo.load(photoID, albumID)
+		else                     setTimeout(checkPasswd, 200)
+	}
+
+	if (album.json==null) {
+		checkContent()
+		return false
+	}
+
 	let params = {
 		photoID,
 		albumID,
@@ -32,11 +47,6 @@ photo.load = function(photoID, albumID) {
 
 	api.post('Photo::get', params, function(data) {
 
-		const checkPasswd = function() {
-			if (password.value!=='') photo.load(photoID, albumID)
-			else                     setTimeout(checkPasswd, 250)
-		}
-
 		if (data==='Warning: Photo private!') {
 			lychee.content.show()
 			lychee.goto()

From a60b4cc45435e95a9c0b9aa8f42600e3af85fdf1 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 20:34:44 +0100
Subject: [PATCH 119/183] Updated password functions. Returns to albums when
 pressing cancel.

---
 src/scripts/password.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/scripts/password.js b/src/scripts/password.js
index e3bf696..4fc110a 100644
--- a/src/scripts/password.js
+++ b/src/scripts/password.js
@@ -9,7 +9,7 @@ password = {
 
 }
 
-password.get = function(albumID, callback, passwd) {
+password.get = function(albumID, callback) {
 
 	if (lychee.publicMode===false)                                  callback()
 	else if (album.json && album.json.password==='0')               callback()
@@ -17,18 +17,25 @@ password.get = function(albumID, callback, passwd) {
 	else if (!albums.json && !album.json) {
 
 		// Continue without password
+
 		album.json = { password: true }
 		callback('')
 
-	} else if (passwd==null) {
+	} else {
 
 		// Request password
 
 		password.getDialog(albumID, callback)
 
-	} else {
+	}
 
-		// Check password
+}
+
+password.getDialog = function(albumID, callback) {
+
+	const action = (data) => {
+
+		let passwd = data.password
 
 		let params = {
 			albumID,
@@ -49,16 +56,10 @@ password.get = function(albumID, callback, passwd) {
 
 	}
 
-}
-
-password.getDialog = function(albumID, callback) {
-
-	const action = (data) => password.get(albumID, callback, data.password)
-
 	const cancel = () => {
 
 		basicModal.close()
-		if (visible.albums()===false) lychee.goto()
+		if (!visible.albums()) lychee.goto()
 
 	}
 

From 2fed632b5cd2c2419e5ae1d5943d9f966b2be38c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 20:35:00 +0100
Subject: [PATCH 120/183] Show content when navigation to albums

---
 src/scripts/lychee.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 78c4c53..0deb8e7 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -217,6 +217,7 @@ lychee.load = function() {
 
 		// Show Albums
 		if (visible.photo()) view.photo.hide()
+		lychee.content.show()
 		albums.load()
 
 	}

From 9117402035de99c2f0e4d4aaf7cb3670e7152e38 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 21:01:51 +0100
Subject: [PATCH 121/183] Return the correct insert_id when adding a new album

---
 php/Modules/Album.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index e4915a1..d95e18b 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -33,15 +33,16 @@ final class Album {
 		$visible = 1;
 
 		// Database
-		$sysstamp = time();
-		$query    = Database::prepare(Database::get(), "INSERT INTO ? (title, sysstamp, public, visible) VALUES ('?', '?', '?', '?')", array(LYCHEE_TABLE_ALBUMS, $title, $sysstamp, $public, $visible));
-		$result   = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+		$sysstamp  = time();
+		$query     = Database::prepare(Database::get(), "INSERT INTO ? (title, sysstamp, public, visible) VALUES ('?', '?', '?', '?')", array(LYCHEE_TABLE_ALBUMS, $title, $sysstamp, $public, $visible));
+		$result    = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
+		$insertID  = Database::get()->insert_id;
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($result===false) return false;
-		return Database::get()->insert_id;
+		return $insertID;
 
 	}
 

From 0fc97da5666243d9d3b7bccafc740f9c62daf001 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 21:04:45 +0100
Subject: [PATCH 122/183] Rebuild

---
 dist/main.css | Bin 32019 -> 31529 bytes
 dist/main.js  | Bin 192524 -> 192713 bytes
 dist/view.js  | Bin 106957 -> 106955 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.css b/dist/main.css
index 7edc009c68d977ae6e352ed9e987e1b4388a9587..3001289e740613b741e40c191a830ea570935131 100755
GIT binary patch
delta 19
bcmbRIi*e;Q#tn;<Ht$nDtFbxKcb7f@WMc_#

delta 146
zcmZ4ajdAiX#tn;<nDPrI$17+|c3_d7yhOo;xd4T4HJP7PXz~>$jm;;OmTB<l<QF6+
wXO>hd=ouAHZU_}&0#bI~hEmAlIweJkdBth@MY&*A1f+q6FdA*n^WLow0JBXpZ~y=R

diff --git a/dist/main.js b/dist/main.js
index 7654f70c8606ddf4baaa96718cf127a386842b61..7f60134a246daca88f1a3a5367b4a40952e7f6af 100644
GIT binary patch
delta 6452
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

delta 6412
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
Zni+miSRpuL?+Yh|P;us_4}^8({{X}$e@g%W

diff --git a/dist/view.js b/dist/view.js
index 321d6b1b15b841469e83780e1f3c7431a7267f29..d0bb3d90804bb1856ad73c66c01c8e662c454716 100644
GIT binary patch
delta 22
ecmX?mnC<jowuUW?Y1PvmD;XuWH&iqFssR9WRS3}l

delta 25
hcmX?onC<LgwuUW?Y1K?hO4A)H86~#YRWtgk0RV?~2^9bU


From 4be78489226e838a286534605f6d4ee7b0b8d5ee Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 21:45:52 +0100
Subject: [PATCH 123/183] Updated version

---
 dist/main.js          | Bin 192713 -> 192713 bytes
 src/package.json      |   2 +-
 src/scripts/lychee.js |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 7f60134a246daca88f1a3a5367b4a40952e7f6af..6dc76b63c56c05997ac6ed5d687ca0619450dddc 100644
GIT binary patch
delta 44
zcmX^4ko)9A?uHh|Elk%eBn<Tolyu5ci;6Sz^PKZjQmvE>j13G847R_sV7k2>0D}?`
An*aa+

delta 44
zcmX^4ko)9A?uHh|Elk%eBn<Q{m2}Edi;6Sz^PKZjQmvE>j13G7EVsY2V7k2>0E8wG
As{jB1

diff --git a/src/package.json b/src/package.json
index fd19306..b69a91b 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Lychee",
-  "version": "3.0.9",
+  "version": "3.1.0",
   "description": "Self-hosted photo-management done right.",
   "authors": "Tobias Reich <tobias@electerious.com>",
   "license": "MIT",
diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 0deb8e7..30aca55 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -6,8 +6,8 @@
 lychee = {
 
 	title           : document.title,
-	version         : '3.0.9',
-	versionCode     : '030009',
+	version         : '3.1.0',
+	versionCode     : '030100',
 
 	updatePath      : '//update.electerious.com/index.json',
 	updateURL       : 'https://github.com/electerious/Lychee',

From d68d84e4e51892d3996814de4f3d1a1d8c2770b1 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 6 Mar 2016 21:46:04 +0100
Subject: [PATCH 124/183] Added v3.1.0 to the changelog

---
 docs/Changelog.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 2ad8e32..058ab82 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,3 +1,29 @@
+## v3.1.0
+
+Released March ??, 2016
+
+**Warning**: It's no longer possible to update from Lychee versions older than 2.7.
+
+**Warning**: Plugin which use the plugin API of Lychee must be updated to work with the new back-end.
+
+**Notice**: It's no longer possible to edit the thumb quality in the database.
+
+**Notice**: It's no longer possible to disable the creation of medium-sized photos when Imagick is installed on the system.
+
+This updates includes a huge rewrite of the back-end. We are now using namespaces and the singleton pattern for Settings::get(), Database::get() and Plugins::get(). Everything is way better documented thanks to PHPDoc comments. Ugly `#` comments have been replaced with the more known `//`. Unused functions are gone and returns are more strict. We also added a handy module to output messages. Failed database updates and invalid queries will be saved to the log.
+
+- `New` Empty titles for albums
+- `Improved` Error messages and log output
+- `Improved` Back-end modules and plugins
+- `Improved` Database connect function and update mechanism
+- `Improved` Default photo title now "Untitled"
+- `Improved` Move to next photo after after moving a picture (#437)
+- `Improved` Return to album overview when canceling album password input
+- `Fixed` session_start() after sending headers (#433)
+- `Fixed` error when deleting last open photo in album
+- `Fixed` Photo sometimes not loading when visiting directly
+- `Fixed` Move album, merge album and switch album/photo menus no longer show empty titles for untitled albums/photos
+
 ## v3.0.9
 
 Released January 10, 2016

From b5e69ec7548d2ea728d20de150d67cc31d9cb1a3 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 10 Mar 2016 23:10:06 +0100
Subject: [PATCH 125/183] New way to center the image in the imageview

---
 src/scripts/build.js       |  4 ++--
 src/styles/_imageview.scss | 26 +++++++++-----------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/scripts/build.js b/src/scripts/build.js
index 4b1f020..620d36f 100644
--- a/src/scripts/build.js
+++ b/src/scripts/build.js
@@ -120,11 +120,11 @@ build.imageview = function(data, visibleControls) {
 
 	if (hasMedium===false) {
 
-		html += lychee.html`<div id='image' class='$${ visibleControls===true ? '' : 'full' }'><div><img src='$${ data.url }' draggable='false'></div></div>`
+		html += lychee.html`<img id='image' class='$${ visibleControls===true ? '' : 'full' }' src='$${ data.url }' draggable='false'>`
 
 	} else {
 
-		html += lychee.html`<div id='image' class='$${ visibleControls===true ? '' : 'full' }'><div><img src='$${ data.url }' srcset='$${ data.medium } 1920w, $${ data.url } $${ data.width }w' draggable='false'></div></div>`
+		html += lychee.html`<img id='image' class='$${ visibleControls===true ? '' : 'full' }' src='$${ data.url }' srcset='$${ data.medium } 1920w, $${ data.url } $${ data.width }w' draggable='false'>`
 
 	}
 
diff --git a/src/styles/_imageview.scss b/src/styles/_imageview.scss
index b376386..d50dc57 100644
--- a/src/styles/_imageview.scss
+++ b/src/styles/_imageview.scss
@@ -21,21 +21,25 @@
 		right: 30px;
 		bottom: 30px;
 		left: 30px;
-		transition: top .3s, right .3s, bottom .3s, left .3s;
+		margin: auto;
+		max-width: calc(100% - 60px);
+		max-height: calc(100% - 90px);
+		width: auto;
+		height: auto;
+		transition: top .3s, right .3s, bottom .3s, left .3s, max-width .3s, max-height .3s;
 		will-change: transform;
 
-		display: flex;
-		justify-content: center;
-		align-items: center;
-
 		animation-name: zoomIn;
 		animation-duration: .3s;
 		animation-timing-function: $timingBounce;
 
 		@media (max-width: 640px) {
+			top: 60px;
 			right: 20px;
 			bottom: 20px;
 			left: 20px;
+			max-width: calc(100% - 40px);
+			max-height: calc(100% - 80px);
 		}
 	}
 
@@ -44,20 +48,8 @@
 		right: 0;
 		bottom: 0;
 		left: 0;
-	}
-
-	#image > div {
-		width: 0;
-		height: 0;
-	}
-
-	#image img {
-		position: absolute;
 		max-width: 100%;
 		max-height: 100%;
-		width: auto;
-		height: auto;
-		transform: translate(-50%, -50%);
 	}
 
 	// Previous/Next Buttons -------------------------------------------------------------- //

From d02b081fc7c20cc0a7937ef245d06f1b4ee89e5c Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 10 Mar 2016 23:10:20 +0100
Subject: [PATCH 126/183] Updated changelog text

---
 docs/Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 058ab82..4e0d377 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -4,7 +4,7 @@ Released March ??, 2016
 
 **Warning**: It's no longer possible to update from Lychee versions older than 2.7.
 
-**Warning**: Plugin which use the plugin API of Lychee must be updated to work with the new back-end.
+**Warning**: Plugins which use the plugin API of Lychee must be updated to work with the new back-end.
 
 **Notice**: It's no longer possible to edit the thumb quality in the database.
 

From 029e0e9c43ea1759f4c42a72e19f9fadac9c3620 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 10 Mar 2016 23:10:28 +0100
Subject: [PATCH 127/183] Rebuild

---
 dist/main.css | Bin 31529 -> 31312 bytes
 dist/main.js  | Bin 192713 -> 192625 bytes
 dist/view.js  | Bin 106955 -> 106866 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.css b/dist/main.css
index 3001289e740613b741e40c191a830ea570935131..ae100499cdb938d4d8042f3d85a5d3d3b89e5224 100755
GIT binary patch
delta 190
zcmZ4ajq$=4#trt~I=P8O>6v*}iKQj^*13rly5*TEB^g%9i8;v{h6V<z3c3nr1_c$G
zV7bYR5yCQ-U@k-%SXV}BW_m^m*o4V;-i8uDBcaA9=ouG-d0-`zv%F;{A4(9P?4v3(
zxz1-VXGwm6707Vw$=1FKtPmUaL`yMM=z=U_wE$T(IX+Noa;dNLWOhG!5PS0hzf2tf
D1k6F4

delta 203
zcmcccg>mIK#trt~lV^JyOfCozW3-;Ume*|ZQBLp4jhsG{f0gl1_ED9YEaSsH+16*%
z<R3l?la>6WCTIIP+tw;)<|d}6mSv`vD?pfbDVb%}<(VlZ8CC|?8L64+86{Q*n939~
zbJHganh8%{?<*&64N;$1T9Oab0%A{g43y!}&^0ws)zLMboERvL;4}n^bHQW`R3``c
L%4~k&o1p^$3w}lP

diff --git a/dist/main.js b/dist/main.js
index 6dc76b63c56c05997ac6ed5d687ca0619450dddc..b9ae00be300212076fdf323f877ab1a8162524ea 100644
GIT binary patch
delta 157
zcmX^4ko)5U?uIRlS@W1PbJM3g&S#XE-an5~j#DXCCtAq{MQpm#0!ESPO7j_I5NbD0
zW|W#<JD*VnT?1TVJ5X0u$n?2i7*iOzwljWZTwTMMKV7hdNqo9=Hk0D?XN62=Kna;5
WrbRW=54>Y4WwPelZu*{S3L^k9Yc|aQ

delta 241
zcmezPfcxY_?uIRlS@W1vGRvmt&SR9|v$Fv*?QAl0(-n$~lBe5FW0VrL(FcoxNu^kw
zXeE#uoXT0j%BL$%WR#lzbsnQE+-x?8+0*Y&Wt5xlKA%wqkHHvfkxbowcRpi!2qV{Y
zmoJPd+gE;JTwTM&l|P-aib;HWP9anHbg68n^zGV3Ox86_)?Cxm-Z7PKzx$493L^j+
C(o)U<

diff --git a/dist/view.js b/dist/view.js
index d0bb3d90804bb1856ad73c66c01c8e662c454716..c1dacec39ab05ff7c514806fa229f8273e47e55c 100644
GIT binary patch
delta 128
zcmX?onC;UcwuUW?-{P4wbJM5$B```%FGygN<5Y^(iB_^f5u2`%!YDF*T>_&FLak#c
qqtx`eL`D^K4R8stuI+~s8I{GRJ5@4@PybiWsKm&%U7><;wI%?YWheCj

delta 218
zcmex#i0$-YwuUW?-{P55GRvkfOkkAYva<m)?QAl0)29n2Fv^MA=!5xSQYls^S_veN
zRVg=;(&>&VjH1(<5*TIRCbL0Io}M4hC^!9b0;38ZqcPNCn7utKkx^NU$(n2W$1+BV
V=}XHQ6{kP0WE9zcyPR>lCIFQdMz{a~


From 976635254e3eb8d2333e9e66760234ea24571b80 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 12 Mar 2016 23:51:33 +0100
Subject: [PATCH 128/183] Album id now based on the current microtime #27

---
 php/Modules/Album.php          | 14 +++++++-------
 php/Modules/Database.php       |  3 ++-
 php/Modules/Photo.php          |  6 ++----
 php/database/albums_table.sql  |  2 +-
 php/database/update_030100.php | 19 +++++++++++++++++++
 php/helpers/generateID.php     | 16 ++++++++++++++++
 php/index.php                  |  1 +
 7 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 php/database/update_030100.php
 create mode 100644 php/helpers/generateID.php

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index d95e18b..feb97ed 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -29,20 +29,20 @@ final class Album {
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		// Properties
-		$public  = 0;
-		$visible = 1;
+		$id       = generateID();
+		$sysstamp = time();
+		$public   = 0;
+		$visible  = 1;
 
 		// Database
-		$sysstamp  = time();
-		$query     = Database::prepare(Database::get(), "INSERT INTO ? (title, sysstamp, public, visible) VALUES ('?', '?', '?', '?')", array(LYCHEE_TABLE_ALBUMS, $title, $sysstamp, $public, $visible));
-		$result    = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
-		$insertID  = Database::get()->insert_id;
+		$query  = Database::prepare(Database::get(), "INSERT INTO ? (id, title, sysstamp, public, visible) VALUES ('?', '?', '?', '?', '?')", array(LYCHEE_TABLE_ALBUMS, $id, $title, $sysstamp, $public, $visible));
+		$result = Database::execute(Database::get(), $query, __METHOD__, __LINE__);
 
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
 		if ($result===false) return false;
-		return $insertID;
+		return $id;
 
 	}
 
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 91d9df7..60ee093 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -13,7 +13,8 @@ final class Database {
 		'020700', // 2.7.0
 		'030000', // 3.0.0
 		'030001', // 3.0.1
-		'030003' // 3.0.3
+		'030003', // 3.0.3
+		'030100' // 3.1.0
 	);
 
 	/**
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index deb5953..c7d20f3 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -139,8 +139,7 @@ final class Photo {
 		}
 
 		// Generate id
-		$id = str_replace('.', '', microtime(true));
-		while(strlen($id)<14) $id .= 0;
+		$id = generateID();
 
 		// Set paths
 		$tmp_name   = $file['tmp_name'];
@@ -1149,8 +1148,7 @@ final class Photo {
 		while ($photo = $photos->fetch_object()) {
 
 			// Generate id
-			$id = str_replace('.', '', microtime(true));
-			while(strlen($id)<14) $id .= 0;
+			$id = generateID();
 
 			// Duplicate entry
 			$values = array(LYCHEE_TABLE_PHOTOS, $id, LYCHEE_TABLE_PHOTOS, $photo->id);
diff --git a/php/database/albums_table.sql b/php/database/albums_table.sql
index 8303b88..ea94d41 100644
--- a/php/database/albums_table.sql
+++ b/php/database/albums_table.sql
@@ -2,7 +2,7 @@
 # ------------------------------------------------------------
 
 CREATE TABLE IF NOT EXISTS `?` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` bigint(14) NOT NULL,
   `title` varchar(100) NOT NULL DEFAULT '',
   `description` varchar(1000) DEFAULT '',
   `sysstamp` int(11) NOT NULL,
diff --git a/php/database/update_030100.php b/php/database/update_030100.php
new file mode 100644
index 0000000..428ba92
--- /dev/null
+++ b/php/database/update_030100.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Update to version 3.1.0
+ */
+
+use Lychee\Modules\Database;
+use Lychee\Modules\Response;
+
+// Change length of album id field
+$query  = Database::prepare($connection, "ALTER TABLE `?` CHANGE `id` `id` BIGINT(14) NOT NULL", array(LYCHEE_TABLE_ALBUMS));
+$result = Database::execute($connection, $query, 'update_030100', __LINE__);
+
+if ($result===false) Response::error('Could not adjust the length of the album id field!');
+
+// Set version
+// if (Database::setVersion($connection, '030100')===false) Response::error('Could not update version of database!');
+
+?>
\ No newline at end of file
diff --git a/php/helpers/generateID.php b/php/helpers/generateID.php
new file mode 100644
index 0000000..80f42c1
--- /dev/null
+++ b/php/helpers/generateID.php
@@ -0,0 +1,16 @@
+<?php
+
+function generateID() {
+
+	// Generate id based on the current microtime
+	$id = str_replace('.', '', microtime(true));
+
+	// Ensure that the id has a length of 14 chars
+	while(strlen($id)<14) $id .= 0;
+
+	// Return the integer value of the id
+	return intval($id);
+
+}
+
+?>
\ No newline at end of file
diff --git a/php/index.php b/php/index.php
index be39f8f..4bacbd7 100755
--- a/php/index.php
+++ b/php/index.php
@@ -20,6 +20,7 @@ require(__DIR__ . '/define.php');
 require(__DIR__ . '/autoload.php');
 
 require(__DIR__ . '/helpers/fastImageCopyResampled.php');
+require(__DIR__ . '/helpers/generateID.php');
 require(__DIR__ . '/helpers/getExtension.php');
 require(__DIR__ . '/helpers/getGraphHeader.php');
 require(__DIR__ . '/helpers/getHashedString.php');

From 63d6ad2c6639832fba89a57bf567024cbdcbcadf Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 00:27:17 +0100
Subject: [PATCH 129/183] Renamed visible to hidden #27

---
 src/scripts/album.js   | 21 ++++++++++-----------
 src/scripts/sidebar.js | 12 ++++++------
 src/scripts/view.js    |  6 +++---
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index 60c503a..78be78d 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -391,11 +391,11 @@ album.setPublic = function(albumID, modal, e) {
 		          <form>
 		              <div class='choice'>
 		                  <label>
-		                      <input type='checkbox' name='visible'>
+		                      <input type='checkbox' name='hidden'>
 		                      <span class='checkbox'>${ build.iconic('check') }</span>
-		                      <span class='label'>Visible</span>
+		                      <span class='label'>Hidden</span>
 		                  </label>
-		                  <p>Listed to visitors of your Lychee.</p>
+		                  <p>Only people with the direct link can view the album.</p>
 		              </div>
 		              <div class='choice'>
 		                  <label>
@@ -411,7 +411,7 @@ album.setPublic = function(albumID, modal, e) {
 		                      <span class='checkbox'>${ build.iconic('check') }</span>
 		                      <span class='label'>Password protected</span>
 		                  </label>
-		                  <p>Only accessible with a valid password.</p>
+		                  <p>Album only accessible with a valid password.</p>
 		                  <input class='text' name='passwordtext' type='password' placeholder='password' value=''>
 		              </div>
 		          </form>
@@ -431,9 +431,8 @@ album.setPublic = function(albumID, modal, e) {
 			}
 		})
 
-		// Active visible by default (public = 0)
-		if ((album.json.public==='1' && album.json.visible==='1') || (album.json.public==='0')) $('.basicModal .choice input[name="visible"]').click()
-		if (album.json.downloadable==='1')                                                      $('.basicModal .choice input[name="downloadable"]').click()
+		if (album.json.public==='1' && album.json.visible==='0') $('.basicModal .choice input[name="hidden"]').click()
+		if (album.json.downloadable==='1')                       $('.basicModal .choice input[name="downloadable"]').click()
 
 		$('.basicModal .choice input[name="password"]').on('change', function() {
 
@@ -453,8 +452,8 @@ album.setPublic = function(albumID, modal, e) {
 		album.json.public = '1'
 
 		// Set visible
-		if ($('.basicModal .choice input[name="visible"]:checked').length===1) album.json.visible = '1'
-		else                                                                   album.json.visible = '0'
+		if ($('.basicModal .choice input[name="hidden"]:checked').length===1) album.json.visible = '0'
+		else                                                                  album.json.visible = '1'
 
 		// Set downloadable
 		if ($('.basicModal .choice input[name="downloadable"]:checked').length===1) album.json.downloadable = '1'
@@ -482,12 +481,12 @@ album.setPublic = function(albumID, modal, e) {
 	// Set data and refresh view
 	if (visible.album()) {
 
-		album.json.visible      = (album.json.public==='0') ? '0' : album.json.visible
+		album.json.visible      = (album.json.public==='0') ? '1' : album.json.visible
 		album.json.downloadable = (album.json.public==='0') ? '0' : album.json.downloadable
 		album.json.password     = (album.json.public==='0') ? '0' : album.json.password
 
 		view.album.public()
-		view.album.visible()
+		view.album.hidden()
 		view.album.downloadable()
 		view.album.password()
 
diff --git a/src/scripts/sidebar.js b/src/scripts/sidebar.js
index 8f1770b..48fb2a9 100644
--- a/src/scripts/sidebar.js
+++ b/src/scripts/sidebar.js
@@ -223,7 +223,7 @@ sidebar.createStructure.album = function(data) {
 	let editable     = false
 	let structure    = {}
 	let _public      = ''
-	let visible      = ''
+	let hidden       = ''
 	let downloadable = ''
 	let password     = ''
 
@@ -242,14 +242,14 @@ sidebar.createStructure.album = function(data) {
 
 	}
 
-	// Set value for visible
+	// Set value for hidden
 	switch (data.visible) {
 
-		case '0' : visible = 'No'
+		case '0' : hidden = 'Yes'
 		           break
-		case '1' : visible = 'Yes'
+		case '1' : hidden = 'No'
 		           break
-		default  : visible = '-'
+		default  : hidden = '-'
 		           break
 
 	}
@@ -301,7 +301,7 @@ sidebar.createStructure.album = function(data) {
 		type  : sidebar.types.DEFAULT,
 		rows  : [
 			{ title: 'Public',       value: _public },
-			{ title: 'Visible',      value: visible },
+			{ title: 'Hidden',       value: hidden },
 			{ title: 'Downloadable', value: downloadable },
 			{ title: 'Password',     value: password }
 		]
diff --git a/src/scripts/view.js b/src/scripts/view.js
index 02cc498..198a4fd 100644
--- a/src/scripts/view.js
+++ b/src/scripts/view.js
@@ -246,10 +246,10 @@ view.album = {
 
 	},
 
-	visible: function() {
+	hidden: function() {
 
-		if (album.json.visible==='1') sidebar.changeAttr('visible', 'Yes')
-		else                          sidebar.changeAttr('visible', 'No')
+		if (album.json.visible==='1') sidebar.changeAttr('hidden', 'No')
+		else                          sidebar.changeAttr('hidden', 'Yes')
 
 	},
 

From 667f33c3a5ca75c145bb6945faa2c46181508670 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 00:27:50 +0100
Subject: [PATCH 130/183] Rebuild

---
 dist/main.js | Bin 192625 -> 192610 bytes
 dist/view.js | Bin 106866 -> 106865 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index b9ae00be300212076fdf323f877ab1a8162524ea..db535973dee28bc7f45d5fa23b5ceefd80a21769 100644
GIT binary patch
delta 1424
zcmX|BU2GIp6waBJVriiip)>;Rc3P)1bUJLsK-kH&6hxp%TLg(@*^;@lce`Wf&a6AL
zTTB;;MjuQthRnm57=wxiBgSf$WE2YFNqrEbm`V_g3u2In4}DOg59*oHnoREb|IWGh
zoHH|(x|@}{kBe2n%Hvh%7ql`hE)$I^7PUvctV(*B%DTEFGb8F6O|tUd+5*&~ld5Z(
zB=f&rbQhR^q3#hN{!HBnkn(W-@#+?)dC7PRfpn^v?&Ag9@Jz=RnWQ2R@&8@gyqXC@
zn?n^NOO3IumSa;v*g_SLx}M1V^^I#65kU|m6pfWf8@DgU0w-Ipb0RC1ijJ9%#WhW1
zNhc*4j_sLtfvOp;Eq)}2Dh;ujUvBd>*2ibfbeh_{X~$42W;CYU*GLJb?WT%u7}Rw|
zD)X7cZq^y+<%uJbtfMRQ)BGDvQHn%dcI31qJFy6*R1#TvMf;1Z@#3%dZCr}5o7%7z
zLFnm;sQ**n4m63I+p**)Hje_5GyNL@-{$U?LJgY8&TaTy@9(^a{96NE$bU7^i)Y=g
zJLvSsuG<`j{5V*Hk^ZfrIG!tpTVpJlNtH^Yv!@slZM$OVmL<B9q>gID-#5G;<4zCX
zTd<f>ZQV%rV7g<SDU<T#ep-#dE0Q;=klY*D8WEK&!;<_#qZ7!<qS1g^#`DPgC-Pbc
zktU*!OA{F<FRDzv&*U^u&1tzLOQ|>z{*1TEU*)!9pz6j&qGZgx>ut@NRysixOP}LY
za$XRM^8iHly9*oq6JD$Tt6RT@VE@s7&`DD_nN1;jS65aLa`@qJHF{qnc%%1V`FC&c
zLcCjli9~bo?kg1z3w`<67~W&%*mV@jU%#ezE@L=x*waz!iF9t%`orDbM4?4$d#;47
zbG3O%iyAHFQO@di+M<yaCI4JFg;@`O`X**-`s@@`A*z4z?3#tqKw`Lm>+GIc2f;sh
z?lf`_Ox?t4ew*U4j3wu9*P`mr&$AeP=!?BIXenRnM$3&$?qCD+qSbN?Jz58ugvM&9
z#byVr1-2n6w*U_;{JsSSs!?ofhh`*+cE|t;-foA#8d<bakI@Xx=V@A$5aM(PSlmjc
z<nj(PT`C@u6vJUTi+WTefzk;Z5hBwG0s_C<3Gd)z1@X1e1|)oPEetP5da@V(Zdyzv
zn)FhAHf~XZ1Rp#F7tmzxhcwqjk~Ae77S;3nOh%mouBarl;OD2|Ao^@R0RPOsQrMq_
zqs5y0`xWf@4qm9)F}r=i&}HadKV)0a#d6fa+G69TmyLN@8cUmbYIrfrw8vtGZpVry
z9iKJm7AdfxG7T$(iRYm<xOfH@1(VaTAQ&k@eR$_GT;>+`M@}&(oSKFK2;$$sL)C)7
z$AhC4t||EF3OqblO!(3jcn{_)i(dt?InF0$Qz*~4j;$0;*CZCz_?|F#6;1*41kKmr
z(tP;cYfv-Ye1N*VO7c`6Qw`mvd=H;6HGa?uhCbw)!q_KV12=c!a6_4Uw0l0^vlVXB
clDYqojQ+fo2r9pD%j^HwA#(Ubg$o+~1H$U^TmS$7

delta 1354
zcmX|BU2GIp6waBJma_e!Xlq0NcDHpp(@uv)jg8$*e?UY^DXYb**>0P?vv<1__U>$E
zX19<o8jU`fV2GKAAu$FKjmDaQS(8;L4Nq#Km<T~qi(!jR(0~tp&_*BBGyNf%-1GmP
zbMHB4?i4*MMbCw736T7B$>lArL<vYtp>mR@rmRGe^^qXy>JqiM5LIZH<VPzqP=QXt
zs1gqo`^Rnff!On&$AH-@o(W+2P~|(NEkv=xfd~RcsjQjLWKyc7=_!GTK?Gv<f7=_H
z2+#X;Dys>q9^ISNQ<UfTP}!oUB@p}Z+Rkl^=LHu<A^EA={Z&}t`IcLpKytaPuEo3o
zMNvptkBF+Cvb0o&2IGn^a3YN=1+j^p_gM<*_b0SijHdir%8Obdt`K=$BlZ&I5S62<
zN=;Lsl0SaTOz6{oY376|MbVYmG5@>uZi?Q3q)RbT(!DN9E+>$DUEAwTc=6NyJ=+oX
zDIeCt^SgJu)V|&SESiLYHY|B~U<#0YG1vq6Huv{r%Fsj(?8E2!<iINO?+<k$|NT%O
zo}Pohqtl-U?{XOO%SahU+RKLnc-Dnly(Aou<Z@GMr{EH0zpO@+Nx>Aw;FQAbBcU;j
zn+>gQsUlR_HIW#PweQj-mOnp6OA)v(yi|f@bz-kef@BAlWRIvFz|LjW8q6|nAa9>B
zly)Z0xE&W~;<_OONpPJ>D^@VAq{Ac<#DTC^tVX-hY{kH!84#Ep*9_Czo6wT6UM44_
z8+=4Ecs{!cz$Cjn^Q3*oYPEkeE1MbiAN@!47&XI*2%>j&C3rrK9}ZWo^(}(eS`X#_
zutv-AZi6}E&cTOo6*(;Q&67v*9xEqrp^*RKRJ3CU!HL73PEkvs8>2Q@IMmH#nx!er
z6tQ)tvMDKUqXh%yL^KskQrC)-eW@^qS&x1B9%icl>SHKDRQt-s=5lu+G2C9h_}rQU
zZ;xM^MQ-cd9jxZwoFB`mzI?X=Reyb*!05?uM$6EWzuJwKrK{#h4YAzS($%QD4iYP<
zO;CZ&c32DSLy~U+Kaj#tEihDyqOT1ako2}e9GG*q4gRhr?nXUL<J2%{Ob`)bwjGk(
zBScOcI@3%lOp3CqvviVLRAG+X0X+y2?*JZw-|m19@UfggC-{IBp6`Uv!${Bd!9Vp?
zOr&8e(x1XD>SfNSFTgySv@wWr^(;&ylA5GZ<A}znp1~CrCF1=05{#qIz{~LO+A9?X
z!|-ahG^?4KGjSc>C>?XTd)HymH>{Z!jd?BI>sl?{Fui)*dtA>L-r?i;51@tlYfx1J
zhYQzkzz~4o_-=DMIi7dYMXrI%<(!qDVJC=A=q5Z`?qZN6EzI16k6=CD=>_mR;|t(%
zLJLsmEH6N3;nV`W0?vzzQ0+7>!j%VMON&r;!>Rs^^Ez`ExUGen&$&9T+%47x?aXse
jbZ`1PlS^E)^IDN>dZ0Orn#zp|{E~k}FML<zoSOdu-xA!1

diff --git a/dist/view.js b/dist/view.js
index c1dacec39ab05ff7c514806fa229f8273e47e55c..6fde421acac75c855c1c20270994af475bcf6ab5 100644
GIT binary patch
delta 55
zcmex#i0$JcwuUW?1ydv<Q;U_XlZsLkv#pa8i&K>hm8>#tmHhIzcT8baWn%NlOi4-2
L+rDKQ<326`U859w

delta 41
zcmV+^0M`HU!Upof27t5yaFmyqj{zW;ER_KWx0sXx6#@rVX>(~}Y-P8zmI1yBbc+y$


From 5262a23ebbdae0d6fe5b16a24d95495ca1660897 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 00:29:56 +0100
Subject: [PATCH 131/183] Updated description of hidden option #24

---
 src/scripts/album.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index 78be78d..109405f 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -395,7 +395,7 @@ album.setPublic = function(albumID, modal, e) {
 		                      <span class='checkbox'>${ build.iconic('check') }</span>
 		                      <span class='label'>Hidden</span>
 		                  </label>
-		                  <p>Only people with the direct link can view the album.</p>
+		                  <p>Only people with the direct link can view this album.</p>
 		              </div>
 		              <div class='choice'>
 		                  <label>

From ff52ea8c73e52a54c957f9cb546f63ca844cd154 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 00:30:01 +0100
Subject: [PATCH 132/183] Rebuild

---
 dist/main.js | Bin 192610 -> 192611 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index db535973dee28bc7f45d5fa23b5ceefd80a21769..76f9db60a597140d93eee82a3859b6b6450fa124 100644
GIT binary patch
delta 26
icmaF#fcx<S?uIRl+b>NIzQQ=aJ@hi;_Rz~rys`kkoeXmT

delta 23
fcmaF-fcwz{?uIRl+b=Puw(q>exP9j(rd6^4my-+L


From 8c050698dd02ef748dd2672b184bfb26911cd1a5 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 17:37:49 +0100
Subject: [PATCH 133/183] Fixed search

---
 php/helpers/search.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/php/helpers/search.php b/php/helpers/search.php
index 50638f9..4b05324 100755
--- a/php/helpers/search.php
+++ b/php/helpers/search.php
@@ -3,6 +3,7 @@
 use Lychee\Modules\Album;
 use Lychee\Modules\Database;
 use Lychee\Modules\Photo;
+use Lychee\Modules\Settings;
 
 /**
  * @return array|false Returns an array with albums and photos.

From d9bd59eba52c4542f6022de44a5ecd91d04c3567 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 17:38:18 +0100
Subject: [PATCH 134/183] Show albums above photos in search #434

---
 src/scripts/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/search.js b/src/scripts/search.js
index a75e613..216c8c8 100755
--- a/src/scripts/search.js
+++ b/src/scripts/search.js
@@ -47,7 +47,7 @@ search.find = function(term) {
 				if (albumsData==='' && photosData==='') html = 'error'
 				else if (albumsData==='')               html = build.divider('Photos') + photosData
 				else if (photosData==='')               html = build.divider('Albums') + albumsData
-				else                                    html = build.divider('Photos') + photosData + build.divider('Albums') + albumsData
+				else                                    html = build.divider('Albums') + albumsData + build.divider('Photos') + photosData
 
 				// Only refresh view when search results are different
 				if (search.hash!==data.hash) {

From 1168d5a1f77978f286c5752bbe5654a13fbc8608 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 17:40:28 +0100
Subject: [PATCH 135/183] Rebuild

---
 dist/main.js | Bin 192611 -> 192611 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 dist/main.js

diff --git a/dist/main.js b/dist/main.js
old mode 100644
new mode 100755
index 76f9db60a597140d93eee82a3859b6b6450fa124..6a0cdccc376becfbf52d0d6372f45f9e9ffa7a79
GIT binary patch
delta 31
ncmaF-fcx<S?uHh|B}}c;<F7GsGUaJc|JcGLxm~4|$vztZ;0p|L

delta 30
mcmaF-fcx<S?uHh|B}}c;rCOP|7`3N=Y+;hzuF}e6pA7)XD+_J_


From deeeaa56ea95161662cb3706ed224ce0f641b554 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 20:40:24 +0100
Subject: [PATCH 136/183] Updated changelog

---
 docs/Changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 4e0d377..3c2080c 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -13,7 +13,10 @@ Released March ??, 2016
 This updates includes a huge rewrite of the back-end. We are now using namespaces and the singleton pattern for Settings::get(), Database::get() and Plugins::get(). Everything is way better documented thanks to PHPDoc comments. Ugly `#` comments have been replaced with the more known `//`. Unused functions are gone and returns are more strict. We also added a handy module to output messages. Failed database updates and invalid queries will be saved to the log.
 
 - `New` Empty titles for albums
+- `New` Share albums as hidden so they are only viewable with a direct link (#27)
 - `Improved` Error messages and log output
+- `Improved` The search shows albums above photos (#434)
+- `Improved` Album id now based on the current microtime (#27)
 - `Improved` Back-end modules and plugins
 - `Improved` Database connect function and update mechanism
 - `Improved` Default photo title now "Untitled"

From 6db83d45e21bd9746542331e8405762bd3e0a866 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 21:19:10 +0100
Subject: [PATCH 137/183] Fixed incorrect escaping when using backslashes

---
 php/Modules/Database.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 60ee093..0948249 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -356,6 +356,10 @@ final class Database {
 
 			}
 
+			// Put a backslash in front of every character that is part of the regular
+			// expression syntax. Avoids a backreference when using preg_replace.
+			$value = preg_quote($value);
+
 			// Replace
 			$query = preg_replace('/\?/', $value, $query, 1);
 

From 5aa920387b4829ed597c3641f0e8dba3638ed718 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sun, 13 Mar 2016 21:19:21 +0100
Subject: [PATCH 138/183] Updated changelog

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 3c2080c..13803b9 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -22,6 +22,7 @@ This updates includes a huge rewrite of the back-end. We are now using namespace
 - `Improved` Default photo title now "Untitled"
 - `Improved` Move to next photo after after moving a picture (#437)
 - `Improved` Return to album overview when canceling album password input
+- `Fixed` incorrect escaping when using backslashes
 - `Fixed` session_start() after sending headers (#433)
 - `Fixed` error when deleting last open photo in album
 - `Fixed` Photo sometimes not loading when visiting directly

From f6926f16700bbbf98fe5c124fd61273a9f967650 Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Tue, 15 Mar 2016 13:28:39 +0100
Subject: [PATCH 139/183] Replacing date by strftime

This allows date translation
---
 php/Modules/Album.php | 2 +-
 php/Modules/Photo.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index feb97ed..4460a5c 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -71,7 +71,7 @@ final class Album {
 		if (isset($data['downloadable'])) $album['downloadable'] = $data['downloadable'];
 
 		// Parse date
-		$album['sysdate'] = date('F Y', $data['sysstamp']);
+		$album['sysdate'] = strftime('%B %Y', $data['sysstamp']);
 
 		// Parse password
 		$album['password'] = ($data['password']=='' ? '0' : '1');
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index c7d20f3..ef79a95 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -614,13 +614,13 @@ final class Photo {
 
 			// Use takestamp
 			$photo['cameraDate'] = '1';
-			$photo['sysdate']    = date('d F Y', $data['takestamp']);
+			$photo['sysdate']    = strftime('%d %B %Y', $data['takestamp']);
 
 		} else {
 
 			// Use sysstamp from the id
 			$photo['cameraDate'] = '0';
-			$photo['sysdate']    = date('d F Y', substr($data['id'], 0, -4));
+			$photo['sysdate']    = strftime('%d %B %Y', substr($data['id'], 0, -4));
 
 		}
 
@@ -658,8 +658,8 @@ final class Photo {
 		}
 
 		// Parse photo
-		$photo['sysdate'] = date('d M. Y', substr($photo['id'], 0, -4));
-		if (strlen($photo['takestamp'])>1) $photo['takedate'] = date('d M. Y', $photo['takestamp']);
+		$photo['sysdate'] = strftime('%d %b. %Y', substr($photo['id'], 0, -4));
+		if (strlen($photo['takestamp'])>1) $photo['takedate'] = strftime('%d %b. %Y', $photo['takestamp']);
 
 		// Parse medium
 		if ($photo['medium']==='1') $photo['medium'] = LYCHEE_URL_UPLOADS_MEDIUM . $photo['url'];

From dffce28eb4f1166657574cada9365c2276b1dc5e Mon Sep 17 00:00:00 2001
From: Bocquet Aldric <aldricbocquet@gmail.com>
Date: Wed, 16 Mar 2016 15:22:18 +0100
Subject: [PATCH 140/183] Fixed a bug preventing photos form being rotated

---
 php/Modules/Photo.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index ef79a95..55fe91f 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -4,6 +4,7 @@ namespace Lychee\Modules;
 
 use ZipArchive;
 use Imagick;
+use ImagickPixel;
 
 final class Photo {
 

From e93564c3e0327e84710540a6fd42c31fdc0b6dbc Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Wed, 16 Mar 2016 17:07:22 +0100
Subject: [PATCH 141/183] Rewrite of getExtension

---
 php/Modules/Album.php        |  2 +-
 php/Modules/Import.php       |  2 +-
 php/Modules/Photo.php        |  6 +++---
 php/helpers/getExtension.php | 15 ++++++++++-----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 4460a5c..253d224 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -278,7 +278,7 @@ final class Album {
 			if (!@is_readable($photo->url)) continue;
 
 			// Get extension of image
-			$extension = getExtension($photo->url);
+			$extension = getExtension($photo->url, true);
 
 			// Set title for photo
 			$zipFileName = $zipTitle . '/' . $photo->title . $extension;
diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index 3bf0df1..76adf19 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -50,7 +50,7 @@ final class Import {
 			// This prevents us from downloading invalid photos.
 
 			// Verify extension
-			$extension = getExtension($url);
+			$extension = getExtension($url, true);
 			if (!in_array(strtolower($extension), Photo::$validExtensions, true)) {
 				$error = true;
 				Log::error(Database::get(), __METHOD__, __LINE__, 'Photo format not supported (' . $url . ')');
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index ef79a95..3f5b6d1 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -123,7 +123,7 @@ final class Photo {
 		}
 
 		// Verify extension
-		$extension = getExtension($file['name']);
+		$extension = getExtension($file['name'], false);
 		if (!in_array(strtolower($extension), self::$validExtensions, true)) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Photo format not supported');
 			if ($returnOnError===true) return false;
@@ -844,8 +844,8 @@ final class Photo {
 		}
 
 		// Get extension
-		$extension = getExtension($photo->url);
-		if ($extension===false) {
+		$extension = getExtension($photo->url, true);
+		if (empty($extension)) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Invalid photo extension');
 			return false;
 		}
diff --git a/php/helpers/getExtension.php b/php/helpers/getExtension.php
index 21089c0..d8df170 100644
--- a/php/helpers/getExtension.php
+++ b/php/helpers/getExtension.php
@@ -1,13 +1,18 @@
 <?php
 
-function getExtension($filename) {
+# Returns the extension of the filename (path or URI) or an empty string
+function getExtension($filename, $isURI = false) {
 
-	$extension = strpos($filename, '.') !== false
-		? strrchr($filename, '.')
-		: '';
+    # If $filename is an URI, get only the path component
+    if ($isURI)
+        $filename = parse_url($filename, PHP_URL_PATH);
+
+	$extension = pathinfo($filename, PATHINFO_EXTENSION);
+
+    if (!empty($extension))
+        $extension = '.' . $extension;
 
 	return $extension;
-
 }
 
 ?>
\ No newline at end of file

From 8bca87e2e4b948c1377e0f8b76bc133107c37342 Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Wed, 16 Mar 2016 19:52:13 +0100
Subject: [PATCH 142/183] Better allow_url_fopen check

ini_get can return false or an empty string when the setting is
deactivated
---
 plugins/Diagnostics/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Diagnostics/index.php b/plugins/Diagnostics/index.php
index 307a774..c7cf963 100644
--- a/plugins/Diagnostics/index.php
+++ b/plugins/Diagnostics/index.php
@@ -91,7 +91,7 @@ if (!$settings['dropboxKey']) echo('Warning: Dropbox import not working. No prop
 
 // Check php.ini Settings
 if (ini_get('max_execution_time')<200&&ini_set('upload_max_filesize', '20M')===false) echo('Warning: You may experience problems when uploading a large amount of photos. Take a look in the FAQ for details.' . PHP_EOL);
-if (!ini_get('allow_url_fopen')) echo('Warning: You may experience problems with the Dropbox- and URL-Import. Edit your php.ini and set allow_url_fopen to 1.' . PHP_EOL);
+if (empty(ini_get('allow_url_fopen'))) echo('Warning: You may experience problems with the Dropbox- and URL-Import. Edit your php.ini and set allow_url_fopen to 1.' . PHP_EOL);
 
 // Check mysql version
 if ($database->server_version<50500) echo('Warning: Lychee uses the GBK charset to avoid sql injections on your MySQL version. Please update to MySQL 5.5 or higher to enable UTF-8 support.' . PHP_EOL);

From 2be1fd21311f57c261a71823f8b9b68df7aa436c Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Wed, 16 Mar 2016 20:20:21 +0100
Subject: [PATCH 143/183] Add login logs

---
 php/Modules/Session.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index 0b846ad..91ffbae 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -70,14 +70,15 @@ final class Session {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		$username = crypt($username, Settings::get()['username']);
+		$username_crypt = crypt($username, Settings::get()['username']);
 		$password = crypt($password, Settings::get()['password']);
 
 		// Check login with crypted hash
-		if (Settings::get()['username']===$username&&
+		if (Settings::get()['username']===$username_crypt&&
 			Settings::get()['password']===$password) {
 				$_SESSION['login']      = true;
 				$_SESSION['identifier'] = Settings::get()['identifier'];
+				Log::notice(Database::get(), __METHOD__, __LINE__, 'User ['.$username.'] has logged in from ['.$_SERVER['REMOTE_ADDR'].']');
 				return true;
 		}
 
@@ -87,6 +88,7 @@ final class Session {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
+		Log::error(Database::get(), __METHOD__, __LINE__, 'User ['.$username.'] has tried to log in from ['.$_SERVER['REMOTE_ADDR'].']');
 		return false;
 
 	}

From d1d5a93fd6bd34a6e8ce5054f1f39a2dd236134b Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 17 Mar 2016 09:18:13 +0100
Subject: [PATCH 144/183] Removed empty value attr from login dialog

---
 src/scripts/lychee.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 30aca55..649529f 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -116,8 +116,8 @@ lychee.loginDialog = function() {
 
 	let msg = lychee.html`
 	          <p class='signIn'>
-	              <input class='text' name='username' autocomplete='username' type='text' value='' placeholder='username' autocapitalize='off' autocorrect='off'>
-	              <input class='text' name='password' autocomplete='current-password' type='password' value='' placeholder='password'>
+	              <input class='text' name='username' autocomplete='username' type='text' placeholder='username' autocapitalize='off' autocorrect='off'>
+	              <input class='text' name='password' autocomplete='current-password' type='password' placeholder='password'>
 	          </p>
 	          <p class='version'>Lychee $${ lychee.version }<span> &#8211; <a target='_blank' href='$${ lychee.updateURL }'>Update available!</a><span></p>
 	          `
@@ -136,14 +136,6 @@ lychee.loginDialog = function() {
 		}
 	})
 
-	if (localStorage) {
-		let localUsername = localStorage.getItem('lychee_username')
-		if (localUsername!=null && localUsername.length>0) {
-			$('.basicModal input[name="username"]').val(localUsername)
-			$('.basicModal input[name="password"]').focus()
-		}
-	}
-
 	if (lychee.checkForUpdates==='1') lychee.getUpdate()
 
 }

From 4455e81d34e15fc6551d4dbdacad09b4002555f9 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 17 Mar 2016 09:18:24 +0100
Subject: [PATCH 145/183] Added shrinkwrap file

---
 src/npm-shrinkwrap.json | 2141 +++++++++++++++++++++++++++++++++++++++
 src/package.json        |    2 +-
 2 files changed, 2142 insertions(+), 1 deletion(-)
 create mode 100644 src/npm-shrinkwrap.json

diff --git a/src/npm-shrinkwrap.json b/src/npm-shrinkwrap.json
new file mode 100644
index 0000000..9622ee0
--- /dev/null
+++ b/src/npm-shrinkwrap.json
@@ -0,0 +1,2141 @@
+{
+  "name": "Lychee",
+  "version": "3.1.0",
+  "dependencies": {
+    "abbrev": {
+      "version": "1.0.7",
+      "from": "abbrev@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "from": "align-text@>=0.1.3 <0.2.0",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"
+    },
+    "amdefine": {
+      "version": "1.0.0",
+      "from": "amdefine@>=0.0.4",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+    },
+    "ansi": {
+      "version": "0.3.1",
+      "from": "ansi@>=0.3.1 <0.4.0",
+      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
+    },
+    "ansi-regex": {
+      "version": "2.0.0",
+      "from": "ansi-regex@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+    },
+    "ansi-styles": {
+      "version": "2.2.0",
+      "from": "ansi-styles@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz"
+    },
+    "archy": {
+      "version": "1.0.0",
+      "from": "archy@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+    },
+    "are-we-there-yet": {
+      "version": "1.1.2",
+      "from": "are-we-there-yet@>=1.1.2 <1.2.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz"
+    },
+    "array-differ": {
+      "version": "1.0.0",
+      "from": "array-differ@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
+    },
+    "array-find-index": {
+      "version": "1.0.1",
+      "from": "array-find-index@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"
+    },
+    "array-index": {
+      "version": "1.0.0",
+      "from": "array-index@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz"
+    },
+    "array-union": {
+      "version": "1.0.1",
+      "from": "array-union@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.1.tgz"
+    },
+    "array-uniq": {
+      "version": "1.0.2",
+      "from": "array-uniq@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "from": "asn1@>=0.2.3 <0.3.0",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "from": "assert-plus@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+    },
+    "async": {
+      "version": "1.5.2",
+      "from": "async@>=1.5.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
+    },
+    "async-foreach": {
+      "version": "0.1.3",
+      "from": "async-foreach@>=0.1.3 <0.2.0",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
+    },
+    "autoprefixer": {
+      "version": "6.3.3",
+      "from": "autoprefixer@>=6.0.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.3.tgz"
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "from": "aws-sign2@>=0.6.0 <0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+    },
+    "aws4": {
+      "version": "1.3.2",
+      "from": "aws4@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz",
+      "dependencies": {
+        "lru-cache": {
+          "version": "4.0.0",
+          "from": "lru-cache@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz"
+        }
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.7.2",
+      "from": "babel-code-frame@>=6.7.2 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.7.2.tgz"
+    },
+    "babel-core": {
+      "version": "6.7.2",
+      "from": "babel-core@>=6.6.5 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.7.2.tgz"
+    },
+    "babel-generator": {
+      "version": "6.7.2",
+      "from": "babel-generator@>=6.7.2 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.7.2.tgz"
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.6.5",
+      "from": "babel-helper-call-delegate@>=6.6.5 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.6.5.tgz"
+    },
+    "babel-helper-define-map": {
+      "version": "6.6.5",
+      "from": "babel-helper-define-map@>=6.6.5 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.6.5.tgz"
+    },
+    "babel-helper-function-name": {
+      "version": "6.6.0",
+      "from": "babel-helper-function-name@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.6.0.tgz"
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.6.5",
+      "from": "babel-helper-get-function-arity@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.6.5.tgz"
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.6.5",
+      "from": "babel-helper-hoist-variables@>=6.6.5 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.6.5.tgz"
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.6.0",
+      "from": "babel-helper-optimise-call-expression@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.6.0.tgz"
+    },
+    "babel-helper-regex": {
+      "version": "6.6.5",
+      "from": "babel-helper-regex@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.6.5.tgz"
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.7.0",
+      "from": "babel-helper-replace-supers@>=6.6.5 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.7.0.tgz"
+    },
+    "babel-helpers": {
+      "version": "6.6.0",
+      "from": "babel-helpers@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.6.0.tgz"
+    },
+    "babel-messages": {
+      "version": "6.7.2",
+      "from": "babel-messages@>=6.7.2 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.7.2.tgz"
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.7.2",
+      "from": "babel-plugin-check-es2015-constants@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.7.2.tgz"
+    },
+    "babel-plugin-syntax-async-functions": {
+      "version": "6.5.0",
+      "from": "babel-plugin-syntax-async-functions@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.5.0.tgz"
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.5.2",
+      "from": "babel-plugin-transform-es2015-arrow-functions@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.5.2.tgz"
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.6.5",
+      "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.6.5.tgz"
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.7.1",
+      "from": "babel-plugin-transform-es2015-block-scoping@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.7.1.tgz"
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.6.5",
+      "from": "babel-plugin-transform-es2015-classes@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.6.5.tgz"
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.6.5",
+      "from": "babel-plugin-transform-es2015-computed-properties@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.6.5.tgz"
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.6.5",
+      "from": "babel-plugin-transform-es2015-destructuring@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.6.5.tgz"
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.6.4",
+      "from": "babel-plugin-transform-es2015-duplicate-keys@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.6.4.tgz"
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.6.0",
+      "from": "babel-plugin-transform-es2015-for-of@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.6.0.tgz"
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.5.0",
+      "from": "babel-plugin-transform-es2015-function-name@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.5.0.tgz"
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.5.0",
+      "from": "babel-plugin-transform-es2015-literals@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.5.0.tgz"
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.7.0",
+      "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.7.0.tgz"
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.6.5",
+      "from": "babel-plugin-transform-es2015-object-super@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.6.5.tgz"
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.7.0",
+      "from": "babel-plugin-transform-es2015-parameters@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.7.0.tgz"
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.5.0",
+      "from": "babel-plugin-transform-es2015-shorthand-properties@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.5.0.tgz"
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.6.5",
+      "from": "babel-plugin-transform-es2015-spread@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.6.5.tgz"
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.5.0",
+      "from": "babel-plugin-transform-es2015-sticky-regex@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.5.0.tgz"
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.6.5",
+      "from": "babel-plugin-transform-es2015-template-literals@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.6.5.tgz"
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.6.0",
+      "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.6.0.tgz"
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.5.0",
+      "from": "babel-plugin-transform-es2015-unicode-regex@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.5.0.tgz"
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.6.5",
+      "from": "babel-plugin-transform-regenerator@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.6.5.tgz"
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.6.5",
+      "from": "babel-plugin-transform-strict-mode@>=6.6.5 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.6.5.tgz"
+    },
+    "babel-preset-es2015": {
+      "version": "6.6.0",
+      "from": "babel-preset-es2015@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.6.0.tgz"
+    },
+    "babel-register": {
+      "version": "6.7.2",
+      "from": "babel-register@>=6.7.2 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.7.2.tgz",
+      "dependencies": {
+        "core-js": {
+          "version": "2.2.0",
+          "from": "core-js@>=2.1.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.2.0.tgz"
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "5.8.35",
+      "from": "babel-runtime@>=5.0.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.35.tgz"
+    },
+    "babel-template": {
+      "version": "6.7.0",
+      "from": "babel-template@>=6.7.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.7.0.tgz"
+    },
+    "babel-traverse": {
+      "version": "6.7.3",
+      "from": "babel-traverse@>=6.7.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.7.3.tgz"
+    },
+    "babel-types": {
+      "version": "6.7.2",
+      "from": "babel-types@>=6.7.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.7.2.tgz"
+    },
+    "babylon": {
+      "version": "6.7.0",
+      "from": "babylon@>=6.7.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.7.0.tgz"
+    },
+    "balanced-match": {
+      "version": "0.3.0",
+      "from": "balanced-match@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+    },
+    "basiccontext": {
+      "version": "3.5.1",
+      "from": "basiccontext@>=3.5.1 <4.0.0"
+    },
+    "basicmodal": {
+      "version": "3.3.3",
+      "from": "basicmodal@>=3.3.3 <4.0.0"
+    },
+    "beeper": {
+      "version": "1.1.0",
+      "from": "beeper@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
+    },
+    "bl": {
+      "version": "1.0.3",
+      "from": "bl@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.5 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
+    },
+    "block-stream": {
+      "version": "0.0.8",
+      "from": "block-stream@*",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+    },
+    "boom": {
+      "version": "2.10.1",
+      "from": "boom@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+    },
+    "brace-expansion": {
+      "version": "1.1.3",
+      "from": "brace-expansion@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz"
+    },
+    "browserslist": {
+      "version": "1.1.3",
+      "from": "browserslist@>=1.1.3 <1.2.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.1.3.tgz"
+    },
+    "bufferstreams": {
+      "version": "1.0.1",
+      "from": "bufferstreams@1.0.1",
+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz"
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "from": "builtin-modules@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"
+    },
+    "camelcase": {
+      "version": "2.1.1",
+      "from": "camelcase@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "from": "camelcase-keys@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"
+    },
+    "caniuse-db": {
+      "version": "1.0.30000430",
+      "from": "caniuse-db@>=1.0.30000409 <2.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000430.tgz"
+    },
+    "caseless": {
+      "version": "0.11.0",
+      "from": "caseless@>=0.11.0 <0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "from": "center-align@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"
+    },
+    "chalk": {
+      "version": "1.1.1",
+      "from": "chalk@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
+    },
+    "clean-css": {
+      "version": "3.4.10",
+      "from": "clean-css@>=3.3.3 <4.0.0",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.10.tgz",
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "from": "source-map@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
+        }
+      }
+    },
+    "cliui": {
+      "version": "3.1.0",
+      "from": "cliui@>=3.0.3 <4.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.1.0.tgz"
+    },
+    "clone": {
+      "version": "1.0.2",
+      "from": "clone@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
+    },
+    "clone-stats": {
+      "version": "0.0.1",
+      "from": "clone-stats@>=0.0.1 <0.0.2",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+    },
+    "code-point-at": {
+      "version": "1.0.0",
+      "from": "code-point-at@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"
+    },
+    "color-convert": {
+      "version": "1.0.0",
+      "from": "color-convert@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz"
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "from": "combined-stream@>=1.0.5 <1.1.0",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+    },
+    "commander": {
+      "version": "2.8.1",
+      "from": "commander@>=2.8.0 <2.9.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "from": "concat-map@0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+    },
+    "concat-stream": {
+      "version": "1.5.1",
+      "from": "concat-stream@>=1.4.7 <2.0.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
+    },
+    "concat-with-sourcemaps": {
+      "version": "1.0.4",
+      "from": "concat-with-sourcemaps@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz"
+    },
+    "config-chain": {
+      "version": "1.1.10",
+      "from": "config-chain@>=1.1.8 <1.2.0",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz"
+    },
+    "convert-source-map": {
+      "version": "1.2.0",
+      "from": "convert-source-map@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.2.0.tgz"
+    },
+    "core-js": {
+      "version": "1.2.6",
+      "from": "core-js@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.6.tgz"
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "from": "core-util-is@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+    },
+    "cross-spawn": {
+      "version": "2.1.5",
+      "from": "cross-spawn@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.1.5.tgz"
+    },
+    "cross-spawn-async": {
+      "version": "2.1.9",
+      "from": "cross-spawn-async@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.1.9.tgz",
+      "dependencies": {
+        "lru-cache": {
+          "version": "4.0.0",
+          "from": "lru-cache@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz"
+        }
+      }
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "from": "cryptiles@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+    },
+    "d": {
+      "version": "0.1.1",
+      "from": "d@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz"
+    },
+    "dashdash": {
+      "version": "1.13.0",
+      "from": "dashdash@>=1.10.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
+    "dateformat": {
+      "version": "1.0.12",
+      "from": "dateformat@>=1.0.11 <2.0.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"
+    },
+    "deap": {
+      "version": "1.0.0",
+      "from": "deap@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/deap/-/deap-1.0.0.tgz"
+    },
+    "debug": {
+      "version": "2.2.0",
+      "from": "debug@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "from": "decamelize@>=1.1.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
+    },
+    "defaults": {
+      "version": "1.0.3",
+      "from": "defaults@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "from": "delayed-stream@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "from": "delegates@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
+    },
+    "deprecated": {
+      "version": "0.0.1",
+      "from": "deprecated@>=0.0.1 <0.0.2",
+      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
+    },
+    "detect-indent": {
+      "version": "3.0.1",
+      "from": "detect-indent@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz"
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "from": "duplexer@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
+    },
+    "duplexer2": {
+      "version": "0.0.2",
+      "from": "duplexer2@0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "from": "ecc-jsbn@>=0.0.1 <1.0.0",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+    },
+    "end-of-stream": {
+      "version": "0.1.5",
+      "from": "end-of-stream@>=0.1.5 <0.2.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"
+    },
+    "error-ex": {
+      "version": "1.3.0",
+      "from": "error-ex@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"
+    },
+    "es5-ext": {
+      "version": "0.10.11",
+      "from": "es5-ext@>=0.10.10 <0.11.0",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.11.tgz"
+    },
+    "es6-iterator": {
+      "version": "2.0.0",
+      "from": "es6-iterator@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz"
+    },
+    "es6-symbol": {
+      "version": "3.0.2",
+      "from": "es6-symbol@>=3.0.2 <4.0.0",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.0.2.tgz"
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "from": "esutils@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
+    },
+    "event-stream": {
+      "version": "3.3.2",
+      "from": "event-stream@>=3.1.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.2.tgz"
+    },
+    "extend": {
+      "version": "2.0.1",
+      "from": "extend@>=2.0.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-2.0.1.tgz"
+    },
+    "extsprintf": {
+      "version": "1.0.2",
+      "from": "extsprintf@1.0.2",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+    },
+    "fancy-log": {
+      "version": "1.2.0",
+      "from": "fancy-log@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz"
+    },
+    "find-index": {
+      "version": "0.1.1",
+      "from": "find-index@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "from": "find-up@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "dependencies": {
+        "path-exists": {
+          "version": "2.1.0",
+          "from": "path-exists@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
+        }
+      }
+    },
+    "findup-sync": {
+      "version": "0.3.0",
+      "from": "findup-sync@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"
+    },
+    "first-chunk-stream": {
+      "version": "1.0.0",
+      "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+    },
+    "flagged-respawn": {
+      "version": "0.3.1",
+      "from": "flagged-respawn@>=0.3.1 <0.4.0",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "from": "forever-agent@>=0.6.1 <0.7.0",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+    },
+    "form-data": {
+      "version": "1.0.0-rc4",
+      "from": "form-data@>=1.0.0-rc3 <1.1.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz"
+    },
+    "from": {
+      "version": "0.1.3",
+      "from": "from@>=0.0.0 <1.0.0",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
+    },
+    "fstream": {
+      "version": "1.0.8",
+      "from": "fstream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz"
+    },
+    "gauge": {
+      "version": "1.2.7",
+      "from": "gauge@>=1.2.5 <1.3.0",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"
+    },
+    "gaze": {
+      "version": "0.5.2",
+      "from": "gaze@>=0.5.1 <0.6.0",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "from": "generate-function@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "from": "generate-object-property@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "from": "get-stdin@>=4.0.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+    },
+    "glob": {
+      "version": "5.0.15",
+      "from": "glob@>=5.0.0 <5.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
+    },
+    "glob-stream": {
+      "version": "3.1.18",
+      "from": "glob-stream@>=3.1.5 <4.0.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "4.5.3",
+          "from": "glob@>=4.3.1 <5.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"
+        },
+        "readable-stream": {
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
+        },
+        "through2": {
+          "version": "0.6.5",
+          "from": "through2@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
+        }
+      }
+    },
+    "glob-watcher": {
+      "version": "0.0.6",
+      "from": "glob-watcher@>=0.0.6 <0.0.7",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"
+    },
+    "glob2base": {
+      "version": "0.0.12",
+      "from": "glob2base@>=0.0.12 <0.0.13",
+      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"
+    },
+    "globals": {
+      "version": "8.18.0",
+      "from": "globals@>=8.3.0 <9.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz"
+    },
+    "globule": {
+      "version": "0.1.0",
+      "from": "globule@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "3.1.21",
+          "from": "glob@>=3.1.21 <3.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"
+        },
+        "graceful-fs": {
+          "version": "1.2.3",
+          "from": "graceful-fs@>=1.2.0 <1.3.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+        },
+        "inherits": {
+          "version": "1.0.2",
+          "from": "inherits@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+        },
+        "lodash": {
+          "version": "1.0.2",
+          "from": "lodash@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "from": "minimatch@>=0.2.11 <0.3.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"
+        }
+      }
+    },
+    "glogg": {
+      "version": "1.0.0",
+      "from": "glogg@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz"
+    },
+    "graceful-fs": {
+      "version": "4.1.3",
+      "from": "graceful-fs@>=4.1.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz"
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "from": "graceful-readlink@>=1.0.0",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+    },
+    "gulp": {
+      "version": "3.9.1",
+      "from": "gulp@>=3.9.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"
+    },
+    "gulp-autoprefixer": {
+      "version": "3.1.0",
+      "from": "gulp-autoprefixer@3.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-3.1.0.tgz"
+    },
+    "gulp-babel": {
+      "version": "6.1.2",
+      "from": "gulp-babel@>=6.1.2 <7.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-6.1.2.tgz",
+      "dependencies": {
+        "object-assign": {
+          "version": "4.0.1",
+          "from": "object-assign@>=4.0.1 <5.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+        }
+      }
+    },
+    "gulp-concat": {
+      "version": "2.6.0",
+      "from": "gulp-concat@>=2.6.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.0.tgz",
+      "dependencies": {
+        "readable-stream": {
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
+        },
+        "through2": {
+          "version": "0.6.5",
+          "from": "through2@>=0.6.3 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
+        }
+      }
+    },
+    "gulp-inject": {
+      "version": "3.0.0",
+      "from": "gulp-inject@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-inject/-/gulp-inject-3.0.0.tgz"
+    },
+    "gulp-load-plugins": {
+      "version": "1.2.0",
+      "from": "gulp-load-plugins@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-load-plugins/-/gulp-load-plugins-1.2.0.tgz",
+      "dependencies": {
+        "findup-sync": {
+          "version": "0.2.1",
+          "from": "findup-sync@>=0.2.1 <0.3.0",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz"
+        },
+        "glob": {
+          "version": "4.3.5",
+          "from": "glob@>=4.3.0 <4.4.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz"
+        }
+      }
+    },
+    "gulp-minify-css": {
+      "version": "1.2.4",
+      "from": "gulp-minify-css@>=1.2.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-minify-css/-/gulp-minify-css-1.2.4.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "object-assign": {
+          "version": "4.0.1",
+          "from": "object-assign@>=4.0.1 <5.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
+    },
+    "gulp-rimraf": {
+      "version": "0.2.0",
+      "from": "gulp-rimraf@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-rimraf/-/gulp-rimraf-0.2.0.tgz"
+    },
+    "gulp-sass": {
+      "version": "2.2.0",
+      "from": "gulp-sass@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-2.2.0.tgz",
+      "dependencies": {
+        "object-assign": {
+          "version": "4.0.1",
+          "from": "object-assign@>=4.0.1 <5.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+        }
+      }
+    },
+    "gulp-uglify": {
+      "version": "1.5.3",
+      "from": "gulp-uglify@>=1.5.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-1.5.3.tgz"
+    },
+    "gulp-util": {
+      "version": "3.0.7",
+      "from": "gulp-util@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz"
+    },
+    "gulplog": {
+      "version": "1.0.0",
+      "from": "gulplog@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"
+    },
+    "har-validator": {
+      "version": "2.0.6",
+      "from": "har-validator@>=2.0.6 <2.1.0",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+      "dependencies": {
+        "commander": {
+          "version": "2.9.0",
+          "from": "commander@>=2.9.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
+        }
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "from": "has-ansi@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+    },
+    "has-flag": {
+      "version": "1.0.0",
+      "from": "has-flag@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
+    },
+    "has-gulplog": {
+      "version": "0.1.0",
+      "from": "has-gulplog@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"
+    },
+    "has-unicode": {
+      "version": "2.0.0",
+      "from": "has-unicode@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz"
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "from": "hawk@>=3.1.0 <3.2.0",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "from": "hoek@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+    },
+    "home-or-tmp": {
+      "version": "1.0.0",
+      "from": "home-or-tmp@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz"
+    },
+    "hosted-git-info": {
+      "version": "2.1.4",
+      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+    },
+    "http-signature": {
+      "version": "1.1.1",
+      "from": "http-signature@>=1.1.0 <1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "from": "indent-string@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "dependencies": {
+        "repeating": {
+          "version": "2.0.0",
+          "from": "repeating@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz"
+        }
+      }
+    },
+    "inflight": {
+      "version": "1.0.4",
+      "from": "inflight@>=1.0.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
+    },
+    "inherits": {
+      "version": "2.0.1",
+      "from": "inherits@>=2.0.1 <2.1.0",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+    },
+    "ini": {
+      "version": "1.3.4",
+      "from": "ini@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+    },
+    "interpret": {
+      "version": "1.0.0",
+      "from": "interpret@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.0.tgz"
+    },
+    "invariant": {
+      "version": "2.2.1",
+      "from": "invariant@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.1.tgz"
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "from": "invert-kv@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
+    },
+    "is-absolute": {
+      "version": "0.1.7",
+      "from": "is-absolute@>=0.1.7 <0.2.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "from": "is-arrayish@>=0.2.1 <0.3.0",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+    },
+    "is-buffer": {
+      "version": "1.1.3",
+      "from": "is-buffer@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.3.tgz"
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
+    },
+    "is-finite": {
+      "version": "1.0.1",
+      "from": "is-finite@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
+    },
+    "is-integer": {
+      "version": "1.0.6",
+      "from": "is-integer@>=1.0.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-integer/-/is-integer-1.0.6.tgz"
+    },
+    "is-my-json-valid": {
+      "version": "2.13.1",
+      "from": "is-my-json-valid@>=2.12.4 <3.0.0",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "from": "is-property@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+    },
+    "is-relative": {
+      "version": "0.1.3",
+      "from": "is-relative@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "from": "is-typedarray@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "from": "is-utf8@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
+    },
+    "isarray": {
+      "version": "0.0.1",
+      "from": "isarray@0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+    },
+    "isexe": {
+      "version": "1.1.2",
+      "from": "isexe@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"
+    },
+    "isobject": {
+      "version": "2.0.0",
+      "from": "isobject@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.0.0.tgz"
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "from": "isstream@>=0.1.2 <0.2.0",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+    },
+    "jodid25519": {
+      "version": "1.0.2",
+      "from": "jodid25519@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+    },
+    "jquery": {
+      "version": "2.2.1",
+      "from": "jquery@>=2.2.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.1.tgz"
+    },
+    "js-base64": {
+      "version": "2.1.9",
+      "from": "js-base64@>=2.1.9 <3.0.0",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
+    },
+    "js-tokens": {
+      "version": "1.0.2",
+      "from": "js-tokens@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.2.tgz"
+    },
+    "jsbn": {
+      "version": "0.1.0",
+      "from": "jsbn@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+    },
+    "jsesc": {
+      "version": "0.5.0",
+      "from": "jsesc@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
+    },
+    "json-schema": {
+      "version": "0.2.2",
+      "from": "json-schema@0.2.2",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+    },
+    "json5": {
+      "version": "0.4.0",
+      "from": "json5@>=0.4.0 <0.5.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+    },
+    "jsonpointer": {
+      "version": "2.0.0",
+      "from": "jsonpointer@2.0.0",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+    },
+    "jsprim": {
+      "version": "1.2.2",
+      "from": "jsprim@>=1.2.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"
+    },
+    "kind-of": {
+      "version": "3.0.2",
+      "from": "kind-of@>=3.0.2 <4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz"
+    },
+    "lazy-cache": {
+      "version": "1.0.3",
+      "from": "lazy-cache@>=1.0.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.3.tgz"
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "from": "lcid@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"
+    },
+    "left-pad": {
+      "version": "0.0.3",
+      "from": "left-pad@0.0.3",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-0.0.3.tgz"
+    },
+    "liftoff": {
+      "version": "2.2.0",
+      "from": "liftoff@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.2.0.tgz"
+    },
+    "line-numbers": {
+      "version": "0.2.0",
+      "from": "line-numbers@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/line-numbers/-/line-numbers-0.2.0.tgz"
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "from": "load-json-file@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"
+    },
+    "lodash": {
+      "version": "3.10.1",
+      "from": "lodash@>=3.10.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
+    },
+    "lodash._basetostring": {
+      "version": "3.0.1",
+      "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+    },
+    "lodash._basevalues": {
+      "version": "3.0.0",
+      "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "from": "lodash._getnative@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
+    },
+    "lodash._reescape": {
+      "version": "3.0.0",
+      "from": "lodash._reescape@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+    },
+    "lodash._reevaluate": {
+      "version": "3.0.0",
+      "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+    },
+    "lodash._root": {
+      "version": "3.0.1",
+      "from": "lodash._root@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"
+    },
+    "lodash.escape": {
+      "version": "3.2.0",
+      "from": "lodash.escape@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"
+    },
+    "lodash.isarguments": {
+      "version": "3.0.8",
+      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.8.tgz"
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "from": "lodash.keys@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
+    },
+    "lodash.pad": {
+      "version": "4.1.0",
+      "from": "lodash.pad@>=4.1.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.1.0.tgz"
+    },
+    "lodash.padend": {
+      "version": "4.2.0",
+      "from": "lodash.padend@>=4.1.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.2.0.tgz"
+    },
+    "lodash.padstart": {
+      "version": "4.2.0",
+      "from": "lodash.padstart@>=4.1.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.2.0.tgz"
+    },
+    "lodash.repeat": {
+      "version": "4.0.0",
+      "from": "lodash.repeat@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.0.0.tgz"
+    },
+    "lodash.restparam": {
+      "version": "3.6.1",
+      "from": "lodash.restparam@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
+    },
+    "lodash.template": {
+      "version": "3.6.2",
+      "from": "lodash.template@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"
+    },
+    "lodash.templatesettings": {
+      "version": "3.1.1",
+      "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"
+    },
+    "lodash.tostring": {
+      "version": "4.1.2",
+      "from": "lodash.tostring@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.2.tgz"
+    },
+    "longest": {
+      "version": "1.0.1",
+      "from": "longest@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+    },
+    "loose-envify": {
+      "version": "1.1.0",
+      "from": "loose-envify@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.1.0.tgz"
+    },
+    "loud-rejection": {
+      "version": "1.3.0",
+      "from": "loud-rejection@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.3.0.tgz"
+    },
+    "lru-cache": {
+      "version": "2.7.3",
+      "from": "lru-cache@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "from": "map-obj@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+    },
+    "map-stream": {
+      "version": "0.1.0",
+      "from": "map-stream@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"
+    },
+    "meow": {
+      "version": "3.7.0",
+      "from": "meow@>=3.3.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "dependencies": {
+        "object-assign": {
+          "version": "4.0.1",
+          "from": "object-assign@>=4.0.1 <5.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+        }
+      }
+    },
+    "mime-db": {
+      "version": "1.22.0",
+      "from": "mime-db@>=1.22.0 <1.23.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+    },
+    "mime-types": {
+      "version": "2.1.10",
+      "from": "mime-types@>=2.1.7 <2.2.0",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz"
+    },
+    "minimatch": {
+      "version": "2.0.10",
+      "from": "minimatch@>=2.0.3 <3.0.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "from": "minimist@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "from": "mkdirp@>=0.5.1 <0.6.0",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "from": "minimist@0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+        }
+      }
+    },
+    "mousetrap": {
+      "version": "1.5.3",
+      "from": "mousetrap@>=1.5.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.5.3.tgz"
+    },
+    "ms": {
+      "version": "0.7.1",
+      "from": "ms@0.7.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+    },
+    "multimatch": {
+      "version": "2.0.0",
+      "from": "multimatch@2.0.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.0.0.tgz"
+    },
+    "multipipe": {
+      "version": "0.1.2",
+      "from": "multipipe@>=0.1.2 <0.2.0",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"
+    },
+    "nan": {
+      "version": "2.2.0",
+      "from": "nan@>=2.0.8 <3.0.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.0.tgz"
+    },
+    "node-gyp": {
+      "version": "3.3.1",
+      "from": "node-gyp@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "4.5.3",
+          "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+          "dependencies": {
+            "minimatch": {
+              "version": "2.0.10",
+              "from": "minimatch@>=2.0.1 <3.0.0"
+            }
+          }
+        },
+        "minimatch": {
+          "version": "1.0.0",
+          "from": "minimatch@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"
+        }
+      }
+    },
+    "node-sass": {
+      "version": "3.4.2",
+      "from": "node-sass@>=3.4.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz"
+    },
+    "node-uuid": {
+      "version": "1.4.7",
+      "from": "node-uuid@>=1.4.7 <1.5.0",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "from": "nopt@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
+    },
+    "normalize-package-data": {
+      "version": "2.3.5",
+      "from": "normalize-package-data@>=2.3.4 <3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "from": "normalize-range@>=0.1.2 <0.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
+    },
+    "npmconf": {
+      "version": "2.1.2",
+      "from": "npmconf@>=2.1.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"
+    },
+    "npmlog": {
+      "version": "2.0.3",
+      "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.3.tgz"
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "from": "num2fraction@>=1.2.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
+    },
+    "number-is-nan": {
+      "version": "1.0.0",
+      "from": "number-is-nan@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+    },
+    "oauth-sign": {
+      "version": "0.8.1",
+      "from": "oauth-sign@>=0.8.0 <0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
+    },
+    "object-assign": {
+      "version": "3.0.0",
+      "from": "object-assign@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
+    },
+    "once": {
+      "version": "1.3.3",
+      "from": "once@>=1.3.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
+    },
+    "orchestrator": {
+      "version": "0.3.7",
+      "from": "orchestrator@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz"
+    },
+    "ordered-read-streams": {
+      "version": "0.1.0",
+      "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+    },
+    "os-homedir": {
+      "version": "1.0.1",
+      "from": "os-homedir@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "from": "os-locale@>=1.4.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"
+    },
+    "os-shim": {
+      "version": "0.1.3",
+      "from": "os-shim@>=0.1.2 <0.2.0",
+      "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"
+    },
+    "os-tmpdir": {
+      "version": "1.0.1",
+      "from": "os-tmpdir@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+    },
+    "osenv": {
+      "version": "0.1.3",
+      "from": "osenv@>=0.0.0 <1.0.0",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "from": "parse-json@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
+    },
+    "path-array": {
+      "version": "1.0.1",
+      "from": "path-array@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz"
+    },
+    "path-exists": {
+      "version": "1.0.0",
+      "from": "path-exists@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz"
+    },
+    "path-is-absolute": {
+      "version": "1.0.0",
+      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "from": "path-type@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"
+    },
+    "pause-stream": {
+      "version": "0.0.11",
+      "from": "pause-stream@0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
+    },
+    "pify": {
+      "version": "2.3.0",
+      "from": "pify@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "from": "pinkie@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+    },
+    "pinkie-promise": {
+      "version": "2.0.0",
+      "from": "pinkie-promise@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"
+    },
+    "postcss": {
+      "version": "5.0.19",
+      "from": "postcss@>=5.0.4 <6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.19.tgz",
+      "dependencies": {
+        "supports-color": {
+          "version": "3.1.2",
+          "from": "supports-color@>=3.1.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"
+        }
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "from": "postcss-value-parser@>=3.2.3 <4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"
+    },
+    "pretty-hrtime": {
+      "version": "1.0.2",
+      "from": "pretty-hrtime@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz"
+    },
+    "private": {
+      "version": "0.1.6",
+      "from": "private@>=0.1.5 <0.2.0",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.6.tgz"
+    },
+    "process-nextick-args": {
+      "version": "1.0.6",
+      "from": "process-nextick-args@>=1.0.6 <1.1.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "from": "proto-list@>=1.2.1 <1.3.0",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "from": "pseudomap@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
+    },
+    "qs": {
+      "version": "6.0.2",
+      "from": "qs@>=6.0.2 <6.1.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "from": "read-pkg@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "from": "read-pkg-up@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
+    },
+    "readable-stream": {
+      "version": "1.1.13",
+      "from": "readable-stream@>=1.1.9 <1.2.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "from": "rechoir@>=0.6.0 <0.7.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"
+    },
+    "redent": {
+      "version": "1.0.0",
+      "from": "redent@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"
+    },
+    "regenerate": {
+      "version": "1.2.1",
+      "from": "regenerate@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.2.1.tgz"
+    },
+    "regexpu-core": {
+      "version": "1.0.0",
+      "from": "regexpu-core@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz"
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "from": "regjsgen@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz"
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "from": "regjsparser@>=0.1.4 <0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz"
+    },
+    "repeat-string": {
+      "version": "1.5.4",
+      "from": "repeat-string@>=1.5.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz"
+    },
+    "repeating": {
+      "version": "1.1.3",
+      "from": "repeating@>=1.1.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"
+    },
+    "replace-ext": {
+      "version": "0.0.1",
+      "from": "replace-ext@0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
+    },
+    "request": {
+      "version": "2.69.0",
+      "from": "request@>=2.61.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.69.0.tgz",
+      "dependencies": {
+        "extend": {
+          "version": "3.0.0",
+          "from": "extend@>=3.0.0 <3.1.0",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+        }
+      }
+    },
+    "resolve": {
+      "version": "1.1.7",
+      "from": "resolve@>=1.1.6 <2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "from": "right-align@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"
+    },
+    "rimraf": {
+      "version": "2.5.2",
+      "from": "rimraf@>=2.4.3 <3.0.0",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "7.0.3",
+          "from": "glob@>=7.0.0 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
+        }
+      }
+    },
+    "sass-graph": {
+      "version": "2.1.1",
+      "from": "sass-graph@>=2.0.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.1.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "from": "glob@>=6.0.4 <7.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
+        },
+        "lodash": {
+          "version": "4.6.1",
+          "from": "lodash@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz"
+        }
+      }
+    },
+    "semver": {
+      "version": "4.3.6",
+      "from": "semver@>=4.1.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+    },
+    "sequencify": {
+      "version": "0.0.7",
+      "from": "sequencify@>=0.0.7 <0.1.0",
+      "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "from": "shebang-regex@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "from": "sigmund@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+    },
+    "signal-exit": {
+      "version": "2.1.2",
+      "from": "signal-exit@>=2.1.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
+    },
+    "slash": {
+      "version": "1.0.0",
+      "from": "slash@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "from": "sntp@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+    },
+    "source-map": {
+      "version": "0.5.3",
+      "from": "source-map@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+    },
+    "source-map-support": {
+      "version": "0.2.10",
+      "from": "source-map-support@>=0.2.10 <0.3.0",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
+      "dependencies": {
+        "source-map": {
+          "version": "0.1.32",
+          "from": "source-map@0.1.32",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"
+        }
+      }
+    },
+    "sparkles": {
+      "version": "1.0.0",
+      "from": "sparkles@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
+    },
+    "spawn-sync": {
+      "version": "1.0.15",
+      "from": "spawn-sync@>=1.0.15 <2.0.0",
+      "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz"
+    },
+    "spdx-correct": {
+      "version": "1.0.2",
+      "from": "spdx-correct@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
+    },
+    "spdx-exceptions": {
+      "version": "1.0.4",
+      "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
+    },
+    "spdx-expression-parse": {
+      "version": "1.0.2",
+      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz"
+    },
+    "spdx-license-ids": {
+      "version": "1.2.0",
+      "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz"
+    },
+    "split": {
+      "version": "0.3.3",
+      "from": "split@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz"
+    },
+    "sshpk": {
+      "version": "1.7.4",
+      "from": "sshpk@>=1.7.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz"
+    },
+    "stream-combiner": {
+      "version": "0.0.4",
+      "from": "stream-combiner@>=0.0.4 <0.1.0",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
+    },
+    "stream-consume": {
+      "version": "0.1.0",
+      "from": "stream-consume@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
+    },
+    "string_decoder": {
+      "version": "0.10.31",
+      "from": "string_decoder@>=0.10.0 <0.11.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+    },
+    "string-width": {
+      "version": "1.0.1",
+      "from": "string-width@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz"
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "from": "stringstream@>=0.0.4 <0.1.0",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "from": "strip-ansi@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "from": "strip-bom@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "from": "strip-indent@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "from": "supports-color@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+    },
+    "tar": {
+      "version": "2.2.1",
+      "from": "tar@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
+    },
+    "through": {
+      "version": "2.3.8",
+      "from": "through@>=2.3.1 <2.4.0",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+    },
+    "through2": {
+      "version": "2.0.1",
+      "from": "through2@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
+    },
+    "tildify": {
+      "version": "1.1.2",
+      "from": "tildify@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz"
+    },
+    "time-stamp": {
+      "version": "1.0.0",
+      "from": "time-stamp@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.0.tgz"
+    },
+    "to-fast-properties": {
+      "version": "1.0.1",
+      "from": "to-fast-properties@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.1.tgz"
+    },
+    "tough-cookie": {
+      "version": "2.2.2",
+      "from": "tough-cookie@>=2.2.0 <2.3.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "from": "trim-newlines@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "from": "trim-right@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"
+    },
+    "tunnel-agent": {
+      "version": "0.4.2",
+      "from": "tunnel-agent@>=0.4.1 <0.5.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
+    },
+    "tweetnacl": {
+      "version": "0.14.1",
+      "from": "tweetnacl@>=0.13.0 <1.0.0",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz"
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "from": "typedarray@>=0.0.5 <0.1.0",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+    },
+    "uglify-js": {
+      "version": "2.6.2",
+      "from": "uglify-js@2.6.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.2.tgz",
+      "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "from": "async@>=0.2.6 <0.3.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "from": "camelcase@>=1.0.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "from": "cliui@>=2.1.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"
+        },
+        "window-size": {
+          "version": "0.1.0",
+          "from": "window-size@0.1.0",
+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "from": "yargs@>=3.10.0 <3.11.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
+        }
+      }
+    },
+    "uglify-save-license": {
+      "version": "0.4.1",
+      "from": "uglify-save-license@>=0.4.1 <0.5.0",
+      "resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz"
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+    },
+    "uid-number": {
+      "version": "0.0.5",
+      "from": "uid-number@0.0.5",
+      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
+    },
+    "unique-stream": {
+      "version": "1.0.0",
+      "from": "unique-stream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
+    },
+    "user-home": {
+      "version": "1.1.1",
+      "from": "user-home@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "from": "util-deprecate@>=1.0.1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+    },
+    "v8flags": {
+      "version": "2.0.11",
+      "from": "v8flags@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.0.11.tgz"
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.1",
+      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
+    },
+    "verror": {
+      "version": "1.3.6",
+      "from": "verror@1.3.6",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+    },
+    "vinyl": {
+      "version": "0.5.3",
+      "from": "vinyl@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"
+    },
+    "vinyl-bufferstream": {
+      "version": "1.0.1",
+      "from": "vinyl-bufferstream@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz"
+    },
+    "vinyl-fs": {
+      "version": "0.3.14",
+      "from": "vinyl-fs@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
+      "dependencies": {
+        "clone": {
+          "version": "0.2.0",
+          "from": "clone@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+        },
+        "graceful-fs": {
+          "version": "3.0.8",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+        },
+        "readable-stream": {
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
+        },
+        "strip-bom": {
+          "version": "1.0.0",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"
+        },
+        "through2": {
+          "version": "0.6.5",
+          "from": "through2@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "from": "vinyl@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"
+        }
+      }
+    },
+    "vinyl-sourcemaps-apply": {
+      "version": "0.2.1",
+      "from": "vinyl-sourcemaps-apply@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"
+    },
+    "which": {
+      "version": "1.2.4",
+      "from": "which@>=1.2.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz"
+    },
+    "window-size": {
+      "version": "0.1.4",
+      "from": "window-size@>=0.1.4 <0.2.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"
+    },
+    "wordwrap": {
+      "version": "0.0.2",
+      "from": "wordwrap@0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+    },
+    "wrap-ansi": {
+      "version": "1.0.0",
+      "from": "wrap-ansi@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz"
+    },
+    "wrappy": {
+      "version": "1.0.1",
+      "from": "wrappy@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "from": "xtend@>=4.0.0 <4.1.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+    },
+    "y18n": {
+      "version": "3.2.0",
+      "from": "y18n@>=3.2.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz"
+    },
+    "yallist": {
+      "version": "2.0.0",
+      "from": "yallist@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"
+    },
+    "yargs": {
+      "version": "3.32.0",
+      "from": "yargs@>=3.8.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"
+    }
+  }
+}
diff --git a/src/package.json b/src/package.json
index b69a91b..2570e1c 100644
--- a/src/package.json
+++ b/src/package.json
@@ -13,7 +13,7 @@
     "start": "gulp watch",
     "compile": "gulp"
   },
-  "devDependencies": {
+  "dependencies": {
     "babel-preset-es2015": "^6.6.0",
     "basiccontext": "^3.5.1",
     "basicmodal": "^3.3.3",

From 76bc0570edb219d13349c1183862d0eafe623f62 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 17 Mar 2016 09:20:08 +0100
Subject: [PATCH 146/183] Removed usage of localStorage for username

---
 src/scripts/lychee.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index 649529f..f6f6f6a 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -95,10 +95,6 @@ lychee.login = function(data) {
 
 		if (data===true) {
 
-			// Use 'try' to catch a thrown error when Safari is in private mode
-			try { localStorage.setItem('lychee_username', user) }
-			catch (err) {}
-
 			window.location.reload()
 
 		} else {

From 61d927b2b7f5bcf822dfeeb558c8d040af54e0a7 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 17 Mar 2016 09:21:21 +0100
Subject: [PATCH 147/183] Rebuild

---
 dist/main.js | Bin 192611 -> 192330 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 dist/main.js

diff --git a/dist/main.js b/dist/main.js
old mode 100755
new mode 100644
index 6a0cdccc376becfbf52d0d6372f45f9e9ffa7a79..3ed2e4bace876727502e9ee46829a2295fd635a0
GIT binary patch
delta 1272
zcmZ8hT}&KR6wVze6(|<4Y#U2~UC1y4!*r>ML?)M?VlAbDC`dHRE}1)XcXz_xna#{B
zG_rkZqKOHOF_SnNV`y#ti9EE)8n?DUd{Sei>WfdP#WtzNs@bGU^r3o&wmz6l?)m@D
zx%Zqi*RNH7@qP8hxiUlw^JS|$nhB0d3{yEn&6Jx~SRYYHXQyZ+1r^g6DNI!6P$f7i
zDo)0T_f6F;M7*`?Lx_2$>I7ni@m;T$HxcZ{qHzFHscbk;<V?*qEK?w&0zl0Br*>Z>
z;rXydWi3s$*`bVOQl39dWtTdxK)grlI;t4Y3jqoyg;d?q8Yu8W(*`Gye16U{^p+^b
zn8d8Os9C0Km^rE>aX5N13n~oQ#4ChdO!^~fL)WPpG0Yaw3Q0`lyBe{V;87~8nnoQ*
zpi(4x!bw~65ozJ1D5>B|JU#MeC`i#8l`KgYC95Ss$>#-9XlOmv2p507zo!;p9}7b*
zJm1|NQ16HSVK4~;tx)ol11SXL!@(W|Z*%K#t^!Qt*b#WH_m6D>e`cf;_%BEL;H*CW
zGdTTm{3Zt>-;Gs3q<7<~D4Y%B%`GIBjOX*I?NbN{J}PT!CL=hasH8CSCda2BZh3rb
zM-8F)U?M%Ow;ePjR=6-l%K^9{wpj*bD=`!hh15ey-k8>o*tt1vH)NT&f%led+{VO(
zpyT2~(y|4GD0i7Gc9ks7#z<U&f$&Q1es90i41tOh6_}hfY{wl+8yUTq$r<$?AD3*N
zpSushB(E#?sJG-cdp|k54lw9H_>WmSbz<o_pm%nrc|Hpt3|F1|Ie^!>4;6lOCw9W!
z2J<ACgYz$6<Dk$N7iZxfrNs>p3RhoI+v^ET9P~6rU4h;kwZY<O7nA86HC;!9);ajT
zgo8#4Hppq!)H5`&g5+H(u0Ylkm)?R*p^x7~Wq|5^a{0i{U?3sfyK(vHZ3o_)zOoG5
z11mp5HNUJxpo|AsZ&rfp&rj13J@eT_1y~B}U0~T<cgA)TH&`u8Q-gJoSW#<4mC$UT
zHK8Lw3QZ`2Nb%byG*S*?xE1XK(%XuXi1}w*(O-2W*r>;8lG--a1rZ>Y+fatvOXRF=
zF~gz4j3{ds%VwxcG4thi)B_O7cEkhl>2~xsJeD8rKw-p+&vc;iJwVU(p}#{lOr$Y4
z-fzMd^)mm1XVDs%j47mZAr_-?Ny|{xo-`P>a<HPJMEvW|p=t0Lcplx^ex>4I481Vy
zFM3>!fAJmkn!h^3g^DkoM|;r!ls+imDBgJ&of-9)ZX=mfs*3BkQN^&INN_v%&Kss~
z&HwjMvQ0CVstf+<1Q+oqF{k;Zvs}pk8n}u`cLe?f{#q}jLjByOLw@Znm-53l_Ytb{
aOIOju#gff!EEK=`jjKnH$lv^(JM}NehP@>K

delta 1479
zcmZuxYitx%6waMOp)IeXEf}EP-8Qo`bQl&)BzC-gP!TA$R*OWlEM)HNo!tp@XV#g!
z%VW1O!T7_7K{F;}Vhm{U5%>XSNk*RWml6X;6T%OJ2ttAeFd;#S{!q{GFc?iH_ndnk
z-#K$0_p1vnmoK&)sx%;0-`a3uYA3@Pg<z`M)G6?yM*5h>dU|Bblypq9tUlgUMonO(
z>DbJ&;M?Zwhy^EGmLn3}Y}tfJeQd^CQ#u&t*-Q?AbgEkZQ)S2Cmg`7N)&PhEf6bY{
zkcnc_rK(Y+#+D)5b*Lz=q$;OAmss#<>*8i2ic*Y%S-sG@dL|@zu;aWSv0AO-TKPl<
zW6ZK{PBvVJTTYp3CQfE1N+803&4PN8W7eN4TKPP6QkIhdsbpfN-j&F`43AJ%Hw^0g
z5>-;>Hoxd@O)1q0S<%6i1^Lvw?Qw|SjN&SJS#c9FO06cbdRy1dh4AC=^skr$u#YDp
z7g1ccET+K^{cAua4Rk@uPY)Cjki&y35Y*=S%5o#9$l6s<u20t927d2w5Adgl``~O@
z_cIv%y6&m~F5izff@g5$nGBq5W1R_>HFLFE;m#?=1g};N-L@rPmbC&V!TPZc;CEo`
z_SBh-;-#C48}r>uErrw%ZlF^DxGj6B0m$u5Low0FTu3PxHPVPoR*cyYWvd5#u*bvQ
zM6Sjim#e1hNgC7cG9}El5-w#~PJ@96Zt?}e0>2X+H9sQ})wDdH4;3vt-%C_mzsKhk
zPZTTn0f-VTDL)qM;hn)x{)|Ng`VaP_Zl3ztVh+%IdWxc0f)9qPm7fCeR{l`^1|OdW
z|29}7@f_@X?V<pQzPf7*{Kw5*=iyTSdbggQ%V6T5rv=I-dT-PQqmd;<r4{OMUxwEC
z`2G#Yjg~yP7j-9Z(^w0);8=7VqHg=_J&4qP<YUwTsKMt)7fp)?65N9;N1wf8AO;(c
z9RP0n@gE_ZYsXWN#;g-pn?Us27e(;i{N;EfXzFK{facN}e{?qE@oKq-9<PH!B4Z(H
zf@X)T1FZs5??5TUqH`T+cnVyTU1&a#-Y#S!629Mses5**Mm<SQ>UlIT$pCSn8`;7<
zrj|UHSw59E%c|kBl1(|qBvjLA1wfc-Bm(doY4iaUE6glLNkpRO7NfC;fll_JKiX#!
znPz#e-+?XaCE@<((MeEQ8&F<oCs~?P44dlSdW%uF3@a)tEWG>z+6XoSFQPy1R4E$F
zq8)3dRdl;daXLIQi9QVRIW#@W?L$52zw!{|hr+#|qSolzM`-s5Y7TeYLTa@C7HV8G
z1OrH6$CDYk%DwH?xN7z|cRjs8RiE;;oH8k8Z-)njZZ7-Ob96>i3YRCKx<*lQ<myB?
z&?h`HmD)Z{gx@?Nydqd;_~z@vywJje@$!R+a<!s+3639>#dGxkQDn_2+jbIjQRMet
z%DxOtN4Jz#iSAp*h@01Kcr8k0o{jUusedxerDYW=B=I@2@^AYv@f~WLm5L2a*C_jv
rEKfwIv2b=dYL51ngheR4@V1bOF1{q3tqNLmbohoa7lo&O5qAC!tlR|X


From aba1629f317c5fc5669afa792955956c57626a15 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 17 Mar 2016 09:28:31 +0100
Subject: [PATCH 148/183] Syntax adjustments #488

---
 php/helpers/getExtension.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/php/helpers/getExtension.php b/php/helpers/getExtension.php
index d8df170..180a853 100644
--- a/php/helpers/getExtension.php
+++ b/php/helpers/getExtension.php
@@ -1,18 +1,20 @@
 <?php
 
-# Returns the extension of the filename (path or URI) or an empty string
+/**
+ * Returns the extension of the filename (path or URI) or an empty string.
+ * @return string Extension of the filename starting with a dot.
+ */
 function getExtension($filename, $isURI = false) {
 
-    # If $filename is an URI, get only the path component
-    if ($isURI)
-        $filename = parse_url($filename, PHP_URL_PATH);
+	// If $filename is an URI, get only the path component
+	if ($isURI===true) $filename = parse_url($filename, PHP_URL_PATH);
 
 	$extension = pathinfo($filename, PATHINFO_EXTENSION);
 
-    if (!empty($extension))
-        $extension = '.' . $extension;
+	if (empty($extension)===false) $extension = '.' . $extension;
 
 	return $extension;
+
 }
 
 ?>
\ No newline at end of file

From ea3921b5d9b01efe0033322dedb49dfd8dfd2539 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 17 Mar 2016 09:35:12 +0100
Subject: [PATCH 149/183] Code adjustment #488

---
 php/Modules/Photo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 50f6dfc..f7e3684 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -846,7 +846,7 @@ final class Photo {
 
 		// Get extension
 		$extension = getExtension($photo->url, true);
-		if (empty($extension)) {
+		if (empty($extension)===true) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Invalid photo extension');
 			return false;
 		}

From 44c54c48f64b606dab9ec3595132dc725c09fce8 Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Thu, 17 Mar 2016 19:21:59 +0100
Subject: [PATCH 150/183] Modifications arround getExtension

---
 dist/main.js                 | Bin 192330 -> 192192 bytes
 dist/view.js                 | Bin 106865 -> 106897 bytes
 php/Modules/Album.php        |   2 +-
 php/Modules/Photo.php        |   2 +-
 php/helpers/getExtension.php |   5 ++++-
 src/scripts/upload.js        |   3 +++
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 3ed2e4bace876727502e9ee46829a2295fd635a0..3ffd9ee0c01e8917f4b84577a75f0204e9a07abe 100644
GIT binary patch
delta 2164
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
ScAfikbyZlHERo`h*!v&TImK%L

delta 2351
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

diff --git a/dist/view.js b/dist/view.js
index 6fde421acac75c855c1c20270994af475bcf6ab5..cf2668b10dd7802be953533fb2f9730b1fbfa20f 100644
GIT binary patch
delta 2627
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

delta 2699
zcma)8YitzP71mkXYYZWAWiY0G?s{2fyf?F$Bw!W>Gx&km+4b7Nm0H#h#=F<MW3Ok{
zJ9qtJody(ARf;OoQ8In05Bf->q6RWm=SM;diIk)wg`g&Bn?|YHgccP-OPbIMrBTnU
z4RzK0=$~`%Idkv1_k8Dk=gwm<xUWC&KG|CaUB<B!)rMTAK&N%CY+^M?#<t4lM$W6K
z**x=#qNo-MUPkAboTGA4=ly<brgG8^oyH%lC!ouUZg{-}B1UuV(<pycy94Fgx>wQD
z+jSd2vToFs0fdc@>NldSZa4-J>&b@aN+D`ozq87iZT=IQM|{-~w(`C}37WsN*^kQ0
zo8u)gY54-@OTlOTJ@^?YYxNS1nrG8cZ6#Wtbh~qu<#Vc0)z-SM-P0QKP$8kII?Lq~
zOv@DtMxm{-l6V!pKc_K`&1Y$B+-tqt_DK1i5x>8WV?1FZD-<He+@5bh)LJhsIu|we
zzKHTbM>7WaV8{3B!^5Iy3!#hSc{RZlO>I&*${(7Mb4^T)7-uThTZ5fi>8kK>p}?_t
z*gDs91U7jPHkH#zjwn0=#>ql9uctYUCwaf0Eh)N@>up^Z9>&j#IK$yWqWS$E4Sm?X
zKXhSk4n~h75+!}zfJ$#HR^BDbn39O`?N}I5{!7g3VBLQMzm^X08#_rC@sa(ck3@(>
zVq}{1kbV*+VXJ%K=qg<L%I7xuB4Un6Vnj%4iTo5*SyzTS1Br>A4lcqIP8B28`U4e!
z>l@>7l!v7a#+TzBK@#L_ma55)w310827;0l!^9I2QuLM=eeZmqJVgryPsI2`yb3S>
zVLas&$MC2R3*yMAuO=MuZr;5sDDU2-(+o|pCiJq|8wguJ8+AGGpFOCe+#<JOohb4S
zxI+@AWR^%%y-<*hACJ`p(4Z|umu&lsKAdbzg7&{Q<NDb1c<y7grjjR7C)ra}U{q(E
zWWANR)3rHLC{RJ0RcWqs84tv_+wYHZ-GuV(cejRE5%5oqZ*V&{#v2#MtBua_h1HS&
ze0_QRrP2r=iWo*}3WJ68Z&1FOzQ3YaXB3Y%1mzwKXiPCyFICETJZ$_+Kfh858+Cbo
zrJ=<*n?HpZ>N9H*8SC)uH5UexU1)5I2r|~<3|&qhRuHBkE$iJF1mYC2o?b}0jK6kO
z8otG6Tsv1=Z!A9Rs^&b16V_UW3UrPpIGuND)B65HKXHIRaAYSofhUf9&4o(q(FT<L
zM~5(wGZod=3r8<Id^qux7YTpisWVue*0B@k-LA+IA&nWU8@Ybk+FG(EO2y#FB%Kdp
z;obacVO1-K%*?4+7kXAsU~#O}ma?G<w?8jk>E}c4y6|$U6uzCM6&<sl*J+QYP3obj
zRsZ5>c@yVR3I)X@iaCcjMfx*YQFU&acGlN_`3y91P6|D(*vD>B82gyh4z%$m<^Yhn
zaJ<yG|Midy=RL1|^)957eTlc$y!#{Mon>F@bz$hP%fCZ--o8BMLP(@54)c;%k|=+1
zWm}y@Bq4jN%ZP_ow4sn>)LwlB({}mlR+P2xZ7<I2jqH0L<4n7@iCeK%P*erG!);G1
zJ`u@!?%HA4P&8$WFbH}gr)4sOT2_>d!N0wM{sPxCn76N7Kj#SxY?e|iY(1_Hi~pq+
z3h`kQHXeR|@5V45M#q&5!*xPl)ziv2Lu!Y@*6-i%gho!yXEF${FrBA)%-r(C!E*~D
zXYBdlG$Qcv2Tx#mKK@~gtDHlMc~stzPSsd%{bPsAsJ?m8slPwpd~l8Zk{eQG_1ui6
zB%8LN4|M1q)3gkg)mtx%-FpWRupeCuhh4_Ot>t%NR#{G&;;1kqXY$k@sf5}RNSg~)
za23*aY8~7F97n3*pYGZe6RD8V60*~$$rKZDx2nx@Jee`4>)~7(=k#S$Y5-D#*Eh8W
zXl@u|Vz60g@de2|&bWBHf0!Q?<0JmzmLQokPc}d!%$lz@z-}^#3r4v1(7vw0LQj{}
z$>XL`$2Jrk3I<6B6Avwt$)cPvLyd3`q)fFDx_l`nq!DN0R9(o6+r325BY4qFXqGKe
zAZ7l#5f)&=exM01!1@k+o#Y95ZZIdSdREJ^&;#70z0C_hfQll>qZokwPBX|Zn6tb5
z(CFfpPvHYzFE8Y1HiK;A#u!<tjxv(6ALZa7fDUtQ3w#j<O|u1dz>ImZ1$M){Ss8$J
z>*jHnuXR-P2Bugbz=yN|S6oo#_7;uyKmfh~Fk$|dz&kK$pS~M<-QF(5V$;?w!4&b~
zY$!f7i~#L-rn&YZ70rD%e=j_Xtg<iN2SKRsTMnLLFkF%3*yt0JG>KItnXTL5OR(QO
zvmIJ+xUwB6NajErRF%Y-XaY{mg*I5r$C%&momE)6BS(|?mML;Z#~+xc7$Z3<I4Fv^
z!Q+XUC);2<#O%v$P=l@1hMho4%cq%$eCRRnZHK{6Pb2-bEXNlLSUYqsE2~K@;2lLA
z%;W8lgdVee59l}?+5_Lkp-}=4%-E6y)d17xXZJ$S=kd@4{w*=uGZ>BBephZaA8zUA
zfr|SCWh%S$`W6fJ6E<;9>c+I>{LZC+ohFJM0y*tC7QMU1wcHfGrAxzYr2&mzvehA&
zkZ|7WJ}pUgAw$&^OD}TfH}}GX#C_r=+yBoyh4%4gMF%_r{pPU_XkXLM_~i@s+i!M&
qQ~{lKT@-3cA#C0^03w8KeE?qDWcJL$w_vq-Y8KYpAI-w!{J#MvD3SmG

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 253d224..01c71bb 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -278,7 +278,7 @@ final class Album {
 			if (!@is_readable($photo->url)) continue;
 
 			// Get extension of image
-			$extension = getExtension($photo->url, true);
+			$extension = getExtension($photo->url, false);
 
 			// Set title for photo
 			$zipFileName = $zipTitle . '/' . $photo->title . $extension;
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index f7e3684..38d82fd 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -845,7 +845,7 @@ final class Photo {
 		}
 
 		// Get extension
-		$extension = getExtension($photo->url, true);
+		$extension = getExtension($photo->url, false);
 		if (empty($extension)===true) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Invalid photo extension');
 			return false;
diff --git a/php/helpers/getExtension.php b/php/helpers/getExtension.php
index 180a853..4ac8b55 100644
--- a/php/helpers/getExtension.php
+++ b/php/helpers/getExtension.php
@@ -6,11 +6,14 @@
  */
 function getExtension($filename, $isURI = false) {
 
-	// If $filename is an URI, get only the path component
+	# If $filename is an URI, get only the path component
 	if ($isURI===true) $filename = parse_url($filename, PHP_URL_PATH);
 
 	$extension = pathinfo($filename, PATHINFO_EXTENSION);
 
+    # Special cases
+    if (strpos($extension, ':')!==false) list($extension, ) = explode(':', $extension, 2);
+
 	if (empty($extension)===false) $extension = '.' . $extension;
 
 	return $extension;
diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index d99d6c1..effdb4f 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -275,11 +275,14 @@ upload.start = {
 
 				basicModal.close()
 
+				/*
+				// Only check for file validity on PHP side
 				let extension = data.link.split('.').pop()
 				if (extension!=='jpeg' && extension!=='jpg' && extension!=='png' && extension!=='gif' && extension!=='webp') {
 					loadingBar.show('error', 'File format of link not supported.')
 					return false
 				}
+				*/
 
 				files[0] = {
 					name      : data.link,

From c50de5350fc448f4d62684b91811a5bdf0d5df98 Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Thu, 17 Mar 2016 19:26:50 +0100
Subject: [PATCH 151/183] Spaces to tabs

---
 php/helpers/getExtension.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/helpers/getExtension.php b/php/helpers/getExtension.php
index 4ac8b55..1ccbbc8 100644
--- a/php/helpers/getExtension.php
+++ b/php/helpers/getExtension.php
@@ -11,8 +11,8 @@ function getExtension($filename, $isURI = false) {
 
 	$extension = pathinfo($filename, PATHINFO_EXTENSION);
 
-    # Special cases
-    if (strpos($extension, ':')!==false) list($extension, ) = explode(':', $extension, 2);
+	# Special cases
+	if (strpos($extension, ':')!==false) list($extension, ) = explode(':', $extension, 2);
 
 	if (empty($extension)===false) $extension = '.' . $extension;
 

From f1d6baff6c03cf72e1313a251e80dcde79c24b11 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Fri, 18 Mar 2016 22:09:54 +0100
Subject: [PATCH 152/183] Rebuild and code adjustments #490

---
 dist/main.js                 | Bin 192192 -> 192160 bytes
 dist/view.js                 | Bin 106897 -> 106865 bytes
 php/helpers/getExtension.php |   7 ++++---
 src/scripts/upload.js        |   9 ---------
 4 files changed, 4 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 dist/main.js

diff --git a/dist/main.js b/dist/main.js
old mode 100644
new mode 100755
index 3ffd9ee0c01e8917f4b84577a75f0204e9a07abe..3963f80d8b565cbec15a3b94c0c4f4d9c8cbb95c
GIT binary patch
delta 2134
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
CDZ2jv

delta 2115
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

diff --git a/dist/view.js b/dist/view.js
index cf2668b10dd7802be953533fb2f9730b1fbfa20f..6fde421acac75c855c1c20270994af475bcf6ab5 100644
GIT binary patch
delta 2699
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

delta 2627
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

diff --git a/php/helpers/getExtension.php b/php/helpers/getExtension.php
index 1ccbbc8..2a48ad8 100644
--- a/php/helpers/getExtension.php
+++ b/php/helpers/getExtension.php
@@ -6,13 +6,14 @@
  */
 function getExtension($filename, $isURI = false) {
 
-	# If $filename is an URI, get only the path component
+	// If $filename is an URI, get only the path component
 	if ($isURI===true) $filename = parse_url($filename, PHP_URL_PATH);
 
 	$extension = pathinfo($filename, PATHINFO_EXTENSION);
 
-	# Special cases
-	if (strpos($extension, ':')!==false) list($extension, ) = explode(':', $extension, 2);
+	// Special cases
+	// https://github.com/electerious/Lychee/issues/482
+	list($extension) = explode(':', $extension, 2);
 
 	if (empty($extension)===false) $extension = '.' . $extension;
 
diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index effdb4f..55b2848 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -275,15 +275,6 @@ upload.start = {
 
 				basicModal.close()
 
-				/*
-				// Only check for file validity on PHP side
-				let extension = data.link.split('.').pop()
-				if (extension!=='jpeg' && extension!=='jpg' && extension!=='png' && extension!=='gif' && extension!=='webp') {
-					loadingBar.show('error', 'File format of link not supported.')
-					return false
-				}
-				*/
-
 				files[0] = {
 					name      : data.link,
 					supported : true

From fbab70f244665a1a216731ce4aea4d9f8b233cd8 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Fri, 18 Mar 2016 22:17:41 +0100
Subject: [PATCH 153/183] Allow URL import of photos containing a question mark

---
 php/helpers/getExtension.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/php/helpers/getExtension.php b/php/helpers/getExtension.php
index 2a48ad8..0716aa6 100644
--- a/php/helpers/getExtension.php
+++ b/php/helpers/getExtension.php
@@ -14,6 +14,7 @@ function getExtension($filename, $isURI = false) {
 	// Special cases
 	// https://github.com/electerious/Lychee/issues/482
 	list($extension) = explode(':', $extension, 2);
+	list($extension) = explode('?', $extension, 2);
 
 	if (empty($extension)===false) $extension = '.' . $extension;
 

From 399619c6e8b0d6c4db0ac67be600386865440a5b Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Sat, 19 Mar 2016 10:21:29 +0100
Subject: [PATCH 154/183] Corrections of Import::url

---
 php/Modules/Import.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/php/Modules/Import.php b/php/Modules/Import.php
index 76adf19..c0d1a32 100644
--- a/php/Modules/Import.php
+++ b/php/Modules/Import.php
@@ -65,13 +65,12 @@ final class Import {
 				continue;
 			}
 
-			$pathinfo = pathinfo($url);
-			$filename = $pathinfo['filename'] . '.' . $pathinfo['extension'];
+			$filename = pathinfo($url, PATHINFO_FILENAME) . $extension;
 			$tmp_name = LYCHEE_DATA . $filename;
 
 			if (@copy($url, $tmp_name)===false) {
 				$error = true;
-				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not copy file (' . $tmp_name . ') to temp-folder (' . $tmp_name . ')');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not copy file (' . $url . ') to temp-folder (' . $tmp_name . ')');
 				continue;
 			}
 

From e1056d1fc6a7b9e412f9adb1f28bc23cb815dc67 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 19 Mar 2016 15:46:07 +0100
Subject: [PATCH 155/183] Removed unnecessary special case for question mark in
 extension #482

---
 php/helpers/getExtension.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/php/helpers/getExtension.php b/php/helpers/getExtension.php
index 0716aa6..2a48ad8 100644
--- a/php/helpers/getExtension.php
+++ b/php/helpers/getExtension.php
@@ -14,7 +14,6 @@ function getExtension($filename, $isURI = false) {
 	// Special cases
 	// https://github.com/electerious/Lychee/issues/482
 	list($extension) = explode(':', $extension, 2);
-	list($extension) = explode('?', $extension, 2);
 
 	if (empty($extension)===false) $extension = '.' . $extension;
 

From 082d306927949782576ebd99af147554370e596d Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Sat, 19 Mar 2016 16:16:41 +0100
Subject: [PATCH 156/183] Small adjustments to #491

---
 php/Modules/Session.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/php/Modules/Session.php b/php/Modules/Session.php
index 91ffbae..8d8714b 100755
--- a/php/Modules/Session.php
+++ b/php/Modules/Session.php
@@ -71,14 +71,14 @@ final class Session {
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
 		$username_crypt = crypt($username, Settings::get()['username']);
-		$password = crypt($password, Settings::get()['password']);
+		$password_crypt = crypt($password, Settings::get()['password']);
 
 		// Check login with crypted hash
 		if (Settings::get()['username']===$username_crypt&&
-			Settings::get()['password']===$password) {
+			Settings::get()['password']===$password_crypt) {
 				$_SESSION['login']      = true;
 				$_SESSION['identifier'] = Settings::get()['identifier'];
-				Log::notice(Database::get(), __METHOD__, __LINE__, 'User ['.$username.'] has logged in from ['.$_SERVER['REMOTE_ADDR'].']');
+				Log::notice(Database::get(), __METHOD__, __LINE__, 'User (' . $username . ') has logged in from ' . $_SERVER['REMOTE_ADDR']);
 				return true;
 		}
 
@@ -88,7 +88,9 @@ final class Session {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		Log::error(Database::get(), __METHOD__, __LINE__, 'User ['.$username.'] has tried to log in from ['.$_SERVER['REMOTE_ADDR'].']');
+		// Log failed log in
+		Log::error(Database::get(), __METHOD__, __LINE__, 'User (' . $username . ') has tried to log in from ' . $_SERVER['REMOTE_ADDR']);
+
 		return false;
 
 	}

From 4d62fc87340ba77e0c3b1119af6924b9f3f5926c Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Mon, 21 Mar 2016 12:51:51 +0100
Subject: [PATCH 157/183] Fix upload duplicates

---
 dist/main.js          | Bin 192160 -> 191885 bytes
 dist/view.js          | Bin 106865 -> 106923 bytes
 src/scripts/build.js  |   7 +----
 src/scripts/upload.js |  63 +++++++++---------------------------------
 4 files changed, 14 insertions(+), 56 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 3963f80d8b565cbec15a3b94c0c4f4d9c8cbb95c..5c0d644b864eb1307a5b96279ee6b20adaaa7f5c 100755
GIT binary patch
delta 2264
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

delta 2657
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

diff --git a/dist/view.js b/dist/view.js
index 6fde421acac75c855c1c20270994af475bcf6ab5..3a48b6fb7ce30604af555d60a09f96cf935db0ca 100644
GIT binary patch
delta 2690
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

delta 2808
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
We%NHavw&iB4o<;(2j=02+`j>iIkb=f

diff --git a/src/scripts/build.js b/src/scripts/build.js
index 620d36f..513f39b 100644
--- a/src/scripts/build.js
+++ b/src/scripts/build.js
@@ -187,12 +187,7 @@ build.uploadModal = function(title, files) {
 		html += lychee.html`
 		        <div class='row'>
 		            <a class='name'>$${ file.name }</a>
-		        `
-
-		if (file.supported===true) html += `<a class='status'></a>`
-		else                       html += `<a class='status error'>Not supported</a>`
-
-		html += `
+		            <a class='status'></a>
 		            <p class='notice'></p>
 		        </div>
 		        `
diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index 55b2848..374c352 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -46,10 +46,11 @@ upload.start = {
 
 		const process = function(files, file) {
 
-			let formData     = new FormData()
-			let xhr          = new XMLHttpRequest()
-			let pre_progress = 0
-			let progress     = 0
+			let formData          = new FormData()
+			let xhr               = new XMLHttpRequest()
+			let pre_progress      = 0
+			let progress          = 0
+			let next_file_started = false
 
 			const finish = function() {
 
@@ -84,34 +85,6 @@ upload.start = {
 
 			}
 
-			// Check if file is supported
-			if (file.supported===false) {
-
-				// Skip file
-				if (file.next!=null) process(files, file.next)
-				else {
-
-					// Look for supported files
-					// If zero files are supported, hide the upload after a delay
-
-					let hasSupportedFiles = false
-
-					for (let i = 0; i < files.length; i++) {
-
-						if (files[i].supported===true) {
-							hasSupportedFiles = true
-							break
-						}
-
-					}
-
-					if (hasSupportedFiles===false) setTimeout(finish, 2000)
-
-				}
-
-				return false
-
-			}
 
 			formData.append('function', 'Photo::add')
 			formData.append('albumID', albumID)
@@ -205,7 +178,7 @@ upload.start = {
 					pre_progress = progress
 				}
 
-				if (progress>=100) {
+				if (progress>=100 && next_file_started==false) {
 
 					// Scroll to the uploading file
 					let scrollPos = 0
@@ -216,7 +189,10 @@ upload.start = {
 					$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status').html('Processing')
 
 					// Upload next file
-					if (file.next!=null) process(files, file.next)
+					if (file.next!=null) {
+						process(files, file.next)
+						next_file_started = true
+					}
 
 				}
 
@@ -233,19 +209,9 @@ upload.start = {
 
 			files[i].num       = i
 			files[i].ready     = false
-			files[i].supported = true
 
 			if (i < files.length-1) files[i].next = files[i + 1]
 			else                    files[i].next = null
-
-			// Check if file is supported
-			if (files[i].type!=='image/jpeg' && files[i].type!=='image/jpg' && files[i].type!=='image/png' && files[i].type!=='image/gif') {
-
-				files[i].ready     = true
-				files[i].supported = false
-
-			}
-
 		}
 
 		window.onbeforeunload = function() { return 'Lychee is currently uploading!' }
@@ -276,8 +242,7 @@ upload.start = {
 				basicModal.close()
 
 				files[0] = {
-					name      : data.link,
-					supported : true
+					name      : data.link
 				}
 
 				upload.show('Importing URL', files, function() {
@@ -356,8 +321,7 @@ upload.start = {
 			let files = []
 
 			files[0] = {
-				name      : data.path,
-				supported : true
+				name      : data.path
 			}
 
 			upload.show('Importing from server', files, function() {
@@ -466,8 +430,7 @@ upload.start = {
 				links += files[i].link + ','
 
 				files[i] = {
-					name      : files[i].link,
-					supported : true
+					name      : files[i].link
 				}
 
 			}

From a0510cf280c16c84f3521745206db3bc1201eb45 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Mon, 21 Mar 2016 14:53:58 +0100
Subject: [PATCH 158/183] Added ISSUE_TEMPLATE and moved files to .github
 folder

---
 CONTRIBUTING.md => .github/CONTRIBUTING.md | 0
 .github/ISSUE_TEMPLATE.md                  | 7 +++++++
 2 files changed, 7 insertions(+)
 rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..5a2c813
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,7 @@
+### Detailed description of the problem
+
+### Steps to reproduce the issue
+
+### Output of the diagnostics (Settings => Diagnostics)
+
+### Browser and system
\ No newline at end of file

From 4fa9a96c89ae5ad9cbe826f7f7db938cf611f505 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Mon, 21 Mar 2016 15:03:17 +0100
Subject: [PATCH 159/183] Code style adjustments #496

---
 src/scripts/upload.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index 374c352..8b6e49f 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -85,7 +85,6 @@ upload.start = {
 
 			}
 
-
 			formData.append('function', 'Photo::add')
 			formData.append('albumID', albumID)
 			formData.append(0, file)
@@ -178,7 +177,7 @@ upload.start = {
 					pre_progress = progress
 				}
 
-				if (progress>=100 && next_file_started==false) {
+				if (progress>=100 && next_file_started===false) {
 
 					// Scroll to the uploading file
 					let scrollPos = 0
@@ -212,6 +211,7 @@ upload.start = {
 
 			if (i < files.length-1) files[i].next = files[i + 1]
 			else                    files[i].next = null
+
 		}
 
 		window.onbeforeunload = function() { return 'Lychee is currently uploading!' }

From 6998ae05f7c12035990dfc2496dab4a111abb278 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Mon, 21 Mar 2016 15:03:20 +0100
Subject: [PATCH 160/183] Rebuild

---
 dist/main.js | Bin 191885 -> 191856 bytes
 dist/view.js | Bin 106923 -> 106891 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 5c0d644b864eb1307a5b96279ee6b20adaaa7f5c..42a11ad4f3d1263e872089731db30600dd122b7b 100755
GIT binary patch
delta 2120
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

delta 2103
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
axg#kLKAKhMp;x&-hd^?k`2l3Su>U{Ov#o>x

diff --git a/dist/view.js b/dist/view.js
index 3a48b6fb7ce30604af555d60a09f96cf935db0ca..9b84a537068a2ab7f84a705cf21659003b41e7b8 100644
GIT binary patch
delta 2710
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
C#g<qA

delta 2639
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


From 0037af59fdc7576d35f6de25bdf3ace5eab87987 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Wed, 23 Mar 2016 16:52:59 +0100
Subject: [PATCH 161/183] Markdown license

---
 LICENSE => LICENSE.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE => LICENSE.md (100%)

diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md

From 6e46f725266fcb6e5b90ba1830e8c2114bcd58a1 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 17:30:11 +0100
Subject: [PATCH 162/183] Removed several shadows and fixed missing icons in
 Safari 9.1

---
 dist/main.css                        | Bin 31312 -> 30698 bytes
 src/styles/_basicContext.custom.scss |   1 -
 src/styles/_content.scss             |   4 ----
 src/styles/_imageview.scss           |   1 -
 src/styles/_message.scss             |   5 -----
 src/styles/main.scss                 |   3 +--
 6 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/dist/main.css b/dist/main.css
index ae100499cdb938d4d8042f3d85a5d3d3b89e5224..4b77b87555f0fd28a1f1ebac04d70cbb3773c835 100755
GIT binary patch
delta 55
zcmV-70LcH)^a1Mc0k9!3li)2ev$`;S0<)bn$^w&%Hu1CKH)a8ou>v5oj5#0~lb%@#
Nvl&xY53}}SS{Ksp7ytkO

delta 579
zcmaF$p7FvL#tn)F8P>YxsY%(HCAw*uIVGt@Rw+gK1-iu<i7ENz8U_l61r-X$KwOlb
zl&E2#qX0pACYqYoB&y%6Xt0hc4Zm%=AnOd!Ei=Sr8BXP!&l{a$l7)D}%0K~Coq>*l
zj-JWnNv1!@at%(equPQLQk%QX(il~&OHwOJpaF~BO@^A2H!>+~7O+r|OvWEhSc3_t
z!*HnHtRI-jKUpDDQb0#9DX};+**8BWF-IZ8P-ilKx)?u-V1dr$gUKQ+ATLaIGnU`n
IpAan$0MjwCJpcdz

diff --git a/src/styles/_basicContext.custom.scss b/src/styles/_basicContext.custom.scss
index 9ef3ed2..7684577 100644
--- a/src/styles/_basicContext.custom.scss
+++ b/src/styles/_basicContext.custom.scss
@@ -12,7 +12,6 @@
 	&__item {
 		margin-bottom: 2px;
 		font-size: 14px;
-		text-shadow: $shadowLight;
 
 		&--separator {
 			margin: 4px 0;
diff --git a/src/styles/_content.scss b/src/styles/_content.scss
index 08f3175..07ecaca 100644
--- a/src/styles/_content.scss
+++ b/src/styles/_content.scss
@@ -146,7 +146,6 @@
 		margin: 0 5px 0 0;
 		width: 8px;
 		height: 8px;
-		filter: drop-shadow(0 1px 3px black(.4));
 	}
 
 	.album img[data-overlay='false'] + .overlay h1,
@@ -185,7 +184,6 @@
 			fill: #fff;
 			width: 16px;
 			height: 16px;
-			filter: drop-shadow($shadowLight);
 		}
 	}
 
@@ -225,7 +223,6 @@
 	left: 50%;
 	padding-top: 20px;
 	color: white(.35);
-	text-shadow: 0 -1px 0 black(.4);
 	text-align: center;
 	transform: translateX(-50%) translateY(-50%);
 
@@ -234,7 +231,6 @@
 		margin: 0 0 10px;
 		width: 50px;
 		height: 50px;
-		filter: drop-shadow(0 -1px 0 black(.4));
 	}
 
 	p {
diff --git a/src/styles/_imageview.scss b/src/styles/_imageview.scss
index d50dc57..24d59fe 100644
--- a/src/styles/_imageview.scss
+++ b/src/styles/_imageview.scss
@@ -105,7 +105,6 @@
 
 		.iconic {
 			fill: white(.8);
-			filter: drop-shadow(0 1px 0 black(.4));
 		}
 	}
 
diff --git a/src/styles/_message.scss b/src/styles/_message.scss
index a38e8b1..f90928c 100644
--- a/src/styles/_message.scss
+++ b/src/styles/_message.scss
@@ -26,7 +26,6 @@
 		color: white(.9);
 		font-size: 14px;
 		text-align: left;
-		text-shadow: $shadow;
 		line-height: 20px;
 
 		b {
@@ -56,7 +55,6 @@
 		padding: 13px 0 15px;
 		background: black(.02);
 		color: white(.5);
-		text-shadow: $shadow;
 		border-top: 1px solid black(.2);
 		box-shadow: inset 0 1px 0 white(.02);
 		cursor: default;
@@ -85,7 +83,6 @@
 		width: 100%;
 		background-color: transparent;
 		color: #fff;
-		text-shadow: $shadow;
 		border: none;
 		// Do not use rgba() for border-bottom
 		// to avoid a blurry line in Safari on non-retina screens
@@ -116,7 +113,6 @@
 			color: white(1);
 			font-size: 14px;
 			font-weight: 700;
-			text-shadow: $shadow;
 		}
 
 		label input {
@@ -258,7 +254,6 @@
 		color: #fff;
 		font-size: 16px;
 		font-weight: bold;
-		text-shadow: $shadow;
 		text-align: center;
 	}
 
diff --git a/src/styles/main.scss b/src/styles/main.scss
index e4b9751..f4f6c66 100755
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -12,8 +12,7 @@
 }
 
 // Properties -------------------------------------------------------------- //
-$shadowLight : 0 -1px 0 black(.1);
-$shadow      : 0 -1px 0 black(.2);
+$shadow: 0 -1px 0 black(.2);
 
 // Colors ------------------------------------------------------------------ //
 $colorBlue : #2293EC;

From 2b7dcb6795eab96c5aba203661a14a342abadd98 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 17:43:14 +0100
Subject: [PATCH 163/183] Finalized database update for version 3.1

---
 php/database/update_030100.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/database/update_030100.php b/php/database/update_030100.php
index 428ba92..3e78358 100644
--- a/php/database/update_030100.php
+++ b/php/database/update_030100.php
@@ -14,6 +14,6 @@ $result = Database::execute($connection, $query, 'update_030100', __LINE__);
 if ($result===false) Response::error('Could not adjust the length of the album id field!');
 
 // Set version
-// if (Database::setVersion($connection, '030100')===false) Response::error('Could not update version of database!');
+if (Database::setVersion($connection, '030100')===false) Response::error('Could not update version of database!');
 
 ?>
\ No newline at end of file

From 30bb0417d51d86f01b5e1aca46c467eb578a6072 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 17:58:31 +0100
Subject: [PATCH 164/183] Updated changelog

---
 docs/Changelog.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 13803b9..7567d8b 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -14,7 +14,8 @@ This updates includes a huge rewrite of the back-end. We are now using namespace
 
 - `New` Empty titles for albums
 - `New` Share albums as hidden so they are only viewable with a direct link (#27)
-- `Improved` Error messages and log output
+- `New` Log failed and successful login attempts (Thanks @qligier, #382 #246)
+- `Improved` error messages and log output
 - `Improved` The search shows albums above photos (#434)
 - `Improved` Album id now based on the current microtime (#27)
 - `Improved` Back-end modules and plugins
@@ -22,6 +23,10 @@ This updates includes a huge rewrite of the back-end. We are now using namespace
 - `Improved` Default photo title now "Untitled"
 - `Improved` Move to next photo after after moving a picture (#437)
 - `Improved` Return to album overview when canceling album password input
+- `Improved` URL import now accepts photo URLs containing "?" and ":" (Thanks @qligier, #482)
+- `Improved` Replaced date by strftime to simplify date translations (Thanks @qligier, #461)
+- `Fixed` Missing icons in Safari 9.1
+- `Fixed` duplicate uploads (Thanks @qligier, #433)
 - `Fixed` incorrect escaping when using backslashes
 - `Fixed` session_start() after sending headers (#433)
 - `Fixed` error when deleting last open photo in album

From 9c1bab29f162247e1fca55cb14e035ef739b26cb Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 18:16:33 +0100
Subject: [PATCH 165/183] Updated comment

---
 src/scripts/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/api.js b/src/scripts/api.js
index d45a007..83e800d 100644
--- a/src/scripts/api.js
+++ b/src/scripts/api.js
@@ -26,7 +26,7 @@ api.post = function(fn, params, callback) {
 			return false
 		}
 
-		// Convert 1 to true and an empty string to false
+		// Convert true and false to real booleans
 		if (data==='true')       data = true
 		else if (data==='false') data = false
 

From c6d8b5f3122614222f9f79ad6651cc2780d4debd Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 18:23:19 +0100
Subject: [PATCH 166/183] Fixed long albums/photos ids for 32bit PHP versions
 #487

---
 php/Access/Admin.php       | 2 +-
 php/Modules/Response.php   | 4 ++--
 php/helpers/generateID.php | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index 927198b..790f398 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -93,7 +93,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['title']), __METHOD__);
 
 		$album = new Album(null);
-		Response::json($album->add($_POST['title']));
+		Response::json($album->add($_POST['title']), JSON_NUMERIC_CHECK);
 
 	}
 
diff --git a/php/Modules/Response.php b/php/Modules/Response.php
index 01c4c10..289c42e 100644
--- a/php/Modules/Response.php
+++ b/php/Modules/Response.php
@@ -16,9 +16,9 @@ final class Response {
 
 	}
 
-	public static function json($str) {
+	public static function json($str, $options = 0) {
 
-		exit(json_encode($str));
+		exit(json_encode($str, $options));
 
 	}
 
diff --git a/php/helpers/generateID.php b/php/helpers/generateID.php
index 80f42c1..84c463d 100644
--- a/php/helpers/generateID.php
+++ b/php/helpers/generateID.php
@@ -8,8 +8,9 @@ function generateID() {
 	// Ensure that the id has a length of 14 chars
 	while(strlen($id)<14) $id .= 0;
 
-	// Return the integer value of the id
-	return intval($id);
+	// Return id as a string. Don't convert the id to an integer
+	// as 14 digits are too big for 32bit PHP versions.
+	return $id;
 
 }
 

From 50086cfe695f1cb2566ce8da8ac6430c24f87ce4 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 18:23:33 +0100
Subject: [PATCH 167/183] Removed outdated first album check

---
 src/scripts/album.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/scripts/album.js b/src/scripts/album.js
index 109405f..961e8b1 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -116,9 +116,6 @@ album.add = function() {
 
 		api.post('Album::add', params, function(data) {
 
-			// Avoid first album to be true
-			if (data===true) data = 1
-
 			if (data!==false && isNumber(data)) {
 				albums.refresh()
 				lychee.goto(data)

From 7bb2a618293da1b697120d0c39875e2d768d79ad Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 18:23:39 +0100
Subject: [PATCH 168/183] Rebuild

---
 dist/main.js | Bin 191856 -> 191842 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 dist/main.js

diff --git a/dist/main.js b/dist/main.js
old mode 100755
new mode 100644
index 42a11ad4f3d1263e872089731db30600dd122b7b..666f199418382b4236323c5cee573934aa8d4a41
GIT binary patch
delta 26
icmexxi~G?n?uIRlKF6j9<T0_d#~owb9(RmMNF4yG{tE#B

delta 35
rcmaEKi~GYZ?uIRlKF4@%ZEY0|)YLRmZ4EVb+P#l4ZudUMB(4qs`Wp;3


From d212363ebf50b531d144d1429340ba1f19eb6071 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 18:40:58 +0100
Subject: [PATCH 169/183] Return photo ID when upload successful #487

---
 dist/main.js          | Bin 191842 -> 191892 bytes
 php/Access/Admin.php  |   2 +-
 php/Modules/Photo.php |   4 ++--
 src/scripts/upload.js |   4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 dist/main.js

diff --git a/dist/main.js b/dist/main.js
old mode 100644
new mode 100755
index 666f199418382b4236323c5cee573934aa8d4a41..0150b053b4b9e25b80f7cd1b52395538ee589fdb
GIT binary patch
delta 84
zcmV-a0IUDv+6$E13xI?Hv;wZYm*92*6_?<}0VJ2NyaF2$awu#ra%FRHZ*FsCRAqQ{
qDYxOg0+0h4b3HISb3A1(Y-Mg|bZ9$sD=R5!W+-J_bGM4X0@y6!*CDF_

delta 114
zcmbPooBPo%?uHh|Ellh7m{@1(6{RMoRN5*U=olFo*xK6W=oObFmXsE&sVS8dm8L3z
zg^E&(3-a@dQ$tcKO6;d^*vI5Necfp$(d{{Vnar6bi);<7i)>Q$a#HisOERpBw6!%e
Q(=<|}i?;7Mz;r_g0B4UW$N&HU

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index 790f398..c083836 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -231,7 +231,7 @@ final class Admin extends Access {
 		Validator::required(isset($_FILES, $_POST['albumID']), __METHOD__);
 
 		$photo = new Photo(null);
-		Response::json($photo->add($_FILES, $_POST['albumID']));
+		Response::json($photo->add($_FILES, $_POST['albumID']), JSON_NUMERIC_CHECK);
 
 	}
 
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
index 38d82fd..587cb8e 100755
--- a/php/Modules/Photo.php
+++ b/php/Modules/Photo.php
@@ -39,7 +39,7 @@ final class Photo {
 	 * Creats new photo(s).
 	 * Exits on error.
 	 * Use $returnOnError if you want to handle errors by your own.
-	 * @return boolean Returns true when successful.
+	 * @return string|false ID of the added photo.
 	 */
 	public function add(array $files, $albumID = 0, $returnOnError = false) {
 
@@ -251,7 +251,7 @@ final class Photo {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
-		return true;
+		return $id;
 
 	}
 
diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index 8b6e49f..8fffcca 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -96,10 +96,12 @@ upload.start = {
 				let wait      = false
 				let errorText = ''
 
+				const isNumber = (n) => (!isNaN(parseFloat(n)) && isFinite(n))
+
 				file.ready = true
 
 				// Set status
-				if (xhr.status===200 && xhr.responseText==='true') {
+				if (xhr.status===200 && isNumber(xhr.responseText)) {
 
 					// Success
 					$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status')

From 152a887bc42d6b7254baaffb231e74a5a9524e74 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 18:41:33 +0100
Subject: [PATCH 170/183] Updated comments due to id type changes #487

---
 php/Modules/Album.php      | 2 +-
 php/helpers/generateID.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/php/Modules/Album.php b/php/Modules/Album.php
index 01c71bb..1c03ba5 100644
--- a/php/Modules/Album.php
+++ b/php/Modules/Album.php
@@ -21,7 +21,7 @@ final class Album {
 	}
 
 	/**
-	 * @return integer|false ID of the created album.
+	 * @return string|false ID of the created album.
 	 */
 	public function add($title = 'Untitled') {
 
diff --git a/php/helpers/generateID.php b/php/helpers/generateID.php
index 84c463d..82a23c3 100644
--- a/php/helpers/generateID.php
+++ b/php/helpers/generateID.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return string Generated ID.
+ */
 function generateID() {
 
 	// Generate id based on the current microtime

From bd0f23ed5c9244f29384b4c1801e4e50d2cda45b Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 20:10:18 +0100
Subject: [PATCH 171/183] Fixed create config function not stoping execution

---
 php/Access/Installation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Access/Installation.php b/php/Access/Installation.php
index ce3863c..4911904 100644
--- a/php/Access/Installation.php
+++ b/php/Access/Installation.php
@@ -26,7 +26,7 @@ final class Installation extends Access {
 
 		Validator::required(isset($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']), __METHOD__);
 
-		echo Config::create($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']);
+		Response::json(Config::create($_POST['dbHost'], $_POST['dbUser'], $_POST['dbPassword'], $_POST['dbName'], $_POST['dbTablePrefix']));
 
 	}
 

From f3d4ca06c8502433a7c697038982f2a177d95258 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 21:29:09 +0100
Subject: [PATCH 172/183] Return import in correct format

---
 php/Access/Admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Access/Admin.php b/php/Access/Admin.php
index c083836..c706653 100644
--- a/php/Access/Admin.php
+++ b/php/Access/Admin.php
@@ -249,7 +249,7 @@ final class Admin extends Access {
 		Validator::required(isset($_POST['albumID'], $_POST['path']), __METHOD__);
 
 		$import = new Import();
-		echo $import->server($_POST['path'], $_POST['albumID']);
+		Response::json($import->server($_POST['path'], $_POST['albumID']));
 
 	}
 

From 4551c342b9d810c1dae03697f3b8a118f40b940a Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 21:36:14 +0100
Subject: [PATCH 173/183] Code style adjustments

---
 src/scripts/upload.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index 8fffcca..9fc4ca6 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -208,8 +208,8 @@ upload.start = {
 
 		for (let i = 0; i < files.length; i++) {
 
-			files[i].num       = i
-			files[i].ready     = false
+			files[i].num   = i
+			files[i].ready = false
 
 			if (i < files.length-1) files[i].next = files[i + 1]
 			else                    files[i].next = null
@@ -244,7 +244,7 @@ upload.start = {
 				basicModal.close()
 
 				files[0] = {
-					name      : data.link
+					name: data.link
 				}
 
 				upload.show('Importing URL', files, function() {
@@ -323,7 +323,7 @@ upload.start = {
 			let files = []
 
 			files[0] = {
-				name      : data.path
+				name: data.path
 			}
 
 			upload.show('Importing from server', files, function() {

From 7a54476ff1ff8fc7185a7b64a49256b59ae6473d Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 21:41:34 +0100
Subject: [PATCH 174/183] Always respond with JSON

---
 php/Modules/Response.php |  4 ++--
 src/scripts/api.js       | 11 +----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/php/Modules/Response.php b/php/Modules/Response.php
index 289c42e..6ae5f30 100644
--- a/php/Modules/Response.php
+++ b/php/Modules/Response.php
@@ -6,13 +6,13 @@ final class Response {
 
 	public static function warning($msg) {
 
-		exit('Warning: ' . $msg);
+		exit(json_encode('Warning: ' . $msg));
 
 	}
 
 	public static function error($msg) {
 
-		exit('Error: ' . $msg);
+		exit(json_encode('Error: ' . $msg));
 
 	}
 
diff --git a/src/scripts/api.js b/src/scripts/api.js
index 83e800d..0cbfc15 100644
--- a/src/scripts/api.js
+++ b/src/scripts/api.js
@@ -26,15 +26,6 @@ api.post = function(fn, params, callback) {
 			return false
 		}
 
-		// Convert true and false to real booleans
-		if (data==='true')       data = true
-		else if (data==='false') data = false
-
-		// Convert to JSON if string start with '{' and ends with '}'
-		if (typeof data==='string' && data.substring(0, 1)==='{' && data.substring(data.length - 1, data.length)==='}') {
-			data = $.parseJSON(data)
-		}
-
 		callback(data)
 
 	}
@@ -49,7 +40,7 @@ api.post = function(fn, params, callback) {
 		type: 'POST',
 		url: api.path,
 		data: params,
-		dataType: 'text',
+		dataType: 'json',
 		success,
 		error
 	})

From 6a28693addea4cd734eb053970531a9a0ed27472 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 21:42:09 +0100
Subject: [PATCH 175/183] Strict response check

---
 src/scripts/settings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/scripts/settings.js b/src/scripts/settings.js
index 8fd92d6..a28f84a 100644
--- a/src/scripts/settings.js
+++ b/src/scripts/settings.js
@@ -36,7 +36,7 @@ settings.createConfig = function() {
 			if (data!==true) {
 
 				// Connection failed
-				if (data.indexOf('Warning: Connection failed!')!==-1) {
+				if (data==='Warning: Connection failed!') {
 
 					basicModal.show({
 						body: '<p>Unable to connect to host database because access was denied. Double-check your host, username and password and ensure that access from your current location is permitted.</p>',
@@ -53,7 +53,7 @@ settings.createConfig = function() {
 				}
 
 				// Creation failed
-				if (data.indexOf('Warning: Creation failed!')!==-1) {
+				if (data==='Warning: Creation failed!') {
 
 					basicModal.show({
 						body: '<p>Unable to create the database. Double-check your host, username and password and ensure that the specified user has the rights to modify and add content to the database.</p>',
@@ -70,7 +70,7 @@ settings.createConfig = function() {
 				}
 
 				// Could not create file
-				if (data.indexOf('Warning: Could not create file!')!==-1) {
+				if (data==='Warning: Could not create file!') {
 
 					basicModal.show({
 						body: "<p>Unable to save this configuration. Permission denied in <b>'data/'</b>. Please set the read, write and execute rights for others in <b>'data/'</b> and <b>'uploads/'</b>. Take a look at the readme for more information.</p>",

From bff454ffc95be3943d4f1ff593d2c46cf2f59a3f Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 21:51:34 +0100
Subject: [PATCH 176/183] Removed unnecessary empty string

---
 php/Modules/Database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 0948249..3f0d54d 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -56,7 +56,7 @@ final class Database {
 		$connection = self::connect($host, $user, $password);
 
 		// Check if the connection was successful
-		if ($connection===false) Response::error('' . $connection->connect_error);
+		if ($connection===false) Response::error($connection->connect_error);
 
 		if (self::setCharset($connection)===false) Response::error('Could not set database charset!');
 

From c7e862124bcd23d917514afcf68b9567841fb4ed Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 21:51:41 +0100
Subject: [PATCH 177/183] Rebuild

---
 dist/main.js | Bin 191892 -> 191715 bytes
 dist/view.js | Bin 106891 -> 106749 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 0150b053b4b9e25b80f7cd1b52395538ee589fdb..1094857246ec2a2e24392639ec6c33a4499adf1b 100755
GIT binary patch
delta 145
zcmbPooBQ!i?uIRlF0VPt@-tHu@-$MX-+awj#gbK=pSL~y4Wk>!^m$(xyBWE*Ykp;%
zS2Ml#E~C`+M}<s<K#|}grfkvaXWN-%S!``>Q>VvwF{w=#>|lB>uN0nGl$V*8Zl&N{
ml$uzQnV+YSmYA87nxd$LQ0dvp^mMvy7n34b_jaIe(_{cx(KW&V

delta 327
zcmaESlY7c-?uIRlF0WNJluC+9Q<ZFOZBy-2Z50iyl+qG&iXj4OY8pTxLrtCOikyrh
zF-p~7WqQS>NyQ~anR)3N20DhCYHCWg=;En*IjMQ+B^kPgIxr?s9ndfpy@JG|;#99-
ze?N^>O--G${LB=EJRozr&uhjimXg$plI^EnGrDmwa!nWb!q~li&KJgcH9*dSQYNYC
zA%#qZ+m978WsCCb8Y%)^te2UWl3L-PrZL^Hok^Bi(_UkGVjPp$v~DJr>3Qu;A2F20
lcQ8p~DC3^Kw1ephhT6_fCPfUjT+`Q2U}D{Vvy+J{82~+hXv+Wq

diff --git a/dist/view.js b/dist/view.js
index 9b84a537068a2ab7f84a705cf21659003b41e7b8..e4b79d2aa5c159970200520516e86f0b9002ada5 100644
GIT binary patch
delta 1254
zcmXw3YiJx*6z1mDY#vQgn}?)%ZNg+GnM}4R8q9F>XiaOkHO-n33fqlrX74=A+?i!&
zvWX_eUxH#q=tZ|6HEIhD<VS=N*0zansy~dNf`X=KYiXm_A3?N;6g`u+Fx+$QJ?DPs
zalbP!e_C|+<Dz#n`H1?n`D=wu6h}l26Uii&=IOH5Pi5NKDHtkmV-lzSSZD@?z)7~T
z9;fW<lG})~4@!HG#<of)k>-z<O%|XiTdC}6q}Yo`5&&lt$#4(OSc+%Z7Ec8k;57DM
zW!)aiaV-v!6rCv32Ta={9JilH9&tUMvVBz@B^t-^0SczRR&}TV#r&1(!h+%$;XOfg
zF{`*$<A3w;Mgio%(zubw(}jhMZKRqb7-JfD5`tn|o?*=pS;sArlPVlx2uhjX;$b=v
z){Rt(SYg9zhErb0RJwN}^ie!bq@<z{*X4;AR_9#Zo(+rhCk4?4SISc1H)?_qeG$<S
zQ-bI;2Pg{*JoT$vzb!9~;R(q#4TXqN|IbJap%@$PISLh=?r94)$@Ln4ec$UL=vE3l
zaPU1I1Z!RY^9Xu+W}vqcQhKZf>fpG&djrXS8h8Rs{9r4Tdvs6(KmWa<UIcBwy?>?%
zOjC!4;U$(1-vRxtXea1jM*CqcJ@P9!{dMG49$dLPQWQkEaV!FB^=MNwjq3^M+xE%_
z0>>mJX_~w#2yzB%Y<zSAT$e{b3B~XsDQ%~rq)bdKET;r_PwFR9ZQX{b`70Ak2u1zl
z$5-<pT6O$dK8QP$2Ld5a?Seenh|-R<a~Y)q@May**`kBnG+{nqm@u!}4lh&ro}yw;
zR<RnV2^k2;w!C^)?>50j*^Tg;q#BOv9ncLk)u%~j^1hxBlN>ko06-I2*UY1A(Q9Ix
zZdro{OauQBJ4M`hIsxdNooS9!;R7;Pd0zl{mG_YUhc~tZ8a1>qRSx3(OFu(B?1fX)
zP{-D(ji9)%Ufo>*Pxi~3=i$j-T)a@bivrPsF&goBa-ZQtxhK0ciDZc7xdITw#1D2j
zpb?*hy`HpECJC&tW0!NQkiy*iXCZ9O#S17OP}xV98g>M80N2@#OR;SSj-9x?3|jH(
zbx7^^)iA6(*K&}|m9_2=82-MZ1IE*zj}?K%U+;pPudV-E2035-AqkH(@S|P|%v-uS
z4tMU}Y=DPj^_yqGa&hxDpr?QAx5AzZ>IMG-TS*3!D{47q4+;T=va}HmgYX+s7}4B!
zjVKBem~ClAbs+j$k&3kJ+pXxIDjE#`<3uHnLsGl|5X)`I%&VnR+OetO5`J8e6q}|^
z;t{N6rFPT{5NbQ(0Qi-5^bT}88|gqTNXtFdfkt<OJlBtQK2p3r=N3=02R-y$!85LH
b<v#P!^}KBUv#2)v;Ve3hN^-F|)F=E8VW_pH

delta 1390
zcmZ8hYiJx*6y_$Iw0Sj2%}dfeb`vHu$z-xg(O`y~M{BIz);vrIg>6zcvv=+cnb}!p
zW|LqN{3R$>gkE$7iK({GKz>9RVNIKe52*eyf(i;YMO#Z7wf+dAMWpDNr1>KZ_ndpq
zx!*nK-0#f8PjX-VEcgBCY(%}8?2Vi{io>FbiDZxjbv4=SrZR155p<QeFo{xcBrk>X
zAV{{b7NzX#{QHQqj|w`F$#x1Rkm(H-P6W^}TP^9RrPz&z#{teFlI}c{N+_;wC3q^x
z0B5p)ORA1gjtkmEQZ%AW9XG55;kaW&a*5;elpQT?&Nn%Z_fatQXz7Unig>H#Ie~)_
z!n=a#U{-vu!u#g&tpMb|TDz6S)A{*nOOMxwF~&4%j|+;GaP>rr$QllY7gR7|xRf$4
z=wjLv()4(oBtm+k9<02EskCPix+tC^QcO{Z<M2cbsk4q|&4k3c1wphRl(Kl}?F#>j
zuCQo}aY3}}eU$lmo_ggC-xd`_@R;Nnx<bTZ?~m{>LJ`*AaT+SP(9!5`Vw)A-=FvCv
zpj&ZlgW-GJ3*M^k7ZLRIt)9*jNa?8{)WLD>?Y?9`_B;zNzPAC&J>5$o&ikOR6G7YW
zA4}zeYw~12yu|X!2cTb!w1EC)q#M?PQ@=papQr9+!I7H-x&94z2E(wH57pJvs5TCL
z+g*8I;E1He41+fWL7v7Y8yy;h(3PQ2^CI|!l(dpi()6&HQ$z`Fo6ye28{2fz^j61~
z5gPW+oLSF;+sdQ2vOzqUIPMF1@-XDd29zdbUYb^l0dK|zoh{k8(G=!<h6!`3W%DwX
z_Y@VovWnFx9hZTCY{#u;)lMB8l$|hdN~&%<?r}{w;$5a>#2)G6VvOS^_W?|iwWgkA
zOKu(8b_#1uU>d{^SaIS+ljDHi(vsvj6+R$ysrv<hm%5L6zq=y`pizDElSLpdzw#5*
z!(KW+1$FG4-|~z5>h-c>c(R}0xeQPC^3s*c!xV@PjG@Hk$s>mMWu9v_B{EGCt|I_3
z47|U?K8^So?6p`TZV=xKJ9aIz4k^rjxCqx)tX)CbfXY6;T64gk131p^TpivG;Mmz~
zE1(@*zYVGVwjP4@&_)K5xxUes2adn4Yk+a?^O0Qec$=+|^R3N)3L)p4Kg8gXdTwY1
zz`W(Vqj2Wo-5Pi}R=vFlp0({afS%squQ?sX)b;-bmJ;(PS2Q!q5tIiMN}IK)AB0zn
zLWpL*t3?r*z;v(yRe|VgKq@lR?>3;nOQ}EnPZO2cHi`2BK&&((Bdd~1N!v1Yhw!6<
zq*!LsATGgXT53X_0HHP^4uD^4LhnJh)8S?mL}upsW;9d=@=`ZC^h5(6a_tle!Jv~K
z0>j-EQe%d*XMk>jsXaa9pvvgnZj9ulCLPz-6O<2&?E=Sz7XEMF|LwK5i~B0X0aBxs
zjM)x}j0_II;|k*LFD3zMdd)#E1Y9!fW;$JTJ1bkxUq}aMQAIjDgD#}cEuymY#TgXH
J+?YWj;XmGI-bnxe


From 502f01ae6ce2923cd4c125a4d09e56ca6fc31fe9 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 22:09:21 +0100
Subject: [PATCH 178/183] Suppress error messages of failed database connects
 and config save attempts

---
 php/Modules/Config.php   | 2 +-
 php/Modules/Database.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/Modules/Config.php b/php/Modules/Config.php
index 60276ff..892e03d 100644
--- a/php/Modules/Config.php
+++ b/php/Modules/Config.php
@@ -42,7 +42,7 @@ $config = "<?php
 ?>";
 
 		// Save file
-		if (file_put_contents(LYCHEE_CONFIG_FILE, $config)===false) return 'Warning: Could not create file!';
+		if (@file_put_contents(LYCHEE_CONFIG_FILE, $config)===false) return 'Warning: Could not create file!';
 
 		return true;
 
diff --git a/php/Modules/Database.php b/php/Modules/Database.php
index 3f0d54d..2df65dc 100755
--- a/php/Modules/Database.php
+++ b/php/Modules/Database.php
@@ -81,7 +81,7 @@ final class Database {
 	public static function connect($host = 'localhost', $user, $password) {
 
 		// Open a new connection to the MySQL server
-		$connection = new Mysqli($host, $user, $password);
+		$connection = @new Mysqli($host, $user, $password);
 
 		// Check if the connection was successful
 		if ($connection->connect_errno) return false;

From 761da1e9360c484e292c66324a0a818248116d24 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 22:22:59 +0100
Subject: [PATCH 179/183] Improved upload messages

---
 src/scripts/upload.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index 9fc4ca6..6b42981 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -120,6 +120,9 @@ upload.start = {
 							.html('Failed')
 							.addClass('error')
 
+						// Throw error
+						if (error===true) lychee.error('Upload failed. Server returned an error!', xhr, xhr.responseText)
+
 					} else if (xhr.responseText.substr(0, 8)==='Warning:') {
 
 						errorText = xhr.responseText.substr(8)
@@ -130,6 +133,9 @@ upload.start = {
 							.html('Skipped')
 							.addClass('warning')
 
+						// Throw error
+						if (error===true) lychee.error('Upload failed. Server returned a warning!', xhr, xhr.responseText)
+
 					} else {
 
 						errorText = 'Server returned an unknown response. Please take a look at the console of your browser for further details.'
@@ -140,15 +146,15 @@ upload.start = {
 							.html('Failed')
 							.addClass('error')
 
+						// Throw error
+						if (error===true) lychee.error('Upload failed. Server returned an unkown error!', xhr, xhr.responseText)
+
 					}
 
 					$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') p.notice')
 						.html(errorText)
 						.show()
 
-					// Throw error
-					if (error===true) lychee.error('Upload failed. Server returned the status code ' + xhr.status + '!', xhr, xhr.responseText)
-
 				}
 
 				// Check if there are file which are not finished

From 472b54906a87c19ac8a1a4507a4fea6f71da84d7 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 22:23:05 +0100
Subject: [PATCH 180/183] Rebuild

---
 dist/main.js | Bin 191715 -> 191867 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 1094857246ec2a2e24392639ec6c33a4499adf1b..fa76f60f6792440d30e8a1f798350f9c61ef31c4 100755
GIT binary patch
delta 152
zcmaESll%8A?uHh|ElgYXPH)=JWG0=Mr;u7ylwYK%q?4nQqgRw#T#%nvoEnl^Q8In=
zUZyo*RWgYR<%vaknR)5hl*R31x&~IJ3^c4XFFU^+x0#yLFP>tOo?ft*NosoLekRH7
KFZMJ2)&T%eDm>u;

delta 85
zcmex;i~I3S?uHh|ElgYXPG{T4w3<!RN+Z!$Y5M>DOk&d&_A~9AZghajZ~Df4OlC4A
n8L0}zC5a`a#R|#!DX9ud+Btd<zP8fz5Br!zw>KVO`lSN^<g6kx


From a9ed9f08e7b19ed7fca4ceb76f6ca46a4a435f27 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 22:37:37 +0100
Subject: [PATCH 181/183] Fixed upload not showing correct error

---
 src/scripts/upload.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/scripts/upload.js b/src/scripts/upload.js
index 6b42981..46fb1d0 100755
--- a/src/scripts/upload.js
+++ b/src/scripts/upload.js
@@ -93,15 +93,22 @@ upload.start = {
 
 			xhr.onload = function() {
 
+				let data      = null
 				let wait      = false
 				let errorText = ''
 
 				const isNumber = (n) => (!isNaN(parseFloat(n)) && isFinite(n))
 
+				try {
+					data = JSON.parse(xhr.responseText)
+				} catch(e) {
+					data = ''
+				}
+
 				file.ready = true
 
 				// Set status
-				if (xhr.status===200 && isNumber(xhr.responseText)) {
+				if (xhr.status===200 && isNumber(data)) {
 
 					// Success
 					$('.basicModal .rows .row:nth-child(' + (file.num + 1) + ') .status')
@@ -110,9 +117,9 @@ upload.start = {
 
 				} else {
 
-					if (xhr.responseText.substr(0, 6)==='Error:') {
+					if (data.substr(0, 6)==='Error:') {
 
-						errorText = xhr.responseText.substr(6) + ' Please take a look at the console of your browser for further details.'
+						errorText = data.substr(6) + ' Please take a look at the console of your browser for further details.'
 						error     = true
 
 						// Error Status
@@ -121,11 +128,11 @@ upload.start = {
 							.addClass('error')
 
 						// Throw error
-						if (error===true) lychee.error('Upload failed. Server returned an error!', xhr, xhr.responseText)
+						if (error===true) lychee.error('Upload failed. Server returned an error!', xhr, data)
 
-					} else if (xhr.responseText.substr(0, 8)==='Warning:') {
+					} else if (data.substr(0, 8)==='Warning:') {
 
-						errorText = xhr.responseText.substr(8)
+						errorText = data.substr(8)
 						warning   = true
 
 						// Warning Status
@@ -134,7 +141,7 @@ upload.start = {
 							.addClass('warning')
 
 						// Throw error
-						if (error===true) lychee.error('Upload failed. Server returned a warning!', xhr, xhr.responseText)
+						if (error===true) lychee.error('Upload failed. Server returned a warning!', xhr, data)
 
 					} else {
 
@@ -147,7 +154,7 @@ upload.start = {
 							.addClass('error')
 
 						// Throw error
-						if (error===true) lychee.error('Upload failed. Server returned an unkown error!', xhr, xhr.responseText)
+						if (error===true) lychee.error('Upload failed. Server returned an unkown error!', xhr, data)
 
 					}
 

From ce2015b269fcc1646dfcd986fcc9f62ada503802 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Thu, 24 Mar 2016 22:37:41 +0100
Subject: [PATCH 182/183] Rebuild

---
 dist/main.js | Bin 191867 -> 191817 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index fa76f60f6792440d30e8a1f798350f9c61ef31c4..c66a317ffcaaf13915826ab74e32faf217b32ec4 100755
GIT binary patch
delta 286
zcmex;i~Hm)?uHh|Ell5b3*?pN<me>YDjMn(*(xdN6i?o`KzRCtql_v(B}J9hCAMC{
z{(gD|iABY!8aaAJsl^5PdBv$AsTC!fwaJMk$r&2Snm|=bO0}6l*~FAeTSWsMBLf3l
zTiYDH;*!LY(qc8WVvXqudzcCZOZ19MlZs1<Gz@giH0?EtY^VR(!}MFJL{rmBDLk<#
zFEcOQN(rbFNu32mox?t+tsEeAKut>1|L<oK+pe&miJ5V_!2u?Bw<1lw;*9)q4NXn!
zwEQBCvcw{VQd<M-Qkzu0oYcJZk__uoZEelWG>z2g(pac7ZGm3atOk1Az&Z)&@a)>e
L?RyU}?b87OkD6nz

delta 320
zcmX?ki~IL2?uHh|Ell5bvnv|vB-$z|O@C0vC_4SYQAU;NIeVC-g^DzC^oml83-a@d
zQ$tcKN;K`KUp&qvIlW*%llJrrdziGeQRVfDOOuLAiZl##%rxya5^Ygrr*rRR`t6A#
zRHCVAr4*i6l$V*8Zlz>vi>jdnVVngP<23d$Z575aP9t&q<9$rhjJzl^)Bo*fa(7GA
z)GN-&FW1o2v`)(}(kM$TQYf}Hur9Vq)yqlEOE1Z=F4or8%uLfrjV_J_dOR_u66hvH
YL(S?ETSWuwB%nxkZOQiT15EpL0F734od5s;


From 9198b4ec2fe3832311194aa7797539a66168ecab Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Tue, 29 Mar 2016 15:37:56 +0200
Subject: [PATCH 183/183] Fixed dbTablePrefix starting with an underscore when
 using an old Lychee installation

---
 php/define.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/php/define.php b/php/define.php
index a215adc..d7bebb7 100644
--- a/php/define.php
+++ b/php/define.php
@@ -26,7 +26,7 @@ define('LYCHEE_URL_UPLOADS_BIG', 'uploads/big/');
 define('LYCHEE_URL_UPLOADS_MEDIUM', 'uploads/medium/');
 define('LYCHEE_URL_UPLOADS_THUMB', 'uploads/thumb/');
 
-function defineTablePrefix($dbTablePrefix = '') {
+function defineTablePrefix($dbTablePrefix) {
 
 	// This part is wrapped into a function, because it needs to be called
 	// after the config-file has been loaded. Other defines are available
@@ -34,6 +34,7 @@ function defineTablePrefix($dbTablePrefix = '') {
 
 	// Parse table prefix
 	// Old users do not have the table prefix stored in their config-file
+	if (isset($dbTablePrefix)===false) $dbTablePrefix = '';
 	if ($dbTablePrefix!=='') $dbTablePrefix .= '_';
 
 	// Define tables