diff --git a/public_html/js/Api.js b/public_html/js/Api.js
index 63db4057..3d195b92 100644
--- a/public_html/js/Api.js
+++ b/public_html/js/Api.js
@@ -2,130 +2,130 @@ var App = App || {};
 
 App.API = function(_, jQuery, promise, appState) {
 
-	var baseUrl = '/api/';
-	var AJAX_UNSENT = 0;
-	var AJAX_OPENED = 1;
-	var AJAX_HEADERS_RECEIVED = 2;
-	var AJAX_LOADING = 3;
-	var AJAX_DONE = 4;
+    var baseUrl = '/api/';
+    var AJAX_UNSENT = 0;
+    var AJAX_OPENED = 1;
+    var AJAX_HEADERS_RECEIVED = 2;
+    var AJAX_LOADING = 3;
+    var AJAX_DONE = 4;
 
-	var cache = {};
+    var cache = {};
 
-	function get(url, data) {
-		return request('GET', url, data);
-	}
+    function get(url, data) {
+        return request('GET', url, data);
+    }
 
-	function post(url, data) {
-		return request('POST', url, data);
-	}
+    function post(url, data) {
+        return request('POST', url, data);
+    }
 
-	function put(url, data) {
-		return request('PUT', url, data);
-	}
+    function put(url, data) {
+        return request('PUT', url, data);
+    }
 
-	function _delete(url, data) {
-		return request('DELETE', url, data);
-	}
+    function _delete(url, data) {
+        return request('DELETE', url, data);
+    }
 
-	function getCacheKey(method, url, data) {
-		return JSON.stringify({method: method, url: url, data: data});
-	}
+    function getCacheKey(method, url, data) {
+        return JSON.stringify({method: method, url: url, data: data});
+    }
 
-	function clearCache() {
-		cache = {};
-	}
+    function clearCache() {
+        cache = {};
+    }
 
-	function request(method, url, data) {
-		if (method === 'GET') {
-			return requestWithCache(method, url, data);
-		}
-		clearCache();
-		return requestWithAjax(method, url, data);
-	}
+    function request(method, url, data) {
+        if (method === 'GET') {
+            return requestWithCache(method, url, data);
+        }
+        clearCache();
+        return requestWithAjax(method, url, data);
+    }
 
-	function requestWithCache(method, url, data) {
-		var cacheKey = getCacheKey(method, url, data);
-		if (_.has(cache, cacheKey)) {
-			return promise.make(function(resolve, reject) {
-				resolve(cache[cacheKey]);
-			});
-		}
+    function requestWithCache(method, url, data) {
+        var cacheKey = getCacheKey(method, url, data);
+        if (_.has(cache, cacheKey)) {
+            return promise.make(function(resolve, reject) {
+                resolve(cache[cacheKey]);
+            });
+        }
 
-		return promise.make(function(resolve, reject) {
-			promise.wait(requestWithAjax(method, url, data))
-				.then(function(response) {
-					setCache(method, url, data, response);
-					resolve(response);
-				}).fail(function(response) {
-					reject(response);
-				});
-		});
-	}
+        return promise.make(function(resolve, reject) {
+            promise.wait(requestWithAjax(method, url, data))
+                .then(function(response) {
+                    setCache(method, url, data, response);
+                    resolve(response);
+                }).fail(function(response) {
+                    reject(response);
+                });
+        });
+    }
 
-	function setCache(method, url, data, response) {
-		var cacheKey = getCacheKey(method, url, data);
-		cache[cacheKey] = response;
-	}
+    function setCache(method, url, data, response) {
+        var cacheKey = getCacheKey(method, url, data);
+        cache[cacheKey] = response;
+    }
 
-	function requestWithAjax(method, url, data) {
-		var fullUrl = baseUrl + '/' + url;
-		fullUrl = fullUrl.replace(/\/{2,}/, '/');
+    function requestWithAjax(method, url, data) {
+        var fullUrl = baseUrl + '/' + url;
+        fullUrl = fullUrl.replace(/\/{2,}/, '/');
 
-		var xhr = null;
-		var apiPromise = promise.make(function(resolve, reject) {
-			var options = {
-				headers: {
-					'X-Authorization-Token': appState.get('loginToken') || '',
-				},
-				success: function(data, textStatus, xhr) {
-					resolve({
-						status: xhr.status,
-						json: stripMeta(data)});
-				},
-				error: function(xhr, textStatus, errorThrown) {
-					reject({
-						status: xhr.status,
-						json: xhr.responseJSON ?
-							stripMeta(xhr.responseJSON) :
-							{error: errorThrown}});
-				},
-				type: method,
-				url: fullUrl,
-				data: data,
-				cache: false,
-			};
-			if (data instanceof FormData) {
-				options.processData = false;
-				options.contentType = false;
-			}
-			xhr = jQuery.ajax(options);
-		});
-		apiPromise.xhr = xhr;
-		return apiPromise;
-	}
+        var xhr = null;
+        var apiPromise = promise.make(function(resolve, reject) {
+            var options = {
+                headers: {
+                    'X-Authorization-Token': appState.get('loginToken') || '',
+                },
+                success: function(data, textStatus, xhr) {
+                    resolve({
+                        status: xhr.status,
+                        json: stripMeta(data)});
+                },
+                error: function(xhr, textStatus, errorThrown) {
+                    reject({
+                        status: xhr.status,
+                        json: xhr.responseJSON ?
+                            stripMeta(xhr.responseJSON) :
+                            {error: errorThrown}});
+                },
+                type: method,
+                url: fullUrl,
+                data: data,
+                cache: false,
+            };
+            if (data instanceof FormData) {
+                options.processData = false;
+                options.contentType = false;
+            }
+            xhr = jQuery.ajax(options);
+        });
+        apiPromise.xhr = xhr;
+        return apiPromise;
+    }
 
-	function stripMeta(data) {
-		var result = {};
-		_.each(data, function(v, k) {
-			if (!k.match(/^__/)) {
-				result[k] = v;
-			}
-		});
-		return result;
-	}
+    function stripMeta(data) {
+        var result = {};
+        _.each(data, function(v, k) {
+            if (!k.match(/^__/)) {
+                result[k] = v;
+            }
+        });
+        return result;
+    }
 
-	return {
-		get: get,
-		post: post,
-		put: put,
-		delete: _delete,
+    return {
+        get: get,
+        post: post,
+        put: put,
+        delete: _delete,
 
-		AJAX_UNSENT: AJAX_UNSENT,
-		AJAX_OPENED: AJAX_OPENED,
-		AJAX_HEADERS_RECEIVED: AJAX_HEADERS_RECEIVED,
-		AJAX_LOADING: AJAX_LOADING,
-		AJAX_DONE: AJAX_DONE,
-	};
+        AJAX_UNSENT: AJAX_UNSENT,
+        AJAX_OPENED: AJAX_OPENED,
+        AJAX_HEADERS_RECEIVED: AJAX_HEADERS_RECEIVED,
+        AJAX_LOADING: AJAX_LOADING,
+        AJAX_DONE: AJAX_DONE,
+    };
 
 };
 
diff --git a/public_html/js/Auth.js b/public_html/js/Auth.js
index 38ddc97a..468b571c 100644
--- a/public_html/js/Auth.js
+++ b/public_html/js/Auth.js
@@ -2,198 +2,198 @@ var App = App || {};
 
 App.Auth = function(_, jQuery, util, api, appState, promise) {
 
-	var privileges = {
-		register: 'register',
-		listUsers: 'listUsers',
-		viewUsers: 'viewUsers',
-		viewAllAccessRanks: 'viewAllAccessRanks',
-		viewAllEmailAddresses: 'viewAllEmailAddresses',
-		changeAccessRank: 'changeAccessRank',
-		changeOwnAvatarStyle: 'changeOwnAvatarStyle',
-		changeOwnEmailAddress: 'changeOwnEmailAddress',
-		changeOwnName: 'changeOwnName',
-		changeOwnPassword: 'changeOwnPassword',
-		changeAllAvatarStyles: 'changeAllAvatarStyles',
-		changeAllEmailAddresses: 'changeAllEmailAddresses',
-		changeAllNames: 'changeAllNames',
-		changeAllPasswords: 'changeAllPasswords',
-		deleteOwnAccount: 'deleteOwnAccount',
-		deleteAllAccounts: 'deleteAllAccounts',
-		banUsers: 'banUsers',
+    var privileges = {
+        register: 'register',
+        listUsers: 'listUsers',
+        viewUsers: 'viewUsers',
+        viewAllAccessRanks: 'viewAllAccessRanks',
+        viewAllEmailAddresses: 'viewAllEmailAddresses',
+        changeAccessRank: 'changeAccessRank',
+        changeOwnAvatarStyle: 'changeOwnAvatarStyle',
+        changeOwnEmailAddress: 'changeOwnEmailAddress',
+        changeOwnName: 'changeOwnName',
+        changeOwnPassword: 'changeOwnPassword',
+        changeAllAvatarStyles: 'changeAllAvatarStyles',
+        changeAllEmailAddresses: 'changeAllEmailAddresses',
+        changeAllNames: 'changeAllNames',
+        changeAllPasswords: 'changeAllPasswords',
+        deleteOwnAccount: 'deleteOwnAccount',
+        deleteAllAccounts: 'deleteAllAccounts',
+        banUsers: 'banUsers',
 
-		listPosts: 'listPosts',
-		viewPosts: 'viewPosts',
-		uploadPosts: 'uploadPosts',
-		uploadPostsAnonymously: 'uploadPostsAnonymously',
-		deletePosts: 'deletePosts',
-		featurePosts: 'featurePosts',
-		changePostSafety: 'changePostSafety',
-		changePostSource: 'changePostSource',
-		changePostTags: 'changePostTags',
-		changePostContent: 'changePostContent',
-		changePostThumbnail: 'changePostThumbnail',
-		changePostRelations: 'changePostRelations',
-		changePostFlags: 'changePostFlags',
+        listPosts: 'listPosts',
+        viewPosts: 'viewPosts',
+        uploadPosts: 'uploadPosts',
+        uploadPostsAnonymously: 'uploadPostsAnonymously',
+        deletePosts: 'deletePosts',
+        featurePosts: 'featurePosts',
+        changePostSafety: 'changePostSafety',
+        changePostSource: 'changePostSource',
+        changePostTags: 'changePostTags',
+        changePostContent: 'changePostContent',
+        changePostThumbnail: 'changePostThumbnail',
+        changePostRelations: 'changePostRelations',
+        changePostFlags: 'changePostFlags',
 
-		addPostNotes: 'addPostNotes',
-		editPostNotes: 'editPostNotes',
-		deletePostNotes: 'deletePostNotes',
+        addPostNotes: 'addPostNotes',
+        editPostNotes: 'editPostNotes',
+        deletePostNotes: 'deletePostNotes',
 
-		listComments: 'listComments',
-		addComments: 'addComments',
-		editOwnComments: 'editOwnComments',
-		editAllComments: 'editAllComments',
-		deleteOwnComments: 'deleteOwnComments',
-		deleteAllComments: 'deleteAllComments',
-		deleteTags: 'deleteTags',
-		mergeTags: 'mergeTags',
+        listComments: 'listComments',
+        addComments: 'addComments',
+        editOwnComments: 'editOwnComments',
+        editAllComments: 'editAllComments',
+        deleteOwnComments: 'deleteOwnComments',
+        deleteAllComments: 'deleteAllComments',
+        deleteTags: 'deleteTags',
+        mergeTags: 'mergeTags',
 
-		listTags: 'listTags',
-		massTag: 'massTag',
-		changeTagName: 'changeTagName',
-		changeTagCategory: 'changeTagCategory',
-		changeTagImplications: 'changeTagImplications',
-		changeTagSuggestions: 'changeTagSuggestions',
-		banTags: 'banTags',
+        listTags: 'listTags',
+        massTag: 'massTag',
+        changeTagName: 'changeTagName',
+        changeTagCategory: 'changeTagCategory',
+        changeTagImplications: 'changeTagImplications',
+        changeTagSuggestions: 'changeTagSuggestions',
+        banTags: 'banTags',
 
-		viewHistory: 'viewHistory',
-	};
+        viewHistory: 'viewHistory',
+    };
 
-	function loginFromCredentials(userNameOrEmail, password, remember) {
-		return promise.make(function(resolve, reject) {
-			promise.wait(api.post('/login', {userNameOrEmail: userNameOrEmail, password: password}))
-				.then(function(response) {
-					updateAppState(response);
-					jQuery.cookie(
-						'auth',
-						response.json.token.name,
-						remember ? { expires: 365 } : {});
-					resolve(response);
-				}).fail(function(response) {
-					reject(response);
-				});
-		});
-	}
+    function loginFromCredentials(userNameOrEmail, password, remember) {
+        return promise.make(function(resolve, reject) {
+            promise.wait(api.post('/login', {userNameOrEmail: userNameOrEmail, password: password}))
+                .then(function(response) {
+                    updateAppState(response);
+                    jQuery.cookie(
+                        'auth',
+                        response.json.token.name,
+                        remember ? { expires: 365 } : {});
+                    resolve(response);
+                }).fail(function(response) {
+                    reject(response);
+                });
+        });
+    }
 
-	function loginFromToken(token, isFromCookie) {
-		return promise.make(function(resolve, reject) {
-			var fd = {
-				token: token,
-				isFromCookie: isFromCookie
-			};
-			promise.wait(api.post('/login', fd))
-				.then(function(response) {
-					updateAppState(response);
-					resolve(response);
-				}).fail(function(response) {
-					reject(response);
-				});
-		});
-	}
+    function loginFromToken(token, isFromCookie) {
+        return promise.make(function(resolve, reject) {
+            var fd = {
+                token: token,
+                isFromCookie: isFromCookie
+            };
+            promise.wait(api.post('/login', fd))
+                .then(function(response) {
+                    updateAppState(response);
+                    resolve(response);
+                }).fail(function(response) {
+                    reject(response);
+                });
+        });
+    }
 
-	function loginAnonymous() {
-		return promise.make(function(resolve, reject) {
-			promise.wait(api.post('/login'))
-				.then(function(response) {
-					updateAppState(response);
-					resolve(response);
-				}).fail(function(response) {
-					reject(response);
-				});
-		});
-	}
+    function loginAnonymous() {
+        return promise.make(function(resolve, reject) {
+            promise.wait(api.post('/login'))
+                .then(function(response) {
+                    updateAppState(response);
+                    resolve(response);
+                }).fail(function(response) {
+                    reject(response);
+                });
+        });
+    }
 
-	function logout() {
-		return promise.make(function(resolve, reject) {
-			jQuery.removeCookie('auth');
-			appState.set('loginToken', null);
-			return promise.wait(loginAnonymous())
-				.then(resolve)
-				.fail(reject);
-		});
-	}
+    function logout() {
+        return promise.make(function(resolve, reject) {
+            jQuery.removeCookie('auth');
+            appState.set('loginToken', null);
+            return promise.wait(loginAnonymous())
+                .then(resolve)
+                .fail(reject);
+        });
+    }
 
-	function tryLoginFromCookie() {
-		return promise.make(function(resolve, reject) {
-			if (isLoggedIn()) {
-				resolve();
-				return;
-			}
+    function tryLoginFromCookie() {
+        return promise.make(function(resolve, reject) {
+            if (isLoggedIn()) {
+                resolve();
+                return;
+            }
 
-			var authCookie = jQuery.cookie('auth');
-			if (!authCookie) {
-				reject();
-				return;
-			}
+            var authCookie = jQuery.cookie('auth');
+            if (!authCookie) {
+                reject();
+                return;
+            }
 
-			promise.wait(loginFromToken(authCookie, true))
-				.then(function(response) {
-					resolve();
-				}).fail(function(response) {
-					jQuery.removeCookie('auth');
-					reject();
-				});
-		});
-	}
+            promise.wait(loginFromToken(authCookie, true))
+                .then(function(response) {
+                    resolve();
+                }).fail(function(response) {
+                    jQuery.removeCookie('auth');
+                    reject();
+                });
+        });
+    }
 
-	function updateAppState(response) {
-		appState.set('privileges', response.json.privileges || []);
-		appState.set('loginToken', response.json.token && response.json.token.name);
-		appState.set('loggedIn', response.json.user && !!response.json.user.id);
-		appState.set('loggedInUser', response.json.user);
-	}
+    function updateAppState(response) {
+        appState.set('privileges', response.json.privileges || []);
+        appState.set('loginToken', response.json.token && response.json.token.name);
+        appState.set('loggedIn', response.json.user && !!response.json.user.id);
+        appState.set('loggedInUser', response.json.user);
+    }
 
-	function isLoggedIn(userName) {
-		if (!appState.get('loggedIn')) {
-			return false;
-		}
-		if (typeof(userName) !== 'undefined') {
-			if (getCurrentUser().name !== userName) {
-				return false;
-			}
-		}
-		return true;
-	}
+    function isLoggedIn(userName) {
+        if (!appState.get('loggedIn')) {
+            return false;
+        }
+        if (typeof(userName) !== 'undefined') {
+            if (getCurrentUser().name !== userName) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-	function getCurrentUser() {
-		return appState.get('loggedInUser');
-	}
+    function getCurrentUser() {
+        return appState.get('loggedInUser');
+    }
 
-	function getCurrentPrivileges() {
-		return appState.get('privileges');
-	}
+    function getCurrentPrivileges() {
+        return appState.get('privileges');
+    }
 
-	function updateCurrentUser(user) {
-		if (user.id !== getCurrentUser().id) {
-			throw new Error('Cannot set current user to other user this way.');
-		}
-		appState.set('loggedInUser', user);
-	}
+    function updateCurrentUser(user) {
+        if (user.id !== getCurrentUser().id) {
+            throw new Error('Cannot set current user to other user this way.');
+        }
+        appState.set('loggedInUser', user);
+    }
 
-	function hasPrivilege(privilege) {
-		return _.contains(getCurrentPrivileges(), privilege);
-	}
+    function hasPrivilege(privilege) {
+        return _.contains(getCurrentPrivileges(), privilege);
+    }
 
-	function startObservingLoginChanges(listenerName, callback) {
-		appState.startObserving('loggedInUser', listenerName, callback);
-	}
+    function startObservingLoginChanges(listenerName, callback) {
+        appState.startObserving('loggedInUser', listenerName, callback);
+    }
 
-	return {
-		loginFromCredentials: loginFromCredentials,
-		loginFromToken: loginFromToken,
-		loginAnonymous: loginAnonymous,
-		tryLoginFromCookie: tryLoginFromCookie,
-		logout: logout,
+    return {
+        loginFromCredentials: loginFromCredentials,
+        loginFromToken: loginFromToken,
+        loginAnonymous: loginAnonymous,
+        tryLoginFromCookie: tryLoginFromCookie,
+        logout: logout,
 
-		startObservingLoginChanges: startObservingLoginChanges,
-		isLoggedIn: isLoggedIn,
-		getCurrentUser: getCurrentUser,
-		updateCurrentUser: updateCurrentUser,
-		getCurrentPrivileges: getCurrentPrivileges,
-		hasPrivilege: hasPrivilege,
+        startObservingLoginChanges: startObservingLoginChanges,
+        isLoggedIn: isLoggedIn,
+        getCurrentUser: getCurrentUser,
+        updateCurrentUser: updateCurrentUser,
+        getCurrentPrivileges: getCurrentPrivileges,
+        hasPrivilege: hasPrivilege,
 
-		privileges: privileges,
-	};
+        privileges: privileges,
+    };
 
 };
 
diff --git a/public_html/js/Bootstrap.js b/public_html/js/Bootstrap.js
index 23429ade..8f5e98d7 100644
--- a/public_html/js/Bootstrap.js
+++ b/public_html/js/Bootstrap.js
@@ -2,29 +2,29 @@ var App = App || {};
 
 App.Bootstrap = function(auth, router, promise, presenterManager) {
 
-	promise.wait(presenterManager.init())
-		.then(function() {
-			promise.wait(auth.tryLoginFromCookie())
-				.then(startRouting)
-				.fail(function(error) {
-					promise.wait(auth.loginAnonymous())
-						.then(startRouting)
-						.fail(function() {
-							console.log(arguments);
-							window.alert('Fatal authentication error');
-						});
-				});
-		}).fail(function() {
-			console.log(arguments);
-		});
+    promise.wait(presenterManager.init())
+        .then(function() {
+            promise.wait(auth.tryLoginFromCookie())
+                .then(startRouting)
+                .fail(function(error) {
+                    promise.wait(auth.loginAnonymous())
+                        .then(startRouting)
+                        .fail(function() {
+                            console.log(arguments);
+                            window.alert('Fatal authentication error');
+                        });
+                });
+        }).fail(function() {
+            console.log(arguments);
+        });
 
-	function startRouting() {
-		try {
-			router.start();
-		} catch (err) {
-			console.log(err);
-		}
-	}
+    function startRouting() {
+        try {
+            router.start();
+        } catch (err) {
+            console.log(err);
+        }
+    }
 
 };
 
diff --git a/public_html/js/BrowsingSettings.js b/public_html/js/BrowsingSettings.js
index 79c8a881..142958d8 100644
--- a/public_html/js/BrowsingSettings.js
+++ b/public_html/js/BrowsingSettings.js
@@ -1,96 +1,96 @@
 var App = App || {};
 
 App.BrowsingSettings = function(
-	promise,
-	auth,
-	api) {
+    promise,
+    auth,
+    api) {
 
-	var settings = getDefaultSettings();
+    var settings = getDefaultSettings();
 
-	auth.startObservingLoginChanges('browsing-settings', loginStateChanged);
+    auth.startObservingLoginChanges('browsing-settings', loginStateChanged);
 
-	readFromLocalStorage();
-	if (auth.isLoggedIn()) {
-		loginStateChanged();
-	}
+    readFromLocalStorage();
+    if (auth.isLoggedIn()) {
+        loginStateChanged();
+    }
 
-	function setSettings(newSettings) {
-		settings = newSettings;
-		return save();
-	}
+    function setSettings(newSettings) {
+        settings = newSettings;
+        return save();
+    }
 
-	function getSettings() {
-		return settings;
-	}
+    function getSettings() {
+        return settings;
+    }
 
-	function getDefaultSettings() {
-		return {
-			hideDownvoted: true,
-			endlessScroll: false,
-			listPosts: {
-				safe: true,
-				sketchy: true,
-				unsafe: true,
-			},
-			keyboardShortcuts: true,
-		};
-	}
+    function getDefaultSettings() {
+        return {
+            hideDownvoted: true,
+            endlessScroll: false,
+            listPosts: {
+                safe: true,
+                sketchy: true,
+                unsafe: true,
+            },
+            keyboardShortcuts: true,
+        };
+    }
 
-	function loginStateChanged() {
-		readFromUser(auth.getCurrentUser());
-	}
+    function loginStateChanged() {
+        readFromUser(auth.getCurrentUser());
+    }
 
-	function readFromLocalStorage() {
-		readFromString(localStorage.getItem('browsingSettings'));
-	}
+    function readFromLocalStorage() {
+        readFromString(localStorage.getItem('browsingSettings'));
+    }
 
-	function readFromUser(user) {
-		readFromString(user.browsingSettings);
-	}
+    function readFromUser(user) {
+        readFromString(user.browsingSettings);
+    }
 
-	function readFromString(string) {
-		if (!string) {
-			return;
-		}
+    function readFromString(string) {
+        if (!string) {
+            return;
+        }
 
-		try {
-			if (typeof(string) === 'string' || string instanceof String) {
-				settings = JSON.parse(string);
-			} else {
-				settings = string;
-			}
-		} catch (e) {
-		}
-	}
+        try {
+            if (typeof(string) === 'string' || string instanceof String) {
+                settings = JSON.parse(string);
+            } else {
+                settings = string;
+            }
+        } catch (e) {
+        }
+    }
 
-	function saveToLocalStorage() {
-		localStorage.setItem('browsingSettings', JSON.stringify(settings));
-	}
+    function saveToLocalStorage() {
+        localStorage.setItem('browsingSettings', JSON.stringify(settings));
+    }
 
-	function saveToUser(user) {
-		var formData = {
-			browsingSettings: JSON.stringify(settings),
-		};
-		return api.post('/users/' + user.name, formData);
-	}
+    function saveToUser(user) {
+        var formData = {
+            browsingSettings: JSON.stringify(settings),
+        };
+        return api.post('/users/' + user.name, formData);
+    }
 
-	function save() {
-		return promise.make(function(resolve, reject) {
-			saveToLocalStorage();
-			if (auth.isLoggedIn()) {
-				promise.wait(saveToUser(auth.getCurrentUser()))
-					.then(resolve)
-					.fail(reject);
-			} else {
-				resolve();
-			}
-		});
-	}
+    function save() {
+        return promise.make(function(resolve, reject) {
+            saveToLocalStorage();
+            if (auth.isLoggedIn()) {
+                promise.wait(saveToUser(auth.getCurrentUser()))
+                    .then(resolve)
+                    .fail(reject);
+            } else {
+                resolve();
+            }
+        });
+    }
 
-	return {
-		getSettings: getSettings,
-		setSettings: setSettings,
-	};
+    return {
+        getSettings: getSettings,
+        setSettings: setSettings,
+    };
 
 };
 
diff --git a/public_html/js/Controls/AutoCompleteInput.js b/public_html/js/Controls/AutoCompleteInput.js
index 0c268bd6..99aecf91 100644
--- a/public_html/js/Controls/AutoCompleteInput.js
+++ b/public_html/js/Controls/AutoCompleteInput.js
@@ -2,273 +2,273 @@ var App = App || {};
 App.Controls = App.Controls || {};
 
 App.Controls.AutoCompleteInput = function($input) {
-	var _ = App.DI.get('_');
-	var jQuery = App.DI.get('jQuery');
-	var tagList = App.DI.get('tagList');
+    var _ = App.DI.get('_');
+    var jQuery = App.DI.get('jQuery');
+    var tagList = App.DI.get('tagList');
 
-	var KEY_TAB = 9;
-	var KEY_RETURN = 13;
-	var KEY_DELETE = 46;
-	var KEY_ESCAPE = 27;
-	var KEY_UP = 38;
-	var KEY_DOWN = 40;
+    var KEY_TAB = 9;
+    var KEY_RETURN = 13;
+    var KEY_DELETE = 46;
+    var KEY_ESCAPE = 27;
+    var KEY_UP = 38;
+    var KEY_DOWN = 40;
 
-	var options = {
-		caseSensitive: false,
-		source: null,
-		maxResults: 15,
-		minLengthToArbitrarySearch: 3,
-		onApply: null,
-		onDelete: null,
-		onRender: null,
-		additionalFilter: null,
-	};
-	var showTimeout = null;
-	var cachedSource = null;
-	var results = [];
-	var activeResult = -1;
-	var monitorInputHidingInterval = null;
+    var options = {
+        caseSensitive: false,
+        source: null,
+        maxResults: 15,
+        minLengthToArbitrarySearch: 3,
+        onApply: null,
+        onDelete: null,
+        onRender: null,
+        additionalFilter: null,
+    };
+    var showTimeout = null;
+    var cachedSource = null;
+    var results = [];
+    var activeResult = -1;
+    var monitorInputHidingInterval = null;
 
-	if ($input.length === 0) {
-		throw new Error('Input element was not found');
-	}
-	if ($input.length > 1) {
-		throw new Error('Cannot add autocompletion to more than one element at once');
-	}
-	if ($input.attr('data-autocomplete')) {
-		throw new Error('Autocompletion was already added for this element');
-	}
-	$input.attr('data-autocomplete', true);
-	$input.attr('autocomplete', 'off');
+    if ($input.length === 0) {
+        throw new Error('Input element was not found');
+    }
+    if ($input.length > 1) {
+        throw new Error('Cannot add autocompletion to more than one element at once');
+    }
+    if ($input.attr('data-autocomplete')) {
+        throw new Error('Autocompletion was already added for this element');
+    }
+    $input.attr('data-autocomplete', true);
+    $input.attr('autocomplete', 'off');
 
-	var $div = jQuery('<div>');
-	var $list = jQuery('<ul>');
-	$div.addClass('autocomplete');
-	$div.append($list);
-	jQuery(document.body).append($div);
+    var $div = jQuery('<div>');
+    var $list = jQuery('<ul>');
+    $div.addClass('autocomplete');
+    $div.append($list);
+    jQuery(document.body).append($div);
 
-	function getSource() {
-		if (cachedSource) {
-			return cachedSource;
-		} else {
-			var source = tagList.getTags();
-			source = _.sortBy(source, function(a) { return -a.usages; });
-			source = _.filter(source, function(a) { return a.usages >= 0; });
-			source = _.map(source, function(a) {
-				return {
-					tag: a.name,
-					caption: a.name + ' (' + a.usages + ')',
-				};
-			});
-			cachedSource = source;
-			return source;
-		}
-	}
+    function getSource() {
+        if (cachedSource) {
+            return cachedSource;
+        } else {
+            var source = tagList.getTags();
+            source = _.sortBy(source, function(a) { return -a.usages; });
+            source = _.filter(source, function(a) { return a.usages >= 0; });
+            source = _.map(source, function(a) {
+                return {
+                    tag: a.name,
+                    caption: a.name + ' (' + a.usages + ')',
+                };
+            });
+            cachedSource = source;
+            return source;
+        }
+    }
 
-	$input.bind('keydown', function(e) {
-		var func = null;
-		if (isShown() && e.which === KEY_ESCAPE) {
-			func = hide;
-		} else if (isShown() && e.which === KEY_TAB) {
-			if (e.shiftKey) {
-				func = selectPrevious;
-			} else {
-				func = selectNext;
-			}
-		} else if (isShown() && e.which === KEY_DOWN) {
-			func = selectNext;
-		} else if (isShown() && e.which === KEY_UP) {
-			func = selectPrevious;
-		} else if (isShown() && e.which === KEY_RETURN && activeResult >= 0) {
-			func = function() { applyAutocomplete(); hide(); };
-		} else if (isShown() && e.which === KEY_DELETE && activeResult >= 0) {
-			func = function() { applyDelete(); hide(); };
-		}
+    $input.bind('keydown', function(e) {
+        var func = null;
+        if (isShown() && e.which === KEY_ESCAPE) {
+            func = hide;
+        } else if (isShown() && e.which === KEY_TAB) {
+            if (e.shiftKey) {
+                func = selectPrevious;
+            } else {
+                func = selectNext;
+            }
+        } else if (isShown() && e.which === KEY_DOWN) {
+            func = selectNext;
+        } else if (isShown() && e.which === KEY_UP) {
+            func = selectPrevious;
+        } else if (isShown() && e.which === KEY_RETURN && activeResult >= 0) {
+            func = function() { applyAutocomplete(); hide(); };
+        } else if (isShown() && e.which === KEY_DELETE && activeResult >= 0) {
+            func = function() { applyDelete(); hide(); };
+        }
 
-		if (func !== null) {
-			e.preventDefault();
-			e.stopPropagation();
-			e.stopImmediatePropagation();
-			func();
-		} else {
-			window.clearTimeout(showTimeout);
-			showTimeout = window.setTimeout(showOrHide, 250);
-		}
-	});
+        if (func !== null) {
+            e.preventDefault();
+            e.stopPropagation();
+            e.stopImmediatePropagation();
+            func();
+        } else {
+            window.clearTimeout(showTimeout);
+            showTimeout = window.setTimeout(showOrHide, 250);
+        }
+    });
 
-	$input.blur(function(e) {
-		window.clearTimeout(showTimeout);
-		window.setTimeout(function() { hide(); }, 50);
-	});
+    $input.blur(function(e) {
+        window.clearTimeout(showTimeout);
+        window.setTimeout(function() { hide(); }, 50);
+    });
 
-	function getSelectionStart(){
-		var input = $input.get(0);
-		if (!input) {
-			return;
-		}
-		if ('selectionStart' in input) {
-			return input.selectionStart;
-		} else if (document.selection) {
-			input.focus();
-			var sel = document.selection.createRange();
-			var selLen = document.selection.createRange().text.length;
-			sel.moveStart('character', -input.value.length);
-			return sel.text.length - selLen;
-		} else {
-			return 0;
-		}
-	}
+    function getSelectionStart(){
+        var input = $input.get(0);
+        if (!input) {
+            return;
+        }
+        if ('selectionStart' in input) {
+            return input.selectionStart;
+        } else if (document.selection) {
+            input.focus();
+            var sel = document.selection.createRange();
+            var selLen = document.selection.createRange().text.length;
+            sel.moveStart('character', -input.value.length);
+            return sel.text.length - selLen;
+        } else {
+            return 0;
+        }
+    }
 
-	function getTextToFind() {
-		var val = $input.val();
-		var start = getSelectionStart();
-		return val.substring(0, start).replace(/.*\s/, '');
-	}
+    function getTextToFind() {
+        var val = $input.val();
+        var start = getSelectionStart();
+        return val.substring(0, start).replace(/.*\s/, '');
+    }
 
-	function showOrHide() {
-		var textToFind = getTextToFind();
-		if (textToFind.length === 0) {
-			hide();
-		} else {
-			updateResults(textToFind);
-			refreshList();
-		}
-	}
+    function showOrHide() {
+        var textToFind = getTextToFind();
+        if (textToFind.length === 0) {
+            hide();
+        } else {
+            updateResults(textToFind);
+            refreshList();
+        }
+    }
 
-	function isShown() {
-		return $div.is(':visible');
-	}
+    function isShown() {
+        return $div.is(':visible');
+    }
 
-	function hide() {
-		$div.hide();
-		window.clearInterval(monitorInputHidingInterval);
-	}
+    function hide() {
+        $div.hide();
+        window.clearInterval(monitorInputHidingInterval);
+    }
 
-	function selectPrevious() {
-		select(activeResult === -1 ? results.length - 1 : activeResult - 1);
-	}
+    function selectPrevious() {
+        select(activeResult === -1 ? results.length - 1 : activeResult - 1);
+    }
 
-	function selectNext() {
-		select(activeResult === -1 ? 0 : activeResult + 1);
-	}
+    function selectNext() {
+        select(activeResult === -1 ? 0 : activeResult + 1);
+    }
 
-	function select(newActiveResult) {
-		if (newActiveResult >= 0 && newActiveResult < results.length) {
-			activeResult = newActiveResult;
-			refreshActiveResult();
-		} else {
-			activeResult = - 1;
-			refreshActiveResult();
-		}
-	}
+    function select(newActiveResult) {
+        if (newActiveResult >= 0 && newActiveResult < results.length) {
+            activeResult = newActiveResult;
+            refreshActiveResult();
+        } else {
+            activeResult = - 1;
+            refreshActiveResult();
+        }
+    }
 
-	function getResultsFilter(textToFind) {
-		if (textToFind.length < options.minLengthToArbitrarySearch) {
-			return options.caseSensitive ?
-				function(resultItem) { return resultItem.tag.indexOf(textToFind) === 0; } :
-				function(resultItem) { return resultItem.tag.toLowerCase().indexOf(textToFind.toLowerCase()) === 0; };
-		} else {
-			return options.caseSensitive ?
-				function(resultItem) { return resultItem.tag.indexOf(textToFind) >= 0; } :
-				function(resultItem) { return resultItem.tag.toLowerCase().indexOf(textToFind.toLowerCase()) >= 0; };
-		}
-	}
+    function getResultsFilter(textToFind) {
+        if (textToFind.length < options.minLengthToArbitrarySearch) {
+            return options.caseSensitive ?
+                function(resultItem) { return resultItem.tag.indexOf(textToFind) === 0; } :
+                function(resultItem) { return resultItem.tag.toLowerCase().indexOf(textToFind.toLowerCase()) === 0; };
+        } else {
+            return options.caseSensitive ?
+                function(resultItem) { return resultItem.tag.indexOf(textToFind) >= 0; } :
+                function(resultItem) { return resultItem.tag.toLowerCase().indexOf(textToFind.toLowerCase()) >= 0; };
+        }
+    }
 
-	function updateResults(textToFind) {
-		var oldResults = results.slice();
-		var source = getSource();
-		var filter = getResultsFilter(textToFind);
-		results = _.filter(source, filter);
-		if (options.additionalFilter) {
-			results = options.additionalFilter(results);
-		}
-		results = results.slice(0, options.maxResults);
-		if (!_.isEqual(oldResults, results)) {
-			activeResult = -1;
-		}
-	}
+    function updateResults(textToFind) {
+        var oldResults = results.slice();
+        var source = getSource();
+        var filter = getResultsFilter(textToFind);
+        results = _.filter(source, filter);
+        if (options.additionalFilter) {
+            results = options.additionalFilter(results);
+        }
+        results = results.slice(0, options.maxResults);
+        if (!_.isEqual(oldResults, results)) {
+            activeResult = -1;
+        }
+    }
 
-	function applyDelete() {
-		if (options.onDelete) {
-			options.onDelete(results[activeResult].tag);
-		}
-	}
+    function applyDelete() {
+        if (options.onDelete) {
+            options.onDelete(results[activeResult].tag);
+        }
+    }
 
-	function applyAutocomplete() {
-		if (options.onApply) {
-			options.onApply(results[activeResult].tag);
-		} else {
-			var val = $input.val();
-			var start = getSelectionStart();
-			var prefix = '';
-			var suffix = val.substring(start);
-			var middle = val.substring(0, start);
-			var index = middle.lastIndexOf(' ');
-			if (index !== -1) {
-				prefix = val.substring(0, index + 1);
-				middle = val.substring(index + 1);
-			}
-			$input.val(prefix + results[activeResult].tag + ' ' + suffix.trimLeft());
-			$input.focus();
-		}
-	}
+    function applyAutocomplete() {
+        if (options.onApply) {
+            options.onApply(results[activeResult].tag);
+        } else {
+            var val = $input.val();
+            var start = getSelectionStart();
+            var prefix = '';
+            var suffix = val.substring(start);
+            var middle = val.substring(0, start);
+            var index = middle.lastIndexOf(' ');
+            if (index !== -1) {
+                prefix = val.substring(0, index + 1);
+                middle = val.substring(index + 1);
+            }
+            $input.val(prefix + results[activeResult].tag + ' ' + suffix.trimLeft());
+            $input.focus();
+        }
+    }
 
-	function refreshList() {
-		if (results.length === 0) {
-			hide();
-			return;
-		}
+    function refreshList() {
+        if (results.length === 0) {
+            hide();
+            return;
+        }
 
-		$list.empty();
-		_.each(results, function(resultItem, resultIndex) {
-			var $listItem = jQuery('<li/>');
-			$listItem.text(resultItem.caption);
-			$listItem.attr('data-key', resultItem.tag);
-			$listItem.hover(function(e) {
-				e.preventDefault();
-				activeResult = resultIndex;
-				refreshActiveResult();
-			});
-			$listItem.mousedown(function(e) {
-				e.preventDefault();
-				activeResult = resultIndex;
-				applyAutocomplete();
-				hide();
-			});
-			$list.append($listItem);
-		});
-		if (options.onRender) {
-			options.onRender($list);
-		}
-		refreshActiveResult();
+        $list.empty();
+        _.each(results, function(resultItem, resultIndex) {
+            var $listItem = jQuery('<li/>');
+            $listItem.text(resultItem.caption);
+            $listItem.attr('data-key', resultItem.tag);
+            $listItem.hover(function(e) {
+                e.preventDefault();
+                activeResult = resultIndex;
+                refreshActiveResult();
+            });
+            $listItem.mousedown(function(e) {
+                e.preventDefault();
+                activeResult = resultIndex;
+                applyAutocomplete();
+                hide();
+            });
+            $list.append($listItem);
+        });
+        if (options.onRender) {
+            options.onRender($list);
+        }
+        refreshActiveResult();
 
-		var x = $input.offset().left;
-		var y = $input.offset().top + $input.outerHeight() - 2;
-		if (y + $div.height() > window.innerHeight) {
-			y = $input.offset().top - $div.height();
-		}
-		$div.css({
-			left: x + 'px',
-			top: y + 'px',
-		});
-		$div.show();
-		monitorInputHiding();
-	}
+        var x = $input.offset().left;
+        var y = $input.offset().top + $input.outerHeight() - 2;
+        if (y + $div.height() > window.innerHeight) {
+            y = $input.offset().top - $div.height();
+        }
+        $div.css({
+            left: x + 'px',
+            top: y + 'px',
+        });
+        $div.show();
+        monitorInputHiding();
+    }
 
-	function refreshActiveResult() {
-		$list.find('li.active').removeClass('active');
-		if (activeResult >= 0) {
-			$list.find('li').eq(activeResult).addClass('active');
-		}
-	}
+    function refreshActiveResult() {
+        $list.find('li.active').removeClass('active');
+        if (activeResult >= 0) {
+            $list.find('li').eq(activeResult).addClass('active');
+        }
+    }
 
-	function monitorInputHiding() {
-		monitorInputHidingInterval = window.setInterval(function() {
-			if (!$input.is(':visible')) {
-				hide();
-			}
-		}, 100);
-	}
+    function monitorInputHiding() {
+        monitorInputHidingInterval = window.setInterval(function() {
+            if (!$input.is(':visible')) {
+                hide();
+            }
+        }, 100);
+    }
 
-	return options;
+    return options;
 };
diff --git a/public_html/js/Controls/FileDropper.js b/public_html/js/Controls/FileDropper.js
index c97fa19a..555f88d5 100644
--- a/public_html/js/Controls/FileDropper.js
+++ b/public_html/js/Controls/FileDropper.js
@@ -2,64 +2,64 @@ var App = App || {};
 App.Controls = App.Controls || {};
 
 App.Controls.FileDropper = function($fileInput) {
-	var _ = App.DI.get('_');
-	var jQuery = App.DI.get('jQuery');
+    var _ = App.DI.get('_');
+    var jQuery = App.DI.get('jQuery');
 
-	var options = {
-		onChange: null,
-		setNames: false,
-	};
+    var options = {
+        onChange: null,
+        setNames: false,
+    };
 
-	var $dropDiv = jQuery('<button type="button" class="file-handler"></button>');
-	var allowMultiple = $fileInput.attr('multiple');
-	$dropDiv.html((allowMultiple ? 'Drop files here!' : 'Drop file here!') + '<br/>Or just click on this box.');
-	$dropDiv.insertBefore($fileInput);
-	$fileInput.attr('multiple', allowMultiple);
-	$fileInput.hide();
+    var $dropDiv = jQuery('<button type="button" class="file-handler"></button>');
+    var allowMultiple = $fileInput.attr('multiple');
+    $dropDiv.html((allowMultiple ? 'Drop files here!' : 'Drop file here!') + '<br/>Or just click on this box.');
+    $dropDiv.insertBefore($fileInput);
+    $fileInput.attr('multiple', allowMultiple);
+    $fileInput.hide();
 
-	$fileInput.change(function(e) {
-		addFiles(this.files);
-	});
+    $fileInput.change(function(e) {
+        addFiles(this.files);
+    });
 
-	$dropDiv.on('dragenter', function(e) {
-		$dropDiv.addClass('active');
-	}).on('dragleave', function(e) {
-		$dropDiv.removeClass('active');
-	}).on('dragover', function(e) {
-		e.preventDefault();
-	}).on('drop', function(e) {
-		e.preventDefault();
-		addFiles(e.originalEvent.dataTransfer.files);
-	}).on('click', function(e) {
-		$fileInput.show().focus().trigger('click').hide();
-		$dropDiv.addClass('active');
-	});
+    $dropDiv.on('dragenter', function(e) {
+        $dropDiv.addClass('active');
+    }).on('dragleave', function(e) {
+        $dropDiv.removeClass('active');
+    }).on('dragover', function(e) {
+        e.preventDefault();
+    }).on('drop', function(e) {
+        e.preventDefault();
+        addFiles(e.originalEvent.dataTransfer.files);
+    }).on('click', function(e) {
+        $fileInput.show().focus().trigger('click').hide();
+        $dropDiv.addClass('active');
+    });
 
-	function addFiles(files) {
-		$dropDiv.removeClass('active');
-		if (!allowMultiple && files.length > 1) {
-			window.alert('Cannot select multiple files.');
-			return;
-		}
-		if (typeof(options.onChange) !== 'undefined') {
-			options.onChange(files);
-		}
-		if (options.setNames && !allowMultiple) {
-			$dropDiv.text(files[0].name);
-		}
-	}
+    function addFiles(files) {
+        $dropDiv.removeClass('active');
+        if (!allowMultiple && files.length > 1) {
+            window.alert('Cannot select multiple files.');
+            return;
+        }
+        if (typeof(options.onChange) !== 'undefined') {
+            options.onChange(files);
+        }
+        if (options.setNames && !allowMultiple) {
+            $dropDiv.text(files[0].name);
+        }
+    }
 
-	function readAsDataURL(file, callback) {
-		var reader = new FileReader();
-		reader.onloadend = function() {
-			callback(reader.result);
-		};
-		reader.readAsDataURL(file);
-	}
+    function readAsDataURL(file, callback) {
+        var reader = new FileReader();
+        reader.onloadend = function() {
+            callback(reader.result);
+        };
+        reader.readAsDataURL(file);
+    }
 
-	_.extend(options, {
-		readAsDataURL: readAsDataURL,
-	});
+    _.extend(options, {
+        readAsDataURL: readAsDataURL,
+    });
 
-	return options;
+    return options;
 };
diff --git a/public_html/js/Controls/TagInput.js b/public_html/js/Controls/TagInput.js
index 21b6e646..601c38fc 100644
--- a/public_html/js/Controls/TagInput.js
+++ b/public_html/js/Controls/TagInput.js
@@ -2,419 +2,419 @@ var App = App || {};
 App.Controls = App.Controls || {};
 
 App.Controls.TagInput = function($underlyingInput) {
-	var _ = App.DI.get('_');
-	var jQuery = App.DI.get('jQuery');
-	var promise = App.DI.get('promise');
-	var api = App.DI.get('api');
-	var tagList = App.DI.get('tagList');
+    var _ = App.DI.get('_');
+    var jQuery = App.DI.get('jQuery');
+    var promise = App.DI.get('promise');
+    var api = App.DI.get('api');
+    var tagList = App.DI.get('tagList');
 
-	var KEY_RETURN = 13;
-	var KEY_SPACE = 32;
-	var KEY_BACKSPACE = 8;
-	var tagConfirmKeys = [KEY_RETURN, KEY_SPACE];
-	var inputConfirmKeys = [KEY_RETURN];
+    var KEY_RETURN = 13;
+    var KEY_SPACE = 32;
+    var KEY_BACKSPACE = 8;
+    var tagConfirmKeys = [KEY_RETURN, KEY_SPACE];
+    var inputConfirmKeys = [KEY_RETURN];
 
-	var SOURCE_INITIAL_TEXT = 1;
-	var SOURCE_AUTOCOMPLETION = 2;
-	var SOURCE_PASTE = 3;
-	var SOURCE_IMPLICATIONS = 4;
-	var SOURCE_INPUT_BLUR = 5;
-	var SOURCE_INPUT_ENTER = 6;
-	var SOURCE_SUGGESTIONS = 7;
+    var SOURCE_INITIAL_TEXT = 1;
+    var SOURCE_AUTOCOMPLETION = 2;
+    var SOURCE_PASTE = 3;
+    var SOURCE_IMPLICATIONS = 4;
+    var SOURCE_INPUT_BLUR = 5;
+    var SOURCE_INPUT_ENTER = 6;
+    var SOURCE_SUGGESTIONS = 7;
 
-	var tags = [];
-	var options = {
-		beforeTagAdded: null,
-		beforeTagRemoved: null,
-		inputConfirmed: null,
-	};
+    var tags = [];
+    var options = {
+        beforeTagAdded: null,
+        beforeTagRemoved: null,
+        inputConfirmed: null,
+    };
 
-	var $wrapper = jQuery('<div class="tag-input">');
-	var $tagList = jQuery('<ul class="tags">');
-	var tagInputId = 'tags' + Math.random();
-	var $label = jQuery('<label for="' + tagInputId + '" style="display: none">Tags:</label>');
-	var $input = jQuery('<input class="tag-real-input" type="text" id="' + tagInputId + '"/>');
-	var $siblings = jQuery('<div class="related-tags"><span>Sibling tags:</span><ul>');
-	var $suggestions = jQuery('<div class="related-tags"><span>Suggested tags:</span><ul>');
-	init();
-	render();
-	initAutoComplete();
+    var $wrapper = jQuery('<div class="tag-input">');
+    var $tagList = jQuery('<ul class="tags">');
+    var tagInputId = 'tags' + Math.random();
+    var $label = jQuery('<label for="' + tagInputId + '" style="display: none">Tags:</label>');
+    var $input = jQuery('<input class="tag-real-input" type="text" id="' + tagInputId + '"/>');
+    var $siblings = jQuery('<div class="related-tags"><span>Sibling tags:</span><ul>');
+    var $suggestions = jQuery('<div class="related-tags"><span>Suggested tags:</span><ul>');
+    init();
+    render();
+    initAutoComplete();
 
-	function init() {
-		if ($underlyingInput.length === 0) {
-			throw new Error('Tag input element was not found');
-		}
-		if ($underlyingInput.length > 1) {
-			throw new Error('Cannot set tag input to more than one element at once');
-		}
-		if ($underlyingInput.attr('data-tagged')) {
-			throw new Error('Tag input was already initialized for this element');
-		}
-		$underlyingInput.attr('data-tagged', true);
-	}
+    function init() {
+        if ($underlyingInput.length === 0) {
+            throw new Error('Tag input element was not found');
+        }
+        if ($underlyingInput.length > 1) {
+            throw new Error('Cannot set tag input to more than one element at once');
+        }
+        if ($underlyingInput.attr('data-tagged')) {
+            throw new Error('Tag input was already initialized for this element');
+        }
+        $underlyingInput.attr('data-tagged', true);
+    }
 
-	function render() {
-		$underlyingInput.hide();
-		$wrapper.append($tagList);
-		$wrapper.append($label);
-		$wrapper.append($input);
-		$wrapper.insertAfter($underlyingInput);
-		$wrapper.click(function(e) {
-			if (e.target.nodeName === 'LI') {
-				return;
-			}
-			e.preventDefault();
-			$input.focus();
-		});
-		$input.attr('placeholder', $underlyingInput.attr('placeholder'));
-		$siblings.insertAfter($wrapper);
-		$suggestions.insertAfter($wrapper);
+    function render() {
+        $underlyingInput.hide();
+        $wrapper.append($tagList);
+        $wrapper.append($label);
+        $wrapper.append($input);
+        $wrapper.insertAfter($underlyingInput);
+        $wrapper.click(function(e) {
+            if (e.target.nodeName === 'LI') {
+                return;
+            }
+            e.preventDefault();
+            $input.focus();
+        });
+        $input.attr('placeholder', $underlyingInput.attr('placeholder'));
+        $siblings.insertAfter($wrapper);
+        $suggestions.insertAfter($wrapper);
 
-		processText($underlyingInput.val(), SOURCE_INITIAL_TEXT);
+        processText($underlyingInput.val(), SOURCE_INITIAL_TEXT);
 
-		$underlyingInput.val('');
-	}
+        $underlyingInput.val('');
+    }
 
-	function initAutoComplete() {
-		var autoComplete = new App.Controls.AutoCompleteInput($input);
-		autoComplete.onDelete = function(text) {
-			removeTag(text);
-			$input.val('');
-		};
-		autoComplete.onApply = function(text) {
-			processText(text, SOURCE_AUTOCOMPLETION);
-			$input.val('');
-		};
-		autoComplete.additionalFilter = function(results) {
-			return _.filter(results, function(resultItem) {
-				return !_.contains(getTags(), resultItem[0]);
-			});
-		};
-		autoComplete.onRender = function($list) {
-			$list.find('li').each(function() {
-				var $li = jQuery(this);
-				if (isTaggedWith($li.attr('data-key'))) {
-					$li.css('opacity', '0.5');
-				}
-			});
-		};
-	}
+    function initAutoComplete() {
+        var autoComplete = new App.Controls.AutoCompleteInput($input);
+        autoComplete.onDelete = function(text) {
+            removeTag(text);
+            $input.val('');
+        };
+        autoComplete.onApply = function(text) {
+            processText(text, SOURCE_AUTOCOMPLETION);
+            $input.val('');
+        };
+        autoComplete.additionalFilter = function(results) {
+            return _.filter(results, function(resultItem) {
+                return !_.contains(getTags(), resultItem[0]);
+            });
+        };
+        autoComplete.onRender = function($list) {
+            $list.find('li').each(function() {
+                var $li = jQuery(this);
+                if (isTaggedWith($li.attr('data-key'))) {
+                    $li.css('opacity', '0.5');
+                }
+            });
+        };
+    }
 
-	$input.bind('focus', function(e) {
-		$wrapper.addClass('focused');
-	});
-	$input.bind('blur', function(e) {
-		$wrapper.removeClass('focused');
-		var tagName = $input.val();
-		addTag(tagName, SOURCE_INPUT_BLUR);
-		$input.val('');
-	});
+    $input.bind('focus', function(e) {
+        $wrapper.addClass('focused');
+    });
+    $input.bind('blur', function(e) {
+        $wrapper.removeClass('focused');
+        var tagName = $input.val();
+        addTag(tagName, SOURCE_INPUT_BLUR);
+        $input.val('');
+    });
 
-	$input.bind('paste', function(e) {
-		e.preventDefault();
-		var pastedText;
-		if (window.clipboardData) {
-			pastedText = window.clipboardData.getData('Text');
-		} else {
-			pastedText = (e.originalEvent || e).clipboardData.getData('text/plain');
-		}
+    $input.bind('paste', function(e) {
+        e.preventDefault();
+        var pastedText;
+        if (window.clipboardData) {
+            pastedText = window.clipboardData.getData('Text');
+        } else {
+            pastedText = (e.originalEvent || e).clipboardData.getData('text/plain');
+        }
 
-		if (pastedText.length > 2000) {
-			window.alert('Pasted text is too long.');
-			return;
-		}
+        if (pastedText.length > 2000) {
+            window.alert('Pasted text is too long.');
+            return;
+        }
 
-		processTextWithoutLast(pastedText, SOURCE_PASTE);
-	});
+        processTextWithoutLast(pastedText, SOURCE_PASTE);
+    });
 
-	$input.bind('keydown', function(e) {
-		if (_.contains(inputConfirmKeys, e.which) && !$input.val()) {
-			e.preventDefault();
-			if (typeof(options.inputConfirmed) !== 'undefined') {
-				options.inputConfirmed();
-			}
-		} else if (_.contains(tagConfirmKeys, e.which)) {
-			var tagName = $input.val();
-			e.preventDefault();
-			$input.val('');
-			addTag(tagName, SOURCE_INPUT_ENTER);
-		} else if (e.which === KEY_BACKSPACE && jQuery(this).val().length === 0) {
-			e.preventDefault();
-			removeLastTag();
-		}
-	});
+    $input.bind('keydown', function(e) {
+        if (_.contains(inputConfirmKeys, e.which) && !$input.val()) {
+            e.preventDefault();
+            if (typeof(options.inputConfirmed) !== 'undefined') {
+                options.inputConfirmed();
+            }
+        } else if (_.contains(tagConfirmKeys, e.which)) {
+            var tagName = $input.val();
+            e.preventDefault();
+            $input.val('');
+            addTag(tagName, SOURCE_INPUT_ENTER);
+        } else if (e.which === KEY_BACKSPACE && jQuery(this).val().length === 0) {
+            e.preventDefault();
+            removeLastTag();
+        }
+    });
 
-	function explodeText(text) {
-		return _.filter(text.trim().split(/\s+/), function(item) {
-			return item.length > 0;
-		});
-	}
+    function explodeText(text) {
+        return _.filter(text.trim().split(/\s+/), function(item) {
+            return item.length > 0;
+        });
+    }
 
-	function processText(text, source) {
-		var tagNamesToAdd = explodeText(text);
-		_.map(tagNamesToAdd, function(tagName) { addTag(tagName, source); });
-	}
+    function processText(text, source) {
+        var tagNamesToAdd = explodeText(text);
+        _.map(tagNamesToAdd, function(tagName) { addTag(tagName, source); });
+    }
 
-	function processTextWithoutLast(text, source) {
-		var tagNamesToAdd = explodeText(text);
-		var lastTagName = tagNamesToAdd.pop();
-		_.map(tagNamesToAdd, function(tagName) { addTag(tagName, source); });
-		$input.val(lastTagName);
-	}
+    function processTextWithoutLast(text, source) {
+        var tagNamesToAdd = explodeText(text);
+        var lastTagName = tagNamesToAdd.pop();
+        _.map(tagNamesToAdd, function(tagName) { addTag(tagName, source); });
+        $input.val(lastTagName);
+    }
 
-	function addTag(tagName, source) {
-		tagName = tagName.trim();
-		if (tagName.length === 0) {
-			return;
-		}
+    function addTag(tagName, source) {
+        tagName = tagName.trim();
+        if (tagName.length === 0) {
+            return;
+        }
 
-		if (tagName.length > 64) {
-			//showing alert inside keydown event leads to mysterious behaviors
-			//in some browsers, hence the timeout
-			window.setTimeout(function() {
-				window.alert('Tag is too long.');
-			}, 10);
-			return;
-		}
+        if (tagName.length > 64) {
+            //showing alert inside keydown event leads to mysterious behaviors
+            //in some browsers, hence the timeout
+            window.setTimeout(function() {
+                window.alert('Tag is too long.');
+            }, 10);
+            return;
+        }
 
-		if (isTaggedWith(tagName)) {
-			flashTagRed(tagName);
-		} else {
-			beforeTagAdded(tagName, source);
+        if (isTaggedWith(tagName)) {
+            flashTagRed(tagName);
+        } else {
+            beforeTagAdded(tagName, source);
 
-			var exportedTag = getExportedTag(tagName);
-			if (!exportedTag || !exportedTag.banned) {
-				tags.push(tagName);
-				var $elem = createListElement(tagName);
-				$tagList.append($elem);
-			}
+            var exportedTag = getExportedTag(tagName);
+            if (!exportedTag || !exportedTag.banned) {
+                tags.push(tagName);
+                var $elem = createListElement(tagName);
+                $tagList.append($elem);
+            }
 
-			afterTagAdded(tagName, source);
-		}
-	}
+            afterTagAdded(tagName, source);
+        }
+    }
 
-	function beforeTagRemoved(tagName) {
-		if (typeof(options.beforeTagRemoved) === 'function') {
-			options.beforeTagRemoved(tagName);
-		}
-	}
+    function beforeTagRemoved(tagName) {
+        if (typeof(options.beforeTagRemoved) === 'function') {
+            options.beforeTagRemoved(tagName);
+        }
+    }
 
-	function afterTagRemoved(tagName) {
-		refreshShownSiblings();
-	}
+    function afterTagRemoved(tagName) {
+        refreshShownSiblings();
+    }
 
-	function beforeTagAdded(tagName, source) {
-		if (typeof(options.beforeTagAdded) === 'function') {
-			options.beforeTagAdded(tagName);
-		}
-	}
+    function beforeTagAdded(tagName, source) {
+        if (typeof(options.beforeTagAdded) === 'function') {
+            options.beforeTagAdded(tagName);
+        }
+    }
 
-	function afterTagAdded(tagName, source) {
-		if (source === SOURCE_IMPLICATIONS) {
-			flashTagYellow(tagName);
-		} else if (source !== SOURCE_INITIAL_TEXT) {
-			var tag = getExportedTag(tagName);
-			if (tag) {
-				_.each(tag.implications, function(impliedTagName) {
-					if (!isTaggedWith(impliedTagName)) {
-						addTag(impliedTagName, SOURCE_IMPLICATIONS);
-					}
-				});
-				if (source !== SOURCE_IMPLICATIONS && source !== SOURCE_SUGGESTIONS) {
-					showOrHideSuggestions(tagName);
-					refreshShownSiblings();
-				}
-			} else {
-				flashTagGreen(tagName);
-			}
-		}
-	}
+    function afterTagAdded(tagName, source) {
+        if (source === SOURCE_IMPLICATIONS) {
+            flashTagYellow(tagName);
+        } else if (source !== SOURCE_INITIAL_TEXT) {
+            var tag = getExportedTag(tagName);
+            if (tag) {
+                _.each(tag.implications, function(impliedTagName) {
+                    if (!isTaggedWith(impliedTagName)) {
+                        addTag(impliedTagName, SOURCE_IMPLICATIONS);
+                    }
+                });
+                if (source !== SOURCE_IMPLICATIONS && source !== SOURCE_SUGGESTIONS) {
+                    showOrHideSuggestions(tagName);
+                    refreshShownSiblings();
+                }
+            } else {
+                flashTagGreen(tagName);
+            }
+        }
+    }
 
-	function getExportedTag(tagName) {
-		return _.first(_.filter(
-			tagList.getTags(),
-			function(t) {
-				return t.name.toLowerCase() === tagName.toLowerCase();
-			}));
-	}
+    function getExportedTag(tagName) {
+        return _.first(_.filter(
+            tagList.getTags(),
+            function(t) {
+                return t.name.toLowerCase() === tagName.toLowerCase();
+            }));
+    }
 
-	function removeTag(tagName) {
-		var oldTagNames = getTags();
-		var newTagNames = _.without(oldTagNames, tagName);
-		if (newTagNames.length !== oldTagNames.length) {
-			beforeTagRemoved(tagName);
-			setTags(newTagNames);
-			afterTagRemoved(tagName);
-		}
-	}
+    function removeTag(tagName) {
+        var oldTagNames = getTags();
+        var newTagNames = _.without(oldTagNames, tagName);
+        if (newTagNames.length !== oldTagNames.length) {
+            beforeTagRemoved(tagName);
+            setTags(newTagNames);
+            afterTagRemoved(tagName);
+        }
+    }
 
-	function isTaggedWith(tagName) {
-		var tagNames = _.map(getTags(), function(tagName) {
-			return tagName.toLowerCase();
-		});
-		return _.contains(tagNames, tagName.toLowerCase());
-	}
+    function isTaggedWith(tagName) {
+        var tagNames = _.map(getTags(), function(tagName) {
+            return tagName.toLowerCase();
+        });
+        return _.contains(tagNames, tagName.toLowerCase());
+    }
 
-	function removeLastTag() {
-		removeTag(_.last(getTags()));
-	}
+    function removeLastTag() {
+        removeTag(_.last(getTags()));
+    }
 
-	function flashTagRed(tagName) {
-		flashTag(tagName, 'rgba(255, 200, 200, 1)');
-	}
+    function flashTagRed(tagName) {
+        flashTag(tagName, 'rgba(255, 200, 200, 1)');
+    }
 
-	function flashTagYellow(tagName) {
-		flashTag(tagName, 'rgba(255, 255, 200, 1)');
-	}
+    function flashTagYellow(tagName) {
+        flashTag(tagName, 'rgba(255, 255, 200, 1)');
+    }
 
-	function flashTagGreen(tagName) {
-		flashTag(tagName, 'rgba(200, 255, 200, 1)');
-	}
+    function flashTagGreen(tagName) {
+        flashTag(tagName, 'rgba(200, 255, 200, 1)');
+    }
 
-	function flashTag(tagName, color) {
-		var $elem = getListElement(tagName);
-		$elem.css({backgroundColor: color});
-	}
+    function flashTag(tagName, color) {
+        var $elem = getListElement(tagName);
+        $elem.css({backgroundColor: color});
+    }
 
-	function getListElement(tagName) {
-		return $tagList.find('li[data-tag="' + tagName.toLowerCase() + '"]');
-	}
+    function getListElement(tagName) {
+        return $tagList.find('li[data-tag="' + tagName.toLowerCase() + '"]');
+    }
 
-	function setTags(newTagNames) {
-		tags = newTagNames.slice();
-		$tagList.empty();
-		$underlyingInput.val(newTagNames.join(' '));
-		_.each(newTagNames, function(tagName) {
-			var $elem = createListElement(tagName);
-			$tagList.append($elem);
-		});
-	}
+    function setTags(newTagNames) {
+        tags = newTagNames.slice();
+        $tagList.empty();
+        $underlyingInput.val(newTagNames.join(' '));
+        _.each(newTagNames, function(tagName) {
+            var $elem = createListElement(tagName);
+            $tagList.append($elem);
+        });
+    }
 
-	function createListElement(tagName) {
-		var $elem = jQuery('<li/>');
-		$elem.attr('data-tag', tagName.toLowerCase());
+    function createListElement(tagName) {
+        var $elem = jQuery('<li/>');
+        $elem.attr('data-tag', tagName.toLowerCase());
 
-		var $tagLink = jQuery('<a class="tag">');
-		$tagLink.text(tagName + ' ' /* for easy copying */);
-		$tagLink.click(function(e) {
-			e.preventDefault();
-			showOrHideSiblings(tagName);
-			showOrHideSuggestions(tagName);
-		});
-		$elem.append($tagLink);
+        var $tagLink = jQuery('<a class="tag">');
+        $tagLink.text(tagName + ' ' /* for easy copying */);
+        $tagLink.click(function(e) {
+            e.preventDefault();
+            showOrHideSiblings(tagName);
+            showOrHideSuggestions(tagName);
+        });
+        $elem.append($tagLink);
 
-		var $deleteButton = jQuery('<a class="close"><i class="fa fa-remove"></i></a>');
-		$deleteButton.click(function(e) {
-			e.preventDefault();
-			removeTag(tagName);
-			$input.focus();
-		});
-		$elem.append($deleteButton);
-		return $elem;
-	}
+        var $deleteButton = jQuery('<a class="close"><i class="fa fa-remove"></i></a>');
+        $deleteButton.click(function(e) {
+            e.preventDefault();
+            removeTag(tagName);
+            $input.focus();
+        });
+        $elem.append($deleteButton);
+        return $elem;
+    }
 
-	function showOrHideSuggestions(tagName) {
-		var tag = getExportedTag(tagName);
-		var suggestions = tag ? tag.suggestions : [];
-		updateSuggestions($suggestions, suggestions);
-	}
+    function showOrHideSuggestions(tagName) {
+        var tag = getExportedTag(tagName);
+        var suggestions = tag ? tag.suggestions : [];
+        updateSuggestions($suggestions, suggestions);
+    }
 
-	function showOrHideSiblings(tagName) {
-		if ($siblings.data('lastTag') === tagName && $siblings.is(':visible')) {
-			$siblings.slideUp('fast');
-			$siblings.data('lastTag', null);
-			return;
-		}
+    function showOrHideSiblings(tagName) {
+        if ($siblings.data('lastTag') === tagName && $siblings.is(':visible')) {
+            $siblings.slideUp('fast');
+            $siblings.data('lastTag', null);
+            return;
+        }
 
-		promise.wait(getSiblings(tagName), promise.make(function(resolve, reject) {
-			$siblings.slideUp('fast', resolve);
-		})).then(function(siblings) {
-			siblings = _.pluck(siblings, 'name');
-			$siblings.data('lastTag', tagName);
-			$siblings.data('siblings', siblings);
-			updateSuggestions($siblings, siblings);
-		}).fail(function() {
-		});
-	}
+        promise.wait(getSiblings(tagName), promise.make(function(resolve, reject) {
+            $siblings.slideUp('fast', resolve);
+        })).then(function(siblings) {
+            siblings = _.pluck(siblings, 'name');
+            $siblings.data('lastTag', tagName);
+            $siblings.data('siblings', siblings);
+            updateSuggestions($siblings, siblings);
+        }).fail(function() {
+        });
+    }
 
-	function refreshShownSiblings() {
-		updateSuggestions($siblings, $siblings.data('siblings'));
-	}
+    function refreshShownSiblings() {
+        updateSuggestions($siblings, $siblings.data('siblings'));
+    }
 
-	function updateSuggestions($target, suggestedTagNames) {
-		function filterSuggestions(sourceTagNames) {
-			if (!sourceTagNames) {
-				return [];
-			}
-			var tagNames = _.filter(sourceTagNames.slice(), function(tagName) {
-				return !isTaggedWith(tagName);
-			});
-			tagNames = tagNames.slice(0, 20);
-			return tagNames;
-		}
+    function updateSuggestions($target, suggestedTagNames) {
+        function filterSuggestions(sourceTagNames) {
+            if (!sourceTagNames) {
+                return [];
+            }
+            var tagNames = _.filter(sourceTagNames.slice(), function(tagName) {
+                return !isTaggedWith(tagName);
+            });
+            tagNames = tagNames.slice(0, 20);
+            return tagNames;
+        }
 
-		function attachTagsToSuggestionList($list, tagNames) {
-			$list.empty();
-			_.each(tagNames, function(tagName) {
-				var $li = jQuery('<li>');
-				var $a = jQuery('<a href="#/posts/query=' + tagName + '">');
-				$a.text(tagName);
-				$a.click(function(e) {
-					e.preventDefault();
-					addTag(tagName, SOURCE_SUGGESTIONS);
-					$li.fadeOut('fast', function() {
-						$li.remove();
-						if ($list.children().length === 0) {
-							$list.parent('div').slideUp('fast');
-						}
-					});
-				});
-				$li.append($a);
-				$list.append($li);
-			});
-		}
+        function attachTagsToSuggestionList($list, tagNames) {
+            $list.empty();
+            _.each(tagNames, function(tagName) {
+                var $li = jQuery('<li>');
+                var $a = jQuery('<a href="#/posts/query=' + tagName + '">');
+                $a.text(tagName);
+                $a.click(function(e) {
+                    e.preventDefault();
+                    addTag(tagName, SOURCE_SUGGESTIONS);
+                    $li.fadeOut('fast', function() {
+                        $li.remove();
+                        if ($list.children().length === 0) {
+                            $list.parent('div').slideUp('fast');
+                        }
+                    });
+                });
+                $li.append($a);
+                $list.append($li);
+            });
+        }
 
-		var suggestions = filterSuggestions(suggestedTagNames);
-		if (suggestions.length > 0) {
-			attachTagsToSuggestionList($target.find('ul'), suggestions);
-			$target.slideDown('fast');
-		} else {
-			$target.slideUp('fast');
-		}
-	}
+        var suggestions = filterSuggestions(suggestedTagNames);
+        if (suggestions.length > 0) {
+            attachTagsToSuggestionList($target.find('ul'), suggestions);
+            $target.slideDown('fast');
+        } else {
+            $target.slideUp('fast');
+        }
+    }
 
-	function getSiblings(tagName) {
-		return promise.make(function(resolve, reject) {
-			promise.wait(api.get('/tags/' + tagName + '/siblings'))
-				.then(function(response) {
-					resolve(response.json.data);
-				}).fail(function() {
-					reject();
-				});
-		});
-	}
+    function getSiblings(tagName) {
+        return promise.make(function(resolve, reject) {
+            promise.wait(api.get('/tags/' + tagName + '/siblings'))
+                .then(function(response) {
+                    resolve(response.json.data);
+                }).fail(function() {
+                    reject();
+                });
+        });
+    }
 
-	function getTags() {
-		return tags;
-	}
+    function getTags() {
+        return tags;
+    }
 
-	function focus() {
-		$input.focus();
-	}
+    function focus() {
+        $input.focus();
+    }
 
-	function hideSuggestions() {
-		$siblings.hide();
-		$suggestions.hide();
-		$siblings.data('siblings', []);
-	}
+    function hideSuggestions() {
+        $siblings.hide();
+        $suggestions.hide();
+        $siblings.data('siblings', []);
+    }
 
-	_.extend(options, {
-		setTags: setTags,
-		getTags: getTags,
-		removeTag: removeTag,
-		addTag: addTag,
-		focus: focus,
-		hideSuggestions: hideSuggestions,
-	});
-	return options;
+    _.extend(options, {
+        setTags: setTags,
+        getTags: getTags,
+        removeTag: removeTag,
+        addTag: addTag,
+        focus: focus,
+        hideSuggestions: hideSuggestions,
+    });
+    return options;
 };
diff --git a/public_html/js/DI.js b/public_html/js/DI.js
index ebd03234..19801d5b 100644
--- a/public_html/js/DI.js
+++ b/public_html/js/DI.js
@@ -2,53 +2,53 @@ var App = App || {};
 
 App.DI = (function() {
 
-	var factories = {};
-	var instances = {};
+    var factories = {};
+    var instances = {};
 
-	function get(key) {
-		var instance = instances[key];
-		if (!instance) {
-			var factory = factories[key];
-			if (!factory) {
-				throw new Error('Unregistered key: ' + key);
-			}
-			var objectInitializer = factory.initializer;
-			var singleton = factory.singleton;
-			var deps = resolveDependencies(objectInitializer, factory.dependencies);
-			instance = {};
-			instance = objectInitializer.apply(instance, deps);
-			if (singleton) {
-				instances[key] = instance;
-			}
-		}
-		return instance;
-	}
+    function get(key) {
+        var instance = instances[key];
+        if (!instance) {
+            var factory = factories[key];
+            if (!factory) {
+                throw new Error('Unregistered key: ' + key);
+            }
+            var objectInitializer = factory.initializer;
+            var singleton = factory.singleton;
+            var deps = resolveDependencies(objectInitializer, factory.dependencies);
+            instance = {};
+            instance = objectInitializer.apply(instance, deps);
+            if (singleton) {
+                instances[key] = instance;
+            }
+        }
+        return instance;
+    }
 
-	function resolveDependencies(objectIntializer, depKeys) {
-		var deps = [];
-		for (var i = 0; i < depKeys.length; i ++) {
-			deps[i] = get(depKeys[i]);
-		}
-		return deps;
-	}
+    function resolveDependencies(objectIntializer, depKeys) {
+        var deps = [];
+        for (var i = 0; i < depKeys.length; i ++) {
+            deps[i] = get(depKeys[i]);
+        }
+        return deps;
+    }
 
-	function register(key, dependencies, objectInitializer) {
-		factories[key] = {initializer: objectInitializer, singleton: false, dependencies: dependencies};
-	}
+    function register(key, dependencies, objectInitializer) {
+        factories[key] = {initializer: objectInitializer, singleton: false, dependencies: dependencies};
+    }
 
-	function registerSingleton(key, dependencies, objectInitializer) {
-		factories[key] = {initializer: objectInitializer, singleton: true, dependencies: dependencies};
-	}
+    function registerSingleton(key, dependencies, objectInitializer) {
+        factories[key] = {initializer: objectInitializer, singleton: true, dependencies: dependencies};
+    }
 
-	function registerManual(key, objectInitializer) {
-		instances[key] = objectInitializer();
-	}
+    function registerManual(key, objectInitializer) {
+        instances[key] = objectInitializer();
+    }
 
-	return {
-		get: get,
-		register: register,
-		registerManual: registerManual,
-		registerSingleton: registerSingleton,
-	};
+    return {
+        get: get,
+        register: register,
+        registerManual: registerManual,
+        registerSingleton: registerSingleton,
+    };
 
 })();
diff --git a/public_html/js/Keyboard.js b/public_html/js/Keyboard.js
index 33dd3f8f..b7169c4a 100644
--- a/public_html/js/Keyboard.js
+++ b/public_html/js/Keyboard.js
@@ -2,60 +2,60 @@ var App = App || {};
 
 App.Keyboard = function(jQuery, mousetrap, browsingSettings) {
 
-	var enabled = browsingSettings.getSettings().keyboardShortcuts;
-	var oldStopCallback = mousetrap.stopCallback;
-	mousetrap.stopCallback = function(e, element, combo, sequence) {
-		if (combo.indexOf('ctrl') === -1 && e.ctrlKey) {
-			return true;
-		}
-		if (combo.indexOf('alt') === -1 && e.altKey) {
-			return true;
-		}
-		if (combo.indexOf('ctrl') !== -1) {
-			return false;
-		}
-		var $focused = jQuery(':focus').eq(0);
-		if ($focused.length) {
-			if ($focused.prop('tagName').match(/embed|object/i)) {
-				return true;
-			}
-			if ($focused.prop('tagName').toLowerCase() === 'input' &&
-				$focused.attr('type').match(/checkbox|radio/i)) {
-				return false;
-			}
-		}
-		return oldStopCallback.apply(mousetrap, arguments);
-	};
+    var enabled = browsingSettings.getSettings().keyboardShortcuts;
+    var oldStopCallback = mousetrap.stopCallback;
+    mousetrap.stopCallback = function(e, element, combo, sequence) {
+        if (combo.indexOf('ctrl') === -1 && e.ctrlKey) {
+            return true;
+        }
+        if (combo.indexOf('alt') === -1 && e.altKey) {
+            return true;
+        }
+        if (combo.indexOf('ctrl') !== -1) {
+            return false;
+        }
+        var $focused = jQuery(':focus').eq(0);
+        if ($focused.length) {
+            if ($focused.prop('tagName').match(/embed|object/i)) {
+                return true;
+            }
+            if ($focused.prop('tagName').toLowerCase() === 'input' &&
+                $focused.attr('type').match(/checkbox|radio/i)) {
+                return false;
+            }
+        }
+        return oldStopCallback.apply(mousetrap, arguments);
+    };
 
-	function keyup(key, callback) {
-		unbind(key);
-		if (enabled) {
-			mousetrap.bind(key, callback, 'keyup');
-		}
-	}
+    function keyup(key, callback) {
+        unbind(key);
+        if (enabled) {
+            mousetrap.bind(key, callback, 'keyup');
+        }
+    }
 
-	function keydown(key, callback) {
-		unbind(key);
-		if (enabled) {
-			mousetrap.bind(key, callback);
-		}
-	}
+    function keydown(key, callback) {
+        unbind(key);
+        if (enabled) {
+            mousetrap.bind(key, callback);
+        }
+    }
 
-	function reset() {
-		mousetrap.reset();
-	}
+    function reset() {
+        mousetrap.reset();
+    }
 
-	function unbind(key) {
-		mousetrap.unbind(key, 'keyup');
-		mousetrap.unbind(key);
-	}
+    function unbind(key) {
+        mousetrap.unbind(key, 'keyup');
+        mousetrap.unbind(key);
+    }
 
-	return {
-		keydown: keydown,
-		keyup: keyup,
-		reset: reset,
-		unbind: unbind,
-	};
+    return {
+        keydown: keydown,
+        keyup: keyup,
+        reset: reset,
+        unbind: unbind,
+    };
 };
 
 App.DI.register('keyboard', ['jQuery', 'mousetrap', 'browsingSettings'], App.Keyboard);
diff --git a/public_html/js/Pager.js b/public_html/js/Pager.js
index 2ae4adde..2b15dcc0 100644
--- a/public_html/js/Pager.js
+++ b/public_html/js/Pager.js
@@ -1,142 +1,142 @@
 var App = App || {};
 
 App.Pager = function(
-	_,
-	promise,
-	api) {
+    _,
+    promise,
+    api) {
 
-	var totalPages;
-	var pageNumber;
-	var searchParams;
-	var url;
-	var cache = {};
+    var totalPages;
+    var pageNumber;
+    var searchParams;
+    var url;
+    var cache = {};
 
-	function init(args) {
-		url = args.url;
+    function init(args) {
+        url = args.url;
 
-		setSearchParams(args.searchParams);
-		if (typeof(args.page) !== 'undefined') {
-			setPage(args.page);
-		} else {
-			setPage(1);
-		}
-	}
+        setSearchParams(args.searchParams);
+        if (typeof(args.page) !== 'undefined') {
+            setPage(args.page);
+        } else {
+            setPage(1);
+        }
+    }
 
-	function getPage() {
-		return pageNumber;
-	}
+    function getPage() {
+        return pageNumber;
+    }
 
-	function getTotalPages() {
-		return totalPages;
-	}
+    function getTotalPages() {
+        return totalPages;
+    }
 
-	function prevPage() {
-		if (pageNumber > 1) {
-			setPage(pageNumber - 1);
-			return true;
-		}
-		return false;
-	}
+    function prevPage() {
+        if (pageNumber > 1) {
+            setPage(pageNumber - 1);
+            return true;
+        }
+        return false;
+    }
 
-	function nextPage() {
-		if (pageNumber < totalPages) {
-			setPage(pageNumber + 1);
-			return true;
-		}
-		return false;
-	}
+    function nextPage() {
+        if (pageNumber < totalPages) {
+            setPage(pageNumber + 1);
+            return true;
+        }
+        return false;
+    }
 
-	function setPage(newPageNumber) {
-		pageNumber = parseInt(newPageNumber);
-		if (!pageNumber || isNaN(pageNumber)) {
-			throw new Error('Trying to set page to a non-number (' + newPageNumber + ')');
-		}
-	}
+    function setPage(newPageNumber) {
+        pageNumber = parseInt(newPageNumber);
+        if (!pageNumber || isNaN(pageNumber)) {
+            throw new Error('Trying to set page to a non-number (' + newPageNumber + ')');
+        }
+    }
 
-	function getSearchParams() {
-		return searchParams;
-	}
+    function getSearchParams() {
+        return searchParams;
+    }
 
-	function setSearchParams(newSearchParams) {
-		setPage(1);
-		searchParams = _.extend({}, newSearchParams);
-		delete searchParams.page;
-	}
+    function setSearchParams(newSearchParams) {
+        setPage(1);
+        searchParams = _.extend({}, newSearchParams);
+        delete searchParams.page;
+    }
 
-	function retrieve() {
-		return promise.make(function(resolve, reject) {
-			promise.wait(api.get(url, _.extend({}, searchParams, {page: pageNumber})))
-				.then(function(response) {
-					var pageSize = response.json.pageSize;
-					var totalRecords = response.json.totalRecords;
-					totalPages = Math.ceil(totalRecords / pageSize);
+    function retrieve() {
+        return promise.make(function(resolve, reject) {
+            promise.wait(api.get(url, _.extend({}, searchParams, {page: pageNumber})))
+                .then(function(response) {
+                    var pageSize = response.json.pageSize;
+                    var totalRecords = response.json.totalRecords;
+                    totalPages = Math.ceil(totalRecords / pageSize);
 
-					resolve({
-						entities: response.json.data,
-						totalRecords: totalRecords,
-						totalPages: totalPages});
+                    resolve({
+                        entities: response.json.data,
+                        totalRecords: totalRecords,
+                        totalPages: totalPages});
 
-				}).fail(function(response) {
-					reject(response);
-				});
-		});
-	}
+                }).fail(function(response) {
+                    reject(response);
+                });
+        });
+    }
 
-	function retrieveCached() {
-		return promise.make(function(resolve, reject) {
-			var cacheKey = JSON.stringify(_.extend({}, searchParams, {url: url, page: getPage()}));
-			if (cacheKey in cache) {
-				resolve.apply(this, cache[cacheKey]);
-			} else {
-				promise.wait(retrieve())
-					.then(function() {
-						cache[cacheKey] = arguments;
-						resolve.apply(this, arguments);
-					}).fail(function() {
-						reject.apply(this, arguments);
-					});
-			}
-		});
-	}
+    function retrieveCached() {
+        return promise.make(function(resolve, reject) {
+            var cacheKey = JSON.stringify(_.extend({}, searchParams, {url: url, page: getPage()}));
+            if (cacheKey in cache) {
+                resolve.apply(this, cache[cacheKey]);
+            } else {
+                promise.wait(retrieve())
+                    .then(function() {
+                        cache[cacheKey] = arguments;
+                        resolve.apply(this, arguments);
+                    }).fail(function() {
+                        reject.apply(this, arguments);
+                    });
+            }
+        });
+    }
 
-	function resetCache() {
-		cache = {};
-	}
+    function resetCache() {
+        cache = {};
+    }
 
-	function getVisiblePages() {
-		var pages = [1, totalPages || 1];
-		var pagesAroundCurrent = 2;
-		for (var i = -pagesAroundCurrent; i <= pagesAroundCurrent; i ++) {
-			if (pageNumber + i >= 1 && pageNumber + i <= totalPages) {
-				pages.push(pageNumber + i);
-			}
-		}
-		if (pageNumber - pagesAroundCurrent - 1 === 2) {
-			pages.push(2);
-		}
-		if (pageNumber + pagesAroundCurrent + 1 === totalPages - 1) {
-			pages.push(totalPages - 1);
-		}
+    function getVisiblePages() {
+        var pages = [1, totalPages || 1];
+        var pagesAroundCurrent = 2;
+        for (var i = -pagesAroundCurrent; i <= pagesAroundCurrent; i ++) {
+            if (pageNumber + i >= 1 && pageNumber + i <= totalPages) {
+                pages.push(pageNumber + i);
+            }
+        }
+        if (pageNumber - pagesAroundCurrent - 1 === 2) {
+            pages.push(2);
+        }
+        if (pageNumber + pagesAroundCurrent + 1 === totalPages - 1) {
+            pages.push(totalPages - 1);
+        }
 
-		return pages.sort(function(a, b) { return a - b; }).filter(function(item, pos) {
-			return !pos || item !== pages[pos - 1];
-		});
-	}
+        return pages.sort(function(a, b) { return a - b; }).filter(function(item, pos) {
+            return !pos || item !== pages[pos - 1];
+        });
+    }
 
-	return {
-		init: init,
-		getPage: getPage,
-		getTotalPages: getTotalPages,
-		prevPage: prevPage,
-		nextPage: nextPage,
-		setPage: setPage,
-		getSearchParams: getSearchParams,
-		setSearchParams: setSearchParams,
-		retrieve: retrieve,
-		retrieveCached: retrieveCached,
-		getVisiblePages: getVisiblePages,
-		resetCache: resetCache,
-	};
+    return {
+        init: init,
+        getPage: getPage,
+        getTotalPages: getTotalPages,
+        prevPage: prevPage,
+        nextPage: nextPage,
+        setPage: setPage,
+        getSearchParams: getSearchParams,
+        setSearchParams: setSearchParams,
+        retrieve: retrieve,
+        retrieveCached: retrieveCached,
+        getVisiblePages: getVisiblePages,
+        resetCache: resetCache,
+    };
 
 };
 
diff --git a/public_html/js/PresenterManager.js b/public_html/js/PresenterManager.js
index b4069c25..de8d7293 100644
--- a/public_html/js/PresenterManager.js
+++ b/public_html/js/PresenterManager.js
@@ -2,53 +2,53 @@ var App = App || {};
 
 App.PresenterManager = function(jQuery, promise, topNavigationPresenter, keyboard) {
 
-	var lastContentPresenter = null;
+    var lastContentPresenter = null;
 
-	function init() {
-		return promise.make(function(resolve, reject) {
-			initPresenter(topNavigationPresenter, [], resolve);
-		});
-	}
+    function init() {
+        return promise.make(function(resolve, reject) {
+            initPresenter(topNavigationPresenter, [], resolve);
+        });
+    }
 
-	function initPresenter(presenter, args, loaded) {
-		presenter.init.call(presenter, args, loaded);
-	}
+    function initPresenter(presenter, args, loaded) {
+        presenter.init.call(presenter, args, loaded);
+    }
 
-	function switchContentPresenter(presenter, args) {
-		if (lastContentPresenter === null || lastContentPresenter.name !== presenter.name) {
-			if (lastContentPresenter !== null && lastContentPresenter.deinit) {
-				lastContentPresenter.deinit();
-			}
-			keyboard.reset();
-			topNavigationPresenter.changeTitle(null);
-			topNavigationPresenter.focus();
-			presenter.init.call(presenter, args, function() {});
-			lastContentPresenter = presenter;
-		} else if (lastContentPresenter.reinit) {
-			lastContentPresenter.reinit.call(lastContentPresenter, args, function() {});
-		}
-	}
+    function switchContentPresenter(presenter, args) {
+        if (lastContentPresenter === null || lastContentPresenter.name !== presenter.name) {
+            if (lastContentPresenter !== null && lastContentPresenter.deinit) {
+                lastContentPresenter.deinit();
+            }
+            keyboard.reset();
+            topNavigationPresenter.changeTitle(null);
+            topNavigationPresenter.focus();
+            presenter.init.call(presenter, args, function() {});
+            lastContentPresenter = presenter;
+        } else if (lastContentPresenter.reinit) {
+            lastContentPresenter.reinit.call(lastContentPresenter, args, function() {});
+        }
+    }
 
-	function initPresenters(options, loaded) {
-		var count = 0;
-		var subPresenterLoaded = function() {
-			count ++;
-			if (count === options.length) {
-				loaded();
-			}
-		};
+    function initPresenters(options, loaded) {
+        var count = 0;
+        var subPresenterLoaded = function() {
+            count ++;
+            if (count === options.length) {
+                loaded();
+            }
+        };
 
-		for (var i = 0; i < options.length; i ++) {
-			initPresenter(options[i][0], options[i][1], subPresenterLoaded);
-		}
-	}
+        for (var i = 0; i < options.length; i ++) {
+            initPresenter(options[i][0], options[i][1], subPresenterLoaded);
+        }
+    }
 
-	return {
-		init: init,
-		initPresenter: initPresenter,
-		initPresenters: initPresenters,
-		switchContentPresenter: switchContentPresenter,
-	};
+    return {
+        init: init,
+        initPresenter: initPresenter,
+        initPresenters: initPresenters,
+        switchContentPresenter: switchContentPresenter,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/CommentListPresenter.js b/public_html/js/Presenters/CommentListPresenter.js
index 229ba7b0..dbab4543 100644
--- a/public_html/js/Presenters/CommentListPresenter.js
+++ b/public_html/js/Presenters/CommentListPresenter.js
@@ -2,230 +2,230 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.CommentListPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	api,
-	auth,
-	topNavigationPresenter,
-	messagePresenter) {
+    _,
+    jQuery,
+    util,
+    promise,
+    api,
+    auth,
+    topNavigationPresenter,
+    messagePresenter) {
 
-	var $el;
-	var privileges;
-	var templates = {};
+    var $el;
+    var privileges;
+    var templates = {};
 
-	var post;
-	var comments = [];
+    var post;
+    var comments = [];
 
-	function init(params, loaded) {
-		$el = params.$target;
-		post = params.post;
-		comments = params.comments || [];
+    function init(params, loaded) {
+        $el = params.$target;
+        post = params.post;
+        comments = params.comments || [];
 
-		privileges = {
-			canListComments: auth.hasPrivilege(auth.privileges.listComments),
-			canAddComments: auth.hasPrivilege(auth.privileges.addComments),
-			canEditOwnComments: auth.hasPrivilege(auth.privileges.editOwnComments),
-			canEditAllComments: auth.hasPrivilege(auth.privileges.editAllComments),
-			canDeleteOwnComments: auth.hasPrivilege(auth.privileges.deleteOwnComments),
-			canDeleteAllComments: auth.hasPrivilege(auth.privileges.deleteAllComments),
-			canViewUsers: auth.hasPrivilege(auth.privileges.viewUsers),
-			canViewPosts: auth.hasPrivilege(auth.privileges.viewPosts),
-		};
+        privileges = {
+            canListComments: auth.hasPrivilege(auth.privileges.listComments),
+            canAddComments: auth.hasPrivilege(auth.privileges.addComments),
+            canEditOwnComments: auth.hasPrivilege(auth.privileges.editOwnComments),
+            canEditAllComments: auth.hasPrivilege(auth.privileges.editAllComments),
+            canDeleteOwnComments: auth.hasPrivilege(auth.privileges.deleteOwnComments),
+            canDeleteAllComments: auth.hasPrivilege(auth.privileges.deleteAllComments),
+            canViewUsers: auth.hasPrivilege(auth.privileges.viewUsers),
+            canViewPosts: auth.hasPrivilege(auth.privileges.viewPosts),
+        };
 
-		promise.wait(
-				util.promiseTemplate('comment-list'),
-				util.promiseTemplate('comment-list-item'),
-				util.promiseTemplate('comment-form'))
-			.then(function(
-					commentListTemplate,
-					commentListItemTemplate,
-					commentFormTemplate)
-				{
-					templates.commentList = commentListTemplate;
-					templates.commentListItem = commentListItemTemplate;
-					templates.commentForm = commentFormTemplate;
+        promise.wait(
+                util.promiseTemplate('comment-list'),
+                util.promiseTemplate('comment-list-item'),
+                util.promiseTemplate('comment-form'))
+            .then(function(
+                    commentListTemplate,
+                    commentListItemTemplate,
+                    commentFormTemplate)
+                {
+                    templates.commentList = commentListTemplate;
+                    templates.commentListItem = commentListItemTemplate;
+                    templates.commentForm = commentFormTemplate;
 
-					render();
-					loaded();
+                    render();
+                    loaded();
 
-					if (comments.length === 0) {
-						promise.wait(api.get('/comments/' + params.post.id))
-							.then(function(response) {
-								comments = response.json.data;
-								render();
-							}).fail(function() {
-								console.log(arguments);
-							});
-					}
-				})
-			.fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+                    if (comments.length === 0) {
+                        promise.wait(api.get('/comments/' + params.post.id))
+                            .then(function(response) {
+                                comments = response.json.data;
+                                render();
+                            }).fail(function() {
+                                console.log(arguments);
+                            });
+                    }
+                })
+            .fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function render() {
-		$el.html(templates.commentList(
-			_.extend(
-				{
-					commentListItemTemplate: templates.commentListItem,
-					commentFormTemplate: templates.commentForm,
-					util: util,
-					comments: comments,
-					post: post,
-				},
-				privileges)));
+    function render() {
+        $el.html(templates.commentList(
+            _.extend(
+                {
+                    commentListItemTemplate: templates.commentListItem,
+                    commentFormTemplate: templates.commentForm,
+                    util: util,
+                    comments: comments,
+                    post: post,
+                },
+                privileges)));
 
-		$el.find('.comment-add form button[type=submit]').click(function(e) { commentFormSubmitted(e, null); });
-		renderComments(comments);
-	}
+        $el.find('.comment-add form button[type=submit]').click(function(e) { commentFormSubmitted(e, null); });
+        renderComments(comments);
+    }
 
-	function renderComments(comments) {
-		var $target = $el.find('.comments');
-		var $targetList = $el.find('ul');
+    function renderComments(comments) {
+        var $target = $el.find('.comments');
+        var $targetList = $el.find('ul');
 
-		if (comments.length > 0) {
-			$target.show();
-		} else {
-			$target.hide();
-		}
+        if (comments.length > 0) {
+            $target.show();
+        } else {
+            $target.hide();
+        }
 
-		$targetList.empty();
-		_.each(comments, function(comment) {
-			renderComment($targetList, comment);
-		});
-	}
+        $targetList.empty();
+        _.each(comments, function(comment) {
+            renderComment($targetList, comment);
+        });
+    }
 
-	function renderComment($targetList, comment) {
-		var $item = jQuery('<li>' + templates.commentListItem({
-			comment: comment,
-			util: util,
-			canVote: auth.isLoggedIn(),
-			canEditComment: auth.isLoggedIn(comment.user.name) ? privileges.canEditOwnComments : privileges.canEditAllComments,
-			canDeleteComment: auth.isLoggedIn(comment.user.name) ? privileges.canDeleteOwnComments : privileges.canDeleteAllComments,
-			canViewUsers: privileges.canViewUsers,
-			canViewPosts: privileges.canViewPosts,
-		}) + '</li>');
-		util.loadImagesNicely($item.find('img'));
-		$targetList.append($item);
+    function renderComment($targetList, comment) {
+        var $item = jQuery('<li>' + templates.commentListItem({
+            comment: comment,
+            util: util,
+            canVote: auth.isLoggedIn(),
+            canEditComment: auth.isLoggedIn(comment.user.name) ? privileges.canEditOwnComments : privileges.canEditAllComments,
+            canDeleteComment: auth.isLoggedIn(comment.user.name) ? privileges.canDeleteOwnComments : privileges.canDeleteAllComments,
+            canViewUsers: privileges.canViewUsers,
+            canViewPosts: privileges.canViewPosts,
+        }) + '</li>');
+        util.loadImagesNicely($item.find('img'));
+        $targetList.append($item);
 
-		$item.find('a.edit').click(function(e) {
-			e.preventDefault();
-			editCommentStart($item, comment);
-		});
+        $item.find('a.edit').click(function(e) {
+            e.preventDefault();
+            editCommentStart($item, comment);
+        });
 
-		$item.find('a.delete').click(function(e) {
-			e.preventDefault();
-			deleteComment(comment);
-		});
+        $item.find('a.delete').click(function(e) {
+            e.preventDefault();
+            deleteComment(comment);
+        });
 
-		$item.find('a.score-up').click(function(e) {
-			e.preventDefault();
-			score(comment, jQuery(this).hasClass('active') ? 0 : 1);
-		});
+        $item.find('a.score-up').click(function(e) {
+            e.preventDefault();
+            score(comment, jQuery(this).hasClass('active') ? 0 : 1);
+        });
 
-		$item.find('a.score-down').click(function(e) {
-			e.preventDefault();
-			score(comment, jQuery(this).hasClass('active') ? 0 : -1);
-		});
-	}
+        $item.find('a.score-down').click(function(e) {
+            e.preventDefault();
+            score(comment, jQuery(this).hasClass('active') ? 0 : -1);
+        });
+    }
 
-	function commentFormSubmitted(e, comment) {
-		e.preventDefault();
-		var $button = jQuery(e.target);
-		var $form = $button.parents('form');
-		var sender = $button.val();
-		if (sender === 'preview') {
-			previewComment($form);
-		} else {
-			submitComment($form, comment);
-		}
-	}
+    function commentFormSubmitted(e, comment) {
+        e.preventDefault();
+        var $button = jQuery(e.target);
+        var $form = $button.parents('form');
+        var sender = $button.val();
+        if (sender === 'preview') {
+            previewComment($form);
+        } else {
+            submitComment($form, comment);
+        }
+    }
 
-	function previewComment($form) {
-		var $preview = $form.find('.preview');
-		$preview.slideUp('fast', function() {
-			$preview.html(util.formatMarkdown($form.find('textarea').val()));
-			$preview.slideDown('fast');
-		});
-	}
+    function previewComment($form) {
+        var $preview = $form.find('.preview');
+        $preview.slideUp('fast', function() {
+            $preview.html(util.formatMarkdown($form.find('textarea').val()));
+            $preview.slideDown('fast');
+        });
+    }
 
-	function updateComment(comment) {
-		comments = _.map(comments, function(c) { return c.id === comment.id ? comment : c; });
-		render();
-	}
+    function updateComment(comment) {
+        comments = _.map(comments, function(c) { return c.id === comment.id ? comment : c; });
+        render();
+    }
 
-	function addComment(comment) {
-		comments.push(comment);
-		render();
-	}
+    function addComment(comment) {
+        comments.push(comment);
+        render();
+    }
 
-	function submitComment($form, commentToEdit) {
-		$form.find('.preview').slideUp();
-		var $textarea = $form.find('textarea');
+    function submitComment($form, commentToEdit) {
+        $form.find('.preview').slideUp();
+        var $textarea = $form.find('textarea');
 
-		var data = {text: $textarea.val()};
-		var p;
-		if (commentToEdit) {
-			p = promise.wait(api.put('/comments/' + commentToEdit.id, data));
-		} else {
-			p = promise.wait(api.post('/comments/' + post.id, data));
-		}
+        var data = {text: $textarea.val()};
+        var p;
+        if (commentToEdit) {
+            p = promise.wait(api.put('/comments/' + commentToEdit.id, data));
+        } else {
+            p = promise.wait(api.post('/comments/' + post.id, data));
+        }
 
-		p.then(function(response) {
-			$textarea.val('');
-			var comment = response.json;
+        p.then(function(response) {
+            $textarea.val('');
+            var comment = response.json;
 
-			if (commentToEdit) {
-				$form.slideUp(function() {
-					$form.remove();
-				});
-				updateComment(comment);
-			} else {
-				addComment(comment);
-			}
-		}).fail(showGenericError);
-	}
+            if (commentToEdit) {
+                $form.slideUp(function() {
+                    $form.remove();
+                });
+                updateComment(comment);
+            } else {
+                addComment(comment);
+            }
+        }).fail(showGenericError);
+    }
 
-	function editCommentStart($item, comment) {
-		if ($item.find('.comment-form').length > 0) {
-			return;
-		}
-		var $form = jQuery(templates.commentForm({title: 'Edit comment', text: comment.text}));
-		$item.find('.body').append($form);
-		$item.find('form button[type=submit]').click(function(e) { commentFormSubmitted(e, comment); });
-	}
+    function editCommentStart($item, comment) {
+        if ($item.find('.comment-form').length > 0) {
+            return;
+        }
+        var $form = jQuery(templates.commentForm({title: 'Edit comment', text: comment.text}));
+        $item.find('.body').append($form);
+        $item.find('form button[type=submit]').click(function(e) { commentFormSubmitted(e, comment); });
+    }
 
-	function deleteComment(comment) {
-		if (!window.confirm('Are you sure you want to delete this comment?')) {
-			return;
-		}
-		promise.wait(api.delete('/comments/' + comment.id))
-			.then(function(response) {
-				comments = _.filter(comments, function(c) { return c.id !== comment.id; });
-				renderComments(comments);
-			}).fail(showGenericError);
-	}
+    function deleteComment(comment) {
+        if (!window.confirm('Are you sure you want to delete this comment?')) {
+            return;
+        }
+        promise.wait(api.delete('/comments/' + comment.id))
+            .then(function(response) {
+                comments = _.filter(comments, function(c) { return c.id !== comment.id; });
+                renderComments(comments);
+            }).fail(showGenericError);
+    }
 
-	function score(comment, scoreValue) {
-		promise.wait(api.post('/comments/' + comment.id + '/score', {score: scoreValue}))
-			.then(function(response) {
-				comment.score = parseInt(response.json.score);
-				comment.ownScore = parseInt(response.json.ownScore);
-				updateComment(comment);
-			}).fail(showGenericError);
-	}
+    function score(comment, scoreValue) {
+        promise.wait(api.post('/comments/' + comment.id + '/score', {score: scoreValue}))
+            .then(function(response) {
+                comment.score = parseInt(response.json.score);
+                comment.ownScore = parseInt(response.json.ownScore);
+                updateComment(comment);
+            }).fail(showGenericError);
+    }
 
-	function showGenericError(response) {
-		window.alert(response.json && response.json.error || response);
-	}
+    function showGenericError(response) {
+        window.alert(response.json && response.json.error || response);
+    }
 
-	return {
-		init: init,
-		render: render,
-	};
+    return {
+        init: init,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/GlobalCommentListPresenter.js b/public_html/js/Presenters/GlobalCommentListPresenter.js
index cf1c86b3..acb2895f 100644
--- a/public_html/js/Presenters/GlobalCommentListPresenter.js
+++ b/public_html/js/Presenters/GlobalCommentListPresenter.js
@@ -2,103 +2,103 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.GlobalCommentListPresenter = function(
-	_,
-	jQuery,
-	util,
-	auth,
-	promise,
-	pagerPresenter,
-	topNavigationPresenter) {
+    _,
+    jQuery,
+    util,
+    auth,
+    promise,
+    pagerPresenter,
+    topNavigationPresenter) {
 
-	var $el;
-	var privileges;
-	var templates = {};
+    var $el;
+    var privileges;
+    var templates = {};
 
-	function init(params, loaded) {
-		$el = jQuery('#content');
-		topNavigationPresenter.select('comments');
+    function init(params, loaded) {
+        $el = jQuery('#content');
+        topNavigationPresenter.select('comments');
 
-		privileges = {
-			canViewPosts: auth.hasPrivilege(auth.privileges.viewPosts),
-		};
+        privileges = {
+            canViewPosts: auth.hasPrivilege(auth.privileges.viewPosts),
+        };
 
-		promise.wait(
-				util.promiseTemplate('global-comment-list'),
-				util.promiseTemplate('global-comment-list-item'),
-				util.promiseTemplate('post-list-item'))
-			.then(function(listTemplate, listItemTemplate, postTemplate) {
-				templates.list = listTemplate;
-				templates.listItem = listItemTemplate;
-				templates.post = postTemplate;
+        promise.wait(
+                util.promiseTemplate('global-comment-list'),
+                util.promiseTemplate('global-comment-list-item'),
+                util.promiseTemplate('post-list-item'))
+            .then(function(listTemplate, listItemTemplate, postTemplate) {
+                templates.list = listTemplate;
+                templates.listItem = listItemTemplate;
+                templates.post = postTemplate;
 
-				render();
-				loaded();
+                render();
+                loaded();
 
-				pagerPresenter.init({
-						baseUri: '#/comments',
-						backendUri: '/comments',
-						$target: $el.find('.pagination-target'),
-						updateCallback: function($page, data) {
-							renderComments($page, data.entities);
-						},
-					},
-					function() {
-						reinit(params, function() {});
-					});
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+                pagerPresenter.init({
+                        baseUri: '#/comments',
+                        backendUri: '/comments',
+                        $target: $el.find('.pagination-target'),
+                        updateCallback: function($page, data) {
+                            renderComments($page, data.entities);
+                        },
+                    },
+                    function() {
+                        reinit(params, function() {});
+                    });
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
 
-	function reinit(params, loaded) {
-		pagerPresenter.reinit({query: params.query || {}});
-		loaded();
-	}
+    function reinit(params, loaded) {
+        pagerPresenter.reinit({query: params.query || {}});
+        loaded();
+    }
 
-	function deinit() {
-		pagerPresenter.deinit();
-	}
+    function deinit() {
+        pagerPresenter.deinit();
+    }
 
-	function render() {
-		$el.html(templates.list());
-	}
+    function render() {
+        $el.html(templates.list());
+    }
 
-	function renderComments($page, data) {
-		var $target = $page.find('.posts');
-		_.each(data, function(data) {
-			var post = data.post;
-			var comments = data.comments;
+    function renderComments($page, data) {
+        var $target = $page.find('.posts');
+        _.each(data, function(data) {
+            var post = data.post;
+            var comments = data.comments;
 
-			var $post = jQuery('<li>' + templates.listItem({
-				util: util,
-				post: post,
-				postTemplate: templates.post,
-				canViewPosts: privileges.canViewPosts,
-			}) + '</li>');
+            var $post = jQuery('<li>' + templates.listItem({
+                util: util,
+                post: post,
+                postTemplate: templates.post,
+                canViewPosts: privileges.canViewPosts,
+            }) + '</li>');
 
-			util.loadImagesNicely($post.find('img'));
-			var presenter = App.DI.get('commentListPresenter');
+            util.loadImagesNicely($post.find('img'));
+            var presenter = App.DI.get('commentListPresenter');
 
-			presenter.init({
-				post: post,
-				comments: comments,
-				$target: $post.find('.post-comments-target'),
-			}, function() {
-				presenter.render();
-			});
+            presenter.init({
+                post: post,
+                comments: comments,
+                $target: $post.find('.post-comments-target'),
+            }, function() {
+                presenter.render();
+            });
 
-			$target.append($post);
-		});
-	}
+            $target.append($post);
+        });
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		deinit: deinit,
-		render: render,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        deinit: deinit,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/HelpPresenter.js b/public_html/js/Presenters/HelpPresenter.js
index f6bfe2d5..49507e62 100644
--- a/public_html/js/Presenters/HelpPresenter.js
+++ b/public_html/js/Presenters/HelpPresenter.js
@@ -2,48 +2,48 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.HelpPresenter = function(
-	jQuery,
-	promise,
-	util,
-	topNavigationPresenter) {
+    jQuery,
+    promise,
+    util,
+    topNavigationPresenter) {
 
-	var $el = jQuery('#content');
-	var templates = {};
-	var activeTab;
+    var $el = jQuery('#content');
+    var templates = {};
+    var activeTab;
 
-	function init(params, loaded) {
-		topNavigationPresenter.select('help');
-		topNavigationPresenter.changeTitle('Help');
+    function init(params, loaded) {
+        topNavigationPresenter.select('help');
+        topNavigationPresenter.changeTitle('Help');
 
-		promise.wait(util.promiseTemplate('help'))
-			.then(function(template) {
-				templates.help = template;
-				reinit(params, loaded);
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+        promise.wait(util.promiseTemplate('help'))
+            .then(function(template) {
+                templates.help = template;
+                reinit(params, loaded);
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function reinit(params, loaded) {
-		activeTab = params.tab || 'about';
-		render();
-		loaded();
-	}
+    function reinit(params, loaded) {
+        activeTab = params.tab || 'about';
+        render();
+        loaded();
+    }
 
-	function render() {
-		$el.html(templates.help({title: topNavigationPresenter.getBaseTitle() }));
-		$el.find('.big-button').removeClass('active');
-		$el.find('.big-button[href*="' + activeTab + '"]').addClass('active');
-		$el.find('div[data-tab]').hide();
-		$el.find('div[data-tab*="' + activeTab + '"]').show();
-	}
+    function render() {
+        $el.html(templates.help({title: topNavigationPresenter.getBaseTitle() }));
+        $el.find('.big-button').removeClass('active');
+        $el.find('.big-button[href*="' + activeTab + '"]').addClass('active');
+        $el.find('div[data-tab]').hide();
+        $el.find('div[data-tab*="' + activeTab + '"]').show();
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		render: render,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/HistoryPresenter.js b/public_html/js/Presenters/HistoryPresenter.js
index ab27f8f9..ad20a710 100644
--- a/public_html/js/Presenters/HistoryPresenter.js
+++ b/public_html/js/Presenters/HistoryPresenter.js
@@ -2,76 +2,76 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.HistoryPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	auth,
-	pagerPresenter,
-	topNavigationPresenter) {
+    _,
+    jQuery,
+    util,
+    promise,
+    auth,
+    pagerPresenter,
+    topNavigationPresenter) {
 
-	var $el = jQuery('#content');
-	var templates = {};
-	var params;
+    var $el = jQuery('#content');
+    var templates = {};
+    var params;
 
-	function init(params, loaded) {
-		topNavigationPresenter.changeTitle('History');
+    function init(params, loaded) {
+        topNavigationPresenter.changeTitle('History');
 
-		promise.wait(
-				util.promiseTemplate('global-history'),
-				util.promiseTemplate('history'))
-			.then(function(historyWrapperTemplate, historyTemplate) {
-				templates.historyWrapper = historyWrapperTemplate;
-				templates.history = historyTemplate;
+        promise.wait(
+                util.promiseTemplate('global-history'),
+                util.promiseTemplate('history'))
+            .then(function(historyWrapperTemplate, historyTemplate) {
+                templates.historyWrapper = historyWrapperTemplate;
+                templates.history = historyTemplate;
 
-				render();
-				loaded();
+                render();
+                loaded();
 
-				pagerPresenter.init({
-						baseUri: '#/history',
-						backendUri: '/history',
-						$target: $el.find('.pagination-target'),
-						updateCallback: function($page, data) {
-							renderHistory($page, data.entities);
-						},
-					},
-					function() {
-						reinit(params, function() {});
-					});
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+                pagerPresenter.init({
+                        baseUri: '#/history',
+                        backendUri: '/history',
+                        $target: $el.find('.pagination-target'),
+                        updateCallback: function($page, data) {
+                            renderHistory($page, data.entities);
+                        },
+                    },
+                    function() {
+                        reinit(params, function() {});
+                    });
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function reinit(_params, loaded) {
-		params = _params;
-		params.query = params.query || {};
+    function reinit(_params, loaded) {
+        params = _params;
+        params.query = params.query || {};
 
-		pagerPresenter.reinit({query: params.query});
-		loaded();
-	}
+        pagerPresenter.reinit({query: params.query});
+        loaded();
+    }
 
-	function deinit() {
-		pagerPresenter.deinit();
-	}
+    function deinit() {
+        pagerPresenter.deinit();
+    }
 
-	function render() {
-		$el.html(templates.historyWrapper());
-	}
+    function render() {
+        $el.html(templates.historyWrapper());
+    }
 
-	function renderHistory($page, historyItems) {
-		$page.append(templates.history({
-			util: util,
-			history: historyItems}));
-	}
+    function renderHistory($page, historyItems) {
+        $page.append(templates.history({
+            util: util,
+            history: historyItems}));
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		deinit: deinit,
-		render: render,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        deinit: deinit,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/HomePresenter.js b/public_html/js/Presenters/HomePresenter.js
index 6bb71878..e7cebe26 100644
--- a/public_html/js/Presenters/HomePresenter.js
+++ b/public_html/js/Presenters/HomePresenter.js
@@ -2,90 +2,90 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.HomePresenter = function(
-	jQuery,
-	util,
-	promise,
-	api,
-	auth,
-	presenterManager,
-	postContentPresenter,
-	topNavigationPresenter,
-	messagePresenter) {
+    jQuery,
+    util,
+    promise,
+    api,
+    auth,
+    presenterManager,
+    postContentPresenter,
+    topNavigationPresenter,
+    messagePresenter) {
 
-	var $el = jQuery('#content');
-	var templates = {};
-	var globals;
-	var post;
-	var user;
+    var $el = jQuery('#content');
+    var templates = {};
+    var globals;
+    var post;
+    var user;
 
-	function init(params, loaded) {
-		topNavigationPresenter.select('home');
-		topNavigationPresenter.changeTitle('Home');
+    function init(params, loaded) {
+        topNavigationPresenter.select('home');
+        topNavigationPresenter.changeTitle('Home');
 
-		promise.wait(
-				util.promiseTemplate('home'),
-				api.get('/globals'),
-				api.get('/posts/featured'))
-			.then(function(
-					homeTemplate,
-					globalsResponse,
-					featuredPostResponse) {
-				templates.home = homeTemplate;
+        promise.wait(
+                util.promiseTemplate('home'),
+                api.get('/globals'),
+                api.get('/posts/featured'))
+            .then(function(
+                    homeTemplate,
+                    globalsResponse,
+                    featuredPostResponse) {
+                templates.home = homeTemplate;
 
-				globals = globalsResponse.json;
-				post = featuredPostResponse.json.post;
-				user = featuredPostResponse.json.user;
-				render();
-				loaded();
+                globals = globalsResponse.json;
+                post = featuredPostResponse.json.post;
+                user = featuredPostResponse.json.user;
+                render();
+                loaded();
 
-				if ($el.find('#post-content-target').length > 0) {
-					presenterManager.initPresenters([
-						[postContentPresenter, {post: post, $target: $el.find('#post-content-target')}]],
-						function() {
-							var $wrapper = $el.find('.object-wrapper');
-							$wrapper.css({
-								maxWidth: $wrapper.attr('data-width') + 'px',
-								width: 'auto',
-								margin: '0 auto'});
-							postContentPresenter.updatePostNotesSize();
-						});
-				}
+                if ($el.find('#post-content-target').length > 0) {
+                    presenterManager.initPresenters([
+                        [postContentPresenter, {post: post, $target: $el.find('#post-content-target')}]],
+                        function() {
+                            var $wrapper = $el.find('.object-wrapper');
+                            $wrapper.css({
+                                maxWidth: $wrapper.attr('data-width') + 'px',
+                                width: 'auto',
+                                margin: '0 auto'});
+                            postContentPresenter.updatePostNotesSize();
+                        });
+                }
 
-			}).fail(function(response) {
-				messagePresenter.showError($el, response.json && response.json.error || response);
-				loaded();
-			});
-	}
+            }).fail(function(response) {
+                messagePresenter.showError($el, response.json && response.json.error || response);
+                loaded();
+            });
+    }
 
-	function render() {
-		$el.html(templates.home({
-			post: post,
-			user: user,
-			globals: globals,
-			title: topNavigationPresenter.getBaseTitle(),
-			canViewUsers: auth.hasPrivilege(auth.privileges.viewUsers),
-			canViewPosts: auth.hasPrivilege(auth.privileges.viewPosts),
-			util: util,
-			version: jQuery('head').attr('data-version'),
-			buildTime: jQuery('head').attr('data-build-time'),
-		}));
-	}
+    function render() {
+        $el.html(templates.home({
+            post: post,
+            user: user,
+            globals: globals,
+            title: topNavigationPresenter.getBaseTitle(),
+            canViewUsers: auth.hasPrivilege(auth.privileges.viewUsers),
+            canViewPosts: auth.hasPrivilege(auth.privileges.viewPosts),
+            util: util,
+            version: jQuery('head').attr('data-version'),
+            buildTime: jQuery('head').attr('data-build-time'),
+        }));
+    }
 
-	return {
-		init: init,
-		render: render,
-	};
+    return {
+        init: init,
+        render: render,
+    };
 
 };
 
 App.DI.register('homePresenter', [
-	'jQuery',
-	'util',
-	'promise',
-	'api',
-	'auth',
-	'presenterManager',
-	'postContentPresenter',
-	'topNavigationPresenter',
-	'messagePresenter'],
-	App.Presenters.HomePresenter);
+    'jQuery',
+    'util',
+    'promise',
+    'api',
+    'auth',
+    'presenterManager',
+    'postContentPresenter',
+    'topNavigationPresenter',
+    'messagePresenter'],
+    App.Presenters.HomePresenter);
diff --git a/public_html/js/Presenters/HttpErrorPresenter.js b/public_html/js/Presenters/HttpErrorPresenter.js
index 7e1a9b38..53810300 100644
--- a/public_html/js/Presenters/HttpErrorPresenter.js
+++ b/public_html/js/Presenters/HttpErrorPresenter.js
@@ -2,46 +2,46 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.HttpErrorPresenter = function(
-	jQuery,
-	promise,
-	util,
-	topNavigationPresenter) {
+    jQuery,
+    promise,
+    util,
+    topNavigationPresenter) {
 
-	var $el = jQuery('#content');
-	var templates = {};
+    var $el = jQuery('#content');
+    var templates = {};
 
-	function init(params, loaded) {
-		topNavigationPresenter.changeTitle('Error ' + params.error);
+    function init(params, loaded) {
+        topNavigationPresenter.changeTitle('Error ' + params.error);
 
-		if (params.error === 404) {
-			promise.wait(util.promiseTemplate('404'))
-				.then(function(template) {
-					templates.errorPage = template;
-					reinit(params, loaded);
-				}).fail(function() {
-					console.log(arguments);
-					loaded();
-				});
-		} else {
-			console.log('Not supported.');
-			loaded();
-		}
-	}
+        if (params.error === 404) {
+            promise.wait(util.promiseTemplate('404'))
+                .then(function(template) {
+                    templates.errorPage = template;
+                    reinit(params, loaded);
+                }).fail(function() {
+                    console.log(arguments);
+                    loaded();
+                });
+        } else {
+            console.log('Not supported.');
+            loaded();
+        }
+    }
 
-	function reinit(params, loaded) {
-		render();
-		loaded();
-	}
+    function reinit(params, loaded) {
+        render();
+        loaded();
+    }
 
-	function render() {
-		$el.html(templates.errorPage());
-	}
+    function render() {
+        $el.html(templates.errorPage());
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		render: render,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/LoginPresenter.js b/public_html/js/Presenters/LoginPresenter.js
index 0ff86c39..6a37a078 100644
--- a/public_html/js/Presenters/LoginPresenter.js
+++ b/public_html/js/Presenters/LoginPresenter.js
@@ -2,84 +2,84 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.LoginPresenter = function(
-	jQuery,
-	util,
-	promise,
-	router,
-	auth,
-	topNavigationPresenter,
-	messagePresenter) {
+    jQuery,
+    util,
+    promise,
+    router,
+    auth,
+    topNavigationPresenter,
+    messagePresenter) {
 
-	var $el = jQuery('#content');
-	var $messages;
-	var templates = {};
-	var previousLocation;
+    var $el = jQuery('#content');
+    var $messages;
+    var templates = {};
+    var previousLocation;
 
-	function init(params, loaded) {
-		topNavigationPresenter.select('login');
-		topNavigationPresenter.changeTitle('Login');
-		previousLocation = params.previousLocation;
-		promise.wait(util.promiseTemplate('login-form'))
-			.then(function(template) {
-				templates.login = template;
-				if (auth.isLoggedIn()) {
-					finishLogin();
-				} else {
-					render();
-					$el.find('input:eq(0)').focus();
-				}
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+    function init(params, loaded) {
+        topNavigationPresenter.select('login');
+        topNavigationPresenter.changeTitle('Login');
+        previousLocation = params.previousLocation;
+        promise.wait(util.promiseTemplate('login-form'))
+            .then(function(template) {
+                templates.login = template;
+                if (auth.isLoggedIn()) {
+                    finishLogin();
+                } else {
+                    render();
+                    $el.find('input:eq(0)').focus();
+                }
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function render() {
-		$el.html(templates.login());
-		$el.find('form').submit(loginFormSubmitted);
-		$messages = $el.find('.messages');
-		$messages.width($el.find('form').width());
-	}
+    function render() {
+        $el.html(templates.login());
+        $el.find('form').submit(loginFormSubmitted);
+        $messages = $el.find('.messages');
+        $messages.width($el.find('form').width());
+    }
 
-	function loginFormSubmitted(e) {
-		e.preventDefault();
-		messagePresenter.hideMessages($messages);
+    function loginFormSubmitted(e) {
+        e.preventDefault();
+        messagePresenter.hideMessages($messages);
 
-		var userNameOrEmail = $el.find('[name=user]').val();
-		var password = $el.find('[name=password]').val();
-		var remember = $el.find('[name=remember]').is(':checked');
+        var userNameOrEmail = $el.find('[name=user]').val();
+        var password = $el.find('[name=password]').val();
+        var remember = $el.find('[name=remember]').is(':checked');
 
-		if (userNameOrEmail.length === 0) {
-			messagePresenter.showError($messages, 'User name cannot be empty.');
-			return false;
-		}
+        if (userNameOrEmail.length === 0) {
+            messagePresenter.showError($messages, 'User name cannot be empty.');
+            return false;
+        }
 
-		if (password.length === 0) {
-			messagePresenter.showError($messages, 'Password cannot be empty.');
-			return false;
-		}
+        if (password.length === 0) {
+            messagePresenter.showError($messages, 'Password cannot be empty.');
+            return false;
+        }
 
-		promise.wait(auth.loginFromCredentials(userNameOrEmail, password, remember))
-			.then(function(response) {
-				finishLogin();
-			}).fail(function(response) {
-				messagePresenter.showError($messages, response.json && response.json.error || response);
-			});
-	}
+        promise.wait(auth.loginFromCredentials(userNameOrEmail, password, remember))
+            .then(function(response) {
+                finishLogin();
+            }).fail(function(response) {
+                messagePresenter.showError($messages, response.json && response.json.error || response);
+            });
+    }
 
-	function finishLogin() {
-		if (previousLocation && !previousLocation.match(/logout|password-reset|activate|register/)) {
-			router.navigate(previousLocation);
-		} else {
-			router.navigateToMainPage();
-		}
-	}
+    function finishLogin() {
+        if (previousLocation && !previousLocation.match(/logout|password-reset|activate|register/)) {
+            router.navigate(previousLocation);
+        } else {
+            router.navigateToMainPage();
+        }
+    }
 
-	return {
-		init: init,
-		render: render,
-	};
+    return {
+        init: init,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/LogoutPresenter.js b/public_html/js/Presenters/LogoutPresenter.js
index 90f4bf2b..6978f90d 100644
--- a/public_html/js/Presenters/LogoutPresenter.js
+++ b/public_html/js/Presenters/LogoutPresenter.js
@@ -2,38 +2,38 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.LogoutPresenter = function(
-	jQuery,
-	promise,
-	router,
-	auth,
-	topNavigationPresenter,
-	messagePresenter) {
+    jQuery,
+    promise,
+    router,
+    auth,
+    topNavigationPresenter,
+    messagePresenter) {
 
-	var $messages = jQuery('#content');
+    var $messages = jQuery('#content');
 
-	function init(params, loaded) {
-		topNavigationPresenter.select('logout');
-		topNavigationPresenter.changeTitle('Logout');
-		promise.wait(auth.logout())
-			.then(function() {
-				loaded();
-				$messages.empty();
-				var $messageDiv = messagePresenter.showInfo($messages, 'Logged out. <a href="">Back to main page</a>');
-				$messageDiv.find('a').click(mainPageLinkClicked);
-			}).fail(function(response) {
-				messagePresenter.showError(($messages, response.json && response.json.error || response) + '<br/>Reload the page to continue.');
-				loaded();
-			});
-	}
+    function init(params, loaded) {
+        topNavigationPresenter.select('logout');
+        topNavigationPresenter.changeTitle('Logout');
+        promise.wait(auth.logout())
+            .then(function() {
+                loaded();
+                $messages.empty();
+                var $messageDiv = messagePresenter.showInfo($messages, 'Logged out. <a href="">Back to main page</a>');
+                $messageDiv.find('a').click(mainPageLinkClicked);
+            }).fail(function(response) {
+                messagePresenter.showError(($messages, response.json && response.json.error || response) + '<br/>Reload the page to continue.');
+                loaded();
+            });
+    }
 
-	function mainPageLinkClicked(e) {
-		e.preventDefault();
-		router.navigateToMainPage();
-	}
+    function mainPageLinkClicked(e) {
+        e.preventDefault();
+        router.navigateToMainPage();
+    }
 
-	return {
-		init: init
-	};
+    return {
+        init: init
+    };
 
 };
 
diff --git a/public_html/js/Presenters/MessagePresenter.js b/public_html/js/Presenters/MessagePresenter.js
index 26a8ddc9..f4c6b8e0 100644
--- a/public_html/js/Presenters/MessagePresenter.js
+++ b/public_html/js/Presenters/MessagePresenter.js
@@ -3,51 +3,51 @@ App.Presenters = App.Presenters || {};
 
 App.Presenters.MessagePresenter = function(_, jQuery) {
 
-	var options = {
-		instant: false
-	};
+    var options = {
+        instant: false
+    };
 
-	function showInfo($el, message) {
-		return showMessage($el, 'info', message);
-	}
+    function showInfo($el, message) {
+        return showMessage($el, 'info', message);
+    }
 
-	function showError($el, message) {
-		return showMessage($el, 'error', message);
-	}
+    function showError($el, message) {
+        return showMessage($el, 'error', message);
+    }
 
-	function hideMessages($el) {
-		var $messages = $el.children('.message');
-		if (options.instant) {
-			$messages.each(function() {
-				jQuery(this).slideUp('fast', function() {
-					jQuery(this).remove();
-				});
-			});
-		} else {
-			$messages.remove();
-		}
-	}
+    function hideMessages($el) {
+        var $messages = $el.children('.message');
+        if (options.instant) {
+            $messages.each(function() {
+                jQuery(this).slideUp('fast', function() {
+                    jQuery(this).remove();
+                });
+            });
+        } else {
+            $messages.remove();
+        }
+    }
 
-	function showMessage($el, className, message) {
-		var $messageDiv = jQuery('<div>');
-		$messageDiv.addClass('message');
-		$messageDiv.addClass(className);
-		$messageDiv.html(message);
-		if (!options.instant) {
-			$messageDiv.hide();
-		}
-		$el.append($messageDiv);
-		if (!options.instant) {
-			$messageDiv.slideDown('fast');
-		}
-		return $messageDiv;
-	}
+    function showMessage($el, className, message) {
+        var $messageDiv = jQuery('<div>');
+        $messageDiv.addClass('message');
+        $messageDiv.addClass(className);
+        $messageDiv.html(message);
+        if (!options.instant) {
+            $messageDiv.hide();
+        }
+        $el.append($messageDiv);
+        if (!options.instant) {
+            $messageDiv.slideDown('fast');
+        }
+        return $messageDiv;
+    }
 
-	return _.extend(options, {
-		showInfo: showInfo,
-		showError: showError,
-		hideMessages: hideMessages,
-	});
+    return _.extend(options, {
+        showInfo: showInfo,
+        showError: showError,
+        hideMessages: hideMessages,
+    });
 
 };
 
diff --git a/public_html/js/Presenters/PagerPresenter.js b/public_html/js/Presenters/PagerPresenter.js
index 261afb4e..c9ca4cf8 100644
--- a/public_html/js/Presenters/PagerPresenter.js
+++ b/public_html/js/Presenters/PagerPresenter.js
@@ -2,267 +2,267 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.PagerPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	keyboard,
-	router,
-	pager,
-	messagePresenter,
-	browsingSettings,
-	progress) {
+    _,
+    jQuery,
+    util,
+    promise,
+    keyboard,
+    router,
+    pager,
+    messagePresenter,
+    browsingSettings,
+    progress) {
 
-	var $target;
-	var $pageList;
-	var $messages;
-	var targetContent;
-	var endlessScroll = browsingSettings.getSettings().endlessScroll;
-	var scrollInterval;
-	var templates = {};
-	var forceClear = !endlessScroll;
+    var $target;
+    var $pageList;
+    var $messages;
+    var targetContent;
+    var endlessScroll = browsingSettings.getSettings().endlessScroll;
+    var scrollInterval;
+    var templates = {};
+    var forceClear = !endlessScroll;
 
-	var baseUri;
-	var updateCallback;
+    var baseUri;
+    var updateCallback;
 
-	function init(params, loaded) {
-		baseUri = params.baseUri;
-		updateCallback = params.updateCallback;
+    function init(params, loaded) {
+        baseUri = params.baseUri;
+        updateCallback = params.updateCallback;
 
-		messagePresenter.instant = true;
+        messagePresenter.instant = true;
 
-		$target = params.$target;
-		targetContent = jQuery(params.$target).html();
+        $target = params.$target;
+        targetContent = jQuery(params.$target).html();
 
-		pager.init({url: params.backendUri});
-		setQuery(params.query);
-		if (forceClear) {
-			clearContent();
-		}
+        pager.init({url: params.backendUri});
+        setQuery(params.query);
+        if (forceClear) {
+            clearContent();
+        }
 
-		promise.wait(util.promiseTemplate('pager'))
-			.then(function(template) {
-				templates.pager = template;
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+        promise.wait(util.promiseTemplate('pager'))
+            .then(function(template) {
+                templates.pager = template;
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function reinit(params, loaded) {
-		setQuery(params.query);
-		if (forceClear) {
-			clearContent();
-		}
+    function reinit(params, loaded) {
+        setQuery(params.query);
+        if (forceClear) {
+            clearContent();
+        }
 
-		promise.wait(retrieve())
-			.then(loaded)
-			.fail(loaded);
+        promise.wait(retrieve())
+            .then(loaded)
+            .fail(loaded);
 
-		if (!endlessScroll) {
-			keyboard.keydown('a', navigateToPrevPage);
-			keyboard.keydown('d', navigateToNextPage);
-		}
-	}
+        if (!endlessScroll) {
+            keyboard.keydown('a', navigateToPrevPage);
+            keyboard.keydown('d', navigateToNextPage);
+        }
+    }
 
-	function deinit() {
-		detachNextPageLoader();
-	}
+    function deinit() {
+        detachNextPageLoader();
+    }
 
-	function getUrl(options) {
-		return util.appendComplexRouteParam(
-			baseUri,
-			util.simplifySearchQuery(
-				_.extend(
-					{},
-					pager.getSearchParams(),
-					{page: pager.getPage()},
-					options)));
-	}
+    function getUrl(options) {
+        return util.appendComplexRouteParam(
+            baseUri,
+            util.simplifySearchQuery(
+                _.extend(
+                    {},
+                    pager.getSearchParams(),
+                    {page: pager.getPage()},
+                    options)));
+    }
 
-	function syncUrl(options) {
-		router.navigate(getUrl(options));
-	}
+    function syncUrl(options) {
+        router.navigate(getUrl(options));
+    }
 
-	function syncUrlInplace(options) {
-		router.navigateInplace(getUrl(options));
-	}
+    function syncUrlInplace(options) {
+        router.navigateInplace(getUrl(options));
+    }
 
-	function retrieve() {
-		messagePresenter.hideMessages($messages);
-		progress.start();
+    function retrieve() {
+        messagePresenter.hideMessages($messages);
+        progress.start();
 
-		return promise.make(function(resolve, reject) {
-			hidePageList();
+        return promise.make(function(resolve, reject) {
+            hidePageList();
 
-			promise.wait(pager.retrieve())
-				.then(function(response) {
-					progress.done();
+            promise.wait(pager.retrieve())
+                .then(function(response) {
+                    progress.done();
 
-					if (forceClear) {
-						clearContent();
-						window.scrollTo(0, 0);
-					}
-					var $page = jQuery('<div class="page">');
-					if (endlessScroll && pager.getTotalPages() > 1) {
-						$page.append('<p>Page ' + pager.getPage() + ' of ' + pager.getTotalPages() + '</p>');
-					}
-					$page.append(targetContent);
-					$target.find('.pagination-content').append($page);
-					updateCallback($page, response);
+                    if (forceClear) {
+                        clearContent();
+                        window.scrollTo(0, 0);
+                    }
+                    var $page = jQuery('<div class="page">');
+                    if (endlessScroll && pager.getTotalPages() > 1) {
+                        $page.append('<p>Page ' + pager.getPage() + ' of ' + pager.getTotalPages() + '</p>');
+                    }
+                    $page.append(targetContent);
+                    $target.find('.pagination-content').append($page);
+                    updateCallback($page, response);
 
-					refreshPageList();
-					if (!response.entities.length) {
-						messagePresenter.showInfo($messages, 'No data to show');
-						if (pager.getVisiblePages().length === 1) {
-							hidePageList();
-						} else  {
-							showPageList();
-						}
-					} else {
-						showPageList();
-					}
+                    refreshPageList();
+                    if (!response.entities.length) {
+                        messagePresenter.showInfo($messages, 'No data to show');
+                        if (pager.getVisiblePages().length === 1) {
+                            hidePageList();
+                        } else  {
+                            showPageList();
+                        }
+                    } else {
+                        showPageList();
+                    }
 
-					if (pager.getPage() < response.totalPages) {
-						attachNextPageLoader();
-					}
+                    if (pager.getPage() < response.totalPages) {
+                        attachNextPageLoader();
+                    }
 
-					resolve();
-				}).fail(function(response) {
-					progress.done();
-					clearContent();
-					hidePageList();
-					messagePresenter.showError($messages, response.json && response.json.error || response);
+                    resolve();
+                }).fail(function(response) {
+                    progress.done();
+                    clearContent();
+                    hidePageList();
+                    messagePresenter.showError($messages, response.json && response.json.error || response);
 
-					reject();
-				});
-		});
-	}
+                    reject();
+                });
+        });
+    }
 
-	function clearContent() {
-		detachNextPageLoader();
-		$target.find('.pagination-content').empty();
-	}
+    function clearContent() {
+        detachNextPageLoader();
+        $target.find('.pagination-content').empty();
+    }
 
-	function attachNextPageLoader() {
-		if (!endlessScroll) {
-			return;
-		}
+    function attachNextPageLoader() {
+        if (!endlessScroll) {
+            return;
+        }
 
-		detachNextPageLoader();
-		scrollInterval = window.setInterval(function() {
-			var myScrollInterval = scrollInterval;
-			var baseLine = $target.offset().top + $target.innerHeight();
-			var scrollY = jQuery(window).scrollTop() + jQuery(window).height();
-			if (scrollY > baseLine) {
-				syncUrlInplace({page: pager.getPage() + 1});
-				window.clearInterval(myScrollInterval);
-			}
-		}, 100);
-	}
+        detachNextPageLoader();
+        scrollInterval = window.setInterval(function() {
+            var myScrollInterval = scrollInterval;
+            var baseLine = $target.offset().top + $target.innerHeight();
+            var scrollY = jQuery(window).scrollTop() + jQuery(window).height();
+            if (scrollY > baseLine) {
+                syncUrlInplace({page: pager.getPage() + 1});
+                window.clearInterval(myScrollInterval);
+            }
+        }, 100);
+    }
 
-	function detachNextPageLoader() {
-		window.clearInterval(scrollInterval);
-	}
+    function detachNextPageLoader() {
+        window.clearInterval(scrollInterval);
+    }
 
-	function showPageList() {
-		$pageList.show();
-	}
+    function showPageList() {
+        $pageList.show();
+    }
 
-	function hidePageList() {
-		$pageList.hide();
-	}
+    function hidePageList() {
+        $pageList.hide();
+    }
 
-	function navigateToPrevPage() {
-		console.log('!');
-		if (pager.prevPage()) {
-			syncUrl({page: pager.getPage()});
-		}
-	}
+    function navigateToPrevPage() {
+        console.log('!');
+        if (pager.prevPage()) {
+            syncUrl({page: pager.getPage()});
+        }
+    }
 
-	function navigateToNextPage() {
-		if (pager.nextPage()) {
-			syncUrl({page: pager.getPage()});
-		}
-	}
+    function navigateToNextPage() {
+        if (pager.nextPage()) {
+            syncUrl({page: pager.getPage()});
+        }
+    }
 
-	function refreshPageList() {
-		var $lastItem = $pageList.find('li:last-child');
-		var currentPage = pager.getPage();
-		var pages = pager.getVisiblePages();
-		$pageList.find('li.page').remove();
-		var lastPage = 0;
-		_.each(pages, function(page) {
-			if (page - lastPage > 1) {
-				jQuery('<li class="page ellipsis"><a>&hellip;</a></li>').insertBefore($lastItem);
-			}
-			lastPage = page;
+    function refreshPageList() {
+        var $lastItem = $pageList.find('li:last-child');
+        var currentPage = pager.getPage();
+        var pages = pager.getVisiblePages();
+        $pageList.find('li.page').remove();
+        var lastPage = 0;
+        _.each(pages, function(page) {
+            if (page - lastPage > 1) {
+                jQuery('<li class="page ellipsis"><a>&hellip;</a></li>').insertBefore($lastItem);
+            }
+            lastPage = page;
 
-			var $a = jQuery('<a href="#"/>');
-			$a.click(function(e) {
-				e.preventDefault();
-				syncUrl({page: page});
-			});
-			$a.addClass('big-button');
-			$a.text(page);
-			if (page === currentPage) {
-				$a.addClass('active');
-			}
-			jQuery('<li class="page"/>').append($a).insertBefore($lastItem);
-		});
+            var $a = jQuery('<a href="#"/>');
+            $a.click(function(e) {
+                e.preventDefault();
+                syncUrl({page: page});
+            });
+            $a.addClass('big-button');
+            $a.text(page);
+            if (page === currentPage) {
+                $a.addClass('active');
+            }
+            jQuery('<li class="page"/>').append($a).insertBefore($lastItem);
+        });
 
-		$pageList.find('li.next a').unbind('click').bind('click', function(e) {
-			e.preventDefault();
-			navigateToNextPage();
-		});
-		$pageList.find('li.prev a').unbind('click').bind('click', function(e) {
-			e.preventDefault();
-			navigateToPrevPage();
-		});
-	}
+        $pageList.find('li.next a').unbind('click').bind('click', function(e) {
+            e.preventDefault();
+            navigateToNextPage();
+        });
+        $pageList.find('li.prev a').unbind('click').bind('click', function(e) {
+            e.preventDefault();
+            navigateToPrevPage();
+        });
+    }
 
-	function render() {
-		$target.html(templates.pager());
-		$messages = $target.find('.pagination-content');
-		$pageList = $target.find('.page-list');
-		if (endlessScroll) {
-			$pageList.remove();
-		} else {
-			refreshPageList();
-		}
-	}
+    function render() {
+        $target.html(templates.pager());
+        $messages = $target.find('.pagination-content');
+        $pageList = $target.find('.page-list');
+        if (endlessScroll) {
+            $pageList.remove();
+        } else {
+            refreshPageList();
+        }
+    }
 
-	function setQuery(query) {
-		if (!query) {
-			return;
-		}
-		query.page = parseInt(query.page) || 1;
-		var page = query.page;
-		query = _.extend({}, query);
-		delete query.page;
-		forceClear =
-			query.query !== pager.getSearchParams().query ||
-			query.order !== pager.getSearchParams().order ||
-			parseInt(page) !== pager.getPage() + 1 ||
-			!endlessScroll;
-		pager.setSearchParams(query);
-		pager.setPage(page);
-	}
+    function setQuery(query) {
+        if (!query) {
+            return;
+        }
+        query.page = parseInt(query.page) || 1;
+        var page = query.page;
+        query = _.extend({}, query);
+        delete query.page;
+        forceClear =
+            query.query !== pager.getSearchParams().query ||
+            query.order !== pager.getSearchParams().order ||
+            parseInt(page) !== pager.getPage() + 1 ||
+            !endlessScroll;
+        pager.setSearchParams(query);
+        pager.setPage(page);
+    }
 
-	function setQueryAndSyncUrl(query) {
-		setQuery(query);
-		syncUrl();
-	}
+    function setQueryAndSyncUrl(query) {
+        setQuery(query);
+        syncUrl();
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		deinit: deinit,
-		syncUrl: syncUrl,
-		setQuery: setQueryAndSyncUrl,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        deinit: deinit,
+        syncUrl: syncUrl,
+        setQuery: setQueryAndSyncUrl,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/PostContentPresenter.js b/public_html/js/Presenters/PostContentPresenter.js
index e03d865b..2dca3f36 100644
--- a/public_html/js/Presenters/PostContentPresenter.js
+++ b/public_html/js/Presenters/PostContentPresenter.js
@@ -2,76 +2,76 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.PostContentPresenter = function(
-	jQuery,
-	util,
-	promise,
-	presenterManager,
-	postNotesPresenter) {
+    jQuery,
+    util,
+    promise,
+    presenterManager,
+    postNotesPresenter) {
 
-	var post;
-	var templates = {};
-	var $target;
+    var post;
+    var templates = {};
+    var $target;
 
-	function init(params, loaded) {
-		$target = params.$target;
-		post = params.post;
+    function init(params, loaded) {
+        $target = params.$target;
+        post = params.post;
 
-		promise.wait(util.promiseTemplate('post-content'))
-			.then(function(postContentTemplate) {
-				templates.postContent = postContentTemplate;
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+        promise.wait(util.promiseTemplate('post-content'))
+            .then(function(postContentTemplate) {
+                templates.postContent = postContentTemplate;
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function render() {
-		$target.html(templates.postContent({post: post}));
+    function render() {
+        $target.html(templates.postContent({post: post}));
 
-		if (post.contentType === 'image') {
-			loadPostNotes();
-			updatePostNotesSize();
-		}
+        if (post.contentType === 'image') {
+            loadPostNotes();
+            updatePostNotesSize();
+        }
 
-		jQuery(window).resize(updatePostNotesSize);
-	}
+        jQuery(window).resize(updatePostNotesSize);
+    }
 
-	function loadPostNotes() {
-		presenterManager.initPresenters([
-			[postNotesPresenter, {post: post, notes: post.notes, $target: $target.find('.post-notes-target')}]],
-			function() {});
-	}
+    function loadPostNotes() {
+        presenterManager.initPresenters([
+            [postNotesPresenter, {post: post, notes: post.notes, $target: $target.find('.post-notes-target')}]],
+            function() {});
+    }
 
-	function updatePostNotesSize() {
-		var $postNotes = $target.find('.post-notes-target');
-		var $objectWrapper = $target.find('.object-wrapper');
-		$postNotes.css({
-			width: $objectWrapper.outerWidth() + 'px',
-			height: $objectWrapper.outerHeight() + 'px',
-			left: ($objectWrapper.offset().left - $objectWrapper.parent().offset().left) + 'px',
-			top: ($objectWrapper.offset().top - $objectWrapper.parent().offset().top) + 'px',
-		});
-	}
+    function updatePostNotesSize() {
+        var $postNotes = $target.find('.post-notes-target');
+        var $objectWrapper = $target.find('.object-wrapper');
+        $postNotes.css({
+            width: $objectWrapper.outerWidth() + 'px',
+            height: $objectWrapper.outerHeight() + 'px',
+            left: ($objectWrapper.offset().left - $objectWrapper.parent().offset().left) + 'px',
+            top: ($objectWrapper.offset().top - $objectWrapper.parent().offset().top) + 'px',
+        });
+    }
 
-	function addNewPostNote() {
-		postNotesPresenter.addNewPostNote();
-	}
+    function addNewPostNote() {
+        postNotesPresenter.addNewPostNote();
+    }
 
-	return {
-		init: init,
-		render: render,
-		addNewPostNote: addNewPostNote,
-		updatePostNotesSize: updatePostNotesSize,
-	};
+    return {
+        init: init,
+        render: render,
+        addNewPostNote: addNewPostNote,
+        updatePostNotesSize: updatePostNotesSize,
+    };
 
 };
 
 App.DI.register('postContentPresenter', [
-	'jQuery',
-	'util',
-	'promise',
-	'presenterManager',
-	'postNotesPresenter'],
-	App.Presenters.PostContentPresenter);
+    'jQuery',
+    'util',
+    'promise',
+    'presenterManager',
+    'postNotesPresenter'],
+    App.Presenters.PostContentPresenter);
diff --git a/public_html/js/Presenters/PostEditPresenter.js b/public_html/js/Presenters/PostEditPresenter.js
index 0b0d0a6e..92b73624 100644
--- a/public_html/js/Presenters/PostEditPresenter.js
+++ b/public_html/js/Presenters/PostEditPresenter.js
@@ -2,154 +2,154 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.PostEditPresenter = function(
-	jQuery,
-	util,
-	promise,
-	api,
-	auth,
-	tagList) {
+    jQuery,
+    util,
+    promise,
+    api,
+    auth,
+    tagList) {
 
-	var $target;
-	var post;
-	var updateCallback;
-	var privileges = {};
-	var templates = {};
+    var $target;
+    var post;
+    var updateCallback;
+    var privileges = {};
+    var templates = {};
 
-	var tagInput;
-	var postContentFileDropper;
-	var postThumbnailFileDropper;
-	var postContent;
-	var postThumbnail;
+    var tagInput;
+    var postContentFileDropper;
+    var postThumbnailFileDropper;
+    var postContent;
+    var postThumbnail;
 
-	privileges.canChangeSafety = auth.hasPrivilege(auth.privileges.changePostSafety);
-	privileges.canChangeSource = auth.hasPrivilege(auth.privileges.changePostSource);
-	privileges.canChangeTags = auth.hasPrivilege(auth.privileges.changePostTags);
-	privileges.canChangeContent = auth.hasPrivilege(auth.privileges.changePostContent);
-	privileges.canChangeThumbnail = auth.hasPrivilege(auth.privileges.changePostThumbnail);
-	privileges.canChangeRelations = auth.hasPrivilege(auth.privileges.changePostRelations);
-	privileges.canChangeFlags = auth.hasPrivilege(auth.privileges.changePostFlags);
+    privileges.canChangeSafety = auth.hasPrivilege(auth.privileges.changePostSafety);
+    privileges.canChangeSource = auth.hasPrivilege(auth.privileges.changePostSource);
+    privileges.canChangeTags = auth.hasPrivilege(auth.privileges.changePostTags);
+    privileges.canChangeContent = auth.hasPrivilege(auth.privileges.changePostContent);
+    privileges.canChangeThumbnail = auth.hasPrivilege(auth.privileges.changePostThumbnail);
+    privileges.canChangeRelations = auth.hasPrivilege(auth.privileges.changePostRelations);
+    privileges.canChangeFlags = auth.hasPrivilege(auth.privileges.changePostFlags);
 
-	function init(params, loaded) {
-		post = params.post;
+    function init(params, loaded) {
+        post = params.post;
 
-		updateCallback = params.updateCallback;
-		$target = params.$target;
+        updateCallback = params.updateCallback;
+        $target = params.$target;
 
-		promise.wait(util.promiseTemplate('post-edit'))
-			.then(function(postEditTemplate) {
-				templates.postEdit = postEditTemplate;
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+        promise.wait(util.promiseTemplate('post-edit'))
+            .then(function(postEditTemplate) {
+                templates.postEdit = postEditTemplate;
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function render() {
-		$target.html(templates.postEdit({post: post, privileges: privileges}));
+    function render() {
+        $target.html(templates.postEdit({post: post, privileges: privileges}));
 
-		postContentFileDropper = new App.Controls.FileDropper($target.find('form [name=content]'));
-		postContentFileDropper.onChange = postContentChanged;
-		postContentFileDropper.setNames = true;
-		postThumbnailFileDropper = new App.Controls.FileDropper($target.find('form [name=thumbnail]'));
-		postThumbnailFileDropper.onChange = postThumbnailChanged;
-		postThumbnailFileDropper.setNames = true;
+        postContentFileDropper = new App.Controls.FileDropper($target.find('form [name=content]'));
+        postContentFileDropper.onChange = postContentChanged;
+        postContentFileDropper.setNames = true;
+        postThumbnailFileDropper = new App.Controls.FileDropper($target.find('form [name=thumbnail]'));
+        postThumbnailFileDropper.onChange = postThumbnailChanged;
+        postThumbnailFileDropper.setNames = true;
 
-		if (privileges.canChangeTags) {
-			tagInput = new App.Controls.TagInput($target.find('form [name=tags]'));
-			tagInput.inputConfirmed = editPost;
-		}
+        if (privileges.canChangeTags) {
+            tagInput = new App.Controls.TagInput($target.find('form [name=tags]'));
+            tagInput.inputConfirmed = editPost;
+        }
 
-		$target.find('form').submit(editFormSubmitted);
-	}
+        $target.find('form').submit(editFormSubmitted);
+    }
 
-	function focus() {
-		if (tagInput) {
-			tagInput.focus();
-		}
-	}
+    function focus() {
+        if (tagInput) {
+            tagInput.focus();
+        }
+    }
 
-	function editFormSubmitted(e) {
-		e.preventDefault();
-		editPost();
-	}
+    function editFormSubmitted(e) {
+        e.preventDefault();
+        editPost();
+    }
 
-	function postContentChanged(files) {
-		postContent = files[0];
-	}
+    function postContentChanged(files) {
+        postContent = files[0];
+    }
 
-	function postThumbnailChanged(files) {
-		postThumbnail = files[0];
-	}
+    function postThumbnailChanged(files) {
+        postThumbnail = files[0];
+    }
 
-	function getPrivileges() {
-		return privileges;
-	}
+    function getPrivileges() {
+        return privileges;
+    }
 
-	function editPost() {
-		var $form = $target.find('form');
-		var formData = new FormData();
-		formData.append('seenEditTime', post.lastEditTime);
+    function editPost() {
+        var $form = $target.find('form');
+        var formData = new FormData();
+        formData.append('seenEditTime', post.lastEditTime);
 
-		if (privileges.canChangeContent && postContent) {
-			formData.append('content', postContent);
-		}
+        if (privileges.canChangeContent && postContent) {
+            formData.append('content', postContent);
+        }
 
-		if (privileges.canChangeThumbnail && postThumbnail) {
-			formData.append('thumbnail', postThumbnail);
-		}
+        if (privileges.canChangeThumbnail && postThumbnail) {
+            formData.append('thumbnail', postThumbnail);
+        }
 
-		if (privileges.canChangeSource) {
-			formData.append('source', $form.find('[name=source]').val());
-		}
+        if (privileges.canChangeSource) {
+            formData.append('source', $form.find('[name=source]').val());
+        }
 
-		if (privileges.canChangeSafety) {
-			formData.append('safety', $form.find('[name=safety]:checked').val());
-		}
+        if (privileges.canChangeSafety) {
+            formData.append('safety', $form.find('[name=safety]:checked').val());
+        }
 
-		if (privileges.canChangeTags) {
-			formData.append('tags', tagInput.getTags().join(' '));
-		}
+        if (privileges.canChangeTags) {
+            formData.append('tags', tagInput.getTags().join(' '));
+        }
 
-		if (privileges.canChangeRelations) {
-			formData.append('relations', $form.find('[name=relations]').val());
-		}
+        if (privileges.canChangeRelations) {
+            formData.append('relations', $form.find('[name=relations]').val());
+        }
 
-		if (privileges.canChangeFlags) {
-			if (post.contentType === 'video') {
-				formData.append('loop', $form.find('[name=loop]').is(':checked') ? 1 : 0);
-			}
-		}
+        if (privileges.canChangeFlags) {
+            if (post.contentType === 'video') {
+                formData.append('loop', $form.find('[name=loop]').is(':checked') ? 1 : 0);
+            }
+        }
 
-		if (post.tags.length === 0) {
-			showEditError('No tags set.');
-			return;
-		}
+        if (post.tags.length === 0) {
+            showEditError('No tags set.');
+            return;
+        }
 
-		jQuery(document.activeElement).blur();
+        jQuery(document.activeElement).blur();
 
-		promise.wait(api.post('/posts/' + post.id, formData))
-			.then(function(response) {
-				tagList.refreshTags();
-				if (typeof(updateCallback) !== 'undefined') {
-					updateCallback(post = response.json);
-				}
-			}).fail(function(response) {
-				showEditError(response);
-			});
-	}
+        promise.wait(api.post('/posts/' + post.id, formData))
+            .then(function(response) {
+                tagList.refreshTags();
+                if (typeof(updateCallback) !== 'undefined') {
+                    updateCallback(post = response.json);
+                }
+            }).fail(function(response) {
+                showEditError(response);
+            });
+    }
 
-	function showEditError(response) {
-		window.alert(response.json && response.json.error || response);
-	}
+    function showEditError(response) {
+        window.alert(response.json && response.json.error || response);
+    }
 
-	return {
-		init: init,
-		render: render,
-		getPrivileges: getPrivileges,
-		focus: focus,
-	};
+    return {
+        init: init,
+        render: render,
+        getPrivileges: getPrivileges,
+        focus: focus,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/PostListPresenter.js b/public_html/js/Presenters/PostListPresenter.js
index 9519e233..14de971e 100644
--- a/public_html/js/Presenters/PostListPresenter.js
+++ b/public_html/js/Presenters/PostListPresenter.js
@@ -2,264 +2,264 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.PostListPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	auth,
-	api,
-	keyboard,
-	pagerPresenter,
-	browsingSettings,
-	topNavigationPresenter) {
+    _,
+    jQuery,
+    util,
+    promise,
+    auth,
+    api,
+    keyboard,
+    pagerPresenter,
+    browsingSettings,
+    topNavigationPresenter) {
 
-	var KEY_RETURN = 13;
+    var KEY_RETURN = 13;
 
-	var templates = {};
-	var $el = jQuery('#content');
-	var $searchInput;
-	var privileges = {};
+    var templates = {};
+    var $el = jQuery('#content');
+    var $searchInput;
+    var privileges = {};
 
-	var params;
+    var params;
 
-	function init(_params, loaded) {
-		topNavigationPresenter.select('posts');
-		topNavigationPresenter.changeTitle('Posts');
-		params = _params;
-		params.query = params.query || {};
+    function init(_params, loaded) {
+        topNavigationPresenter.select('posts');
+        topNavigationPresenter.changeTitle('Posts');
+        params = _params;
+        params.query = params.query || {};
 
-		privileges.canMassTag = auth.hasPrivilege(auth.privileges.massTag);
-		privileges.canViewPosts = auth.hasPrivilege(auth.privileges.viewPosts);
+        privileges.canMassTag = auth.hasPrivilege(auth.privileges.massTag);
+        privileges.canViewPosts = auth.hasPrivilege(auth.privileges.viewPosts);
 
-		promise.wait(
-				util.promiseTemplate('post-list'),
-				util.promiseTemplate('post-list-item'))
-			.then(function(listTemplate, listItemTemplate) {
-				templates.list = listTemplate;
-				templates.listItem = listItemTemplate;
+        promise.wait(
+                util.promiseTemplate('post-list'),
+                util.promiseTemplate('post-list-item'))
+            .then(function(listTemplate, listItemTemplate) {
+                templates.list = listTemplate;
+                templates.listItem = listItemTemplate;
 
-				render();
-				loaded();
+                render();
+                loaded();
 
-				pagerPresenter.init({
-						baseUri: '#/posts',
-						backendUri: '/posts',
-						$target: $el.find('.pagination-target'),
-						updateCallback: function($page, data) {
-							renderPosts($page, data.entities);
-						},
-					},
-					function() {
-						reinit(params, function() {});
-					});
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
+                pagerPresenter.init({
+                        baseUri: '#/posts',
+                        backendUri: '/posts',
+                        $target: $el.find('.pagination-target'),
+                        updateCallback: function($page, data) {
+                            renderPosts($page, data.entities);
+                        },
+                    },
+                    function() {
+                        reinit(params, function() {});
+                    });
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
 
-		jQuery(window).on('resize', windowResized);
-	}
+        jQuery(window).on('resize', windowResized);
+    }
 
-	function reinit(_params, loaded) {
-		params = _params;
-		params.query = params.query || {};
-		pagerPresenter.reinit({query: params.query});
-		loaded();
-		softRender();
-	}
+    function reinit(_params, loaded) {
+        params = _params;
+        params.query = params.query || {};
+        pagerPresenter.reinit({query: params.query});
+        loaded();
+        softRender();
+    }
 
-	function deinit() {
-		pagerPresenter.deinit();
-		jQuery(window).off('resize', windowResized);
-	}
+    function deinit() {
+        pagerPresenter.deinit();
+        jQuery(window).off('resize', windowResized);
+    }
 
-	function render() {
-		$el.html(templates.list({
-			massTag: params.query.massTag,
-			privileges: privileges,
-			browsingSettings: browsingSettings.getSettings()}));
-		$searchInput = $el.find('input[name=query]');
-		App.Controls.AutoCompleteInput($searchInput);
+    function render() {
+        $el.html(templates.list({
+            massTag: params.query.massTag,
+            privileges: privileges,
+            browsingSettings: browsingSettings.getSettings()}));
+        $searchInput = $el.find('input[name=query]');
+        App.Controls.AutoCompleteInput($searchInput);
 
-		$searchInput.val(params.query.query);
-		$searchInput.keydown(searchInputKeyPressed);
-		$el.find('form').submit(searchFormSubmitted);
-		$el.find('[name=mass-tag]').click(massTagButtonClicked);
-		$el.find('.safety button').click(safetyButtonClicked);
+        $searchInput.val(params.query.query);
+        $searchInput.keydown(searchInputKeyPressed);
+        $el.find('form').submit(searchFormSubmitted);
+        $el.find('[name=mass-tag]').click(massTagButtonClicked);
+        $el.find('.safety button').click(safetyButtonClicked);
 
-		keyboard.keyup('p', function() {
-			$el.find('.posts li a').eq(0).focus();
-		});
+        keyboard.keyup('p', function() {
+            $el.find('.posts li a').eq(0).focus();
+        });
 
-		keyboard.keyup('q', function() {
-			$searchInput.eq(0).focus().select();
-		});
+        keyboard.keyup('q', function() {
+            $searchInput.eq(0).focus().select();
+        });
 
-		windowResized();
-	}
+        windowResized();
+    }
 
-	function safetyButtonClicked(e) {
-		e.preventDefault();
-		var settings = browsingSettings.getSettings();
-		var buttonClass = jQuery(e.currentTarget).attr('class').split(' ')[0];
-		var enabled = jQuery(e.currentTarget).hasClass('disabled');
-		jQuery(e.currentTarget).toggleClass('disabled');
-		if (buttonClass === 'safety-unsafe') {
-			settings.listPosts.unsafe = enabled;
-		} else if (buttonClass === 'safety-sketchy') {
-			settings.listPosts.sketchy = enabled;
-		} else if (buttonClass === 'safety-safe') {
-			settings.listPosts.safe = enabled;
-		}
-		promise.wait(browsingSettings.setSettings(settings))
-			.then(function() {
-				reinit(params, function() {});
-			}).fail(function() {
-				console.log(arguments);
-			});
-	}
+    function safetyButtonClicked(e) {
+        e.preventDefault();
+        var settings = browsingSettings.getSettings();
+        var buttonClass = jQuery(e.currentTarget).attr('class').split(' ')[0];
+        var enabled = jQuery(e.currentTarget).hasClass('disabled');
+        jQuery(e.currentTarget).toggleClass('disabled');
+        if (buttonClass === 'safety-unsafe') {
+            settings.listPosts.unsafe = enabled;
+        } else if (buttonClass === 'safety-sketchy') {
+            settings.listPosts.sketchy = enabled;
+        } else if (buttonClass === 'safety-safe') {
+            settings.listPosts.safe = enabled;
+        }
+        promise.wait(browsingSettings.setSettings(settings))
+            .then(function() {
+                reinit(params, function() {});
+            }).fail(function() {
+                console.log(arguments);
+            });
+    }
 
-	function softRender() {
-		$searchInput.val(params.query.query);
+    function softRender() {
+        $searchInput.val(params.query.query);
 
-		var $massTagInfo = $el.find('.mass-tag-info');
-		if (params.query.massTag) {
-			$massTagInfo.show();
-			$massTagInfo.find('span').text(params.query.massTag);
-		} else {
-			$massTagInfo.hide();
-		}
-		_.map($el.find('.posts .post-small'), function(postNode) { softRenderPost(jQuery(postNode).parents('li')); });
-	}
+        var $massTagInfo = $el.find('.mass-tag-info');
+        if (params.query.massTag) {
+            $massTagInfo.show();
+            $massTagInfo.find('span').text(params.query.massTag);
+        } else {
+            $massTagInfo.hide();
+        }
+        _.map($el.find('.posts .post-small'), function(postNode) { softRenderPost(jQuery(postNode).parents('li')); });
+    }
 
-	function renderPosts($page, posts) {
-		var $target = $page.find('.posts');
-		_.each(posts, function(post) {
-			if (!shouldSkipPost(post)) {
-				var $post = renderPost(post);
-				softRenderPost($post);
-				$target.append($post);
-			}
-		});
-		windowResized();
-	}
+    function renderPosts($page, posts) {
+        var $target = $page.find('.posts');
+        _.each(posts, function(post) {
+            if (!shouldSkipPost(post)) {
+                var $post = renderPost(post);
+                softRenderPost($post);
+                $target.append($post);
+            }
+        });
+        windowResized();
+    }
 
-	function shouldSkipPost(post) {
-		var settings = browsingSettings.getSettings();
-		if (post.ownScore < 0 && settings.hideDownvoted) {
-			return true;
-		}
-		if (settings.listPosts) {
-			if (post.safety === 'safe' && !settings.listPosts.safe) {
-				return true;
-			} else if (post.safety === 'sketchy' && !settings.listPosts.sketchy) {
-				return true;
-			} else if (post.safety === 'unsafe' && !settings.listPosts.unsafe) {
-				return true;
-			}
-		}
-		return false;
-	}
+    function shouldSkipPost(post) {
+        var settings = browsingSettings.getSettings();
+        if (post.ownScore < 0 && settings.hideDownvoted) {
+            return true;
+        }
+        if (settings.listPosts) {
+            if (post.safety === 'safe' && !settings.listPosts.safe) {
+                return true;
+            } else if (post.safety === 'sketchy' && !settings.listPosts.sketchy) {
+                return true;
+            } else if (post.safety === 'unsafe' && !settings.listPosts.unsafe) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	function renderPost(post) {
-		var $post = jQuery('<li>' + templates.listItem({
-			util: util,
-			query: params.query,
-			post: post,
-			canViewPosts: privileges.canViewPosts,
-		}) + '</li>');
-		$post.data('post', post);
-		util.loadImagesNicely($post.find('img'));
-		return $post;
-	}
+    function renderPost(post) {
+        var $post = jQuery('<li>' + templates.listItem({
+            util: util,
+            query: params.query,
+            post: post,
+            canViewPosts: privileges.canViewPosts,
+        }) + '</li>');
+        $post.data('post', post);
+        util.loadImagesNicely($post.find('img'));
+        return $post;
+    }
 
-	function softRenderPost($post) {
-		var classes = [];
-		if (params.query.massTag) {
-			var post = $post.data('post');
-			if (_.contains(_.map(post.tags, function(tag) { return tag.name.toLowerCase(); }), params.query.massTag.toLowerCase())) {
-				classes.push('tagged');
-			} else {
-				classes.push('untagged');
-			}
-		}
-		$post.toggleClass('tagged', _.contains(classes, 'tagged'));
-		$post.toggleClass('untagged', _.contains(classes, 'untagged'));
-		$post.find('.action').toggle(_.any(classes));
-		$post.find('.action button').text(_.contains(classes, 'tagged') ? 'Tagged' : 'Untagged').unbind('click').click(postTagButtonClicked);
-	}
+    function softRenderPost($post) {
+        var classes = [];
+        if (params.query.massTag) {
+            var post = $post.data('post');
+            if (_.contains(_.map(post.tags, function(tag) { return tag.name.toLowerCase(); }), params.query.massTag.toLowerCase())) {
+                classes.push('tagged');
+            } else {
+                classes.push('untagged');
+            }
+        }
+        $post.toggleClass('tagged', _.contains(classes, 'tagged'));
+        $post.toggleClass('untagged', _.contains(classes, 'untagged'));
+        $post.find('.action').toggle(_.any(classes));
+        $post.find('.action button').text(_.contains(classes, 'tagged') ? 'Tagged' : 'Untagged').unbind('click').click(postTagButtonClicked);
+    }
 
-	function windowResized() {
-		var $list = $el.find('ul.posts');
-		var $posts = $list.find('.post-small');
-		var $firstPost = $posts.eq(0);
-		var $lastPost = $firstPost;
-		for (var i = 1; i < $posts.length; i ++) {
-			$lastPost = $posts.eq(i-1);
-			if ($posts.eq(i).offset().left < $lastPost.offset().left) {
-				break;
-			}
-		}
-		if ($firstPost.length === 0) {
-			return;
-		}
-		$el.find('.search').width($lastPost.offset().left + $lastPost.width() - $firstPost.offset().left);
-	}
+    function windowResized() {
+        var $list = $el.find('ul.posts');
+        var $posts = $list.find('.post-small');
+        var $firstPost = $posts.eq(0);
+        var $lastPost = $firstPost;
+        for (var i = 1; i < $posts.length; i ++) {
+            $lastPost = $posts.eq(i-1);
+            if ($posts.eq(i).offset().left < $lastPost.offset().left) {
+                break;
+            }
+        }
+        if ($firstPost.length === 0) {
+            return;
+        }
+        $el.find('.search').width($lastPost.offset().left + $lastPost.width() - $firstPost.offset().left);
+    }
 
-	function postTagButtonClicked(e) {
-		e.preventDefault();
-		var $post = jQuery(e.target).parents('li');
-		var post = $post.data('post');
-		var tags = _.pluck(post.tags, 'name');
-		if (_.contains(_.map(tags, function(tag) { return tag.toLowerCase(); }), params.query.massTag.toLowerCase())) {
-			tags = _.filter(tags, function(tag) { return tag.toLowerCase() !== params.query.massTag.toLowerCase(); });
-		} else {
-			tags.push(params.query.massTag);
-		}
-		var formData = {};
-		formData.seenEditTime = post.lastEditTime;
-		formData.tags = tags.join(' ');
-		promise.wait(api.post('/posts/' + post.id, formData))
-			.then(function(response) {
-				post = response.json;
-				$post.data('post', post);
-				softRenderPost($post);
-			}).fail(function(response) {
-				window.alert(response.json && response.json.error || response);
-			});
-	}
+    function postTagButtonClicked(e) {
+        e.preventDefault();
+        var $post = jQuery(e.target).parents('li');
+        var post = $post.data('post');
+        var tags = _.pluck(post.tags, 'name');
+        if (_.contains(_.map(tags, function(tag) { return tag.toLowerCase(); }), params.query.massTag.toLowerCase())) {
+            tags = _.filter(tags, function(tag) { return tag.toLowerCase() !== params.query.massTag.toLowerCase(); });
+        } else {
+            tags.push(params.query.massTag);
+        }
+        var formData = {};
+        formData.seenEditTime = post.lastEditTime;
+        formData.tags = tags.join(' ');
+        promise.wait(api.post('/posts/' + post.id, formData))
+            .then(function(response) {
+                post = response.json;
+                $post.data('post', post);
+                softRenderPost($post);
+            }).fail(function(response) {
+                window.alert(response.json && response.json.error || response);
+            });
+    }
 
-	function searchInputKeyPressed(e) {
-		if (e.which !== KEY_RETURN) {
-			return;
-		}
-		updateSearch();
-	}
+    function searchInputKeyPressed(e) {
+        if (e.which !== KEY_RETURN) {
+            return;
+        }
+        updateSearch();
+    }
 
-	function massTagButtonClicked(e) {
-		e.preventDefault();
-		params.query.massTag = window.prompt('Enter tag to tag with:');
-		pagerPresenter.setQuery(params.query);
-	}
+    function massTagButtonClicked(e) {
+        e.preventDefault();
+        params.query.massTag = window.prompt('Enter tag to tag with:');
+        pagerPresenter.setQuery(params.query);
+    }
 
-	function searchFormSubmitted(e) {
-		e.preventDefault();
-		updateSearch();
-	}
+    function searchFormSubmitted(e) {
+        e.preventDefault();
+        updateSearch();
+    }
 
-	function updateSearch() {
-		$searchInput.blur();
-		params.query.query = $searchInput.val().trim();
-		params.query.page = 1;
-		pagerPresenter.setQuery(params.query);
-	}
+    function updateSearch() {
+        $searchInput.blur();
+        params.query.query = $searchInput.val().trim();
+        params.query.page = 1;
+        pagerPresenter.setQuery(params.query);
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		deinit: deinit,
-		render: render,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        deinit: deinit,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/PostNotesPresenter.js b/public_html/js/Presenters/PostNotesPresenter.js
index 83df850b..41660f3e 100644
--- a/public_html/js/Presenters/PostNotesPresenter.js
+++ b/public_html/js/Presenters/PostNotesPresenter.js
@@ -2,192 +2,192 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.PostNotesPresenter = function(
-	jQuery,
-	util,
-	promise,
-	api,
-	auth,
-	draggable,
-	resizable) {
+    jQuery,
+    util,
+    promise,
+    api,
+    auth,
+    draggable,
+    resizable) {
 
-	var post;
-	var notes;
-	var templates = {};
-	var $target;
-	var $form;
-	var privileges = {};
+    var post;
+    var notes;
+    var templates = {};
+    var $target;
+    var $form;
+    var privileges = {};
 
-	function init(params, loaded) {
-		$target = params.$target;
-		post = params.post;
-		notes = params.notes || [];
+    function init(params, loaded) {
+        $target = params.$target;
+        post = params.post;
+        notes = params.notes || [];
 
-		privileges.canDeletePostNotes = auth.hasPrivilege(auth.privileges.deletePostNotes);
-		privileges.canEditPostNotes = auth.hasPrivilege(auth.privileges.editPostNotes);
+        privileges.canDeletePostNotes = auth.hasPrivilege(auth.privileges.deletePostNotes);
+        privileges.canEditPostNotes = auth.hasPrivilege(auth.privileges.editPostNotes);
 
-		promise.wait(util.promiseTemplate('post-notes'))
-			.then(function(postNotesTemplate) {
-				templates.postNotes = postNotesTemplate;
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+        promise.wait(util.promiseTemplate('post-notes'))
+            .then(function(postNotesTemplate) {
+                templates.postNotes = postNotesTemplate;
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function addNewPostNote() {
-		notes.push({left: 10.0, top: 10.0, width: 10.0, height: 10.0, text: '…'});
-	}
+    function addNewPostNote() {
+        notes.push({left: 10.0, top: 10.0, width: 10.0, height: 10.0, text: '…'});
+    }
 
-	function addNewPostNoteAndRender() {
-		addNewPostNote();
-		render();
-	}
+    function addNewPostNoteAndRender() {
+        addNewPostNote();
+        render();
+    }
 
-	function render() {
-		$target.html(templates.postNotes({
-			privileges: privileges,
-			post: post,
-			notes: notes,
-			util: util}));
+    function render() {
+        $target.html(templates.postNotes({
+            privileges: privileges,
+            post: post,
+            notes: notes,
+            util: util}));
 
-		$form = $target.find('.post-note-edit');
-		var $postNotes = $target.find('.post-note');
+        $form = $target.find('.post-note-edit');
+        var $postNotes = $target.find('.post-note');
 
-		$postNotes.each(function(i) {
-			var postNote = notes[i];
-			var $postNote = jQuery(this);
-			$postNote.data('postNote', postNote);
-			$postNote.find('.text-wrapper').click(postNoteClicked);
-			postNote.$element = $postNote;
-			draggable.makeDraggable($postNote, draggable.relativeDragStrategy, true);
-			resizable.makeResizable($postNote, true);
-		});
+        $postNotes.each(function(i) {
+            var postNote = notes[i];
+            var $postNote = jQuery(this);
+            $postNote.data('postNote', postNote);
+            $postNote.find('.text-wrapper').click(postNoteClicked);
+            postNote.$element = $postNote;
+            draggable.makeDraggable($postNote, draggable.relativeDragStrategy, true);
+            resizable.makeResizable($postNote, true);
+        });
 
-		$form.find('button').click(formSubmitted);
-	}
+        $form.find('button').click(formSubmitted);
+    }
 
-	function formSubmitted(e) {
-		e.preventDefault();
-		var $button = jQuery(e.target);
-		var sender = $button.val();
+    function formSubmitted(e) {
+        e.preventDefault();
+        var $button = jQuery(e.target);
+        var sender = $button.val();
 
-		var postNote = $form.data('postNote');
-		postNote.left = (postNote.$element.offset().left - $target.offset().left) * 100.0 / $target.outerWidth();
-		postNote.top = (postNote.$element.offset().top - $target.offset().top) * 100.0 / $target.outerHeight();
-		postNote.width = postNote.$element.width() * 100.0 / $target.outerWidth();
-		postNote.height = postNote.$element.height() * 100.0 / $target.outerHeight();
-		postNote.text = $form.find('textarea').val();
+        var postNote = $form.data('postNote');
+        postNote.left = (postNote.$element.offset().left - $target.offset().left) * 100.0 / $target.outerWidth();
+        postNote.top = (postNote.$element.offset().top - $target.offset().top) * 100.0 / $target.outerHeight();
+        postNote.width = postNote.$element.width() * 100.0 / $target.outerWidth();
+        postNote.height = postNote.$element.height() * 100.0 / $target.outerHeight();
+        postNote.text = $form.find('textarea').val();
 
-		if (sender === 'cancel') {
-			hideForm();
-		} else if (sender === 'remove') {
-			removePostNote(postNote);
-		} else if (sender === 'save') {
-			savePostNote(postNote);
-		} else if (sender === 'preview') {
-			previewPostNote(postNote);
-		}
-	}
+        if (sender === 'cancel') {
+            hideForm();
+        } else if (sender === 'remove') {
+            removePostNote(postNote);
+        } else if (sender === 'save') {
+            savePostNote(postNote);
+        } else if (sender === 'preview') {
+            previewPostNote(postNote);
+        }
+    }
 
-	function removePostNote(postNote) {
-		if (postNote.id) {
-			if (window.confirm('Are you sure you want to delete this note?')) {
-				promise.wait(api.delete('/notes/' + postNote.id))
-					.then(function() {
-						hideForm();
-						postNote.$element.remove();
-					}).fail(function(response) {
-						window.alert(response.json && response.json.error || response);
-					});
-			}
-		} else {
-			postNote.$element.remove();
-			hideForm();
-		}
-	}
+    function removePostNote(postNote) {
+        if (postNote.id) {
+            if (window.confirm('Are you sure you want to delete this note?')) {
+                promise.wait(api.delete('/notes/' + postNote.id))
+                    .then(function() {
+                        hideForm();
+                        postNote.$element.remove();
+                    }).fail(function(response) {
+                        window.alert(response.json && response.json.error || response);
+                    });
+            }
+        } else {
+            postNote.$element.remove();
+            hideForm();
+        }
+    }
 
-	function savePostNote(postNote) {
-		if (window.confirm('Are you sure you want to save this note?')) {
-			var formData = {
-				left: postNote.left,
-				top: postNote.top,
-				width: postNote.width,
-				height: postNote.height,
-				text: postNote.text,
-			};
+    function savePostNote(postNote) {
+        if (window.confirm('Are you sure you want to save this note?')) {
+            var formData = {
+                left: postNote.left,
+                top: postNote.top,
+                width: postNote.width,
+                height: postNote.height,
+                text: postNote.text,
+            };
 
-			var p = postNote.id ?
-				api.put('/notes/' + postNote.id, formData) :
-				api.post('/notes/' + post.id, formData);
+            var p = postNote.id ?
+                api.put('/notes/' + postNote.id, formData) :
+                api.post('/notes/' + post.id, formData);
 
-			promise.wait(p)
-				.then(function(response) {
-					hideForm();
-					postNote.id = response.json.id;
-					postNote.$element.data('postNote', postNote);
-					render();
-				}).fail(function(response) {
-					window.alert(response.json && response.json.error || response);
-				});
-		}
-	}
+            promise.wait(p)
+                .then(function(response) {
+                    hideForm();
+                    postNote.id = response.json.id;
+                    postNote.$element.data('postNote', postNote);
+                    render();
+                }).fail(function(response) {
+                    window.alert(response.json && response.json.error || response);
+                });
+        }
+    }
 
-	function previewPostNote(postNote) {
-		var previewText = $form.find('textarea').val();
-		postNote.$element.find('.text').html(util.formatMarkdown(previewText));
-		showPostNoteText(postNote);
-	}
+    function previewPostNote(postNote) {
+        var previewText = $form.find('textarea').val();
+        postNote.$element.find('.text').html(util.formatMarkdown(previewText));
+        showPostNoteText(postNote);
+    }
 
-	function showPostNoteText(postNote) {
-		postNote.$element.find('.text-wrapper').show();
-	}
+    function showPostNoteText(postNote) {
+        postNote.$element.find('.text-wrapper').show();
+    }
 
-	function hidePostNoteText(postNote) {
-		postNote.$element.find('.text-wrapper').css('display', '');
-	}
+    function hidePostNoteText(postNote) {
+        postNote.$element.find('.text-wrapper').css('display', '');
+    }
 
-	function postNoteClicked(e) {
-		e.preventDefault();
-		var $postNote = jQuery(e.currentTarget).parents('.post-note');
-		if ($postNote.hasClass('resizing') || $postNote.hasClass('dragging')) {
-			return;
-		}
-		showFormForPostNote($postNote);
-	}
+    function postNoteClicked(e) {
+        e.preventDefault();
+        var $postNote = jQuery(e.currentTarget).parents('.post-note');
+        if ($postNote.hasClass('resizing') || $postNote.hasClass('dragging')) {
+            return;
+        }
+        showFormForPostNote($postNote);
+    }
 
-	function showFormForPostNote($postNote) {
-		hideForm();
-		var postNote = $postNote.data('postNote');
-		$form.data('postNote', postNote);
-		$form.find('textarea').val(postNote.text);
-		$form.show();
-		draggable.makeDraggable($form, draggable.absoluteDragStrategy, false);
-	}
+    function showFormForPostNote($postNote) {
+        hideForm();
+        var postNote = $postNote.data('postNote');
+        $form.data('postNote', postNote);
+        $form.find('textarea').val(postNote.text);
+        $form.show();
+        draggable.makeDraggable($form, draggable.absoluteDragStrategy, false);
+    }
 
-	function hideForm() {
-		var previousPostNote = $form.data('post-note');
-		if (previousPostNote) {
-			hidePostNoteText(previousPostNote);
-		}
-		$form.hide();
-	}
+    function hideForm() {
+        var previousPostNote = $form.data('post-note');
+        if (previousPostNote) {
+            hidePostNoteText(previousPostNote);
+        }
+        $form.hide();
+    }
 
-	return {
-		init: init,
-		render: render,
-		addNewPostNote: addNewPostNoteAndRender,
-	};
+    return {
+        init: init,
+        render: render,
+        addNewPostNote: addNewPostNoteAndRender,
+    };
 
 };
 
 App.DI.register('postNotesPresenter', [
-	'jQuery',
-	'util',
-	'promise',
-	'api',
-	'auth',
-	'draggable',
-	'resizable'],
-	App.Presenters.PostNotesPresenter);
+    'jQuery',
+    'util',
+    'promise',
+    'api',
+    'auth',
+    'draggable',
+    'resizable'],
+    App.Presenters.PostNotesPresenter);
diff --git a/public_html/js/Presenters/PostPresenter.js b/public_html/js/Presenters/PostPresenter.js
index 8c605a23..920cf0de 100644
--- a/public_html/js/Presenters/PostPresenter.js
+++ b/public_html/js/Presenters/PostPresenter.js
@@ -2,349 +2,349 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.PostPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	api,
-	auth,
-	router,
-	keyboard,
-	presenterManager,
-	postsAroundCalculator,
-	postEditPresenter,
-	postContentPresenter,
-	commentListPresenter,
-	topNavigationPresenter,
-	messagePresenter) {
+    _,
+    jQuery,
+    util,
+    promise,
+    api,
+    auth,
+    router,
+    keyboard,
+    presenterManager,
+    postsAroundCalculator,
+    postEditPresenter,
+    postContentPresenter,
+    commentListPresenter,
+    topNavigationPresenter,
+    messagePresenter) {
 
-	var $el = jQuery('#content');
-	var $messages = $el;
+    var $el = jQuery('#content');
+    var $messages = $el;
 
-	var templates = {};
-	var params;
+    var templates = {};
+    var params;
 
-	var postNameOrId;
-	var post;
+    var postNameOrId;
+    var post;
 
-	var privileges = {};
+    var privileges = {};
 
-	function init(params, loaded) {
-		topNavigationPresenter.select('posts');
-		postsAroundCalculator.resetCache();
+    function init(params, loaded) {
+        topNavigationPresenter.select('posts');
+        postsAroundCalculator.resetCache();
 
-		privileges.canDeletePosts = auth.hasPrivilege(auth.privileges.deletePosts);
-		privileges.canFeaturePosts = auth.hasPrivilege(auth.privileges.featurePosts);
-		privileges.canViewHistory = auth.hasPrivilege(auth.privileges.viewHistory);
-		privileges.canAddPostNotes = auth.hasPrivilege(auth.privileges.addPostNotes);
+        privileges.canDeletePosts = auth.hasPrivilege(auth.privileges.deletePosts);
+        privileges.canFeaturePosts = auth.hasPrivilege(auth.privileges.featurePosts);
+        privileges.canViewHistory = auth.hasPrivilege(auth.privileges.viewHistory);
+        privileges.canAddPostNotes = auth.hasPrivilege(auth.privileges.addPostNotes);
 
-		promise.wait(
-				util.promiseTemplate('post'),
-				util.promiseTemplate('history'))
-			.then(function(
-					postTemplate,
-					historyTemplate) {
-				templates.post = postTemplate;
-				templates.history = historyTemplate;
+        promise.wait(
+                util.promiseTemplate('post'),
+                util.promiseTemplate('history'))
+            .then(function(
+                    postTemplate,
+                    historyTemplate) {
+                templates.post = postTemplate;
+                templates.history = historyTemplate;
 
-				reinit(params, loaded);
-			}).fail(function(response) {
-				showGenericError(response);
-				loaded();
-			});
-	}
+                reinit(params, loaded);
+            }).fail(function(response) {
+                showGenericError(response);
+                loaded();
+            });
+    }
 
-	function reinit(_params, loaded) {
-		params = _params;
-		params.query = params.query || {};
-		params.query.page = parseInt(params.query.page) || 1;
+    function reinit(_params, loaded) {
+        params = _params;
+        params.query = params.query || {};
+        params.query.page = parseInt(params.query.page) || 1;
 
-		postNameOrId = params.postNameOrId;
+        postNameOrId = params.postNameOrId;
 
-		promise.wait(refreshPost())
-			.then(function() {
-				topNavigationPresenter.changeTitle('@' + post.id);
-				render();
-				loaded();
+        promise.wait(refreshPost())
+            .then(function() {
+                topNavigationPresenter.changeTitle('@' + post.id);
+                render();
+                loaded();
 
-				presenterManager.initPresenters([
-					[postContentPresenter, {post: post, $target: $el.find('#post-content-target')}],
-					[postEditPresenter, {post: post, $target: $el.find('#post-edit-target'), updateCallback: postEdited}],
-					[commentListPresenter, {post: post, $target: $el.find('#post-comments-target')}]],
-					function() { });
+                presenterManager.initPresenters([
+                    [postContentPresenter, {post: post, $target: $el.find('#post-content-target')}],
+                    [postEditPresenter, {post: post, $target: $el.find('#post-edit-target'), updateCallback: postEdited}],
+                    [commentListPresenter, {post: post, $target: $el.find('#post-comments-target')}]],
+                    function() { });
 
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
 
-	}
+    }
 
-	function attachLinksToPostsAround() {
-		promise.wait(postsAroundCalculator.getLinksToPostsAround(params.query, post.id))
-			.then(function(nextPostUrl, prevPostUrl) {
-				var $prevPost = $el.find('#post-current-search .right a');
-				var $nextPost = $el.find('#post-current-search .left a');
+    function attachLinksToPostsAround() {
+        promise.wait(postsAroundCalculator.getLinksToPostsAround(params.query, post.id))
+            .then(function(nextPostUrl, prevPostUrl) {
+                var $prevPost = $el.find('#post-current-search .right a');
+                var $nextPost = $el.find('#post-current-search .left a');
 
-				if (nextPostUrl) {
-					$nextPost.addClass('enabled');
-					$nextPost.attr('href', nextPostUrl);
-					keyboard.keyup('a', function() {
-						router.navigate(nextPostUrl);
-					});
-				} else {
-					$nextPost.removeClass('enabled');
-					$nextPost.removeAttr('href');
-					keyboard.unbind('a');
-				}
+                if (nextPostUrl) {
+                    $nextPost.addClass('enabled');
+                    $nextPost.attr('href', nextPostUrl);
+                    keyboard.keyup('a', function() {
+                        router.navigate(nextPostUrl);
+                    });
+                } else {
+                    $nextPost.removeClass('enabled');
+                    $nextPost.removeAttr('href');
+                    keyboard.unbind('a');
+                }
 
-				if (prevPostUrl) {
-					$prevPost.addClass('enabled');
-					$prevPost.attr('href', prevPostUrl);
-					keyboard.keyup('d', function() {
-						router.navigate(prevPostUrl);
-					});
-				} else {
-					$prevPost.removeClass('enabled');
-					$prevPost.removeAttr('href');
-					keyboard.unbind('d');
-				}
-			}).fail(function() {
-			});
-	}
+                if (prevPostUrl) {
+                    $prevPost.addClass('enabled');
+                    $prevPost.attr('href', prevPostUrl);
+                    keyboard.keyup('d', function() {
+                        router.navigate(prevPostUrl);
+                    });
+                } else {
+                    $prevPost.removeClass('enabled');
+                    $prevPost.removeAttr('href');
+                    keyboard.unbind('d');
+                }
+            }).fail(function() {
+            });
+    }
 
-	function refreshPost() {
-		return promise.make(function(resolve, reject) {
-			promise.wait(api.get('/posts/' + postNameOrId))
-				.then(function(postResponse) {
-					post = postResponse.json;
-					resolve();
-				}).fail(function(response) {
-					showGenericError(response);
-					reject();
-				});
-		});
-	}
+    function refreshPost() {
+        return promise.make(function(resolve, reject) {
+            promise.wait(api.get('/posts/' + postNameOrId))
+                .then(function(postResponse) {
+                    post = postResponse.json;
+                    resolve();
+                }).fail(function(response) {
+                    showGenericError(response);
+                    reject();
+                });
+        });
+    }
 
-	function render() {
-		$el.html(renderPostTemplate());
-		$messages = $el.find('.messages');
+    function render() {
+        $el.html(renderPostTemplate());
+        $messages = $el.find('.messages');
 
-		keyboard.keyup('e', function() {
-			editButtonClicked(null);
-		});
+        keyboard.keyup('e', function() {
+            editButtonClicked(null);
+        });
 
-		keyboard.keyup('f', function() {
-			var $wrapper = $el.find('.object-wrapper');
-			if ($wrapper.data('full')) {
-				$wrapper.css({maxWidth: $wrapper.attr('data-width') + 'px', width: 'auto'});
-				$wrapper.data('full', false);
-			} else {
-				$wrapper.css({maxWidth: null, width: $wrapper.attr('data-width')});
-				$wrapper.data('full', true);
-			}
-			postContentPresenter.updatePostNotesSize();
-		});
+        keyboard.keyup('f', function() {
+            var $wrapper = $el.find('.object-wrapper');
+            if ($wrapper.data('full')) {
+                $wrapper.css({maxWidth: $wrapper.attr('data-width') + 'px', width: 'auto'});
+                $wrapper.data('full', false);
+            } else {
+                $wrapper.css({maxWidth: null, width: $wrapper.attr('data-width')});
+                $wrapper.data('full', true);
+            }
+            postContentPresenter.updatePostNotesSize();
+        });
 
-		attachSidebarEvents();
+        attachSidebarEvents();
 
-		attachLinksToPostsAround();
-	}
+        attachLinksToPostsAround();
+    }
 
-	function postEdited(newPost) {
-		post = newPost;
-		hideEditForm();
-		softRender();
-	}
+    function postEdited(newPost) {
+        post = newPost;
+        hideEditForm();
+        softRender();
+    }
 
-	function softRender() {
-		renderSidebar();
-		$el.find('video').prop('loop', post.flags.loop);
-	}
+    function softRender() {
+        renderSidebar();
+        $el.find('video').prop('loop', post.flags.loop);
+    }
 
-	function renderSidebar() {
-		$el.find('#sidebar').html(jQuery(renderPostTemplate()).find('#sidebar').html());
-		attachSidebarEvents();
-	}
+    function renderSidebar() {
+        $el.find('#sidebar').html(jQuery(renderPostTemplate()).find('#sidebar').html());
+        attachSidebarEvents();
+    }
 
-	function renderPostTemplate() {
-		return templates.post({
-			query: params.query,
-			post: post,
-			ownScore: post.ownScore,
-			postFavorites: post.favorites,
-			postHistory: post.history,
+    function renderPostTemplate() {
+        return templates.post({
+            query: params.query,
+            post: post,
+            ownScore: post.ownScore,
+            postFavorites: post.favorites,
+            postHistory: post.history,
 
-			util: util,
+            util: util,
 
-			historyTemplate: templates.history,
+            historyTemplate: templates.history,
 
-			hasFav: _.any(post.favorites, function(favUser) { return favUser.id === auth.getCurrentUser().id; }),
-			isLoggedIn: auth.isLoggedIn(),
-			privileges: privileges,
-			editPrivileges: postEditPresenter.getPrivileges(),
-		});
-	}
+            hasFav: _.any(post.favorites, function(favUser) { return favUser.id === auth.getCurrentUser().id; }),
+            isLoggedIn: auth.isLoggedIn(),
+            privileges: privileges,
+            editPrivileges: postEditPresenter.getPrivileges(),
+        });
+    }
 
-	function attachSidebarEvents() {
-		$el.find('#sidebar .delete').click(deleteButtonClicked);
-		$el.find('#sidebar .feature').click(featureButtonClicked);
-		$el.find('#sidebar .edit').click(editButtonClicked);
-		$el.find('#sidebar .history').click(historyButtonClicked);
-		$el.find('#sidebar .add-favorite').click(addFavoriteButtonClicked);
-		$el.find('#sidebar .delete-favorite').click(deleteFavoriteButtonClicked);
-		$el.find('#sidebar .score-up').click(scoreUpButtonClicked);
-		$el.find('#sidebar .score-down').click(scoreDownButtonClicked);
-		$el.find('#sidebar .add-note').click(addNoteButtonClicked);
-	}
+    function attachSidebarEvents() {
+        $el.find('#sidebar .delete').click(deleteButtonClicked);
+        $el.find('#sidebar .feature').click(featureButtonClicked);
+        $el.find('#sidebar .edit').click(editButtonClicked);
+        $el.find('#sidebar .history').click(historyButtonClicked);
+        $el.find('#sidebar .add-favorite').click(addFavoriteButtonClicked);
+        $el.find('#sidebar .delete-favorite').click(deleteFavoriteButtonClicked);
+        $el.find('#sidebar .score-up').click(scoreUpButtonClicked);
+        $el.find('#sidebar .score-down').click(scoreDownButtonClicked);
+        $el.find('#sidebar .add-note').click(addNoteButtonClicked);
+    }
 
-	function addNoteButtonClicked(e) {
-		e.preventDefault();
-		postContentPresenter.addNewPostNote();
-	}
+    function addNoteButtonClicked(e) {
+        e.preventDefault();
+        postContentPresenter.addNewPostNote();
+    }
 
-	function deleteButtonClicked(e) {
-		e.preventDefault();
-		messagePresenter.hideMessages($messages);
-		if (window.confirm('Do you really want to delete this post?')) {
-			deletePost();
-		}
-	}
+    function deleteButtonClicked(e) {
+        e.preventDefault();
+        messagePresenter.hideMessages($messages);
+        if (window.confirm('Do you really want to delete this post?')) {
+            deletePost();
+        }
+    }
 
-	function deletePost() {
-		promise.wait(api.delete('/posts/' + post.id))
-			.then(function(response) {
-				router.navigate('#/posts');
-			}).fail(showGenericError);
-	}
+    function deletePost() {
+        promise.wait(api.delete('/posts/' + post.id))
+            .then(function(response) {
+                router.navigate('#/posts');
+            }).fail(showGenericError);
+    }
 
-	function featureButtonClicked(e) {
-		e.preventDefault();
-		messagePresenter.hideMessages($messages);
-		if (window.confirm('Do you want to feature this post on the front page?')) {
-			featurePost();
-		}
-	}
+    function featureButtonClicked(e) {
+        e.preventDefault();
+        messagePresenter.hideMessages($messages);
+        if (window.confirm('Do you want to feature this post on the front page?')) {
+            featurePost();
+        }
+    }
 
-	function featurePost() {
-		promise.wait(api.post('/posts/' + post.id + '/feature'))
-			.then(function(response) {
-				router.navigate('#/home');
-			}).fail(showGenericError);
-	}
+    function featurePost() {
+        promise.wait(api.post('/posts/' + post.id + '/feature'))
+            .then(function(response) {
+                router.navigate('#/home');
+            }).fail(showGenericError);
+    }
 
-	function editButtonClicked(e) {
-		if (e) {
-			e.preventDefault();
-		}
-		messagePresenter.hideMessages($messages);
-		if ($el.find('#post-edit-target').is(':visible')) {
-			hideEditForm();
-		} else {
-			showEditForm();
-		}
-	}
+    function editButtonClicked(e) {
+        if (e) {
+            e.preventDefault();
+        }
+        messagePresenter.hideMessages($messages);
+        if ($el.find('#post-edit-target').is(':visible')) {
+            hideEditForm();
+        } else {
+            showEditForm();
+        }
+    }
 
-	function showEditForm() {
-		$el.find('#post-edit-target').slideDown('fast');
-		util.enableExitConfirmation();
-		postEditPresenter.focus();
-	}
+    function showEditForm() {
+        $el.find('#post-edit-target').slideDown('fast');
+        util.enableExitConfirmation();
+        postEditPresenter.focus();
+    }
 
-	function hideEditForm() {
-		$el.find('#post-edit-target').slideUp('fast');
-		util.disableExitConfirmation();
-	}
+    function hideEditForm() {
+        $el.find('#post-edit-target').slideUp('fast');
+        util.disableExitConfirmation();
+    }
 
-	function historyButtonClicked(e) {
-		e.preventDefault();
-		if ($el.find('.post-history-wrapper').is(':visible')) {
-			hideHistory();
-		} else {
-			showHistory();
-		}
-	}
+    function historyButtonClicked(e) {
+        e.preventDefault();
+        if ($el.find('.post-history-wrapper').is(':visible')) {
+            hideHistory();
+        } else {
+            showHistory();
+        }
+    }
 
-	function hideHistory() {
-		$el.find('.post-history-wrapper').slideUp('slow');
-	}
+    function hideHistory() {
+        $el.find('.post-history-wrapper').slideUp('slow');
+    }
 
-	function showHistory() {
-		$el.find('.post-history-wrapper').slideDown('slow');
-	}
+    function showHistory() {
+        $el.find('.post-history-wrapper').slideDown('slow');
+    }
 
-	function addFavoriteButtonClicked(e) {
-		e.preventDefault();
-		addFavorite();
-	}
+    function addFavoriteButtonClicked(e) {
+        e.preventDefault();
+        addFavorite();
+    }
 
-	function deleteFavoriteButtonClicked(e) {
-		e.preventDefault();
-		deleteFavorite();
-	}
+    function deleteFavoriteButtonClicked(e) {
+        e.preventDefault();
+        deleteFavorite();
+    }
 
-	function addFavorite() {
-		promise.wait(api.post('/posts/' + post.id + '/favorites'))
-			.then(function(response) {
-				promise.wait(refreshPost()).then(softRender);
-			}).fail(showGenericError);
-	}
+    function addFavorite() {
+        promise.wait(api.post('/posts/' + post.id + '/favorites'))
+            .then(function(response) {
+                promise.wait(refreshPost()).then(softRender);
+            }).fail(showGenericError);
+    }
 
-	function deleteFavorite() {
-		promise.wait(api.delete('/posts/' + post.id + '/favorites'))
-			.then(function(response) {
-				promise.wait(refreshPost()).then(softRender);
-			}).fail(showGenericError);
-	}
+    function deleteFavorite() {
+        promise.wait(api.delete('/posts/' + post.id + '/favorites'))
+            .then(function(response) {
+                promise.wait(refreshPost()).then(softRender);
+            }).fail(showGenericError);
+    }
 
-	function scoreUpButtonClicked(e) {
-		e.preventDefault();
-		var $target = jQuery(this);
-		score($target.hasClass('active') ? 0 : 1);
-	}
+    function scoreUpButtonClicked(e) {
+        e.preventDefault();
+        var $target = jQuery(this);
+        score($target.hasClass('active') ? 0 : 1);
+    }
 
-	function scoreDownButtonClicked(e) {
-		e.preventDefault();
-		var $target = jQuery(this);
-		score($target.hasClass('active') ? 0 : -1);
-	}
+    function scoreDownButtonClicked(e) {
+        e.preventDefault();
+        var $target = jQuery(this);
+        score($target.hasClass('active') ? 0 : -1);
+    }
 
-	function score(scoreValue) {
-		promise.wait(api.post('/posts/' + post.id + '/score', {score: scoreValue}))
-			.then(function() {
-				promise.wait(refreshPost()).then(softRender);
-			}).fail(showGenericError);
-	}
+    function score(scoreValue) {
+        promise.wait(api.post('/posts/' + post.id + '/score', {score: scoreValue}))
+            .then(function() {
+                promise.wait(refreshPost()).then(softRender);
+            }).fail(showGenericError);
+    }
 
-	function showGenericError(response) {
-		if ($messages === $el) {
-			$el.empty();
-		}
-		messagePresenter.showError($messages, response.json && response.json.error || response);
-	}
+    function showGenericError(response) {
+        if ($messages === $el) {
+            $el.empty();
+        }
+        messagePresenter.showError($messages, response.json && response.json.error || response);
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		render: render
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        render: render
+    };
 
 };
 
 App.DI.register('postPresenter', [
-	'_',
-	'jQuery',
-	'util',
-	'promise',
-	'api',
-	'auth',
-	'router',
-	'keyboard',
-	'presenterManager',
-	'postsAroundCalculator',
-	'postEditPresenter',
-	'postContentPresenter',
-	'commentListPresenter',
-	'topNavigationPresenter',
-	'messagePresenter'],
-	App.Presenters.PostPresenter);
+    '_',
+    'jQuery',
+    'util',
+    'promise',
+    'api',
+    'auth',
+    'router',
+    'keyboard',
+    'presenterManager',
+    'postsAroundCalculator',
+    'postEditPresenter',
+    'postContentPresenter',
+    'commentListPresenter',
+    'topNavigationPresenter',
+    'messagePresenter'],
+    App.Presenters.PostPresenter);
diff --git a/public_html/js/Presenters/PostUploadPresenter.js b/public_html/js/Presenters/PostUploadPresenter.js
index 8639cd0f..af70a83e 100644
--- a/public_html/js/Presenters/PostUploadPresenter.js
+++ b/public_html/js/Presenters/PostUploadPresenter.js
@@ -2,687 +2,687 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.PostUploadPresenter = function(
-	_,
-	jQuery,
-	keyboard,
-	promise,
-	util,
-	api,
-	auth,
-	router,
-	tagList,
-	topNavigationPresenter,
-	messagePresenter) {
-
-	var KEY_RETURN = 13;
-
-	var $el = jQuery('#content');
-	var $messages;
-	var templates = {};
-	var allPosts = [];
-	var tagInput;
-	var fileDropper;
-	var interactionEnabled = true;
-	var currentUploadId = null;
-	var currentUploadXhr = null;
-	var maxPostSize = 0;
-
-	function init(params, loaded) {
-		topNavigationPresenter.select('upload');
-		topNavigationPresenter.changeTitle('Upload');
-		maxPostSize = parseInt(jQuery('head').attr('data-max-post-size'));
-
-		promise.wait(util.promiseTemplate('post-upload'))
-			.then(function(template) {
-				templates.upload = template;
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
-
-	function render() {
-		$el.html(templates.upload({
-			canUploadPostsAnonymously: auth.hasPrivilege(auth.privileges.uploadPostsAnonymously)
-		}));
-		$messages = $el.find('.messages');
-
-		tagInput = new App.Controls.TagInput($el.find('form [name=tags]'));
-		fileDropper = new App.Controls.FileDropper($el.find('[name=post-content]'));
-		fileDropper.onChange = fileHandlerChanged;
-
-		$el.find('.url-handler input').keydown(urlHandlerKeyPressed);
-		$el.find('.url-handler button').click(urlHandlerButtonClicked);
-		$el.find('thead th.checkbox').click(postTableSelectAllCheckboxClicked);
-
-		keyboard.keydown('ctrl+up', selectPrevPostTableRow);
-		keyboard.keydown('ctrl+down', selectNextPostTableRow);
-		keyboard.keyup('q', tagInput.focus);
-
-		$el.find('.remove').click(removeButtonClicked);
-		$el.find('.move-up').click(moveUpButtonClicked);
-		$el.find('.move-down').click(moveDownButtonClicked);
-		$el.find('.previous').click(selectPrevPostTableRow);
-		$el.find('.next').click(selectNextPostTableRow);
-		$el.find('.upload').click(uploadButtonClicked);
-		$el.find('.stop').click(stopButtonClicked);
-	}
-
-	function getDefaultPost() {
-		return {
-			safety: 'safe',
-			source: null,
-			anonymous: false,
-			tags: [],
-
-			fileName: null,
-			content: null,
-			url: null,
-			getThumbnail: function() { return promise.makeSilent(function(resolve, reject) { resolve(null); }); },
-			$tableRow: null,
-		};
-	}
-
-	function urlHandlerKeyPressed(e) {
-		if (e.which !== KEY_RETURN) {
-			return;
-		}
-
-		e.preventDefault();
-		$el.find('.url-handler button').trigger('click');
-	}
-
-	function urlHandlerButtonClicked(e) {
-		var $input = $el.find('.url-handler input');
-
-		var url = $input.val().trim();
-		if (url === '') {
-			return;
-		}
-
-		var protocol = /^(\w+):\/\//.exec(url);
-		if (!protocol) {
-			url = 'http://' + url;
-		} else {
-			protocol = protocol[1].toLowerCase();
-			if (protocol !== 'http' && protocol !== 'https') {
-				window.alert('Unsupported protocol: ' + protocol);
-				return;
-			}
-		}
-		$input.val('');
-		var post = addPostFromURL(url);
-		selectPostTableRow(post);
-	}
-
-	function fileHandlerChanged(files) {
-		if (files.length > 0) {
-			var posts = [];
-			for (var i = 0; i < files.length; i ++) {
-				if (files[i].size > maxPostSize) {
-					window.alert('File "' + files[i].name + '" is too big - ignoring.' +
-						String.fromCharCode(10) +
-						'(max allowed file size = ' + maxPostSize + ' bytes)');
-					continue;
-				}
-				var post = addPostFromFile(files[i]);
-				posts.push(post);
-			}
-			selectPostTableRow(_.first(posts));
-		}
-	}
-
-	function postAdded(post) {
-		var allPosts = getAllPosts();
-		allPosts.push(post);
-		setAllPosts(allPosts);
-		createPostTableRow(post);
-		updatePostThumbnailInTable(post);
-	}
-
-	function postChanged(post) {
-		updatePostTableRow(post);
-	}
-
-	function postTableRowClicked(e) {
-		e.preventDefault();
-		if (!interactionEnabled) {
-			return;
-		}
-		var $allCheckboxes = jQuery(this).parents('table').find('tbody input[type=checkbox]');
-		var $myCheckbox = jQuery(this).parents('tr').find('input[type=checkbox]');
-		$allCheckboxes.prop('checked', false);
-		$myCheckbox.prop('checked', true);
-		postTableCheckboxesChanged(e);
-		tagInput.focus();
-	}
-
-	function postTableCheckboxClicked(e) {
-		if (!interactionEnabled) {
-			e.preventDefault();
-			return;
-		}
-		if (e.target.nodeName === 'TD') {
-			var checkbox = jQuery(this).find('input[type=checkbox]');
-			checkbox.prop('checked', !checkbox.prop('checked'));
-		}
-		postTableCheckboxesChanged(e);
-	}
-
-	function postTableSelectAllCheckboxClicked(e) {
-		if (!interactionEnabled) {
-			e.preventDefault();
-			return;
-		}
-		var $checkbox = jQuery(this).find('input[type=checkbox]');
-		if (e.target.nodeName === 'TH') {
-			$checkbox.prop('checked', !$checkbox.prop('checked'));
-		}
-		$el.find('tbody input[type=checkbox]').prop('checked', $checkbox.prop('checked'));
-		postTableCheckboxesChanged();
-	}
-
-	function postTableCheckboxesChanged(e) {
-		if (!interactionEnabled) {
-			if (typeof(e) !== 'undefined') {
-				e.preventDefault();
-			}
-			return;
-		}
-
-		var $table = $el.find('table');
-		$table.find('tbody tr').each(function(i, row) {
-			var $row = jQuery(row);
-			var checked = $row.find('input[type=checkbox]').prop('checked');
-			$row.toggleClass('selected', checked);
-		});
-
-		var allPosts = getAllPosts();
-		var selectedPosts = getSelectedPosts();
-		$table.find('[name=select-all]').prop('checked', allPosts.length === selectedPosts.length);
-		postTableSelectionChanged(selectedPosts);
-	}
-
-	function removeButtonClicked(e) {
-		e.preventDefault();
-		removePosts(getSelectedPosts());
-	}
-
-	function moveUpButtonClicked(e) {
-		e.preventDefault();
-		movePostsUp(getSelectedPosts());
-	}
-
-	function moveDownButtonClicked(e) {
-		e.preventDefault();
-		movePostsDown(getSelectedPosts());
-	}
-
-	function uploadButtonClicked(e) {
-		e.preventDefault();
-		if (!interactionEnabled) {
-			return;
-		}
-		startUpload();
-	}
-
-	function stopButtonClicked(e) {
-		e.preventDefault();
-		stopUpload();
-	}
-
-	function makeThumbnail(thumbnailWidth, thumbnailHeight, file) {
-		return promise.makeSilent(function(resolve, reject) {
-			var canvas = document.createElement('canvas');
-			var img = new Image();
-			canvas.width = thumbnailWidth;
-			canvas.height = thumbnailHeight;
-			var context = canvas.getContext('2d');
-			img.onload = function() {
-				//memory still leaks...
-				img.onload = null;
-				context.drawImage(img, 0, 0, thumbnailWidth, thumbnailHeight);
-				URL.revokeObjectURL(img.src);
-				img.src = null;
-				resolve(canvas.toDataURL());
-			};
-			img.src = URL.createObjectURL(file);
-		});
-	}
-
-	function addPostFromFile(file) {
-		var post = _.extend({}, getDefaultPost(), {
-			fileName: file.name,
-			file: file,
-			getThumbnail: function(thumbnailWidth, thumbnailHeight) {
-				return promise.makeSilent(function(resolve, reject) {
-					if (!file.type.match('image.*')) {
-						resolve(null);
-						return;
-					}
-					if (thumbnailWidth === null || thumbnailHeight === null) {
-						resolve(URL.createObjectURL(post.file));
-						return;
-					}
-					makeThumbnail(thumbnailWidth, thumbnailHeight, post.file)
-						.then(function(thumbnailDataURL) {
-							resolve(thumbnailDataURL);
-						});
-				});
-			},
-		});
-
-		postAdded(post);
-		return post;
-	}
-
-	function addPostFromURL(url) {
-		var post = _.extend({}, getDefaultPost(), {
-			url: url,
-			fileName: url,
-		});
-
-		var matches = url.match(/watch.*?=([a-zA-Z0-9_-]+)/);
-		if (matches) {
-			var youtubeThumbnailURL = 'http://img.youtube.com/vi/' + matches[1] + '/mqdefault.jpg';
-			post.getThumbnail = function(thumbnailWidth, thumbnailHeight) {
-				return promise.makeSilent(function(resolve, reject) {
-					resolve(youtubeThumbnailURL);
-				});
-			};
-		} else if (url.match(/image|img|jpg|png|gif/i)) {
-			post.getThumbnail = function(thumbnailWidth, thumbnailHeight) {
-				return promise.makeSilent(function(resolve, reject) {
-					resolve(url);
-				});
-			};
-		}
-
-		postAdded(post);
-		setPostsSource([post], url);
-		return post;
-	}
-
-	function createPostTableRow(post) {
-		var $table = $el.find('table');
-		var $row = $table.find('.template').clone(true);
-
-		post.$tableRow = $row;
-
-		$row.removeClass('template');
-		$row.find('td:not(.checkbox)').click(postTableRowClicked);
-		$row.find('a').click(postTableRowClicked);
-		$row.find('td.checkbox').click(postTableCheckboxClicked);
-		$row.data('post', post);
-		$table.find('tbody').append($row);
-		$row.find('td.checkbox input').attr('id', _.uniqueId());
-		$row.find('td.checkbox label').attr('for', $row.find('td.checkbox input').attr('id'));
-
-		postChanged(post);
-
-		showOrHidePostsTable();
-	}
-
-	function updatePostTableRow(post) {
-		var $row = post.$tableRow;
-		$row.find('.tags').text(post.tags.join(', ') || '-');
-		$row.find('.safety div').attr('class', 'safety-' + post.safety);
-	}
-
-	function updatePostThumbnailInForm(post) {
-		post.getThumbnail(null, null).then(function(thumbnailDataURL) {
-			var $thumbnail = $el.find('.form-slider .thumbnail');
-			var $img = $thumbnail.find('img');
-			var $link = $thumbnail.find('a');
-			if (thumbnailDataURL === null) {
-				$img.hide();
-				$link.hide();
-			} else {
-				$img.show();
-				$img.attr('src', thumbnailDataURL);
-				$link.show();
-				$link.attr('href', thumbnailDataURL);
-			}
-		});
-	}
-
-	function updatePostThumbnailInTable(post) {
-		post.getThumbnail(30, 30).then(function(thumbnailDataURL) {
-			var $row = post.$tableRow;
-			if (thumbnailDataURL === null) {
-				$row.find('img').attr('src', util.transparentPixel());
-			} else {
-				$row.find('img').attr('src', thumbnailDataURL);
-			}
-		});
-	}
-
-	function getAllPosts() {
-		return allPosts;
-	}
-
-	function setAllPosts(newPosts) {
-		allPosts = newPosts;
-	}
-
-	function syncPostsWithTable() {
-		setAllPosts(_.map($el.find('tbody tr'), function(row) {
-			return jQuery(row).data('post');
-		}));
-	}
-
-	function getSelectedPosts() {
-		return _.map($el.find('tbody tr.selected'), function(row) {
-			return jQuery(row).data('post');
-		});
-	}
-
-	function postTableSelectionChanged(selectedPosts) {
-		messagePresenter.hideMessages($messages);
-		if (selectedPosts.length === 0) {
-			hidePostEditForm();
-		} else {
-			tagInput.hideSuggestions();
-			showPostEditForm(selectedPosts);
-		}
-		$el.find('.post-table-op').prop('disabled', selectedPosts.length === 0);
-		if (selectedPosts.length === 1) {
-			updatePostThumbnailInForm(selectedPosts[0]);
-		}
-	}
-
-	function hidePostEditForm() {
-		var $postEditForm = $el.find('form');
-		$postEditForm.parent('.form-slider').slideUp(function() {
-			$postEditForm.find('.thumbnail').hide();
-		});
-	}
-
-	function showPostEditForm(selectedPosts) {
-		var $postEditForm = $el.find('form');
-		$postEditForm.parent('.form-slider').slideDown();
-		if (selectedPosts.length !== 1) {
-			$postEditForm.parent('.form-slider').find('.thumbnail').slideUp();
-			$postEditForm.find('.file-name strong').text('Multiple posts selected');
-		} else {
-			var post = selectedPosts[0];
-			$postEditForm.parent('.form-slider').find('.thumbnail').slideDown();
-			$postEditForm.find('.file-name strong').text(post.fileName || post.url);
-			updatePostThumbnailInForm(post);
-		}
-
-		var combinedPost = getCombinedPost(selectedPosts);
-
-		$postEditForm.find('[name=source]').val(combinedPost.source);
-		$postEditForm.find('[name=anonymous]').prop('checked', combinedPost.anonymous);
-		$postEditForm.find('[name=safety]').prop('checked', false);
-		if (combinedPost.safety !== null) {
-			$postEditForm.find('[name=safety][value=' + combinedPost.safety + ']').prop('checked', true);
-		}
-		tagInput.setTags(combinedPost.tags);
-
-		$postEditForm.find('[name=source]').unbind('change').bind('change', function(e) {
-			setPostsSource(selectedPosts, jQuery(this).val());
-		});
-		$postEditForm.find('[name=safety]').unbind('change').bind('change', function(e) {
-			setPostsSafety(selectedPosts, jQuery(this).val());
-		});
-		$postEditForm.find('[name=anonymous]').unbind('change').bind('change', function(e) {
-			setPostsAnonymity(selectedPosts, jQuery(this).is(':checked'));
-		});
-		tagInput.beforeTagAdded = function(tag) {
-			addTagToPosts(selectedPosts, tag);
-		};
-		tagInput.beforeTagRemoved = function(tag) {
-			removeTagFromPosts(selectedPosts, tag);
-		};
-	}
-
-	function getTagIndex(post, tag) {
-		var tags = jQuery.map(post.tags, function(tag) {
-			return tag.toLowerCase();
-		});
-		return tags.indexOf(tag.toLowerCase());
-	}
-
-	function hasTag(post, tag) {
-		return getTagIndex(post, tag) !== -1;
-	}
-
-	function getCombinedPost(posts) {
-		var combinedPost = _.extend({}, getDefaultPost());
-		if (posts.length === 0) {
-			return combinedPost;
-		}
-		_.extend(combinedPost, posts[0]);
-
-		var tagFilter = function(post) {
-			return function(tag) {
-				return hasTag(post, tag);
-			};
-		};
-
-		for (var i = 1; i < posts.length; i ++) {
-			if (posts[i].safety !== posts[0].safety) {
-				combinedPost.safety = null;
-			}
-			if (posts[i].anonymous !== posts[0].anonymous) {
-				combinedPost.anonymous = null;
-			}
-			if (posts[i].source !== posts[0].source) {
-				combinedPost.source = null;
-			}
-			combinedPost.tags = combinedPost.tags.filter(tagFilter(posts[i]));
-		}
-
-		return combinedPost;
-	}
-
-	function setPostsSource(posts, newSource) {
-		_.each(posts, function(post) {
-			var maxSourceLength = 200;
-			if (newSource.length > maxSourceLength) {
-				newSource = newSource.substring(0, maxSourceLength - 5) + '(...)';
-			}
-			post.source = newSource;
-			postChanged(post);
-		});
-	}
-
-	function setPostsSafety(posts, newSafety) {
-		_.each(posts, function(post) {
-			post.safety = newSafety;
-			postChanged(post);
-		});
-	}
-
-	function setPostsAnonymity(posts, isAnonymous) {
-		_.each(posts, function(post) {
-			post.anonymous = isAnonymous;
-			postChanged(post);
-		});
-	}
-
-	function addTagToPosts(posts, tag) {
-		jQuery.each(posts, function(i, post) {
-			if (!hasTag(post, tag)) {
-				post.tags.push(tag);
-			}
-			postChanged(post);
-		});
-	}
-
-	function removeTagFromPosts(posts, tag) {
-		jQuery.each(posts, function(i, post) {
-			if (hasTag(post, tag)) {
-				post.tags.splice(getTagIndex(post, tag), 1);
-			}
-			postChanged(post);
-		});
-	}
-
-	function selectPostTableRow(post) {
-		if (post) {
-			var $table = $el.find('table');
-			$table.find('tbody input[type=checkbox]').prop('checked', false);
-			$table.find('tbody tr').each(function(i, row) {
-				var $row = jQuery(row);
-				if (post === $row.data('post')) {
-					$row.find('input[type=checkbox]').prop('checked', true);
-					return false;
-				}
-			});
-			postTableCheckboxesChanged();
-		}
-	}
-
-	function selectPrevPostTableRow() {
-		selectPostTableRow($el.find('tbody tr.selected:eq(0)').prev().data('post'));
-		return false;
-	}
-
-	function selectNextPostTableRow() {
-		selectPostTableRow($el.find('tbody tr.selected:eq(0)').next().data('post'));
-		return false;
-	}
-
-	function showOrHidePostsTable() {
-		if (getAllPosts().length === 0) {
-			util.disableExitConfirmation();
-			$el.find('#post-upload-step2').fadeOut();
-		} else {
-			util.enableExitConfirmation();
-			$el.find('#post-upload-step2').fadeIn();
-		}
-	}
-
-	function removePosts(posts) {
-		_.each(posts, function(post) {
-			post.$tableRow.remove();
-		});
-		syncPostsWithTable();
-		showOrHidePostsTable();
-		postTableCheckboxesChanged();
-	}
-
-	function movePostsUp(posts) {
-		_.each(posts, function(post) {
-			var $row = post.$tableRow;
-			$row.insertBefore($row.prev('tr:not(.selected)'));
-		});
-		syncPostsWithTable();
-	}
-
-	function movePostsDown(posts) {
-		_.each(posts.reverse(), function(post) {
-			var $row = post.$tableRow;
-			$row.insertAfter($row.next('tr:not(.selected)'));
-		});
-		syncPostsWithTable();
-	}
-
-	function startUpload() {
-		$el.find('tbody input[type=checkbox]').prop('checked', false);
-		postTableCheckboxesChanged();
-
-		$el.find('.upload').hide();
-		$el.find('.stop').show();
-		interactionEnabled = false;
-		currentUploadId = Math.random();
-		uploadNextPost();
-	}
-
-	function stopUpload() {
-		currentUploadId = null;
-		showUploadError('Upload stopped.');
-		if (currentUploadXhr && currentUploadXhr.readystate !== api.AJAX_DONE) {
-			currentUploadXhr.abort();
-		}
-	}
-
-	function uploadNextPost() {
-		var priorUploadId = currentUploadId;
-		messagePresenter.hideMessages($messages);
-
-		var posts = getAllPosts();
-		if (posts.length === 0) {
-			onUploadCompleted();
-			return;
-		}
-
-		messagePresenter.showInfo($messages, 'Uploading in progress&hellip;');
-		var post = posts[0];
-		var $row = post.$tableRow;
-
-		var formData = new FormData();
-		if (post.url) {
-			formData.append('url', post.url);
-		} else {
-			formData.append('content', post.file);
-			formData.append('contentFileName', post.fileName);
-		}
-		formData.append('source', post.source || '');
-		formData.append('safety', post.safety);
-		formData.append('anonymous', (post.anonymous | 0));
-		formData.append('tags', post.tags.join(' '));
-
-		if (post.tags.length === 0) {
-			showUploadError('No tags set.');
-			return;
-		}
-
-		var apiPromise = api.post('/posts', formData);
-		currentUploadXhr = apiPromise.xhr;
-
-		promise.wait(apiPromise)
-			.then(function(response) {
-				$row.slideUp(function(response) {
-					if (priorUploadId === currentUploadId) {
-						$row.remove();
-						posts.shift();
-						setAllPosts(posts);
-						uploadNextPost();
-					}
-				});
-			}).fail(function(response) {
-				if (priorUploadId === currentUploadId) {
-					showUploadError(response.json && response.json.error || response);
-				}
-			});
-	}
-
-	function onUploadCompleted() {
-		util.disableExitConfirmation();
-		tagList.refreshTags();
-		router.navigate('#/posts');
-	}
-
-	function showUploadError(message) {
-		$el.find('.upload').show();
-		$el.find('.stop').hide();
-		messagePresenter.hideMessages($messages);
-		messagePresenter.showError($messages, message);
-		interactionEnabled = true;
-	}
-
-	return {
-		init: init,
-		render: render,
-	};
+    _,
+    jQuery,
+    keyboard,
+    promise,
+    util,
+    api,
+    auth,
+    router,
+    tagList,
+    topNavigationPresenter,
+    messagePresenter) {
+
+    var KEY_RETURN = 13;
+
+    var $el = jQuery('#content');
+    var $messages;
+    var templates = {};
+    var allPosts = [];
+    var tagInput;
+    var fileDropper;
+    var interactionEnabled = true;
+    var currentUploadId = null;
+    var currentUploadXhr = null;
+    var maxPostSize = 0;
+
+    function init(params, loaded) {
+        topNavigationPresenter.select('upload');
+        topNavigationPresenter.changeTitle('Upload');
+        maxPostSize = parseInt(jQuery('head').attr('data-max-post-size'));
+
+        promise.wait(util.promiseTemplate('post-upload'))
+            .then(function(template) {
+                templates.upload = template;
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
+
+    function render() {
+        $el.html(templates.upload({
+            canUploadPostsAnonymously: auth.hasPrivilege(auth.privileges.uploadPostsAnonymously)
+        }));
+        $messages = $el.find('.messages');
+
+        tagInput = new App.Controls.TagInput($el.find('form [name=tags]'));
+        fileDropper = new App.Controls.FileDropper($el.find('[name=post-content]'));
+        fileDropper.onChange = fileHandlerChanged;
+
+        $el.find('.url-handler input').keydown(urlHandlerKeyPressed);
+        $el.find('.url-handler button').click(urlHandlerButtonClicked);
+        $el.find('thead th.checkbox').click(postTableSelectAllCheckboxClicked);
+
+        keyboard.keydown('ctrl+up', selectPrevPostTableRow);
+        keyboard.keydown('ctrl+down', selectNextPostTableRow);
+        keyboard.keyup('q', tagInput.focus);
+
+        $el.find('.remove').click(removeButtonClicked);
+        $el.find('.move-up').click(moveUpButtonClicked);
+        $el.find('.move-down').click(moveDownButtonClicked);
+        $el.find('.previous').click(selectPrevPostTableRow);
+        $el.find('.next').click(selectNextPostTableRow);
+        $el.find('.upload').click(uploadButtonClicked);
+        $el.find('.stop').click(stopButtonClicked);
+    }
+
+    function getDefaultPost() {
+        return {
+            safety: 'safe',
+            source: null,
+            anonymous: false,
+            tags: [],
+
+            fileName: null,
+            content: null,
+            url: null,
+            getThumbnail: function() { return promise.makeSilent(function(resolve, reject) { resolve(null); }); },
+            $tableRow: null,
+        };
+    }
+
+    function urlHandlerKeyPressed(e) {
+        if (e.which !== KEY_RETURN) {
+            return;
+        }
+
+        e.preventDefault();
+        $el.find('.url-handler button').trigger('click');
+    }
+
+    function urlHandlerButtonClicked(e) {
+        var $input = $el.find('.url-handler input');
+
+        var url = $input.val().trim();
+        if (url === '') {
+            return;
+        }
+
+        var protocol = /^(\w+):\/\//.exec(url);
+        if (!protocol) {
+            url = 'http://' + url;
+        } else {
+            protocol = protocol[1].toLowerCase();
+            if (protocol !== 'http' && protocol !== 'https') {
+                window.alert('Unsupported protocol: ' + protocol);
+                return;
+            }
+        }
+        $input.val('');
+        var post = addPostFromURL(url);
+        selectPostTableRow(post);
+    }
+
+    function fileHandlerChanged(files) {
+        if (files.length > 0) {
+            var posts = [];
+            for (var i = 0; i < files.length; i ++) {
+                if (files[i].size > maxPostSize) {
+                    window.alert('File "' + files[i].name + '" is too big - ignoring.' +
+                        String.fromCharCode(10) +
+                        '(max allowed file size = ' + maxPostSize + ' bytes)');
+                    continue;
+                }
+                var post = addPostFromFile(files[i]);
+                posts.push(post);
+            }
+            selectPostTableRow(_.first(posts));
+        }
+    }
+
+    function postAdded(post) {
+        var allPosts = getAllPosts();
+        allPosts.push(post);
+        setAllPosts(allPosts);
+        createPostTableRow(post);
+        updatePostThumbnailInTable(post);
+    }
+
+    function postChanged(post) {
+        updatePostTableRow(post);
+    }
+
+    function postTableRowClicked(e) {
+        e.preventDefault();
+        if (!interactionEnabled) {
+            return;
+        }
+        var $allCheckboxes = jQuery(this).parents('table').find('tbody input[type=checkbox]');
+        var $myCheckbox = jQuery(this).parents('tr').find('input[type=checkbox]');
+        $allCheckboxes.prop('checked', false);
+        $myCheckbox.prop('checked', true);
+        postTableCheckboxesChanged(e);
+        tagInput.focus();
+    }
+
+    function postTableCheckboxClicked(e) {
+        if (!interactionEnabled) {
+            e.preventDefault();
+            return;
+        }
+        if (e.target.nodeName === 'TD') {
+            var checkbox = jQuery(this).find('input[type=checkbox]');
+            checkbox.prop('checked', !checkbox.prop('checked'));
+        }
+        postTableCheckboxesChanged(e);
+    }
+
+    function postTableSelectAllCheckboxClicked(e) {
+        if (!interactionEnabled) {
+            e.preventDefault();
+            return;
+        }
+        var $checkbox = jQuery(this).find('input[type=checkbox]');
+        if (e.target.nodeName === 'TH') {
+            $checkbox.prop('checked', !$checkbox.prop('checked'));
+        }
+        $el.find('tbody input[type=checkbox]').prop('checked', $checkbox.prop('checked'));
+        postTableCheckboxesChanged();
+    }
+
+    function postTableCheckboxesChanged(e) {
+        if (!interactionEnabled) {
+            if (typeof(e) !== 'undefined') {
+                e.preventDefault();
+            }
+            return;
+        }
+
+        var $table = $el.find('table');
+        $table.find('tbody tr').each(function(i, row) {
+            var $row = jQuery(row);
+            var checked = $row.find('input[type=checkbox]').prop('checked');
+            $row.toggleClass('selected', checked);
+        });
+
+        var allPosts = getAllPosts();
+        var selectedPosts = getSelectedPosts();
+        $table.find('[name=select-all]').prop('checked', allPosts.length === selectedPosts.length);
+        postTableSelectionChanged(selectedPosts);
+    }
+
+    function removeButtonClicked(e) {
+        e.preventDefault();
+        removePosts(getSelectedPosts());
+    }
+
+    function moveUpButtonClicked(e) {
+        e.preventDefault();
+        movePostsUp(getSelectedPosts());
+    }
+
+    function moveDownButtonClicked(e) {
+        e.preventDefault();
+        movePostsDown(getSelectedPosts());
+    }
+
+    function uploadButtonClicked(e) {
+        e.preventDefault();
+        if (!interactionEnabled) {
+            return;
+        }
+        startUpload();
+    }
+
+    function stopButtonClicked(e) {
+        e.preventDefault();
+        stopUpload();
+    }
+
+    function makeThumbnail(thumbnailWidth, thumbnailHeight, file) {
+        return promise.makeSilent(function(resolve, reject) {
+            var canvas = document.createElement('canvas');
+            var img = new Image();
+            canvas.width = thumbnailWidth;
+            canvas.height = thumbnailHeight;
+            var context = canvas.getContext('2d');
+            img.onload = function() {
+                //memory still leaks...
+                img.onload = null;
+                context.drawImage(img, 0, 0, thumbnailWidth, thumbnailHeight);
+                URL.revokeObjectURL(img.src);
+                img.src = null;
+                resolve(canvas.toDataURL());
+            };
+            img.src = URL.createObjectURL(file);
+        });
+    }
+
+    function addPostFromFile(file) {
+        var post = _.extend({}, getDefaultPost(), {
+            fileName: file.name,
+            file: file,
+            getThumbnail: function(thumbnailWidth, thumbnailHeight) {
+                return promise.makeSilent(function(resolve, reject) {
+                    if (!file.type.match('image.*')) {
+                        resolve(null);
+                        return;
+                    }
+                    if (thumbnailWidth === null || thumbnailHeight === null) {
+                        resolve(URL.createObjectURL(post.file));
+                        return;
+                    }
+                    makeThumbnail(thumbnailWidth, thumbnailHeight, post.file)
+                        .then(function(thumbnailDataURL) {
+                            resolve(thumbnailDataURL);
+                        });
+                });
+            },
+        });
+
+        postAdded(post);
+        return post;
+    }
+
+    function addPostFromURL(url) {
+        var post = _.extend({}, getDefaultPost(), {
+            url: url,
+            fileName: url,
+        });
+
+        var matches = url.match(/watch.*?=([a-zA-Z0-9_-]+)/);
+        if (matches) {
+            var youtubeThumbnailURL = 'http://img.youtube.com/vi/' + matches[1] + '/mqdefault.jpg';
+            post.getThumbnail = function(thumbnailWidth, thumbnailHeight) {
+                return promise.makeSilent(function(resolve, reject) {
+                    resolve(youtubeThumbnailURL);
+                });
+            };
+        } else if (url.match(/image|img|jpg|png|gif/i)) {
+            post.getThumbnail = function(thumbnailWidth, thumbnailHeight) {
+                return promise.makeSilent(function(resolve, reject) {
+                    resolve(url);
+                });
+            };
+        }
+
+        postAdded(post);
+        setPostsSource([post], url);
+        return post;
+    }
+
+    function createPostTableRow(post) {
+        var $table = $el.find('table');
+        var $row = $table.find('.template').clone(true);
+
+        post.$tableRow = $row;
+
+        $row.removeClass('template');
+        $row.find('td:not(.checkbox)').click(postTableRowClicked);
+        $row.find('a').click(postTableRowClicked);
+        $row.find('td.checkbox').click(postTableCheckboxClicked);
+        $row.data('post', post);
+        $table.find('tbody').append($row);
+        $row.find('td.checkbox input').attr('id', _.uniqueId());
+        $row.find('td.checkbox label').attr('for', $row.find('td.checkbox input').attr('id'));
+
+        postChanged(post);
+
+        showOrHidePostsTable();
+    }
+
+    function updatePostTableRow(post) {
+        var $row = post.$tableRow;
+        $row.find('.tags').text(post.tags.join(', ') || '-');
+        $row.find('.safety div').attr('class', 'safety-' + post.safety);
+    }
+
+    function updatePostThumbnailInForm(post) {
+        post.getThumbnail(null, null).then(function(thumbnailDataURL) {
+            var $thumbnail = $el.find('.form-slider .thumbnail');
+            var $img = $thumbnail.find('img');
+            var $link = $thumbnail.find('a');
+            if (thumbnailDataURL === null) {
+                $img.hide();
+                $link.hide();
+            } else {
+                $img.show();
+                $img.attr('src', thumbnailDataURL);
+                $link.show();
+                $link.attr('href', thumbnailDataURL);
+            }
+        });
+    }
+
+    function updatePostThumbnailInTable(post) {
+        post.getThumbnail(30, 30).then(function(thumbnailDataURL) {
+            var $row = post.$tableRow;
+            if (thumbnailDataURL === null) {
+                $row.find('img').attr('src', util.transparentPixel());
+            } else {
+                $row.find('img').attr('src', thumbnailDataURL);
+            }
+        });
+    }
+
+    function getAllPosts() {
+        return allPosts;
+    }
+
+    function setAllPosts(newPosts) {
+        allPosts = newPosts;
+    }
+
+    function syncPostsWithTable() {
+        setAllPosts(_.map($el.find('tbody tr'), function(row) {
+            return jQuery(row).data('post');
+        }));
+    }
+
+    function getSelectedPosts() {
+        return _.map($el.find('tbody tr.selected'), function(row) {
+            return jQuery(row).data('post');
+        });
+    }
+
+    function postTableSelectionChanged(selectedPosts) {
+        messagePresenter.hideMessages($messages);
+        if (selectedPosts.length === 0) {
+            hidePostEditForm();
+        } else {
+            tagInput.hideSuggestions();
+            showPostEditForm(selectedPosts);
+        }
+        $el.find('.post-table-op').prop('disabled', selectedPosts.length === 0);
+        if (selectedPosts.length === 1) {
+            updatePostThumbnailInForm(selectedPosts[0]);
+        }
+    }
+
+    function hidePostEditForm() {
+        var $postEditForm = $el.find('form');
+        $postEditForm.parent('.form-slider').slideUp(function() {
+            $postEditForm.find('.thumbnail').hide();
+        });
+    }
+
+    function showPostEditForm(selectedPosts) {
+        var $postEditForm = $el.find('form');
+        $postEditForm.parent('.form-slider').slideDown();
+        if (selectedPosts.length !== 1) {
+            $postEditForm.parent('.form-slider').find('.thumbnail').slideUp();
+            $postEditForm.find('.file-name strong').text('Multiple posts selected');
+        } else {
+            var post = selectedPosts[0];
+            $postEditForm.parent('.form-slider').find('.thumbnail').slideDown();
+            $postEditForm.find('.file-name strong').text(post.fileName || post.url);
+            updatePostThumbnailInForm(post);
+        }
+
+        var combinedPost = getCombinedPost(selectedPosts);
+
+        $postEditForm.find('[name=source]').val(combinedPost.source);
+        $postEditForm.find('[name=anonymous]').prop('checked', combinedPost.anonymous);
+        $postEditForm.find('[name=safety]').prop('checked', false);
+        if (combinedPost.safety !== null) {
+            $postEditForm.find('[name=safety][value=' + combinedPost.safety + ']').prop('checked', true);
+        }
+        tagInput.setTags(combinedPost.tags);
+
+        $postEditForm.find('[name=source]').unbind('change').bind('change', function(e) {
+            setPostsSource(selectedPosts, jQuery(this).val());
+        });
+        $postEditForm.find('[name=safety]').unbind('change').bind('change', function(e) {
+            setPostsSafety(selectedPosts, jQuery(this).val());
+        });
+        $postEditForm.find('[name=anonymous]').unbind('change').bind('change', function(e) {
+            setPostsAnonymity(selectedPosts, jQuery(this).is(':checked'));
+        });
+        tagInput.beforeTagAdded = function(tag) {
+            addTagToPosts(selectedPosts, tag);
+        };
+        tagInput.beforeTagRemoved = function(tag) {
+            removeTagFromPosts(selectedPosts, tag);
+        };
+    }
+
+    function getTagIndex(post, tag) {
+        var tags = jQuery.map(post.tags, function(tag) {
+            return tag.toLowerCase();
+        });
+        return tags.indexOf(tag.toLowerCase());
+    }
+
+    function hasTag(post, tag) {
+        return getTagIndex(post, tag) !== -1;
+    }
+
+    function getCombinedPost(posts) {
+        var combinedPost = _.extend({}, getDefaultPost());
+        if (posts.length === 0) {
+            return combinedPost;
+        }
+        _.extend(combinedPost, posts[0]);
+
+        var tagFilter = function(post) {
+            return function(tag) {
+                return hasTag(post, tag);
+            };
+        };
+
+        for (var i = 1; i < posts.length; i ++) {
+            if (posts[i].safety !== posts[0].safety) {
+                combinedPost.safety = null;
+            }
+            if (posts[i].anonymous !== posts[0].anonymous) {
+                combinedPost.anonymous = null;
+            }
+            if (posts[i].source !== posts[0].source) {
+                combinedPost.source = null;
+            }
+            combinedPost.tags = combinedPost.tags.filter(tagFilter(posts[i]));
+        }
+
+        return combinedPost;
+    }
+
+    function setPostsSource(posts, newSource) {
+        _.each(posts, function(post) {
+            var maxSourceLength = 200;
+            if (newSource.length > maxSourceLength) {
+                newSource = newSource.substring(0, maxSourceLength - 5) + '(...)';
+            }
+            post.source = newSource;
+            postChanged(post);
+        });
+    }
+
+    function setPostsSafety(posts, newSafety) {
+        _.each(posts, function(post) {
+            post.safety = newSafety;
+            postChanged(post);
+        });
+    }
+
+    function setPostsAnonymity(posts, isAnonymous) {
+        _.each(posts, function(post) {
+            post.anonymous = isAnonymous;
+            postChanged(post);
+        });
+    }
+
+    function addTagToPosts(posts, tag) {
+        jQuery.each(posts, function(i, post) {
+            if (!hasTag(post, tag)) {
+                post.tags.push(tag);
+            }
+            postChanged(post);
+        });
+    }
+
+    function removeTagFromPosts(posts, tag) {
+        jQuery.each(posts, function(i, post) {
+            if (hasTag(post, tag)) {
+                post.tags.splice(getTagIndex(post, tag), 1);
+            }
+            postChanged(post);
+        });
+    }
+
+    function selectPostTableRow(post) {
+        if (post) {
+            var $table = $el.find('table');
+            $table.find('tbody input[type=checkbox]').prop('checked', false);
+            $table.find('tbody tr').each(function(i, row) {
+                var $row = jQuery(row);
+                if (post === $row.data('post')) {
+                    $row.find('input[type=checkbox]').prop('checked', true);
+                    return false;
+                }
+            });
+            postTableCheckboxesChanged();
+        }
+    }
+
+    function selectPrevPostTableRow() {
+        selectPostTableRow($el.find('tbody tr.selected:eq(0)').prev().data('post'));
+        return false;
+    }
+
+    function selectNextPostTableRow() {
+        selectPostTableRow($el.find('tbody tr.selected:eq(0)').next().data('post'));
+        return false;
+    }
+
+    function showOrHidePostsTable() {
+        if (getAllPosts().length === 0) {
+            util.disableExitConfirmation();
+            $el.find('#post-upload-step2').fadeOut();
+        } else {
+            util.enableExitConfirmation();
+            $el.find('#post-upload-step2').fadeIn();
+        }
+    }
+
+    function removePosts(posts) {
+        _.each(posts, function(post) {
+            post.$tableRow.remove();
+        });
+        syncPostsWithTable();
+        showOrHidePostsTable();
+        postTableCheckboxesChanged();
+    }
+
+    function movePostsUp(posts) {
+        _.each(posts, function(post) {
+            var $row = post.$tableRow;
+            $row.insertBefore($row.prev('tr:not(.selected)'));
+        });
+        syncPostsWithTable();
+    }
+
+    function movePostsDown(posts) {
+        _.each(posts.reverse(), function(post) {
+            var $row = post.$tableRow;
+            $row.insertAfter($row.next('tr:not(.selected)'));
+        });
+        syncPostsWithTable();
+    }
+
+    function startUpload() {
+        $el.find('tbody input[type=checkbox]').prop('checked', false);
+        postTableCheckboxesChanged();
+
+        $el.find('.upload').hide();
+        $el.find('.stop').show();
+        interactionEnabled = false;
+        currentUploadId = Math.random();
+        uploadNextPost();
+    }
+
+    function stopUpload() {
+        currentUploadId = null;
+        showUploadError('Upload stopped.');
+        if (currentUploadXhr && currentUploadXhr.readystate !== api.AJAX_DONE) {
+            currentUploadXhr.abort();
+        }
+    }
+
+    function uploadNextPost() {
+        var priorUploadId = currentUploadId;
+        messagePresenter.hideMessages($messages);
+
+        var posts = getAllPosts();
+        if (posts.length === 0) {
+            onUploadCompleted();
+            return;
+        }
+
+        messagePresenter.showInfo($messages, 'Uploading in progress&hellip;');
+        var post = posts[0];
+        var $row = post.$tableRow;
+
+        var formData = new FormData();
+        if (post.url) {
+            formData.append('url', post.url);
+        } else {
+            formData.append('content', post.file);
+            formData.append('contentFileName', post.fileName);
+        }
+        formData.append('source', post.source || '');
+        formData.append('safety', post.safety);
+        formData.append('anonymous', (post.anonymous | 0));
+        formData.append('tags', post.tags.join(' '));
+
+        if (post.tags.length === 0) {
+            showUploadError('No tags set.');
+            return;
+        }
+
+        var apiPromise = api.post('/posts', formData);
+        currentUploadXhr = apiPromise.xhr;
+
+        promise.wait(apiPromise)
+            .then(function(response) {
+                $row.slideUp(function(response) {
+                    if (priorUploadId === currentUploadId) {
+                        $row.remove();
+                        posts.shift();
+                        setAllPosts(posts);
+                        uploadNextPost();
+                    }
+                });
+            }).fail(function(response) {
+                if (priorUploadId === currentUploadId) {
+                    showUploadError(response.json && response.json.error || response);
+                }
+            });
+    }
+
+    function onUploadCompleted() {
+        util.disableExitConfirmation();
+        tagList.refreshTags();
+        router.navigate('#/posts');
+    }
+
+    function showUploadError(message) {
+        $el.find('.upload').show();
+        $el.find('.stop').hide();
+        messagePresenter.hideMessages($messages);
+        messagePresenter.showError($messages, message);
+        interactionEnabled = true;
+    }
+
+    return {
+        init: init,
+        render: render,
+    };
 
 };
 
 App.DI.register('postUploadPresenter', [
-	'_',
-	'jQuery',
-	'keyboard',
-	'promise',
-	'util',
-	'api',
-	'auth',
-	'router',
-	'tagList',
-	'topNavigationPresenter',
-	'messagePresenter'], App.Presenters.PostUploadPresenter);
+    '_',
+    'jQuery',
+    'keyboard',
+    'promise',
+    'util',
+    'api',
+    'auth',
+    'router',
+    'tagList',
+    'topNavigationPresenter',
+    'messagePresenter'], App.Presenters.PostUploadPresenter);
diff --git a/public_html/js/Presenters/ProgressPresenter.js b/public_html/js/Presenters/ProgressPresenter.js
index 81143e0d..80a7bf63 100644
--- a/public_html/js/Presenters/ProgressPresenter.js
+++ b/public_html/js/Presenters/ProgressPresenter.js
@@ -2,43 +2,43 @@ var App = App || {};
 App.Controls = App.Controls || {};
 
 App.Presenters.ProgressPresenter = function(nprogress) {
-	var nesting = 0;
+    var nesting = 0;
 
-	function start() {
-		nesting ++;
+    function start() {
+        nesting ++;
 
-		if (nesting === 1) {
-			nprogress.start();
-		}
-	}
+        if (nesting === 1) {
+            nprogress.start();
+        }
+    }
 
-	function reset() {
-		nesting = 0;
-	}
+    function reset() {
+        nesting = 0;
+    }
 
-	function done() {
-		if (nesting) {
-			nesting --;
-		}
+    function done() {
+        if (nesting) {
+            nesting --;
+        }
 
-		if (nesting <= 0) {
-			nprogress.done();
-		} else {
-			nprogress.inc();
-		}
-	}
+        if (nesting <= 0) {
+            nprogress.done();
+        } else {
+            nprogress.inc();
+        }
+    }
 
-	window.setInterval(function() {
-		if (nesting <= 0) {
-			nprogress.done();
-		}
-	}, 1000);
+    window.setInterval(function() {
+        if (nesting <= 0) {
+            nprogress.done();
+        }
+    }, 1000);
 
-	return {
-		start: start,
-		done: done,
-		reset: reset,
-	};
+    return {
+        start: start,
+        done: done,
+        reset: reset,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/RegistrationPresenter.js b/public_html/js/Presenters/RegistrationPresenter.js
index 207fc860..2c900068 100644
--- a/public_html/js/Presenters/RegistrationPresenter.js
+++ b/public_html/js/Presenters/RegistrationPresenter.js
@@ -2,100 +2,100 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.RegistrationPresenter = function(
-	jQuery,
-	util,
-	promise,
-	api,
-	topNavigationPresenter,
-	messagePresenter) {
+    jQuery,
+    util,
+    promise,
+    api,
+    topNavigationPresenter,
+    messagePresenter) {
 
-	var $el = jQuery('#content');
-	var templates = {};
-	var $messages;
+    var $el = jQuery('#content');
+    var templates = {};
+    var $messages;
 
-	function init(params, loaded) {
-		topNavigationPresenter.select('register');
-		topNavigationPresenter.changeTitle('Registration');
-		promise.wait(util.promiseTemplate('registration-form'))
-			.then(function(template) {
-				templates.registration = template;
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+    function init(params, loaded) {
+        topNavigationPresenter.select('register');
+        topNavigationPresenter.changeTitle('Registration');
+        promise.wait(util.promiseTemplate('registration-form'))
+            .then(function(template) {
+                templates.registration = template;
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function render() {
-		$el.html(templates.registration());
-		$el.find('form').submit(registrationFormSubmitted);
-		$messages = $el.find('.messages');
-		$messages.width($el.find('form').width());
-	}
+    function render() {
+        $el.html(templates.registration());
+        $el.find('form').submit(registrationFormSubmitted);
+        $messages = $el.find('.messages');
+        $messages.width($el.find('form').width());
+    }
 
-	function registrationFormSubmitted(e) {
-		e.preventDefault();
-		messagePresenter.hideMessages($messages);
+    function registrationFormSubmitted(e) {
+        e.preventDefault();
+        messagePresenter.hideMessages($messages);
 
-		var formData = {
-			userName: $el.find('[name=userName]').val(),
-			password: $el.find('[name=password]').val(),
-			passwordConfirmation: $el.find('[name=passwordConfirmation]').val(),
-			email: $el.find('[name=email]').val(),
-		};
+        var formData = {
+            userName: $el.find('[name=userName]').val(),
+            password: $el.find('[name=password]').val(),
+            passwordConfirmation: $el.find('[name=passwordConfirmation]').val(),
+            email: $el.find('[name=email]').val(),
+        };
 
-		if (!validateRegistrationFormData(formData)) {
-			return;
-		}
+        if (!validateRegistrationFormData(formData)) {
+            return;
+        }
 
-		promise.wait(api.post('/users', formData))
-			.then(function(response) {
-				registrationSuccess(response);
-			}).fail(function(response) {
-				registrationFailure(response);
-			});
-	}
+        promise.wait(api.post('/users', formData))
+            .then(function(response) {
+                registrationSuccess(response);
+            }).fail(function(response) {
+                registrationFailure(response);
+            });
+    }
 
-	function registrationSuccess(apiResponse) {
-		$el.find('form').slideUp(function() {
-			var message = 'Registration complete! ';
-			if (!apiResponse.json.confirmed) {
-				message += '<br/>Check your inbox for activation e-mail.<br/>If e-mail doesn\'t show up, check your spam folder.';
-			} else {
-				message += '<a href="#/login">Click here</a> to login.';
-			}
-			messagePresenter.showInfo($messages, message);
-		});
-	}
+    function registrationSuccess(apiResponse) {
+        $el.find('form').slideUp(function() {
+            var message = 'Registration complete! ';
+            if (!apiResponse.json.confirmed) {
+                message += '<br/>Check your inbox for activation e-mail.<br/>If e-mail doesn\'t show up, check your spam folder.';
+            } else {
+                message += '<a href="#/login">Click here</a> to login.';
+            }
+            messagePresenter.showInfo($messages, message);
+        });
+    }
 
-	function registrationFailure(apiResponse) {
-		messagePresenter.showError($messages, apiResponse.json && apiResponse.json.error || apiResponse);
-	}
+    function registrationFailure(apiResponse) {
+        messagePresenter.showError($messages, apiResponse.json && apiResponse.json.error || apiResponse);
+    }
 
-	function validateRegistrationFormData(formData) {
-		if (formData.userName.length === 0) {
-			messagePresenter.showError($messages, 'User name cannot be empty.');
-			return false;
-		}
+    function validateRegistrationFormData(formData) {
+        if (formData.userName.length === 0) {
+            messagePresenter.showError($messages, 'User name cannot be empty.');
+            return false;
+        }
 
-		if (formData.password.length === 0) {
-			messagePresenter.showError($messages, 'Password cannot be empty.');
-			return false;
-		}
+        if (formData.password.length === 0) {
+            messagePresenter.showError($messages, 'Password cannot be empty.');
+            return false;
+        }
 
-		if (formData.password !== formData.passwordConfirmation) {
-			messagePresenter.showError($messages, 'Passwords must be the same.');
-			return false;
-		}
+        if (formData.password !== formData.passwordConfirmation) {
+            messagePresenter.showError($messages, 'Passwords must be the same.');
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	return {
-		init: init,
-		render: render,
-	};
+    return {
+        init: init,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/TagListPresenter.js b/public_html/js/Presenters/TagListPresenter.js
index cfa67aba..fa9cc4aa 100644
--- a/public_html/js/Presenters/TagListPresenter.js
+++ b/public_html/js/Presenters/TagListPresenter.js
@@ -2,124 +2,124 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.TagListPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	keyboard,
-	pagerPresenter,
-	topNavigationPresenter) {
+    _,
+    jQuery,
+    util,
+    promise,
+    keyboard,
+    pagerPresenter,
+    topNavigationPresenter) {
 
-	var $el = jQuery('#content');
-	var $searchInput;
-	var templates = {};
+    var $el = jQuery('#content');
+    var $searchInput;
+    var templates = {};
 
-	var params;
+    var params;
 
-	function init(_params, loaded) {
-		topNavigationPresenter.select('tags');
-		topNavigationPresenter.changeTitle('Tags');
-		params = _params;
-		params.query = params.query || {};
+    function init(_params, loaded) {
+        topNavigationPresenter.select('tags');
+        topNavigationPresenter.changeTitle('Tags');
+        params = _params;
+        params.query = params.query || {};
 
-		promise.wait(
-				util.promiseTemplate('tag-list'),
-				util.promiseTemplate('tag-list-item'))
-			.then(function(listTemplate, listItemTemplate) {
-				templates.list = listTemplate;
-				templates.listItem = listItemTemplate;
+        promise.wait(
+                util.promiseTemplate('tag-list'),
+                util.promiseTemplate('tag-list-item'))
+            .then(function(listTemplate, listItemTemplate) {
+                templates.list = listTemplate;
+                templates.listItem = listItemTemplate;
 
-				render();
-				loaded();
+                render();
+                loaded();
 
-				pagerPresenter.init({
-						baseUri: '#/tags',
-						backendUri: '/tags',
-						$target: $el.find('.pagination-target'),
-						updateCallback: function($page, data) {
-							renderTags($page, data.entities);
-						},
-					},
-					function() {
-						reinit(params, function() {});
-					});
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+                pagerPresenter.init({
+                        baseUri: '#/tags',
+                        backendUri: '/tags',
+                        $target: $el.find('.pagination-target'),
+                        updateCallback: function($page, data) {
+                            renderTags($page, data.entities);
+                        },
+                    },
+                    function() {
+                        reinit(params, function() {});
+                    });
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function reinit(_params, loaded) {
-		params = _params;
-		params.query = params.query || {};
-		params.query.order = params.query.order || 'name,asc';
-		updateActiveOrder(params.query.order);
+    function reinit(_params, loaded) {
+        params = _params;
+        params.query = params.query || {};
+        params.query.order = params.query.order || 'name,asc';
+        updateActiveOrder(params.query.order);
 
-		pagerPresenter.reinit({query: params.query});
+        pagerPresenter.reinit({query: params.query});
 
-		keyboard.keyup('p', function() {
-			$el.find('table a').eq(0).focus();
-		});
+        keyboard.keyup('p', function() {
+            $el.find('table a').eq(0).focus();
+        });
 
-		keyboard.keyup('q', function() {
-			$searchInput.eq(0).focus().select();
-		});
+        keyboard.keyup('q', function() {
+            $searchInput.eq(0).focus().select();
+        });
 
-		loaded();
-		softRender();
-	}
+        loaded();
+        softRender();
+    }
 
-	function deinit() {
-		pagerPresenter.deinit();
-	}
+    function deinit() {
+        pagerPresenter.deinit();
+    }
 
-	function render() {
-		$el.html(templates.list());
-		$searchInput = $el.find('input[name=query]');
-		$el.find('form').submit(searchFormSubmitted);
-		App.Controls.AutoCompleteInput($searchInput);
-		softRender();
-	}
+    function render() {
+        $el.html(templates.list());
+        $searchInput = $el.find('input[name=query]');
+        $el.find('form').submit(searchFormSubmitted);
+        App.Controls.AutoCompleteInput($searchInput);
+        softRender();
+    }
 
-	function softRender() {
-		$searchInput.val(params.query.query);
-	}
+    function softRender() {
+        $searchInput.val(params.query.query);
+    }
 
 
-	function searchFormSubmitted(e) {
-		e.preventDefault();
-		updateSearch();
-	}
+    function searchFormSubmitted(e) {
+        e.preventDefault();
+        updateSearch();
+    }
 
-	function updateSearch() {
-		$searchInput.blur();
-		params.query.query = $searchInput.val().trim();
-		params.query.page = 1;
-		pagerPresenter.setQuery(params.query);
-	}
+    function updateSearch() {
+        $searchInput.blur();
+        params.query.query = $searchInput.val().trim();
+        params.query.page = 1;
+        pagerPresenter.setQuery(params.query);
+    }
 
-	function updateActiveOrder(activeOrder) {
-		$el.find('.order li a.active').removeClass('active');
-		$el.find('.order [href*="' + activeOrder + '"]').addClass('active');
-	}
+    function updateActiveOrder(activeOrder) {
+        $el.find('.order li a.active').removeClass('active');
+        $el.find('.order [href*="' + activeOrder + '"]').addClass('active');
+    }
 
-	function renderTags($page, tags) {
-		var $target = $page.find('tbody');
-		_.each(tags, function(tag) {
-			var $item = jQuery(templates.listItem({
-				tag: tag,
-				util: util,
-			}));
-			$target.append($item);
-		});
-	}
+    function renderTags($page, tags) {
+        var $target = $page.find('tbody');
+        _.each(tags, function(tag) {
+            var $item = jQuery(templates.listItem({
+                tag: tag,
+                util: util,
+            }));
+            $target.append($item);
+        });
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		deinit: deinit,
-		render: render,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        deinit: deinit,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/TagPresenter.js b/public_html/js/Presenters/TagPresenter.js
index 7966ed1d..0776b253 100644
--- a/public_html/js/Presenters/TagPresenter.js
+++ b/public_html/js/Presenters/TagPresenter.js
@@ -2,199 +2,199 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.TagPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	auth,
-	api,
-	tagList,
-	router,
-	keyboard,
-	topNavigationPresenter,
-	messagePresenter) {
+    _,
+    jQuery,
+    util,
+    promise,
+    auth,
+    api,
+    tagList,
+    router,
+    keyboard,
+    topNavigationPresenter,
+    messagePresenter) {
 
-	var $el = jQuery('#content');
-	var $messages = $el;
-	var templates = {};
-	var implicationsTagInput;
-	var suggestionsTagInput;
+    var $el = jQuery('#content');
+    var $messages = $el;
+    var templates = {};
+    var implicationsTagInput;
+    var suggestionsTagInput;
 
-	var tag;
-	var posts;
-	var siblings;
+    var tag;
+    var posts;
+    var siblings;
 
-	var privileges = {};
+    var privileges = {};
 
-	function init(params, loaded) {
-		topNavigationPresenter.select('tags');
-		topNavigationPresenter.changeTitle('Tags');
+    function init(params, loaded) {
+        topNavigationPresenter.select('tags');
+        topNavigationPresenter.changeTitle('Tags');
 
-		privileges.canChangeName = auth.hasPrivilege(auth.privileges.changeTagName);
-		privileges.canChangeCategory = auth.hasPrivilege(auth.privileges.changeTagCategory);
-		privileges.canChangeImplications = auth.hasPrivilege(auth.privileges.changeTagImplications);
-		privileges.canChangeSuggestions = auth.hasPrivilege(auth.privileges.changeTagSuggestions);
-		privileges.canBan = auth.hasPrivilege(auth.privileges.banTags);
-		privileges.canViewHistory = auth.hasPrivilege(auth.privileges.viewHistory);
-		privileges.canDelete = auth.hasPrivilege(auth.privileges.deleteTags);
-		privileges.canMerge = auth.hasPrivilege(auth.privileges.mergeTags);
-		privileges.canViewPosts = auth.hasPrivilege(auth.privileges.viewPosts);
+        privileges.canChangeName = auth.hasPrivilege(auth.privileges.changeTagName);
+        privileges.canChangeCategory = auth.hasPrivilege(auth.privileges.changeTagCategory);
+        privileges.canChangeImplications = auth.hasPrivilege(auth.privileges.changeTagImplications);
+        privileges.canChangeSuggestions = auth.hasPrivilege(auth.privileges.changeTagSuggestions);
+        privileges.canBan = auth.hasPrivilege(auth.privileges.banTags);
+        privileges.canViewHistory = auth.hasPrivilege(auth.privileges.viewHistory);
+        privileges.canDelete = auth.hasPrivilege(auth.privileges.deleteTags);
+        privileges.canMerge = auth.hasPrivilege(auth.privileges.mergeTags);
+        privileges.canViewPosts = auth.hasPrivilege(auth.privileges.viewPosts);
 
-		promise.wait(
-				util.promiseTemplate('tag'),
-				util.promiseTemplate('post-list-item'),
-				util.promiseTemplate('history'))
-			.then(function(tagTemplate, postListItemTemplate, historyTemplate) {
-				templates.tag = tagTemplate;
-				templates.postListItem = postListItemTemplate;
-				templates.history = historyTemplate;
+        promise.wait(
+                util.promiseTemplate('tag'),
+                util.promiseTemplate('post-list-item'),
+                util.promiseTemplate('history'))
+            .then(function(tagTemplate, postListItemTemplate, historyTemplate) {
+                templates.tag = tagTemplate;
+                templates.postListItem = postListItemTemplate;
+                templates.history = historyTemplate;
 
-				reinit(params, loaded);
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+                reinit(params, loaded);
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function reinit(params, loaded) {
-		var tagName = params.tagName;
+    function reinit(params, loaded) {
+        var tagName = params.tagName;
 
-		messagePresenter.hideMessages($messages);
+        messagePresenter.hideMessages($messages);
 
-		promise.wait(
-				api.get('tags/' + tagName),
-				api.get('tags/' + tagName + '/siblings'),
-				api.get('posts', {query: tagName}))
-			.then(function(tagResponse, siblingsResponse, postsResponse) {
-				tag = tagResponse.json;
-				siblings = siblingsResponse.json.data;
-				posts = postsResponse.json.data;
-				posts = posts.slice(0, 8);
+        promise.wait(
+                api.get('tags/' + tagName),
+                api.get('tags/' + tagName + '/siblings'),
+                api.get('posts', {query: tagName}))
+            .then(function(tagResponse, siblingsResponse, postsResponse) {
+                tag = tagResponse.json;
+                siblings = siblingsResponse.json.data;
+                posts = postsResponse.json.data;
+                posts = posts.slice(0, 8);
 
-				render();
-				loaded();
+                render();
+                loaded();
 
-				renderPosts(posts);
-			}).fail(function(tagResponse, siblingsResponse, postsResponse) {
-				messagePresenter.showError($messages, tagResponse.json.error || siblingsResponse.json.error || postsResponse.json.error);
-				loaded();
-			});
-	}
+                renderPosts(posts);
+            }).fail(function(tagResponse, siblingsResponse, postsResponse) {
+                messagePresenter.showError($messages, tagResponse.json.error || siblingsResponse.json.error || postsResponse.json.error);
+                loaded();
+            });
+    }
 
-	function render() {
-		$el.html(templates.tag({
-			privileges: privileges,
-			tag: tag,
-			siblings: siblings,
-			tagCategories: JSON.parse(jQuery('head').attr('data-tag-categories')),
-			util: util,
-			historyTemplate: templates.history,
-		}));
-		$el.find('.post-list').hide();
-		$el.find('form').submit(function(e) { e.preventDefault(); });
-		$el.find('form button[name=update]').click(updateButtonClicked);
-		$el.find('form button[name=delete]').click(deleteButtonClicked);
-		$el.find('form button[name=merge]').click(mergeButtonClicked);
-		implicationsTagInput = App.Controls.TagInput($el.find('[name=implications]'));
-		suggestionsTagInput = App.Controls.TagInput($el.find('[name=suggestions]'));
-	}
+    function render() {
+        $el.html(templates.tag({
+            privileges: privileges,
+            tag: tag,
+            siblings: siblings,
+            tagCategories: JSON.parse(jQuery('head').attr('data-tag-categories')),
+            util: util,
+            historyTemplate: templates.history,
+        }));
+        $el.find('.post-list').hide();
+        $el.find('form').submit(function(e) { e.preventDefault(); });
+        $el.find('form button[name=update]').click(updateButtonClicked);
+        $el.find('form button[name=delete]').click(deleteButtonClicked);
+        $el.find('form button[name=merge]').click(mergeButtonClicked);
+        implicationsTagInput = App.Controls.TagInput($el.find('[name=implications]'));
+        suggestionsTagInput = App.Controls.TagInput($el.find('[name=suggestions]'));
+    }
 
-	function updateButtonClicked(e) {
-		e.preventDefault();
-		var $form = $el.find('form');
-		var formData = {};
+    function updateButtonClicked(e) {
+        e.preventDefault();
+        var $form = $el.find('form');
+        var formData = {};
 
-		if (privileges.canChangeName) {
-			formData.name = $form.find('[name=name]').val();
-		}
+        if (privileges.canChangeName) {
+            formData.name = $form.find('[name=name]').val();
+        }
 
-		if (privileges.canChangeCategory) {
-			formData.category = $form.find('[name=category]:checked').val();
-		}
+        if (privileges.canChangeCategory) {
+            formData.category = $form.find('[name=category]:checked').val();
+        }
 
-		if (privileges.canBan) {
-			formData.banned = $form.find('[name=ban]').is(':checked') ? 1 : 0;
-		}
+        if (privileges.canBan) {
+            formData.banned = $form.find('[name=ban]').is(':checked') ? 1 : 0;
+        }
 
-		if (privileges.canChangeImplications) {
-			formData.implications = implicationsTagInput.getTags().join(' ');
-		}
+        if (privileges.canChangeImplications) {
+            formData.implications = implicationsTagInput.getTags().join(' ');
+        }
 
-		if (privileges.canChangeSuggestions) {
-			formData.suggestions = suggestionsTagInput.getTags().join(' ');
-		}
+        if (privileges.canChangeSuggestions) {
+            formData.suggestions = suggestionsTagInput.getTags().join(' ');
+        }
 
-		promise.wait(api.put('/tags/' + tag.name, formData))
-			.then(function(response) {
-				router.navigateInplace('#/tag/' + response.json.name);
-				tagList.refreshTags();
-			}).fail(function(response) {
-				window.alert(response.json && response.json.error || 'An error occured.');
-			});
-	}
+        promise.wait(api.put('/tags/' + tag.name, formData))
+            .then(function(response) {
+                router.navigateInplace('#/tag/' + response.json.name);
+                tagList.refreshTags();
+            }).fail(function(response) {
+                window.alert(response.json && response.json.error || 'An error occured.');
+            });
+    }
 
-	function deleteButtonClicked(e) {
-		if (!window.confirm('Are you sure you want to delete this tag?')) {
-			return;
-		}
-		promise.wait(api.delete('/tags/' + tag.name))
-			.then(function(response) {
-				router.navigate('#/tags');
-				tagList.refreshTags();
-			}).fail(function(response) {
-				window.alert(response.json && response.json.error || 'An error occured.');
-			});
-	}
+    function deleteButtonClicked(e) {
+        if (!window.confirm('Are you sure you want to delete this tag?')) {
+            return;
+        }
+        promise.wait(api.delete('/tags/' + tag.name))
+            .then(function(response) {
+                router.navigate('#/tags');
+                tagList.refreshTags();
+            }).fail(function(response) {
+                window.alert(response.json && response.json.error || 'An error occured.');
+            });
+    }
 
-	function mergeButtonClicked(e) {
-		var targetTag = window.prompt('What tag should this be merged to?');
-		if (targetTag) {
-			promise.wait(api.put('/tags/' + tag.name + '/merge', {targetTag: targetTag}))
-				.then(function(response) {
-					router.navigate('#/tags');
-					tagList.refreshTags();
-				}).fail(function(response) {
-					window.alert(response.json && response.json.error || 'An error occured.');
-				});
-		}
-	}
+    function mergeButtonClicked(e) {
+        var targetTag = window.prompt('What tag should this be merged to?');
+        if (targetTag) {
+            promise.wait(api.put('/tags/' + tag.name + '/merge', {targetTag: targetTag}))
+                .then(function(response) {
+                    router.navigate('#/tags');
+                    tagList.refreshTags();
+                }).fail(function(response) {
+                    window.alert(response.json && response.json.error || 'An error occured.');
+                });
+        }
+    }
 
-	function renderPosts(posts) {
-		var $target = $el.find('.post-list ul');
-		_.each(posts, function(post) {
-			var $post = jQuery('<li>' + templates.postListItem({
-				util: util,
-				post: post,
-				query: {query: tag.name},
-				canViewPosts: privileges.canViewPosts,
-			}) + '</li>');
-			$target.append($post);
-		});
-		if (posts.length > 0) {
-			$el.find('.post-list').fadeIn();
-			keyboard.keyup('p', function() {
-				$el.find('.post-list a').eq(0).focus();
-			});
-		}
-	}
+    function renderPosts(posts) {
+        var $target = $el.find('.post-list ul');
+        _.each(posts, function(post) {
+            var $post = jQuery('<li>' + templates.postListItem({
+                util: util,
+                post: post,
+                query: {query: tag.name},
+                canViewPosts: privileges.canViewPosts,
+            }) + '</li>');
+            $target.append($post);
+        });
+        if (posts.length > 0) {
+            $el.find('.post-list').fadeIn();
+            keyboard.keyup('p', function() {
+                $el.find('.post-list a').eq(0).focus();
+            });
+        }
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+    };
 
 };
 
 App.DI.register('tagPresenter', [
-	'_',
-	'jQuery',
-	'util',
-	'promise',
-	'auth',
-	'api',
-	'tagList',
-	'router',
-	'keyboard',
-	'topNavigationPresenter',
-	'messagePresenter'],
+    '_',
+    'jQuery',
+    'util',
+    'promise',
+    'auth',
+    'api',
+    'tagList',
+    'router',
+    'keyboard',
+    'topNavigationPresenter',
+    'messagePresenter'],
 App.Presenters.TagPresenter);
diff --git a/public_html/js/Presenters/TopNavigationPresenter.js b/public_html/js/Presenters/TopNavigationPresenter.js
index b63af644..3889310e 100644
--- a/public_html/js/Presenters/TopNavigationPresenter.js
+++ b/public_html/js/Presenters/TopNavigationPresenter.js
@@ -2,78 +2,78 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.TopNavigationPresenter = function(
-	jQuery,
-	util,
-	promise,
-	auth) {
+    jQuery,
+    util,
+    promise,
+    auth) {
 
-	var selectedElement = null;
-	var $el = jQuery('#top-navigation');
-	var templates = {};
-	var baseTitle = document.title;
+    var selectedElement = null;
+    var $el = jQuery('#top-navigation');
+    var templates = {};
+    var baseTitle = document.title;
 
-	function init(params, loaded) {
-		promise.wait(util.promiseTemplate('top-navigation'))
-			.then(function(template) {
-				templates.topNavigation = template;
-				render();
-				loaded();
-				auth.startObservingLoginChanges('top-navigation', loginStateChanged);
-			}).fail(function() {
-				loaded();
-			});
-	}
+    function init(params, loaded) {
+        promise.wait(util.promiseTemplate('top-navigation'))
+            .then(function(template) {
+                templates.topNavigation = template;
+                render();
+                loaded();
+                auth.startObservingLoginChanges('top-navigation', loginStateChanged);
+            }).fail(function() {
+                loaded();
+            });
+    }
 
-	function select(newSelectedElement) {
-		selectedElement = newSelectedElement;
-		$el.find('li a').removeClass('active');
-		$el.find('li.' + selectedElement).find('a').addClass('active');
-	}
+    function select(newSelectedElement) {
+        selectedElement = newSelectedElement;
+        $el.find('li a').removeClass('active');
+        $el.find('li.' + selectedElement).find('a').addClass('active');
+    }
 
-	function loginStateChanged() {
-		render();
-	}
+    function loginStateChanged() {
+        render();
+    }
 
-	function render() {
-		$el.html(templates.topNavigation({
-			loggedIn: auth.isLoggedIn(),
-			user: auth.getCurrentUser(),
-			canListUsers: auth.hasPrivilege(auth.privileges.listUsers),
-			canListPosts: auth.hasPrivilege(auth.privileges.listPosts),
-			canListComments: auth.hasPrivilege(auth.privileges.listComments),
-			canListTags: auth.hasPrivilege(auth.privileges.listTags),
-			canUploadPosts: auth.hasPrivilege(auth.privileges.uploadPosts),
-		}));
-		$el.find('li.' + selectedElement).find('a').addClass('active');
-	}
+    function render() {
+        $el.html(templates.topNavigation({
+            loggedIn: auth.isLoggedIn(),
+            user: auth.getCurrentUser(),
+            canListUsers: auth.hasPrivilege(auth.privileges.listUsers),
+            canListPosts: auth.hasPrivilege(auth.privileges.listPosts),
+            canListComments: auth.hasPrivilege(auth.privileges.listComments),
+            canListTags: auth.hasPrivilege(auth.privileges.listTags),
+            canUploadPosts: auth.hasPrivilege(auth.privileges.uploadPosts),
+        }));
+        $el.find('li.' + selectedElement).find('a').addClass('active');
+    }
 
-	function focus() {
-		var $tmp = jQuery('<a href="#"> </a>');
-		$el.prepend($tmp);
-		$tmp.focus();
-		$tmp.remove();
-	}
+    function focus() {
+        var $tmp = jQuery('<a href="#"> </a>');
+        $el.prepend($tmp);
+        $tmp.focus();
+        $tmp.remove();
+    }
 
-	function getBaseTitle() {
-		return baseTitle;
-	}
+    function getBaseTitle() {
+        return baseTitle;
+    }
 
-	function changeTitle(subTitle) {
-		var newTitle = baseTitle;
-		if (subTitle) {
-			newTitle += ' - ' + subTitle;
-		}
-		document.title = newTitle;
-	}
+    function changeTitle(subTitle) {
+        var newTitle = baseTitle;
+        if (subTitle) {
+            newTitle += ' - ' + subTitle;
+        }
+        document.title = newTitle;
+    }
 
-	return {
-		init: init,
-		render: render,
-		select: select,
-		focus: focus,
-		getBaseTitle: getBaseTitle,
-		changeTitle: changeTitle,
-	};
+    return {
+        init: init,
+        render: render,
+        select: select,
+        focus: focus,
+        getBaseTitle: getBaseTitle,
+        changeTitle: changeTitle,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/UserAccountRemovalPresenter.js b/public_html/js/Presenters/UserAccountRemovalPresenter.js
index 04b731da..bf94aa68 100644
--- a/public_html/js/Presenters/UserAccountRemovalPresenter.js
+++ b/public_html/js/Presenters/UserAccountRemovalPresenter.js
@@ -2,80 +2,80 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.UserAccountRemovalPresenter = function(
-	jQuery,
-	util,
-	promise,
-	api,
-	auth,
-	router,
-	messagePresenter) {
+    jQuery,
+    util,
+    promise,
+    api,
+    auth,
+    router,
+    messagePresenter) {
 
-	var target;
-	var templates = {};
-	var user;
-	var privileges = {};
+    var target;
+    var templates = {};
+    var user;
+    var privileges = {};
 
-	function init(params, loaded) {
-		user = params.user;
-		target = params.target;
+    function init(params, loaded) {
+        user = params.user;
+        target = params.target;
 
-		privileges.canDeleteAccount =
-			auth.hasPrivilege(auth.privileges.deleteAllAccounts) ||
-			(auth.hasPrivilege(auth.privileges.deleteOwnAccount) && auth.isLoggedIn(user.name));
+        privileges.canDeleteAccount =
+            auth.hasPrivilege(auth.privileges.deleteAllAccounts) ||
+            (auth.hasPrivilege(auth.privileges.deleteOwnAccount) && auth.isLoggedIn(user.name));
 
-		promise.wait(util.promiseTemplate('account-removal'))
-			.then(function(template) {
-				templates.accountRemoval = template;
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+        promise.wait(util.promiseTemplate('account-removal'))
+            .then(function(template) {
+                templates.accountRemoval = template;
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function render() {
-		var $el = jQuery(target);
-		$el.html(templates.accountRemoval({
-			user: user,
-			canDeleteAccount: privileges.canDeleteAccount}));
+    function render() {
+        var $el = jQuery(target);
+        $el.html(templates.accountRemoval({
+            user: user,
+            canDeleteAccount: privileges.canDeleteAccount}));
 
-		$el.find('form').submit(accountRemovalFormSubmitted);
-	}
+        $el.find('form').submit(accountRemovalFormSubmitted);
+    }
 
-	function getPrivileges() {
-		return privileges;
-	}
+    function getPrivileges() {
+        return privileges;
+    }
 
-	function accountRemovalFormSubmitted(e) {
-		e.preventDefault();
-		var $el = jQuery(target);
-		var $messages = $el.find('.messages');
-		messagePresenter.hideMessages($messages);
-		if (!$el.find('input[name=confirmation]:visible').prop('checked')) {
-			messagePresenter.showError($messages, 'Must confirm to proceed.');
-			return;
-		}
-		promise.wait(api.delete('/users/' + user.name))
-			.then(function() {
-				auth.logout();
-				var $messageDiv = messagePresenter.showInfo($messages, 'Account deleted. <a href="">Back to main page</a>');
-				$messageDiv.find('a').click(mainPageLinkClicked);
-			}).fail(function(response) {
-				messagePresenter.showError($messages, response.json && response.json.error || response);
-			});
-	}
+    function accountRemovalFormSubmitted(e) {
+        e.preventDefault();
+        var $el = jQuery(target);
+        var $messages = $el.find('.messages');
+        messagePresenter.hideMessages($messages);
+        if (!$el.find('input[name=confirmation]:visible').prop('checked')) {
+            messagePresenter.showError($messages, 'Must confirm to proceed.');
+            return;
+        }
+        promise.wait(api.delete('/users/' + user.name))
+            .then(function() {
+                auth.logout();
+                var $messageDiv = messagePresenter.showInfo($messages, 'Account deleted. <a href="">Back to main page</a>');
+                $messageDiv.find('a').click(mainPageLinkClicked);
+            }).fail(function(response) {
+                messagePresenter.showError($messages, response.json && response.json.error || response);
+            });
+    }
 
-	function mainPageLinkClicked(e) {
-		e.preventDefault();
-		router.navigateToMainPage();
-	}
+    function mainPageLinkClicked(e) {
+        e.preventDefault();
+        router.navigateToMainPage();
+    }
 
-	return {
-		init: init,
-		render: render,
-		getPrivileges: getPrivileges
-	};
+    return {
+        init: init,
+        render: render,
+        getPrivileges: getPrivileges
+    };
 
 };
 
diff --git a/public_html/js/Presenters/UserAccountSettingsPresenter.js b/public_html/js/Presenters/UserAccountSettingsPresenter.js
index 76fed7e0..ea5f7a37 100644
--- a/public_html/js/Presenters/UserAccountSettingsPresenter.js
+++ b/public_html/js/Presenters/UserAccountSettingsPresenter.js
@@ -2,162 +2,162 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.UserAccountSettingsPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	api,
-	auth,
-	messagePresenter) {
+    _,
+    jQuery,
+    util,
+    promise,
+    api,
+    auth,
+    messagePresenter) {
 
-	var target;
-	var templates = {};
-	var user;
-	var privileges;
-	var avatarContent;
-	var fileDropper;
+    var target;
+    var templates = {};
+    var user;
+    var privileges;
+    var avatarContent;
+    var fileDropper;
 
-	function init(params, loaded) {
-		user = params.user;
-		target = params.target;
+    function init(params, loaded) {
+        user = params.user;
+        target = params.target;
 
-		privileges = {
-			canBan:
-				auth.hasPrivilege(auth.privileges.banUsers),
-			canChangeAccessRank:
-				auth.hasPrivilege(auth.privileges.changeAccessRank),
-			canChangeAvatarStyle:
-				auth.hasPrivilege(auth.privileges.changeAllAvatarStyles) ||
-				(auth.hasPrivilege(auth.privileges.changeOwnAvatarStyle) && auth.isLoggedIn(user.name)),
-			canChangeName:
-				auth.hasPrivilege(auth.privileges.changeAllNames) ||
-				(auth.hasPrivilege(auth.privileges.changeOwnName) && auth.isLoggedIn(user.name)),
-			canChangeEmailAddress:
-				auth.hasPrivilege(auth.privileges.changeAllEmailAddresses) ||
-				(auth.hasPrivilege(auth.privileges.changeOwnEmailAddress) && auth.isLoggedIn(user.name)),
-			canChangePassword:
-				auth.hasPrivilege(auth.privileges.changeAllPasswords) ||
-				(auth.hasPrivilege(auth.privileges.changeOwnPassword) && auth.isLoggedIn(user.name)),
-		};
+        privileges = {
+            canBan:
+                auth.hasPrivilege(auth.privileges.banUsers),
+            canChangeAccessRank:
+                auth.hasPrivilege(auth.privileges.changeAccessRank),
+            canChangeAvatarStyle:
+                auth.hasPrivilege(auth.privileges.changeAllAvatarStyles) ||
+                (auth.hasPrivilege(auth.privileges.changeOwnAvatarStyle) && auth.isLoggedIn(user.name)),
+            canChangeName:
+                auth.hasPrivilege(auth.privileges.changeAllNames) ||
+                (auth.hasPrivilege(auth.privileges.changeOwnName) && auth.isLoggedIn(user.name)),
+            canChangeEmailAddress:
+                auth.hasPrivilege(auth.privileges.changeAllEmailAddresses) ||
+                (auth.hasPrivilege(auth.privileges.changeOwnEmailAddress) && auth.isLoggedIn(user.name)),
+            canChangePassword:
+                auth.hasPrivilege(auth.privileges.changeAllPasswords) ||
+                (auth.hasPrivilege(auth.privileges.changeOwnPassword) && auth.isLoggedIn(user.name)),
+        };
 
-		promise.wait(util.promiseTemplate('account-settings'))
-			.then(function(template) {
-				templates.accountRemoval = template;
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+        promise.wait(util.promiseTemplate('account-settings'))
+            .then(function(template) {
+                templates.accountRemoval = template;
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function render() {
-		var $el = jQuery(target);
-		$el.html(templates.accountRemoval(_.extend({user: user}, privileges)));
-		$el.find('form').submit(accountSettingsFormSubmitted);
-		$el.find('form [name=avatar-style]').change(avatarStyleChanged);
-		avatarStyleChanged();
-		fileDropper = new App.Controls.FileDropper($el.find('[name=avatar-content]'));
-		fileDropper.onChange = avatarContentChanged;
-		fileDropper.setNames = true;
-	}
+    function render() {
+        var $el = jQuery(target);
+        $el.html(templates.accountRemoval(_.extend({user: user}, privileges)));
+        $el.find('form').submit(accountSettingsFormSubmitted);
+        $el.find('form [name=avatar-style]').change(avatarStyleChanged);
+        avatarStyleChanged();
+        fileDropper = new App.Controls.FileDropper($el.find('[name=avatar-content]'));
+        fileDropper.onChange = avatarContentChanged;
+        fileDropper.setNames = true;
+    }
 
-	function getPrivileges() {
-		return privileges;
-	}
+    function getPrivileges() {
+        return privileges;
+    }
 
-	function avatarStyleChanged(e) {
-		var $el = jQuery(target);
-		var $target = $el.find('.avatar-content .file-handler');
-		if ($el.find('[name=avatar-style]:checked').val() === 'manual') {
-			$target.show();
-		} else {
-			$target.hide();
-		}
-	}
+    function avatarStyleChanged(e) {
+        var $el = jQuery(target);
+        var $target = $el.find('.avatar-content .file-handler');
+        if ($el.find('[name=avatar-style]:checked').val() === 'manual') {
+            $target.show();
+        } else {
+            $target.hide();
+        }
+    }
 
-	function avatarContentChanged(files) {
-		avatarContent = files[0];
-	}
+    function avatarContentChanged(files) {
+        avatarContent = files[0];
+    }
 
-	function accountSettingsFormSubmitted(e) {
-		e.preventDefault();
-		var $el = jQuery(target);
-		var $messages = jQuery(target).find('.messages');
-		messagePresenter.hideMessages($messages);
-		var formData = new FormData();
+    function accountSettingsFormSubmitted(e) {
+        e.preventDefault();
+        var $el = jQuery(target);
+        var $messages = jQuery(target).find('.messages');
+        messagePresenter.hideMessages($messages);
+        var formData = new FormData();
 
-		if (privileges.canChangeAvatarStyle) {
-			formData.append('avatarStyle', $el.find('[name=avatar-style]:checked').val());
-			if (avatarContent) {
-				formData.append('avatarContent', avatarContent);
-			}
-		}
-		if (privileges.canChangeName) {
-			formData.append('userName', $el.find('[name=userName]').val());
-		}
+        if (privileges.canChangeAvatarStyle) {
+            formData.append('avatarStyle', $el.find('[name=avatar-style]:checked').val());
+            if (avatarContent) {
+                formData.append('avatarContent', avatarContent);
+            }
+        }
+        if (privileges.canChangeName) {
+            formData.append('userName', $el.find('[name=userName]').val());
+        }
 
-		if (privileges.canChangeEmailAddress) {
-			formData.append('email', $el.find('[name=email]').val());
-		}
+        if (privileges.canChangeEmailAddress) {
+            formData.append('email', $el.find('[name=email]').val());
+        }
 
-		if (privileges.canChangePassword) {
-			var password = $el.find('[name=password]').val();
-			var passwordConfirmation = $el.find('[name=passwordConfirmation]').val();
+        if (privileges.canChangePassword) {
+            var password = $el.find('[name=password]').val();
+            var passwordConfirmation = $el.find('[name=passwordConfirmation]').val();
 
-			if (password) {
-				if (password !== passwordConfirmation) {
-					messagePresenter.showError($messages, 'Passwords must be the same.');
-					return;
-				}
+            if (password) {
+                if (password !== passwordConfirmation) {
+                    messagePresenter.showError($messages, 'Passwords must be the same.');
+                    return;
+                }
 
-				formData.append('password', password);
-			}
-		}
+                formData.append('password', password);
+            }
+        }
 
-		if (privileges.canChangeAccessRank) {
-			formData.append('accessRank', $el.find('[name=access-rank]:checked').val());
-		}
+        if (privileges.canChangeAccessRank) {
+            formData.append('accessRank', $el.find('[name=access-rank]:checked').val());
+        }
 
-		if (privileges.canBan) {
-			formData.append('banned', $el.find('[name=ban]').is(':checked') ? 1 : 0);
-		}
+        if (privileges.canBan) {
+            formData.append('banned', $el.find('[name=ban]').is(':checked') ? 1 : 0);
+        }
 
-		promise.wait(api.post('/users/' + user.name, formData))
-			.then(function(response) {
-				editSuccess(response);
-			}).fail(function(response) {
-				editFailure(response);
-			});
-	}
+        promise.wait(api.post('/users/' + user.name, formData))
+            .then(function(response) {
+                editSuccess(response);
+            }).fail(function(response) {
+                editFailure(response);
+            });
+    }
 
-	function editSuccess(apiResponse) {
-		var wasLoggedIn = auth.isLoggedIn(user.name);
-		user = apiResponse.json;
-		if (wasLoggedIn) {
-			auth.updateCurrentUser(user);
-		}
+    function editSuccess(apiResponse) {
+        var wasLoggedIn = auth.isLoggedIn(user.name);
+        user = apiResponse.json;
+        if (wasLoggedIn) {
+            auth.updateCurrentUser(user);
+        }
 
-		render();
+        render();
 
-		var $messages = jQuery(target).find('.messages');
-		var message = 'Account settings updated!';
-		if (!apiResponse.json.confirmed) {
-			message += '<br/>Check your inbox for activation e-mail.<br/>If e-mail doesn\'t show up, check your spam folder.';
-		}
-		messagePresenter.showInfo($messages, message);
-	}
+        var $messages = jQuery(target).find('.messages');
+        var message = 'Account settings updated!';
+        if (!apiResponse.json.confirmed) {
+            message += '<br/>Check your inbox for activation e-mail.<br/>If e-mail doesn\'t show up, check your spam folder.';
+        }
+        messagePresenter.showInfo($messages, message);
+    }
 
-	function editFailure(apiResponse) {
-		var $messages = jQuery(target).find('.messages');
-		messagePresenter.showError($messages, apiResponse.json && apiResponse.json.error || apiResponse);
-	}
+    function editFailure(apiResponse) {
+        var $messages = jQuery(target).find('.messages');
+        messagePresenter.showError($messages, apiResponse.json && apiResponse.json.error || apiResponse);
+    }
 
-	return {
-		init: init,
-		render: render,
-		getPrivileges: getPrivileges,
-	};
+    return {
+        init: init,
+        render: render,
+        getPrivileges: getPrivileges,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/UserActivationPresenter.js b/public_html/js/Presenters/UserActivationPresenter.js
index 16af4c16..e52ddd76 100644
--- a/public_html/js/Presenters/UserActivationPresenter.js
+++ b/public_html/js/Presenters/UserActivationPresenter.js
@@ -2,117 +2,117 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.UserActivationPresenter = function(
-	jQuery,
-	promise,
-	util,
-	auth,
-	api,
-	router,
-	topNavigationPresenter,
-	messagePresenter) {
+    jQuery,
+    promise,
+    util,
+    auth,
+    api,
+    router,
+    topNavigationPresenter,
+    messagePresenter) {
 
-	var $el = jQuery('#content');
-	var $messages = $el;
-	var templates = {};
-	var formHidden = false;
-	var operation;
+    var $el = jQuery('#content');
+    var $messages = $el;
+    var templates = {};
+    var formHidden = false;
+    var operation;
 
-	function init(params, loaded) {
-		topNavigationPresenter.select('login');
-		topNavigationPresenter.changeTitle('Account recovery');
-		reinit(params, loaded);
-	}
+    function init(params, loaded) {
+        topNavigationPresenter.select('login');
+        topNavigationPresenter.changeTitle('Account recovery');
+        reinit(params, loaded);
+    }
 
-	function reinit(params, loaded) {
-		operation = params.operation;
-		promise.wait(util.promiseTemplate('user-query-form'))
-			.then(function(template) {
-				templates.userQuery = template;
-				if (params.token) {
-					hideForm();
-					confirmToken(params.token);
-				} else {
-					showForm();
-				}
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+    function reinit(params, loaded) {
+        operation = params.operation;
+        promise.wait(util.promiseTemplate('user-query-form'))
+            .then(function(template) {
+                templates.userQuery = template;
+                if (params.token) {
+                    hideForm();
+                    confirmToken(params.token);
+                } else {
+                    showForm();
+                }
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function render() {
-		$el.html(templates.userQuery());
-		$messages = $el.find('.messages');
-		if (formHidden) {
-			$el.find('form').hide();
-		}
-		$el.find('form').submit(userQueryFormSubmitted);
-	}
+    function render() {
+        $el.html(templates.userQuery());
+        $messages = $el.find('.messages');
+        if (formHidden) {
+            $el.find('form').hide();
+        }
+        $el.find('form').submit(userQueryFormSubmitted);
+    }
 
-	function hideForm() {
-		formHidden = true;
-	}
+    function hideForm() {
+        formHidden = true;
+    }
 
-	function showForm() {
-		formHidden = false;
-	}
+    function showForm() {
+        formHidden = false;
+    }
 
-	function userQueryFormSubmitted(e) {
-		e.preventDefault();
-		messagePresenter.hideMessages($messages);
+    function userQueryFormSubmitted(e) {
+        e.preventDefault();
+        messagePresenter.hideMessages($messages);
 
-		var userNameOrEmail = $el.find('form input[name=user]').val();
-		if (userNameOrEmail.length === 0) {
-			messagePresenter.showError($messages, 'Field cannot be blank.');
-			return;
-		}
-		var url = operation === 'passwordReset' ?
-			'/password-reset/' + userNameOrEmail :
-			'/activation/' + userNameOrEmail;
+        var userNameOrEmail = $el.find('form input[name=user]').val();
+        if (userNameOrEmail.length === 0) {
+            messagePresenter.showError($messages, 'Field cannot be blank.');
+            return;
+        }
+        var url = operation === 'passwordReset' ?
+            '/password-reset/' + userNameOrEmail :
+            '/activation/' + userNameOrEmail;
 
-		promise.wait(api.post(url))
-			.then(function(response) {
-				var message = operation === 'passwordReset' ?
-					'Password reset request sent.' :
-					'Activation e-mail resent.';
-				message += ' Check your inbox.<br/>If e-mail doesn\'t show up, check your spam folder.';
+        promise.wait(api.post(url))
+            .then(function(response) {
+                var message = operation === 'passwordReset' ?
+                    'Password reset request sent.' :
+                    'Activation e-mail resent.';
+                message += ' Check your inbox.<br/>If e-mail doesn\'t show up, check your spam folder.';
 
-				$el.find('#user-query-form').slideUp(function() {
-					messagePresenter.showInfo($messages, message);
-				});
-			}).fail(function(response) {
-				messagePresenter.showError($messages, response.json && response.json.error || response);
-			});
-	}
+                $el.find('#user-query-form').slideUp(function() {
+                    messagePresenter.showInfo($messages, message);
+                });
+            }).fail(function(response) {
+                messagePresenter.showError($messages, response.json && response.json.error || response);
+            });
+    }
 
-	function confirmToken(token) {
-		messagePresenter.hideMessages($messages);
+    function confirmToken(token) {
+        messagePresenter.hideMessages($messages);
 
-		var url = operation === 'passwordReset' ?
-			'/finish-password-reset/' + token :
-			'/finish-activation/' + token;
+        var url = operation === 'passwordReset' ?
+            '/finish-password-reset/' + token :
+            '/finish-activation/' + token;
 
-		promise.wait(api.post(url))
-			.then(function(response) {
-				var message = operation === 'passwordReset' ?
-					'Your new password is <strong>' + response.json.newPassword + '</strong>.' :
-					'E-mail activation successful.';
+        promise.wait(api.post(url))
+            .then(function(response) {
+                var message = operation === 'passwordReset' ?
+                    'Your new password is <strong>' + response.json.newPassword + '</strong>.' :
+                    'E-mail activation successful.';
 
-				$el.find('#user-query-form').slideUp(function() {
-					messagePresenter.showInfo($messages, message);
-				});
-			}).fail(function(response) {
-				messagePresenter.showError($messages, response.json && response.json.error || response);
-			});
-	}
+                $el.find('#user-query-form').slideUp(function() {
+                    messagePresenter.showInfo($messages, message);
+                });
+            }).fail(function(response) {
+                messagePresenter.showError($messages, response.json && response.json.error || response);
+            });
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		render: render,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/UserBrowsingSettingsPresenter.js b/public_html/js/Presenters/UserBrowsingSettingsPresenter.js
index fe15df4f..43bea35e 100644
--- a/public_html/js/Presenters/UserBrowsingSettingsPresenter.js
+++ b/public_html/js/Presenters/UserBrowsingSettingsPresenter.js
@@ -2,75 +2,75 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.UserBrowsingSettingsPresenter = function(
-	jQuery,
-	util,
-	promise,
-	auth,
-	browsingSettings,
-	messagePresenter) {
+    jQuery,
+    util,
+    promise,
+    auth,
+    browsingSettings,
+    messagePresenter) {
 
-	var target;
-	var templates = {};
-	var user;
-	var privileges = {};
+    var target;
+    var templates = {};
+    var user;
+    var privileges = {};
 
-	function init(params, loaded) {
-		user = params.user;
-		target = params.target;
+    function init(params, loaded) {
+        user = params.user;
+        target = params.target;
 
-		privileges.canChangeBrowsingSettings = auth.isLoggedIn(user.name) && user.name === auth.getCurrentUser().name;
+        privileges.canChangeBrowsingSettings = auth.isLoggedIn(user.name) && user.name === auth.getCurrentUser().name;
 
-		promise.wait(util.promiseTemplate('browsing-settings'))
-			.then(function(template) {
-				templates.browsingSettings = template;
-				render();
-				loaded();
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+        promise.wait(util.promiseTemplate('browsing-settings'))
+            .then(function(template) {
+                templates.browsingSettings = template;
+                render();
+                loaded();
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function render() {
-		var $el = jQuery(target);
-		$el.html(templates.browsingSettings({user: user, settings: browsingSettings.getSettings()}));
-		$el.find('form').submit(browsingSettingsFormSubmitted);
-	}
+    function render() {
+        var $el = jQuery(target);
+        $el.html(templates.browsingSettings({user: user, settings: browsingSettings.getSettings()}));
+        $el.find('form').submit(browsingSettingsFormSubmitted);
+    }
 
-	function browsingSettingsFormSubmitted(e) {
-		e.preventDefault();
-		var $el = jQuery(target);
-		var $messages = $el.find('.messages');
-		messagePresenter.hideMessages($messages);
+    function browsingSettingsFormSubmitted(e) {
+        e.preventDefault();
+        var $el = jQuery(target);
+        var $messages = $el.find('.messages');
+        messagePresenter.hideMessages($messages);
 
-		var newSettings = {
-			endlessScroll: $el.find('[name=endlessScroll]').is(':checked'),
-			hideDownvoted: $el.find('[name=hideDownvoted]').is(':checked'),
-			listPosts: {
-				safe: $el.find('[name=listSafePosts]').is(':checked'),
-				sketchy: $el.find('[name=listSketchyPosts]').is(':checked'),
-				unsafe: $el.find('[name=listUnsafePosts]').is(':checked'),
-			},
-			keyboardShortcuts: $el.find('[name=keyboardShortcuts]').is(':checked'),
-		};
+        var newSettings = {
+            endlessScroll: $el.find('[name=endlessScroll]').is(':checked'),
+            hideDownvoted: $el.find('[name=hideDownvoted]').is(':checked'),
+            listPosts: {
+                safe: $el.find('[name=listSafePosts]').is(':checked'),
+                sketchy: $el.find('[name=listSketchyPosts]').is(':checked'),
+                unsafe: $el.find('[name=listUnsafePosts]').is(':checked'),
+            },
+            keyboardShortcuts: $el.find('[name=keyboardShortcuts]').is(':checked'),
+        };
 
-		promise.wait(browsingSettings.setSettings(newSettings))
-			.then(function() {
-				messagePresenter.showInfo($messages, 'Browsing settings updated!');
-			}).fail(function() {
-				console.log(arguments);
-			});
-	}
+        promise.wait(browsingSettings.setSettings(newSettings))
+            .then(function() {
+                messagePresenter.showInfo($messages, 'Browsing settings updated!');
+            }).fail(function() {
+                console.log(arguments);
+            });
+    }
 
-	function getPrivileges() {
-		return privileges;
-	}
+    function getPrivileges() {
+        return privileges;
+    }
 
-	return {
-		init: init,
-		render: render,
-		getPrivileges: getPrivileges,
-	};
+    return {
+        init: init,
+        render: render,
+        getPrivileges: getPrivileges,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/UserListPresenter.js b/public_html/js/Presenters/UserListPresenter.js
index 060424a4..a395c5d1 100644
--- a/public_html/js/Presenters/UserListPresenter.js
+++ b/public_html/js/Presenters/UserListPresenter.js
@@ -2,93 +2,93 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.UserListPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	auth,
-	pagerPresenter,
-	topNavigationPresenter) {
+    _,
+    jQuery,
+    util,
+    promise,
+    auth,
+    pagerPresenter,
+    topNavigationPresenter) {
 
-	var $el = jQuery('#content');
-	var templates = {};
-	var params;
-	var privileges = {};
+    var $el = jQuery('#content');
+    var templates = {};
+    var params;
+    var privileges = {};
 
-	function init(params, loaded) {
-		topNavigationPresenter.select('users');
-		topNavigationPresenter.changeTitle('Users');
+    function init(params, loaded) {
+        topNavigationPresenter.select('users');
+        topNavigationPresenter.changeTitle('Users');
 
-		privileges.canViewUsers = auth.hasPrivilege(auth.privileges.viewUsers);
+        privileges.canViewUsers = auth.hasPrivilege(auth.privileges.viewUsers);
 
-		promise.wait(
-				util.promiseTemplate('user-list'),
-				util.promiseTemplate('user-list-item'))
-			.then(function(listTemplate, listItemTemplate) {
-				templates.list = listTemplate;
-				templates.listItem = listItemTemplate;
+        promise.wait(
+                util.promiseTemplate('user-list'),
+                util.promiseTemplate('user-list-item'))
+            .then(function(listTemplate, listItemTemplate) {
+                templates.list = listTemplate;
+                templates.listItem = listItemTemplate;
 
-				render();
-				loaded();
+                render();
+                loaded();
 
-				pagerPresenter.init({
-						baseUri: '#/users',
-						backendUri: '/users',
-						$target: $el.find('.pagination-target'),
-						updateCallback: function($page, data) {
-							renderUsers($page, data.entities);
-						},
-					},
-					function() {
-						reinit(params, function() {});
-					});
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+                pagerPresenter.init({
+                        baseUri: '#/users',
+                        backendUri: '/users',
+                        $target: $el.find('.pagination-target'),
+                        updateCallback: function($page, data) {
+                            renderUsers($page, data.entities);
+                        },
+                    },
+                    function() {
+                        reinit(params, function() {});
+                    });
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function reinit(_params, loaded) {
-		params = _params;
-		params.query = params.query || {};
-		params.query.order = params.query.order || 'name,asc';
-		updateActiveOrder(params.query.order);
+    function reinit(_params, loaded) {
+        params = _params;
+        params.query = params.query || {};
+        params.query.order = params.query.order || 'name,asc';
+        updateActiveOrder(params.query.order);
 
-		pagerPresenter.reinit({query: params.query});
-		loaded();
-	}
+        pagerPresenter.reinit({query: params.query});
+        loaded();
+    }
 
-	function deinit() {
-		pagerPresenter.deinit();
-	}
+    function deinit() {
+        pagerPresenter.deinit();
+    }
 
-	function render() {
-		$el.html(templates.list(privileges));
-	}
+    function render() {
+        $el.html(templates.list(privileges));
+    }
 
-	function updateActiveOrder(activeOrder) {
-		$el.find('.order li a.active').removeClass('active');
-		$el.find('.order [href*="' + activeOrder + '"]').addClass('active');
-	}
+    function updateActiveOrder(activeOrder) {
+        $el.find('.order li a.active').removeClass('active');
+        $el.find('.order [href*="' + activeOrder + '"]').addClass('active');
+    }
 
-	function renderUsers($page, users) {
-		var $target = $page.find('.users');
-		_.each(users, function(user) {
-			var $item = jQuery('<li>' + templates.listItem(_.extend({
-				user: user,
-				util: util,
-			}, privileges)) + '</li>');
-			$target.append($item);
-		});
-		_.map(_.map($target.find('img'), jQuery), util.loadImagesNicely);
-	}
+    function renderUsers($page, users) {
+        var $target = $page.find('.users');
+        _.each(users, function(user) {
+            var $item = jQuery('<li>' + templates.listItem(_.extend({
+                user: user,
+                util: util,
+            }, privileges)) + '</li>');
+            $target.append($item);
+        });
+        _.map(_.map($target.find('img'), jQuery), util.loadImagesNicely);
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		deinit: deinit,
-		render: render,
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        deinit: deinit,
+        render: render,
+    };
 
 };
 
diff --git a/public_html/js/Presenters/UserPresenter.js b/public_html/js/Presenters/UserPresenter.js
index e9897b31..dd3fdfc5 100644
--- a/public_html/js/Presenters/UserPresenter.js
+++ b/public_html/js/Presenters/UserPresenter.js
@@ -2,105 +2,105 @@ var App = App || {};
 App.Presenters = App.Presenters || {};
 
 App.Presenters.UserPresenter = function(
-	_,
-	jQuery,
-	util,
-	promise,
-	api,
-	auth,
-	topNavigationPresenter,
-	presenterManager,
-	userBrowsingSettingsPresenter,
-	userAccountSettingsPresenter,
-	userAccountRemovalPresenter,
-	messagePresenter) {
+    _,
+    jQuery,
+    util,
+    promise,
+    api,
+    auth,
+    topNavigationPresenter,
+    presenterManager,
+    userBrowsingSettingsPresenter,
+    userAccountSettingsPresenter,
+    userAccountRemovalPresenter,
+    messagePresenter) {
 
-	var $el = jQuery('#content');
-	var $messages = $el;
-	var templates = {};
-	var user;
-	var userName = null;
-	var activeTab;
+    var $el = jQuery('#content');
+    var $messages = $el;
+    var templates = {};
+    var user;
+    var userName = null;
+    var activeTab;
 
-	function init(params, loaded) {
-		promise.wait(util.promiseTemplate('user'))
-			.then(function(template) {
-				templates.user = template;
-				reinit(params, loaded);
-			}).fail(function() {
-				console.log(arguments);
-				loaded();
-			});
-	}
+    function init(params, loaded) {
+        promise.wait(util.promiseTemplate('user'))
+            .then(function(template) {
+                templates.user = template;
+                reinit(params, loaded);
+            }).fail(function() {
+                console.log(arguments);
+                loaded();
+            });
+    }
 
-	function reinit(params, loaded) {
-		if (params.userName !== userName) {
-			userName = params.userName;
-			topNavigationPresenter.select(auth.isLoggedIn(userName) ? 'my-account' : 'users');
-			topNavigationPresenter.changeTitle(userName);
+    function reinit(params, loaded) {
+        if (params.userName !== userName) {
+            userName = params.userName;
+            topNavigationPresenter.select(auth.isLoggedIn(userName) ? 'my-account' : 'users');
+            topNavigationPresenter.changeTitle(userName);
 
-			promise.wait(api.get('/users/' + userName))
-				.then(function(response) {
-					user = response.json;
-					var extendedContext = _.extend(params, {user: user});
+            promise.wait(api.get('/users/' + userName))
+                .then(function(response) {
+                    user = response.json;
+                    var extendedContext = _.extend(params, {user: user});
 
-					presenterManager.initPresenters([
-						[userBrowsingSettingsPresenter, _.extend({}, extendedContext, {target: '#browsing-settings-target'})],
-						[userAccountSettingsPresenter, _.extend({}, extendedContext, {target: '#account-settings-target'})],
-						[userAccountRemovalPresenter, _.extend({}, extendedContext, {target: '#account-removal-target'})]],
-						function() {
-							initTabs(params);
-							loaded();
-						});
+                    presenterManager.initPresenters([
+                        [userBrowsingSettingsPresenter, _.extend({}, extendedContext, {target: '#browsing-settings-target'})],
+                        [userAccountSettingsPresenter, _.extend({}, extendedContext, {target: '#account-settings-target'})],
+                        [userAccountRemovalPresenter, _.extend({}, extendedContext, {target: '#account-removal-target'})]],
+                        function() {
+                            initTabs(params);
+                            loaded();
+                        });
 
-				}).fail(function(response) {
-					$el.empty();
-					messagePresenter.showError($messages, response.json && response.json.error || response);
-					loaded();
-				});
+                }).fail(function(response) {
+                    $el.empty();
+                    messagePresenter.showError($messages, response.json && response.json.error || response);
+                    loaded();
+                });
 
-		} else {
-			initTabs(params);
-			loaded();
-		}
-	}
+        } else {
+            initTabs(params);
+            loaded();
+        }
+    }
 
-	function initTabs(params) {
-		activeTab = params.tab || 'basic-info';
-		render();
-	}
+    function initTabs(params) {
+        activeTab = params.tab || 'basic-info';
+        render();
+    }
 
-	function render() {
-		$el.html(templates.user({
-			user: user,
-			isLoggedIn: auth.isLoggedIn(user.name),
-			util: util,
-			canChangeBrowsingSettings: userBrowsingSettingsPresenter.getPrivileges().canChangeBrowsingSettings,
-			canChangeAccountSettings: _.any(userAccountSettingsPresenter.getPrivileges()),
-			canDeleteAccount: userAccountRemovalPresenter.getPrivileges().canDeleteAccount}));
-		$messages = $el.find('.messages');
-		util.loadImagesNicely($el.find('img'));
-		userBrowsingSettingsPresenter.render();
-		userAccountSettingsPresenter.render();
-		userAccountRemovalPresenter.render();
-		changeTab(activeTab);
-	}
+    function render() {
+        $el.html(templates.user({
+            user: user,
+            isLoggedIn: auth.isLoggedIn(user.name),
+            util: util,
+            canChangeBrowsingSettings: userBrowsingSettingsPresenter.getPrivileges().canChangeBrowsingSettings,
+            canChangeAccountSettings: _.any(userAccountSettingsPresenter.getPrivileges()),
+            canDeleteAccount: userAccountRemovalPresenter.getPrivileges().canDeleteAccount}));
+        $messages = $el.find('.messages');
+        util.loadImagesNicely($el.find('img'));
+        userBrowsingSettingsPresenter.render();
+        userAccountSettingsPresenter.render();
+        userAccountRemovalPresenter.render();
+        changeTab(activeTab);
+    }
 
-	function changeTab(targetTab) {
-		var $link = $el.find('a[data-tab=' + targetTab + ']');
-		var $links = $link.closest('ul').find('a[data-tab]');
-		var $tabs = $el.find('.tab-wrapper').find('.tab');
-		$links.removeClass('active');
-		$link.addClass('active');
-		$tabs.removeClass('active');
-		$tabs.filter('[data-tab=' + targetTab + ']').addClass('active');
-	}
+    function changeTab(targetTab) {
+        var $link = $el.find('a[data-tab=' + targetTab + ']');
+        var $links = $link.closest('ul').find('a[data-tab]');
+        var $tabs = $el.find('.tab-wrapper').find('.tab');
+        $links.removeClass('active');
+        $link.addClass('active');
+        $tabs.removeClass('active');
+        $tabs.filter('[data-tab=' + targetTab + ']').addClass('active');
+    }
 
-	return {
-		init: init,
-		reinit: reinit,
-		render: render
-	};
+    return {
+        init: init,
+        reinit: reinit,
+        render: render
+    };
 
 };
 
diff --git a/public_html/js/Promise.js b/public_html/js/Promise.js
index 299d922a..6be91486 100644
--- a/public_html/js/Promise.js
+++ b/public_html/js/Promise.js
@@ -2,84 +2,84 @@ var App = App || {};
 
 App.Promise = function(_, jQuery, progress) {
 
-	function BrokenPromiseError(promiseId) {
-		this.name = 'BrokenPromiseError';
-		this.message = 'Broken promise (promise ID: ' + promiseId + ')';
-	}
-	BrokenPromiseError.prototype = new Error();
+    function BrokenPromiseError(promiseId) {
+        this.name = 'BrokenPromiseError';
+        this.message = 'Broken promise (promise ID: ' + promiseId + ')';
+    }
+    BrokenPromiseError.prototype = new Error();
 
-	var active = [];
-	var promiseId = 0;
+    var active = [];
+    var promiseId = 0;
 
-	function make(callback, useProgress) {
-		var deferred = jQuery.Deferred();
-		var promise = deferred.promise();
-		promise.promiseId = ++ promiseId;
+    function make(callback, useProgress) {
+        var deferred = jQuery.Deferred();
+        var promise = deferred.promise();
+        promise.promiseId = ++ promiseId;
 
-		if (useProgress === true) {
-			progress.start();
-		}
-		callback(function() {
-			try {
-				deferred.resolve.apply(deferred, arguments);
-				active = _.without(active, promise.promiseId);
-				progress.done();
-			} catch (e) {
-				if (!(e instanceof BrokenPromiseError)) {
-					console.log(e);
-				}
-				progress.reset();
-			}
-		}, function() {
-			try {
-				deferred.reject.apply(deferred, arguments);
-				active = _.without(active, promise.promiseId);
-				progress.done();
-			} catch (e) {
-				if (!(e instanceof BrokenPromiseError)) {
-					console.log(e);
-				}
-				progress.reset();
-			}
-		});
+        if (useProgress === true) {
+            progress.start();
+        }
+        callback(function() {
+            try {
+                deferred.resolve.apply(deferred, arguments);
+                active = _.without(active, promise.promiseId);
+                progress.done();
+            } catch (e) {
+                if (!(e instanceof BrokenPromiseError)) {
+                    console.log(e);
+                }
+                progress.reset();
+            }
+        }, function() {
+            try {
+                deferred.reject.apply(deferred, arguments);
+                active = _.without(active, promise.promiseId);
+                progress.done();
+            } catch (e) {
+                if (!(e instanceof BrokenPromiseError)) {
+                    console.log(e);
+                }
+                progress.reset();
+            }
+        });
 
-		active.push(promise.promiseId);
+        active.push(promise.promiseId);
 
-		promise.always(function() {
-			if (!_.contains(active, promise.promiseId)) {
-				throw new BrokenPromiseError(promise.promiseId);
-			}
-		});
+        promise.always(function() {
+            if (!_.contains(active, promise.promiseId)) {
+                throw new BrokenPromiseError(promise.promiseId);
+            }
+        });
 
-		return promise;
-	}
+        return promise;
+    }
 
-	function wait() {
-		var promises = arguments;
-		var deferred = jQuery.Deferred();
-		return jQuery.when.apply(jQuery, promises)
-			.then(function() {
-				return deferred.resolve.apply(deferred, arguments);
-			}).fail(function() {
-				return deferred.reject.apply(deferred, arguments);
-			});
-	}
+    function wait() {
+        var promises = arguments;
+        var deferred = jQuery.Deferred();
+        return jQuery.when.apply(jQuery, promises)
+            .then(function() {
+                return deferred.resolve.apply(deferred, arguments);
+            }).fail(function() {
+                return deferred.reject.apply(deferred, arguments);
+            });
+    }
 
-	function abortAll() {
-		active = [];
-	}
+    function abortAll() {
+        active = [];
+    }
 
-	function getActive() {
-		return active.length;
-	}
+    function getActive() {
+        return active.length;
+    }
 
-	return {
-		make: function(callback) { return make(callback, true); },
-		makeSilent: function(callback) { return make(callback, false); },
-		wait: wait,
-		getActive: getActive,
-		abortAll: abortAll,
-	};
+    return {
+        make: function(callback) { return make(callback, true); },
+        makeSilent: function(callback) { return make(callback, false); },
+        wait: wait,
+        getActive: getActive,
+        abortAll: abortAll,
+    };
 
 };
 
diff --git a/public_html/js/Router.js b/public_html/js/Router.js
index 4aa1be95..f47895d3 100644
--- a/public_html/js/Router.js
+++ b/public_html/js/Router.js
@@ -2,184 +2,184 @@ var App = App || {};
 
 App.Router = function(_, jQuery, promise, util, appState, presenterManager) {
 
-	var root = '#/';
-	var previousLocation = window.location.href;
-	var routes = [];
+    var root = '#/';
+    var previousLocation = window.location.href;
+    var routes = [];
 
-	injectRoutes();
+    injectRoutes();
 
-	function injectRoutes() {
-		inject('', 'homePresenter');
-		inject('#/', 'homePresenter');
-		inject('#/404', 'httpErrorPresenter', {error: 404});
-		inject('#/home', 'homePresenter');
-		inject('#/login', 'loginPresenter');
-		inject('#/logout', 'logoutPresenter');
-		inject('#/register', 'registrationPresenter');
-		inject('#/upload', 'postUploadPresenter');
-		inject('#/password-reset(/:token)', 'userActivationPresenter', {operation: 'passwordReset'});
-		inject('#/activate(/:token)', 'userActivationPresenter', {operation: 'activation'});
-		inject('#/users(/:!query)', 'userListPresenter');
-		inject('#/user/:userName(/:tab)', 'userPresenter');
-		inject('#/posts(/:!query)', 'postListPresenter');
-		inject('#/post/:postNameOrId(/:!query)', 'postPresenter');
-		inject('#/comments(/:!query)', 'globalCommentListPresenter');
-		inject('#/tags(/:!query)', 'tagListPresenter');
-		inject('#/tag/:tagName', 'tagPresenter');
-		inject('#/help(/:tab)', 'helpPresenter');
-		inject('#/history(/:!query)', 'historyPresenter');
-	}
+    function injectRoutes() {
+        inject('', 'homePresenter');
+        inject('#/', 'homePresenter');
+        inject('#/404', 'httpErrorPresenter', {error: 404});
+        inject('#/home', 'homePresenter');
+        inject('#/login', 'loginPresenter');
+        inject('#/logout', 'logoutPresenter');
+        inject('#/register', 'registrationPresenter');
+        inject('#/upload', 'postUploadPresenter');
+        inject('#/password-reset(/:token)', 'userActivationPresenter', {operation: 'passwordReset'});
+        inject('#/activate(/:token)', 'userActivationPresenter', {operation: 'activation'});
+        inject('#/users(/:!query)', 'userListPresenter');
+        inject('#/user/:userName(/:tab)', 'userPresenter');
+        inject('#/posts(/:!query)', 'postListPresenter');
+        inject('#/post/:postNameOrId(/:!query)', 'postPresenter');
+        inject('#/comments(/:!query)', 'globalCommentListPresenter');
+        inject('#/tags(/:!query)', 'tagListPresenter');
+        inject('#/tag/:tagName', 'tagPresenter');
+        inject('#/help(/:tab)', 'helpPresenter');
+        inject('#/history(/:!query)', 'historyPresenter');
+    }
 
-	function navigate(url, useBrowserDispatcher) {
-		if (('pushState' in history) && !useBrowserDispatcher) {
-			history.pushState('', '', url);
-			dispatch();
-		} else {
-			window.location.href = url;
-		}
-	}
+    function navigate(url, useBrowserDispatcher) {
+        if (('pushState' in history) && !useBrowserDispatcher) {
+            history.pushState('', '', url);
+            dispatch();
+        } else {
+            window.location.href = url;
+        }
+    }
 
-	function navigateToMainPage() {
-		navigate(root);
-	}
+    function navigateToMainPage() {
+        navigate(root);
+    }
 
-	function navigateInplace(url, useBrowserDispatcher) {
-		if ('replaceState' in history) {
-			history.replaceState('', '', url);
-			if (!useBrowserDispatcher) {
-				dispatch();
-			} else {
-				location.reload();
-			}
-		} else {
-			navigate(url, useBrowserDispatcher);
-		}
-	}
+    function navigateInplace(url, useBrowserDispatcher) {
+        if ('replaceState' in history) {
+            history.replaceState('', '', url);
+            if (!useBrowserDispatcher) {
+                dispatch();
+            } else {
+                location.reload();
+            }
+        } else {
+            navigate(url, useBrowserDispatcher);
+        }
+    }
 
-	function start() {
-		if ('onhashchange' in window) {
-			window.onhashchange = dispatch;
-		} else {
-			window.onpopstate = dispatch;
-		}
-		dispatch();
-	}
+    function start() {
+        if ('onhashchange' in window) {
+            window.onhashchange = dispatch;
+        } else {
+            window.onpopstate = dispatch;
+        }
+        dispatch();
+    }
 
-	function inject(definition, presenterName, additionalParams) {
-		routes.push(new Route(definition, function(params) {
-			if (util.isExitConfirmationEnabled()) {
-				if (window.location.href === previousLocation) {
-					return;
-				} else {
-					if (window.confirm('Are you sure you want to leave this page? Data will be lost.')) {
-						util.disableExitConfirmation();
-					} else {
-						window.location.href = previousLocation;
-						return;
-					}
-				}
-			}
+    function inject(definition, presenterName, additionalParams) {
+        routes.push(new Route(definition, function(params) {
+            if (util.isExitConfirmationEnabled()) {
+                if (window.location.href === previousLocation) {
+                    return;
+                } else {
+                    if (window.confirm('Are you sure you want to leave this page? Data will be lost.')) {
+                        util.disableExitConfirmation();
+                    } else {
+                        window.location.href = previousLocation;
+                        return;
+                    }
+                }
+            }
 
-			params = _.extend({}, params, additionalParams, {previousLocation: previousLocation});
+            params = _.extend({}, params, additionalParams, {previousLocation: previousLocation});
 
-			//abort every operation that can be executed
-			promise.abortAll();
-			previousLocation = window.location.href;
+            //abort every operation that can be executed
+            promise.abortAll();
+            previousLocation = window.location.href;
 
-			var presenter = App.DI.get(presenterName);
-			presenter.name = presenterName;
-			presenterManager.switchContentPresenter(presenter, params);
-		}));
-	}
+            var presenter = App.DI.get(presenterName);
+            presenter.name = presenterName;
+            presenterManager.switchContentPresenter(presenter, params);
+        }));
+    }
 
-	function dispatch() {
-		var url = document.location.hash;
-		for (var i = 0; i < routes.length; i ++) {
-			var route = routes[i];
-			if (route.match(url)) {
-				route.callback(route.params);
-				return true;
-			}
-		}
-		navigateInplace('#/404', true);
-		return false;
-	}
+    function dispatch() {
+        var url = document.location.hash;
+        for (var i = 0; i < routes.length; i ++) {
+            var route = routes[i];
+            if (route.match(url)) {
+                route.callback(route.params);
+                return true;
+            }
+        }
+        navigateInplace('#/404', true);
+        return false;
+    }
 
-	function parseComplexParamValue(value) {
-		var result = {};
-		var params = (value || '').split(/;/);
-		for (var i = 0; i < params.length; i ++) {
-			var param = params[i];
-			if (!param) {
-				continue;
-			}
-			var kv = param.split(/=/);
-			result[kv[0]] = kv[1];
-		}
-		return result;
-	}
+    function parseComplexParamValue(value) {
+        var result = {};
+        var params = (value || '').split(/;/);
+        for (var i = 0; i < params.length; i ++) {
+            var param = params[i];
+            if (!param) {
+                continue;
+            }
+            var kv = param.split(/=/);
+            result[kv[0]] = kv[1];
+        }
+        return result;
+    }
 
-	function Route(definition, callback) {
-		var possibleRoutes = getPossibleRoutes(definition);
+    function Route(definition, callback) {
+        var possibleRoutes = getPossibleRoutes(definition);
 
-		function getPossibleRoutes(routeDefinition) {
-			var parts = [];
-			var re = new RegExp('\\(([^}]+?)\\)', 'g');
-			while (true) {
-				var text = re.exec(routeDefinition);
-				if (!text) {
-					break;
-				}
-				parts.push(text[1]);
-			}
-			var possibleRoutes = [routeDefinition.split('(')[0]];
-			for (var i = 0; i < parts.length; i ++) {
-				possibleRoutes.push(possibleRoutes[possibleRoutes.length - 1] + parts[i]);
-			}
-			return possibleRoutes;
-		}
+        function getPossibleRoutes(routeDefinition) {
+            var parts = [];
+            var re = new RegExp('\\(([^}]+?)\\)', 'g');
+            while (true) {
+                var text = re.exec(routeDefinition);
+                if (!text) {
+                    break;
+                }
+                parts.push(text[1]);
+            }
+            var possibleRoutes = [routeDefinition.split('(')[0]];
+            for (var i = 0; i < parts.length; i ++) {
+                possibleRoutes.push(possibleRoutes[possibleRoutes.length - 1] + parts[i]);
+            }
+            return possibleRoutes;
+        }
 
-		function match(url) {
-			var params = {};
-			for (var i = 0; i < possibleRoutes.length; i ++) {
-				var possibleRoute = possibleRoutes[i];
-				var compare = url;
-				var possibleRouteParts = possibleRoute.split('/');
-				var compareParts = compare.split('/');
-				if (possibleRoute.search(':') > 0) {
-					for (var j = 0; j < possibleRouteParts.length; j ++) {
-						if ((j < compareParts.length) && (possibleRouteParts[j].charAt(0) === ':')) {
-							var key = possibleRouteParts[j].substring(1);
-							var value = compareParts[j];
-							if (key.charAt(0) === '!') {
-								key = key.substring(1);
-								value = parseComplexParamValue(value);
-							}
-							params[key] = value;
-							compareParts[j] = possibleRouteParts[j];
-							compare = compareParts.join('/');
-						}
-					}
-				}
-				if (possibleRoute === compare) {
-					this.params = params;
-					return true;
-				}
-			}
-			return false;
-		}
+        function match(url) {
+            var params = {};
+            for (var i = 0; i < possibleRoutes.length; i ++) {
+                var possibleRoute = possibleRoutes[i];
+                var compare = url;
+                var possibleRouteParts = possibleRoute.split('/');
+                var compareParts = compare.split('/');
+                if (possibleRoute.search(':') > 0) {
+                    for (var j = 0; j < possibleRouteParts.length; j ++) {
+                        if ((j < compareParts.length) && (possibleRouteParts[j].charAt(0) === ':')) {
+                            var key = possibleRouteParts[j].substring(1);
+                            var value = compareParts[j];
+                            if (key.charAt(0) === '!') {
+                                key = key.substring(1);
+                                value = parseComplexParamValue(value);
+                            }
+                            params[key] = value;
+                            compareParts[j] = possibleRouteParts[j];
+                            compare = compareParts.join('/');
+                        }
+                    }
+                }
+                if (possibleRoute === compare) {
+                    this.params = params;
+                    return true;
+                }
+            }
+            return false;
+        }
 
-		this.match = match;
-		this.callback = callback;
-	}
+        this.match = match;
+        this.callback = callback;
+    }
 
 
-	return {
-		start: start,
-		navigate: navigate,
-		navigateInplace: navigateInplace,
-		navigateToMainPage: navigateToMainPage,
-	};
+    return {
+        start: start,
+        navigate: navigate,
+        navigateInplace: navigateInplace,
+        navigateToMainPage: navigateToMainPage,
+    };
 };
 
 App.DI.registerSingleton('router', ['_', 'jQuery', 'promise', 'util', 'appState', 'presenterManager'], App.Router);
diff --git a/public_html/js/Services/PostsAroundCalculator.js b/public_html/js/Services/PostsAroundCalculator.js
index de53ffd9..1fa640ab 100644
--- a/public_html/js/Services/PostsAroundCalculator.js
+++ b/public_html/js/Services/PostsAroundCalculator.js
@@ -3,83 +3,83 @@ App.Services = App.Services || {};
 
 App.Services.PostsAroundCalculator = function(_, promise, util, pager) {
 
-	pager.init({url: '/posts'});
+    pager.init({url: '/posts'});
 
-	function resetCache() {
-		pager.resetCache();
-	}
+    function resetCache() {
+        pager.resetCache();
+    }
 
-	function getLinksToPostsAround(query, postId) {
-		return promise.make(function(resolve, reject) {
-			pager.setSearchParams(query);
-			pager.setPage(query.page);
-			promise.wait(pager.retrieveCached())
-				.then(function(response) {
-					var postIds = _.pluck(response.entities, 'id');
-					var position = _.indexOf(postIds, postId);
+    function getLinksToPostsAround(query, postId) {
+        return promise.make(function(resolve, reject) {
+            pager.setSearchParams(query);
+            pager.setPage(query.page);
+            promise.wait(pager.retrieveCached())
+                .then(function(response) {
+                    var postIds = _.pluck(response.entities, 'id');
+                    var position = _.indexOf(postIds, postId);
 
-					if (position === -1) {
-						resolve(null, null);
-					}
+                    if (position === -1) {
+                        resolve(null, null);
+                    }
 
-					promise.wait(
-							getLinkToPostAround(postIds, position, query.page, -1),
-							getLinkToPostAround(postIds, position, query.page, 1))
-						.then(function(nextPostUrl, prevPostUrl) {
-							resolve(nextPostUrl, prevPostUrl);
-						}).fail(function() {
-							reject();
-						});
-				}).fail(function() {
-					reject();
-				});
-		});
-	}
+                    promise.wait(
+                            getLinkToPostAround(postIds, position, query.page, -1),
+                            getLinkToPostAround(postIds, position, query.page, 1))
+                        .then(function(nextPostUrl, prevPostUrl) {
+                            resolve(nextPostUrl, prevPostUrl);
+                        }).fail(function() {
+                            reject();
+                        });
+                }).fail(function() {
+                    reject();
+                });
+        });
+    }
 
-	function getLinkToPostAround(postIds, position, page, direction) {
-		return promise.make(function(resolve, reject) {
-			if (position + direction >= 0 && position + direction < postIds.length) {
-				var url = util.appendComplexRouteParam(
-					'#/post/' + postIds[position + direction],
-					util.simplifySearchQuery(
-						_.extend(
-							{page: page},
-							pager.getSearchParams())));
+    function getLinkToPostAround(postIds, position, page, direction) {
+        return promise.make(function(resolve, reject) {
+            if (position + direction >= 0 && position + direction < postIds.length) {
+                var url = util.appendComplexRouteParam(
+                    '#/post/' + postIds[position + direction],
+                    util.simplifySearchQuery(
+                        _.extend(
+                            {page: page},
+                            pager.getSearchParams())));
 
-				resolve(url);
-			} else if (page + direction >= 1) {
-				pager.setPage(page + direction);
-				promise.wait(pager.retrieveCached())
-					.then(function(response) {
-						if (response.entities.length) {
-							var post = direction === - 1 ?
-								_.last(response.entities) :
-								_.first(response.entities);
+                resolve(url);
+            } else if (page + direction >= 1) {
+                pager.setPage(page + direction);
+                promise.wait(pager.retrieveCached())
+                    .then(function(response) {
+                        if (response.entities.length) {
+                            var post = direction === - 1 ?
+                                _.last(response.entities) :
+                                _.first(response.entities);
 
-							var url = util.appendComplexRouteParam(
-								'#/post/' + post.id,
-								util.simplifySearchQuery(
-									_.extend(
-										{page: page + direction},
-										pager.getSearchParams())));
+                            var url = util.appendComplexRouteParam(
+                                '#/post/' + post.id,
+                                util.simplifySearchQuery(
+                                    _.extend(
+                                        {page: page + direction},
+                                        pager.getSearchParams())));
 
-							resolve(url);
-						} else {
-							resolve(null);
-						}
-					}).fail(function() {
-						reject();
-					});
-			} else {
-				resolve(null);
-			}
-		});
-	}
+                            resolve(url);
+                        } else {
+                            resolve(null);
+                        }
+                    }).fail(function() {
+                        reject();
+                    });
+            } else {
+                resolve(null);
+            }
+        });
+    }
 
-	return {
-		resetCache: resetCache,
-		getLinksToPostsAround: getLinksToPostsAround,
-	};
+    return {
+        resetCache: resetCache,
+        getLinksToPostsAround: getLinksToPostsAround,
+    };
 };
 
 App.DI.register('postsAroundCalculator', ['_', 'promise', 'util', 'pager'], App.Services.PostsAroundCalculator);
diff --git a/public_html/js/Services/TagList.js b/public_html/js/Services/TagList.js
index b7a196c9..d54b0f4f 100644
--- a/public_html/js/Services/TagList.js
+++ b/public_html/js/Services/TagList.js
@@ -2,31 +2,31 @@ var App = App || {};
 App.Services = App.Services || {};
 
 App.Services.TagList = function(jQuery) {
-	var tags = [];
+    var tags = [];
 
-	function refreshTags() {
-		jQuery.ajax({
-			success: function(data, textStatus, xhr) {
-				tags = data;
-			},
-			error: function(xhr, textStatus, errorThrown) {
-				console.log(new Error(errorThrown));
-			},
-			type: 'GET',
-			url: '/data/tags.json',
-		});
-	}
+    function refreshTags() {
+        jQuery.ajax({
+            success: function(data, textStatus, xhr) {
+                tags = data;
+            },
+            error: function(xhr, textStatus, errorThrown) {
+                console.log(new Error(errorThrown));
+            },
+            type: 'GET',
+            url: '/data/tags.json',
+        });
+    }
 
-	function getTags() {
-		return tags;
-	}
+    function getTags() {
+        return tags;
+    }
 
-	refreshTags();
+    refreshTags();
 
-	return {
-		refreshTags: refreshTags,
-		getTags: getTags,
-	};
+    return {
+        refreshTags: refreshTags,
+        getTags: getTags,
+    };
 };
 
 App.DI.registerSingleton('tagList', ['jQuery'], App.Services.TagList);
diff --git a/public_html/js/State.js b/public_html/js/State.js
index 62d61890..ab3ead72 100644
--- a/public_html/js/State.js
+++ b/public_html/js/State.js
@@ -2,50 +2,50 @@ var App = App || {};
 
 App.State = function() {
 
-	var properties = {};
-	var observers = {};
+    var properties = {};
+    var observers = {};
 
-	function get(key) {
-		return properties[key];
-	}
+    function get(key) {
+        return properties[key];
+    }
 
-	function set(key, value) {
-		properties[key] = value;
-		if (key in observers) {
-			for (var observerName in observers[key]) {
-				if (observers[key].hasOwnProperty(observerName)) {
-					observers[key][observerName](key, value);
-				}
-			}
-		}
-	}
+    function set(key, value) {
+        properties[key] = value;
+        if (key in observers) {
+            for (var observerName in observers[key]) {
+                if (observers[key].hasOwnProperty(observerName)) {
+                    observers[key][observerName](key, value);
+                }
+            }
+        }
+    }
 
-	function startObserving(key, observerName, callback) {
-		if (!(key in observers)) {
-			observers[key] = {};
-		}
-		if (!(observerName in observers[key])) {
-			observers[key][observerName] = {};
-		}
-		observers[key][observerName] = callback;
-	}
+    function startObserving(key, observerName, callback) {
+        if (!(key in observers)) {
+            observers[key] = {};
+        }
+        if (!(observerName in observers[key])) {
+            observers[key][observerName] = {};
+        }
+        observers[key][observerName] = callback;
+    }
 
-	function stopObserving(key, observerName) {
-		if (!(key in observers)) {
-			return;
-		}
-		if (!(observerName in observers[key])) {
-			return;
-		}
-		delete observers[key][observerName];
-	}
+    function stopObserving(key, observerName) {
+        if (!(key in observers)) {
+            return;
+        }
+        if (!(observerName in observers[key])) {
+            return;
+        }
+        delete observers[key][observerName];
+    }
 
-	return {
-		get: get,
-		set: set,
-		startObserving: startObserving,
-		stopObserving: stopObserving,
-	};
+    return {
+        get: get,
+        set: set,
+        startObserving: startObserving,
+        stopObserving: stopObserving,
+    };
 
 };
 
diff --git a/public_html/js/Util/Draggable.js b/public_html/js/Util/Draggable.js
index be2e6456..16948b41 100644
--- a/public_html/js/Util/Draggable.js
+++ b/public_html/js/Util/Draggable.js
@@ -2,146 +2,146 @@ var App = App || {};
 App.Util = App.Util || {};
 
 App.Util.Draggable = function(jQuery) {
-	var KEY_LEFT = 37;
-	var KEY_UP = 38;
-	var KEY_RIGHT = 39;
-	var KEY_DOWN = 40;
+    var KEY_LEFT = 37;
+    var KEY_UP = 38;
+    var KEY_RIGHT = 39;
+    var KEY_DOWN = 40;
 
-	function relativeDragStrategy($element) {
-		var $parent = $element.parent();
-		var delta;
-		var x = $element.offset().left - $parent.offset().left;
-		var y = $element.offset().top - $parent.offset().top;
+    function relativeDragStrategy($element) {
+        var $parent = $element.parent();
+        var delta;
+        var x = $element.offset().left - $parent.offset().left;
+        var y = $element.offset().top - $parent.offset().top;
 
-		var getPosition = function() {
-			return {x: x, y: y};
-		};
+        var getPosition = function() {
+            return {x: x, y: y};
+        };
 
-		var setPosition = function(newX, newY) {
-			x = newX;
-			y = newY;
-			var screenX = Math.min(Math.max(newX, 0), $parent.outerWidth() - $element.outerWidth());
-			var screenY = Math.min(Math.max(newY, 0), $parent.outerHeight() - $element.outerHeight());
-			screenX *= 100.0 / $parent.outerWidth();
-			screenY *= 100.0 / $parent.outerHeight();
-			$element.css({
-				left: screenX + '%',
-				top: screenY + '%'});
-		};
+        var setPosition = function(newX, newY) {
+            x = newX;
+            y = newY;
+            var screenX = Math.min(Math.max(newX, 0), $parent.outerWidth() - $element.outerWidth());
+            var screenY = Math.min(Math.max(newY, 0), $parent.outerHeight() - $element.outerHeight());
+            screenX *= 100.0 / $parent.outerWidth();
+            screenY *= 100.0 / $parent.outerHeight();
+            $element.css({
+                left: screenX + '%',
+                top: screenY + '%'});
+        };
 
-		return {
-			mouseClicked: function(e) {
-				delta = {
-					x: $element.offset().left - e.clientX,
-					y: $element.offset().top - e.clientY,
-				};
-			},
+        return {
+            mouseClicked: function(e) {
+                delta = {
+                    x: $element.offset().left - e.clientX,
+                    y: $element.offset().top - e.clientY,
+                };
+            },
 
-			mouseMoved: function(e) {
-				setPosition(
-					e.clientX + delta.x - $parent.offset().left,
-					e.clientY + delta.y - $parent.offset().top);
-			},
+            mouseMoved: function(e) {
+                setPosition(
+                    e.clientX + delta.x - $parent.offset().left,
+                    e.clientY + delta.y - $parent.offset().top);
+            },
 
-			getPosition: getPosition,
-			setPosition: setPosition,
-		};
-	}
+            getPosition: getPosition,
+            setPosition: setPosition,
+        };
+    }
 
-	function absoluteDragStrategy($element) {
-		var delta;
-		var x = $element.offset().left;
-		var y = $element.offset().top;
+    function absoluteDragStrategy($element) {
+        var delta;
+        var x = $element.offset().left;
+        var y = $element.offset().top;
 
-		var getPosition = function() {
-			return {x: x, y: y};
-		};
+        var getPosition = function() {
+            return {x: x, y: y};
+        };
 
-		var setPosition = function(newX, newY) {
-			x = newX;
-			y = newY;
-			$element.css({
-				left: x + 'px',
-				top: y + 'px'});
-		};
+        var setPosition = function(newX, newY) {
+            x = newX;
+            y = newY;
+            $element.css({
+                left: x + 'px',
+                top: y + 'px'});
+        };
 
-		return {
-			mouseClicked: function(e) {
-				delta = {
-					x: $element.position().left - e.clientX,
-					y: $element.position().top - e.clientY,
-				};
-			},
+        return {
+            mouseClicked: function(e) {
+                delta = {
+                    x: $element.position().left - e.clientX,
+                    y: $element.position().top - e.clientY,
+                };
+            },
 
-			mouseMoved: function(e) {
-				setPosition(e.clientX + delta.x, e.clientY + delta.y);
-			},
+            mouseMoved: function(e) {
+                setPosition(e.clientX + delta.x, e.clientY + delta.y);
+            },
 
-			getPosition: getPosition,
-			setPosition: setPosition,
-		};
-	}
+            getPosition: getPosition,
+            setPosition: setPosition,
+        };
+    }
 
-	function makeDraggable($element, dragStrategy, enableHotkeys) {
-		var strategy = dragStrategy($element);
-		$element.data('drag-strategy', strategy);
+    function makeDraggable($element, dragStrategy, enableHotkeys) {
+        var strategy = dragStrategy($element);
+        $element.data('drag-strategy', strategy);
 
-		$element.addClass('draggable');
+        $element.addClass('draggable');
 
-		$element.mousedown(function(e) {
-			if (e.target !== $element.get(0)) {
-				return;
-			}
-			e.preventDefault();
-			$element.focus();
-			$element.addClass('dragging');
+        $element.mousedown(function(e) {
+            if (e.target !== $element.get(0)) {
+                return;
+            }
+            e.preventDefault();
+            $element.focus();
+            $element.addClass('dragging');
 
-			strategy.mouseClicked(e);
-			jQuery(window).bind('mousemove.elemmove', function(e) {
-				strategy.mouseMoved(e);
-			}).bind('mouseup.elemmove', function(e) {
-				e.preventDefault();
-				strategy.mouseMoved(e);
-				$element.removeClass('dragging');
-				jQuery(window).unbind('mousemove.elemmove');
-				jQuery(window).unbind('mouseup.elemmove');
-			});
-		});
+            strategy.mouseClicked(e);
+            jQuery(window).bind('mousemove.elemmove', function(e) {
+                strategy.mouseMoved(e);
+            }).bind('mouseup.elemmove', function(e) {
+                e.preventDefault();
+                strategy.mouseMoved(e);
+                $element.removeClass('dragging');
+                jQuery(window).unbind('mousemove.elemmove');
+                jQuery(window).unbind('mouseup.elemmove');
+            });
+        });
 
-		if (enableHotkeys) {
-			$element.keydown(function(e) {
-				var position = strategy.getPosition();
-				var oldPosition = {x: position.x, y: position.y};
-				if (e.shiftKey) {
-					return;
-				}
+        if (enableHotkeys) {
+            $element.keydown(function(e) {
+                var position = strategy.getPosition();
+                var oldPosition = {x: position.x, y: position.y};
+                if (e.shiftKey) {
+                    return;
+                }
 
-				var delta = e.ctrlKey ? 10 : 1;
-				if (e.which === KEY_LEFT) {
-					position.x -= delta;
-				} else if (e.which === KEY_RIGHT) {
-					position.x += delta;
-				} else if (e.which === KEY_UP) {
-					position.y -= delta;
-				} else if (e.which === KEY_DOWN) {
-					position.y += delta;
-				}
+                var delta = e.ctrlKey ? 10 : 1;
+                if (e.which === KEY_LEFT) {
+                    position.x -= delta;
+                } else if (e.which === KEY_RIGHT) {
+                    position.x += delta;
+                } else if (e.which === KEY_UP) {
+                    position.y -= delta;
+                } else if (e.which === KEY_DOWN) {
+                    position.y += delta;
+                }
 
-				if (position.x !== oldPosition.x || position.y !== oldPosition.y) {
-					e.stopPropagation();
-					e.stopImmediatePropagation();
-					e.preventDefault();
-					strategy.setPosition(position.x, position.y);
-				}
-			});
-		}
-	}
+                if (position.x !== oldPosition.x || position.y !== oldPosition.y) {
+                    e.stopPropagation();
+                    e.stopImmediatePropagation();
+                    e.preventDefault();
+                    strategy.setPosition(position.x, position.y);
+                }
+            });
+        }
+    }
 
-	return {
-		makeDraggable: makeDraggable,
-		absoluteDragStrategy: absoluteDragStrategy,
-		relativeDragStrategy: relativeDragStrategy,
-	};
+    return {
+        makeDraggable: makeDraggable,
+        absoluteDragStrategy: absoluteDragStrategy,
+        relativeDragStrategy: relativeDragStrategy,
+    };
 
 };
 
diff --git a/public_html/js/Util/Misc.js b/public_html/js/Util/Misc.js
index 014423bb..29ea091f 100644
--- a/public_html/js/Util/Misc.js
+++ b/public_html/js/Util/Misc.js
@@ -3,265 +3,265 @@ App.Util = App.Util || {};
 
 App.Util.Misc = function(_, jQuery, marked, promise) {
 
-	var exitConfirmationEnabled = false;
+    var exitConfirmationEnabled = false;
 
-	function transparentPixel() {
-		return 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
-	}
+    function transparentPixel() {
+        return 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+    }
 
-	function enableExitConfirmation() {
-		exitConfirmationEnabled = true;
-		jQuery(window).bind('beforeunload', function(e) {
-			return 'There are unsaved changes.';
-		});
-	}
+    function enableExitConfirmation() {
+        exitConfirmationEnabled = true;
+        jQuery(window).bind('beforeunload', function(e) {
+            return 'There are unsaved changes.';
+        });
+    }
 
-	function disableExitConfirmation() {
-		exitConfirmationEnabled = false;
-		jQuery(window).unbind('beforeunload');
-	}
+    function disableExitConfirmation() {
+        exitConfirmationEnabled = false;
+        jQuery(window).unbind('beforeunload');
+    }
 
-	function isExitConfirmationEnabled() {
-		return exitConfirmationEnabled;
-	}
+    function isExitConfirmationEnabled() {
+        return exitConfirmationEnabled;
+    }
 
-	function loadImagesNicely($img) {
-		if (!$img.get(0).complete) {
-			$img.addClass('loading');
-			$img.css({opacity: 0});
-			var $div = jQuery('<div>Loading ' + $img.attr('alt') + '&hellip;</div>');
-			var width = $img.width();
-			var height = $img.height();
-			if (width > 50 && height > 50) {
-				$div.css({
-					position: 'absolute',
-					width: width + 'px',
-					height: height + 'px',
-					color: 'rgba(0, 0, 0, 0.15)',
-					zIndex: -1,
-					display: 'flex',
-					alignItems: 'center',
-					justifyContent: 'center',
-					textAlign: 'center'});
-				$div.insertBefore($img);
-				$div.offset($img.offset());
-			}
-			$img.bind('load', function() {
-				$img.animate({opacity: 1}, 'fast');
-				$img.removeClass('loading');
-				$div.fadeOut($div.remove);
-			});
-		}
-	}
+    function loadImagesNicely($img) {
+        if (!$img.get(0).complete) {
+            $img.addClass('loading');
+            $img.css({opacity: 0});
+            var $div = jQuery('<div>Loading ' + $img.attr('alt') + '&hellip;</div>');
+            var width = $img.width();
+            var height = $img.height();
+            if (width > 50 && height > 50) {
+                $div.css({
+                    position: 'absolute',
+                    width: width + 'px',
+                    height: height + 'px',
+                    color: 'rgba(0, 0, 0, 0.15)',
+                    zIndex: -1,
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    textAlign: 'center'});
+                $div.insertBefore($img);
+                $div.offset($img.offset());
+            }
+            $img.bind('load', function() {
+                $img.animate({opacity: 1}, 'fast');
+                $img.removeClass('loading');
+                $div.fadeOut($div.remove);
+            });
+        }
+    }
 
-	function promiseTemplate(templateName) {
-		return promiseTemplateFromDOM(templateName) ||
-			promiseTemplateWithAJAX(templateName);
-	}
+    function promiseTemplate(templateName) {
+        return promiseTemplateFromDOM(templateName) ||
+            promiseTemplateWithAJAX(templateName);
+    }
 
-	function promiseTemplateFromDOM(templateName) {
-		var $template = jQuery('#' + templateName + '-template');
-		if ($template.length) {
-			return promise.make(function(resolve, reject) {
-				resolve(_.template($template.html()));
-			});
-		}
-		return null;
-	}
+    function promiseTemplateFromDOM(templateName) {
+        var $template = jQuery('#' + templateName + '-template');
+        if ($template.length) {
+            return promise.make(function(resolve, reject) {
+                resolve(_.template($template.html()));
+            });
+        }
+        return null;
+    }
 
-	function promiseTemplateWithAJAX(templateName) {
-		return promise.make(function(resolve, reject) {
-			var templatesDir = '/templates';
-			var templateUrl = templatesDir + '/' + templateName + '.tpl';
+    function promiseTemplateWithAJAX(templateName) {
+        return promise.make(function(resolve, reject) {
+            var templatesDir = '/templates';
+            var templateUrl = templatesDir + '/' + templateName + '.tpl';
 
-			jQuery.ajax({
-				url: templateUrl,
-				method: 'GET',
-				success: function(data, textStatus, xhr) {
-					resolve(_.template(data));
-				},
-				error: function(xhr, textStatus, errorThrown) {
-					console.log(new Error('Error while loading template ' + templateName + ': ' + errorThrown));
-					reject();
-				},
-			});
-		});
-	}
+            jQuery.ajax({
+                url: templateUrl,
+                method: 'GET',
+                success: function(data, textStatus, xhr) {
+                    resolve(_.template(data));
+                },
+                error: function(xhr, textStatus, errorThrown) {
+                    console.log(new Error('Error while loading template ' + templateName + ': ' + errorThrown));
+                    reject();
+                },
+            });
+        });
+    }
 
-	function formatRelativeTime(timeString) {
-		if (!timeString) {
-			return 'never';
-		}
+    function formatRelativeTime(timeString) {
+        if (!timeString) {
+            return 'never';
+        }
 
-		var then = Date.parse(timeString);
-		var now = Date.now();
-		var difference = Math.abs(now - then);
-		var future = now < then;
+        var then = Date.parse(timeString);
+        var now = Date.now();
+        var difference = Math.abs(now - then);
+        var future = now < then;
 
-		var text = (function(difference) {
-			var mul = 1000;
-			var prevMul;
+        var text = (function(difference) {
+            var mul = 1000;
+            var prevMul;
 
-			mul *= 60;
-			if (difference < mul) {
-				return 'a few seconds';
-			} else if (difference < mul * 2) {
-				return 'a minute';
-			}
+            mul *= 60;
+            if (difference < mul) {
+                return 'a few seconds';
+            } else if (difference < mul * 2) {
+                return 'a minute';
+            }
 
-			prevMul = mul; mul *= 60;
-			if (difference < mul) {
-				return Math.round(difference / prevMul) + ' minutes';
-			} else if (difference < mul * 2) {
-				return 'an hour';
-			}
+            prevMul = mul; mul *= 60;
+            if (difference < mul) {
+                return Math.round(difference / prevMul) + ' minutes';
+            } else if (difference < mul * 2) {
+                return 'an hour';
+            }
 
-			prevMul = mul; mul *= 24;
-			if (difference < mul) {
-				return Math.round(difference / prevMul) + ' hours';
-			} else if (difference < mul * 2) {
-				return 'a day';
-			}
+            prevMul = mul; mul *= 24;
+            if (difference < mul) {
+                return Math.round(difference / prevMul) + ' hours';
+            } else if (difference < mul * 2) {
+                return 'a day';
+            }
 
-			prevMul = mul; mul *= 30.42;
-			if (difference < mul) {
-				return Math.round(difference / prevMul) + ' days';
-			} else if (difference < mul * 2) {
-				return 'a month';
-			}
+            prevMul = mul; mul *= 30.42;
+            if (difference < mul) {
+                return Math.round(difference / prevMul) + ' days';
+            } else if (difference < mul * 2) {
+                return 'a month';
+            }
 
-			prevMul = mul; mul *= 12;
-			if (difference < mul) {
-				return Math.round(difference / prevMul) + ' months';
-			} else if (difference < mul * 2) {
-				return 'a year';
-			}
+            prevMul = mul; mul *= 12;
+            if (difference < mul) {
+                return Math.round(difference / prevMul) + ' months';
+            } else if (difference < mul * 2) {
+                return 'a year';
+            }
 
-			return Math.round(difference / mul) + ' years';
-		})(difference);
+            return Math.round(difference / mul) + ' years';
+        })(difference);
 
-		if (text === 'a day') {
-			return future ? 'tomorrow' : 'yesterday';
-		}
-		return future ? 'in ' + text : text + ' ago';
-	}
+        if (text === 'a day') {
+            return future ? 'tomorrow' : 'yesterday';
+        }
+        return future ? 'in ' + text : text + ' ago';
+    }
 
-	function formatAbsoluteTime(timeString) {
-		var time = new Date(Date.parse(timeString));
-		return time.toString();
-	}
+    function formatAbsoluteTime(timeString) {
+        var time = new Date(Date.parse(timeString));
+        return time.toString();
+    }
 
-	function formatUnits(number, base, suffixes, callback) {
-		if (!number && number !== 0) {
-			return NaN;
-		}
-		number *= 1.0;
+    function formatUnits(number, base, suffixes, callback) {
+        if (!number && number !== 0) {
+            return NaN;
+        }
+        number *= 1.0;
 
-		var suffix = suffixes.shift();
-		while (number >= base && suffixes.length > 0) {
-			suffix = suffixes.shift();
-			number /= base;
-		}
+        var suffix = suffixes.shift();
+        while (number >= base && suffixes.length > 0) {
+            suffix = suffixes.shift();
+            number /= base;
+        }
 
-		if (typeof(callback) === 'undefined') {
-			callback = function(number, suffix) {
-				return suffix ? number.toFixed(1) + suffix : number;
-			};
-		}
+        if (typeof(callback) === 'undefined') {
+            callback = function(number, suffix) {
+                return suffix ? number.toFixed(1) + suffix : number;
+            };
+        }
 
-		return callback(number, suffix);
-	}
+        return callback(number, suffix);
+    }
 
-	function formatFileSize(fileSize) {
-		return formatUnits(
-			fileSize,
-			1024,
-			['B', 'K', 'M', 'G'],
-			function(number, suffix) {
-				var decimalPlaces = number < 20 && suffix !== 'B' ? 1 : 0;
-				return number.toFixed(decimalPlaces) + suffix;
-			});
-	}
+    function formatFileSize(fileSize) {
+        return formatUnits(
+            fileSize,
+            1024,
+            ['B', 'K', 'M', 'G'],
+            function(number, suffix) {
+                var decimalPlaces = number < 20 && suffix !== 'B' ? 1 : 0;
+                return number.toFixed(decimalPlaces) + suffix;
+            });
+    }
 
-	function formatMarkdown(text) {
-		var renderer = new marked.Renderer();
+    function formatMarkdown(text) {
+        var renderer = new marked.Renderer();
 
-		var options = {
-			renderer: renderer,
-			breaks: true,
-			sanitize: true,
-			smartypants: true,
-		};
+        var options = {
+            renderer: renderer,
+            breaks: true,
+            sanitize: true,
+            smartypants: true,
+        };
 
-		var preDecorator = function(text) {
-			//prevent ^#... from being treated as headers, due to tag permalinks
-			text = text.replace(/^#/g, '%%%#');
-			//fix \ before ~ being stripped away
-			text = text.replace(/\\~/g, '%%%T');
-			return text;
-		};
+        var preDecorator = function(text) {
+            //prevent ^#... from being treated as headers, due to tag permalinks
+            text = text.replace(/^#/g, '%%%#');
+            //fix \ before ~ being stripped away
+            text = text.replace(/\\~/g, '%%%T');
+            return text;
+        };
 
-		var postDecorator = function(text) {
-			//restore fixes
-			text = text.replace(/%%%T/g, '\\~');
-			text = text.replace(/%%%#/g, '#');
+        var postDecorator = function(text) {
+            //restore fixes
+            text = text.replace(/%%%T/g, '\\~');
+            text = text.replace(/%%%#/g, '#');
 
-			//search permalinks
-			text = text.replace(/\[search\]((?:[^\[]|\[(?!\/?search\]))+)\[\/search\]/ig, '<a href="#/posts/query=$1"><code>$1</code></a>');
-			//spoilers
-			text = text.replace(/\[spoiler\]((?:[^\[]|\[(?!\/?spoiler\]))+)\[\/spoiler\]/ig, '<span class="spoiler">$1</span>');
-			//[small]
-			text = text.replace(/\[small\]((?:[^\[]|\[(?!\/?small\]))+)\[\/small\]/ig, '<small>$1</small>');
-			//strike-through
-			text = text.replace(/(^|[^\\])(~~|~)([^~]+)\2/g, '$1<del>$3</del>');
-			text = text.replace(/\\~/g, '~');
-			//post premalinks
-			text = text.replace(/(^|[\s<>\(\)\[\]])@(\d+)/g, '$1<a href="#/post/$2"><code>@$2</code></a>');
-			//user permalinks
-			text = text.replace(/(^|[\s<>\(\)\[\]])\+([a-zA-Z0-9_-]+)/g, '$1<a href="#/user/$2"><code>+$2</code></a>');
-			//tag permalinks
-			text = text.replace(/(^|[\s<>\(\)\[\]])\#([^\s<>/\\]+)/g, '$1<a href="#/posts/query=$2"><code>#$2</code></a>');
-			return text;
-		};
+            //search permalinks
+            text = text.replace(/\[search\]((?:[^\[]|\[(?!\/?search\]))+)\[\/search\]/ig, '<a href="#/posts/query=$1"><code>$1</code></a>');
+            //spoilers
+            text = text.replace(/\[spoiler\]((?:[^\[]|\[(?!\/?spoiler\]))+)\[\/spoiler\]/ig, '<span class="spoiler">$1</span>');
+            //[small]
+            text = text.replace(/\[small\]((?:[^\[]|\[(?!\/?small\]))+)\[\/small\]/ig, '<small>$1</small>');
+            //strike-through
+            text = text.replace(/(^|[^\\])(~~|~)([^~]+)\2/g, '$1<del>$3</del>');
+            text = text.replace(/\\~/g, '~');
+            //post premalinks
+            text = text.replace(/(^|[\s<>\(\)\[\]])@(\d+)/g, '$1<a href="#/post/$2"><code>@$2</code></a>');
+            //user permalinks
+            text = text.replace(/(^|[\s<>\(\)\[\]])\+([a-zA-Z0-9_-]+)/g, '$1<a href="#/user/$2"><code>+$2</code></a>');
+            //tag permalinks
+            text = text.replace(/(^|[\s<>\(\)\[\]])\#([^\s<>/\\]+)/g, '$1<a href="#/posts/query=$2"><code>#$2</code></a>');
+            return text;
+        };
 
-		return postDecorator(marked(preDecorator(text), options));
-	}
+        return postDecorator(marked(preDecorator(text), options));
+    }
 
-	function appendComplexRouteParam(baseUri, params) {
-		var result = baseUri + '/';
-		_.each(params, function(v, k) {
-			if (typeof(v) !== 'undefined') {
-				result += k + '=' + v + ';';
-			}
-		});
-		return result.slice(0, -1);
-	}
+    function appendComplexRouteParam(baseUri, params) {
+        var result = baseUri + '/';
+        _.each(params, function(v, k) {
+            if (typeof(v) !== 'undefined') {
+                result += k + '=' + v + ';';
+            }
+        });
+        return result.slice(0, -1);
+    }
 
-	function simplifySearchQuery(query) {
-		if (typeof(query) === 'undefined') {
-			return {};
-		}
-		if (query.page === 1) {
-			delete query.page;
-		}
-		query = _.pick(query, _.identity); //remove falsy values
-		return query;
-	}
+    function simplifySearchQuery(query) {
+        if (typeof(query) === 'undefined') {
+            return {};
+        }
+        if (query.page === 1) {
+            delete query.page;
+        }
+        query = _.pick(query, _.identity); //remove falsy values
+        return query;
+    }
 
-	return {
-		promiseTemplate: promiseTemplate,
-		formatRelativeTime: formatRelativeTime,
-		formatAbsoluteTime: formatAbsoluteTime,
-		formatFileSize: formatFileSize,
-		formatMarkdown: formatMarkdown,
-		enableExitConfirmation: enableExitConfirmation,
-		disableExitConfirmation: disableExitConfirmation,
-		isExitConfirmationEnabled: isExitConfirmationEnabled,
-		transparentPixel: transparentPixel,
-		loadImagesNicely: loadImagesNicely,
-		appendComplexRouteParam: appendComplexRouteParam,
-		simplifySearchQuery: simplifySearchQuery,
-	};
+    return {
+        promiseTemplate: promiseTemplate,
+        formatRelativeTime: formatRelativeTime,
+        formatAbsoluteTime: formatAbsoluteTime,
+        formatFileSize: formatFileSize,
+        formatMarkdown: formatMarkdown,
+        enableExitConfirmation: enableExitConfirmation,
+        disableExitConfirmation: disableExitConfirmation,
+        isExitConfirmationEnabled: isExitConfirmationEnabled,
+        transparentPixel: transparentPixel,
+        loadImagesNicely: loadImagesNicely,
+        appendComplexRouteParam: appendComplexRouteParam,
+        simplifySearchQuery: simplifySearchQuery,
+    };
 
 };
 
diff --git a/public_html/js/Util/Resizable.js b/public_html/js/Util/Resizable.js
index 58c41c17..ca62ed31 100644
--- a/public_html/js/Util/Resizable.js
+++ b/public_html/js/Util/Resizable.js
@@ -2,108 +2,108 @@ var App = App || {};
 App.Util = App.Util || {};
 
 App.Util.Resizable = function(jQuery) {
-	var KEY_LEFT = 37;
-	var KEY_UP = 38;
-	var KEY_RIGHT = 39;
-	var KEY_DOWN = 40;
+    var KEY_LEFT = 37;
+    var KEY_UP = 38;
+    var KEY_RIGHT = 39;
+    var KEY_DOWN = 40;
 
-	function relativeResizeStrategy($element) {
-		var $parent = $element.parent();
-		var delta;
-		var width = $element.width();
-		var height = $element.height();
+    function relativeResizeStrategy($element) {
+        var $parent = $element.parent();
+        var delta;
+        var width = $element.width();
+        var height = $element.height();
 
-		var getSize = function() {
-			return {width: width, height: height};
-		};
+        var getSize = function() {
+            return {width: width, height: height};
+        };
 
-		var setSize = function(newWidth, newHeight) {
-			width = newWidth;
-			height = newHeight;
-			var screenWidth = Math.min(Math.max(width, 20), $parent.outerWidth() + $parent.offset().left - $element.offset().left);
-			var screenHeight = Math.min(Math.max(height, 20), $parent.outerHeight() + $parent.offset().top - $element.offset().top);
-			screenWidth *= 100.0 / $parent.outerWidth();
-			screenHeight *= 100.0 / $parent.outerHeight();
-			$element.css({
-				width: screenWidth + '%',
-				height: screenHeight + '%'});
-		};
+        var setSize = function(newWidth, newHeight) {
+            width = newWidth;
+            height = newHeight;
+            var screenWidth = Math.min(Math.max(width, 20), $parent.outerWidth() + $parent.offset().left - $element.offset().left);
+            var screenHeight = Math.min(Math.max(height, 20), $parent.outerHeight() + $parent.offset().top - $element.offset().top);
+            screenWidth *= 100.0 / $parent.outerWidth();
+            screenHeight *= 100.0 / $parent.outerHeight();
+            $element.css({
+                width: screenWidth + '%',
+                height: screenHeight + '%'});
+        };
 
-		return {
-			mouseClicked: function(e) {
-				delta = {
-					x: $element.width() - e.clientX,
-					y: $element.height() - e.clientY,
-				};
-			},
+        return {
+            mouseClicked: function(e) {
+                delta = {
+                    x: $element.width() - e.clientX,
+                    y: $element.height() - e.clientY,
+                };
+            },
 
-			mouseMoved: function(e) {
-				setSize(
-					e.clientX + delta.x,
-					e.clientY + delta.y);
-			},
+            mouseMoved: function(e) {
+                setSize(
+                    e.clientX + delta.x,
+                    e.clientY + delta.y);
+            },
 
-			getSize: getSize,
-			setSize: setSize,
-		};
-	}
+            getSize: getSize,
+            setSize: setSize,
+        };
+    }
 
-	function makeResizable($element, enableHotkeys) {
-		var $resizer = jQuery('<div class="resizer"></div>');
-		var strategy = relativeResizeStrategy($element);
-		$element.append($resizer);
+    function makeResizable($element, enableHotkeys) {
+        var $resizer = jQuery('<div class="resizer"></div>');
+        var strategy = relativeResizeStrategy($element);
+        $element.append($resizer);
 
-		$resizer.mousedown(function(e) {
-			e.preventDefault();
-			e.stopPropagation();
-			$element.focus();
-			$element.addClass('resizing');
+        $resizer.mousedown(function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            $element.focus();
+            $element.addClass('resizing');
 
-			strategy.mouseClicked(e);
+            strategy.mouseClicked(e);
 
-			jQuery(window).bind('mousemove.elemsize', function(e) {
-				strategy.mouseMoved(e);
-			}).bind('mouseup.elemsize', function(e) {
-				e.preventDefault();
-				strategy.mouseMoved(e);
-				$element.removeClass('resizing');
-				jQuery(window).unbind('mousemove.elemsize');
-				jQuery(window).unbind('mouseup.elemsize');
-			});
-		});
+            jQuery(window).bind('mousemove.elemsize', function(e) {
+                strategy.mouseMoved(e);
+            }).bind('mouseup.elemsize', function(e) {
+                e.preventDefault();
+                strategy.mouseMoved(e);
+                $element.removeClass('resizing');
+                jQuery(window).unbind('mousemove.elemsize');
+                jQuery(window).unbind('mouseup.elemsize');
+            });
+        });
 
-		if (enableHotkeys) {
-			$element.keydown(function(e) {
-				var size = strategy.getSize();
-				var oldSize = {width: size.width, height: size.height};
-				if (!e.shiftKey) {
-					return;
-				}
+        if (enableHotkeys) {
+            $element.keydown(function(e) {
+                var size = strategy.getSize();
+                var oldSize = {width: size.width, height: size.height};
+                if (!e.shiftKey) {
+                    return;
+                }
 
-				var delta = e.ctrlKey ? 10 : 1;
-				if (e.which === KEY_LEFT) {
-					size.width -= delta;
-				} else if (e.which === KEY_RIGHT) {
-					size.width += delta;
-				} else if (e.which === KEY_UP) {
-					size.height -= delta;
-				} else if (e.which === KEY_DOWN) {
-					size.height += delta;
-				}
+                var delta = e.ctrlKey ? 10 : 1;
+                if (e.which === KEY_LEFT) {
+                    size.width -= delta;
+                } else if (e.which === KEY_RIGHT) {
+                    size.width += delta;
+                } else if (e.which === KEY_UP) {
+                    size.height -= delta;
+                } else if (e.which === KEY_DOWN) {
+                    size.height += delta;
+                }
 
-				if (size.width !== oldSize.width || size.height !== oldSize.height) {
-					e.stopPropagation();
-					e.stopImmediatePropagation();
-					e.preventDefault();
-					strategy.setSize(size.width, size.height);
-				}
-			});
-		}
-	}
+                if (size.width !== oldSize.width || size.height !== oldSize.height) {
+                    e.stopPropagation();
+                    e.stopImmediatePropagation();
+                    e.preventDefault();
+                    strategy.setSize(size.width, size.height);
+                }
+            });
+        }
+    }
 
-	return {
-		makeResizable: makeResizable,
-	};
+    return {
+        makeResizable: makeResizable,
+    };
 
 };
 
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
index 14e9360c..c83394e8 100644
--- a/src/Bootstrap.php
+++ b/src/Bootstrap.php
@@ -5,42 +5,42 @@ $startTime = microtime(true);
 
 final class Bootstrap
 {
-	private static $startTime;
+    private static $startTime;
 
-	public static function init($startTime)
-	{
-		self::$startTime = $startTime;
-		self::setTimezone();
-		self::turnErrorsIntoExceptions();
-		self::initAutoloader();
-	}
+    public static function init($startTime)
+    {
+        self::$startTime = $startTime;
+        self::setTimezone();
+        self::turnErrorsIntoExceptions();
+        self::initAutoloader();
+    }
 
-	public static function getStartTime()
-	{
-		return self::$startTime;
-	}
+    public static function getStartTime()
+    {
+        return self::$startTime;
+    }
 
-	private static function setTimezone()
-	{
-		date_default_timezone_set('UTC');
-	}
+    private static function setTimezone()
+    {
+        date_default_timezone_set('UTC');
+    }
 
-	private static function initAutoloader()
-	{
-		require(__DIR__
-			. DIRECTORY_SEPARATOR . '..'
-			. DIRECTORY_SEPARATOR . 'vendor'
-			. DIRECTORY_SEPARATOR . 'autoload.php');
-	}
+    private static function initAutoloader()
+    {
+        require(__DIR__
+            . DIRECTORY_SEPARATOR . '..'
+            . DIRECTORY_SEPARATOR . 'vendor'
+            . DIRECTORY_SEPARATOR . 'autoload.php');
+    }
 
-	private static function turnErrorsIntoExceptions()
-	{
-		set_error_handler(
-			function($errno, $errstr, $errfile, $errline, array $errcontext)
-			{
-				throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
-			});
-	}
+    private static function turnErrorsIntoExceptions()
+    {
+        set_error_handler(
+            function($errno, $errstr, $errfile, $errline, array $errcontext)
+            {
+                throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
+            });
+    }
 }
 
 Bootstrap::init($startTime);
diff --git a/src/Config.php b/src/Config.php
index e2cef918..9c47b7f3 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -3,79 +3,79 @@ namespace Szurubooru;
 
 class Config extends \ArrayObject
 {
-	private $dataDirectory;
-	private $publicDataDirectory;
+    private $dataDirectory;
+    private $publicDataDirectory;
 
-	public function __construct($dataDirectory, $publicDataDirectory)
-	{
-		$this->setFlags($this->getArrayObjectFlags());
-		$this->dataDirectory = $dataDirectory;
-		$this->publicDataDirectory = $publicDataDirectory;
-		$this->tryLoadFromIni([
-			$dataDirectory . DIRECTORY_SEPARATOR . 'config.ini',
-			$dataDirectory . DIRECTORY_SEPARATOR . 'local.ini']);
-	}
+    public function __construct($dataDirectory, $publicDataDirectory)
+    {
+        $this->setFlags($this->getArrayObjectFlags());
+        $this->dataDirectory = $dataDirectory;
+        $this->publicDataDirectory = $publicDataDirectory;
+        $this->tryLoadFromIni([
+            $dataDirectory . DIRECTORY_SEPARATOR . 'config.ini',
+            $dataDirectory . DIRECTORY_SEPARATOR . 'local.ini']);
+    }
 
-	public function tryLoadFromIni($configPaths)
-	{
-		if (!is_array($configPaths))
-			$configPaths = [$configPaths];
+    public function tryLoadFromIni($configPaths)
+    {
+        if (!is_array($configPaths))
+            $configPaths = [$configPaths];
 
-		foreach ($configPaths as $configPath)
-		{
-			if (file_exists($configPath))
-				$this->loadFromIni($configPath);
-		}
-	}
+        foreach ($configPaths as $configPath)
+        {
+            if (file_exists($configPath))
+                $this->loadFromIni($configPath);
+        }
+    }
 
-	public function getDataDirectory()
-	{
-		return $this->dataDirectory;
-	}
+    public function getDataDirectory()
+    {
+        return $this->dataDirectory;
+    }
 
-	public function getPublicDataDirectory()
-	{
-		return $this->publicDataDirectory;
-	}
+    public function getPublicDataDirectory()
+    {
+        return $this->publicDataDirectory;
+    }
 
-	public function offsetGet($index)
-	{
-		if (!parent::offsetExists($index))
-			return null;
-		return parent::offsetGet($index);
-	}
+    public function offsetGet($index)
+    {
+        if (!parent::offsetExists($index))
+            return null;
+        return parent::offsetGet($index);
+    }
 
-	public function loadFromIni($configPath)
-	{
-		$array = parse_ini_file($configPath, true, INI_SCANNER_RAW);
+    public function loadFromIni($configPath)
+    {
+        $array = parse_ini_file($configPath, true, INI_SCANNER_RAW);
 
-		foreach ($array as $key => $value)
-		{
-			if (!is_array($value))
-			{
-				$this->offsetSet($key, $value);
-			}
-			else
-			{
-				$section = $key;
-				$ptr = $this;
+        foreach ($array as $key => $value)
+        {
+            if (!is_array($value))
+            {
+                $this->offsetSet($key, $value);
+            }
+            else
+            {
+                $section = $key;
+                $ptr = $this;
 
-				foreach (explode('.', $section) as $subSection)
-				{
-					if (!$ptr->offsetExists($subSection))
-						$ptr->offsetSet($subSection, new \ArrayObject([], $this->getArrayObjectFlags()));
+                foreach (explode('.', $section) as $subSection)
+                {
+                    if (!$ptr->offsetExists($subSection))
+                        $ptr->offsetSet($subSection, new \ArrayObject([], $this->getArrayObjectFlags()));
 
-					$ptr = $ptr->$subSection;
-				}
+                    $ptr = $ptr->$subSection;
+                }
 
-				foreach ($value as $sectionKey => $sectionValue)
-					$ptr->offsetSet($sectionKey, $sectionValue);
-			}
-		}
-	}
+                foreach ($value as $sectionKey => $sectionValue)
+                    $ptr->offsetSet($sectionKey, $sectionValue);
+            }
+        }
+    }
 
-	private function getArrayObjectFlags()
-	{
-		return parent::ARRAY_AS_PROPS | parent::STD_PROP_LIST;
-	}
+    private function getArrayObjectFlags()
+    {
+        return parent::ARRAY_AS_PROPS | parent::STD_PROP_LIST;
+    }
 }
diff --git a/src/Dao/AbstractDao.php b/src/Dao/AbstractDao.php
index 7b2d9579..e31d60c7 100644
--- a/src/Dao/AbstractDao.php
+++ b/src/Dao/AbstractDao.php
@@ -12,300 +12,300 @@ use Szurubooru\Search\Result;
 
 abstract class AbstractDao implements ICrudDao, IBatchDao
 {
-	protected $pdo;
-	protected $tableName;
-	protected $entityConverter;
-	protected $driver;
+    protected $pdo;
+    protected $tableName;
+    protected $entityConverter;
+    protected $driver;
 
-	public function __construct(
-		DatabaseConnection $databaseConnection,
-		$tableName,
-		IEntityConverter $entityConverter)
-	{
-		$this->setDatabaseConnection($databaseConnection);
-		$this->tableName = $tableName;
-		$this->entityConverter = $entityConverter;
-		$this->entityConverter->setEntityDecorator(function($entity)
-			{
-				$this->afterLoad($entity);
-			});
-	}
+    public function __construct(
+        DatabaseConnection $databaseConnection,
+        $tableName,
+        IEntityConverter $entityConverter)
+    {
+        $this->setDatabaseConnection($databaseConnection);
+        $this->tableName = $tableName;
+        $this->entityConverter = $entityConverter;
+        $this->entityConverter->setEntityDecorator(function($entity)
+            {
+                $this->afterLoad($entity);
+            });
+    }
 
-	public function getTableName()
-	{
-		return $this->tableName;
-	}
+    public function getTableName()
+    {
+        return $this->tableName;
+    }
 
-	public function getEntityConverter()
-	{
-		return $this->entityConverter;
-	}
+    public function getEntityConverter()
+    {
+        return $this->entityConverter;
+    }
 
-	public function save(&$entity)
-	{
-		$entity = $this->upsert($entity);
-		$this->afterSave($entity);
-		$this->afterBatchSave([$entity]);
-		return $entity;
-	}
+    public function save(&$entity)
+    {
+        $entity = $this->upsert($entity);
+        $this->afterSave($entity);
+        $this->afterBatchSave([$entity]);
+        return $entity;
+    }
 
-	public function batchSave(array $entities)
-	{
-		foreach ($entities as $key => $entity)
-		{
-			$entities[$key] = $this->upsert($entity);
-			$this->afterSave($entity);
-		}
-		if (count($entities) > 0)
-			$this->afterBatchSave([$entity]);
-		return $entities;
-	}
+    public function batchSave(array $entities)
+    {
+        foreach ($entities as $key => $entity)
+        {
+            $entities[$key] = $this->upsert($entity);
+            $this->afterSave($entity);
+        }
+        if (count($entities) > 0)
+            $this->afterBatchSave([$entity]);
+        return $entities;
+    }
 
-	public function findAll()
-	{
-		$query = $this->pdo->from($this->tableName);
-		return $this->arrayToEntities($query);
-	}
+    public function findAll()
+    {
+        $query = $this->pdo->from($this->tableName);
+        return $this->arrayToEntities($query);
+    }
 
-	public function findById($entityId)
-	{
-		return $this->findOneBy($this->getIdColumn(), $entityId);
-	}
+    public function findById($entityId)
+    {
+        return $this->findOneBy($this->getIdColumn(), $entityId);
+    }
 
-	public function findByIds($entityIds)
-	{
-		return $this->findBy($this->getIdColumn(), $entityIds);
-	}
+    public function findByIds($entityIds)
+    {
+        return $this->findBy($this->getIdColumn(), $entityIds);
+    }
 
-	public function findFiltered(IFilter $searchFilter)
-	{
-		$query = $this->pdo->from($this->tableName);
+    public function findFiltered(IFilter $searchFilter)
+    {
+        $query = $this->pdo->from($this->tableName);
 
-		$orderByString = self::compileOrderBy($searchFilter->getOrder());
-		if ($orderByString)
-			$query->orderBy($orderByString);
+        $orderByString = self::compileOrderBy($searchFilter->getOrder());
+        if ($orderByString)
+            $query->orderBy($orderByString);
 
-		$this->decorateQueryFromFilter($query, $searchFilter);
-		if ($searchFilter->getPageSize() > 0)
-		{
-			$query->limit($searchFilter->getPageSize());
-			$query->offset($searchFilter->getPageSize() * max(0, $searchFilter->getPageNumber() - 1));
-		}
-		$entities = $this->arrayToEntities(iterator_to_array($query));
+        $this->decorateQueryFromFilter($query, $searchFilter);
+        if ($searchFilter->getPageSize() > 0)
+        {
+            $query->limit($searchFilter->getPageSize());
+            $query->offset($searchFilter->getPageSize() * max(0, $searchFilter->getPageNumber() - 1));
+        }
+        $entities = $this->arrayToEntities(iterator_to_array($query));
 
-		$query = $this->pdo->from($this->tableName);
-		$this->decorateQueryFromFilter($query, $searchFilter);
-		$totalRecords = count($query);
+        $query = $this->pdo->from($this->tableName);
+        $this->decorateQueryFromFilter($query, $searchFilter);
+        $totalRecords = count($query);
 
-		$searchResult = new Result();
-		$searchResult->setSearchFilter($searchFilter);
-		$searchResult->setEntities($entities);
-		$searchResult->setTotalRecords($totalRecords);
-		$searchResult->setPageNumber($searchFilter->getPageNumber());
-		$searchResult->setPageSize($searchFilter->getPageSize());
-		return $searchResult;
-	}
+        $searchResult = new Result();
+        $searchResult->setSearchFilter($searchFilter);
+        $searchResult->setEntities($entities);
+        $searchResult->setTotalRecords($totalRecords);
+        $searchResult->setPageNumber($searchFilter->getPageNumber());
+        $searchResult->setPageSize($searchFilter->getPageSize());
+        return $searchResult;
+    }
 
-	public function deleteAll()
-	{
-		foreach ($this->findAll() as $entity)
-		{
-			$this->beforeDelete($entity);
-		}
-		$this->pdo->deleteFrom($this->tableName)->execute();
-	}
+    public function deleteAll()
+    {
+        foreach ($this->findAll() as $entity)
+        {
+            $this->beforeDelete($entity);
+        }
+        $this->pdo->deleteFrom($this->tableName)->execute();
+    }
 
-	public function deleteById($entityId)
-	{
-		return $this->deleteBy($this->getIdColumn(), $entityId);
-	}
+    public function deleteById($entityId)
+    {
+        return $this->deleteBy($this->getIdColumn(), $entityId);
+    }
 
-	public function update(Entity $entity)
-	{
-		$arrayEntity = $this->entityConverter->toArray($entity);
-		unset($arrayEntity['id']);
-		$this->pdo->update($this->tableName)->set($arrayEntity)->where($this->getIdColumn(), $entity->getId())->execute();
-		return $entity;
-	}
+    public function update(Entity $entity)
+    {
+        $arrayEntity = $this->entityConverter->toArray($entity);
+        unset($arrayEntity['id']);
+        $this->pdo->update($this->tableName)->set($arrayEntity)->where($this->getIdColumn(), $entity->getId())->execute();
+        return $entity;
+    }
 
-	public function create(Entity $entity)
-	{
-		$sql = 'UPDATE sequencer SET lastUsedId = (@lastUsedId := (lastUsedId + 1)) WHERE tableName = :tableName';
-		$query = $this->pdo->prepare($sql);
-		$query->bindValue(':tableName', $this->tableName);
-		$query->execute();
-		$lastUsedId = $this->pdo->query('SELECT @lastUsedId')->fetchColumn();
+    public function create(Entity $entity)
+    {
+        $sql = 'UPDATE sequencer SET lastUsedId = (@lastUsedId := (lastUsedId + 1)) WHERE tableName = :tableName';
+        $query = $this->pdo->prepare($sql);
+        $query->bindValue(':tableName', $this->tableName);
+        $query->execute();
+        $lastUsedId = $this->pdo->query('SELECT @lastUsedId')->fetchColumn();
 
-		$entity->setId(intval($lastUsedId));
-		$arrayEntity = $this->entityConverter->toArray($entity);
-		$this->pdo->insertInto($this->tableName)->values($arrayEntity)->execute();
-		return $entity;
-	}
+        $entity->setId(intval($lastUsedId));
+        $arrayEntity = $this->entityConverter->toArray($entity);
+        $this->pdo->insertInto($this->tableName)->values($arrayEntity)->execute();
+        return $entity;
+    }
 
-	protected function getIdColumn()
-	{
-		return 'id';
-	}
+    protected function getIdColumn()
+    {
+        return 'id';
+    }
 
-	protected function hasAnyRecords()
-	{
-		return count(iterator_to_array($this->pdo->from($this->tableName)->limit(1))) > 0;
-	}
+    protected function hasAnyRecords()
+    {
+        return count(iterator_to_array($this->pdo->from($this->tableName)->limit(1))) > 0;
+    }
 
-	protected function findBy($columnName, $value)
-	{
-		if (is_array($value) && empty($value))
-			return [];
-		$query = $this->pdo->from($this->tableName)->where($columnName, $value);
-		$arrayEntities = iterator_to_array($query);
-		return $this->arrayToEntities($arrayEntities);
-	}
+    protected function findBy($columnName, $value)
+    {
+        if (is_array($value) && empty($value))
+            return [];
+        $query = $this->pdo->from($this->tableName)->where($columnName, $value);
+        $arrayEntities = iterator_to_array($query);
+        return $this->arrayToEntities($arrayEntities);
+    }
 
-	protected function findOneBy($columnName, $value)
-	{
-		$entities = $this->findBy($columnName, $value);
-		if (!$entities)
-			return null;
-		return array_shift($entities);
-	}
+    protected function findOneBy($columnName, $value)
+    {
+        $entities = $this->findBy($columnName, $value);
+        if (!$entities)
+            return null;
+        return array_shift($entities);
+    }
 
-	protected function deleteBy($columnName, $value)
-	{
-		foreach ($this->findBy($columnName, $value) as $entity)
-		{
-			$this->beforeDelete($entity);
-		}
-		$this->pdo->deleteFrom($this->tableName)->where($columnName, $value)->execute();
-	}
+    protected function deleteBy($columnName, $value)
+    {
+        foreach ($this->findBy($columnName, $value) as $entity)
+        {
+            $this->beforeDelete($entity);
+        }
+        $this->pdo->deleteFrom($this->tableName)->where($columnName, $value)->execute();
+    }
 
-	protected function afterLoad(Entity $entity)
-	{
-	}
+    protected function afterLoad(Entity $entity)
+    {
+    }
 
-	protected function afterSave(Entity $entity)
-	{
-	}
+    protected function afterSave(Entity $entity)
+    {
+    }
 
-	protected function afterBatchSave(array $entities)
-	{
-	}
+    protected function afterBatchSave(array $entities)
+    {
+    }
 
-	protected function beforeDelete(Entity $entity)
-	{
-	}
+    protected function beforeDelete(Entity $entity)
+    {
+    }
 
-	protected function decorateQueryFromRequirement($query, Requirement $requirement)
-	{
-		$value = $requirement->getValue();
-		$sqlColumn = $requirement->getType();
+    protected function decorateQueryFromRequirement($query, Requirement $requirement)
+    {
+        $value = $requirement->getValue();
+        $sqlColumn = $requirement->getType();
 
-		if ($value instanceof RequirementCompositeValue)
-		{
-			$sql = $sqlColumn;
-			$bindings = $value->getValues();
+        if ($value instanceof RequirementCompositeValue)
+        {
+            $sql = $sqlColumn;
+            $bindings = $value->getValues();
 
-			if ($requirement->isNegated())
-				$sql = 'NOT ' . $sql;
-		}
+            if ($requirement->isNegated())
+                $sql = 'NOT ' . $sql;
+        }
 
-		else if ($value instanceof RequirementRangedValue)
-		{
-			if ($value->getMinValue() && $value->getMaxValue())
-			{
-				$sql = $sqlColumn . ' >= ? AND ' . $sqlColumn . ' <= ?';
-				$bindings = [$value->getMinValue(), $value->getMaxValue()];
-			}
-			elseif ($value->getMinValue())
-			{
-				$sql = $sqlColumn . ' >= ?';
-				$bindings = [$value->getMinValue()];
-			}
-			elseif ($value->getMaxValue())
-			{
-				$sql = $sqlColumn . ' <= ?';
-				$bindings = [$value->getMaxValue()];
-			}
-			else
-				throw new \RuntimeException('Neither min or max value was supplied');
+        else if ($value instanceof RequirementRangedValue)
+        {
+            if ($value->getMinValue() && $value->getMaxValue())
+            {
+                $sql = $sqlColumn . ' >= ? AND ' . $sqlColumn . ' <= ?';
+                $bindings = [$value->getMinValue(), $value->getMaxValue()];
+            }
+            elseif ($value->getMinValue())
+            {
+                $sql = $sqlColumn . ' >= ?';
+                $bindings = [$value->getMinValue()];
+            }
+            elseif ($value->getMaxValue())
+            {
+                $sql = $sqlColumn . ' <= ?';
+                $bindings = [$value->getMaxValue()];
+            }
+            else
+                throw new \RuntimeException('Neither min or max value was supplied');
 
-			if ($requirement->isNegated())
-				$sql = 'NOT (' . $sql . ')';
-		}
+            if ($requirement->isNegated())
+                $sql = 'NOT (' . $sql . ')';
+        }
 
-		else if ($value instanceof RequirementSingleValue)
-		{
-			$sql = $sqlColumn;
-			$bindings = [$value->getValue()];
+        else if ($value instanceof RequirementSingleValue)
+        {
+            $sql = $sqlColumn;
+            $bindings = [$value->getValue()];
 
-			if ($requirement->isNegated())
-				$sql = 'NOT ' . $sql;
-		}
+            if ($requirement->isNegated())
+                $sql = 'NOT ' . $sql;
+        }
 
-		else
-			throw new \Exception('Bad value: ' . get_class($value));
+        else
+            throw new \Exception('Bad value: ' . get_class($value));
 
-		$query->where($sql, $bindings);
-	}
+        $query->where($sql, $bindings);
+    }
 
-	protected function arrayToEntities($arrayEntities, $entityConverter = null)
-	{
-		if ($entityConverter === null)
-			$entityConverter = $this->entityConverter;
+    protected function arrayToEntities($arrayEntities, $entityConverter = null)
+    {
+        if ($entityConverter === null)
+            $entityConverter = $this->entityConverter;
 
-		$entities = [];
-		foreach ($arrayEntities as $arrayEntity)
-		{
-			$entity = $entityConverter->toEntity($arrayEntity);
-			$entities[$entity->getId()] = $entity;
-		}
-		return $entities;
-	}
+        $entities = [];
+        foreach ($arrayEntities as $arrayEntity)
+        {
+            $entity = $entityConverter->toEntity($arrayEntity);
+            $entities[$entity->getId()] = $entity;
+        }
+        return $entities;
+    }
 
-	private function setDatabaseConnection(DatabaseConnection $databaseConnection)
-	{
-		$this->pdo = $databaseConnection->getPDO();
-		$this->driver = $databaseConnection->getDriver();
-	}
+    private function setDatabaseConnection(DatabaseConnection $databaseConnection)
+    {
+        $this->pdo = $databaseConnection->getPDO();
+        $this->driver = $databaseConnection->getDriver();
+    }
 
-	private function decorateQueryFromFilter($query, IFilter $filter)
-	{
-		foreach ($filter->getRequirements() as $requirement)
-		{
-			$this->decorateQueryFromRequirement($query, $requirement);
-		}
-	}
+    private function decorateQueryFromFilter($query, IFilter $filter)
+    {
+        foreach ($filter->getRequirements() as $requirement)
+        {
+            $this->decorateQueryFromRequirement($query, $requirement);
+        }
+    }
 
-	private function compileOrderBy($order)
-	{
-		$orderByString = '';
-		foreach ($order as $orderColumn => $orderDir)
-		{
-			if ($orderColumn === IFilter::ORDER_RANDOM)
-			{
-				$driver = $this->driver;
-				if ($driver === 'sqlite')
-				{
-					$orderColumn = 'RANDOM()';
-				}
-				else
-				{
-					$orderColumn = 'RAND()';
-				}
-			}
-			$orderByString .= $orderColumn . ' ' . ($orderDir === IFilter::ORDER_DESC ? 'DESC' : 'ASC') . ', ';
-		}
-		return substr($orderByString, 0, -2);
-	}
+    private function compileOrderBy($order)
+    {
+        $orderByString = '';
+        foreach ($order as $orderColumn => $orderDir)
+        {
+            if ($orderColumn === IFilter::ORDER_RANDOM)
+            {
+                $driver = $this->driver;
+                if ($driver === 'sqlite')
+                {
+                    $orderColumn = 'RANDOM()';
+                }
+                else
+                {
+                    $orderColumn = 'RAND()';
+                }
+            }
+            $orderByString .= $orderColumn . ' ' . ($orderDir === IFilter::ORDER_DESC ? 'DESC' : 'ASC') . ', ';
+        }
+        return substr($orderByString, 0, -2);
+    }
 
-	private function upsert(Entity $entity)
-	{
-		if ($entity->getId())
-		{
-			return $this->update($entity);
-		}
-		else
-		{
-			return $this->create($entity);
-		}
-	}
+    private function upsert(Entity $entity)
+    {
+        if ($entity->getId())
+        {
+            return $this->update($entity);
+        }
+        else
+        {
+            return $this->create($entity);
+        }
+    }
 }
diff --git a/src/Dao/CommentDao.php b/src/Dao/CommentDao.php
index cfa84f0b..1f806af2 100644
--- a/src/Dao/CommentDao.php
+++ b/src/Dao/CommentDao.php
@@ -10,42 +10,42 @@ use Szurubooru\Entities\Post;
 
 class CommentDao extends AbstractDao implements ICrudDao
 {
-	private $userDao;
-	private $postDao;
+    private $userDao;
+    private $postDao;
 
-	public function __construct(
-		DatabaseConnection $databaseConnection,
-		UserDao $userDao,
-		PostDao $postDao)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'comments',
-			new CommentEntityConverter());
+    public function __construct(
+        DatabaseConnection $databaseConnection,
+        UserDao $userDao,
+        PostDao $postDao)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'comments',
+            new CommentEntityConverter());
 
-		$this->userDao = $userDao;
-		$this->postDao = $postDao;
-	}
+        $this->userDao = $userDao;
+        $this->postDao = $postDao;
+    }
 
-	public function findByPost(Post $post)
-	{
-		return $this->findBy('postId', $post->getId());
-	}
+    public function findByPost(Post $post)
+    {
+        return $this->findBy('postId', $post->getId());
+    }
 
-	protected function afterLoad(Entity $comment)
-	{
-		$comment->setLazyLoader(
-			Comment::LAZY_LOADER_USER,
-			function (Comment $comment)
-			{
-				return $this->userDao->findById($comment->getUserId());
-			});
+    protected function afterLoad(Entity $comment)
+    {
+        $comment->setLazyLoader(
+            Comment::LAZY_LOADER_USER,
+            function (Comment $comment)
+            {
+                return $this->userDao->findById($comment->getUserId());
+            });
 
-		$comment->setLazyLoader(
-			Comment::LAZY_LOADER_POST,
-			function (Comment $comment)
-			{
-				return $this->postDao->findById($comment->getPostId());
-			});
-	}
+        $comment->setLazyLoader(
+            Comment::LAZY_LOADER_POST,
+            function (Comment $comment)
+            {
+                return $this->postDao->findById($comment->getPostId());
+            });
+    }
 }
diff --git a/src/Dao/EntityConverters/AbstractEntityConverter.php b/src/Dao/EntityConverters/AbstractEntityConverter.php
index 7e92465e..3045a38e 100644
--- a/src/Dao/EntityConverters/AbstractEntityConverter.php
+++ b/src/Dao/EntityConverters/AbstractEntityConverter.php
@@ -5,43 +5,43 @@ use Szurubooru\Entities\Entity;
 
 abstract class AbstractEntityConverter implements IEntityConverter
 {
-	private $entityDecorator = null;
+    private $entityDecorator = null;
 
-	public function setEntityDecorator(callable $entityDecorator)
-	{
-		$this->entityDecorator = $entityDecorator;
-	}
+    public function setEntityDecorator(callable $entityDecorator)
+    {
+        $this->entityDecorator = $entityDecorator;
+    }
 
-	public function toEntity(array $array)
-	{
-		$entity = $this->toBasicEntity($array);
-		$func = $this->entityDecorator;
-		if ($func !== null)
-			$func($entity);
-		return $entity;
-	}
+    public function toEntity(array $array)
+    {
+        $entity = $this->toBasicEntity($array);
+        $func = $this->entityDecorator;
+        if ($func !== null)
+            $func($entity);
+        return $entity;
+    }
 
-	public function toArray(Entity $entity)
-	{
-		$array = $this->toBasicArray($entity);
-		if ($entity->getId() !== null)
-			$array['id'] = $entity->getId();
-		return $array;
-	}
+    public function toArray(Entity $entity)
+    {
+        $array = $this->toBasicArray($entity);
+        if ($entity->getId() !== null)
+            $array['id'] = $entity->getId();
+        return $array;
+    }
 
-	protected abstract function toBasicEntity(array $array);
+    protected abstract function toBasicEntity(array $array);
 
-	protected abstract function toBasicArray(Entity $entity);
+    protected abstract function toBasicArray(Entity $entity);
 
-	protected function dbTimeToEntityTime($time)
-	{
-		if ($time === null)
-			return null;
-		return date('c', strtotime($time));
-	}
+    protected function dbTimeToEntityTime($time)
+    {
+        if ($time === null)
+            return null;
+        return date('c', strtotime($time));
+    }
 
-	protected function entityTimeToDbTime($time)
-	{
-		return $time === null ? null : date('Y-m-d H:i:s', strtotime($time));
-	}
+    protected function entityTimeToDbTime($time)
+    {
+        return $time === null ? null : date('Y-m-d H:i:s', strtotime($time));
+    }
 }
diff --git a/src/Dao/EntityConverters/CommentEntityConverter.php b/src/Dao/EntityConverters/CommentEntityConverter.php
index 9e772ec2..5b30708c 100644
--- a/src/Dao/EntityConverters/CommentEntityConverter.php
+++ b/src/Dao/EntityConverters/CommentEntityConverter.php
@@ -5,27 +5,27 @@ use Szurubooru\Entities\Entity;
 
 class CommentEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'userId' => $entity->getUserId(),
-			'postId' => $entity->getPostId(),
-			'text' => $entity->getText(),
-			'creationTime' => $this->entityTimeToDbTime($entity->getCreationTime()),
-			'lastEditTime' => $this->entityTimeToDbTime($entity->getLastEditTime()),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'userId' => $entity->getUserId(),
+            'postId' => $entity->getPostId(),
+            'text' => $entity->getText(),
+            'creationTime' => $this->entityTimeToDbTime($entity->getCreationTime()),
+            'lastEditTime' => $this->entityTimeToDbTime($entity->getLastEditTime()),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new Comment(intval($array['id']));
-		$entity->setUserId($array['userId']);
-		$entity->setPostId($array['postId']);
-		$entity->setText($array['text']);
-		$entity->setCreationTime($this->dbTimeToEntityTime($array['creationTime']));
-		$entity->setLastEditTime($this->dbTimeToEntityTime($array['lastEditTime']));
-		$entity->setMeta(Comment::META_SCORE, intval($array['score']));
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new Comment(intval($array['id']));
+        $entity->setUserId($array['userId']);
+        $entity->setPostId($array['postId']);
+        $entity->setText($array['text']);
+        $entity->setCreationTime($this->dbTimeToEntityTime($array['creationTime']));
+        $entity->setLastEditTime($this->dbTimeToEntityTime($array['lastEditTime']));
+        $entity->setMeta(Comment::META_SCORE, intval($array['score']));
+        return $entity;
+    }
 }
diff --git a/src/Dao/EntityConverters/FavoriteEntityConverter.php b/src/Dao/EntityConverters/FavoriteEntityConverter.php
index 21bdc985..e04f003e 100644
--- a/src/Dao/EntityConverters/FavoriteEntityConverter.php
+++ b/src/Dao/EntityConverters/FavoriteEntityConverter.php
@@ -5,22 +5,22 @@ use Szurubooru\Entities\Favorite;
 
 class FavoriteEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'userId' => $entity->getUserId(),
-			'postId' => $entity->getPostId(),
-			'time' => $this->entityTimeToDbTime($entity->getTime()),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'userId' => $entity->getUserId(),
+            'postId' => $entity->getPostId(),
+            'time' => $this->entityTimeToDbTime($entity->getTime()),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new Favorite(intval($array['id']));
-		$entity->setUserId($array['userId']);
-		$entity->setPostId($array['postId']);
-		$entity->setTime($this->dbTimeToEntityTime($array['time']));
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new Favorite(intval($array['id']));
+        $entity->setUserId($array['userId']);
+        $entity->setPostId($array['postId']);
+        $entity->setTime($this->dbTimeToEntityTime($array['time']));
+        return $entity;
+    }
 }
diff --git a/src/Dao/EntityConverters/GlobalParamEntityConverter.php b/src/Dao/EntityConverters/GlobalParamEntityConverter.php
index 060d60e6..0d37266e 100644
--- a/src/Dao/EntityConverters/GlobalParamEntityConverter.php
+++ b/src/Dao/EntityConverters/GlobalParamEntityConverter.php
@@ -5,20 +5,20 @@ use Szurubooru\Entities\GlobalParam;
 
 class GlobalParamEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'dataKey' => $entity->getKey(),
-			'dataValue' => $entity->getValue(),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'dataKey' => $entity->getKey(),
+            'dataValue' => $entity->getValue(),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new GlobalParam(intval($array['id']));
-		$entity->setKey($array['dataKey']);
-		$entity->setValue($array['dataValue']);
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new GlobalParam(intval($array['id']));
+        $entity->setKey($array['dataKey']);
+        $entity->setValue($array['dataValue']);
+        return $entity;
+    }
 }
diff --git a/src/Dao/EntityConverters/IEntityConverter.php b/src/Dao/EntityConverters/IEntityConverter.php
index f35b50a1..aa7daf6b 100644
--- a/src/Dao/EntityConverters/IEntityConverter.php
+++ b/src/Dao/EntityConverters/IEntityConverter.php
@@ -4,7 +4,7 @@ use Szurubooru\Entities\Entity;
 
 interface IEntityConverter
 {
-	public function toArray(Entity $entity);
+    public function toArray(Entity $entity);
 
-	public function toEntity(array $array);
+    public function toEntity(array $array);
 }
diff --git a/src/Dao/EntityConverters/PostEntityConverter.php b/src/Dao/EntityConverters/PostEntityConverter.php
index df3b1901..532d78e0 100644
--- a/src/Dao/EntityConverters/PostEntityConverter.php
+++ b/src/Dao/EntityConverters/PostEntityConverter.php
@@ -5,52 +5,52 @@ use Szurubooru\Entities\Post;
 
 class PostEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'name' => $entity->getName(),
-			'userId' => $entity->getUserId(),
-			'uploadTime' => $this->entityTimeToDbTime($entity->getUploadTime()),
-			'lastEditTime' => $this->entityTimeToDbTime($entity->getLastEditTime()),
-			'safety' => $entity->getSafety(),
-			'contentType' => $entity->getContentType(),
-			'contentChecksum' => $entity->getContentChecksum(),
-			'contentMimeType' => $entity->getContentMimeType(),
-			'source' => $entity->getSource(),
-			'imageWidth' => $entity->getImageWidth(),
-			'imageHeight' => $entity->getImageHeight(),
-			'originalFileSize' => $entity->getOriginalFileSize(),
-			'originalFileName' => $entity->getOriginalFileName(),
-			'featureCount' => $entity->getFeatureCount(),
-			'lastFeatureTime' => $this->entityTimeToDbTime($entity->getLastFeatureTime()),
-			'flags' => $entity->getFlags(),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'name' => $entity->getName(),
+            'userId' => $entity->getUserId(),
+            'uploadTime' => $this->entityTimeToDbTime($entity->getUploadTime()),
+            'lastEditTime' => $this->entityTimeToDbTime($entity->getLastEditTime()),
+            'safety' => $entity->getSafety(),
+            'contentType' => $entity->getContentType(),
+            'contentChecksum' => $entity->getContentChecksum(),
+            'contentMimeType' => $entity->getContentMimeType(),
+            'source' => $entity->getSource(),
+            'imageWidth' => $entity->getImageWidth(),
+            'imageHeight' => $entity->getImageHeight(),
+            'originalFileSize' => $entity->getOriginalFileSize(),
+            'originalFileName' => $entity->getOriginalFileName(),
+            'featureCount' => $entity->getFeatureCount(),
+            'lastFeatureTime' => $this->entityTimeToDbTime($entity->getLastFeatureTime()),
+            'flags' => $entity->getFlags(),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new Post(intval($array['id']));
-		$entity->setName($array['name']);
-		$entity->setUserId($array['userId']);
-		$entity->setUploadTime($this->dbTimeToEntityTime($array['uploadTime']));
-		$entity->setLastEditTime($this->dbTimeToEntityTime($array['lastEditTime']));
-		$entity->setSafety(intval($array['safety']));
-		$entity->setContentType(intval($array['contentType']));
-		$entity->setContentChecksum($array['contentChecksum']);
-		$entity->setContentMimeType($array['contentMimeType']);
-		$entity->setSource($array['source']);
-		$entity->setImageWidth($array['imageWidth']);
-		$entity->setImageHeight($array['imageHeight']);
-		$entity->setOriginalFileSize($array['originalFileSize']);
-		$entity->setOriginalFileName($array['originalFileName']);
-		$entity->setFeatureCount(intval($array['featureCount']));
-		$entity->setLastFeatureTime($this->dbTimeToEntityTime($array['lastFeatureTime']));
-		$entity->setFlags(intval($array['flags']));
-		$entity->setMeta(Post::META_TAG_COUNT, intval($array['tagCount']));
-		$entity->setMeta(Post::META_FAV_COUNT, intval($array['favCount']));
-		$entity->setMeta(Post::META_COMMENT_COUNT, intval($array['commentCount']));
-		$entity->setMeta(Post::META_SCORE, intval($array['score']));
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new Post(intval($array['id']));
+        $entity->setName($array['name']);
+        $entity->setUserId($array['userId']);
+        $entity->setUploadTime($this->dbTimeToEntityTime($array['uploadTime']));
+        $entity->setLastEditTime($this->dbTimeToEntityTime($array['lastEditTime']));
+        $entity->setSafety(intval($array['safety']));
+        $entity->setContentType(intval($array['contentType']));
+        $entity->setContentChecksum($array['contentChecksum']);
+        $entity->setContentMimeType($array['contentMimeType']);
+        $entity->setSource($array['source']);
+        $entity->setImageWidth($array['imageWidth']);
+        $entity->setImageHeight($array['imageHeight']);
+        $entity->setOriginalFileSize($array['originalFileSize']);
+        $entity->setOriginalFileName($array['originalFileName']);
+        $entity->setFeatureCount(intval($array['featureCount']));
+        $entity->setLastFeatureTime($this->dbTimeToEntityTime($array['lastFeatureTime']));
+        $entity->setFlags(intval($array['flags']));
+        $entity->setMeta(Post::META_TAG_COUNT, intval($array['tagCount']));
+        $entity->setMeta(Post::META_FAV_COUNT, intval($array['favCount']));
+        $entity->setMeta(Post::META_COMMENT_COUNT, intval($array['commentCount']));
+        $entity->setMeta(Post::META_SCORE, intval($array['score']));
+        return $entity;
+    }
 }
diff --git a/src/Dao/EntityConverters/PostNoteEntityConverter.php b/src/Dao/EntityConverters/PostNoteEntityConverter.php
index 1ae357ba..69ffe79b 100644
--- a/src/Dao/EntityConverters/PostNoteEntityConverter.php
+++ b/src/Dao/EntityConverters/PostNoteEntityConverter.php
@@ -5,28 +5,28 @@ use Szurubooru\Entities\PostNote;
 
 class PostNoteEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'postId' => $entity->getPostId(),
-			'x' => $entity->getLeft(),
-			'y' => $entity->getTop(),
-			'width' => $entity->getWidth(),
-			'height' => $entity->getHeight(),
-			'text' => $entity->getText(),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'postId' => $entity->getPostId(),
+            'x' => $entity->getLeft(),
+            'y' => $entity->getTop(),
+            'width' => $entity->getWidth(),
+            'height' => $entity->getHeight(),
+            'text' => $entity->getText(),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new PostNote(intval($array['id']));
-		$entity->setPostId($array['postId']);
-		$entity->setLeft(floatval($array['x']));
-		$entity->setTop(floatval($array['y']));
-		$entity->setWidth(floatval($array['width']));
-		$entity->setHeight(floatval($array['height']));
-		$entity->setText($array['text']);
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new PostNote(intval($array['id']));
+        $entity->setPostId($array['postId']);
+        $entity->setLeft(floatval($array['x']));
+        $entity->setTop(floatval($array['y']));
+        $entity->setWidth(floatval($array['width']));
+        $entity->setHeight(floatval($array['height']));
+        $entity->setText($array['text']);
+        return $entity;
+    }
 }
diff --git a/src/Dao/EntityConverters/ScoreEntityConverter.php b/src/Dao/EntityConverters/ScoreEntityConverter.php
index f860b31f..c739a1bd 100644
--- a/src/Dao/EntityConverters/ScoreEntityConverter.php
+++ b/src/Dao/EntityConverters/ScoreEntityConverter.php
@@ -5,26 +5,26 @@ use Szurubooru\Entities\Score;
 
 class ScoreEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'userId' => $entity->getUserId(),
-			'postId' => $entity->getPostId(),
-			'commentId' => $entity->getCommentId(),
-			'time' => $this->entityTimeToDbTime($entity->getTime()),
-			'score' => $entity->getScore(),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'userId' => $entity->getUserId(),
+            'postId' => $entity->getPostId(),
+            'commentId' => $entity->getCommentId(),
+            'time' => $this->entityTimeToDbTime($entity->getTime()),
+            'score' => $entity->getScore(),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new Score(intval($array['id']));
-		$entity->setUserId($array['userId']);
-		$entity->setPostId($array['postId']);
-		$entity->setCommentId($array['commentId']);
-		$entity->setTime($this->dbTimeToEntityTime($array['time']));
-		$entity->setScore(intval($array['score']));
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new Score(intval($array['id']));
+        $entity->setUserId($array['userId']);
+        $entity->setPostId($array['postId']);
+        $entity->setCommentId($array['commentId']);
+        $entity->setTime($this->dbTimeToEntityTime($array['time']));
+        $entity->setScore(intval($array['score']));
+        return $entity;
+    }
 }
diff --git a/src/Dao/EntityConverters/SnapshotEntityConverter.php b/src/Dao/EntityConverters/SnapshotEntityConverter.php
index 17c37a81..65fc96d1 100644
--- a/src/Dao/EntityConverters/SnapshotEntityConverter.php
+++ b/src/Dao/EntityConverters/SnapshotEntityConverter.php
@@ -5,30 +5,30 @@ use Szurubooru\Entities\Snapshot;
 
 class SnapshotEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'time' => $this->entityTimeToDbTime($entity->getTime()),
-			'type' => $entity->getType(),
-			'primaryKey' => $entity->getPrimaryKey(),
-			'userId' => $entity->getUserId(),
-			'operation' => $entity->getOperation(),
-			'data' => gzdeflate(json_encode($entity->getData())),
-			'dataDifference' => gzdeflate(json_encode($entity->getDataDifference())),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'time' => $this->entityTimeToDbTime($entity->getTime()),
+            'type' => $entity->getType(),
+            'primaryKey' => $entity->getPrimaryKey(),
+            'userId' => $entity->getUserId(),
+            'operation' => $entity->getOperation(),
+            'data' => gzdeflate(json_encode($entity->getData())),
+            'dataDifference' => gzdeflate(json_encode($entity->getDataDifference())),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new Snapshot(intval($array['id']));
-		$entity->setTime($this->dbTimeToEntityTime($array['time']));
-		$entity->setType(intval($array['type']));
-		$entity->setPrimaryKey($array['primaryKey']);
-		$entity->setUserId(intval($array['userId']));
-		$entity->setOperation($array['operation']);
-		$entity->setData(json_decode(gzinflate($array['data']), true));
-		$entity->setDataDifference(json_decode(gzinflate($array['dataDifference']), true));
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new Snapshot(intval($array['id']));
+        $entity->setTime($this->dbTimeToEntityTime($array['time']));
+        $entity->setType(intval($array['type']));
+        $entity->setPrimaryKey($array['primaryKey']);
+        $entity->setUserId(intval($array['userId']));
+        $entity->setOperation($array['operation']);
+        $entity->setData(json_decode(gzinflate($array['data']), true));
+        $entity->setDataDifference(json_decode(gzinflate($array['dataDifference']), true));
+        return $entity;
+    }
 }
diff --git a/src/Dao/EntityConverters/TagEntityConverter.php b/src/Dao/EntityConverters/TagEntityConverter.php
index 2f012a76..d340b27d 100644
--- a/src/Dao/EntityConverters/TagEntityConverter.php
+++ b/src/Dao/EntityConverters/TagEntityConverter.php
@@ -5,25 +5,25 @@ use Szurubooru\Entities\Tag;
 
 class TagEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'name' => $entity->getName(),
-			'creationTime' => $this->entityTimeToDbTime($entity->getCreationTime()),
-			'banned' => intval($entity->isBanned()),
-			'category' => $entity->getCategory(),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'name' => $entity->getName(),
+            'creationTime' => $this->entityTimeToDbTime($entity->getCreationTime()),
+            'banned' => intval($entity->isBanned()),
+            'category' => $entity->getCategory(),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new Tag(intval($array['id']));
-		$entity->setName($array['name']);
-		$entity->setCreationTime($this->dbTimeToEntityTime($array['creationTime']));
-		$entity->setMeta(Tag::META_USAGES, intval($array['usages']));
-		$entity->setBanned($array['banned']);
-		$entity->setCategory($array['category']);
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new Tag(intval($array['id']));
+        $entity->setName($array['name']);
+        $entity->setCreationTime($this->dbTimeToEntityTime($array['creationTime']));
+        $entity->setMeta(Tag::META_USAGES, intval($array['usages']));
+        $entity->setBanned($array['banned']);
+        $entity->setCategory($array['category']);
+        return $entity;
+    }
 }
diff --git a/src/Dao/EntityConverters/TokenEntityConverter.php b/src/Dao/EntityConverters/TokenEntityConverter.php
index 5d80fcb6..31063b9d 100644
--- a/src/Dao/EntityConverters/TokenEntityConverter.php
+++ b/src/Dao/EntityConverters/TokenEntityConverter.php
@@ -5,22 +5,22 @@ use Szurubooru\Entities\Token;
 
 class TokenEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'name' => $entity->getName(),
-			'purpose' => $entity->getPurpose(),
-			'additionalData' => $entity->getAdditionalData(),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'name' => $entity->getName(),
+            'purpose' => $entity->getPurpose(),
+            'additionalData' => $entity->getAdditionalData(),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new Token(intval($array['id']));
-		$entity->setName($array['name']);
-		$entity->setPurpose($array['purpose']);
-		$entity->setAdditionalData($array['additionalData']);
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new Token(intval($array['id']));
+        $entity->setName($array['name']);
+        $entity->setPurpose($array['purpose']);
+        $entity->setAdditionalData($array['additionalData']);
+        return $entity;
+    }
 }
diff --git a/src/Dao/EntityConverters/UserEntityConverter.php b/src/Dao/EntityConverters/UserEntityConverter.php
index 6186fd25..a385299d 100644
--- a/src/Dao/EntityConverters/UserEntityConverter.php
+++ b/src/Dao/EntityConverters/UserEntityConverter.php
@@ -5,40 +5,40 @@ use Szurubooru\Entities\User;
 
 class UserEntityConverter extends AbstractEntityConverter implements IEntityConverter
 {
-	public function toBasicArray(Entity $entity)
-	{
-		return
-		[
-			'name' => $entity->getName(),
-			'email' => $entity->getEmail(),
-			'emailUnconfirmed' => $entity->getEmailUnconfirmed(),
-			'passwordHash' => $entity->getPasswordHash(),
-			'passwordSalt' => $entity->getPasswordSalt(),
-			'accessRank' => $entity->getAccessRank(),
-			'registrationTime' => $this->entityTimeToDbTime($entity->getRegistrationTime()),
-			'lastLoginTime' => $this->entityTimeToDbTime($entity->getLastLoginTime()),
-			'avatarStyle' => $entity->getAvatarStyle(),
-			'browsingSettings' => json_encode($entity->getBrowsingSettings()),
-			'accountConfirmed' => intval($entity->isAccountConfirmed()),
-			'banned' => intval($entity->isBanned()),
-		];
-	}
+    public function toBasicArray(Entity $entity)
+    {
+        return
+        [
+            'name' => $entity->getName(),
+            'email' => $entity->getEmail(),
+            'emailUnconfirmed' => $entity->getEmailUnconfirmed(),
+            'passwordHash' => $entity->getPasswordHash(),
+            'passwordSalt' => $entity->getPasswordSalt(),
+            'accessRank' => $entity->getAccessRank(),
+            'registrationTime' => $this->entityTimeToDbTime($entity->getRegistrationTime()),
+            'lastLoginTime' => $this->entityTimeToDbTime($entity->getLastLoginTime()),
+            'avatarStyle' => $entity->getAvatarStyle(),
+            'browsingSettings' => json_encode($entity->getBrowsingSettings()),
+            'accountConfirmed' => intval($entity->isAccountConfirmed()),
+            'banned' => intval($entity->isBanned()),
+        ];
+    }
 
-	public function toBasicEntity(array $array)
-	{
-		$entity = new User(intval($array['id']));
-		$entity->setName($array['name']);
-		$entity->setEmail($array['email']);
-		$entity->setEmailUnconfirmed($array['emailUnconfirmed']);
-		$entity->setPasswordHash($array['passwordHash']);
-		$entity->setPasswordSalt($array['passwordSalt']);
-		$entity->setAccessRank(intval($array['accessRank']));
-		$entity->setRegistrationTime($this->dbTimeToEntityTime($array['registrationTime']));
-		$entity->setLastLoginTime($this->dbTimeToEntityTime($array['lastLoginTime']));
-		$entity->setAvatarStyle(intval($array['avatarStyle']));
-		$entity->setBrowsingSettings(json_decode($array['browsingSettings']));
-		$entity->setAccountConfirmed($array['accountConfirmed']);
-		$entity->setBanned($array['banned']);
-		return $entity;
-	}
+    public function toBasicEntity(array $array)
+    {
+        $entity = new User(intval($array['id']));
+        $entity->setName($array['name']);
+        $entity->setEmail($array['email']);
+        $entity->setEmailUnconfirmed($array['emailUnconfirmed']);
+        $entity->setPasswordHash($array['passwordHash']);
+        $entity->setPasswordSalt($array['passwordSalt']);
+        $entity->setAccessRank(intval($array['accessRank']));
+        $entity->setRegistrationTime($this->dbTimeToEntityTime($array['registrationTime']));
+        $entity->setLastLoginTime($this->dbTimeToEntityTime($array['lastLoginTime']));
+        $entity->setAvatarStyle(intval($array['avatarStyle']));
+        $entity->setBrowsingSettings(json_decode($array['browsingSettings']));
+        $entity->setAccountConfirmed($array['accountConfirmed']);
+        $entity->setBanned($array['banned']);
+        return $entity;
+    }
 }
diff --git a/src/Dao/FavoritesDao.php b/src/Dao/FavoritesDao.php
index 99efea03..4f23cc89 100644
--- a/src/Dao/FavoritesDao.php
+++ b/src/Dao/FavoritesDao.php
@@ -10,65 +10,65 @@ use Szurubooru\Services\TimeService;
 
 class FavoritesDao extends AbstractDao implements ICrudDao
 {
-	private $timeService;
+    private $timeService;
 
-	public function __construct(
-		DatabaseConnection $databaseConnection,
-		TimeService $timeService)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'favorites',
-			new FavoriteEntityConverter());
+    public function __construct(
+        DatabaseConnection $databaseConnection,
+        TimeService $timeService)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'favorites',
+            new FavoriteEntityConverter());
 
-		$this->timeService = $timeService;
-	}
+        $this->timeService = $timeService;
+    }
 
-	public function findByEntity(Entity $entity)
-	{
-		if ($entity instanceof Post)
-			return $this->findBy('postId', $entity->getId());
-		else
-			throw new \InvalidArgumentException();
-	}
+    public function findByEntity(Entity $entity)
+    {
+        if ($entity instanceof Post)
+            return $this->findBy('postId', $entity->getId());
+        else
+            throw new \InvalidArgumentException();
+    }
 
-	public function set(User $user, Entity $entity)
-	{
-		$favorite = $this->get($user, $entity);
-		if (!$favorite)
-		{
-			$favorite = new Favorite();
-			$favorite->setTime($this->timeService->getCurrentTime());
-			$favorite->setUserId($user->getId());
+    public function set(User $user, Entity $entity)
+    {
+        $favorite = $this->get($user, $entity);
+        if (!$favorite)
+        {
+            $favorite = new Favorite();
+            $favorite->setTime($this->timeService->getCurrentTime());
+            $favorite->setUserId($user->getId());
 
-			if ($entity instanceof Post)
-				$favorite->setPostId($entity->getId());
-			else
-				throw new \InvalidArgumentException();
+            if ($entity instanceof Post)
+                $favorite->setPostId($entity->getId());
+            else
+                throw new \InvalidArgumentException();
 
-			$this->save($favorite);
-		}
-		return $favorite;
-	}
+            $this->save($favorite);
+        }
+        return $favorite;
+    }
 
-	public function delete(User $user, Entity $entity)
-	{
-		$favorite = $this->get($user, $entity);
-		if ($favorite)
-			$this->deleteById($favorite->getId());
-	}
+    public function delete(User $user, Entity $entity)
+    {
+        $favorite = $this->get($user, $entity);
+        if ($favorite)
+            $this->deleteById($favorite->getId());
+    }
 
-	private function get(User $user, Entity $entity)
-	{
-		$query = $this->pdo->from($this->tableName)->where('userId', $user->getId());
+    private function get(User $user, Entity $entity)
+    {
+        $query = $this->pdo->from($this->tableName)->where('userId', $user->getId());
 
-		if ($entity instanceof Post)
-			$query->where('postId', $entity->getId());
-		else
-			throw new \InvalidArgumentException();
+        if ($entity instanceof Post)
+            $query->where('postId', $entity->getId());
+        else
+            throw new \InvalidArgumentException();
 
-		$arrayEntities = iterator_to_array($query);
-		$entities = $this->arrayToEntities($arrayEntities);
-		return array_shift($entities);
-	}
+        $arrayEntities = iterator_to_array($query);
+        $entities = $this->arrayToEntities($arrayEntities);
+        return array_shift($entities);
+    }
 }
diff --git a/src/Dao/FileDao.php b/src/Dao/FileDao.php
index 512996cb..83a40146 100644
--- a/src/Dao/FileDao.php
+++ b/src/Dao/FileDao.php
@@ -4,93 +4,93 @@ use Szurubooru\Dao\IFileDao;
 
 class FileDao implements IFileDao
 {
-	private $directory;
+    private $directory;
 
-	public function __construct($directory)
-	{
-		$this->directory = $directory;
-	}
+    public function __construct($directory)
+    {
+        $this->directory = $directory;
+    }
 
-	public function load($fileName)
-	{
-		$fullPath = $this->getFullPath($fileName);
-		return file_exists($fullPath)
-			? file_get_contents($fullPath)
-			: null;
-	}
+    public function load($fileName)
+    {
+        $fullPath = $this->getFullPath($fileName);
+        return file_exists($fullPath)
+            ? file_get_contents($fullPath)
+            : null;
+    }
 
-	public function save($fileName, $data)
-	{
-		$fullPath = $this->getFullPath($fileName);
-		$this->createFolders($fileName);
-		file_put_contents($fullPath, $data);
-	}
+    public function save($fileName, $data)
+    {
+        $fullPath = $this->getFullPath($fileName);
+        $this->createFolders($fileName);
+        file_put_contents($fullPath, $data);
+    }
 
-	public function delete($fileName)
-	{
-		$fullPath = $this->getFullPath($fileName);
-		if (file_exists($fullPath))
-			unlink($fullPath);
-	}
+    public function delete($fileName)
+    {
+        $fullPath = $this->getFullPath($fileName);
+        if (file_exists($fullPath))
+            unlink($fullPath);
+    }
 
-	public function exists($fileName)
-	{
-		$fullPath = $this->getFullPath($fileName);
-		return file_exists($fullPath);
-	}
+    public function exists($fileName)
+    {
+        $fullPath = $this->getFullPath($fileName);
+        return file_exists($fullPath);
+    }
 
-	public function getFullPath($fileName)
-	{
-		return $this->directory . DIRECTORY_SEPARATOR . $fileName;
-	}
+    public function getFullPath($fileName)
+    {
+        return $this->directory . DIRECTORY_SEPARATOR . $fileName;
+    }
 
-	public function listAll()
-	{
-		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory));
-		$files = [];
-		foreach ($iterator as $path)
-		{
-			if (!$path->isDir())
-				$files[] = $this->getRelativePath($this->directory, $path->getPathName());
-		}
-		return $files;
-	}
+    public function listAll()
+    {
+        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory));
+        $files = [];
+        foreach ($iterator as $path)
+        {
+            if (!$path->isDir())
+                $files[] = $this->getRelativePath($this->directory, $path->getPathName());
+        }
+        return $files;
+    }
 
-	private function createFolders($fileName)
-	{
-		$fullPath = dirname($this->getFullPath($fileName));
-		if (!file_exists($fullPath))
-			mkdir($fullPath, 0777, true);
-	}
+    private function createFolders($fileName)
+    {
+        $fullPath = dirname($this->getFullPath($fileName));
+        if (!file_exists($fullPath))
+            mkdir($fullPath, 0777, true);
+    }
 
-	private function getRelativePath($from, $to)
-	{
-		$from = is_dir($from) ? rtrim($from, '\/') . '/' : $from;
-		$to = is_dir($to) ? rtrim($to, '\/') . '/' : $to;
-		$from = explode('/', str_replace('\\', '/', $from));
-		$to = explode('/', str_replace('\\', '/', $to));
-		$relPath = $to;
-		foreach($from as $depth => $dir)
-		{
-			if($dir === $to[$depth])
-			{
-				array_shift($relPath);
-			}
-			else
-			{
-				$remaining = count($from) - $depth;
-				if ($remaining > 1)
-				{
-					$padLength = (count($relPath) + $remaining - 1) * -1;
-					$relPath = array_pad($relPath, $padLength, '..');
-					break;
-				}
-				else
-				{
-					$relPath[0] = $relPath[0];
-				}
-			}
-		}
-		return implode('/', $relPath);
-	}
+    private function getRelativePath($from, $to)
+    {
+        $from = is_dir($from) ? rtrim($from, '\/') . '/' : $from;
+        $to = is_dir($to) ? rtrim($to, '\/') . '/' : $to;
+        $from = explode('/', str_replace('\\', '/', $from));
+        $to = explode('/', str_replace('\\', '/', $to));
+        $relPath = $to;
+        foreach($from as $depth => $dir)
+        {
+            if($dir === $to[$depth])
+            {
+                array_shift($relPath);
+            }
+            else
+            {
+                $remaining = count($from) - $depth;
+                if ($remaining > 1)
+                {
+                    $padLength = (count($relPath) + $remaining - 1) * -1;
+                    $relPath = array_pad($relPath, $padLength, '..');
+                    break;
+                }
+                else
+                {
+                    $relPath[0] = $relPath[0];
+                }
+            }
+        }
+        return implode('/', $relPath);
+    }
 }
diff --git a/src/Dao/GlobalParamDao.php b/src/Dao/GlobalParamDao.php
index ba0817c5..1a4631de 100644
--- a/src/Dao/GlobalParamDao.php
+++ b/src/Dao/GlobalParamDao.php
@@ -5,32 +5,32 @@ use Szurubooru\DatabaseConnection;
 
 class GlobalParamDao extends AbstractDao implements ICrudDao
 {
-	public function __construct(DatabaseConnection $databaseConnection)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'globals',
-			new GlobalParamEntityConverter());
-	}
+    public function __construct(DatabaseConnection $databaseConnection)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'globals',
+            new GlobalParamEntityConverter());
+    }
 
-	public function save(&$entity)
-	{
-		if (!$entity->getId())
-		{
-			$otherEntityWithThisKey = $this->findByKey($entity->getKey());
-			if ($otherEntityWithThisKey)
-				$entity->setId($otherEntityWithThisKey->getId());
-		}
-		parent::save($entity);
-	}
+    public function save(&$entity)
+    {
+        if (!$entity->getId())
+        {
+            $otherEntityWithThisKey = $this->findByKey($entity->getKey());
+            if ($otherEntityWithThisKey)
+                $entity->setId($otherEntityWithThisKey->getId());
+        }
+        parent::save($entity);
+    }
 
-	public function findByKey($key)
-	{
-		return $this->findOneBy('dataKey', $key);
-	}
+    public function findByKey($key)
+    {
+        return $this->findOneBy('dataKey', $key);
+    }
 
-	public function deleteByKey($key)
-	{
-		return $this->deleteBy('dataKey', $key);
-	}
+    public function deleteByKey($key)
+    {
+        return $this->deleteBy('dataKey', $key);
+    }
 }
diff --git a/src/Dao/IBatchDao.php b/src/Dao/IBatchDao.php
index 2e6a459f..1847c369 100644
--- a/src/Dao/IBatchDao.php
+++ b/src/Dao/IBatchDao.php
@@ -3,9 +3,9 @@ namespace Szurubooru\Dao;
 
 interface IBatchDao
 {
-	public function findAll();
+    public function findAll();
 
-	public function deleteAll();
+    public function deleteAll();
 
-	public function batchSave(array $objects);
+    public function batchSave(array $objects);
 }
diff --git a/src/Dao/ICrudDao.php b/src/Dao/ICrudDao.php
index 34ac7a7c..f4e17fb0 100644
--- a/src/Dao/ICrudDao.php
+++ b/src/Dao/ICrudDao.php
@@ -3,9 +3,9 @@ namespace Szurubooru\Dao;
 
 interface ICrudDao
 {
-	public function findById($objectId);
+    public function findById($objectId);
 
-	public function save(&$object);
+    public function save(&$object);
 
-	public function deleteById($objectId);
+    public function deleteById($objectId);
 }
diff --git a/src/Dao/IFileDao.php b/src/Dao/IFileDao.php
index 9f6d8aac..6d8b678c 100644
--- a/src/Dao/IFileDao.php
+++ b/src/Dao/IFileDao.php
@@ -3,11 +3,11 @@ namespace Szurubooru\Dao;
 
 interface IFileDao
 {
-	public function load($fileName);
+    public function load($fileName);
 
-	public function save($fileName, $contents);
+    public function save($fileName, $contents);
 
-	public function delete($fileName);
+    public function delete($fileName);
 
-	public function exists($fileName);
+    public function exists($fileName);
 }
diff --git a/src/Dao/PostDao.php b/src/Dao/PostDao.php
index 6c473fe5..c9a59f61 100644
--- a/src/Dao/PostDao.php
+++ b/src/Dao/PostDao.php
@@ -13,295 +13,295 @@ use Szurubooru\Services\ThumbnailService;
 
 class PostDao extends AbstractDao implements ICrudDao
 {
-	private $tagDao;
-	private $userDao;
-	private $fileDao;
-	private $thumbnailService;
+    private $tagDao;
+    private $userDao;
+    private $fileDao;
+    private $thumbnailService;
 
-	public function __construct(
-		DatabaseConnection $databaseConnection,
-		TagDao $tagDao,
-		UserDao $userDao,
-		PublicFileDao $fileDao,
-		ThumbnailService $thumbnailService)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'posts',
-			new PostEntityConverter());
+    public function __construct(
+        DatabaseConnection $databaseConnection,
+        TagDao $tagDao,
+        UserDao $userDao,
+        PublicFileDao $fileDao,
+        ThumbnailService $thumbnailService)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'posts',
+            new PostEntityConverter());
 
-		$this->tagDao = $tagDao;
-		$this->userDao = $userDao;
-		$this->fileDao = $fileDao;
-		$this->thumbnailService = $thumbnailService;
-	}
+        $this->tagDao = $tagDao;
+        $this->userDao = $userDao;
+        $this->fileDao = $fileDao;
+        $this->thumbnailService = $thumbnailService;
+    }
 
-	public function getCount()
-	{
-		return count($this->pdo->from($this->tableName));
-	}
+    public function getCount()
+    {
+        return count($this->pdo->from($this->tableName));
+    }
 
-	public function getTotalFileSize()
-	{
-		$query = $this->pdo->from($this->tableName)->select('SUM(originalFileSize) AS __sum');
-		return iterator_to_array($query)[0]['__sum'];
-	}
+    public function getTotalFileSize()
+    {
+        $query = $this->pdo->from($this->tableName)->select('SUM(originalFileSize) AS __sum');
+        return iterator_to_array($query)[0]['__sum'];
+    }
 
-	public function findByName($name)
-	{
-		return $this->findOneBy('name', $name);
-	}
+    public function findByName($name)
+    {
+        return $this->findOneBy('name', $name);
+    }
 
-	public function findByTagName($tagName)
-	{
-		$query = $this->pdo->from('posts')
-			->innerJoin('postTags', 'postTags.postId = posts.id')
-			->innerJoin('tags', 'postTags.tagId = tags.id')
-			->where('tags.name', $tagName);
-		$arrayEntities = iterator_to_array($query);
-		return $this->arrayToEntities($arrayEntities);
-	}
+    public function findByTagName($tagName)
+    {
+        $query = $this->pdo->from('posts')
+            ->innerJoin('postTags', 'postTags.postId = posts.id')
+            ->innerJoin('tags', 'postTags.tagId = tags.id')
+            ->where('tags.name', $tagName);
+        $arrayEntities = iterator_to_array($query);
+        return $this->arrayToEntities($arrayEntities);
+    }
 
-	public function findByContentChecksum($checksum)
-	{
-		return $this->findOneBy('contentChecksum', $checksum);
-	}
+    public function findByContentChecksum($checksum)
+    {
+        return $this->findOneBy('contentChecksum', $checksum);
+    }
 
-	protected function afterLoad(Entity $post)
-	{
-		$post->setLazyLoader(
-			Post::LAZY_LOADER_CONTENT,
-			function (Post $post)
-			{
-				return $this->fileDao->load($post->getContentPath());
-			});
+    protected function afterLoad(Entity $post)
+    {
+        $post->setLazyLoader(
+            Post::LAZY_LOADER_CONTENT,
+            function (Post $post)
+            {
+                return $this->fileDao->load($post->getContentPath());
+            });
 
-		$post->setLazyLoader(
-			Post::LAZY_LOADER_THUMBNAIL_SOURCE_CONTENT,
-			function (Post $post)
-			{
-				return $this->fileDao->load($post->getThumbnailSourceContentPath());
-			});
+        $post->setLazyLoader(
+            Post::LAZY_LOADER_THUMBNAIL_SOURCE_CONTENT,
+            function (Post $post)
+            {
+                return $this->fileDao->load($post->getThumbnailSourceContentPath());
+            });
 
-		$post->setLazyLoader(
-			Post::LAZY_LOADER_USER,
-			function (Post $post)
-			{
-				return $this->getUser($post);
-			});
+        $post->setLazyLoader(
+            Post::LAZY_LOADER_USER,
+            function (Post $post)
+            {
+                return $this->getUser($post);
+            });
 
-		$post->setLazyLoader(
-			Post::LAZY_LOADER_TAGS,
-			function (Post $post)
-			{
-				return $this->getTags($post);
-			});
+        $post->setLazyLoader(
+            Post::LAZY_LOADER_TAGS,
+            function (Post $post)
+            {
+                return $this->getTags($post);
+            });
 
-		$post->setLazyLoader(
-			Post::LAZY_LOADER_RELATED_POSTS,
-			function (Post $post)
-			{
-				return $this->getRelatedPosts($post);
-			});
-	}
+        $post->setLazyLoader(
+            Post::LAZY_LOADER_RELATED_POSTS,
+            function (Post $post)
+            {
+                return $this->getRelatedPosts($post);
+            });
+    }
 
-	protected function afterSave(Entity $post)
-	{
-		$this->syncContent($post);
-		$this->syncThumbnailSourceContent($post);
-		$this->syncTags($post);
-		$this->syncPostRelations($post);
-	}
+    protected function afterSave(Entity $post)
+    {
+        $this->syncContent($post);
+        $this->syncThumbnailSourceContent($post);
+        $this->syncTags($post);
+        $this->syncPostRelations($post);
+    }
 
-	protected function decorateQueryFromRequirement($query, Requirement $requirement)
-	{
-		if ($requirement->getType() === PostFilter::REQUIREMENT_TAG)
-		{
-			$tagName = $requirement->getValue()->getValue();
-			$tag = $this->tagDao->findByName($tagName);
-			if (!$tag)
-				throw new \DomainException('Invalid tag: "' . $tagName . '"');
+    protected function decorateQueryFromRequirement($query, Requirement $requirement)
+    {
+        if ($requirement->getType() === PostFilter::REQUIREMENT_TAG)
+        {
+            $tagName = $requirement->getValue()->getValue();
+            $tag = $this->tagDao->findByName($tagName);
+            if (!$tag)
+                throw new \DomainException('Invalid tag: "' . $tagName . '"');
 
-			$sql = 'EXISTS (
-				SELECT 1 FROM postTags
-				WHERE postTags.postId = posts.id
-					AND postTags.tagId = ?)';
+            $sql = 'EXISTS (
+                SELECT 1 FROM postTags
+                WHERE postTags.postId = posts.id
+                    AND postTags.tagId = ?)';
 
-			if ($requirement->isNegated())
-				$sql = 'NOT ' . $sql;
+            if ($requirement->isNegated())
+                $sql = 'NOT ' . $sql;
 
-			$query->where($sql, $tag->getId());
-			return;
-		}
+            $query->where($sql, $tag->getId());
+            return;
+        }
 
-		elseif ($requirement->getType() === PostFilter::REQUIREMENT_FAVORITE)
-		{
-			foreach ($requirement->getValue()->getValues() as $userName)
-			{
-				$sql = 'EXISTS (
-					SELECT 1 FROM favorites f
-					WHERE f.postId = posts.id
-						AND f.userId = (SELECT id FROM users WHERE name = ?))';
-				if ($requirement->isNegated())
-					$sql = 'NOT ' . $sql;
-				$query->where($sql, [$userName]);
-			}
-			return;
-		}
+        elseif ($requirement->getType() === PostFilter::REQUIREMENT_FAVORITE)
+        {
+            foreach ($requirement->getValue()->getValues() as $userName)
+            {
+                $sql = 'EXISTS (
+                    SELECT 1 FROM favorites f
+                    WHERE f.postId = posts.id
+                        AND f.userId = (SELECT id FROM users WHERE name = ?))';
+                if ($requirement->isNegated())
+                    $sql = 'NOT ' . $sql;
+                $query->where($sql, [$userName]);
+            }
+            return;
+        }
 
-		elseif ($requirement->getType() === PostFilter::REQUIREMENT_COMMENT_AUTHOR)
-		{
-			foreach ($requirement->getValue()->getValues() as $userName)
-			{
-				$sql = 'EXISTS (
-					SELECT 1 FROM comments c
-					WHERE c.postId = posts.id
-						AND c.userId = (SELECT id FROM users WHERE name = ?))';
-				if ($requirement->isNegated())
-					$sql = 'NOT ' . $sql;
-				$query->where($sql, [$userName]);
-			}
-			return;
-		}
+        elseif ($requirement->getType() === PostFilter::REQUIREMENT_COMMENT_AUTHOR)
+        {
+            foreach ($requirement->getValue()->getValues() as $userName)
+            {
+                $sql = 'EXISTS (
+                    SELECT 1 FROM comments c
+                    WHERE c.postId = posts.id
+                        AND c.userId = (SELECT id FROM users WHERE name = ?))';
+                if ($requirement->isNegated())
+                    $sql = 'NOT ' . $sql;
+                $query->where($sql, [$userName]);
+            }
+            return;
+        }
 
-		elseif ($requirement->getType() === PostFilter::REQUIREMENT_UPLOADER)
-		{
-			foreach ($requirement->getValue()->getValues() as $userName)
-			{
-				$alias = 'u' . uniqid();
-				$query->innerJoin('users ' . $alias, $alias . '.id = posts.userId');
-				$sql = $alias . '.name = ?';
-				if ($requirement->isNegated())
-					$sql = 'NOT ' . $sql;
-				$query->where($sql, [$userName]);
-			}
-			return;
-		}
+        elseif ($requirement->getType() === PostFilter::REQUIREMENT_UPLOADER)
+        {
+            foreach ($requirement->getValue()->getValues() as $userName)
+            {
+                $alias = 'u' . uniqid();
+                $query->innerJoin('users ' . $alias, $alias . '.id = posts.userId');
+                $sql = $alias . '.name = ?';
+                if ($requirement->isNegated())
+                    $sql = 'NOT ' . $sql;
+                $query->where($sql, [$userName]);
+            }
+            return;
+        }
 
-		elseif ($requirement->getType() === PostFilter::REQUIREMENT_USER_SCORE)
-		{
-			$values = $requirement->getValue()->getValues();
-			$userName = $values[0];
-			$score = $values[1];
-			$sql = 'EXISTS (
-				SELECT 1 FROM scores
-				WHERE scores.postId = posts.id
-					AND scores.userId = (SELECT id FROM users WHERE name = ?)
-					AND scores.score = ?)';
-			if ($requirement->isNegated())
-				$sql = 'NOT ' . $sql;
-			$query->where($sql, [$userName, $score]);
-			return;
-		}
+        elseif ($requirement->getType() === PostFilter::REQUIREMENT_USER_SCORE)
+        {
+            $values = $requirement->getValue()->getValues();
+            $userName = $values[0];
+            $score = $values[1];
+            $sql = 'EXISTS (
+                SELECT 1 FROM scores
+                WHERE scores.postId = posts.id
+                    AND scores.userId = (SELECT id FROM users WHERE name = ?)
+                    AND scores.score = ?)';
+            if ($requirement->isNegated())
+                $sql = 'NOT ' . $sql;
+            $query->where($sql, [$userName, $score]);
+            return;
+        }
 
-		parent::decorateQueryFromRequirement($query, $requirement);
-	}
+        parent::decorateQueryFromRequirement($query, $requirement);
+    }
 
-	private function getTags(Post $post)
-	{
-		return $this->tagDao->findByPostId($post->getId());
-	}
+    private function getTags(Post $post)
+    {
+        return $this->tagDao->findByPostId($post->getId());
+    }
 
-	private function getUser(Post $post)
-	{
-		return $this->userDao->findById($post->getUserId());
-	}
+    private function getUser(Post $post)
+    {
+        return $this->userDao->findById($post->getUserId());
+    }
 
-	private function getRelatedPosts(Post $post)
-	{
-		$relatedPostIds = [];
+    private function getRelatedPosts(Post $post)
+    {
+        $relatedPostIds = [];
 
-		foreach ($this->pdo->from('postRelations')->where('post1id', $post->getId()) as $arrayEntity)
-		{
-			$postId = intval($arrayEntity['post2id']);
-			if ($postId !== $post->getId())
-				$relatedPostIds[] = $postId;
-		}
+        foreach ($this->pdo->from('postRelations')->where('post1id', $post->getId()) as $arrayEntity)
+        {
+            $postId = intval($arrayEntity['post2id']);
+            if ($postId !== $post->getId())
+                $relatedPostIds[] = $postId;
+        }
 
-		foreach ($this->pdo->from('postRelations')->where('post2id', $post->getId()) as $arrayEntity)
-		{
-			$postId = intval($arrayEntity['post1id']);
-			if ($postId !== $post->getId())
-				$relatedPostIds[] = $postId;
-		}
+        foreach ($this->pdo->from('postRelations')->where('post2id', $post->getId()) as $arrayEntity)
+        {
+            $postId = intval($arrayEntity['post1id']);
+            if ($postId !== $post->getId())
+                $relatedPostIds[] = $postId;
+        }
 
-		return $this->findByIds($relatedPostIds);
-	}
+        return $this->findByIds($relatedPostIds);
+    }
 
-	private function syncContent(Post $post)
-	{
-		$targetPath = $post->getContentPath();
-		$content = $post->getContent();
-		if ($content)
-			$this->fileDao->save($targetPath, $content);
-		else
-			$this->fileDao->delete($targetPath, $content);
-		$this->thumbnailService->deleteUsedThumbnails($targetPath);
-	}
+    private function syncContent(Post $post)
+    {
+        $targetPath = $post->getContentPath();
+        $content = $post->getContent();
+        if ($content)
+            $this->fileDao->save($targetPath, $content);
+        else
+            $this->fileDao->delete($targetPath, $content);
+        $this->thumbnailService->deleteUsedThumbnails($targetPath);
+    }
 
-	private function syncThumbnailSourceContent(Post $post)
-	{
-		$targetPath = $post->getThumbnailSourceContentPath();
-		$content = $post->getThumbnailSourceContent();
-		if ($content)
-			$this->fileDao->save($targetPath, $content);
-		else
-			$this->fileDao->delete($targetPath);
-		$this->thumbnailService->deleteUsedThumbnails($targetPath);
-	}
+    private function syncThumbnailSourceContent(Post $post)
+    {
+        $targetPath = $post->getThumbnailSourceContentPath();
+        $content = $post->getThumbnailSourceContent();
+        if ($content)
+            $this->fileDao->save($targetPath, $content);
+        else
+            $this->fileDao->delete($targetPath);
+        $this->thumbnailService->deleteUsedThumbnails($targetPath);
+    }
 
-	private function syncTags(Post $post)
-	{
-		$tagIds = array_map(
-			function ($tag)
-			{
-				if (!$tag->getId())
-					throw new \RuntimeException('Unsaved entities found');
-				return $tag->getId();
-			},
-			$post->getTags());
+    private function syncTags(Post $post)
+    {
+        $tagIds = array_map(
+            function ($tag)
+            {
+                if (!$tag->getId())
+                    throw new \RuntimeException('Unsaved entities found');
+                return $tag->getId();
+            },
+            $post->getTags());
 
-		$existingTagRelationIds = array_map(
-			function ($arrayEntity)
-			{
-				return $arrayEntity['tagId'];
-			},
-			iterator_to_array($this->pdo->from('postTags')->where('postId', $post->getId())));
+        $existingTagRelationIds = array_map(
+            function ($arrayEntity)
+            {
+                return $arrayEntity['tagId'];
+            },
+            iterator_to_array($this->pdo->from('postTags')->where('postId', $post->getId())));
 
-		$tagRelationsToInsert = array_diff($tagIds, $existingTagRelationIds);
-		$tagRelationsToDelete = array_diff($existingTagRelationIds, $tagIds);
+        $tagRelationsToInsert = array_diff($tagIds, $existingTagRelationIds);
+        $tagRelationsToDelete = array_diff($existingTagRelationIds, $tagIds);
 
-		foreach ($tagRelationsToInsert as $tagId)
-		{
-			$this->pdo->insertInto('postTags')->values(['postId' => $post->getId(), 'tagId' => $tagId])->execute();
-		}
-		foreach ($tagRelationsToDelete as $tagId)
-		{
-			$this->pdo->deleteFrom('postTags')->where('postId', $post->getId())->where('tagId', $tagId)->execute();
-		}
-	}
+        foreach ($tagRelationsToInsert as $tagId)
+        {
+            $this->pdo->insertInto('postTags')->values(['postId' => $post->getId(), 'tagId' => $tagId])->execute();
+        }
+        foreach ($tagRelationsToDelete as $tagId)
+        {
+            $this->pdo->deleteFrom('postTags')->where('postId', $post->getId())->where('tagId', $tagId)->execute();
+        }
+    }
 
-	private function syncPostRelations(Post $post)
-	{
-		$relatedPostIds = array_filter(array_unique(array_map(
-			function ($post)
-			{
-				if (!$post->getId())
-					throw new \RuntimeException('Unsaved entities found');
-				return $post->getId();
-			},
-			$post->getRelatedPosts())));
+    private function syncPostRelations(Post $post)
+    {
+        $relatedPostIds = array_filter(array_unique(array_map(
+            function ($post)
+            {
+                if (!$post->getId())
+                    throw new \RuntimeException('Unsaved entities found');
+                return $post->getId();
+            },
+            $post->getRelatedPosts())));
 
-		$this->pdo->deleteFrom('postRelations')->where('post1id', $post->getId())->execute();
-		$this->pdo->deleteFrom('postRelations')->where('post2id', $post->getId())->execute();
-		foreach ($relatedPostIds as $postId)
-		{
-			$this->pdo
-				->insertInto('postRelations')
-				->values([
-					'post1id' => $post->getId(),
-					'post2id' => $postId])
-				->execute();
-		}
-	}
+        $this->pdo->deleteFrom('postRelations')->where('post1id', $post->getId())->execute();
+        $this->pdo->deleteFrom('postRelations')->where('post2id', $post->getId())->execute();
+        foreach ($relatedPostIds as $postId)
+        {
+            $this->pdo
+                ->insertInto('postRelations')
+                ->values([
+                    'post1id' => $post->getId(),
+                    'post2id' => $postId])
+                ->execute();
+        }
+    }
 }
diff --git a/src/Dao/PostNoteDao.php b/src/Dao/PostNoteDao.php
index 939fec90..8bfec398 100644
--- a/src/Dao/PostNoteDao.php
+++ b/src/Dao/PostNoteDao.php
@@ -8,32 +8,32 @@ use Szurubooru\Entities\PostNote;
 
 class PostNoteDao extends AbstractDao implements ICrudDao
 {
-	private $postDao;
+    private $postDao;
 
-	public function __construct(
-		DatabaseConnection $databaseConnection,
-		PostDao $postDao)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'postNotes',
-			new PostNoteEntityConverter());
+    public function __construct(
+        DatabaseConnection $databaseConnection,
+        PostDao $postDao)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'postNotes',
+            new PostNoteEntityConverter());
 
-		$this->postDao = $postDao;
-	}
+        $this->postDao = $postDao;
+    }
 
-	public function findByPostId($postId)
-	{
-		return $this->findBy('postId', $postId);
-	}
+    public function findByPostId($postId)
+    {
+        return $this->findBy('postId', $postId);
+    }
 
-	protected function afterLoad(Entity $postNote)
-	{
-		$postNote->setLazyLoader(
-			PostNote::LAZY_LOADER_POST,
-			function (PostNote $postNote)
-			{
-				return $this->postDao->findById($postNote->getPostId());
-			});
-	}
+    protected function afterLoad(Entity $postNote)
+    {
+        $postNote->setLazyLoader(
+            PostNote::LAZY_LOADER_POST,
+            function (PostNote $postNote)
+            {
+                return $this->postDao->findById($postNote->getPostId());
+            });
+    }
 }
diff --git a/src/Dao/PublicFileDao.php b/src/Dao/PublicFileDao.php
index 4987d7a0..570a0c4c 100644
--- a/src/Dao/PublicFileDao.php
+++ b/src/Dao/PublicFileDao.php
@@ -6,8 +6,8 @@ use Szurubooru\Dao\IFileDao;
 
 class PublicFileDao extends FileDao implements IFileDao
 {
-	public function __construct(Config $config)
-	{
-		parent::__construct($config->getPublicDataDirectory());
-	}
+    public function __construct(Config $config)
+    {
+        parent::__construct($config->getPublicDataDirectory());
+    }
 }
diff --git a/src/Dao/ScoreDao.php b/src/Dao/ScoreDao.php
index c4b89bb3..da53570b 100644
--- a/src/Dao/ScoreDao.php
+++ b/src/Dao/ScoreDao.php
@@ -11,70 +11,70 @@ use Szurubooru\Services\TimeService;
 
 class ScoreDao extends AbstractDao implements ICrudDao
 {
-	private $timeService;
+    private $timeService;
 
-	public function __construct(
-		DatabaseConnection $databaseConnection,
-		TimeService $timeService)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'scores',
-			new ScoreEntityConverter());
+    public function __construct(
+        DatabaseConnection $databaseConnection,
+        TimeService $timeService)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'scores',
+            new ScoreEntityConverter());
 
-		$this->timeService = $timeService;
-	}
+        $this->timeService = $timeService;
+    }
 
-	public function getScoreValue(Entity $entity)
-	{
-		$query = $this->getBaseQuery($entity);
-		$query->select(null);
-		$query->select('SUM(score) AS score');
-		return iterator_to_array($query)[0]['score'];
-	}
+    public function getScoreValue(Entity $entity)
+    {
+        $query = $this->getBaseQuery($entity);
+        $query->select(null);
+        $query->select('SUM(score) AS score');
+        return iterator_to_array($query)[0]['score'];
+    }
 
-	public function getUserScore(User $user, Entity $entity)
-	{
-		$query = $this->getBaseQuery($entity);
-		$query->where('userId', $user->getId());
+    public function getUserScore(User $user, Entity $entity)
+    {
+        $query = $this->getBaseQuery($entity);
+        $query->where('userId', $user->getId());
 
-		$arrayEntities = iterator_to_array($query);
-		$entities = $this->arrayToEntities($arrayEntities);
-		return array_shift($entities);
-	}
+        $arrayEntities = iterator_to_array($query);
+        $entities = $this->arrayToEntities($arrayEntities);
+        return array_shift($entities);
+    }
 
-	public function setUserScore(User $user, Entity $entity, $scoreValue)
-	{
-		$score = $this->getUserScore($user, $entity);
-		if (!$score)
-		{
-			$score = new Score();
-			$score->setTime($this->timeService->getCurrentTime());
-			$score->setUserId($user->getId());
+    public function setUserScore(User $user, Entity $entity, $scoreValue)
+    {
+        $score = $this->getUserScore($user, $entity);
+        if (!$score)
+        {
+            $score = new Score();
+            $score->setTime($this->timeService->getCurrentTime());
+            $score->setUserId($user->getId());
 
-			if ($entity instanceof Post)
-				$score->setPostId($entity->getId());
-			elseif ($entity instanceof Comment)
-				$score->setCommentId($entity->getId());
-			else
-				throw new \InvalidArgumentException();
-		}
-		$score->setScore($scoreValue);
-		$this->save($score);
-		return $score;
-	}
+            if ($entity instanceof Post)
+                $score->setPostId($entity->getId());
+            elseif ($entity instanceof Comment)
+                $score->setCommentId($entity->getId());
+            else
+                throw new \InvalidArgumentException();
+        }
+        $score->setScore($scoreValue);
+        $this->save($score);
+        return $score;
+    }
 
-	private function getBaseQuery($entity)
-	{
-		$query = $this->pdo->from($this->tableName);
+    private function getBaseQuery($entity)
+    {
+        $query = $this->pdo->from($this->tableName);
 
-		if ($entity instanceof Post)
-			$query->where('postId', $entity->getId());
-		elseif ($entity instanceof Comment)
-			$query->where('commentId', $entity->getId());
-		else
-			throw new \InvalidArgumentException();
+        if ($entity instanceof Post)
+            $query->where('postId', $entity->getId());
+        elseif ($entity instanceof Comment)
+            $query->where('commentId', $entity->getId());
+        else
+            throw new \InvalidArgumentException();
 
-		return $query;
-	}
+        return $query;
+    }
 }
diff --git a/src/Dao/SnapshotDao.php b/src/Dao/SnapshotDao.php
index 7f41293a..290d2578 100644
--- a/src/Dao/SnapshotDao.php
+++ b/src/Dao/SnapshotDao.php
@@ -8,47 +8,47 @@ use Szurubooru\Entities\Snapshot;
 
 class SnapshotDao extends AbstractDao
 {
-	private $userDao;
+    private $userDao;
 
-	public function __construct(
-		DatabaseConnection $databaseConnection,
-		UserDao $userDao)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'snapshots',
-			new SnapshotEntityConverter());
+    public function __construct(
+        DatabaseConnection $databaseConnection,
+        UserDao $userDao)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'snapshots',
+            new SnapshotEntityConverter());
 
-		$this->userDao = $userDao;
-	}
+        $this->userDao = $userDao;
+    }
 
-	public function findEarlierSnapshots(Snapshot $snapshot)
-	{
-		$query = $this->pdo
-			->from($this->tableName)
-			->where('type', $snapshot->getType())
-			->where('primaryKey', $snapshot->getPrimaryKey())
-			->orderBy('time DESC');
+    public function findEarlierSnapshots(Snapshot $snapshot)
+    {
+        $query = $this->pdo
+            ->from($this->tableName)
+            ->where('type', $snapshot->getType())
+            ->where('primaryKey', $snapshot->getPrimaryKey())
+            ->orderBy('time DESC');
 
-		if ($snapshot->getId())
-			$query->where('id < ?', $snapshot->getId());
+        if ($snapshot->getId())
+            $query->where('id < ?', $snapshot->getId());
 
-		return $this->arrayToEntities(iterator_to_array($query));
-	}
+        return $this->arrayToEntities(iterator_to_array($query));
+    }
 
-	public function afterLoad(Entity $snapshot)
-	{
-		$snapshot->setLazyLoader(
-			Snapshot::LAZY_LOADER_USER,
-			function (Snapshot $snapshot)
-			{
-				return $this->getUser($snapshot);
-			});
-	}
+    public function afterLoad(Entity $snapshot)
+    {
+        $snapshot->setLazyLoader(
+            Snapshot::LAZY_LOADER_USER,
+            function (Snapshot $snapshot)
+            {
+                return $this->getUser($snapshot);
+            });
+    }
 
-	private function getUser(Snapshot $snapshot)
-	{
-		$userId = $snapshot->getUserId();
-		return $this->userDao->findById($userId);
-	}
+    private function getUser(Snapshot $snapshot)
+    {
+        $userId = $snapshot->getUserId();
+        return $this->userDao->findById($userId);
+    }
 }
diff --git a/src/Dao/TagDao.php b/src/Dao/TagDao.php
index 9d723aaa..5c0f77d5 100644
--- a/src/Dao/TagDao.php
+++ b/src/Dao/TagDao.php
@@ -10,213 +10,213 @@ use Szurubooru\Search\Requirements\Requirement;
 
 class TagDao extends AbstractDao implements ICrudDao
 {
-	const TAG_RELATION_IMPLICATION = 1;
-	const TAG_RELATION_SUGGESTION = 2;
+    const TAG_RELATION_IMPLICATION = 1;
+    const TAG_RELATION_SUGGESTION = 2;
 
-	public function __construct(DatabaseConnection $databaseConnection)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'tags',
-			new TagEntityConverter());
-	}
+    public function __construct(DatabaseConnection $databaseConnection)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'tags',
+            new TagEntityConverter());
+    }
 
-	public function findByName($tagName)
-	{
-		return $this->findOneBy('name', $tagName);
-	}
+    public function findByName($tagName)
+    {
+        return $this->findOneBy('name', $tagName);
+    }
 
-	public function findByNames($tagNames)
-	{
-		return $this->findBy('name', $tagNames);
-	}
+    public function findByNames($tagNames)
+    {
+        return $this->findBy('name', $tagNames);
+    }
 
-	public function findByPostId($postId)
-	{
-		return $this->findByPostIds([$postId]);
-	}
+    public function findByPostId($postId)
+    {
+        return $this->findByPostIds([$postId]);
+    }
 
-	public function findByPostIds($postIds)
-	{
-		$query = $this->pdo->from($this->tableName)
-			->innerJoin('postTags', 'postTags.tagId = tags.id')
-			->where('postTags.postId', $postIds);
-		$arrayEntities = iterator_to_array($query);
-		return $this->arrayToEntities($arrayEntities);
-	}
+    public function findByPostIds($postIds)
+    {
+        $query = $this->pdo->from($this->tableName)
+            ->innerJoin('postTags', 'postTags.tagId = tags.id')
+            ->where('postTags.postId', $postIds);
+        $arrayEntities = iterator_to_array($query);
+        return $this->arrayToEntities($arrayEntities);
+    }
 
-	public function findSiblings($tagName)
-	{
-		$tag = $this->findByName($tagName);
-		if (!$tag)
-			return [];
-		$tagId = $tag->getId();
-		$query = $this->pdo->from($this->tableName)
-			->select('COUNT(pt2.postId) AS postCount')
-			->innerJoin('postTags pt1', 'pt1.tagId = tags.id')
-			->innerJoin('postTags pt2', 'pt2.postId = pt1.postId')
-			->where('pt2.tagId', $tagId)
-			->groupBy('tags.id')
-			->orderBy('postCount DESC, name ASC');
+    public function findSiblings($tagName)
+    {
+        $tag = $this->findByName($tagName);
+        if (!$tag)
+            return [];
+        $tagId = $tag->getId();
+        $query = $this->pdo->from($this->tableName)
+            ->select('COUNT(pt2.postId) AS postCount')
+            ->innerJoin('postTags pt1', 'pt1.tagId = tags.id')
+            ->innerJoin('postTags pt2', 'pt2.postId = pt1.postId')
+            ->where('pt2.tagId', $tagId)
+            ->groupBy('tags.id')
+            ->orderBy('postCount DESC, name ASC');
 
-		$arrayEntities = array_filter(
-			iterator_to_array($query),
-			function($arrayEntity) use ($tagName)
-			{
-				return strcasecmp($arrayEntity['name'], $tagName) !== 0;
-			});
+        $arrayEntities = array_filter(
+            iterator_to_array($query),
+            function($arrayEntity) use ($tagName)
+            {
+                return strcasecmp($arrayEntity['name'], $tagName) !== 0;
+            });
 
-		return $this->arrayToEntities($arrayEntities);
-	}
+        return $this->arrayToEntities($arrayEntities);
+    }
 
-	public function export()
-	{
-		$exported = [];
-		foreach ($this->pdo->from($this->tableName) as $arrayEntity)
-		{
-			$exported[$arrayEntity['id']] = [
-				'name' => $arrayEntity['name'],
-				'usages' => intval($arrayEntity['usages']),
-				'banned' => boolval($arrayEntity['banned'])
-			];
-		}
+    public function export()
+    {
+        $exported = [];
+        foreach ($this->pdo->from($this->tableName) as $arrayEntity)
+        {
+            $exported[$arrayEntity['id']] = [
+                'name' => $arrayEntity['name'],
+                'usages' => intval($arrayEntity['usages']),
+                'banned' => boolval($arrayEntity['banned'])
+            ];
+        }
 
-		//upgrades on old databases
-		try
-		{
-			$relations = iterator_to_array($this->pdo->from('tagRelations'));
-		}
-		catch (\Exception $e)
-		{
-			$relations = [];
-		}
+        //upgrades on old databases
+        try
+        {
+            $relations = iterator_to_array($this->pdo->from('tagRelations'));
+        }
+        catch (\Exception $e)
+        {
+            $relations = [];
+        }
 
-		foreach ($relations as $arrayEntity)
-		{
-			$key1 = $arrayEntity['tag1id'];
-			$key2 = $arrayEntity['tag2id'];
-			$type = intval($arrayEntity['type']);
-			if ($type === self::TAG_RELATION_IMPLICATION)
-				$target = 'implications';
-			elseif ($type === self::TAG_RELATION_SUGGESTION)
-				$target = 'suggestions';
-			else
-				continue;
+        foreach ($relations as $arrayEntity)
+        {
+            $key1 = $arrayEntity['tag1id'];
+            $key2 = $arrayEntity['tag2id'];
+            $type = intval($arrayEntity['type']);
+            if ($type === self::TAG_RELATION_IMPLICATION)
+                $target = 'implications';
+            elseif ($type === self::TAG_RELATION_SUGGESTION)
+                $target = 'suggestions';
+            else
+                continue;
 
-			if (!isset($exported[$key1]) || !isset($exported[$key2]))
-				continue;
+            if (!isset($exported[$key1]) || !isset($exported[$key2]))
+                continue;
 
-			if (!isset($exported[$key1][$target]))
-				$exported[$key1][$target] = [];
+            if (!isset($exported[$key1][$target]))
+                $exported[$key1][$target] = [];
 
-			$exported[$key1][$target][] = $exported[$key2]['name'];
-		}
+            $exported[$key1][$target][] = $exported[$key2]['name'];
+        }
 
-		return array_values($exported);
-	}
+        return array_values($exported);
+    }
 
-	protected function afterLoad(Entity $tag)
-	{
-		$tag->setLazyLoader(
-			Tag::LAZY_LOADER_IMPLIED_TAGS,
-			function (Tag $tag)
-			{
-				return $this->findImpliedTags($tag);
-			});
+    protected function afterLoad(Entity $tag)
+    {
+        $tag->setLazyLoader(
+            Tag::LAZY_LOADER_IMPLIED_TAGS,
+            function (Tag $tag)
+            {
+                return $this->findImpliedTags($tag);
+            });
 
-		$tag->setLazyLoader(
-			Tag::LAZY_LOADER_SUGGESTED_TAGS,
-			function (Tag $tag)
-			{
-				return $this->findSuggested($tag);
-			});
-	}
+        $tag->setLazyLoader(
+            Tag::LAZY_LOADER_SUGGESTED_TAGS,
+            function (Tag $tag)
+            {
+                return $this->findSuggested($tag);
+            });
+    }
 
-	protected function afterSave(Entity $tag)
-	{
-		$this->syncImpliedTags($tag);
-		$this->syncSuggestedTags($tag);
-	}
+    protected function afterSave(Entity $tag)
+    {
+        $this->syncImpliedTags($tag);
+        $this->syncSuggestedTags($tag);
+    }
 
-	protected function decorateQueryFromRequirement($query, Requirement $requirement)
-	{
-		if ($requirement->getType() === TagFilter::REQUIREMENT_PARTIAL_TAG_NAME)
-		{
-			$sql = 'INSTR(LOWER(tags.name), LOWER(?)) > 0';
+    protected function decorateQueryFromRequirement($query, Requirement $requirement)
+    {
+        if ($requirement->getType() === TagFilter::REQUIREMENT_PARTIAL_TAG_NAME)
+        {
+            $sql = 'INSTR(LOWER(tags.name), LOWER(?)) > 0';
 
-			if ($requirement->isNegated())
-				$sql = 'NOT ' . $sql;
+            if ($requirement->isNegated())
+                $sql = 'NOT ' . $sql;
 
-			$query->where($sql, $requirement->getValue()->getValue());
-			return;
-		}
+            $query->where($sql, $requirement->getValue()->getValue());
+            return;
+        }
 
-		elseif ($requirement->getType() === TagFilter::REQUIREMENT_CATEGORY)
-		{
-			$sql = 'IFNULL(category, \'default\')';
-			$requirement->setType($sql);
-			return parent::decorateQueryFromRequirement($query, $requirement);
-		}
+        elseif ($requirement->getType() === TagFilter::REQUIREMENT_CATEGORY)
+        {
+            $sql = 'IFNULL(category, \'default\')';
+            $requirement->setType($sql);
+            return parent::decorateQueryFromRequirement($query, $requirement);
+        }
 
-		parent::decorateQueryFromRequirement($query, $requirement);
-	}
+        parent::decorateQueryFromRequirement($query, $requirement);
+    }
 
-	private function findImpliedTags(Tag $tag)
-	{
-		return $this->findRelatedTagsByType($tag, self::TAG_RELATION_IMPLICATION);
-	}
+    private function findImpliedTags(Tag $tag)
+    {
+        return $this->findRelatedTagsByType($tag, self::TAG_RELATION_IMPLICATION);
+    }
 
-	private function findSuggested(Tag $tag)
-	{
-		return $this->findRelatedTagsByType($tag, self::TAG_RELATION_SUGGESTION);
-	}
+    private function findSuggested(Tag $tag)
+    {
+        return $this->findRelatedTagsByType($tag, self::TAG_RELATION_SUGGESTION);
+    }
 
-	private function syncImpliedTags($tag)
-	{
-		$this->syncRelatedTagsByType($tag, $tag->getImpliedTags(), self::TAG_RELATION_IMPLICATION);
-	}
+    private function syncImpliedTags($tag)
+    {
+        $this->syncRelatedTagsByType($tag, $tag->getImpliedTags(), self::TAG_RELATION_IMPLICATION);
+    }
 
-	private function syncSuggestedTags($tag)
-	{
-		$this->syncRelatedTagsByType($tag, $tag->getSuggestedTags(), self::TAG_RELATION_SUGGESTION);
-	}
+    private function syncSuggestedTags($tag)
+    {
+        $this->syncRelatedTagsByType($tag, $tag->getSuggestedTags(), self::TAG_RELATION_SUGGESTION);
+    }
 
-	private function syncRelatedTagsByType(Tag $tag, array $relatedTags, $type)
-	{
-		$relatedTagIds = array_filter(array_unique(array_map(
-			function ($tag)
-			{
-				if (!$tag->getId())
-					throw new \RuntimeException('Unsaved entities found');
-				return $tag->getId();
-			},
-			$relatedTags)));
+    private function syncRelatedTagsByType(Tag $tag, array $relatedTags, $type)
+    {
+        $relatedTagIds = array_filter(array_unique(array_map(
+            function ($tag)
+            {
+                if (!$tag->getId())
+                    throw new \RuntimeException('Unsaved entities found');
+                return $tag->getId();
+            },
+            $relatedTags)));
 
-		$this->pdo->deleteFrom('tagRelations')
-			->where('tag1id', $tag->getId())
-			->where('type', $type)
-			->execute();
+        $this->pdo->deleteFrom('tagRelations')
+            ->where('tag1id', $tag->getId())
+            ->where('type', $type)
+            ->execute();
 
-		foreach ($relatedTagIds as $tagId)
-		{
-			$this->pdo
-				->insertInto('tagRelations')
-				->values([
-					'tag1id' => $tag->getId(),
-					'tag2id' => $tagId,
-					'type' => $type])
-				->execute();
-		}
-	}
+        foreach ($relatedTagIds as $tagId)
+        {
+            $this->pdo
+                ->insertInto('tagRelations')
+                ->values([
+                    'tag1id' => $tag->getId(),
+                    'tag2id' => $tagId,
+                    'type' => $type])
+                ->execute();
+        }
+    }
 
-	private function findRelatedTagsByType(Tag $tag, $type)
-	{
-		$tagId = $tag->getId();
-		$query = $this->pdo->from($this->tableName)
-			->innerJoin('tagRelations tr', 'tags.id = tr.tag2id')
-			->where('tr.type', $type)
-			->where('tr.tag1id', $tagId);
-		$arrayEntities = iterator_to_array($query);
-		return $this->arrayToEntities($arrayEntities);
-	}
+    private function findRelatedTagsByType(Tag $tag, $type)
+    {
+        $tagId = $tag->getId();
+        $query = $this->pdo->from($this->tableName)
+            ->innerJoin('tagRelations tr', 'tags.id = tr.tag2id')
+            ->where('tr.type', $type)
+            ->where('tr.tag1id', $tagId);
+        $arrayEntities = iterator_to_array($query);
+        return $this->arrayToEntities($arrayEntities);
+    }
 }
diff --git a/src/Dao/TokenDao.php b/src/Dao/TokenDao.php
index 07130d8c..40525bf2 100644
--- a/src/Dao/TokenDao.php
+++ b/src/Dao/TokenDao.php
@@ -5,39 +5,39 @@ use Szurubooru\DatabaseConnection;
 
 class TokenDao extends AbstractDao
 {
-	public function __construct(DatabaseConnection $databaseConnection)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'tokens',
-			new TokenEntityConverter());
-	}
+    public function __construct(DatabaseConnection $databaseConnection)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'tokens',
+            new TokenEntityConverter());
+    }
 
-	public function findByName($tokenName)
-	{
-		return $this->findOneBy('name', $tokenName);
-	}
+    public function findByName($tokenName)
+    {
+        return $this->findOneBy('name', $tokenName);
+    }
 
-	public function findByAdditionalDataAndPurpose($additionalData, $purpose)
-	{
-		$query = $this->pdo->from($this->tableName)
-			->where('additionalData', $additionalData)
-			->where('purpose', $purpose);
-		$arrayEntities = iterator_to_array($query);
-		$entities = $this->arrayToEntities($arrayEntities);
-		if (!$entities || !count($entities))
-			return null;
-		$entity = array_shift($entities);
-		return $entity;
-	}
+    public function findByAdditionalDataAndPurpose($additionalData, $purpose)
+    {
+        $query = $this->pdo->from($this->tableName)
+            ->where('additionalData', $additionalData)
+            ->where('purpose', $purpose);
+        $arrayEntities = iterator_to_array($query);
+        $entities = $this->arrayToEntities($arrayEntities);
+        if (!$entities || !count($entities))
+            return null;
+        $entity = array_shift($entities);
+        return $entity;
+    }
 
-	public function deleteByName($tokenName)
-	{
-		return $this->deleteBy('name', $tokenName);
-	}
+    public function deleteByName($tokenName)
+    {
+        return $this->deleteBy('name', $tokenName);
+    }
 
-	public function deleteByAdditionalData($additionalData)
-	{
-		return $this->deleteBy('additionalData', $additionalData);
-	}
+    public function deleteByAdditionalData($additionalData)
+    {
+        return $this->deleteBy('additionalData', $additionalData);
+    }
 }
diff --git a/src/Dao/TransactionManager.php b/src/Dao/TransactionManager.php
index 1701f967..82799d32 100644
--- a/src/Dao/TransactionManager.php
+++ b/src/Dao/TransactionManager.php
@@ -4,40 +4,40 @@ use Szurubooru\DatabaseConnection;
 
 class TransactionManager
 {
-	private $databaseConnection;
+    private $databaseConnection;
 
-	public function __construct(DatabaseConnection $databaseConnection)
-	{
-		$this->databaseConnection = $databaseConnection;
-	}
+    public function __construct(DatabaseConnection $databaseConnection)
+    {
+        $this->databaseConnection = $databaseConnection;
+    }
 
-	public function commit($callback)
-	{
-		return $this->doInTransaction($callback, 'commit');
-	}
+    public function commit($callback)
+    {
+        return $this->doInTransaction($callback, 'commit');
+    }
 
-	public function rollback($callback)
-	{
-		return $this->doInTransaction($callback, 'rollBack');
-	}
+    public function rollback($callback)
+    {
+        return $this->doInTransaction($callback, 'rollBack');
+    }
 
-	public function doInTransaction($callback, $operation)
-	{
-		$pdo = $this->databaseConnection->getPDO();
-		if ($pdo->inTransaction())
-			return $callback();
+    public function doInTransaction($callback, $operation)
+    {
+        $pdo = $this->databaseConnection->getPDO();
+        if ($pdo->inTransaction())
+            return $callback();
 
-		$pdo->beginTransaction();
-		try
-		{
-			$ret = $callback();
-			$pdo->$operation();
-			return $ret;
-		}
-		catch (\Exception $e)
-		{
-			$pdo->rollBack();
-			throw $e;
-		}
-	}
+        $pdo->beginTransaction();
+        try
+        {
+            $ret = $callback();
+            $pdo->$operation();
+            return $ret;
+        }
+        catch (\Exception $e)
+        {
+            $pdo->rollBack();
+            throw $e;
+        }
+    }
 }
diff --git a/src/Dao/UserDao.php b/src/Dao/UserDao.php
index e5bd78b3..7313c386 100644
--- a/src/Dao/UserDao.php
+++ b/src/Dao/UserDao.php
@@ -9,78 +9,78 @@ use Szurubooru\Services\ThumbnailService;
 
 class UserDao extends AbstractDao implements ICrudDao
 {
-	const ORDER_NAME = 'name';
-	const ORDER_REGISTRATION_TIME = 'registrationTime';
+    const ORDER_NAME = 'name';
+    const ORDER_REGISTRATION_TIME = 'registrationTime';
 
-	private $fileDao;
-	private $thumbnailService;
+    private $fileDao;
+    private $thumbnailService;
 
-	public function __construct(
-		DatabaseConnection $databaseConnection,
-		PublicFileDao $fileDao,
-		ThumbnailService $thumbnailService)
-	{
-		parent::__construct(
-			$databaseConnection,
-			'users',
-			new UserEntityConverter());
+    public function __construct(
+        DatabaseConnection $databaseConnection,
+        PublicFileDao $fileDao,
+        ThumbnailService $thumbnailService)
+    {
+        parent::__construct(
+            $databaseConnection,
+            'users',
+            new UserEntityConverter());
 
-		$this->fileDao = $fileDao;
-		$this->thumbnailService = $thumbnailService;
-	}
+        $this->fileDao = $fileDao;
+        $this->thumbnailService = $thumbnailService;
+    }
 
-	public function findByName($userName)
-	{
-		return $this->findOneBy('name', $userName);
-	}
+    public function findByName($userName)
+    {
+        return $this->findOneBy('name', $userName);
+    }
 
-	public function findByEmail($userEmail, $allowUnconfirmed = false)
-	{
-		$result = $this->findOneBy('email', $userEmail);
-		if (!$result && $allowUnconfirmed)
-		{
-			$result = $this->findOneBy('emailUnconfirmed', $userEmail);
-		}
-		return $result;
-	}
+    public function findByEmail($userEmail, $allowUnconfirmed = false)
+    {
+        $result = $this->findOneBy('email', $userEmail);
+        if (!$result && $allowUnconfirmed)
+        {
+            $result = $this->findOneBy('emailUnconfirmed', $userEmail);
+        }
+        return $result;
+    }
 
-	public function hasAnyUsers()
-	{
-		return $this->hasAnyRecords();
-	}
+    public function hasAnyUsers()
+    {
+        return $this->hasAnyRecords();
+    }
 
-	public function deleteByName($userName)
-	{
-		$this->deleteBy('name', $userName);
-		$this->pdo->deleteFrom('tokens')->where('additionalData', $userName);
-	}
+    public function deleteByName($userName)
+    {
+        $this->deleteBy('name', $userName);
+        $this->pdo->deleteFrom('tokens')->where('additionalData', $userName);
+    }
 
-	protected function afterLoad(Entity $user)
-	{
-		$user->setLazyLoader(
-			User::LAZY_LOADER_CUSTOM_AVATAR_SOURCE_CONTENT,
-			function(User $user)
-			{
-				$avatarSource = $user->getCustomAvatarSourceContentPath();
-				return $this->fileDao->load($avatarSource);
-			});
-	}
+    protected function afterLoad(Entity $user)
+    {
+        $user->setLazyLoader(
+            User::LAZY_LOADER_CUSTOM_AVATAR_SOURCE_CONTENT,
+            function(User $user)
+            {
+                $avatarSource = $user->getCustomAvatarSourceContentPath();
+                return $this->fileDao->load($avatarSource);
+            });
+    }
 
-	protected function afterSave(Entity $user)
-	{
-		$targetPath = $user->getCustomAvatarSourceContentPath();
-		$content = $user->getCustomAvatarSourceContent();
-		if ($content)
-			$this->fileDao->save($targetPath, $content);
-		else
-			$this->fileDao->delete($targetPath);
-		$this->thumbnailService->deleteUsedThumbnails($targetPath);
-	}
+    protected function afterSave(Entity $user)
+    {
+        $targetPath = $user->getCustomAvatarSourceContentPath();
+        $content = $user->getCustomAvatarSourceContent();
+        if ($content)
+            $this->fileDao->save($targetPath, $content);
+        else
+            $this->fileDao->delete($targetPath);
+        $this->thumbnailService->deleteUsedThumbnails($targetPath);
+    }
 
-	protected function afterDelete(Entity $user)
-	{
-		$avatarSource = $user->getCustomAvatarSourceContentPath();
-		$this->fileDao->delete($avatarSource);
-		$this->thumbnailService->deleteUsedThumbnails($avatarSource);
-	}
+    protected function afterDelete(Entity $user)
+    {
+        $avatarSource = $user->getCustomAvatarSourceContentPath();
+        $this->fileDao->delete($avatarSource);
+        $this->thumbnailService->deleteUsedThumbnails($avatarSource);
+    }
 }
diff --git a/src/DatabaseConnection.php b/src/DatabaseConnection.php
index 2f84e57b..d45514fb 100644
--- a/src/DatabaseConnection.php
+++ b/src/DatabaseConnection.php
@@ -5,45 +5,45 @@ use Szurubooru\PDOEx\PDOEx;
 
 class DatabaseConnection
 {
-	private $pdo;
-	private $config;
+    private $pdo;
+    private $config;
 
-	public function __construct(Config $config)
-	{
-		$this->config = $config;
-	}
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
 
-	public function getPDO()
-	{
-		if (!$this->pdo)
-		{
-			$this->createPDO();
-		}
-		return $this->pdo;
-	}
+    public function getPDO()
+    {
+        if (!$this->pdo)
+        {
+            $this->createPDO();
+        }
+        return $this->pdo;
+    }
 
-	public function getDriver()
-	{
-		return $this->getPDO()->getAttribute(\PDO::ATTR_DRIVER_NAME);
-	}
+    public function getDriver()
+    {
+        return $this->getPDO()->getAttribute(\PDO::ATTR_DRIVER_NAME);
+    }
 
-	public function close()
-	{
-		$this->pdo = null;
-	}
+    public function close()
+    {
+        $this->pdo = null;
+    }
 
-	private function createPDO()
-	{
-		$cwd = getcwd();
-		if ($this->config->getDataDirectory())
-			chdir($this->config->getDataDirectory());
+    private function createPDO()
+    {
+        $cwd = getcwd();
+        if ($this->config->getDataDirectory())
+            chdir($this->config->getDataDirectory());
 
-		$this->pdo = new PDOEx(
-			$this->config->database->dsn,
-			$this->config->database->user,
-			$this->config->database->password);
+        $this->pdo = new PDOEx(
+            $this->config->database->dsn,
+            $this->config->database->user,
+            $this->config->database->password);
 
-		$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-		chdir($cwd);
-	}
+        $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+        chdir($cwd);
+    }
 }
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index fb70a1ef..1b374d8e 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -10,78 +10,78 @@ use Szurubooru\Services\TokenService;
 
 final class Dispatcher
 {
-	private $router;
-	private $config;
-	private $databaseConnection;
-	private $authService;
-	private $tokenService;
+    private $router;
+    private $config;
+    private $databaseConnection;
+    private $authService;
+    private $tokenService;
 
-	public function __construct(
-		Router $router,
-		Config $config,
-		DatabaseConnection $databaseConnection,
-		HttpHelper $httpHelper,
-		AuthService $authService,
-		TokenService $tokenService,
-		RouteRepository $routeRepository)
-	{
-		$this->router = $router;
-		$this->config = $config;
-		$this->databaseConnection = $databaseConnection;
-		$this->httpHelper = $httpHelper;
-		$this->authService = $authService;
-		$this->tokenService = $tokenService;
+    public function __construct(
+        Router $router,
+        Config $config,
+        DatabaseConnection $databaseConnection,
+        HttpHelper $httpHelper,
+        AuthService $authService,
+        TokenService $tokenService,
+        RouteRepository $routeRepository)
+    {
+        $this->router = $router;
+        $this->config = $config;
+        $this->databaseConnection = $databaseConnection;
+        $this->httpHelper = $httpHelper;
+        $this->authService = $authService;
+        $this->tokenService = $tokenService;
 
-		//if script fails prematurely, mark it as fail from advance
-		$this->httpHelper->setResponseCode(500);
+        //if script fails prematurely, mark it as fail from advance
+        $this->httpHelper->setResponseCode(500);
 
-		$routeRepository->injectRoutes($router);
-	}
+        $routeRepository->injectRoutes($router);
+    }
 
-	public function run($requestMethod, $requestUri)
-	{
-		try
-		{
-			$code = 200;
-			$this->authorizeFromRequestHeader();
-			$json = (array) $this->router->handle($requestMethod, $requestUri);
-		}
-		catch (\Exception $e)
-		{
-			$code = 400;
-			$trace = $e->getTrace();
-			foreach ($trace as &$item)
-				unset($item['args']);
-			$json = [
-				'error' => $e->getMessage(),
-				'trace' => $trace,
-			];
-		}
-		$end = microtime(true);
-		$json['__time'] = $end - Bootstrap::getStartTime();
-		if ($this->config->misc->dumpSqlIntoQueries)
-		{
-			$json['__queries'] = $this->databaseConnection->getPDO()->getQueryCount();
-			$json['__statements'] = $this->databaseConnection->getPDO()->getStatements();
-		}
+    public function run($requestMethod, $requestUri)
+    {
+        try
+        {
+            $code = 200;
+            $this->authorizeFromRequestHeader();
+            $json = (array) $this->router->handle($requestMethod, $requestUri);
+        }
+        catch (\Exception $e)
+        {
+            $code = 400;
+            $trace = $e->getTrace();
+            foreach ($trace as &$item)
+                unset($item['args']);
+            $json = [
+                'error' => $e->getMessage(),
+                'trace' => $trace,
+            ];
+        }
+        $end = microtime(true);
+        $json['__time'] = $end - Bootstrap::getStartTime();
+        if ($this->config->misc->dumpSqlIntoQueries)
+        {
+            $json['__queries'] = $this->databaseConnection->getPDO()->getQueryCount();
+            $json['__statements'] = $this->databaseConnection->getPDO()->getStatements();
+        }
 
-		if (!$this->httpHelper->isRedirecting())
-		{
-			$this->httpHelper->setResponseCode($code);
-			$this->httpHelper->setHeader('Content-Type', 'application/json');
-			$this->httpHelper->outputJSON($json);
-		}
+        if (!$this->httpHelper->isRedirecting())
+        {
+            $this->httpHelper->setResponseCode($code);
+            $this->httpHelper->setHeader('Content-Type', 'application/json');
+            $this->httpHelper->outputJSON($json);
+        }
 
-		return $json;
-	}
+        return $json;
+    }
 
-	private function authorizeFromRequestHeader()
-	{
-		$loginTokenName = $this->httpHelper->getRequestHeader('X-Authorization-Token');
-		if ($loginTokenName)
-		{
-			$token = $this->tokenService->getByName($loginTokenName);
-			$this->authService->loginFromToken($token);
-		}
-	}
+    private function authorizeFromRequestHeader()
+    {
+        $loginTokenName = $this->httpHelper->getRequestHeader('X-Authorization-Token');
+        if ($loginTokenName)
+        {
+            $token = $this->tokenService->getByName($loginTokenName);
+            $this->authService->loginFromToken($token);
+        }
+    }
 }
diff --git a/src/Entities/Comment.php b/src/Entities/Comment.php
index 153026c9..ed75ff9a 100644
--- a/src/Entities/Comment.php
+++ b/src/Entities/Comment.php
@@ -5,91 +5,91 @@ use Szurubooru\Entities\User;
 
 final class Comment extends Entity
 {
-	private $postId;
-	private $userId;
-	private $creationTime;
-	private $lastEditTime;
-	private $text;
+    private $postId;
+    private $userId;
+    private $creationTime;
+    private $lastEditTime;
+    private $text;
 
-	const LAZY_LOADER_USER = 'user';
-	const LAZY_LOADER_POST = 'post';
+    const LAZY_LOADER_USER = 'user';
+    const LAZY_LOADER_POST = 'post';
 
-	const META_SCORE = 'score';
+    const META_SCORE = 'score';
 
-	public function getUserId()
-	{
-		return $this->userId;
-	}
+    public function getUserId()
+    {
+        return $this->userId;
+    }
 
-	public function setUserId($userId)
-	{
-		$this->userId = $userId;
-	}
+    public function setUserId($userId)
+    {
+        $this->userId = $userId;
+    }
 
-	public function getPostId()
-	{
-		return $this->postId;
-	}
+    public function getPostId()
+    {
+        return $this->postId;
+    }
 
-	public function setPostId($postId)
-	{
-		$this->postId = $postId;
-	}
+    public function setPostId($postId)
+    {
+        $this->postId = $postId;
+    }
 
-	public function getCreationTime()
-	{
-		return $this->creationTime;
-	}
+    public function getCreationTime()
+    {
+        return $this->creationTime;
+    }
 
-	public function setCreationTime($creationTime)
-	{
-		$this->creationTime = $creationTime;
-	}
+    public function setCreationTime($creationTime)
+    {
+        $this->creationTime = $creationTime;
+    }
 
-	public function getLastEditTime()
-	{
-		return $this->lastEditTime;
-	}
+    public function getLastEditTime()
+    {
+        return $this->lastEditTime;
+    }
 
-	public function setLastEditTime($lastEditTime)
-	{
-		$this->lastEditTime = $lastEditTime;
-	}
+    public function setLastEditTime($lastEditTime)
+    {
+        $this->lastEditTime = $lastEditTime;
+    }
 
-	public function getText()
-	{
-		return $this->text;
-	}
+    public function getText()
+    {
+        return $this->text;
+    }
 
-	public function setText($text)
-	{
-		$this->text = $text;
-	}
+    public function setText($text)
+    {
+        $this->text = $text;
+    }
 
-	public function getUser()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_USER, null);
-	}
+    public function getUser()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_USER, null);
+    }
 
-	public function setUser(User $user = null)
-	{
-		$this->lazySave(self::LAZY_LOADER_USER, $user);
-		$this->userId = $user ? $user->getId() : null;
-	}
+    public function setUser(User $user = null)
+    {
+        $this->lazySave(self::LAZY_LOADER_USER, $user);
+        $this->userId = $user ? $user->getId() : null;
+    }
 
-	public function getPost()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_POST, null);
-	}
+    public function getPost()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_POST, null);
+    }
 
-	public function setPost(Post $post)
-	{
-		$this->lazySave(self::LAZY_LOADER_POST, $post);
-		$this->postId = $post->getId();
-	}
+    public function setPost(Post $post)
+    {
+        $this->lazySave(self::LAZY_LOADER_POST, $post);
+        $this->postId = $post->getId();
+    }
 
-	public function getScore()
-	{
-		return $this->getMeta(self::META_SCORE, 0);
-	}
+    public function getScore()
+    {
+        return $this->getMeta(self::META_SCORE, 0);
+    }
 }
diff --git a/src/Entities/Entity.php b/src/Entities/Entity.php
index 5d6116f9..44836504 100644
--- a/src/Entities/Entity.php
+++ b/src/Entities/Entity.php
@@ -3,74 +3,74 @@ namespace Szurubooru\Entities;
 
 abstract class Entity
 {
-	protected $id = null;
-	private $lazyLoaders = [];
-	private $lazyContainers = [];
-	private $meta;
+    protected $id = null;
+    private $lazyLoaders = [];
+    private $lazyContainers = [];
+    private $meta;
 
-	public function __construct($id = null)
-	{
-		$this->id = $id === null ? null : intval($id);
-	}
+    public function __construct($id = null)
+    {
+        $this->id = $id === null ? null : intval($id);
+    }
 
-	public function getId()
-	{
-		return $this->id;
-	}
+    public function getId()
+    {
+        return $this->id;
+    }
 
-	public function setId($id)
-	{
-		$this->id = $id;
-	}
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
 
-	public function getMeta($metaName, $default = null)
-	{
-		if (!isset($this->meta[$metaName]))
-			return $default;
-		return $this->meta[$metaName];
-	}
+    public function getMeta($metaName, $default = null)
+    {
+        if (!isset($this->meta[$metaName]))
+            return $default;
+        return $this->meta[$metaName];
+    }
 
-	public function setMeta($metaName, $value)
-	{
-		$this->meta[$metaName] = $value;
-	}
+    public function setMeta($metaName, $value)
+    {
+        $this->meta[$metaName] = $value;
+    }
 
-	public function resetMeta()
-	{
-		$this->meta = [];
-	}
+    public function resetMeta()
+    {
+        $this->meta = [];
+    }
 
-	public function resetLazyLoaders()
-	{
-		$this->lazyLoaders = [];
-		$this->lazyContainers = [];
-	}
+    public function resetLazyLoaders()
+    {
+        $this->lazyLoaders = [];
+        $this->lazyContainers = [];
+    }
 
-	public function setLazyLoader($lazyContainerName, $getter)
-	{
-		$this->lazyLoaders[$lazyContainerName] = $getter;
-	}
+    public function setLazyLoader($lazyContainerName, $getter)
+    {
+        $this->lazyLoaders[$lazyContainerName] = $getter;
+    }
 
-	protected function lazyLoad($lazyContainerName, $defaultValue)
-	{
-		if (!isset($this->lazyContainers[$lazyContainerName]))
-		{
-			if (!isset($this->lazyLoaders[$lazyContainerName]))
-			{
-				return $defaultValue;
-			}
-			$result = $this->lazyLoaders[$lazyContainerName]($this);
-			$this->lazySave($lazyContainerName, $result);
-		}
-		else
-		{
-			$result = $this->lazyContainers[$lazyContainerName];
-		}
-		return $result;
-	}
+    protected function lazyLoad($lazyContainerName, $defaultValue)
+    {
+        if (!isset($this->lazyContainers[$lazyContainerName]))
+        {
+            if (!isset($this->lazyLoaders[$lazyContainerName]))
+            {
+                return $defaultValue;
+            }
+            $result = $this->lazyLoaders[$lazyContainerName]($this);
+            $this->lazySave($lazyContainerName, $result);
+        }
+        else
+        {
+            $result = $this->lazyContainers[$lazyContainerName];
+        }
+        return $result;
+    }
 
-	protected function lazySave($lazyContainerName, $value)
-	{
-		$this->lazyContainers[$lazyContainerName] = $value;
-	}
+    protected function lazySave($lazyContainerName, $value)
+    {
+        $this->lazyContainers[$lazyContainerName] = $value;
+    }
 }
diff --git a/src/Entities/Favorite.php b/src/Entities/Favorite.php
index 8eb05734..9db14411 100644
--- a/src/Entities/Favorite.php
+++ b/src/Entities/Favorite.php
@@ -5,62 +5,62 @@ use Szurubooru\Entities\User;
 
 final class Favorite extends Entity
 {
-	private $postId;
-	private $userId;
-	private $time;
+    private $postId;
+    private $userId;
+    private $time;
 
-	const LAZY_LOADER_USER = 'user';
-	const LAZY_LOADER_POST = 'post';
+    const LAZY_LOADER_USER = 'user';
+    const LAZY_LOADER_POST = 'post';
 
-	public function getUserId()
-	{
-		return $this->userId;
-	}
+    public function getUserId()
+    {
+        return $this->userId;
+    }
 
-	public function setUserId($userId)
-	{
-		$this->userId = $userId;
-	}
+    public function setUserId($userId)
+    {
+        $this->userId = $userId;
+    }
 
-	public function getPostId()
-	{
-		return $this->postId;
-	}
+    public function getPostId()
+    {
+        return $this->postId;
+    }
 
-	public function setPostId($postId)
-	{
-		$this->postId = $postId;
-	}
+    public function setPostId($postId)
+    {
+        $this->postId = $postId;
+    }
 
-	public function getTime()
-	{
-		return $this->time;
-	}
+    public function getTime()
+    {
+        return $this->time;
+    }
 
-	public function setTime($time)
-	{
-		$this->time = $time;
-	}
+    public function setTime($time)
+    {
+        $this->time = $time;
+    }
 
-	public function getUser()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_USER, null);
-	}
+    public function getUser()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_USER, null);
+    }
 
-	public function setUser(User $user)
-	{
-		$this->lazySave(self::LAZY_LOADER_USER, $user);
-		$this->userId = $user->getId();
-	}
+    public function setUser(User $user)
+    {
+        $this->lazySave(self::LAZY_LOADER_USER, $user);
+        $this->userId = $user->getId();
+    }
 
-	public function getPost()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_POST, null);
-	}
+    public function getPost()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_POST, null);
+    }
 
-	public function setPost(Post $post)
-	{
-		$this->lazySave(self::LAZY_LOADER_POST, $post);
-		$this->postId = $post->getId();
-	}
+    public function setPost(Post $post)
+    {
+        $this->lazySave(self::LAZY_LOADER_POST, $post);
+        $this->postId = $post->getId();
+    }
 }
diff --git a/src/Entities/GlobalParam.php b/src/Entities/GlobalParam.php
index 3ad4eacd..0def0657 100644
--- a/src/Entities/GlobalParam.php
+++ b/src/Entities/GlobalParam.php
@@ -3,31 +3,31 @@ namespace Szurubooru\Entities;
 
 final class GlobalParam extends Entity
 {
-	const KEY_FEATURED_POST_USER = 'featuredPostUser';
-	const KEY_FEATURED_POST = 'featuredPost';
-	const KEY_POST_SIZE = 'postSize';
-	const KEY_POST_COUNT = 'postCount';
+    const KEY_FEATURED_POST_USER = 'featuredPostUser';
+    const KEY_FEATURED_POST = 'featuredPost';
+    const KEY_POST_SIZE = 'postSize';
+    const KEY_POST_COUNT = 'postCount';
 
-	private $key;
-	private $value;
+    private $key;
+    private $value;
 
-	public function getKey()
-	{
-		return $this->key;
-	}
+    public function getKey()
+    {
+        return $this->key;
+    }
 
-	public function setKey($key)
-	{
-		$this->key = $key;
-	}
+    public function setKey($key)
+    {
+        $this->key = $key;
+    }
 
-	public function getValue()
-	{
-		return $this->value;
-	}
+    public function getValue()
+    {
+        return $this->value;
+    }
 
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
+    public function setValue($value)
+    {
+        $this->value = $value;
+    }
 }
diff --git a/src/Entities/Post.php b/src/Entities/Post.php
index b54d2bd1..a8d0cad5 100644
--- a/src/Entities/Post.php
+++ b/src/Entities/Post.php
@@ -4,290 +4,290 @@ use Szurubooru\Entities\User;
 
 final class Post extends Entity
 {
-	const POST_SAFETY_SAFE = 1;
-	const POST_SAFETY_SKETCHY = 2;
-	const POST_SAFETY_UNSAFE = 3;
+    const POST_SAFETY_SAFE = 1;
+    const POST_SAFETY_SKETCHY = 2;
+    const POST_SAFETY_UNSAFE = 3;
 
-	const POST_TYPE_IMAGE = 1;
-	const POST_TYPE_FLASH = 2;
-	const POST_TYPE_VIDEO = 3;
-	const POST_TYPE_YOUTUBE = 4;
-	const POST_TYPE_ANIMATED_IMAGE = 5;
+    const POST_TYPE_IMAGE = 1;
+    const POST_TYPE_FLASH = 2;
+    const POST_TYPE_VIDEO = 3;
+    const POST_TYPE_YOUTUBE = 4;
+    const POST_TYPE_ANIMATED_IMAGE = 5;
 
-	const FLAG_LOOP = 1;
+    const FLAG_LOOP = 1;
 
-	const LAZY_LOADER_USER = 'user';
-	const LAZY_LOADER_TAGS = 'tags';
-	const LAZY_LOADER_CONTENT = 'content';
-	const LAZY_LOADER_THUMBNAIL_SOURCE_CONTENT = 'thumbnailSourceContent';
-	const LAZY_LOADER_RELATED_POSTS = 'relatedPosts';
+    const LAZY_LOADER_USER = 'user';
+    const LAZY_LOADER_TAGS = 'tags';
+    const LAZY_LOADER_CONTENT = 'content';
+    const LAZY_LOADER_THUMBNAIL_SOURCE_CONTENT = 'thumbnailSourceContent';
+    const LAZY_LOADER_RELATED_POSTS = 'relatedPosts';
 
-	const META_TAG_COUNT = 'tagCount';
-	const META_FAV_COUNT = 'favCount';
-	const META_COMMENT_COUNT = 'commentCount';
-	const META_SCORE = 'score';
+    const META_TAG_COUNT = 'tagCount';
+    const META_FAV_COUNT = 'favCount';
+    const META_COMMENT_COUNT = 'commentCount';
+    const META_SCORE = 'score';
 
-	private $name;
-	private $userId;
-	private $uploadTime;
-	private $lastEditTime;
-	private $safety;
-	private $contentType;
-	private $contentChecksum;
-	private $contentMimeType;
-	private $source;
-	private $imageWidth;
-	private $imageHeight;
-	private $originalFileSize;
-	private $originalFileName;
-	private $featureCount = 0;
-	private $lastFeatureTime;
-	private $flags = 0;
+    private $name;
+    private $userId;
+    private $uploadTime;
+    private $lastEditTime;
+    private $safety;
+    private $contentType;
+    private $contentChecksum;
+    private $contentMimeType;
+    private $source;
+    private $imageWidth;
+    private $imageHeight;
+    private $originalFileSize;
+    private $originalFileName;
+    private $featureCount = 0;
+    private $lastFeatureTime;
+    private $flags = 0;
 
-	public function getIdMarkdown()
-	{
-		return '@' . $this->id;
-	}
+    public function getIdMarkdown()
+    {
+        return '@' . $this->id;
+    }
 
-	public function getName()
-	{
-		return $this->name;
-	}
+    public function getName()
+    {
+        return $this->name;
+    }
 
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
 
-	public function getUserId()
-	{
-		return $this->userId;
-	}
+    public function getUserId()
+    {
+        return $this->userId;
+    }
 
-	public function setUserId($userId)
-	{
-		$this->userId = $userId;
-	}
+    public function setUserId($userId)
+    {
+        $this->userId = $userId;
+    }
 
-	public function getSafety()
-	{
-		return $this->safety;
-	}
+    public function getSafety()
+    {
+        return $this->safety;
+    }
 
-	public function setSafety($safety)
-	{
-		$this->safety = $safety;
-	}
+    public function setSafety($safety)
+    {
+        $this->safety = $safety;
+    }
 
-	public function getUploadTime()
-	{
-		return $this->uploadTime;
-	}
+    public function getUploadTime()
+    {
+        return $this->uploadTime;
+    }
 
-	public function setUploadTime($uploadTime)
-	{
-		$this->uploadTime = $uploadTime;
-	}
+    public function setUploadTime($uploadTime)
+    {
+        $this->uploadTime = $uploadTime;
+    }
 
-	public function getLastEditTime()
-	{
-		return $this->lastEditTime;
-	}
+    public function getLastEditTime()
+    {
+        return $this->lastEditTime;
+    }
 
-	public function setLastEditTime($lastEditTime)
-	{
-		$this->lastEditTime = $lastEditTime;
-	}
+    public function setLastEditTime($lastEditTime)
+    {
+        $this->lastEditTime = $lastEditTime;
+    }
 
-	public function getContentType()
-	{
-		return $this->contentType;
-	}
+    public function getContentType()
+    {
+        return $this->contentType;
+    }
 
-	public function setContentType($contentType)
-	{
-		$this->contentType = $contentType;
-	}
+    public function setContentType($contentType)
+    {
+        $this->contentType = $contentType;
+    }
 
-	public function getContentChecksum()
-	{
-		return $this->contentChecksum;
-	}
+    public function getContentChecksum()
+    {
+        return $this->contentChecksum;
+    }
 
-	public function setContentChecksum($contentChecksum)
-	{
-		$this->contentChecksum = $contentChecksum;
-	}
+    public function setContentChecksum($contentChecksum)
+    {
+        $this->contentChecksum = $contentChecksum;
+    }
 
-	public function getContentMimeType()
-	{
-		return $this->contentMimeType;
-	}
+    public function getContentMimeType()
+    {
+        return $this->contentMimeType;
+    }
 
-	public function setContentMimeType($contentMimeType)
-	{
-		$this->contentMimeType = $contentMimeType;
-	}
+    public function setContentMimeType($contentMimeType)
+    {
+        $this->contentMimeType = $contentMimeType;
+    }
 
-	public function getSource()
-	{
-		return $this->source;
-	}
+    public function getSource()
+    {
+        return $this->source;
+    }
 
-	public function setSource($source)
-	{
-		$this->source = $source;
-	}
+    public function setSource($source)
+    {
+        $this->source = $source;
+    }
 
-	public function getImageWidth()
-	{
-		return $this->imageWidth;
-	}
+    public function getImageWidth()
+    {
+        return $this->imageWidth;
+    }
 
-	public function setImageWidth($imageWidth)
-	{
-		$this->imageWidth = $imageWidth;
-	}
+    public function setImageWidth($imageWidth)
+    {
+        $this->imageWidth = $imageWidth;
+    }
 
-	public function getImageHeight()
-	{
-		return $this->imageHeight;
-	}
+    public function getImageHeight()
+    {
+        return $this->imageHeight;
+    }
 
-	public function setImageHeight($imageHeight)
-	{
-		$this->imageHeight = $imageHeight;
-	}
+    public function setImageHeight($imageHeight)
+    {
+        $this->imageHeight = $imageHeight;
+    }
 
-	public function getOriginalFileSize()
-	{
-		return $this->originalFileSize;
-	}
+    public function getOriginalFileSize()
+    {
+        return $this->originalFileSize;
+    }
 
-	public function setOriginalFileSize($originalFileSize)
-	{
-		$this->originalFileSize = $originalFileSize;
-	}
+    public function setOriginalFileSize($originalFileSize)
+    {
+        $this->originalFileSize = $originalFileSize;
+    }
 
-	public function getOriginalFileName()
-	{
-		return $this->originalFileName;
-	}
+    public function getOriginalFileName()
+    {
+        return $this->originalFileName;
+    }
 
-	public function setOriginalFileName($originalFileName)
-	{
-		$this->originalFileName = $originalFileName;
-	}
+    public function setOriginalFileName($originalFileName)
+    {
+        $this->originalFileName = $originalFileName;
+    }
 
-	public function getFeatureCount()
-	{
-		return $this->featureCount;
-	}
+    public function getFeatureCount()
+    {
+        return $this->featureCount;
+    }
 
-	public function setFeatureCount($featureCount)
-	{
-		$this->featureCount = $featureCount;
-	}
+    public function setFeatureCount($featureCount)
+    {
+        $this->featureCount = $featureCount;
+    }
 
-	public function getLastFeatureTime()
-	{
-		return $this->lastFeatureTime;
-	}
+    public function getLastFeatureTime()
+    {
+        return $this->lastFeatureTime;
+    }
 
-	public function setLastFeatureTime($lastFeatureTime)
-	{
-		$this->lastFeatureTime = $lastFeatureTime;
-	}
+    public function setLastFeatureTime($lastFeatureTime)
+    {
+        $this->lastFeatureTime = $lastFeatureTime;
+    }
 
-	public function getFlags()
-	{
-		return $this->flags;
-	}
+    public function getFlags()
+    {
+        return $this->flags;
+    }
 
-	public function setFlags($flags)
-	{
-		$this->flags = $flags;
-	}
+    public function setFlags($flags)
+    {
+        $this->flags = $flags;
+    }
 
-	public function getTags()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_TAGS, []);
-	}
+    public function getTags()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_TAGS, []);
+    }
 
-	public function setTags(array $tags)
-	{
-		$this->lazySave(self::LAZY_LOADER_TAGS, $tags);
-		$this->setMeta(self::META_TAG_COUNT, count($tags));
-	}
+    public function setTags(array $tags)
+    {
+        $this->lazySave(self::LAZY_LOADER_TAGS, $tags);
+        $this->setMeta(self::META_TAG_COUNT, count($tags));
+    }
 
-	public function getRelatedPosts()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_RELATED_POSTS, []);
-	}
+    public function getRelatedPosts()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_RELATED_POSTS, []);
+    }
 
-	public function setRelatedPosts(array $relatedPosts)
-	{
-		$this->lazySave(self::LAZY_LOADER_RELATED_POSTS, $relatedPosts);
-	}
+    public function setRelatedPosts(array $relatedPosts)
+    {
+        $this->lazySave(self::LAZY_LOADER_RELATED_POSTS, $relatedPosts);
+    }
 
-	public function getUser()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_USER, null);
-	}
+    public function getUser()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_USER, null);
+    }
 
-	public function setUser(User $user = null)
-	{
-		$this->lazySave(self::LAZY_LOADER_USER, $user);
-		$this->userId = $user ? $user->getId() : null;
-	}
+    public function setUser(User $user = null)
+    {
+        $this->lazySave(self::LAZY_LOADER_USER, $user);
+        $this->userId = $user ? $user->getId() : null;
+    }
 
-	public function getContent()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_CONTENT, null);
-	}
+    public function getContent()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_CONTENT, null);
+    }
 
-	public function setContent($content)
-	{
-		$this->lazySave(self::LAZY_LOADER_CONTENT, $content);
-	}
+    public function setContent($content)
+    {
+        $this->lazySave(self::LAZY_LOADER_CONTENT, $content);
+    }
 
-	public function getThumbnailSourceContent()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_THUMBNAIL_SOURCE_CONTENT, null);
-	}
+    public function getThumbnailSourceContent()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_THUMBNAIL_SOURCE_CONTENT, null);
+    }
 
-	public function setThumbnailSourceContent($content)
-	{
-		$this->lazySave(self::LAZY_LOADER_THUMBNAIL_SOURCE_CONTENT, $content);
-	}
+    public function setThumbnailSourceContent($content)
+    {
+        $this->lazySave(self::LAZY_LOADER_THUMBNAIL_SOURCE_CONTENT, $content);
+    }
 
-	public function getContentPath()
-	{
-		return 'posts' . DIRECTORY_SEPARATOR . $this->getName();
-	}
+    public function getContentPath()
+    {
+        return 'posts' . DIRECTORY_SEPARATOR . $this->getName();
+    }
 
-	public function getThumbnailSourceContentPath()
-	{
-		return 'posts' . DIRECTORY_SEPARATOR . $this->getName() . '-custom-thumb';
-	}
+    public function getThumbnailSourceContentPath()
+    {
+        return 'posts' . DIRECTORY_SEPARATOR . $this->getName() . '-custom-thumb';
+    }
 
-	public function getTagCount()
-	{
-		return $this->getMeta(self::META_TAG_COUNT, 0);
-	}
+    public function getTagCount()
+    {
+        return $this->getMeta(self::META_TAG_COUNT, 0);
+    }
 
-	public function getFavoriteCount()
-	{
-		return $this->getMeta(self::META_FAV_COUNT, 0);
-	}
+    public function getFavoriteCount()
+    {
+        return $this->getMeta(self::META_FAV_COUNT, 0);
+    }
 
-	public function getCommentCount()
-	{
-		return $this->getMeta(self::META_COMMENT_COUNT, 0);
-	}
+    public function getCommentCount()
+    {
+        return $this->getMeta(self::META_COMMENT_COUNT, 0);
+    }
 
-	public function getScore()
-	{
-		return $this->getMeta(self::META_SCORE, 0);
-	}
+    public function getScore()
+    {
+        return $this->getMeta(self::META_SCORE, 0);
+    }
 }
diff --git a/src/Entities/PostNote.php b/src/Entities/PostNote.php
index 2fa85bc6..7bc3436c 100644
--- a/src/Entities/PostNote.php
+++ b/src/Entities/PostNote.php
@@ -3,83 +3,83 @@ namespace Szurubooru\Entities;
 
 final class PostNote extends Entity
 {
-	private $postId;
-	private $left;
-	private $top;
-	private $width;
-	private $height;
-	private $text;
+    private $postId;
+    private $left;
+    private $top;
+    private $width;
+    private $height;
+    private $text;
 
-	const LAZY_LOADER_POST = 'post';
+    const LAZY_LOADER_POST = 'post';
 
-	public function getPostId()
-	{
-		return $this->postId;
-	}
+    public function getPostId()
+    {
+        return $this->postId;
+    }
 
-	public function setPostId($postId)
-	{
-		$this->postId = $postId;
-	}
+    public function setPostId($postId)
+    {
+        $this->postId = $postId;
+    }
 
-	public function getLeft()
-	{
-		return $this->left;
-	}
+    public function getLeft()
+    {
+        return $this->left;
+    }
 
-	public function setLeft($left)
-	{
-		$this->left = $left;
-	}
+    public function setLeft($left)
+    {
+        $this->left = $left;
+    }
 
-	public function getTop()
-	{
-		return $this->top;
-	}
+    public function getTop()
+    {
+        return $this->top;
+    }
 
-	public function setTop($top)
-	{
-		$this->top = $top;
-	}
+    public function setTop($top)
+    {
+        $this->top = $top;
+    }
 
-	public function getWidth()
-	{
-		return $this->width;
-	}
+    public function getWidth()
+    {
+        return $this->width;
+    }
 
-	public function setWidth($width)
-	{
-		$this->width = $width;
-	}
+    public function setWidth($width)
+    {
+        $this->width = $width;
+    }
 
-	public function getHeight()
-	{
-		return $this->height;
-	}
+    public function getHeight()
+    {
+        return $this->height;
+    }
 
-	public function setHeight($height)
-	{
-		$this->height = $height;
-	}
+    public function setHeight($height)
+    {
+        $this->height = $height;
+    }
 
-	public function getText()
-	{
-		return $this->text;
-	}
+    public function getText()
+    {
+        return $this->text;
+    }
 
-	public function setText($text)
-	{
-		$this->text = $text;
-	}
+    public function setText($text)
+    {
+        $this->text = $text;
+    }
 
-	public function getPost()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_POST, null);
-	}
+    public function getPost()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_POST, null);
+    }
 
-	public function setPost(Post $post)
-	{
-		$this->lazySave(self::LAZY_LOADER_POST, $post);
-		$this->postId = $post->getId();
-	}
+    public function setPost(Post $post)
+    {
+        $this->lazySave(self::LAZY_LOADER_POST, $post);
+        $this->postId = $post->getId();
+    }
 }
diff --git a/src/Entities/Score.php b/src/Entities/Score.php
index 29a64ed6..28197eaa 100644
--- a/src/Entities/Score.php
+++ b/src/Entities/Score.php
@@ -3,59 +3,59 @@ namespace Szurubooru\Entities;
 
 final class Score extends Entity
 {
-	private $postId;
-	private $commentId;
-	private $score;
-	private $time;
-	private $userId;
+    private $postId;
+    private $commentId;
+    private $score;
+    private $time;
+    private $userId;
 
-	public function getUserId()
-	{
-		return $this->userId;
-	}
+    public function getUserId()
+    {
+        return $this->userId;
+    }
 
-	public function setUserId($userId)
-	{
-		$this->userId = $userId;
-	}
+    public function setUserId($userId)
+    {
+        $this->userId = $userId;
+    }
 
-	public function getPostId()
-	{
-		return $this->postId;
-	}
+    public function getPostId()
+    {
+        return $this->postId;
+    }
 
-	public function setPostId($postId)
-	{
-		$this->postId = $postId;
-	}
+    public function setPostId($postId)
+    {
+        $this->postId = $postId;
+    }
 
-	public function getCommentId()
-	{
-		return $this->commentId;
-	}
+    public function getCommentId()
+    {
+        return $this->commentId;
+    }
 
-	public function setCommentId($commentId)
-	{
-		$this->commentId = $commentId;
-	}
+    public function setCommentId($commentId)
+    {
+        $this->commentId = $commentId;
+    }
 
-	public function getTime()
-	{
-		return $this->time;
-	}
+    public function getTime()
+    {
+        return $this->time;
+    }
 
-	public function setTime($time)
-	{
-		$this->time = $time;
-	}
+    public function setTime($time)
+    {
+        $this->time = $time;
+    }
 
-	public function getScore()
-	{
-		return $this->score;
-	}
+    public function getScore()
+    {
+        return $this->score;
+    }
 
-	public function setScore($score)
-	{
-		$this->score = $score;
-	}
+    public function setScore($score)
+    {
+        $this->score = $score;
+    }
 }
diff --git a/src/Entities/Snapshot.php b/src/Entities/Snapshot.php
index 548ae857..d22a5bd8 100644
--- a/src/Entities/Snapshot.php
+++ b/src/Entities/Snapshot.php
@@ -4,101 +4,101 @@ use Szurubooru\Entities\User;
 
 final class Snapshot extends Entity
 {
-	const TYPE_POST = 0;
-	const TYPE_TAG = 1;
+    const TYPE_POST = 0;
+    const TYPE_TAG = 1;
 
-	const OPERATION_CREATION = 0;
-	const OPERATION_CHANGE = 1;
-	const OPERATION_DELETE = 2;
+    const OPERATION_CREATION = 0;
+    const OPERATION_CHANGE = 1;
+    const OPERATION_DELETE = 2;
 
-	const LAZY_LOADER_USER = 'user';
+    const LAZY_LOADER_USER = 'user';
 
-	private $time;
-	private $type;
-	private $primaryKey;
-	private $operation;
-	private $userId;
-	private $data;
-	private $dataDifference;
+    private $time;
+    private $type;
+    private $primaryKey;
+    private $operation;
+    private $userId;
+    private $data;
+    private $dataDifference;
 
-	public function getTime()
-	{
-		return $this->time;
-	}
+    public function getTime()
+    {
+        return $this->time;
+    }
 
-	public function setTime($time)
-	{
-		$this->time = $time;
-	}
+    public function setTime($time)
+    {
+        $this->time = $time;
+    }
 
-	public function getType()
-	{
-		return $this->type;
-	}
+    public function getType()
+    {
+        return $this->type;
+    }
 
-	public function setType($type)
-	{
-		$this->type = $type;
-	}
+    public function setType($type)
+    {
+        $this->type = $type;
+    }
 
-	public function getPrimaryKey()
-	{
-		return $this->primaryKey;
-	}
+    public function getPrimaryKey()
+    {
+        return $this->primaryKey;
+    }
 
-	public function setPrimaryKey($primaryKey)
-	{
-		$this->primaryKey = $primaryKey;
-	}
+    public function setPrimaryKey($primaryKey)
+    {
+        $this->primaryKey = $primaryKey;
+    }
 
-	public function getOperation()
-	{
-		return $this->operation;
-	}
+    public function getOperation()
+    {
+        return $this->operation;
+    }
 
-	public function setOperation($operation)
-	{
-		$this->operation = $operation;
-	}
+    public function setOperation($operation)
+    {
+        $this->operation = $operation;
+    }
 
-	public function getUserId()
-	{
-		return $this->userId;
-	}
+    public function getUserId()
+    {
+        return $this->userId;
+    }
 
-	public function setUserId($userId)
-	{
-		$this->userId = $userId;
-	}
+    public function setUserId($userId)
+    {
+        $this->userId = $userId;
+    }
 
-	public function getData()
-	{
-		return $this->data;
-	}
+    public function getData()
+    {
+        return $this->data;
+    }
 
-	public function setData($data)
-	{
-		$this->data = $data;
-	}
+    public function setData($data)
+    {
+        $this->data = $data;
+    }
 
-	public function getDataDifference()
-	{
-		return $this->dataDifference;
-	}
+    public function getDataDifference()
+    {
+        return $this->dataDifference;
+    }
 
-	public function setDataDifference($dataDifference)
-	{
-		$this->dataDifference = $dataDifference;
-	}
+    public function setDataDifference($dataDifference)
+    {
+        $this->dataDifference = $dataDifference;
+    }
 
-	public function getUser()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_USER, null);
-	}
+    public function getUser()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_USER, null);
+    }
 
-	public function setUser(User $user = null)
-	{
-		$this->lazySave(self::LAZY_LOADER_USER, $user);
-		$this->userId = $user ? $user->getId() : null;
-	}
+    public function setUser(User $user = null)
+    {
+        $this->lazySave(self::LAZY_LOADER_USER, $user);
+        $this->userId = $user ? $user->getId() : null;
+    }
 }
diff --git a/src/Entities/Tag.php b/src/Entities/Tag.php
index d186fc40..c3e98ee9 100644
--- a/src/Entities/Tag.php
+++ b/src/Entities/Tag.php
@@ -3,78 +3,78 @@ namespace Szurubooru\Entities;
 
 final class Tag extends Entity
 {
-	private $name;
-	private $creationTime;
-	private $banned = false;
-	private $category = 'default';
+    private $name;
+    private $creationTime;
+    private $banned = false;
+    private $category = 'default';
 
-	const LAZY_LOADER_IMPLIED_TAGS = 'implications';
-	const LAZY_LOADER_SUGGESTED_TAGS = 'suggestions';
+    const LAZY_LOADER_IMPLIED_TAGS = 'implications';
+    const LAZY_LOADER_SUGGESTED_TAGS = 'suggestions';
 
-	const META_USAGES = 'usages';
+    const META_USAGES = 'usages';
 
-	public function getName()
-	{
-		return $this->name;
-	}
+    public function getName()
+    {
+        return $this->name;
+    }
 
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
 
-	public function getCreationTime()
-	{
-		return $this->creationTime;
-	}
+    public function getCreationTime()
+    {
+        return $this->creationTime;
+    }
 
-	public function setCreationTime($creationTime)
-	{
-		$this->creationTime = $creationTime;
-	}
+    public function setCreationTime($creationTime)
+    {
+        $this->creationTime = $creationTime;
+    }
 
-	public function isBanned()
-	{
-		return $this->banned;
-	}
+    public function isBanned()
+    {
+        return $this->banned;
+    }
 
-	public function setBanned($banned)
-	{
-		$this->banned = boolval($banned);
-	}
+    public function setBanned($banned)
+    {
+        $this->banned = boolval($banned);
+    }
 
-	public function getCategory()
-	{
-		return $this->category;
-	}
+    public function getCategory()
+    {
+        return $this->category;
+    }
 
-	public function setCategory($category)
-	{
-		$this->category = $category;
-	}
+    public function setCategory($category)
+    {
+        $this->category = $category;
+    }
 
-	public function getUsages()
-	{
-		return $this->getMeta(self::META_USAGES);
-	}
+    public function getUsages()
+    {
+        return $this->getMeta(self::META_USAGES);
+    }
 
-	public function getImpliedTags()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_IMPLIED_TAGS, []);
-	}
+    public function getImpliedTags()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_IMPLIED_TAGS, []);
+    }
 
-	public function setImpliedTags(array $impliedTags)
-	{
-		$this->lazySave(self::LAZY_LOADER_IMPLIED_TAGS, $impliedTags);
-	}
+    public function setImpliedTags(array $impliedTags)
+    {
+        $this->lazySave(self::LAZY_LOADER_IMPLIED_TAGS, $impliedTags);
+    }
 
-	public function getSuggestedTags()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_SUGGESTED_TAGS, []);
-	}
+    public function getSuggestedTags()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_SUGGESTED_TAGS, []);
+    }
 
-	public function setSuggestedTags(array $suggestedTags)
-	{
-		$this->lazySave(self::LAZY_LOADER_SUGGESTED_TAGS, $suggestedTags);
-	}
+    public function setSuggestedTags(array $suggestedTags)
+    {
+        $this->lazySave(self::LAZY_LOADER_SUGGESTED_TAGS, $suggestedTags);
+    }
 }
diff --git a/src/Entities/Token.php b/src/Entities/Token.php
index 4358f930..4146b072 100644
--- a/src/Entities/Token.php
+++ b/src/Entities/Token.php
@@ -3,41 +3,41 @@ namespace Szurubooru\Entities;
 
 final class Token extends Entity
 {
-	const PURPOSE_LOGIN = 1;
-	const PURPOSE_ACTIVATE = 2;
-	const PURPOSE_PASSWORD_RESET = 3;
+    const PURPOSE_LOGIN = 1;
+    const PURPOSE_ACTIVATE = 2;
+    const PURPOSE_PASSWORD_RESET = 3;
 
-	private $name;
-	private $purpose;
-	private $additionalData;
+    private $name;
+    private $purpose;
+    private $additionalData;
 
-	public function getName()
-	{
-		return $this->name;
-	}
+    public function getName()
+    {
+        return $this->name;
+    }
 
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
 
-	public function getPurpose()
-	{
-		return $this->purpose;
-	}
+    public function getPurpose()
+    {
+        return $this->purpose;
+    }
 
-	public function setPurpose($purpose)
-	{
-		$this->purpose = intval($purpose);
-	}
+    public function setPurpose($purpose)
+    {
+        $this->purpose = intval($purpose);
+    }
 
-	public function getAdditionalData()
-	{
-		return $this->additionalData;
-	}
+    public function getAdditionalData()
+    {
+        return $this->additionalData;
+    }
 
-	public function setAdditionalData($additionalData)
-	{
-		$this->additionalData = $additionalData;
-	}
+    public function setAdditionalData($additionalData)
+    {
+        $this->additionalData = $additionalData;
+    }
 }
diff --git a/src/Entities/User.php b/src/Entities/User.php
index e0f6fab6..4074677d 100644
--- a/src/Entities/User.php
+++ b/src/Entities/User.php
@@ -3,165 +3,165 @@ namespace Szurubooru\Entities;
 
 final class User extends Entity
 {
-	const ACCESS_RANK_NOBODY = 0;
-	const ACCESS_RANK_ANONYMOUS = 1;
-	const ACCESS_RANK_RESTRICTED_USER = 2;
-	const ACCESS_RANK_REGULAR_USER = 3;
-	const ACCESS_RANK_POWER_USER = 4;
-	const ACCESS_RANK_MODERATOR = 5;
-	const ACCESS_RANK_ADMINISTRATOR = 6;
+    const ACCESS_RANK_NOBODY = 0;
+    const ACCESS_RANK_ANONYMOUS = 1;
+    const ACCESS_RANK_RESTRICTED_USER = 2;
+    const ACCESS_RANK_REGULAR_USER = 3;
+    const ACCESS_RANK_POWER_USER = 4;
+    const ACCESS_RANK_MODERATOR = 5;
+    const ACCESS_RANK_ADMINISTRATOR = 6;
 
-	const AVATAR_STYLE_GRAVATAR = 1;
-	const AVATAR_STYLE_MANUAL = 2;
-	const AVATAR_STYLE_BLANK = 3;
+    const AVATAR_STYLE_GRAVATAR = 1;
+    const AVATAR_STYLE_MANUAL = 2;
+    const AVATAR_STYLE_BLANK = 3;
 
-	const LAZY_LOADER_CUSTOM_AVATAR_SOURCE_CONTENT = 'customAvatarContent';
+    const LAZY_LOADER_CUSTOM_AVATAR_SOURCE_CONTENT = 'customAvatarContent';
 
-	private $name;
-	private $email;
-	private $emailUnconfirmed;
-	private $passwordHash;
-	private $passwordSalt;
-	private $accessRank;
-	private $registrationTime;
-	private $lastLoginTime;
-	private $avatarStyle;
-	private $browsingSettings;
-	private $accountConfirmed = false;
-	private $banned = false;
+    private $name;
+    private $email;
+    private $emailUnconfirmed;
+    private $passwordHash;
+    private $passwordSalt;
+    private $accessRank;
+    private $registrationTime;
+    private $lastLoginTime;
+    private $avatarStyle;
+    private $browsingSettings;
+    private $accountConfirmed = false;
+    private $banned = false;
 
-	public function getName()
-	{
-		return $this->name;
-	}
+    public function getName()
+    {
+        return $this->name;
+    }
 
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
 
-	public function getEmail()
-	{
-		return $this->email;
-	}
+    public function getEmail()
+    {
+        return $this->email;
+    }
 
-	public function setEmail($email)
-	{
-		$this->email = $email;
-	}
+    public function setEmail($email)
+    {
+        $this->email = $email;
+    }
 
-	public function getEmailUnconfirmed()
-	{
-		return $this->emailUnconfirmed;
-	}
+    public function getEmailUnconfirmed()
+    {
+        return $this->emailUnconfirmed;
+    }
 
-	public function setEmailUnconfirmed($emailUnconfirmed)
-	{
-		$this->emailUnconfirmed = $emailUnconfirmed;
-	}
+    public function setEmailUnconfirmed($emailUnconfirmed)
+    {
+        $this->emailUnconfirmed = $emailUnconfirmed;
+    }
 
-	public function isBanned()
-	{
-		return $this->banned;
-	}
+    public function isBanned()
+    {
+        return $this->banned;
+    }
 
-	public function setBanned($banned)
-	{
-		$this->banned = boolval($banned);
-	}
+    public function setBanned($banned)
+    {
+        $this->banned = boolval($banned);
+    }
 
-	public function isAccountConfirmed()
-	{
-		return $this->accountConfirmed;
-	}
+    public function isAccountConfirmed()
+    {
+        return $this->accountConfirmed;
+    }
 
-	public function setAccountConfirmed($accountConfirmed)
-	{
-		$this->accountConfirmed = boolval($accountConfirmed);
-	}
+    public function setAccountConfirmed($accountConfirmed)
+    {
+        $this->accountConfirmed = boolval($accountConfirmed);
+    }
 
-	public function getPasswordHash()
-	{
-		return $this->passwordHash;
-	}
+    public function getPasswordHash()
+    {
+        return $this->passwordHash;
+    }
 
-	public function setPasswordHash($passwordHash)
-	{
-		$this->passwordHash = $passwordHash;
-	}
+    public function setPasswordHash($passwordHash)
+    {
+        $this->passwordHash = $passwordHash;
+    }
 
-	public function getPasswordSalt()
-	{
-		return $this->passwordSalt;
-	}
+    public function getPasswordSalt()
+    {
+        return $this->passwordSalt;
+    }
 
-	public function setPasswordSalt($passwordSalt)
-	{
-		$this->passwordSalt = $passwordSalt;
-	}
+    public function setPasswordSalt($passwordSalt)
+    {
+        $this->passwordSalt = $passwordSalt;
+    }
 
-	public function getAccessRank()
-	{
-		return $this->accessRank;
-	}
+    public function getAccessRank()
+    {
+        return $this->accessRank;
+    }
 
-	public function setAccessRank($accessRank)
-	{
-		$this->accessRank = $accessRank;
-	}
+    public function setAccessRank($accessRank)
+    {
+        $this->accessRank = $accessRank;
+    }
 
-	public function getRegistrationTime()
-	{
-		return $this->registrationTime;
-	}
+    public function getRegistrationTime()
+    {
+        return $this->registrationTime;
+    }
 
-	public function setRegistrationTime($registrationTime)
-	{
-		$this->registrationTime = $registrationTime;
-	}
+    public function setRegistrationTime($registrationTime)
+    {
+        $this->registrationTime = $registrationTime;
+    }
 
-	public function getLastLoginTime()
-	{
-		return $this->lastLoginTime;
-	}
+    public function getLastLoginTime()
+    {
+        return $this->lastLoginTime;
+    }
 
-	public function setLastLoginTime($lastLoginTime)
-	{
-		$this->lastLoginTime = $lastLoginTime;
-	}
+    public function setLastLoginTime($lastLoginTime)
+    {
+        $this->lastLoginTime = $lastLoginTime;
+    }
 
-	public function getAvatarStyle()
-	{
-		return $this->avatarStyle;
-	}
+    public function getAvatarStyle()
+    {
+        return $this->avatarStyle;
+    }
 
-	public function setAvatarStyle($avatarStyle)
-	{
-		$this->avatarStyle = $avatarStyle;
-	}
+    public function setAvatarStyle($avatarStyle)
+    {
+        $this->avatarStyle = $avatarStyle;
+    }
 
-	public function getBrowsingSettings()
-	{
-		return $this->browsingSettings;
-	}
+    public function getBrowsingSettings()
+    {
+        return $this->browsingSettings;
+    }
 
-	public function setBrowsingSettings($browsingSettings)
-	{
-		$this->browsingSettings = $browsingSettings;
-	}
+    public function setBrowsingSettings($browsingSettings)
+    {
+        $this->browsingSettings = $browsingSettings;
+    }
 
-	public function getCustomAvatarSourceContent()
-	{
-		return $this->lazyLoad(self::LAZY_LOADER_CUSTOM_AVATAR_SOURCE_CONTENT, null);
-	}
+    public function getCustomAvatarSourceContent()
+    {
+        return $this->lazyLoad(self::LAZY_LOADER_CUSTOM_AVATAR_SOURCE_CONTENT, null);
+    }
 
-	public function setCustomAvatarSourceContent($content)
-	{
-		$this->lazySave(self::LAZY_LOADER_CUSTOM_AVATAR_SOURCE_CONTENT, $content);
-	}
+    public function setCustomAvatarSourceContent($content)
+    {
+        $this->lazySave(self::LAZY_LOADER_CUSTOM_AVATAR_SOURCE_CONTENT, $content);
+    }
 
-	public function getCustomAvatarSourceContentPath()
-	{
-		return 'avatars' . DIRECTORY_SEPARATOR . $this->getId();
-	}
+    public function getCustomAvatarSourceContentPath()
+    {
+        return 'avatars' . DIRECTORY_SEPARATOR . $this->getId();
+    }
 }
diff --git a/src/FormData/LoginFormData.php b/src/FormData/LoginFormData.php
index 2fb3977d..99b3ca2d 100644
--- a/src/FormData/LoginFormData.php
+++ b/src/FormData/LoginFormData.php
@@ -5,19 +5,19 @@ use Szurubooru\Validator;
 
 class LoginFormData implements IValidatable
 {
-	public $userNameOrEmail;
-	public $password;
+    public $userNameOrEmail;
+    public $password;
 
-	public function __construct($inputReader = null)
-	{
-		if ($inputReader !== null)
-		{
-			$this->userNameOrEmail = trim($inputReader->userNameOrEmail);
-			$this->password = $inputReader->password;
-		}
-	}
+    public function __construct($inputReader = null)
+    {
+        if ($inputReader !== null)
+        {
+            $this->userNameOrEmail = trim($inputReader->userNameOrEmail);
+            $this->password = $inputReader->password;
+        }
+    }
 
-	public function validate(Validator $validator)
-	{
-	}
+    public function validate(Validator $validator)
+    {
+    }
 }
diff --git a/src/FormData/PostEditFormData.php b/src/FormData/PostEditFormData.php
index f7a2691e..c4a68738 100644
--- a/src/FormData/PostEditFormData.php
+++ b/src/FormData/PostEditFormData.php
@@ -6,46 +6,46 @@ use Szurubooru\Validator;
 
 class PostEditFormData implements IValidatable
 {
-	public $content;
-	public $thumbnail;
-	public $safety;
-	public $source;
-	public $tags;
-	public $relations;
-	public $flags;
+    public $content;
+    public $thumbnail;
+    public $safety;
+    public $source;
+    public $tags;
+    public $relations;
+    public $flags;
 
-	public $seenEditTime;
+    public $seenEditTime;
 
-	public function __construct($inputReader = null)
-	{
-		if ($inputReader !== null)
-		{
-			$this->content = $inputReader->readFile('content');
-			$this->thumbnail = $inputReader->readFile('thumbnail');
-			if ($inputReader->safety)
-				$this->safety = EnumHelper::postSafetyFromString($inputReader->safety);
-			if ($inputReader->source !== null)
-				$this->source = $inputReader->source;
-			$this->tags = preg_split('/[\s+]/', $inputReader->tags);
-			if ($inputReader->relations !== null)
-				$this->relations = array_filter(preg_split('/[\s+]/', $inputReader->relations));
-			$this->seenEditTime = $inputReader->seenEditTime;
-			$this->flags = new \StdClass;
-			$this->flags->loop = !empty($inputReader->loop);
-		}
-	}
+    public function __construct($inputReader = null)
+    {
+        if ($inputReader !== null)
+        {
+            $this->content = $inputReader->readFile('content');
+            $this->thumbnail = $inputReader->readFile('thumbnail');
+            if ($inputReader->safety)
+                $this->safety = EnumHelper::postSafetyFromString($inputReader->safety);
+            if ($inputReader->source !== null)
+                $this->source = $inputReader->source;
+            $this->tags = preg_split('/[\s+]/', $inputReader->tags);
+            if ($inputReader->relations !== null)
+                $this->relations = array_filter(preg_split('/[\s+]/', $inputReader->relations));
+            $this->seenEditTime = $inputReader->seenEditTime;
+            $this->flags = new \StdClass;
+            $this->flags->loop = !empty($inputReader->loop);
+        }
+    }
 
-	public function validate(Validator $validator)
-	{
-		$validator->validatePostTags($this->tags);
+    public function validate(Validator $validator)
+    {
+        $validator->validatePostTags($this->tags);
 
-		if ($this->source !== null)
-			$validator->validatePostSource($this->source);
+        if ($this->source !== null)
+            $validator->validatePostSource($this->source);
 
-		if ($this->relations)
-		{
-			foreach ($this->relations as $relatedPostId)
-				$validator->validateNumber($relatedPostId);
-		}
-	}
+        if ($this->relations)
+        {
+            foreach ($this->relations as $relatedPostId)
+                $validator->validateNumber($relatedPostId);
+        }
+    }
 }
diff --git a/src/FormData/PostNoteFormData.php b/src/FormData/PostNoteFormData.php
index b84e51bf..8166141c 100644
--- a/src/FormData/PostNoteFormData.php
+++ b/src/FormData/PostNoteFormData.php
@@ -5,26 +5,26 @@ use Szurubooru\Validator;
 
 class PostNoteFormData implements IValidatable
 {
-	public $left;
-	public $top;
-	public $width;
-	public $height;
-	public $text;
+    public $left;
+    public $top;
+    public $width;
+    public $height;
+    public $text;
 
-	public function __construct($inputReader = null)
-	{
-		if ($inputReader !== null)
-		{
-			$this->left = floatval($inputReader->left);
-			$this->top = floatval($inputReader->top);
-			$this->width = floatval($inputReader->width);
-			$this->height = floatval($inputReader->height);
-			$this->text = trim($inputReader->text);
-		}
-	}
+    public function __construct($inputReader = null)
+    {
+        if ($inputReader !== null)
+        {
+            $this->left = floatval($inputReader->left);
+            $this->top = floatval($inputReader->top);
+            $this->width = floatval($inputReader->width);
+            $this->height = floatval($inputReader->height);
+            $this->text = trim($inputReader->text);
+        }
+    }
 
-	public function validate(Validator $validator)
-	{
-		$validator->validateMinLength($this->text, 3, 'Post note content');
-	}
+    public function validate(Validator $validator)
+    {
+        $validator->validateMinLength($this->text, 3, 'Post note content');
+    }
 }
diff --git a/src/FormData/RegistrationFormData.php b/src/FormData/RegistrationFormData.php
index 96bd3b7c..0014b687 100644
--- a/src/FormData/RegistrationFormData.php
+++ b/src/FormData/RegistrationFormData.php
@@ -5,24 +5,24 @@ use Szurubooru\Validator;
 
 class RegistrationFormData implements IValidatable
 {
-	public $userName;
-	public $password;
-	public $email;
+    public $userName;
+    public $password;
+    public $email;
 
-	public function __construct($inputReader = null)
-	{
-		if ($inputReader !== null)
-		{
-			$this->userName = trim($inputReader->userName);
-			$this->password = $inputReader->password;
-			$this->email = trim($inputReader->email);
-		}
-	}
+    public function __construct($inputReader = null)
+    {
+        if ($inputReader !== null)
+        {
+            $this->userName = trim($inputReader->userName);
+            $this->password = $inputReader->password;
+            $this->email = trim($inputReader->email);
+        }
+    }
 
-	public function validate(Validator $validator)
-	{
-		$validator->validateUserName($this->userName);
-		$validator->validatePassword($this->password);
-		$validator->validateEmail($this->email);
-	}
+    public function validate(Validator $validator)
+    {
+        $validator->validateUserName($this->userName);
+        $validator->validatePassword($this->password);
+        $validator->validateEmail($this->email);
+    }
 }
diff --git a/src/FormData/TagEditFormData.php b/src/FormData/TagEditFormData.php
index 3ae43caf..0c960dbb 100644
--- a/src/FormData/TagEditFormData.php
+++ b/src/FormData/TagEditFormData.php
@@ -5,40 +5,40 @@ use Szurubooru\Validator;
 
 class TagEditFormData implements IValidatable
 {
-	public $name;
-	public $banned;
-	public $category;
-	public $implications;
-	public $suggestions;
+    public $name;
+    public $banned;
+    public $category;
+    public $implications;
+    public $suggestions;
 
-	public function __construct($inputReader = null)
-	{
-		if ($inputReader !== null)
-		{
-			$this->name = trim($inputReader->name);
-			$this->category = strtolower(trim($inputReader->category));
+    public function __construct($inputReader = null)
+    {
+        if ($inputReader !== null)
+        {
+            $this->name = trim($inputReader->name);
+            $this->category = strtolower(trim($inputReader->category));
 
-			if ($inputReader->banned !== null)
-				$this->banned = boolval($inputReader->banned);
+            if ($inputReader->banned !== null)
+                $this->banned = boolval($inputReader->banned);
 
-			$this->implications = array_filter(array_unique(preg_split('/[\s+]/', $inputReader->implications)));
-			$this->suggestions = array_filter(array_unique(preg_split('/[\s+]/', $inputReader->suggestions)));
-		}
-	}
+            $this->implications = array_filter(array_unique(preg_split('/[\s+]/', $inputReader->implications)));
+            $this->suggestions = array_filter(array_unique(preg_split('/[\s+]/', $inputReader->suggestions)));
+        }
+    }
 
-	public function validate(Validator $validator)
-	{
-		if ($this->category !== null)
-			$validator->validateLength($this->category, 1, 25, 'Tag category');
+    public function validate(Validator $validator)
+    {
+        if ($this->category !== null)
+            $validator->validateLength($this->category, 1, 25, 'Tag category');
 
-		if ($this->name !== null)
-			$validator->validatePostTags([$this->name]);
+        if ($this->name !== null)
+            $validator->validatePostTags([$this->name]);
 
-		if (!empty($this->implications))
-			$validator->validatePostTags($this->implications);
+        if (!empty($this->implications))
+            $validator->validatePostTags($this->implications);
 
-		if (!empty($this->suggestions))
-			$validator->validatePostTags($this->suggestions);
-	}
+        if (!empty($this->suggestions))
+            $validator->validatePostTags($this->suggestions);
+    }
 }
 
diff --git a/src/FormData/UploadFormData.php b/src/FormData/UploadFormData.php
index 4b9f4987..ab018cae 100644
--- a/src/FormData/UploadFormData.php
+++ b/src/FormData/UploadFormData.php
@@ -6,37 +6,37 @@ use Szurubooru\Validator;
 
 class UploadFormData implements IValidatable
 {
-	public $contentFileName;
-	public $content;
-	public $url;
-	public $anonymous;
-	public $safety;
-	public $source;
-	public $tags;
+    public $contentFileName;
+    public $content;
+    public $url;
+    public $anonymous;
+    public $safety;
+    public $source;
+    public $tags;
 
-	public function __construct($inputReader = null)
-	{
-		if ($inputReader !== null)
-		{
-			$this->contentFileName = $inputReader->contentFileName;
-			$this->content = $inputReader->readFile('content');
-			$this->url = $inputReader->url;
-			$this->anonymous = $inputReader->anonymous;
-			$this->safety = EnumHelper::postSafetyFromString($inputReader->safety);
-			$this->source = $inputReader->source;
-			$this->tags = preg_split('/[\s+]/', $inputReader->tags);
-		}
-	}
+    public function __construct($inputReader = null)
+    {
+        if ($inputReader !== null)
+        {
+            $this->contentFileName = $inputReader->contentFileName;
+            $this->content = $inputReader->readFile('content');
+            $this->url = $inputReader->url;
+            $this->anonymous = $inputReader->anonymous;
+            $this->safety = EnumHelper::postSafetyFromString($inputReader->safety);
+            $this->source = $inputReader->source;
+            $this->tags = preg_split('/[\s+]/', $inputReader->tags);
+        }
+    }
 
-	public function validate(Validator $validator)
-	{
-		if ($this->content === null && $this->url === null)
-			throw new \DomainException('Neither data or URL provided.');
+    public function validate(Validator $validator)
+    {
+        if ($this->content === null && $this->url === null)
+            throw new \DomainException('Neither data or URL provided.');
 
-		$validator->validatePostTags($this->tags);
+        $validator->validatePostTags($this->tags);
 
-		if ($this->source !== null)
-			$validator->validatePostSource($this->source);
-	}
+        if ($this->source !== null)
+            $validator->validatePostSource($this->source);
+    }
 }
 
diff --git a/src/FormData/UserEditFormData.php b/src/FormData/UserEditFormData.php
index 45549b67..10b09351 100644
--- a/src/FormData/UserEditFormData.php
+++ b/src/FormData/UserEditFormData.php
@@ -7,60 +7,60 @@ use Szurubooru\Validator;
 
 class UserEditFormData implements IValidatable
 {
-	public $userName;
-	public $email;
-	public $password;
-	public $accessRank;
-	public $avatarStyle;
-	public $avatarContent;
-	public $browsingSettings;
-	public $banned;
+    public $userName;
+    public $email;
+    public $password;
+    public $accessRank;
+    public $avatarStyle;
+    public $avatarContent;
+    public $browsingSettings;
+    public $banned;
 
-	public function __construct($inputReader = null)
-	{
-		if ($inputReader !== null)
-		{
-			$this->userName = $inputReader->userName;
-			$this->email = $inputReader->email;
-			$this->password = $inputReader->password;
-			if ($inputReader->accessRank !== null)
-				$this->accessRank = EnumHelper::accessRankFromString($inputReader->accessRank);
-			if ($inputReader->avatarStyle !== null)
-				$this->avatarStyle = EnumHelper::avatarStyleFromString($inputReader->avatarStyle);
-			$this->avatarContent = $inputReader->readFile('avatarContent');
-			$this->browsingSettings = json_decode($inputReader->browsingSettings);
-			if ($inputReader->banned !== null)
-				$this->banned = boolval($inputReader->banned);
-		}
-	}
+    public function __construct($inputReader = null)
+    {
+        if ($inputReader !== null)
+        {
+            $this->userName = $inputReader->userName;
+            $this->email = $inputReader->email;
+            $this->password = $inputReader->password;
+            if ($inputReader->accessRank !== null)
+                $this->accessRank = EnumHelper::accessRankFromString($inputReader->accessRank);
+            if ($inputReader->avatarStyle !== null)
+                $this->avatarStyle = EnumHelper::avatarStyleFromString($inputReader->avatarStyle);
+            $this->avatarContent = $inputReader->readFile('avatarContent');
+            $this->browsingSettings = json_decode($inputReader->browsingSettings);
+            if ($inputReader->banned !== null)
+                $this->banned = boolval($inputReader->banned);
+        }
+    }
 
-	public function validate(Validator $validator)
-	{
-		if ($this->userName !== null)
-			$validator->validateUserName($this->userName);
+    public function validate(Validator $validator)
+    {
+        if ($this->userName !== null)
+            $validator->validateUserName($this->userName);
 
-		if ($this->password !== null)
-			$validator->validatePassword($this->password);
+        if ($this->password !== null)
+            $validator->validatePassword($this->password);
 
-		if ($this->email !== null)
-			$validator->validateEmail($this->email);
+        if ($this->email !== null)
+            $validator->validateEmail($this->email);
 
-		if (strlen($this->avatarContent) > 1024 * 512)
-			throw new \DomainException('Avatar content must have at most 512 kilobytes.');
+        if (strlen($this->avatarContent) > 1024 * 512)
+            throw new \DomainException('Avatar content must have at most 512 kilobytes.');
 
-		if ($this->avatarContent)
-		{
-			$avatarContentMimeType = MimeHelper::getMimeTypeFromBuffer($this->avatarContent);
-			if (!MimeHelper::isImage($avatarContentMimeType))
-				throw new \DomainException('Avatar must be an image (detected: ' . $avatarContentMimeType . ').');
-		}
+        if ($this->avatarContent)
+        {
+            $avatarContentMimeType = MimeHelper::getMimeTypeFromBuffer($this->avatarContent);
+            if (!MimeHelper::isImage($avatarContentMimeType))
+                throw new \DomainException('Avatar must be an image (detected: ' . $avatarContentMimeType . ').');
+        }
 
-		if ($this->browsingSettings !== null)
-		{
-			if (!is_object($this->browsingSettings))
-				throw new \InvalidArgumentException('Browsing settings must be valid JSON.');
-			else if (strlen(json_encode($this->browsingSettings)) > 300)
-				throw new \InvalidArgumentException('Stringified browsing settings can have at most 300 characters.');
-		}
-	}
+        if ($this->browsingSettings !== null)
+        {
+            if (!is_object($this->browsingSettings))
+                throw new \InvalidArgumentException('Browsing settings must be valid JSON.');
+            else if (strlen(json_encode($this->browsingSettings)) > 300)
+                throw new \InvalidArgumentException('Stringified browsing settings can have at most 300 characters.');
+        }
+    }
 }
diff --git a/src/Helpers/EnumHelper.php b/src/Helpers/EnumHelper.php
index 9d599a4e..2e4aa26d 100644
--- a/src/Helpers/EnumHelper.php
+++ b/src/Helpers/EnumHelper.php
@@ -6,111 +6,111 @@ use Szurubooru\Entities\User;
 
 class EnumHelper
 {
-	private static $accessRankMap =
-	[
-		'anonymous' => User::ACCESS_RANK_ANONYMOUS,
-		'restrictedUser' => User::ACCESS_RANK_RESTRICTED_USER,
-		'regularUser' => User::ACCESS_RANK_REGULAR_USER,
-		'powerUser' => User::ACCESS_RANK_POWER_USER,
-		'moderator' => User::ACCESS_RANK_MODERATOR,
-		'administrator' => User::ACCESS_RANK_ADMINISTRATOR,
-	];
+    private static $accessRankMap =
+    [
+        'anonymous' => User::ACCESS_RANK_ANONYMOUS,
+        'restrictedUser' => User::ACCESS_RANK_RESTRICTED_USER,
+        'regularUser' => User::ACCESS_RANK_REGULAR_USER,
+        'powerUser' => User::ACCESS_RANK_POWER_USER,
+        'moderator' => User::ACCESS_RANK_MODERATOR,
+        'administrator' => User::ACCESS_RANK_ADMINISTRATOR,
+    ];
 
-	private static $avatarStyleMap =
-	[
-		'gravatar' => User::AVATAR_STYLE_GRAVATAR,
-		'manual' => User::AVATAR_STYLE_MANUAL,
-		'none' => User::AVATAR_STYLE_BLANK,
-		'blank' => User::AVATAR_STYLE_BLANK,
-	];
+    private static $avatarStyleMap =
+    [
+        'gravatar' => User::AVATAR_STYLE_GRAVATAR,
+        'manual' => User::AVATAR_STYLE_MANUAL,
+        'none' => User::AVATAR_STYLE_BLANK,
+        'blank' => User::AVATAR_STYLE_BLANK,
+    ];
 
-	private static $postSafetyMap =
-	[
-		'safe' => Post::POST_SAFETY_SAFE,
-		'sketchy' => Post::POST_SAFETY_SKETCHY,
-		'unsafe' => Post::POST_SAFETY_UNSAFE,
-	];
+    private static $postSafetyMap =
+    [
+        'safe' => Post::POST_SAFETY_SAFE,
+        'sketchy' => Post::POST_SAFETY_SKETCHY,
+        'unsafe' => Post::POST_SAFETY_UNSAFE,
+    ];
 
-	private static $postTypeMap =
-	[
-		'image' => Post::POST_TYPE_IMAGE,
-		'video' => Post::POST_TYPE_VIDEO,
-		'flash' => Post::POST_TYPE_FLASH,
-		'youtube' => Post::POST_TYPE_YOUTUBE,
-		'animation' => Post::POST_TYPE_ANIMATED_IMAGE,
-	];
+    private static $postTypeMap =
+    [
+        'image' => Post::POST_TYPE_IMAGE,
+        'video' => Post::POST_TYPE_VIDEO,
+        'flash' => Post::POST_TYPE_FLASH,
+        'youtube' => Post::POST_TYPE_YOUTUBE,
+        'animation' => Post::POST_TYPE_ANIMATED_IMAGE,
+    ];
 
-	private static $snapshotTypeMap =
-	[
-		'post' => Snapshot::TYPE_POST,
-	];
+    private static $snapshotTypeMap =
+    [
+        'post' => Snapshot::TYPE_POST,
+    ];
 
-	public static function accessRankToString($accessRank)
-	{
-		return self::enumToString(self::$accessRankMap, $accessRank);
-	}
+    public static function accessRankToString($accessRank)
+    {
+        return self::enumToString(self::$accessRankMap, $accessRank);
+    }
 
-	public static function accessRankFromString($accessRankString)
-	{
-		return self::stringToEnum(self::$accessRankMap, $accessRankString);
-	}
+    public static function accessRankFromString($accessRankString)
+    {
+        return self::stringToEnum(self::$accessRankMap, $accessRankString);
+    }
 
-	public static function avatarStyleToString($avatarStyle)
-	{
-		return self::enumToString(self::$avatarStyleMap, $avatarStyle);
-	}
+    public static function avatarStyleToString($avatarStyle)
+    {
+        return self::enumToString(self::$avatarStyleMap, $avatarStyle);
+    }
 
-	public static function avatarStyleFromString($avatarStyleString)
-	{
-		return self::stringToEnum(self::$avatarStyleMap, $avatarStyleString);
-	}
+    public static function avatarStyleFromString($avatarStyleString)
+    {
+        return self::stringToEnum(self::$avatarStyleMap, $avatarStyleString);
+    }
 
-	public static function postSafetyToString($postSafety)
-	{
-		return self::enumToString(self::$postSafetyMap, $postSafety);
-	}
+    public static function postSafetyToString($postSafety)
+    {
+        return self::enumToString(self::$postSafetyMap, $postSafety);
+    }
 
-	public static function postSafetyFromString($postSafetyString)
-	{
-		return self::stringToEnum(self::$postSafetyMap, $postSafetyString);
-	}
+    public static function postSafetyFromString($postSafetyString)
+    {
+        return self::stringToEnum(self::$postSafetyMap, $postSafetyString);
+    }
 
-	public static function postTypeToString($postType)
-	{
-		return self::enumToString(self::$postTypeMap, $postType);
-	}
+    public static function postTypeToString($postType)
+    {
+        return self::enumToString(self::$postTypeMap, $postType);
+    }
 
-	public static function postTypeFromString($postTypeString)
-	{
-		return self::stringToEnum(self::$postTypeMap, $postTypeString);
-	}
+    public static function postTypeFromString($postTypeString)
+    {
+        return self::stringToEnum(self::$postTypeMap, $postTypeString);
+    }
 
-	public static function snapshotTypeFromString($snapshotTypeString)
-	{
-		return self::stringToEnum(self::$snapshotTypeMap, $snapshotTypeString);
-	}
+    public static function snapshotTypeFromString($snapshotTypeString)
+    {
+        return self::stringToEnum(self::$snapshotTypeMap, $snapshotTypeString);
+    }
 
-	private static function enumToString($enumMap, $enumValue)
-	{
-		$reverseMap = array_flip($enumMap);
-		if (!isset($reverseMap[$enumValue]))
-			throw new \RuntimeException('Invalid value!');
+    private static function enumToString($enumMap, $enumValue)
+    {
+        $reverseMap = array_flip($enumMap);
+        if (!isset($reverseMap[$enumValue]))
+            throw new \RuntimeException('Invalid value!');
 
-		return $reverseMap[$enumValue];
-	}
+        return $reverseMap[$enumValue];
+    }
 
-	private static function stringToEnum($enumMap, $enumString)
-	{
-		$key = trim(strtolower($enumString));
-		$lowerEnumMap = array_change_key_case($enumMap, \CASE_LOWER);
-		if (!isset($lowerEnumMap[$key]))
-		{
-			throw new \DomainException(sprintf(
-				'Unrecognized value: %s.' . PHP_EOL . 'Possible values: %s',
-				$enumString,
-				join(', ', array_keys($lowerEnumMap))));
-		}
+    private static function stringToEnum($enumMap, $enumString)
+    {
+        $key = trim(strtolower($enumString));
+        $lowerEnumMap = array_change_key_case($enumMap, \CASE_LOWER);
+        if (!isset($lowerEnumMap[$key]))
+        {
+            throw new \DomainException(sprintf(
+                'Unrecognized value: %s.' . PHP_EOL . 'Possible values: %s',
+                $enumString,
+                join(', ', array_keys($lowerEnumMap))));
+        }
 
-		return $lowerEnumMap[$key];
-	}
+        return $lowerEnumMap[$key];
+    }
 }
diff --git a/src/Helpers/HttpHelper.php b/src/Helpers/HttpHelper.php
index eeeeb36a..45641087 100644
--- a/src/Helpers/HttpHelper.php
+++ b/src/Helpers/HttpHelper.php
@@ -3,89 +3,89 @@ namespace Szurubooru\Helpers;
 
 class HttpHelper
 {
-	private $redirected = false;
+    private $redirected = false;
 
-	public function setResponseCode($code)
-	{
-		http_response_code($code);
-	}
+    public function setResponseCode($code)
+    {
+        http_response_code($code);
+    }
 
-	public function setHeader($key, $value)
-	{
-		header($key . ': ' . $value);
-	}
+    public function setHeader($key, $value)
+    {
+        header($key . ': ' . $value);
+    }
 
-	public function outputJSON($data)
-	{
-		$encodedJson = json_encode((array) $data);
-		$lastError = json_last_error();
-		if ($lastError !== JSON_ERROR_NONE)
-			$this->output('Fatal error while encoding JSON: ' . $lastError . PHP_EOL . PHP_EOL . print_r($data, true));
-		else
-			$this->output($encodedJson);
-	}
+    public function outputJSON($data)
+    {
+        $encodedJson = json_encode((array) $data);
+        $lastError = json_last_error();
+        if ($lastError !== JSON_ERROR_NONE)
+            $this->output('Fatal error while encoding JSON: ' . $lastError . PHP_EOL . PHP_EOL . print_r($data, true));
+        else
+            $this->output($encodedJson);
+    }
 
-	public function output($data)
-	{
-		echo $data;
-	}
+    public function output($data)
+    {
+        echo $data;
+    }
 
-	public function getRequestHeaders()
-	{
-		if (function_exists('getallheaders'))
-		{
-			return getallheaders();
-		}
-		$result = [];
-		foreach ($_SERVER as $key => $value)
-		{
-			if (substr($key, 0, 5) == "HTTP_")
-			{
-				$key = str_replace(" ", "-", ucwords(strtolower(str_replace("_", " ", substr($key, 5)))));
-				$result[$key] = $value;
-			}
-			else
-			{
-				$result[$key] = $value;
-			}
-		}
-		return $result;
-	}
+    public function getRequestHeaders()
+    {
+        if (function_exists('getallheaders'))
+        {
+            return getallheaders();
+        }
+        $result = [];
+        foreach ($_SERVER as $key => $value)
+        {
+            if (substr($key, 0, 5) == "HTTP_")
+            {
+                $key = str_replace(" ", "-", ucwords(strtolower(str_replace("_", " ", substr($key, 5)))));
+                $result[$key] = $value;
+            }
+            else
+            {
+                $result[$key] = $value;
+            }
+        }
+        return $result;
+    }
 
-	public function getRequestHeader($key)
-	{
-		$headers = $this->getRequestHeaders();
-		return isset($headers[$key]) ? $headers[$key] : null;
-	}
+    public function getRequestHeader($key)
+    {
+        $headers = $this->getRequestHeaders();
+        return isset($headers[$key]) ? $headers[$key] : null;
+    }
 
-	public function getRequestMethod()
-	{
-		return $_SERVER['REQUEST_METHOD'];
-	}
+    public function getRequestMethod()
+    {
+        return $_SERVER['REQUEST_METHOD'];
+    }
 
-	public function getRequestUri()
-	{
-		$requestUri = $_SERVER['REQUEST_URI'];
-		$requestUri = preg_replace('/\?.*$/', '', $requestUri);
-		return $requestUri;
-	}
+    public function getRequestUri()
+    {
+        $requestUri = $_SERVER['REQUEST_URI'];
+        $requestUri = preg_replace('/\?.*$/', '', $requestUri);
+        return $requestUri;
+    }
 
-	public function redirect($destination)
-	{
-		$this->setResponseCode(307);
-		$this->setHeader('Location', $destination);
-		$this->redirected = true;
-	}
+    public function redirect($destination)
+    {
+        $this->setResponseCode(307);
+        $this->setHeader('Location', $destination);
+        $this->redirected = true;
+    }
 
-	public function nonCachedRedirect($destination)
-	{
-		$this->setResponseCode(303);
-		$this->setHeader('Location', $destination);
-		$this->redirected = true;
-	}
+    public function nonCachedRedirect($destination)
+    {
+        $this->setResponseCode(303);
+        $this->setHeader('Location', $destination);
+        $this->redirected = true;
+    }
 
-	public function isRedirecting()
-	{
-		return $this->redirected;
-	}
+    public function isRedirecting()
+    {
+        return $this->redirected;
+    }
 }
diff --git a/src/Helpers/InputReader.php b/src/Helpers/InputReader.php
index 874b3a58..5f4353d6 100644
--- a/src/Helpers/InputReader.php
+++ b/src/Helpers/InputReader.php
@@ -3,36 +3,36 @@ namespace Szurubooru\Helpers;
 
 final class InputReader extends \ArrayObject
 {
-	public function __construct()
-	{
-		parent::setFlags(parent::ARRAY_AS_PROPS | parent::STD_PROP_LIST);
+    public function __construct()
+    {
+        parent::setFlags(parent::ARRAY_AS_PROPS | parent::STD_PROP_LIST);
 
-		$_PUT = [];
-		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT')
-			parse_str(file_get_contents('php://input'), $_PUT);
+        $_PUT = [];
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT')
+            parse_str(file_get_contents('php://input'), $_PUT);
 
-		foreach ([$_GET, $_POST, $_PUT] as $source)
-		{
-			foreach ($source as $key => $value)
-				$this->offsetSet($key, $value);
-		}
-	}
+        foreach ([$_GET, $_POST, $_PUT] as $source)
+        {
+            foreach ($source as $key => $value)
+                $this->offsetSet($key, $value);
+        }
+    }
 
-	public function offsetGet($index)
-	{
-		if (!parent::offsetExists($index))
-			return null;
-		return parent::offsetGet($index);
-	}
+    public function offsetGet($index)
+    {
+        if (!parent::offsetExists($index))
+            return null;
+        return parent::offsetGet($index);
+    }
 
-	public function readFile($fileName)
-	{
-		if (!isset($_FILES[$fileName]))
-			return null;
+    public function readFile($fileName)
+    {
+        if (!isset($_FILES[$fileName]))
+            return null;
 
-		if (!$_FILES[$fileName]['tmp_name'])
-			throw new \Exception('File is probably too big.');
+        if (!$_FILES[$fileName]['tmp_name'])
+            throw new \Exception('File is probably too big.');
 
-		return file_get_contents($_FILES[$fileName]['tmp_name']);
-	}
+        return file_get_contents($_FILES[$fileName]['tmp_name']);
+    }
 }
diff --git a/src/Helpers/MimeHelper.php b/src/Helpers/MimeHelper.php
index a771aa15..ea05631a 100644
--- a/src/Helpers/MimeHelper.php
+++ b/src/Helpers/MimeHelper.php
@@ -3,99 +3,99 @@ namespace Szurubooru\Helpers;
 
 class MimeHelper
 {
-	public static function getMimeTypeFromFile($path)
-	{
-		$fh = fopen($path, 'rb');
-		if (!$fh)
-			throw new \Exception('Cannot open ' . $path . ' for reading');
-		$bytes = fread($fh, 16);
-		fclose($fh);
-		return self::getMimeTypeFrom16Bytes($bytes);
-	}
+    public static function getMimeTypeFromFile($path)
+    {
+        $fh = fopen($path, 'rb');
+        if (!$fh)
+            throw new \Exception('Cannot open ' . $path . ' for reading');
+        $bytes = fread($fh, 16);
+        fclose($fh);
+        return self::getMimeTypeFrom16Bytes($bytes);
+    }
 
-	public static function getMimeTypeFromBuffer($buffer)
-	{
-		return self::getMimeTypeFrom16Bytes(substr($buffer, 0, 16));
-	}
+    public static function getMimeTypeFromBuffer($buffer)
+    {
+        return self::getMimeTypeFrom16Bytes(substr($buffer, 0, 16));
+    }
 
-	public static function isBufferAnimatedGif($buffer)
-	{
-		return strtolower(self::getMimeTypeFromBuffer($buffer)) === 'image/gif'
-		and preg_match_all('#\x21\xf9\x04.{4}\x00[\x2c\x21]#s', $buffer) > 1;
-	}
+    public static function isBufferAnimatedGif($buffer)
+    {
+        return strtolower(self::getMimeTypeFromBuffer($buffer)) === 'image/gif'
+        and preg_match_all('#\x21\xf9\x04.{4}\x00[\x2c\x21]#s', $buffer) > 1;
+    }
 
-	public static function isFlash($mime)
-	{
-		return strtolower($mime) === 'application/x-shockwave-flash';
-	}
+    public static function isFlash($mime)
+    {
+        return strtolower($mime) === 'application/x-shockwave-flash';
+    }
 
-	public static function isVideo($mime)
-	{
-		return strtolower($mime) === 'application/ogg' || preg_match('/video\//i', $mime);
-	}
+    public static function isVideo($mime)
+    {
+        return strtolower($mime) === 'application/ogg' || preg_match('/video\//i', $mime);
+    }
 
-	public static function isImage($mime)
-	{
-		return in_array(strtolower($mime), ['image/jpeg', 'image/png', 'image/gif']);
-	}
+    public static function isImage($mime)
+    {
+        return in_array(strtolower($mime), ['image/jpeg', 'image/png', 'image/gif']);
+    }
 
-	public static function getExtension($mime)
-	{
-		$map =
-		[
-			'application/x-shockwave-flash' => 'SWF',
-			'image/jpeg' => 'JPG',
-			'image/png' => 'PNG',
-			'image/gif' => 'GIF',
-			'video/webm' => 'WEBM',
-			'video/mp4' => 'MP4',
-			'video/mpeg' => 'MPEG MPG MPE',
-			'video/x-flv' => 'FLV',
-			'video/x-matroska' => 'MKV',
-			'video/3gpp' => '3GP',
-			'video/quicktime' => 'QT MOV',
-			'text/plain' => 'TXT',
-		];
-		$key = strtolower(trim($mime));
-		return isset($map[$key]) ? $map[$key] : null;
-	}
+    public static function getExtension($mime)
+    {
+        $map =
+        [
+            'application/x-shockwave-flash' => 'SWF',
+            'image/jpeg' => 'JPG',
+            'image/png' => 'PNG',
+            'image/gif' => 'GIF',
+            'video/webm' => 'WEBM',
+            'video/mp4' => 'MP4',
+            'video/mpeg' => 'MPEG MPG MPE',
+            'video/x-flv' => 'FLV',
+            'video/x-matroska' => 'MKV',
+            'video/3gpp' => '3GP',
+            'video/quicktime' => 'QT MOV',
+            'text/plain' => 'TXT',
+        ];
+        $key = strtolower(trim($mime));
+        return isset($map[$key]) ? $map[$key] : null;
+    }
 
-	private static function getMimeTypeFrom16Bytes($bytes)
-	{
-		if ($bytes === false)
-			return false;
+    private static function getMimeTypeFrom16Bytes($bytes)
+    {
+        if ($bytes === false)
+            return false;
 
-		if (strncmp($bytes, 'CWS', 3) === 0 || strncmp($bytes, 'FWS', 3) === 0 || strncmp($bytes, 'ZWS', 3) === 0)
-			return 'application/x-shockwave-flash';
+        if (strncmp($bytes, 'CWS', 3) === 0 || strncmp($bytes, 'FWS', 3) === 0 || strncmp($bytes, 'ZWS', 3) === 0)
+            return 'application/x-shockwave-flash';
 
-		if (strncmp($bytes, "\xff\xd8\xff", 3) === 0)
-			return 'image/jpeg';
+        if (strncmp($bytes, "\xff\xd8\xff", 3) === 0)
+            return 'image/jpeg';
 
-		if (strncmp($bytes, "\x89PNG\x0d\x0a", 6) === 0)
-			return 'image/png';
+        if (strncmp($bytes, "\x89PNG\x0d\x0a", 6) === 0)
+            return 'image/png';
 
-		if (strncmp($bytes, 'GIF87a', 6) === 0 || strncmp($bytes, 'GIF89a', 6) === 0)
-			return 'image/gif';
+        if (strncmp($bytes, 'GIF87a', 6) === 0 || strncmp($bytes, 'GIF89a', 6) === 0)
+            return 'image/gif';
 
-		if (strncmp($bytes, "\x1a\x45\xdf\xa3", 4) === 0)
-			return 'video/webm';
+        if (strncmp($bytes, "\x1a\x45\xdf\xa3", 4) === 0)
+            return 'video/webm';
 
-		if (strncmp(substr($bytes, 4), 'ftypisom', 8) === 0 || strncmp(substr($bytes, 4), 'ftypmp42', 8) === 0)
-			return 'video/mp4';
+        if (strncmp(substr($bytes, 4), 'ftypisom', 8) === 0 || strncmp(substr($bytes, 4), 'ftypmp42', 8) === 0)
+            return 'video/mp4';
 
-		if (strncmp($bytes, "\x46\x4c\x56\x01", 4) === 0)
-			return 'video/x-flv';
+        if (strncmp($bytes, "\x46\x4c\x56\x01", 4) === 0)
+            return 'video/x-flv';
 
-		if (strncmp($bytes, "\x1a\x45\xdf\xa3\x93\x42\x82\x88\x6d\x61\x74\x72\x6f\x73\x6b\x61", 16) === 0)
-			return 'video/x-matroska';
+        if (strncmp($bytes, "\x1a\x45\xdf\xa3\x93\x42\x82\x88\x6d\x61\x74\x72\x6f\x73\x6b\x61", 16) === 0)
+            return 'video/x-matroska';
 
-		if (strncmp($bytes, "\x00\x00\x00\x14\x66\x74\x79\x70\x33\x67\x70", 12) === 0 or
-			strncmp($bytes, "\x00\x00\x00\x20\x66\x74\x79\x70\x33\x67\x70", 12) === 0)
-			return 'video/3gpp';
+        if (strncmp($bytes, "\x00\x00\x00\x14\x66\x74\x79\x70\x33\x67\x70", 12) === 0 or
+            strncmp($bytes, "\x00\x00\x00\x20\x66\x74\x79\x70\x33\x67\x70", 12) === 0)
+            return 'video/3gpp';
 
-		if (strncmp(substr($bytes, 4), 'ftypqt  ', 8) === 0)
-			return 'video/quicktime';
+        if (strncmp(substr($bytes, 4), 'ftypqt  ', 8) === 0)
+            return 'video/quicktime';
 
-		return 'application/octet-stream';
-	}
+        return 'application/octet-stream';
+    }
 }
diff --git a/src/Helpers/ProgramExecutor.php b/src/Helpers/ProgramExecutor.php
index 87aa0ffa..09ffb802 100644
--- a/src/Helpers/ProgramExecutor.php
+++ b/src/Helpers/ProgramExecutor.php
@@ -3,24 +3,24 @@ namespace Szurubooru\Helpers;
 
 class ProgramExecutor
 {
-	public static function run($programName, $arguments)
-	{
-		$quotedArguments = array_map('escapeshellarg', $arguments);
+    public static function run($programName, $arguments)
+    {
+        $quotedArguments = array_map('escapeshellarg', $arguments);
 
-		$cmd = sprintf('%s %s 2>&1', $programName, implode(' ', $quotedArguments));
-		return exec($cmd);
-	}
+        $cmd = sprintf('%s %s 2>&1', $programName, implode(' ', $quotedArguments));
+        return exec($cmd);
+    }
 
-	public static function isProgramAvailable($programName)
-	{
-		if (PHP_OS === 'WINNT')
-		{
-			exec('where "' . $programName . '" 2>&1 >nul', $trash, $exitCode);
-		}
-		else
-		{
-			exec('command -v "' . $programName . '" >/dev/null 2>&1', $trash, $exitCode);
-		}
-		return $exitCode === 0;
-	}
+    public static function isProgramAvailable($programName)
+    {
+        if (PHP_OS === 'WINNT')
+        {
+            exec('where "' . $programName . '" 2>&1 >nul', $trash, $exitCode);
+        }
+        else
+        {
+            exec('command -v "' . $programName . '" >/dev/null 2>&1', $trash, $exitCode);
+        }
+        return $exitCode === 0;
+    }
 }
diff --git a/src/Helpers/TypeHelper.php b/src/Helpers/TypeHelper.php
index ea1354f9..e9c95256 100644
--- a/src/Helpers/TypeHelper.php
+++ b/src/Helpers/TypeHelper.php
@@ -3,18 +3,18 @@ namespace Szurubooru\Helpers;
 
 class TypeHelper
 {
-	public static function toBool($value)
-	{
-		if ($value === 0)
-			return false;
-		if ($value === 'false')
-			return false;
-		if ($value === false)
-			return false;
-		if (is_array($value) && count($value) === 1)
-			return false;
-		if ($value === null)
-			return false;
-		return true;
-	}
+    public static function toBool($value)
+    {
+        if ($value === 0)
+            return false;
+        if ($value === 'false')
+            return false;
+        if ($value === false)
+            return false;
+        if (is_array($value) && count($value) === 1)
+            return false;
+        if ($value === null)
+            return false;
+        return true;
+    }
 }
diff --git a/src/IValidatable.php b/src/IValidatable.php
index be2913cf..31b51f8d 100644
--- a/src/IValidatable.php
+++ b/src/IValidatable.php
@@ -4,5 +4,5 @@ use Szurubooru\Validator;
 
 interface IValidatable
 {
-	public function validate(Validator $validator);
+    public function validate(Validator $validator);
 }
diff --git a/src/Injector.php b/src/Injector.php
index a03921d5..9ba6562a 100644
--- a/src/Injector.php
+++ b/src/Injector.php
@@ -5,36 +5,36 @@ use Doctrine\Common\Cache\ArrayCache;
 
 final class Injector
 {
-	private static $container;
-	private static $definitionCache;
+    private static $container;
+    private static $definitionCache;
 
-	public static function init()
-	{
-		$definitionsPath = __DIR__
-			. DIRECTORY_SEPARATOR . '..'
-			. DIRECTORY_SEPARATOR . 'src'
-			. DIRECTORY_SEPARATOR . 'di.php';
+    public static function init()
+    {
+        $definitionsPath = __DIR__
+            . DIRECTORY_SEPARATOR . '..'
+            . DIRECTORY_SEPARATOR . 'src'
+            . DIRECTORY_SEPARATOR . 'di.php';
 
-		self::$definitionCache = new ArrayCache();
-		$builder = new ContainerBuilder();
-		$builder->setDefinitionCache(self::$definitionCache);
-		$builder->addDefinitions($definitionsPath);
-		$builder->useAutowiring(true);
-		$builder->useAnnotations(false);
-		self::$container = $builder->build();
-	}
+        self::$definitionCache = new ArrayCache();
+        $builder = new ContainerBuilder();
+        $builder->setDefinitionCache(self::$definitionCache);
+        $builder->addDefinitions($definitionsPath);
+        $builder->useAutowiring(true);
+        $builder->useAnnotations(false);
+        self::$container = $builder->build();
+    }
 
-	public static function get($className)
-	{
-		return self::$container->get($className);
-	}
+    public static function get($className)
+    {
+        return self::$container->get($className);
+    }
 
-	public static function set($className, $object)
-	{
-		self::$container->set($className, $object);
-		self::$definitionCache->delete($className);
-		self::$definitionCache->flushAll();
-	}
+    public static function set($className, $object)
+    {
+        self::$container->set($className, $object);
+        self::$definitionCache->delete($className);
+        self::$definitionCache->flushAll();
+    }
 }
 
 Injector::init();
diff --git a/src/NotSupportedException.php b/src/NotSupportedException.php
index 06af8987..1eadec16 100644
--- a/src/NotSupportedException.php
+++ b/src/NotSupportedException.php
@@ -3,8 +3,8 @@ namespace Szurubooru;
 
 class NotSupportedException extends \BadMethodCallException
 {
-	public function __construct($message = null)
-	{
-		parent::__construct($message === null ? 'Not supported' : $message);
-	}
+    public function __construct($message = null)
+    {
+        parent::__construct($message === null ? 'Not supported' : $message);
+    }
 }
diff --git a/src/PDOEx/BaseQuery.php b/src/PDOEx/BaseQuery.php
index e046fa61..81242775 100644
--- a/src/PDOEx/BaseQuery.php
+++ b/src/PDOEx/BaseQuery.php
@@ -3,172 +3,172 @@ namespace Szurubooru\PDOEx;
 
 abstract class BaseQuery implements \IteratorAggregate
 {
-	const CLAUSE_BASE = 'base';
-	const CLAUSE_WHERE = 'where';
-	const CLAUSE_JOIN = 'join';
-	const CLAUSE_ORDER = 'order';
-	const CLAUSE_GROUP = 'group';
-	const CLAUSE_LIMIT = 'limit';
+    const CLAUSE_BASE = 'base';
+    const CLAUSE_WHERE = 'where';
+    const CLAUSE_JOIN = 'join';
+    const CLAUSE_ORDER = 'order';
+    const CLAUSE_GROUP = 'group';
+    const CLAUSE_LIMIT = 'limit';
 
-	protected $table;
-	protected $pdoex;
+    protected $table;
+    protected $pdoex;
 
-	protected $clauses;
-	protected $parameters;
+    protected $clauses;
+    protected $parameters;
 
-	public function __construct(PDOEx $pdoex, $table)
-	{
-		$this->pdoex = $pdoex;
-		$this->table = $table;
-		$this->clauses = [];
-		$this->parameters = [];
-		$this->init();
-	}
+    public function __construct(PDOEx $pdoex, $table)
+    {
+        $this->pdoex = $pdoex;
+        $this->table = $table;
+        $this->clauses = [];
+        $this->parameters = [];
+        $this->init();
+    }
 
-	public function getIterator()
-	{
-		return $this->execute();
-	}
+    public function getIterator()
+    {
+        return $this->execute();
+    }
 
-	public function getQuery()
-	{
-		return $this->buildQuery();
-	}
+    public function getQuery()
+    {
+        return $this->buildQuery();
+    }
 
-	public function execute()
-	{
-		$query = $this->buildQuery();
-		$parameters = $this->getParameters();
+    public function execute()
+    {
+        $query = $this->buildQuery();
+        $parameters = $this->getParameters();
 
-		try
-		{
-			$result = $this->pdoex->prepare($query);
-			if (!$result || !$result->execute($parameters))
-				$this->throwQueryException($query, $parameters, 'unknown reason');
-		}
-		catch (\PDOException $e)
-		{
-			$this->throwQueryException($query, $parameters, $e->getMessage());
-		}
-		return $result;
-	}
+        try
+        {
+            $result = $this->pdoex->prepare($query);
+            if (!$result || !$result->execute($parameters))
+                $this->throwQueryException($query, $parameters, 'unknown reason');
+        }
+        catch (\PDOException $e)
+        {
+            $this->throwQueryException($query, $parameters, $e->getMessage());
+        }
+        return $result;
+    }
 
-	public function innerJoin($table, $condition)
-	{
-		if (!isset($this->clauses[self::CLAUSE_JOIN]))
-			$this->clauses[self::CLAUSE_JOIN] = [];
+    public function innerJoin($table, $condition)
+    {
+        if (!isset($this->clauses[self::CLAUSE_JOIN]))
+            $this->clauses[self::CLAUSE_JOIN] = [];
 
-		$this->clauses[self::CLAUSE_JOIN][] = 'INNER JOIN ' . $table . ' ON ' . $condition;
-		return $this;
-	}
+        $this->clauses[self::CLAUSE_JOIN][] = 'INNER JOIN ' . $table . ' ON ' . $condition;
+        return $this;
+    }
 
-	public function where($key, $value = null)
-	{
-		if ($key === null)
-		{
-			$this->clauses[self::CLAUSE_WHERE] = [];
-			return;
-		}
+    public function where($key, $value = null)
+    {
+        if ($key === null)
+        {
+            $this->clauses[self::CLAUSE_WHERE] = [];
+            return;
+        }
 
-		if (!isset($this->clauses[self::CLAUSE_WHERE]))
-			$this->clauses[self::CLAUSE_WHERE] = [];
+        if (!isset($this->clauses[self::CLAUSE_WHERE]))
+            $this->clauses[self::CLAUSE_WHERE] = [];
 
-		$sql = empty($this->clauses[self::CLAUSE_WHERE]) ? 'WHERE' : 'AND';
+        $sql = empty($this->clauses[self::CLAUSE_WHERE]) ? 'WHERE' : 'AND';
 
-		if (strpos($key, '?') !== false)
-		{
-			if (!is_array($value))
-				$value = [$value];
-			assert(substr_count($key, '?') === count($value), 'Binding ' .  print_r($value, true) . ' to ' . $key);
-			$index = 0;
-			$sql .= ' ' . preg_replace_callback(
-				'/\?/',
-				function($match) use (&$index, $value)
-				{
-					$ret = $this->bind($value[$index]);
-					$index ++;
-					return $ret;
-				},
-				$key);
-			$this->clauses[self::CLAUSE_WHERE][] = $sql;
-			return $this;
-		}
+        if (strpos($key, '?') !== false)
+        {
+            if (!is_array($value))
+                $value = [$value];
+            assert(substr_count($key, '?') === count($value), 'Binding ' .  print_r($value, true) . ' to ' . $key);
+            $index = 0;
+            $sql .= ' ' . preg_replace_callback(
+                '/\?/',
+                function($match) use (&$index, $value)
+                {
+                    $ret = $this->bind($value[$index]);
+                    $index ++;
+                    return $ret;
+                },
+                $key);
+            $this->clauses[self::CLAUSE_WHERE][] = $sql;
+            return $this;
+        }
 
-		if (!is_array($value))
-		{
-			if ($value === null)
-				$sql .= ' ' . $key . ' IS NULL';
-			else
-				$sql .= ' ' . $key . ' = ' . $this->bind($value);
-			$this->clauses[self::CLAUSE_WHERE][] = $sql;
-			return $this;
-		}
+        if (!is_array($value))
+        {
+            if ($value === null)
+                $sql .= ' ' . $key . ' IS NULL';
+            else
+                $sql .= ' ' . $key . ' = ' . $this->bind($value);
+            $this->clauses[self::CLAUSE_WHERE][] = $sql;
+            return $this;
+        }
 
-		if (empty($value))
-		{
-			$sql .= ' 0';
-			$this->clauses[self::CLAUSE_WHERE][] = $sql;
-			return $this;
-		}
+        if (empty($value))
+        {
+            $sql .= ' 0';
+            $this->clauses[self::CLAUSE_WHERE][] = $sql;
+            return $this;
+        }
 
-		$sql .= ' ' . $key . ' IN (';
-		foreach ($value as $id => $val)
-		{
-			$sql .= $this->bind($val) . ', ';
-		}
-		$sql = substr($sql, 0, -2);
-		$sql .= ')';
-		$this->clauses[self::CLAUSE_WHERE][] = $sql;
-		return $this;
-	}
+        $sql .= ' ' . $key . ' IN (';
+        foreach ($value as $id => $val)
+        {
+            $sql .= $this->bind($val) . ', ';
+        }
+        $sql = substr($sql, 0, -2);
+        $sql .= ')';
+        $this->clauses[self::CLAUSE_WHERE][] = $sql;
+        return $this;
+    }
 
-	protected function getParameters()
-	{
-		return $this->parameters;
-	}
+    protected function getParameters()
+    {
+        return $this->parameters;
+    }
 
-	protected function buildQuery()
-	{
-		$priorities = array_flip([
-			self::CLAUSE_BASE,
-			self::CLAUSE_JOIN,
-			self::CLAUSE_WHERE,
-			self::CLAUSE_GROUP,
-			self::CLAUSE_ORDER,
-			self::CLAUSE_LIMIT]);
-		uksort(
-			$this->clauses,
-			function($clauseNameA, $clauseNameB) use ($priorities)
-			{
-				return $priorities[$clauseNameA] - $priorities[$clauseNameB];
-			});
+    protected function buildQuery()
+    {
+        $priorities = array_flip([
+            self::CLAUSE_BASE,
+            self::CLAUSE_JOIN,
+            self::CLAUSE_WHERE,
+            self::CLAUSE_GROUP,
+            self::CLAUSE_ORDER,
+            self::CLAUSE_LIMIT]);
+        uksort(
+            $this->clauses,
+            function($clauseNameA, $clauseNameB) use ($priorities)
+            {
+                return $priorities[$clauseNameA] - $priorities[$clauseNameB];
+            });
 
-		$query = '';
-		foreach ($this->clauses as $statements)
-		{
-			if (!is_array($statements))
-				$statements = [$statements];
-			foreach ($statements as $statement)
-				$query .= ' ' . $statement;
-		}
-		return trim($query);
-	}
+        $query = '';
+        foreach ($this->clauses as $statements)
+        {
+            if (!is_array($statements))
+                $statements = [$statements];
+            foreach ($statements as $statement)
+                $query .= ' ' . $statement;
+        }
+        return trim($query);
+    }
 
-	protected abstract function init();
+    protected abstract function init();
 
-	protected function bind($value)
-	{
-		$id = ':' . uniqid();
-		$this->parameters[$id] = $value;
-		return $id;
-	}
+    protected function bind($value)
+    {
+        $id = ':' . uniqid();
+        $this->parameters[$id] = $value;
+        return $id;
+    }
 
-	private function throwQueryException($query, $parameters, $message)
-	{
-		throw new \Exception(sprintf(
-			'Problem executing query "%s" with parameters %s: %s',
-			$query,
-			print_r($parameters, true),
-			$message));
-	}
+    private function throwQueryException($query, $parameters, $message)
+    {
+        throw new \Exception(sprintf(
+            'Problem executing query "%s" with parameters %s: %s',
+            $query,
+            print_r($parameters, true),
+            $message));
+    }
 }
diff --git a/src/PDOEx/DeleteQuery.php b/src/PDOEx/DeleteQuery.php
index eef55517..395989c5 100644
--- a/src/PDOEx/DeleteQuery.php
+++ b/src/PDOEx/DeleteQuery.php
@@ -3,8 +3,8 @@ namespace Szurubooru\PDOEx;
 
 class DeleteQuery extends BaseQuery
 {
-	protected function init()
-	{
-		$this->clauses[self::CLAUSE_BASE] = 'DELETE FROM ' . $this->table;
-	}
+    protected function init()
+    {
+        $this->clauses[self::CLAUSE_BASE] = 'DELETE FROM ' . $this->table;
+    }
 }
diff --git a/src/PDOEx/InsertQuery.php b/src/PDOEx/InsertQuery.php
index a42fc27b..0b4e9f22 100644
--- a/src/PDOEx/InsertQuery.php
+++ b/src/PDOEx/InsertQuery.php
@@ -3,39 +3,39 @@ namespace Szurubooru\PDOEx;
 
 class InsertQuery extends BaseQuery
 {
-	private $values = [];
+    private $values = [];
 
-	public function values(array $values)
-	{
-		$this->values = $values;
-		$this->refreshBaseQuery();
-		return $this;
-	}
+    public function values(array $values)
+    {
+        $this->values = $values;
+        $this->refreshBaseQuery();
+        return $this;
+    }
 
-	public function where($key, $value = null)
-	{
-		throw new \BadMethodCallException('This makes no sense!');
-	}
+    public function where($key, $value = null)
+    {
+        throw new \BadMethodCallException('This makes no sense!');
+    }
 
-	public function innerJoin($table, $condition)
-	{
-		throw new \BadMethodCallException('This makes no sense!');
-	}
+    public function innerJoin($table, $condition)
+    {
+        throw new \BadMethodCallException('This makes no sense!');
+    }
 
-	protected function init()
-	{
-		$this->refreshBaseQuery();
-	}
+    protected function init()
+    {
+        $this->refreshBaseQuery();
+    }
 
-	private function refreshBaseQuery()
-	{
-		$sql = 'INSERT INTO ' . $this->table;
-		$sql .= ' (' . implode(', ', array_keys($this->values)) . ')';
-		$sql .= ' VALUES (';
-		foreach ($this->values as $value)
-			$sql .= $this->bind($value) . ', ';
-		$sql = substr($sql, 0, -2);
-		$sql .= ')';
-		$this->clauses[self::CLAUSE_BASE] = $sql;
-	}
+    private function refreshBaseQuery()
+    {
+        $sql = 'INSERT INTO ' . $this->table;
+        $sql .= ' (' . implode(', ', array_keys($this->values)) . ')';
+        $sql .= ' VALUES (';
+        foreach ($this->values as $value)
+            $sql .= $this->bind($value) . ', ';
+        $sql = substr($sql, 0, -2);
+        $sql .= ')';
+        $this->clauses[self::CLAUSE_BASE] = $sql;
+    }
 }
diff --git a/src/PDOEx/PDOEx.php b/src/PDOEx/PDOEx.php
index 14862699..01c049da 100644
--- a/src/PDOEx/PDOEx.php
+++ b/src/PDOEx/PDOEx.php
@@ -3,43 +3,43 @@ namespace Szurubooru\PDOEx;
 
 class PDOEx extends \PDO
 {
-	private $queryCount = 0;
-	private $statements = [];
+    private $queryCount = 0;
+    private $statements = [];
 
-	public function prepare($statement, $driverOptions = [])
-	{
-		++ $this->queryCount;
-		$this->statements[] = $statement;
-		return parent::prepare($statement, $driverOptions);
-	}
+    public function prepare($statement, $driverOptions = [])
+    {
+        ++ $this->queryCount;
+        $this->statements[] = $statement;
+        return parent::prepare($statement, $driverOptions);
+    }
 
-	public function getQueryCount()
-	{
-		return $this->queryCount;
-	}
+    public function getQueryCount()
+    {
+        return $this->queryCount;
+    }
 
-	public function getStatements()
-	{
-		return $this->statements;
-	}
+    public function getStatements()
+    {
+        return $this->statements;
+    }
 
-	public function from($table)
-	{
-		return new SelectQuery($this, $table);
-	}
+    public function from($table)
+    {
+        return new SelectQuery($this, $table);
+    }
 
-	public function insertInto($table)
-	{
-		return new InsertQuery($this, $table);
-	}
+    public function insertInto($table)
+    {
+        return new InsertQuery($this, $table);
+    }
 
-	public function update($table)
-	{
-		return new UpdateQuery($this, $table);
-	}
+    public function update($table)
+    {
+        return new UpdateQuery($this, $table);
+    }
 
-	public function deleteFrom($table)
-	{
-		return new DeleteQuery($this, $table);
-	}
+    public function deleteFrom($table)
+    {
+        return new DeleteQuery($this, $table);
+    }
 }
diff --git a/src/PDOEx/SelectQuery.php b/src/PDOEx/SelectQuery.php
index e19e282e..f6afb4d4 100644
--- a/src/PDOEx/SelectQuery.php
+++ b/src/PDOEx/SelectQuery.php
@@ -3,93 +3,93 @@ namespace Szurubooru\PDOEx;
 
 class SelectQuery extends BaseQuery implements \Countable
 {
-	private $selectTarget = '';
-	private $orderTarget = '';
-	private $offset = 0;
-	private $limit = null;
+    private $selectTarget = '';
+    private $orderTarget = '';
+    private $offset = 0;
+    private $limit = null;
 
-	public function limit($limit)
-	{
-		if ($limit === null || $limit === false)
-			$this->limit = null;
-		else
-			$this->limit = intval($limit);
-		$this->refreshLimitClause();
-		return $this;
-	}
+    public function limit($limit)
+    {
+        if ($limit === null || $limit === false)
+            $this->limit = null;
+        else
+            $this->limit = intval($limit);
+        $this->refreshLimitClause();
+        return $this;
+    }
 
-	public function offset($offset)
-	{
-		$this->offset = intval($offset);
-		$this->refreshLimitClause();
-		return $this;
-	}
+    public function offset($offset)
+    {
+        $this->offset = intval($offset);
+        $this->refreshLimitClause();
+        return $this;
+    }
 
-	public function select($key)
-	{
-		if ($key === null)
-			$this->selectTarget = '';
-		else
-		{
-			if ($this->selectTarget)
-				$this->selectTarget .= ', ';
-			$this->selectTarget .= $key;
-		}
-		$this->refreshBaseClause();
-		return $this;
-	}
+    public function select($key)
+    {
+        if ($key === null)
+            $this->selectTarget = '';
+        else
+        {
+            if ($this->selectTarget)
+                $this->selectTarget .= ', ';
+            $this->selectTarget .= $key;
+        }
+        $this->refreshBaseClause();
+        return $this;
+    }
 
-	public function orderBy($key, $dir = null)
-	{
-		if ($key === null)
-			$this->orderTarget = '';
-		else
-		{
-			if ($this->orderTarget)
-				$this->orderTarget .= ', ';
-			$this->orderTarget .= rtrim($key . ' ' . $dir);
-		}
-		$this->refreshOrderClause();
-		return $this;
-	}
+    public function orderBy($key, $dir = null)
+    {
+        if ($key === null)
+            $this->orderTarget = '';
+        else
+        {
+            if ($this->orderTarget)
+                $this->orderTarget .= ', ';
+            $this->orderTarget .= rtrim($key . ' ' . $dir);
+        }
+        $this->refreshOrderClause();
+        return $this;
+    }
 
-	public function groupBy($key)
-	{
-		$this->clauses[self::CLAUSE_GROUP] = 'GROUP BY ' . $key;
-		return $this;
-	}
+    public function groupBy($key)
+    {
+        $this->clauses[self::CLAUSE_GROUP] = 'GROUP BY ' . $key;
+        return $this;
+    }
 
-	public function count()
-	{
-		$query = clone($this);
-		return iterator_to_array($query->select(null)->select('COUNT(1) AS c'))[0]['c'];
-	}
+    public function count()
+    {
+        $query = clone($this);
+        return iterator_to_array($query->select(null)->select('COUNT(1) AS c'))[0]['c'];
+    }
 
-	protected function init()
-	{
-		$this->selectTarget = $this->table . '.*';
-		$this->refreshBaseClause();
-	}
+    protected function init()
+    {
+        $this->selectTarget = $this->table . '.*';
+        $this->refreshBaseClause();
+    }
 
-	private function refreshBaseClause()
-	{
-		$this->clauses[self::CLAUSE_BASE] = 'SELECT ' . $this->selectTarget . ' FROM ' . $this->table;
-	}
+    private function refreshBaseClause()
+    {
+        $this->clauses[self::CLAUSE_BASE] = 'SELECT ' . $this->selectTarget . ' FROM ' . $this->table;
+    }
 
-	private function refreshOrderClause()
-	{
-		$this->clauses[self::CLAUSE_ORDER] = 'ORDER BY ' . $this->orderTarget;
-	}
+    private function refreshOrderClause()
+    {
+        $this->clauses[self::CLAUSE_ORDER] = 'ORDER BY ' . $this->orderTarget;
+    }
 
-	private function refreshLimitClause()
-	{
-		$sql = '';
-		if ($this->limit !== null)
-		{
-			$sql .= 'LIMIT ' . $this->limit;
-			if ($this->offset !== null && $this->offset !== 0)
-				$sql .= ' OFFSET ' . intval($this->offset);
-		}
-		$this->clauses[self::CLAUSE_LIMIT] = $sql;
-	}
+    private function refreshLimitClause()
+    {
+        $sql = '';
+        if ($this->limit !== null)
+        {
+            $sql .= 'LIMIT ' . $this->limit;
+            if ($this->offset !== null && $this->offset !== 0)
+                $sql .= ' OFFSET ' . intval($this->offset);
+        }
+        $this->clauses[self::CLAUSE_LIMIT] = $sql;
+    }
 }
diff --git a/src/PDOEx/UpdateQuery.php b/src/PDOEx/UpdateQuery.php
index eee43705..28fb05ae 100644
--- a/src/PDOEx/UpdateQuery.php
+++ b/src/PDOEx/UpdateQuery.php
@@ -3,32 +3,32 @@ namespace Szurubooru\PDOEx;
 
 class UpdateQuery extends BaseQuery
 {
-	private $values = [];
+    private $values = [];
 
-	public function set(array $values)
-	{
-		$this->values = $values;
-		$this->refreshBaseQuery();
-		return $this;
-	}
+    public function set(array $values)
+    {
+        $this->values = $values;
+        $this->refreshBaseQuery();
+        return $this;
+    }
 
-	public function innerJoin($table, $condition)
-	{
-		throw new \BadMethodCallException('This makes no sense!');
-	}
+    public function innerJoin($table, $condition)
+    {
+        throw new \BadMethodCallException('This makes no sense!');
+    }
 
-	protected function init()
-	{
-		$this->refreshBaseQuery();
-	}
+    protected function init()
+    {
+        $this->refreshBaseQuery();
+    }
 
-	private function refreshBaseQuery()
-	{
-		$sql = 'UPDATE ' . $this->table;
-		$sql .= ' SET ';
-		foreach ($this->values as $key => $value)
-			$sql .= $key . ' = ' . $this->bind($value) . ', ';
-		$sql = substr($sql, 0, -2);
-		$this->clauses[self::CLAUSE_BASE] = $sql;
-	}
+    private function refreshBaseQuery()
+    {
+        $sql = 'UPDATE ' . $this->table;
+        $sql .= ' SET ';
+        foreach ($this->values as $key => $value)
+            $sql .= $key . ' = ' . $this->bind($value) . ', ';
+        $sql = substr($sql, 0, -2);
+        $this->clauses[self::CLAUSE_BASE] = $sql;
+    }
 }
diff --git a/src/Privilege.php b/src/Privilege.php
index 26765ba0..78de4ec0 100644
--- a/src/Privilege.php
+++ b/src/Privilege.php
@@ -3,58 +3,58 @@ namespace Szurubooru;
 
 class Privilege
 {
-	const REGISTER = 'register';
-	const LIST_USERS = 'listUsers';
-	const VIEW_USERS = 'viewUsers';
-	const VIEW_ALL_EMAIL_ADDRESSES = 'viewAllEmailAddresses';
-	const VIEW_ALL_ACCESS_RANKS = 'viewAllAccessRanks';
-	const CHANGE_ACCESS_RANK = 'changeAccessRank';
-	const CHANGE_OWN_AVATAR_STYLE = 'changeOwnAvatarStyle';
-	const CHANGE_OWN_EMAIL_ADDRESS = 'changeOwnEmailAddress';
-	const CHANGE_OWN_NAME = 'changeOwnName';
-	const CHANGE_OWN_PASSWORD = 'changeOwnPassword';
-	const CHANGE_ALL_AVATAR_STYLES = 'changeAllAvatarStyles';
-	const CHANGE_ALL_EMAIL_ADDRESSES = 'changeAllEmailAddresses';
-	const CHANGE_ALL_NAMES = 'changeAllNames';
-	const CHANGE_ALL_PASSWORDS = 'changeAllPasswords';
-	const DELETE_OWN_ACCOUNT = 'deleteOwnAccount';
-	const DELETE_ALL_ACCOUNTS = 'deleteAllAccounts';
-	const BAN_USERS = 'banUsers';
+    const REGISTER = 'register';
+    const LIST_USERS = 'listUsers';
+    const VIEW_USERS = 'viewUsers';
+    const VIEW_ALL_EMAIL_ADDRESSES = 'viewAllEmailAddresses';
+    const VIEW_ALL_ACCESS_RANKS = 'viewAllAccessRanks';
+    const CHANGE_ACCESS_RANK = 'changeAccessRank';
+    const CHANGE_OWN_AVATAR_STYLE = 'changeOwnAvatarStyle';
+    const CHANGE_OWN_EMAIL_ADDRESS = 'changeOwnEmailAddress';
+    const CHANGE_OWN_NAME = 'changeOwnName';
+    const CHANGE_OWN_PASSWORD = 'changeOwnPassword';
+    const CHANGE_ALL_AVATAR_STYLES = 'changeAllAvatarStyles';
+    const CHANGE_ALL_EMAIL_ADDRESSES = 'changeAllEmailAddresses';
+    const CHANGE_ALL_NAMES = 'changeAllNames';
+    const CHANGE_ALL_PASSWORDS = 'changeAllPasswords';
+    const DELETE_OWN_ACCOUNT = 'deleteOwnAccount';
+    const DELETE_ALL_ACCOUNTS = 'deleteAllAccounts';
+    const BAN_USERS = 'banUsers';
 
-	const LIST_POSTS = 'listPosts';
-	const VIEW_POSTS = 'viewPosts';
-	const UPLOAD_POSTS = 'uploadPosts';
-	const UPLOAD_POSTS_ANONYMOUSLY = 'uploadPostsAnonymously';
-	const DELETE_POSTS = 'deletePosts';
-	const FEATURE_POSTS = 'featurePosts';
-	const CHANGE_POST_SAFETY = 'changePostSafety';
-	const CHANGE_POST_SOURCE = 'changePostSource';
-	const CHANGE_POST_TAGS = 'changePostTags';
-	const CHANGE_POST_CONTENT = 'changePostContent';
-	const CHANGE_POST_THUMBNAIL = 'changePostThumbnail';
-	const CHANGE_POST_RELATIONS = 'changePostRelations';
-	const CHANGE_POST_FLAGS = 'changePostFlags';
+    const LIST_POSTS = 'listPosts';
+    const VIEW_POSTS = 'viewPosts';
+    const UPLOAD_POSTS = 'uploadPosts';
+    const UPLOAD_POSTS_ANONYMOUSLY = 'uploadPostsAnonymously';
+    const DELETE_POSTS = 'deletePosts';
+    const FEATURE_POSTS = 'featurePosts';
+    const CHANGE_POST_SAFETY = 'changePostSafety';
+    const CHANGE_POST_SOURCE = 'changePostSource';
+    const CHANGE_POST_TAGS = 'changePostTags';
+    const CHANGE_POST_CONTENT = 'changePostContent';
+    const CHANGE_POST_THUMBNAIL = 'changePostThumbnail';
+    const CHANGE_POST_RELATIONS = 'changePostRelations';
+    const CHANGE_POST_FLAGS = 'changePostFlags';
 
-	const ADD_POST_NOTES = 'addPostNotes';
-	const EDIT_POST_NOTES = 'editPostNotes';
-	const DELETE_POST_NOTES = 'deletePostNotes';
+    const ADD_POST_NOTES = 'addPostNotes';
+    const EDIT_POST_NOTES = 'editPostNotes';
+    const DELETE_POST_NOTES = 'deletePostNotes';
 
-	const LIST_TAGS = 'listTags';
-	const MASS_TAG = 'massTag';
-	const CHANGE_TAG_NAME = 'changeTagName';
-	const CHANGE_TAG_CATEGORY = 'changeTagCategory';
-	const CHANGE_TAG_IMPLICATIONS = 'changeTagImplications';
-	const CHANGE_TAG_SUGGESTIONS = 'changeTagSuggestions';
-	const BAN_TAGS = 'banTags';
-	const DELETE_TAGS = 'deleteTags';
-	const MERGE_TAGS = 'mergeTags';
+    const LIST_TAGS = 'listTags';
+    const MASS_TAG = 'massTag';
+    const CHANGE_TAG_NAME = 'changeTagName';
+    const CHANGE_TAG_CATEGORY = 'changeTagCategory';
+    const CHANGE_TAG_IMPLICATIONS = 'changeTagImplications';
+    const CHANGE_TAG_SUGGESTIONS = 'changeTagSuggestions';
+    const BAN_TAGS = 'banTags';
+    const DELETE_TAGS = 'deleteTags';
+    const MERGE_TAGS = 'mergeTags';
 
-	const LIST_COMMENTS = 'listComments';
-	const ADD_COMMENTS = 'addComments';
-	const EDIT_OWN_COMMENTS = 'editOwnComments';
-	const EDIT_ALL_COMMENTS = 'editAllComments';
-	const DELETE_OWN_COMMENTS = 'deleteOwnComments';
-	const DELETE_ALL_COMMENTS = 'deleteAllComments';
+    const LIST_COMMENTS = 'listComments';
+    const ADD_COMMENTS = 'addComments';
+    const EDIT_OWN_COMMENTS = 'editOwnComments';
+    const EDIT_ALL_COMMENTS = 'editAllComments';
+    const DELETE_OWN_COMMENTS = 'deleteOwnComments';
+    const DELETE_ALL_COMMENTS = 'deleteAllComments';
 
-	const VIEW_HISTORY = 'viewHistory';
+    const VIEW_HISTORY = 'viewHistory';
 }
diff --git a/src/RouteRepository.php b/src/RouteRepository.php
index dc754041..5e964eee 100644
--- a/src/RouteRepository.php
+++ b/src/RouteRepository.php
@@ -3,27 +3,27 @@ namespace Szurubooru;
 
 class RouteRepository
 {
-	private $routes = [];
+    private $routes = [];
 
-	public function __construct(array $routes)
-	{
-		$this->routes = $routes;
-	}
+    public function __construct(array $routes)
+    {
+        $this->routes = $routes;
+    }
 
-	public function getRoutes()
-	{
-		return $this->routes;
-	}
+    public function getRoutes()
+    {
+        return $this->routes;
+    }
 
-	public function injectRoutes(Router $router)
-	{
-		foreach ($this->routes as $route)
-		{
-			foreach ($route->getMethods() as $method)
-			{
-				$method = strtolower($method);
-				$router->$method($route->getUrl(), [$route, 'work']);
-			}
-		}
-	}
+    public function injectRoutes(Router $router)
+    {
+        foreach ($this->routes as $route)
+        {
+            foreach ($route->getMethods() as $method)
+            {
+                $method = strtolower($method);
+                $router->$method($route->getUrl(), [$route, 'work']);
+            }
+        }
+    }
 }
diff --git a/src/Router.php b/src/Router.php
index 7fb5a620..b3b41b19 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -3,55 +3,55 @@ namespace Szurubooru;
 
 class Router
 {
-	private $routes;
+    private $routes;
 
-	public function get($url, callable $function)
-	{
-		$this->inject('GET', $url, $function);
-	}
+    public function get($url, callable $function)
+    {
+        $this->inject('GET', $url, $function);
+    }
 
-	public function post($url, callable $function)
-	{
-		$this->inject('POST', $url, $function);
-	}
+    public function post($url, callable $function)
+    {
+        $this->inject('POST', $url, $function);
+    }
 
-	public function put($url, callable $function)
-	{
-		$this->inject('PUT', $url, $function);
-	}
+    public function put($url, callable $function)
+    {
+        $this->inject('PUT', $url, $function);
+    }
 
-	public function delete($url, callable $function)
-	{
-		$this->inject('DELETE', $url, $function);
-	}
+    public function delete($url, callable $function)
+    {
+        $this->inject('DELETE', $url, $function);
+    }
 
-	public function handle($method, $request)
-	{
-		if (!isset($this->routes[$method]))
-			throw new \DomainException('Unhandled request method: ' . $method);
+    public function handle($method, $request)
+    {
+        if (!isset($this->routes[$method]))
+            throw new \DomainException('Unhandled request method: ' . $method);
 
-		$request = trim($request, '/');
-		foreach ($this->routes[$method] as $url => $callback)
-		{
-			if (!preg_match(self::getRegex($url), $request, $matches))
-				continue;
+        $request = trim($request, '/');
+        foreach ($this->routes[$method] as $url => $callback)
+        {
+            if (!preg_match(self::getRegex($url), $request, $matches))
+                continue;
 
-			return $callback($matches);
-		}
+            return $callback($matches);
+        }
 
-		throw new \DomainException('Unhandled request address: ' . $request);
-	}
+        throw new \DomainException('Unhandled request address: ' . $request);
+    }
 
-	private function inject($method, $url, callable $function)
-	{
-		if (!isset($this->routes[$method]))
-			$this->routes[$method] = [];
-		$this->routes[$method][$url] = $function;
-	}
+    private function inject($method, $url, callable $function)
+    {
+        if (!isset($this->routes[$method]))
+            $this->routes[$method] = [];
+        $this->routes[$method][$url] = $function;
+    }
 
-	private static function getRegex($url)
-	{
-		$quotedQuery = preg_quote(trim($url, '/'), '/');
-		return '/^' . preg_replace('/\\\?\:([a-zA-Z_-]*)/', '(?P<\1>[^\/]+)', $quotedQuery) . '$/i';
-	}
+    private static function getRegex($url)
+    {
+        $quotedQuery = preg_quote(trim($url, '/'), '/');
+        return '/^' . preg_replace('/\\\?\:([a-zA-Z_-]*)/', '(?P<\1>[^\/]+)', $quotedQuery) . '$/i';
+    }
 }
diff --git a/src/Routes/AbstractRoute.php b/src/Routes/AbstractRoute.php
index 33a87edc..a2ec0ebd 100644
--- a/src/Routes/AbstractRoute.php
+++ b/src/Routes/AbstractRoute.php
@@ -3,9 +3,9 @@ namespace Szurubooru\Routes;
 
 abstract class AbstractRoute
 {
-	public abstract function getMethods();
+    public abstract function getMethods();
 
-	public abstract function getUrl();
+    public abstract function getUrl();
 
-	public abstract function work($args);
+    public abstract function work($args);
 }
diff --git a/src/Routes/Comments/AbstractCommentRoute.php b/src/Routes/Comments/AbstractCommentRoute.php
index 2136fd3e..2ac28244 100644
--- a/src/Routes/Comments/AbstractCommentRoute.php
+++ b/src/Routes/Comments/AbstractCommentRoute.php
@@ -5,11 +5,11 @@ use Szurubooru\ViewProxies\CommentViewProxy;
 
 abstract class AbstractCommentRoute extends AbstractRoute
 {
-	protected function getCommentsFetchConfig()
-	{
-		return
-		[
-			CommentViewProxy::FETCH_OWN_SCORE => true,
-		];
-	}
+    protected function getCommentsFetchConfig()
+    {
+        return
+        [
+            CommentViewProxy::FETCH_OWN_SCORE => true,
+        ];
+    }
 }
diff --git a/src/Routes/Comments/AddComment.php b/src/Routes/Comments/AddComment.php
index 8cf76a65..4d013ae3 100644
--- a/src/Routes/Comments/AddComment.php
+++ b/src/Routes/Comments/AddComment.php
@@ -10,45 +10,45 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 class AddComment extends AbstractCommentRoute
 {
-	private $privilegeService;
-	private $postService;
-	private $commentService;
-	private $commentViewProxy;
-	private $postViewProxy;
-	private $inputReader;
+    private $privilegeService;
+    private $postService;
+    private $commentService;
+    private $commentViewProxy;
+    private $postViewProxy;
+    private $inputReader;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		CommentService $commentService,
-		CommentViewProxy $commentViewProxy,
-		PostViewProxy $postViewProxy,
-		InputReader $inputReader)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->commentService = $commentService;
-		$this->commentViewProxy = $commentViewProxy;
-		$this->postViewProxy = $postViewProxy;
-		$this->inputReader = $inputReader;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        CommentService $commentService,
+        CommentViewProxy $commentViewProxy,
+        PostViewProxy $postViewProxy,
+        InputReader $inputReader)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->commentService = $commentService;
+        $this->commentViewProxy = $commentViewProxy;
+        $this->postViewProxy = $postViewProxy;
+        $this->inputReader = $inputReader;
+    }
 
-	public function getMethods()
-	{
-		return ['POST'];
-	}
+    public function getMethods()
+    {
+        return ['POST'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/comments/:postNameOrId';
-	}
+    public function getUrl()
+    {
+        return '/api/comments/:postNameOrId';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::ADD_COMMENTS);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::ADD_COMMENTS);
 
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		$comment = $this->commentService->createComment($post, $this->inputReader->text);
-		return $this->commentViewProxy->fromEntity($comment, $this->getCommentsFetchConfig());
-	}
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        $comment = $this->commentService->createComment($post, $this->inputReader->text);
+        return $this->commentViewProxy->fromEntity($comment, $this->getCommentsFetchConfig());
+    }
 }
diff --git a/src/Routes/Comments/DeleteComment.php b/src/Routes/Comments/DeleteComment.php
index c17c3b1c..c6701a6f 100644
--- a/src/Routes/Comments/DeleteComment.php
+++ b/src/Routes/Comments/DeleteComment.php
@@ -10,48 +10,48 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 class DeleteComment extends AbstractCommentRoute
 {
-	private $privilegeService;
-	private $postService;
-	private $commentService;
-	private $commentViewProxy;
-	private $postViewProxy;
-	private $inputReader;
+    private $privilegeService;
+    private $postService;
+    private $commentService;
+    private $commentViewProxy;
+    private $postViewProxy;
+    private $inputReader;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		CommentService $commentService,
-		CommentViewProxy $commentViewProxy,
-		PostViewProxy $postViewProxy,
-		InputReader $inputReader)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->commentService = $commentService;
-		$this->commentViewProxy = $commentViewProxy;
-		$this->postViewProxy = $postViewProxy;
-		$this->inputReader = $inputReader;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        CommentService $commentService,
+        CommentViewProxy $commentViewProxy,
+        PostViewProxy $postViewProxy,
+        InputReader $inputReader)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->commentService = $commentService;
+        $this->commentViewProxy = $commentViewProxy;
+        $this->postViewProxy = $postViewProxy;
+        $this->inputReader = $inputReader;
+    }
 
-	public function getMethods()
-	{
-		return ['DELETE'];
-	}
+    public function getMethods()
+    {
+        return ['DELETE'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/comments/:commentId';
-	}
+    public function getUrl()
+    {
+        return '/api/comments/:commentId';
+    }
 
-	public function work($args)
-	{
-		$comment = $this->commentService->getById($args['commentId']);
+    public function work($args)
+    {
+        $comment = $this->commentService->getById($args['commentId']);
 
-		$this->privilegeService->assertPrivilege(
-			$this->privilegeService->isLoggedIn($comment->getUser())
-				? Privilege::DELETE_OWN_COMMENTS
-				: Privilege::DELETE_ALL_COMMENTS);
+        $this->privilegeService->assertPrivilege(
+            $this->privilegeService->isLoggedIn($comment->getUser())
+                ? Privilege::DELETE_OWN_COMMENTS
+                : Privilege::DELETE_ALL_COMMENTS);
 
-		return $this->commentService->deleteComment($comment);
-	}
+        return $this->commentService->deleteComment($comment);
+    }
 }
diff --git a/src/Routes/Comments/EditComment.php b/src/Routes/Comments/EditComment.php
index 26072180..96ea52a1 100644
--- a/src/Routes/Comments/EditComment.php
+++ b/src/Routes/Comments/EditComment.php
@@ -10,49 +10,49 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 class EditComment extends AbstractCommentRoute
 {
-	private $privilegeService;
-	private $postService;
-	private $commentService;
-	private $commentViewProxy;
-	private $postViewProxy;
-	private $inputReader;
+    private $privilegeService;
+    private $postService;
+    private $commentService;
+    private $commentViewProxy;
+    private $postViewProxy;
+    private $inputReader;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		CommentService $commentService,
-		CommentViewProxy $commentViewProxy,
-		PostViewProxy $postViewProxy,
-		InputReader $inputReader)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->commentService = $commentService;
-		$this->commentViewProxy = $commentViewProxy;
-		$this->postViewProxy = $postViewProxy;
-		$this->inputReader = $inputReader;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        CommentService $commentService,
+        CommentViewProxy $commentViewProxy,
+        PostViewProxy $postViewProxy,
+        InputReader $inputReader)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->commentService = $commentService;
+        $this->commentViewProxy = $commentViewProxy;
+        $this->postViewProxy = $postViewProxy;
+        $this->inputReader = $inputReader;
+    }
 
-	public function getMethods()
-	{
-		return ['PUT'];
-	}
+    public function getMethods()
+    {
+        return ['PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/comments/:commentId';
-	}
+    public function getUrl()
+    {
+        return '/api/comments/:commentId';
+    }
 
-	public function work($args)
-	{
-		$comment = $this->commentService->getById($args['commentId']);
+    public function work($args)
+    {
+        $comment = $this->commentService->getById($args['commentId']);
 
-		$this->privilegeService->assertPrivilege(
-			($comment->getUser() && $this->privilegeService->isLoggedIn($comment->getUser()))
-				? Privilege::EDIT_OWN_COMMENTS
-				: Privilege::EDIT_ALL_COMMENTS);
+        $this->privilegeService->assertPrivilege(
+            ($comment->getUser() && $this->privilegeService->isLoggedIn($comment->getUser()))
+                ? Privilege::EDIT_OWN_COMMENTS
+                : Privilege::EDIT_ALL_COMMENTS);
 
-		$comment = $this->commentService->updateComment($comment, $this->inputReader->text);
-		return $this->commentViewProxy->fromEntity($comment, $this->getCommentsFetchConfig());
-	}
+        $comment = $this->commentService->updateComment($comment, $this->inputReader->text);
+        return $this->commentViewProxy->fromEntity($comment, $this->getCommentsFetchConfig());
+    }
 }
diff --git a/src/Routes/Comments/GetComments.php b/src/Routes/Comments/GetComments.php
index 55e86ee9..be3c4f40 100644
--- a/src/Routes/Comments/GetComments.php
+++ b/src/Routes/Comments/GetComments.php
@@ -13,75 +13,75 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 class GetComments extends AbstractCommentRoute
 {
-	private $privilegeService;
-	private $postService;
-	private $commentService;
-	private $commentViewProxy;
-	private $postViewProxy;
-	private $inputReader;
+    private $privilegeService;
+    private $postService;
+    private $commentService;
+    private $commentViewProxy;
+    private $postViewProxy;
+    private $inputReader;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		CommentService $commentService,
-		CommentViewProxy $commentViewProxy,
-		PostViewProxy $postViewProxy,
-		InputReader $inputReader)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->commentService = $commentService;
-		$this->commentViewProxy = $commentViewProxy;
-		$this->postViewProxy = $postViewProxy;
-		$this->inputReader = $inputReader;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        CommentService $commentService,
+        CommentViewProxy $commentViewProxy,
+        PostViewProxy $postViewProxy,
+        InputReader $inputReader)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->commentService = $commentService;
+        $this->commentViewProxy = $commentViewProxy;
+        $this->postViewProxy = $postViewProxy;
+        $this->inputReader = $inputReader;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/comments';
-	}
+    public function getUrl()
+    {
+        return '/api/comments';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::LIST_COMMENTS);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::LIST_COMMENTS);
 
-		$filter = new PostFilter();
-		$filter->setPageSize(10);
-		$filter->setPageNumber($this->inputReader->page);
-		$filter->setOrder([
-			PostFilter::ORDER_LAST_COMMENT_TIME =>
-			PostFilter::ORDER_DESC]);
+        $filter = new PostFilter();
+        $filter->setPageSize(10);
+        $filter->setPageNumber($this->inputReader->page);
+        $filter->setOrder([
+            PostFilter::ORDER_LAST_COMMENT_TIME =>
+            PostFilter::ORDER_DESC]);
 
-		$this->postService->decorateFilterFromBrowsingSettings($filter);
+        $this->postService->decorateFilterFromBrowsingSettings($filter);
 
-		$requirement = new Requirement();
-		$requirement->setValue(new RequirementRangedValue());
-		$requirement->getValue()->setMinValue(1);
-		$requirement->setType(PostFilter::REQUIREMENT_COMMENT_COUNT);
-		$filter->addRequirement($requirement);
+        $requirement = new Requirement();
+        $requirement->setValue(new RequirementRangedValue());
+        $requirement->getValue()->setMinValue(1);
+        $requirement->setType(PostFilter::REQUIREMENT_COMMENT_COUNT);
+        $filter->addRequirement($requirement);
 
-		$result = $this->postService->getFiltered($filter);
-		$posts = $result->getEntities();
+        $result = $this->postService->getFiltered($filter);
+        $posts = $result->getEntities();
 
-		$data = [];
-		foreach ($posts as $post)
-		{
-			$data[] = [
-				'post' => $this->postViewProxy->fromEntity($post),
-				'comments' => $this->commentViewProxy->fromArray(
-					array_reverse($this->commentService->getByPost($post)),
-					$this->getCommentsFetchConfig()),
-			];
-		}
+        $data = [];
+        foreach ($posts as $post)
+        {
+            $data[] = [
+                'post' => $this->postViewProxy->fromEntity($post),
+                'comments' => $this->commentViewProxy->fromArray(
+                    array_reverse($this->commentService->getByPost($post)),
+                    $this->getCommentsFetchConfig()),
+            ];
+        }
 
-		return [
-			'data' => $data,
-			'pageSize' => $result->getPageSize(),
-			'totalRecords' => $result->getTotalRecords()];
-	}
+        return [
+            'data' => $data,
+            'pageSize' => $result->getPageSize(),
+            'totalRecords' => $result->getTotalRecords()];
+    }
 }
diff --git a/src/Routes/Comments/GetPostComments.php b/src/Routes/Comments/GetPostComments.php
index 7687d137..5052cdf2 100644
--- a/src/Routes/Comments/GetPostComments.php
+++ b/src/Routes/Comments/GetPostComments.php
@@ -13,56 +13,56 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 class GetPostComments extends AbstractCommentRoute
 {
-	private $privilegeService;
-	private $postService;
-	private $commentService;
-	private $commentViewProxy;
-	private $postViewProxy;
-	private $inputReader;
+    private $privilegeService;
+    private $postService;
+    private $commentService;
+    private $commentViewProxy;
+    private $postViewProxy;
+    private $inputReader;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		CommentService $commentService,
-		CommentViewProxy $commentViewProxy,
-		PostViewProxy $postViewProxy,
-		InputReader $inputReader)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->commentService = $commentService;
-		$this->commentViewProxy = $commentViewProxy;
-		$this->postViewProxy = $postViewProxy;
-		$this->inputReader = $inputReader;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        CommentService $commentService,
+        CommentViewProxy $commentViewProxy,
+        PostViewProxy $postViewProxy,
+        InputReader $inputReader)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->commentService = $commentService;
+        $this->commentViewProxy = $commentViewProxy;
+        $this->postViewProxy = $postViewProxy;
+        $this->inputReader = $inputReader;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/comments/:postNameOrId';
-	}
+    public function getUrl()
+    {
+        return '/api/comments/:postNameOrId';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::LIST_COMMENTS);
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::LIST_COMMENTS);
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
 
-		$filter = new CommentFilter();
-		$filter->setOrder([
-			CommentFilter::ORDER_ID =>
-			CommentFilter::ORDER_ASC]);
+        $filter = new CommentFilter();
+        $filter->setOrder([
+            CommentFilter::ORDER_ID =>
+            CommentFilter::ORDER_ASC]);
 
-		$requirement = new Requirement();
-		$requirement->setValue(new RequirementSingleValue($post->getId()));
-		$requirement->setType(CommentFilter::REQUIREMENT_POST_ID);
-		$filter->addRequirement($requirement);
+        $requirement = new Requirement();
+        $requirement->setValue(new RequirementSingleValue($post->getId()));
+        $requirement->setType(CommentFilter::REQUIREMENT_POST_ID);
+        $filter->addRequirement($requirement);
 
-		$result = $this->commentService->getFiltered($filter);
-		$entities = $this->commentViewProxy->fromArray($result->getEntities(), $this->getCommentsFetchConfig());
-		return ['data' => $entities];
-	}
+        $result = $this->commentService->getFiltered($filter);
+        $entities = $this->commentViewProxy->fromArray($result->getEntities(), $this->getCommentsFetchConfig());
+        return ['data' => $entities];
+    }
 }
diff --git a/src/Routes/Favorites/AddToFavorites.php b/src/Routes/Favorites/AddToFavorites.php
index a1527f53..a6c8ef0c 100644
--- a/src/Routes/Favorites/AddToFavorites.php
+++ b/src/Routes/Favorites/AddToFavorites.php
@@ -9,44 +9,44 @@ use Szurubooru\ViewProxies\UserViewProxy;
 
 class AddToFavorites extends AbstractRoute
 {
-	private $privilegeService;
-	private $authService;
-	private $postService;
-	private $favoritesService;
-	private $userViewProxy;
+    private $privilegeService;
+    private $authService;
+    private $postService;
+    private $favoritesService;
+    private $userViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		AuthService $authService,
-		PostService $postService,
-		FavoritesService $favoritesService,
-		UserViewProxy $userViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->authService = $authService;
-		$this->postService = $postService;
-		$this->favoritesService = $favoritesService;
-		$this->userViewProxy = $userViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        AuthService $authService,
+        PostService $postService,
+        FavoritesService $favoritesService,
+        UserViewProxy $userViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->authService = $authService;
+        $this->postService = $postService;
+        $this->favoritesService = $favoritesService;
+        $this->userViewProxy = $userViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postNameOrId/favorites';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postNameOrId/favorites';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertLoggedIn();
-		$user = $this->authService->getLoggedInUser();
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		$this->favoritesService->addFavorite($user, $post);
+    public function work($args)
+    {
+        $this->privilegeService->assertLoggedIn();
+        $user = $this->authService->getLoggedInUser();
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        $this->favoritesService->addFavorite($user, $post);
 
-		$users = $this->favoritesService->getFavoriteUsers($post);
-		return ['data' => $this->userViewProxy->fromArray($users)];
-	}
+        $users = $this->favoritesService->getFavoriteUsers($post);
+        return ['data' => $this->userViewProxy->fromArray($users)];
+    }
 }
diff --git a/src/Routes/Favorites/GetFavoriteUsers.php b/src/Routes/Favorites/GetFavoriteUsers.php
index 5eacd75e..9064b4f3 100644
--- a/src/Routes/Favorites/GetFavoriteUsers.php
+++ b/src/Routes/Favorites/GetFavoriteUsers.php
@@ -9,40 +9,40 @@ use Szurubooru\ViewProxies\UserViewProxy;
 
 class GetFavoriteUsers extends AbstractRoute
 {
-	private $privilegeService;
-	private $authService;
-	private $postService;
-	private $favoritesService;
-	private $userViewProxy;
+    private $privilegeService;
+    private $authService;
+    private $postService;
+    private $favoritesService;
+    private $userViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		AuthService $authService,
-		PostService $postService,
-		FavoritesService $favoritesService,
-		UserViewProxy $userViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->authService = $authService;
-		$this->postService = $postService;
-		$this->favoritesService = $favoritesService;
-		$this->userViewProxy = $userViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        AuthService $authService,
+        PostService $postService,
+        FavoritesService $favoritesService,
+        UserViewProxy $userViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->authService = $authService;
+        $this->postService = $postService;
+        $this->favoritesService = $favoritesService;
+        $this->userViewProxy = $userViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postNameOrId/favorites';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postNameOrId/favorites';
+    }
 
-	public function work($args)
-	{
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		$users = $this->favoritesService->getFavoriteUsers($post);
-		return ['data' => $this->userViewProxy->fromArray($users)];
-	}
+    public function work($args)
+    {
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        $users = $this->favoritesService->getFavoriteUsers($post);
+        return ['data' => $this->userViewProxy->fromArray($users)];
+    }
 }
diff --git a/src/Routes/Favorites/RemoveFromFavorites.php b/src/Routes/Favorites/RemoveFromFavorites.php
index 7754edca..2cd84a6e 100644
--- a/src/Routes/Favorites/RemoveFromFavorites.php
+++ b/src/Routes/Favorites/RemoveFromFavorites.php
@@ -9,44 +9,44 @@ use Szurubooru\ViewProxies\UserViewProxy;
 
 class RemoveFromFavorites extends AbstractRoute
 {
-	private $privilegeService;
-	private $authService;
-	private $postService;
-	private $favoritesService;
-	private $userViewProxy;
+    private $privilegeService;
+    private $authService;
+    private $postService;
+    private $favoritesService;
+    private $userViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		AuthService $authService,
-		PostService $postService,
-		FavoritesService $favoritesService,
-		UserViewProxy $userViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->authService = $authService;
-		$this->postService = $postService;
-		$this->favoritesService = $favoritesService;
-		$this->userViewProxy = $userViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        AuthService $authService,
+        PostService $postService,
+        FavoritesService $favoritesService,
+        UserViewProxy $userViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->authService = $authService;
+        $this->postService = $postService;
+        $this->favoritesService = $favoritesService;
+        $this->userViewProxy = $userViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['DELETE'];
-	}
+    public function getMethods()
+    {
+        return ['DELETE'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postNameOrId/favorites';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postNameOrId/favorites';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertLoggedIn();
-		$user = $this->authService->getLoggedInUser();
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		$this->favoritesService->deleteFavorite($user, $post);
+    public function work($args)
+    {
+        $this->privilegeService->assertLoggedIn();
+        $user = $this->authService->getLoggedInUser();
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        $this->favoritesService->deleteFavorite($user, $post);
 
-		$users = $this->favoritesService->getFavoriteUsers($post);
-		return ['data' => $this->userViewProxy->fromArray($users)];
-	}
+        $users = $this->favoritesService->getFavoriteUsers($post);
+        return ['data' => $this->userViewProxy->fromArray($users)];
+    }
 }
diff --git a/src/Routes/GetGlobals.php b/src/Routes/GetGlobals.php
index 6afe84c4..c5edbaba 100644
--- a/src/Routes/GetGlobals.php
+++ b/src/Routes/GetGlobals.php
@@ -4,31 +4,31 @@ use Szurubooru\Dao\GlobalParamDao;
 
 class GetGlobals extends AbstractRoute
 {
-	private $globalParamDao;
+    private $globalParamDao;
 
-	public function __construct(GlobalParamDao $globalParamDao)
-	{
-		$this->globalParamDao = $globalParamDao;
-	}
+    public function __construct(GlobalParamDao $globalParamDao)
+    {
+        $this->globalParamDao = $globalParamDao;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/globals';
-	}
+    public function getUrl()
+    {
+        return '/api/globals';
+    }
 
-	public function work($args)
-	{
-		$globals = $this->globalParamDao->findAll();
-		$result = [];
-		foreach ($globals as $global)
-		{
-			$result[$global->getKey()] = $global->getValue();
-		}
-		return $result;
-	}
+    public function work($args)
+    {
+        $globals = $this->globalParamDao->findAll();
+        $result = [];
+        foreach ($globals as $global)
+        {
+            $result[$global->getKey()] = $global->getValue();
+        }
+        return $result;
+    }
 }
diff --git a/src/Routes/GetHistory.php b/src/Routes/GetHistory.php
index 3604b49b..684ea246 100644
--- a/src/Routes/GetHistory.php
+++ b/src/Routes/GetHistory.php
@@ -10,47 +10,47 @@ use Szurubooru\ViewProxies\SnapshotViewProxy;
 
 class GetHistory extends AbstractRoute
 {
-	private $historyService;
-	private $privilegeService;
-	private $snapshotSearchParser;
-	private $inputReader;
-	private $snapshotViewProxy;
+    private $historyService;
+    private $privilegeService;
+    private $snapshotSearchParser;
+    private $inputReader;
+    private $snapshotViewProxy;
 
-	public function __construct(
-		HistoryService $historyService,
-		PrivilegeService $privilegeService,
-		SnapshotSearchParser $snapshotSearchParser,
-		InputReader $inputReader,
-		SnapshotViewProxy $snapshotViewProxy)
-	{
-		$this->historyService = $historyService;
-		$this->privilegeService = $privilegeService;
-		$this->snapshotSearchParser = $snapshotSearchParser;
-		$this->inputReader = $inputReader;
-		$this->snapshotViewProxy = $snapshotViewProxy;
-	}
+    public function __construct(
+        HistoryService $historyService,
+        PrivilegeService $privilegeService,
+        SnapshotSearchParser $snapshotSearchParser,
+        InputReader $inputReader,
+        SnapshotViewProxy $snapshotViewProxy)
+    {
+        $this->historyService = $historyService;
+        $this->privilegeService = $privilegeService;
+        $this->snapshotSearchParser = $snapshotSearchParser;
+        $this->inputReader = $inputReader;
+        $this->snapshotViewProxy = $snapshotViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/history';
-	}
+    public function getUrl()
+    {
+        return '/api/history';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::VIEW_HISTORY);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::VIEW_HISTORY);
 
-		$filter = $this->snapshotSearchParser->createFilterFromInputReader($this->inputReader);
-		$filter->setPageSize(50);
-		$result = $this->historyService->getFiltered($filter);
-		$entities = $this->snapshotViewProxy->fromArray($result->getEntities());
-		return [
-			'data' => $entities,
-			'pageSize' => $result->getPageSize(),
-			'totalRecords' => $result->getTotalRecords()];
-	}
+        $filter = $this->snapshotSearchParser->createFilterFromInputReader($this->inputReader);
+        $filter->setPageSize(50);
+        $result = $this->historyService->getFiltered($filter);
+        $entities = $this->snapshotViewProxy->fromArray($result->getEntities());
+        return [
+            'data' => $entities,
+            'pageSize' => $result->getPageSize(),
+            'totalRecords' => $result->getTotalRecords()];
+    }
 }
diff --git a/src/Routes/Login.php b/src/Routes/Login.php
index 5fac1b85..61923883 100644
--- a/src/Routes/Login.php
+++ b/src/Routes/Login.php
@@ -12,73 +12,73 @@ use Szurubooru\ViewProxies\UserViewProxy;
 
 class Login extends AbstractRoute
 {
-	private $authService;
-	private $userService;
-	private $tokenService;
-	private $privilegeService;
-	private $inputReader;
-	private $userViewProxy;
-	private $tokenViewProxy;
+    private $authService;
+    private $userService;
+    private $tokenService;
+    private $privilegeService;
+    private $inputReader;
+    private $userViewProxy;
+    private $tokenViewProxy;
 
-	public function __construct(
-		AuthService $authService,
-		UserService $userService,
-		TokenService $tokenService,
-		PrivilegeService $privilegeService,
-		InputReader $inputReader,
-		UserViewProxy $userViewProxy,
-		TokenViewProxy $tokenViewProxy)
-	{
-		$this->authService = $authService;
-		$this->userService = $userService;
-		$this->tokenService = $tokenService;
-		$this->privilegeService = $privilegeService;
-		$this->inputReader = $inputReader;
-		$this->userViewProxy = $userViewProxy;
-		$this->tokenViewProxy = $tokenViewProxy;
-	}
+    public function __construct(
+        AuthService $authService,
+        UserService $userService,
+        TokenService $tokenService,
+        PrivilegeService $privilegeService,
+        InputReader $inputReader,
+        UserViewProxy $userViewProxy,
+        TokenViewProxy $tokenViewProxy)
+    {
+        $this->authService = $authService;
+        $this->userService = $userService;
+        $this->tokenService = $tokenService;
+        $this->privilegeService = $privilegeService;
+        $this->inputReader = $inputReader;
+        $this->userViewProxy = $userViewProxy;
+        $this->tokenViewProxy = $tokenViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/login';
-	}
+    public function getUrl()
+    {
+        return '/api/login';
+    }
 
-	public function work($args)
-	{
-		if (isset($this->inputReader->userNameOrEmail) && isset($this->inputReader->password))
-		{
-			$formData = new LoginFormData($this->inputReader);
-			$this->authService->loginFromCredentials($formData);
+    public function work($args)
+    {
+        if (isset($this->inputReader->userNameOrEmail) && isset($this->inputReader->password))
+        {
+            $formData = new LoginFormData($this->inputReader);
+            $this->authService->loginFromCredentials($formData);
 
-			$user = $this->authService->getLoggedInUser();
-			$this->userService->updateUserLastLoginTime($user);
-		}
-		elseif (isset($this->inputReader->token))
-		{
-			$token = $this->tokenService->getByName($this->inputReader->token);
-			$this->authService->loginFromToken($token);
+            $user = $this->authService->getLoggedInUser();
+            $this->userService->updateUserLastLoginTime($user);
+        }
+        elseif (isset($this->inputReader->token))
+        {
+            $token = $this->tokenService->getByName($this->inputReader->token);
+            $this->authService->loginFromToken($token);
 
-			$user = $this->authService->getLoggedInUser();
-			$isFromCookie = boolval($this->inputReader->isFromCookie);
-			if ($isFromCookie)
-				$this->userService->updateUserLastLoginTime($user);
-		}
-		else
-		{
-			$this->authService->loginAnonymous();
-			$user = $this->authService->getLoggedInUser();
-		}
+            $user = $this->authService->getLoggedInUser();
+            $isFromCookie = boolval($this->inputReader->isFromCookie);
+            if ($isFromCookie)
+                $this->userService->updateUserLastLoginTime($user);
+        }
+        else
+        {
+            $this->authService->loginAnonymous();
+            $user = $this->authService->getLoggedInUser();
+        }
 
-		return
-		[
-			'token' => $this->tokenViewProxy->fromEntity($this->authService->getLoginToken()),
-			'user' => $this->userViewProxy->fromEntity($user),
-			'privileges' => $this->privilegeService->getCurrentPrivileges(),
-		];
-	}
+        return
+        [
+            'token' => $this->tokenViewProxy->fromEntity($this->authService->getLoginToken()),
+            'user' => $this->userViewProxy->fromEntity($user),
+            'privileges' => $this->privilegeService->getCurrentPrivileges(),
+        ];
+    }
 }
diff --git a/src/Routes/Posts/AbstractPostRoute.php b/src/Routes/Posts/AbstractPostRoute.php
index 7b97bd3f..05b57bea 100644
--- a/src/Routes/Posts/AbstractPostRoute.php
+++ b/src/Routes/Posts/AbstractPostRoute.php
@@ -5,25 +5,25 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 abstract class AbstractPostRoute extends AbstractRoute
 {
-	protected function getFullFetchConfig()
-	{
-		return
-		[
-			PostViewProxy::FETCH_RELATIONS => true,
-			PostViewProxy::FETCH_TAGS => true,
-			PostViewProxy::FETCH_USER => true,
-			PostViewProxy::FETCH_HISTORY => true,
-			PostViewProxy::FETCH_OWN_SCORE => true,
-			PostViewProxy::FETCH_FAVORITES => true,
-			PostViewProxy::FETCH_NOTES => true,
-		];
-	}
+    protected function getFullFetchConfig()
+    {
+        return
+        [
+            PostViewProxy::FETCH_RELATIONS => true,
+            PostViewProxy::FETCH_TAGS => true,
+            PostViewProxy::FETCH_USER => true,
+            PostViewProxy::FETCH_HISTORY => true,
+            PostViewProxy::FETCH_OWN_SCORE => true,
+            PostViewProxy::FETCH_FAVORITES => true,
+            PostViewProxy::FETCH_NOTES => true,
+        ];
+    }
 
-	protected function getLightFetchConfig()
-	{
-		return
-		[
-			PostViewProxy::FETCH_TAGS => true,
-		];
-	}
+    protected function getLightFetchConfig()
+    {
+        return
+        [
+            PostViewProxy::FETCH_TAGS => true,
+        ];
+    }
 }
diff --git a/src/Routes/Posts/CreatePost.php b/src/Routes/Posts/CreatePost.php
index d7f12406..de757cf4 100644
--- a/src/Routes/Posts/CreatePost.php
+++ b/src/Routes/Posts/CreatePost.php
@@ -9,44 +9,44 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 class CreatePost extends AbstractPostRoute
 {
-	private $privilegeService;
-	private $postService;
-	private $inputReader;
-	private $postViewProxy;
+    private $privilegeService;
+    private $postService;
+    private $inputReader;
+    private $postViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		InputReader $inputReader,
-		PostViewProxy $postViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->inputReader = $inputReader;
-		$this->postViewProxy = $postViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        InputReader $inputReader,
+        PostViewProxy $postViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->inputReader = $inputReader;
+        $this->postViewProxy = $postViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['POST'];
-	}
+    public function getMethods()
+    {
+        return ['POST'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts';
-	}
+    public function getUrl()
+    {
+        return '/api/posts';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::UPLOAD_POSTS);
-		$formData = new UploadFormData($this->inputReader);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::UPLOAD_POSTS);
+        $formData = new UploadFormData($this->inputReader);
 
-		$this->privilegeService->assertPrivilege(Privilege::UPLOAD_POSTS);
+        $this->privilegeService->assertPrivilege(Privilege::UPLOAD_POSTS);
 
-		if ($formData->anonymous)
-			$this->privilegeService->assertPrivilege(Privilege::UPLOAD_POSTS_ANONYMOUSLY);
+        if ($formData->anonymous)
+            $this->privilegeService->assertPrivilege(Privilege::UPLOAD_POSTS_ANONYMOUSLY);
 
-		$post = $this->postService->createPost($formData);
-		return $this->postViewProxy->fromEntity($post, $this->getFullFetchConfig());
-	}
+        $post = $this->postService->createPost($formData);
+        return $this->postViewProxy->fromEntity($post, $this->getFullFetchConfig());
+    }
 }
diff --git a/src/Routes/Posts/DeletePost.php b/src/Routes/Posts/DeletePost.php
index 24084f74..6b83861c 100644
--- a/src/Routes/Posts/DeletePost.php
+++ b/src/Routes/Posts/DeletePost.php
@@ -6,32 +6,32 @@ use Szurubooru\Services\PrivilegeService;
 
 class DeletePost extends AbstractPostRoute
 {
-	private $privilegeService;
-	private $postService;
+    private $privilegeService;
+    private $postService;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+    }
 
-	public function getMethods()
-	{
-		return ['DELETE'];
-	}
+    public function getMethods()
+    {
+        return ['DELETE'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postNameOrId';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postNameOrId';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::DELETE_POSTS);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::DELETE_POSTS);
 
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		$this->postService->deletePost($post);
-	}
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        $this->postService->deletePost($post);
+    }
 }
diff --git a/src/Routes/Posts/FeaturePost.php b/src/Routes/Posts/FeaturePost.php
index bb84e1c2..aa5ab365 100644
--- a/src/Routes/Posts/FeaturePost.php
+++ b/src/Routes/Posts/FeaturePost.php
@@ -7,35 +7,35 @@ use Szurubooru\Services\PrivilegeService;
 
 class FeaturePost extends AbstractPostRoute
 {
-	private $privilegeService;
-	private $postService;
-	private $postFeatureService;
+    private $privilegeService;
+    private $postService;
+    private $postFeatureService;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		PostFeatureService $postFeatureService)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->postFeatureService = $postFeatureService;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        PostFeatureService $postFeatureService)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->postFeatureService = $postFeatureService;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postNameOrId/feature';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postNameOrId/feature';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::FEATURE_POSTS);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::FEATURE_POSTS);
 
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		$this->postFeatureService->featurePost($post);
-	}
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        $this->postFeatureService->featurePost($post);
+    }
 }
diff --git a/src/Routes/Posts/GetFeaturedPost.php b/src/Routes/Posts/GetFeaturedPost.php
index de55755f..160e4922 100644
--- a/src/Routes/Posts/GetFeaturedPost.php
+++ b/src/Routes/Posts/GetFeaturedPost.php
@@ -7,36 +7,36 @@ use Szurubooru\ViewProxies\UserViewProxy;
 
 class GetFeaturedPost extends AbstractPostRoute
 {
-	private $postFeatureService;
-	private $postViewProxy;
+    private $postFeatureService;
+    private $postViewProxy;
 
-	public function __construct(
-		PostFeatureService $postFeatureService,
-		UserViewProxy $userViewProxy,
-		PostViewProxy $postViewProxy)
-	{
-		$this->postFeatureService = $postFeatureService;
-		$this->userViewProxy = $userViewProxy;
-		$this->postViewProxy = $postViewProxy;
-	}
+    public function __construct(
+        PostFeatureService $postFeatureService,
+        UserViewProxy $userViewProxy,
+        PostViewProxy $postViewProxy)
+    {
+        $this->postFeatureService = $postFeatureService;
+        $this->userViewProxy = $userViewProxy;
+        $this->postViewProxy = $postViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/featured';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/featured';
+    }
 
-	public function work($args)
-	{
-		$post = $this->postFeatureService->getFeaturedPost();
-		$user = $this->postFeatureService->getFeaturedPostUser();
-		return [
-			'user' => $this->userViewProxy->fromEntity($user),
-			'post' => $this->postViewProxy->fromEntity($post, $this->getFullFetchConfig()),
-		];
-	}
+    public function work($args)
+    {
+        $post = $this->postFeatureService->getFeaturedPost();
+        $user = $this->postFeatureService->getFeaturedPostUser();
+        return [
+            'user' => $this->userViewProxy->fromEntity($user),
+            'post' => $this->postViewProxy->fromEntity($post, $this->getFullFetchConfig()),
+        ];
+    }
 }
diff --git a/src/Routes/Posts/GetPost.php b/src/Routes/Posts/GetPost.php
index 502aafe5..91f4f612 100644
--- a/src/Routes/Posts/GetPost.php
+++ b/src/Routes/Posts/GetPost.php
@@ -7,35 +7,35 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 class GetPost extends AbstractPostRoute
 {
-	private $privilegeService;
-	private $postService;
-	private $postViewProxy;
+    private $privilegeService;
+    private $postService;
+    private $postViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		PostViewProxy $postViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->postViewProxy = $postViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        PostViewProxy $postViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->postViewProxy = $postViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postNameOrId';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postNameOrId';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::VIEW_POSTS);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::VIEW_POSTS);
 
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		return $this->postViewProxy->fromEntity($post, $this->getFullFetchConfig());
-	}
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        return $this->postViewProxy->fromEntity($post, $this->getFullFetchConfig());
+    }
 }
diff --git a/src/Routes/Posts/GetPostContent.php b/src/Routes/Posts/GetPostContent.php
index 8b06a5c2..a7ab9fe6 100644
--- a/src/Routes/Posts/GetPostContent.php
+++ b/src/Routes/Posts/GetPostContent.php
@@ -9,48 +9,48 @@ use Szurubooru\Services\PostService;
 
 class GetPostContent extends AbstractPostRoute
 {
-	private $config;
-	private $fileDao;
-	private $postService;
-	private $networkingService;
+    private $config;
+    private $fileDao;
+    private $postService;
+    private $networkingService;
 
-	public function __construct(
-		Config $config,
-		PublicFileDao $fileDao,
-		PostService $postService,
-		NetworkingService $networkingService)
-	{
-		$this->config = $config;
-		$this->fileDao = $fileDao;
-		$this->postService = $postService;
-		$this->networkingService = $networkingService;
-	}
+    public function __construct(
+        Config $config,
+        PublicFileDao $fileDao,
+        PostService $postService,
+        NetworkingService $networkingService)
+    {
+        $this->config = $config;
+        $this->fileDao = $fileDao;
+        $this->postService = $postService;
+        $this->networkingService = $networkingService;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postName/content';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postName/content';
+    }
 
-	public function work($args)
-	{
-		$post = $this->postService->getByName($args['postName']);
+    public function work($args)
+    {
+        $post = $this->postService->getByName($args['postName']);
 
-		$customFileName = sprintf('%s_%s.%s',
-			$this->config->basic->serviceName,
-			$post->getName(),
-			strtolower(MimeHelper::getExtension($post->getContentMimeType())));
+        $customFileName = sprintf('%s_%s.%s',
+            $this->config->basic->serviceName,
+            $post->getName(),
+            strtolower(MimeHelper::getExtension($post->getContentMimeType())));
 
-		if ($post->getContentType() === Post::POST_TYPE_YOUTUBE)
-		{
-			$this->networkingService->nonCachedRedirect($post->getOriginalFileName());
-			return;
-		}
+        if ($post->getContentType() === Post::POST_TYPE_YOUTUBE)
+        {
+            $this->networkingService->nonCachedRedirect($post->getOriginalFileName());
+            return;
+        }
 
-		$this->networkingService->serveFile($this->fileDao->getFullPath($post->getContentPath()), $customFileName);
-	}
+        $this->networkingService->serveFile($this->fileDao->getFullPath($post->getContentPath()), $customFileName);
+    }
 }
diff --git a/src/Routes/Posts/GetPostThumbnail.php b/src/Routes/Posts/GetPostThumbnail.php
index bf3e8149..f305de5d 100644
--- a/src/Routes/Posts/GetPostThumbnail.php
+++ b/src/Routes/Posts/GetPostThumbnail.php
@@ -9,41 +9,41 @@ use Szurubooru\Services\PostThumbnailService;
 
 class GetPostThumbnail extends AbstractPostRoute
 {
-	private $config;
-	private $fileDao;
-	private $postService;
-	private $networkingService;
-	private $postThumbnailService;
+    private $config;
+    private $fileDao;
+    private $postService;
+    private $networkingService;
+    private $postThumbnailService;
 
-	public function __construct(
-		Config $config,
-		PublicFileDao $fileDao,
-		PostService $postService,
-		NetworkingService $networkingService,
-		PostThumbnailService $postThumbnailService)
-	{
-		$this->config = $config;
-		$this->fileDao = $fileDao;
-		$this->postService = $postService;
-		$this->networkingService = $networkingService;
-		$this->postThumbnailService = $postThumbnailService;
-	}
+    public function __construct(
+        Config $config,
+        PublicFileDao $fileDao,
+        PostService $postService,
+        NetworkingService $networkingService,
+        PostThumbnailService $postThumbnailService)
+    {
+        $this->config = $config;
+        $this->fileDao = $fileDao;
+        $this->postService = $postService;
+        $this->networkingService = $networkingService;
+        $this->postThumbnailService = $postThumbnailService;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postName/thumbnail/:size';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postName/thumbnail/:size';
+    }
 
-	public function work($args)
-	{
-		$size = $args['size'];
-		$post = $this->postService->getByName($args['postName']);
-		$thumbnailName = $this->postThumbnailService->generateIfNeeded($post, $size, $size);
-		$this->networkingService->serveFile($this->fileDao->getFullPath($thumbnailName));
-	}
+    public function work($args)
+    {
+        $size = $args['size'];
+        $post = $this->postService->getByName($args['postName']);
+        $thumbnailName = $this->postThumbnailService->generateIfNeeded($post, $size, $size);
+        $this->networkingService->serveFile($this->fileDao->getFullPath($thumbnailName));
+    }
 }
diff --git a/src/Routes/Posts/GetPosts.php b/src/Routes/Posts/GetPosts.php
index 8e5ad955..3cdab1d6 100644
--- a/src/Routes/Posts/GetPosts.php
+++ b/src/Routes/Posts/GetPosts.php
@@ -10,52 +10,52 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 class GetPosts extends AbstractPostRoute
 {
-	private $config;
-	private $privilegeService;
-	private $postService;
-	private $postSearchParser;
-	private $inputReader;
-	private $postViewProxy;
+    private $config;
+    private $privilegeService;
+    private $postService;
+    private $postSearchParser;
+    private $inputReader;
+    private $postViewProxy;
 
-	public function __construct(
-		Config $config,
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		PostSearchParser $postSearchParser,
-		InputReader $inputReader,
-		PostViewProxy $postViewProxy)
-	{
-		$this->config = $config;
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->postSearchParser = $postSearchParser;
-		$this->inputReader = $inputReader;
-		$this->postViewProxy = $postViewProxy;
-	}
+    public function __construct(
+        Config $config,
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        PostSearchParser $postSearchParser,
+        InputReader $inputReader,
+        PostViewProxy $postViewProxy)
+    {
+        $this->config = $config;
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->postSearchParser = $postSearchParser;
+        $this->inputReader = $inputReader;
+        $this->postViewProxy = $postViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts';
-	}
+    public function getUrl()
+    {
+        return '/api/posts';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::LIST_POSTS);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::LIST_POSTS);
 
-		$filter = $this->postSearchParser->createFilterFromInputReader($this->inputReader);
-		$filter->setPageSize($this->config->posts->postsPerPage);
-		$this->postService->decorateFilterFromBrowsingSettings($filter);
+        $filter = $this->postSearchParser->createFilterFromInputReader($this->inputReader);
+        $filter->setPageSize($this->config->posts->postsPerPage);
+        $this->postService->decorateFilterFromBrowsingSettings($filter);
 
-		$result = $this->postService->getFiltered($filter);
-		$entities = $this->postViewProxy->fromArray($result->getEntities(), $this->getLightFetchConfig());
-		return [
-			'data' => $entities,
-			'pageSize' => $result->getPageSize(),
-			'totalRecords' => $result->getTotalRecords()];
-	}
+        $result = $this->postService->getFiltered($filter);
+        $entities = $this->postViewProxy->fromArray($result->getEntities(), $this->getLightFetchConfig());
+        return [
+            'data' => $entities,
+            'pageSize' => $result->getPageSize(),
+            'totalRecords' => $result->getTotalRecords()];
+    }
 }
diff --git a/src/Routes/Posts/Notes/AddPostNote.php b/src/Routes/Posts/Notes/AddPostNote.php
index 3df5a7aa..5e3fa76e 100644
--- a/src/Routes/Posts/Notes/AddPostNote.php
+++ b/src/Routes/Posts/Notes/AddPostNote.php
@@ -11,44 +11,44 @@ use Szurubooru\ViewProxies\PostNoteViewProxy;
 
 class AddPostNote extends AbstractPostRoute
 {
-	private $inputReader;
-	private $postService;
-	private $postNotesService;
-	private $privilegeService;
-	private $postNoteViewProxy;
+    private $inputReader;
+    private $postService;
+    private $postNotesService;
+    private $privilegeService;
+    private $postNoteViewProxy;
 
-	public function __construct(
-		InputReader $inputReader,
-		PostService $postService,
-		PostNotesService $postNotesService,
-		PrivilegeService $privilegeService,
-		PostNoteViewProxy $postNoteViewProxy)
-	{
-		$this->inputReader = $inputReader;
-		$this->postService = $postService;
-		$this->postNotesService = $postNotesService;
-		$this->privilegeService = $privilegeService;
-		$this->postNoteViewProxy = $postNoteViewProxy;
-	}
+    public function __construct(
+        InputReader $inputReader,
+        PostService $postService,
+        PostNotesService $postNotesService,
+        PrivilegeService $privilegeService,
+        PostNoteViewProxy $postNoteViewProxy)
+    {
+        $this->inputReader = $inputReader;
+        $this->postService = $postService;
+        $this->postNotesService = $postNotesService;
+        $this->privilegeService = $privilegeService;
+        $this->postNoteViewProxy = $postNoteViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['POST'];
-	}
+    public function getMethods()
+    {
+        return ['POST'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/notes/:postNameOrId';
-	}
+    public function getUrl()
+    {
+        return '/api/notes/:postNameOrId';
+    }
 
-	public function work($args)
-	{
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
+    public function work($args)
+    {
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
 
-		$this->privilegeService->assertPrivilege(Privilege::ADD_POST_NOTES);
+        $this->privilegeService->assertPrivilege(Privilege::ADD_POST_NOTES);
 
-		$formData = new PostNoteFormData($this->inputReader);
-		$postNote = $this->postNotesService->createPostNote($post, $formData);
-		return $this->postNoteViewProxy->fromEntity($postNote);
-	}
+        $formData = new PostNoteFormData($this->inputReader);
+        $postNote = $this->postNotesService->createPostNote($post, $formData);
+        return $this->postNoteViewProxy->fromEntity($postNote);
+    }
 }
diff --git a/src/Routes/Posts/Notes/DeletePostNote.php b/src/Routes/Posts/Notes/DeletePostNote.php
index 8667fc89..f97c645a 100644
--- a/src/Routes/Posts/Notes/DeletePostNote.php
+++ b/src/Routes/Posts/Notes/DeletePostNote.php
@@ -7,31 +7,31 @@ use Szurubooru\Services\PrivilegeService;
 
 class DeletePostNote extends AbstractPostRoute
 {
-	private $postNotesService;
-	private $privilegeService;
+    private $postNotesService;
+    private $privilegeService;
 
-	public function __construct(
-		PostNotesService $postNotesService,
-		PrivilegeService $privilegeService)
-	{
-		$this->postNotesService = $postNotesService;
-		$this->privilegeService = $privilegeService;
-	}
+    public function __construct(
+        PostNotesService $postNotesService,
+        PrivilegeService $privilegeService)
+    {
+        $this->postNotesService = $postNotesService;
+        $this->privilegeService = $privilegeService;
+    }
 
-	public function getMethods()
-	{
-		return ['DELETE'];
-	}
+    public function getMethods()
+    {
+        return ['DELETE'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/notes/:postNoteId';
-	}
+    public function getUrl()
+    {
+        return '/api/notes/:postNoteId';
+    }
 
-	public function work($args)
-	{
-		$postNote = $this->postNotesService->getById($args['postNoteId']);
-		$this->privilegeService->assertPrivilege(Privilege::DELETE_POST_NOTES);
-		return $this->postNotesService->deletePostNote($postNote);
-	}
+    public function work($args)
+    {
+        $postNote = $this->postNotesService->getById($args['postNoteId']);
+        $this->privilegeService->assertPrivilege(Privilege::DELETE_POST_NOTES);
+        return $this->postNotesService->deletePostNote($postNote);
+    }
 }
diff --git a/src/Routes/Posts/Notes/GetPostNotes.php b/src/Routes/Posts/Notes/GetPostNotes.php
index 5ef988fd..a5232bca 100644
--- a/src/Routes/Posts/Notes/GetPostNotes.php
+++ b/src/Routes/Posts/Notes/GetPostNotes.php
@@ -10,40 +10,40 @@ use Szurubooru\ViewProxies\PostNoteViewProxy;
 
 class GetPostNotes extends AbstractPostRoute
 {
-	private $inputReader;
-	private $postService;
-	private $postNotesService;
-	private $privilegeService;
-	private $postNoteViewProxy;
+    private $inputReader;
+    private $postService;
+    private $postNotesService;
+    private $privilegeService;
+    private $postNoteViewProxy;
 
-	public function __construct(
-		InputReader $inputReader,
-		PostService $postService,
-		PostNotesService $postNotesService,
-		PrivilegeService $privilegeService,
-		PostNoteViewProxy $postNoteViewProxy)
-	{
-		$this->inputReader = $inputReader;
-		$this->postService = $postService;
-		$this->postNotesService = $postNotesService;
-		$this->privilegeService = $privilegeService;
-		$this->postNoteViewProxy = $postNoteViewProxy;
-	}
+    public function __construct(
+        InputReader $inputReader,
+        PostService $postService,
+        PostNotesService $postNotesService,
+        PrivilegeService $privilegeService,
+        PostNoteViewProxy $postNoteViewProxy)
+    {
+        $this->inputReader = $inputReader;
+        $this->postService = $postService;
+        $this->postNotesService = $postNotesService;
+        $this->privilegeService = $privilegeService;
+        $this->postNoteViewProxy = $postNoteViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/notes/:postNameOrId';
-	}
+    public function getUrl()
+    {
+        return '/api/notes/:postNameOrId';
+    }
 
-	public function work($args)
-	{
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		$postNotes = $this->postNotesService->getByPost($post);
-		return $this->postNoteViewProxy->fromArray($postNotes);
-	}
+    public function work($args)
+    {
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        $postNotes = $this->postNotesService->getByPost($post);
+        return $this->postNoteViewProxy->fromArray($postNotes);
+    }
 }
diff --git a/src/Routes/Posts/Notes/UpdatePostNote.php b/src/Routes/Posts/Notes/UpdatePostNote.php
index 76fa2656..a96bfd78 100644
--- a/src/Routes/Posts/Notes/UpdatePostNote.php
+++ b/src/Routes/Posts/Notes/UpdatePostNote.php
@@ -10,41 +10,41 @@ use Szurubooru\ViewProxies\PostNoteViewProxy;
 
 class UpdatePostNote extends AbstractPostRoute
 {
-	private $inputReader;
-	private $postNotesService;
-	private $privilegeService;
-	private $postNoteViewProxy;
+    private $inputReader;
+    private $postNotesService;
+    private $privilegeService;
+    private $postNoteViewProxy;
 
-	public function __construct(
-		InputReader $inputReader,
-		PostNotesService $postNotesService,
-		PrivilegeService $privilegeService,
-		PostNoteViewProxy $postNoteViewProxy)
-	{
-		$this->inputReader = $inputReader;
-		$this->postNotesService = $postNotesService;
-		$this->privilegeService = $privilegeService;
-		$this->postNoteViewProxy = $postNoteViewProxy;
-	}
+    public function __construct(
+        InputReader $inputReader,
+        PostNotesService $postNotesService,
+        PrivilegeService $privilegeService,
+        PostNoteViewProxy $postNoteViewProxy)
+    {
+        $this->inputReader = $inputReader;
+        $this->postNotesService = $postNotesService;
+        $this->privilegeService = $privilegeService;
+        $this->postNoteViewProxy = $postNoteViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['PUT'];
-	}
+    public function getMethods()
+    {
+        return ['PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/notes/:postNoteId';
-	}
+    public function getUrl()
+    {
+        return '/api/notes/:postNoteId';
+    }
 
-	public function work($args)
-	{
-		$postNote = $this->postNotesService->getById($args['postNoteId']);
+    public function work($args)
+    {
+        $postNote = $this->postNotesService->getById($args['postNoteId']);
 
-		$this->privilegeService->assertPrivilege(Privilege::EDIT_POST_NOTES);
+        $this->privilegeService->assertPrivilege(Privilege::EDIT_POST_NOTES);
 
-		$formData = new PostNoteFormData($this->inputReader);
-		$postNote = $this->postNotesService->updatePostNote($postNote, $formData);
-		return $this->postNoteViewProxy->fromEntity($postNote);
-	}
+        $formData = new PostNoteFormData($this->inputReader);
+        $postNote = $this->postNotesService->updatePostNote($postNote, $formData);
+        return $this->postNoteViewProxy->fromEntity($postNote);
+    }
 }
diff --git a/src/Routes/Posts/UpdatePost.php b/src/Routes/Posts/UpdatePost.php
index 475dc1ef..5787af40 100644
--- a/src/Routes/Posts/UpdatePost.php
+++ b/src/Routes/Posts/UpdatePost.php
@@ -9,56 +9,56 @@ use Szurubooru\ViewProxies\PostViewProxy;
 
 class UpdatePost extends AbstractPostRoute
 {
-	private $privilegeService;
-	private $postService;
-	private $inputReader;
-	private $postViewProxy;
+    private $privilegeService;
+    private $postService;
+    private $inputReader;
+    private $postViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		PostService $postService,
-		InputReader $inputReader,
-		PostViewProxy $postViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->postService = $postService;
-		$this->inputReader = $inputReader;
-		$this->postViewProxy = $postViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        PostService $postService,
+        InputReader $inputReader,
+        PostViewProxy $postViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->postService = $postService;
+        $this->inputReader = $inputReader;
+        $this->postViewProxy = $postViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['POST'];
-	}
+    public function getMethods()
+    {
+        return ['POST'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postNameOrId';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postNameOrId';
+    }
 
-	public function work($args)
-	{
-		$postNameOrId = $args['postNameOrId'];
-		$post = $this->postService->getByNameOrId($postNameOrId);
-		$formData = new PostEditFormData($this->inputReader);
+    public function work($args)
+    {
+        $postNameOrId = $args['postNameOrId'];
+        $post = $this->postService->getByNameOrId($postNameOrId);
+        $formData = new PostEditFormData($this->inputReader);
 
-		if ($formData->content !== null)
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_CONTENT);
+        if ($formData->content !== null)
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_CONTENT);
 
-		if ($formData->thumbnail !== null)
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_THUMBNAIL);
+        if ($formData->thumbnail !== null)
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_THUMBNAIL);
 
-		if ($formData->safety !== null)
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_SAFETY);
+        if ($formData->safety !== null)
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_SAFETY);
 
-		if ($formData->source !== null)
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_SOURCE);
+        if ($formData->source !== null)
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_SOURCE);
 
-		if ($formData->tags !== null)
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_TAGS);
+        if ($formData->tags !== null)
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_POST_TAGS);
 
-		$this->postService->updatePost($post, $formData);
-		$post = $this->postService->getByNameOrId($postNameOrId);
-		return $this->postViewProxy->fromEntity($post, $this->getFullFetchConfig());
-	}
+        $this->postService->updatePost($post, $formData);
+        $post = $this->postService->getByNameOrId($postNameOrId);
+        return $this->postViewProxy->fromEntity($post, $this->getFullFetchConfig());
+    }
 }
diff --git a/src/Routes/Scores/AbstractScoreRoute.php b/src/Routes/Scores/AbstractScoreRoute.php
index 44807816..052181b8 100644
--- a/src/Routes/Scores/AbstractScoreRoute.php
+++ b/src/Routes/Scores/AbstractScoreRoute.php
@@ -9,40 +9,40 @@ use Szurubooru\Routes\AbstractRoute;
 
 abstract class AbstractScoreRoute extends AbstractRoute
 {
-	private $privilegeService;
-	private $scoreService;
-	private $authService;
+    private $privilegeService;
+    private $scoreService;
+    private $authService;
 
-	public function __construct(
-		AuthService $authService,
-		InputReader $inputReader,
-		PrivilegeService $privilegeService,
-		ScoreService $scoreService)
-	{
-		$this->authService = $authService;
-		$this->inputReader = $inputReader;
-		$this->privilegeService = $privilegeService;
-		$this->scoreService = $scoreService;
-	}
+    public function __construct(
+        AuthService $authService,
+        InputReader $inputReader,
+        PrivilegeService $privilegeService,
+        ScoreService $scoreService)
+    {
+        $this->authService = $authService;
+        $this->inputReader = $inputReader;
+        $this->privilegeService = $privilegeService;
+        $this->scoreService = $scoreService;
+    }
 
-	protected function getScore(Entity $entity)
-	{
-		$user = $this->authService->getLoggedInUser();
-		return [
-			'score' => $this->scoreService->getScoreValue($entity),
-			'ownScore' => $this->scoreService->getUserScoreValue($user, $entity),
-		];
-	}
+    protected function getScore(Entity $entity)
+    {
+        $user = $this->authService->getLoggedInUser();
+        return [
+            'score' => $this->scoreService->getScoreValue($entity),
+            'ownScore' => $this->scoreService->getUserScoreValue($user, $entity),
+        ];
+    }
 
-	protected function setScore(Entity $entity)
-	{
-		$this->privilegeService->assertLoggedIn();
-		$score = intval($this->inputReader->score);
-		$user = $this->authService->getLoggedInUser();
-		$result = $this->scoreService->setUserScore($user, $entity, $score);
-		return [
-			'score' => $this->scoreService->getScoreValue($entity),
-			'ownScore' => $result->getScore(),
-		];
-	}
+    protected function setScore(Entity $entity)
+    {
+        $this->privilegeService->assertLoggedIn();
+        $score = intval($this->inputReader->score);
+        $user = $this->authService->getLoggedInUser();
+        $result = $this->scoreService->setUserScore($user, $entity, $score);
+        return [
+            'score' => $this->scoreService->getScoreValue($entity),
+            'ownScore' => $result->getScore(),
+        ];
+    }
 }
diff --git a/src/Routes/Scores/GetCommentScore.php b/src/Routes/Scores/GetCommentScore.php
index 58b2325f..a1c6a08f 100644
--- a/src/Routes/Scores/GetCommentScore.php
+++ b/src/Routes/Scores/GetCommentScore.php
@@ -9,37 +9,37 @@ use Szurubooru\Services\ScoreService;
 
 class GetCommentScore extends AbstractScoreRoute
 {
-	private $commentService;
+    private $commentService;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		AuthService $authService,
-		CommentService $commentService,
-		ScoreService $scoreService,
-		InputReader $inputReader)
-	{
-		parent::__construct(
-			$authService,
-			$inputReader,
-			$privilegeService,
-			$scoreService);
+    public function __construct(
+        PrivilegeService $privilegeService,
+        AuthService $authService,
+        CommentService $commentService,
+        ScoreService $scoreService,
+        InputReader $inputReader)
+    {
+        parent::__construct(
+            $authService,
+            $inputReader,
+            $privilegeService,
+            $scoreService);
 
-		$this->commentService = $commentService;
-	}
+        $this->commentService = $commentService;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/comments/:commentId/score';
-	}
+    public function getUrl()
+    {
+        return '/api/comments/:commentId/score';
+    }
 
-	public function work($args)
-	{
-		$comment = $this->commentService->getById($args['commentId']);
-		return $this->getScore($comment);
-	}
+    public function work($args)
+    {
+        $comment = $this->commentService->getById($args['commentId']);
+        return $this->getScore($comment);
+    }
 }
diff --git a/src/Routes/Scores/GetPostScore.php b/src/Routes/Scores/GetPostScore.php
index fbb15130..0a90e009 100644
--- a/src/Routes/Scores/GetPostScore.php
+++ b/src/Routes/Scores/GetPostScore.php
@@ -9,37 +9,37 @@ use Szurubooru\Services\ScoreService;
 
 class GetPostScore extends AbstractScoreRoute
 {
-	private $postService;
+    private $postService;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		AuthService $authService,
-		PostService $postService,
-		ScoreService $scoreService,
-		InputReader $inputReader)
-	{
-		parent::__construct(
-			$authService,
-			$inputReader,
-			$privilegeService,
-			$scoreService);
+    public function __construct(
+        PrivilegeService $privilegeService,
+        AuthService $authService,
+        PostService $postService,
+        ScoreService $scoreService,
+        InputReader $inputReader)
+    {
+        parent::__construct(
+            $authService,
+            $inputReader,
+            $privilegeService,
+            $scoreService);
 
-		$this->postService = $postService;
-	}
+        $this->postService = $postService;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postNameOrId/score';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postNameOrId/score';
+    }
 
-	public function work($args)
-	{
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		return $this->getScore($post);
-	}
+    public function work($args)
+    {
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        return $this->getScore($post);
+    }
 }
diff --git a/src/Routes/Scores/SetCommentScore.php b/src/Routes/Scores/SetCommentScore.php
index 70355748..bd1a1ea3 100644
--- a/src/Routes/Scores/SetCommentScore.php
+++ b/src/Routes/Scores/SetCommentScore.php
@@ -9,37 +9,37 @@ use Szurubooru\Services\ScoreService;
 
 class SetCommentScore extends AbstractScoreRoute
 {
-	private $commentService;
+    private $commentService;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		AuthService $authService,
-		CommentService $commentService,
-		ScoreService $scoreService,
-		InputReader $inputReader)
-	{
-		parent::__construct(
-			$authService,
-			$inputReader,
-			$privilegeService,
-			$scoreService);
+    public function __construct(
+        PrivilegeService $privilegeService,
+        AuthService $authService,
+        CommentService $commentService,
+        ScoreService $scoreService,
+        InputReader $inputReader)
+    {
+        parent::__construct(
+            $authService,
+            $inputReader,
+            $privilegeService,
+            $scoreService);
 
-		$this->commentService = $commentService;
-	}
+        $this->commentService = $commentService;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/comments/:commentId/score';
-	}
+    public function getUrl()
+    {
+        return '/api/comments/:commentId/score';
+    }
 
-	public function work($args)
-	{
-		$comment = $this->commentService->getById($args['commentId']);
-		return $this->setScore($comment);
-	}
+    public function work($args)
+    {
+        $comment = $this->commentService->getById($args['commentId']);
+        return $this->setScore($comment);
+    }
 }
diff --git a/src/Routes/Scores/SetPostScore.php b/src/Routes/Scores/SetPostScore.php
index 1b5a8a65..8ca564f4 100644
--- a/src/Routes/Scores/SetPostScore.php
+++ b/src/Routes/Scores/SetPostScore.php
@@ -9,37 +9,37 @@ use Szurubooru\Services\ScoreService;
 
 class SetPostScore extends AbstractScoreRoute
 {
-	private $postService;
+    private $postService;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		AuthService $authService,
-		PostService $postService,
-		ScoreService $scoreService,
-		InputReader $inputReader)
-	{
-		parent::__construct(
-			$authService,
-			$inputReader,
-			$privilegeService,
-			$scoreService);
+    public function __construct(
+        PrivilegeService $privilegeService,
+        AuthService $authService,
+        PostService $postService,
+        ScoreService $scoreService,
+        InputReader $inputReader)
+    {
+        parent::__construct(
+            $authService,
+            $inputReader,
+            $privilegeService,
+            $scoreService);
 
-		$this->postService = $postService;
-	}
+        $this->postService = $postService;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/posts/:postNameOrId/score';
-	}
+    public function getUrl()
+    {
+        return '/api/posts/:postNameOrId/score';
+    }
 
-	public function work($args)
-	{
-		$post = $this->postService->getByNameOrId($args['postNameOrId']);
-		return $this->setScore($post);
-	}
+    public function work($args)
+    {
+        $post = $this->postService->getByNameOrId($args['postNameOrId']);
+        return $this->setScore($post);
+    }
 }
diff --git a/src/Routes/Tags/AbstractTagRoute.php b/src/Routes/Tags/AbstractTagRoute.php
index ed64d7bf..ed1da51a 100644
--- a/src/Routes/Tags/AbstractTagRoute.php
+++ b/src/Routes/Tags/AbstractTagRoute.php
@@ -5,13 +5,13 @@ use Szurubooru\ViewProxies\TagViewProxy;
 
 abstract class AbstractTagRoute extends AbstractRoute
 {
-	protected function getFullFetchConfig()
-	{
-		return
-		[
-			TagViewProxy::FETCH_IMPLICATIONS => true,
-			TagViewProxy::FETCH_SUGGESTIONS => true,
-			TagViewProxy::FETCH_HISTORY => true,
-		];
-	}
+    protected function getFullFetchConfig()
+    {
+        return
+        [
+            TagViewProxy::FETCH_IMPLICATIONS => true,
+            TagViewProxy::FETCH_SUGGESTIONS => true,
+            TagViewProxy::FETCH_HISTORY => true,
+        ];
+    }
 }
diff --git a/src/Routes/Tags/DeleteTag.php b/src/Routes/Tags/DeleteTag.php
index 786189c7..0cd827a0 100644
--- a/src/Routes/Tags/DeleteTag.php
+++ b/src/Routes/Tags/DeleteTag.php
@@ -6,31 +6,31 @@ use Szurubooru\Services\TagService;
 
 class DeleteTag extends AbstractTagRoute
 {
-	private $privilegeService;
-	private $tagService;
+    private $privilegeService;
+    private $tagService;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		TagService $tagService)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->tagService = $tagService;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        TagService $tagService)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->tagService = $tagService;
+    }
 
-	public function getMethods()
-	{
-		return ['DELETE'];
-	}
+    public function getMethods()
+    {
+        return ['DELETE'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/tags/:tagName';
-	}
+    public function getUrl()
+    {
+        return '/api/tags/:tagName';
+    }
 
-	public function work($args)
-	{
-		$tag = $this->tagService->getByName($args['tagName']);
-		$this->privilegeService->assertPrivilege(Privilege::DELETE_TAGS);
-		return $this->tagService->deleteTag($tag);
-	}
+    public function work($args)
+    {
+        $tag = $this->tagService->getByName($args['tagName']);
+        $this->privilegeService->assertPrivilege(Privilege::DELETE_TAGS);
+        return $this->tagService->deleteTag($tag);
+    }
 }
diff --git a/src/Routes/Tags/GetTag.php b/src/Routes/Tags/GetTag.php
index 00bb3217..6c0c6836 100644
--- a/src/Routes/Tags/GetTag.php
+++ b/src/Routes/Tags/GetTag.php
@@ -7,35 +7,35 @@ use Szurubooru\ViewProxies\TagViewProxy;
 
 class GetTag extends AbstractTagRoute
 {
-	private $privilegeService;
-	private $tagService;
-	private $tagViewProxy;
+    private $privilegeService;
+    private $tagService;
+    private $tagViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		TagService $tagService,
-		TagViewProxy $tagViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->tagService = $tagService;
-		$this->tagViewProxy = $tagViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        TagService $tagService,
+        TagViewProxy $tagViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->tagService = $tagService;
+        $this->tagViewProxy = $tagViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/tags/:tagName';
-	}
+    public function getUrl()
+    {
+        return '/api/tags/:tagName';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::LIST_TAGS);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::LIST_TAGS);
 
-		$tag = $this->tagService->getByName($args['tagName']);
-		return $this->tagViewProxy->fromEntity($tag, $this->getFullFetchConfig());
-	}
+        $tag = $this->tagService->getByName($args['tagName']);
+        return $this->tagViewProxy->fromEntity($tag, $this->getFullFetchConfig());
+    }
 }
diff --git a/src/Routes/Tags/GetTagSiblings.php b/src/Routes/Tags/GetTagSiblings.php
index e6ffcfa2..bda22e44 100644
--- a/src/Routes/Tags/GetTagSiblings.php
+++ b/src/Routes/Tags/GetTagSiblings.php
@@ -7,39 +7,39 @@ use Szurubooru\ViewProxies\TagViewProxy;
 
 class GetTagSiblings extends AbstractTagRoute
 {
-	private $privilegeService;
-	private $tagService;
-	private $tagViewProxy;
+    private $privilegeService;
+    private $tagService;
+    private $tagViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		TagService $tagService,
-		TagViewProxy $tagViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->tagService = $tagService;
-		$this->tagViewProxy = $tagViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        TagService $tagService,
+        TagViewProxy $tagViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->tagService = $tagService;
+        $this->tagViewProxy = $tagViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/tags/:tagName/siblings';
-	}
+    public function getUrl()
+    {
+        return '/api/tags/:tagName/siblings';
+    }
 
-	public function work($args)
-	{
-		$tagName = $args['tagName'];
-		$this->privilegeService->assertPrivilege(Privilege::LIST_TAGS);
-		$tag = $this->tagService->getByName($tagName);
-		$result = $this->tagService->getSiblings($tagName);
-		$entities = $this->tagViewProxy->fromArray($result);
-		return [
-			'data' => $entities,
-		];
-	}
+    public function work($args)
+    {
+        $tagName = $args['tagName'];
+        $this->privilegeService->assertPrivilege(Privilege::LIST_TAGS);
+        $tag = $this->tagService->getByName($tagName);
+        $result = $this->tagService->getSiblings($tagName);
+        $entities = $this->tagViewProxy->fromArray($result);
+        return [
+            'data' => $entities,
+        ];
+    }
 }
diff --git a/src/Routes/Tags/GetTags.php b/src/Routes/Tags/GetTags.php
index 5a4ec930..47bb9596 100644
--- a/src/Routes/Tags/GetTags.php
+++ b/src/Routes/Tags/GetTags.php
@@ -9,48 +9,48 @@ use Szurubooru\ViewProxies\TagViewProxy;
 
 class GetTags extends AbstractTagRoute
 {
-	private $privilegeService;
-	private $tagService;
-	private $tagViewProxy;
-	private $tagSearchParser;
-	private $inputReader;
+    private $privilegeService;
+    private $tagService;
+    private $tagViewProxy;
+    private $tagSearchParser;
+    private $inputReader;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		TagService $tagService,
-		TagViewProxy $tagViewProxy,
-		TagSearchParser $tagSearchParser,
-		InputReader $inputReader)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->tagService = $tagService;
-		$this->tagViewProxy = $tagViewProxy;
-		$this->tagSearchParser = $tagSearchParser;
-		$this->inputReader = $inputReader;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        TagService $tagService,
+        TagViewProxy $tagViewProxy,
+        TagSearchParser $tagSearchParser,
+        InputReader $inputReader)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->tagService = $tagService;
+        $this->tagViewProxy = $tagViewProxy;
+        $this->tagSearchParser = $tagSearchParser;
+        $this->inputReader = $inputReader;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/tags';
-	}
+    public function getUrl()
+    {
+        return '/api/tags';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::LIST_TAGS);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::LIST_TAGS);
 
-		$filter = $this->tagSearchParser->createFilterFromInputReader($this->inputReader);
-		$filter->setPageSize(50);
+        $filter = $this->tagSearchParser->createFilterFromInputReader($this->inputReader);
+        $filter->setPageSize(50);
 
-		$result = $this->tagService->getFiltered($filter);
-		$entities = $this->tagViewProxy->fromArray($result->getEntities(), $this->getFullFetchConfig());
-		return [
-			'data' => $entities,
-			'pageSize' => $result->getPageSize(),
-			'totalRecords' => $result->getTotalRecords()];
-	}
+        $result = $this->tagService->getFiltered($filter);
+        $entities = $this->tagViewProxy->fromArray($result->getEntities(), $this->getFullFetchConfig());
+        return [
+            'data' => $entities,
+            'pageSize' => $result->getPageSize(),
+            'totalRecords' => $result->getTotalRecords()];
+    }
 }
diff --git a/src/Routes/Tags/MergeTags.php b/src/Routes/Tags/MergeTags.php
index 20c30160..8a0f9e5b 100644
--- a/src/Routes/Tags/MergeTags.php
+++ b/src/Routes/Tags/MergeTags.php
@@ -7,37 +7,37 @@ use Szurubooru\Services\TagService;
 
 class MergeTags extends AbstractTagRoute
 {
-	private $privilegeService;
-	private $tagService;
-	private $inputReader;
+    private $privilegeService;
+    private $tagService;
+    private $inputReader;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		TagService $tagService,
-		InputReader $inputReader)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->tagService = $tagService;
-		$this->inputReader = $inputReader;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        TagService $tagService,
+        InputReader $inputReader)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->tagService = $tagService;
+        $this->inputReader = $inputReader;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/tags/:tagName/merge';
-	}
+    public function getUrl()
+    {
+        return '/api/tags/:tagName/merge';
+    }
 
-	public function work($args)
-	{
-		$tagName = $args['tagName'];
-		$targetTagName = $this->inputReader->targetTag;
-		$sourceTag = $this->tagService->getByName($tagName);
-		$targetTag = $this->tagService->getByName($targetTagName);
-		$this->privilegeService->assertPrivilege(Privilege::MERGE_TAGS);
-		return $this->tagService->mergeTag($sourceTag, $targetTag);
-	}
+    public function work($args)
+    {
+        $tagName = $args['tagName'];
+        $targetTagName = $this->inputReader->targetTag;
+        $sourceTag = $this->tagService->getByName($tagName);
+        $targetTag = $this->tagService->getByName($targetTagName);
+        $this->privilegeService->assertPrivilege(Privilege::MERGE_TAGS);
+        return $this->tagService->mergeTag($sourceTag, $targetTag);
+    }
 }
diff --git a/src/Routes/Tags/UpdateTag.php b/src/Routes/Tags/UpdateTag.php
index eb1c1c49..7f848e7f 100644
--- a/src/Routes/Tags/UpdateTag.php
+++ b/src/Routes/Tags/UpdateTag.php
@@ -9,54 +9,54 @@ use Szurubooru\ViewProxies\TagViewProxy;
 
 class UpdateTag extends AbstractTagRoute
 {
-	private $privilegeService;
-	private $tagService;
-	private $tagViewProxy;
-	private $inputReader;
+    private $privilegeService;
+    private $tagService;
+    private $tagViewProxy;
+    private $inputReader;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		TagService $tagService,
-		TagViewProxy $tagViewProxy,
-		InputReader $inputReader)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->tagService = $tagService;
-		$this->tagViewProxy = $tagViewProxy;
-		$this->inputReader = $inputReader;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        TagService $tagService,
+        TagViewProxy $tagViewProxy,
+        InputReader $inputReader)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->tagService = $tagService;
+        $this->tagViewProxy = $tagViewProxy;
+        $this->inputReader = $inputReader;
+    }
 
-	public function getMethods()
-	{
-		return ['PUT'];
-	}
+    public function getMethods()
+    {
+        return ['PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/tags/:tagName';
-	}
+    public function getUrl()
+    {
+        return '/api/tags/:tagName';
+    }
 
-	public function work($args)
-	{
-		$tag = $this->tagService->getByName($args['tagName']);
-		$formData = new TagEditFormData($this->inputReader);
+    public function work($args)
+    {
+        $tag = $this->tagService->getByName($args['tagName']);
+        $formData = new TagEditFormData($this->inputReader);
 
-		if ($formData->name !== null)
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_NAME);
+        if ($formData->name !== null)
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_NAME);
 
-		if ($formData->category !== null)
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_CATEGORY);
+        if ($formData->category !== null)
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_CATEGORY);
 
-		if ($formData->banned !== null)
-			$this->privilegeService->assertPrivilege(Privilege::BAN_TAGS);
+        if ($formData->banned !== null)
+            $this->privilegeService->assertPrivilege(Privilege::BAN_TAGS);
 
-		if ($formData->implications !== null)
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_IMPLICATIONS);
+        if ($formData->implications !== null)
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_IMPLICATIONS);
 
-		if ($formData->suggestions !== null)
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_SUGGESTIONS);
+        if ($formData->suggestions !== null)
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_TAG_SUGGESTIONS);
 
-		$tag = $this->tagService->updateTag($tag, $formData);
-		return $this->tagViewProxy->fromEntity($tag, $this->getFullFetchConfig());
-	}
+        $tag = $this->tagService->updateTag($tag, $formData);
+        return $this->tagViewProxy->fromEntity($tag, $this->getFullFetchConfig());
+    }
 }
diff --git a/src/Routes/Users/ActivateAccount.php b/src/Routes/Users/ActivateAccount.php
index 5209728c..790bb542 100644
--- a/src/Routes/Users/ActivateAccount.php
+++ b/src/Routes/Users/ActivateAccount.php
@@ -4,26 +4,26 @@ use Szurubooru\Services\UserService;
 
 class ActivateAccount extends AbstractUserRoute
 {
-	private $userService;
+    private $userService;
 
-	public function __construct(UserService $userService)
-	{
-		$this->userService = $userService;
-	}
+    public function __construct(UserService $userService)
+    {
+        $this->userService = $userService;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/activation/:userNameOrEmail';
-	}
+    public function getUrl()
+    {
+        return '/api/activation/:userNameOrEmail';
+    }
 
-	public function work($args)
-	{
-		$user = $this->userService->getByNameOrEmail($args['userNameOrEmail'], true);
-		return $this->userService->sendActivationEmail($user);
-	}
+    public function work($args)
+    {
+        $user = $this->userService->getByNameOrEmail($args['userNameOrEmail'], true);
+        return $this->userService->sendActivationEmail($user);
+    }
 }
diff --git a/src/Routes/Users/CreateUser.php b/src/Routes/Users/CreateUser.php
index 6fdafb12..a8dcee94 100644
--- a/src/Routes/Users/CreateUser.php
+++ b/src/Routes/Users/CreateUser.php
@@ -9,38 +9,38 @@ use Szurubooru\ViewProxies\UserViewProxy;
 
 class CreateUser extends AbstractUserRoute
 {
-	private $privilegeService;
-	private $userService;
-	private $inputReader;
-	private $userViewProxy;
+    private $privilegeService;
+    private $userService;
+    private $inputReader;
+    private $userViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		UserService $userService,
-		InputReader $inputReader,
-		UserViewProxy $userViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->userService = $userService;
-		$this->inputReader = $inputReader;
-		$this->userViewProxy = $userViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        UserService $userService,
+        InputReader $inputReader,
+        UserViewProxy $userViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->userService = $userService;
+        $this->inputReader = $inputReader;
+        $this->userViewProxy = $userViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['POST'];
-	}
+    public function getMethods()
+    {
+        return ['POST'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/users';
-	}
+    public function getUrl()
+    {
+        return '/api/users';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::REGISTER);
-		$formData = new RegistrationFormData($this->inputReader);
-		$user = $this->userService->createUser($formData);
-		return $this->userViewProxy->fromEntity($user);
-	}
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::REGISTER);
+        $formData = new RegistrationFormData($this->inputReader);
+        $user = $this->userService->createUser($formData);
+        return $this->userViewProxy->fromEntity($user);
+    }
 }
diff --git a/src/Routes/Users/DeleteUser.php b/src/Routes/Users/DeleteUser.php
index 8b2985e2..92f04108 100644
--- a/src/Routes/Users/DeleteUser.php
+++ b/src/Routes/Users/DeleteUser.php
@@ -7,37 +7,37 @@ use Szurubooru\Services\UserService;
 
 class DeleteUser extends AbstractUserRoute
 {
-	private $privilegeService;
-	private $userService;
+    private $privilegeService;
+    private $userService;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		UserService $userService)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->userService = $userService;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        UserService $userService)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->userService = $userService;
+    }
 
-	public function getMethods()
-	{
-		return ['DELETE'];
-	}
+    public function getMethods()
+    {
+        return ['DELETE'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/users/:userNameOrEmail';
-	}
+    public function getUrl()
+    {
+        return '/api/users/:userNameOrEmail';
+    }
 
-	public function work($args)
-	{
-		$userNameOrEmail = $args['userNameOrEmail'];
+    public function work($args)
+    {
+        $userNameOrEmail = $args['userNameOrEmail'];
 
-		$this->privilegeService->assertPrivilege(
-			$this->privilegeService->isLoggedIn($userNameOrEmail)
-				? Privilege::DELETE_OWN_ACCOUNT
-				: Privilege::DELETE_ALL_ACCOUNTS);
+        $this->privilegeService->assertPrivilege(
+            $this->privilegeService->isLoggedIn($userNameOrEmail)
+                ? Privilege::DELETE_OWN_ACCOUNT
+                : Privilege::DELETE_ALL_ACCOUNTS);
 
-		$user = $this->userService->getByNameOrEmail($userNameOrEmail);
-		return $this->userService->deleteUser($user);
-	}
+        $user = $this->userService->getByNameOrEmail($userNameOrEmail);
+        return $this->userService->deleteUser($user);
+    }
 }
diff --git a/src/Routes/Users/FinishActivation.php b/src/Routes/Users/FinishActivation.php
index 79a6a3ec..dfe33f3c 100644
--- a/src/Routes/Users/FinishActivation.php
+++ b/src/Routes/Users/FinishActivation.php
@@ -5,30 +5,30 @@ use Szurubooru\Services\UserService;
 
 class FinishActivation extends AbstractUserRoute
 {
-	private $userService;
-	private $tokenService;
+    private $userService;
+    private $tokenService;
 
-	public function __construct(
-		UserService $userService,
-		TokenService $tokenService)
-	{
-		$this->userService = $userService;
-		$this->tokenService = $tokenService;
-	}
+    public function __construct(
+        UserService $userService,
+        TokenService $tokenService)
+    {
+        $this->userService = $userService;
+        $this->tokenService = $tokenService;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/finish-activation/:tokenName';
-	}
+    public function getUrl()
+    {
+        return '/api/finish-activation/:tokenName';
+    }
 
-	public function work($args)
-	{
-		$token = $this->tokenService->getByName($args['tokenName']);
-		$this->userService->finishActivation($token);
-	}
+    public function work($args)
+    {
+        $token = $this->tokenService->getByName($args['tokenName']);
+        $this->userService->finishActivation($token);
+    }
 }
diff --git a/src/Routes/Users/FinishPasswordReset.php b/src/Routes/Users/FinishPasswordReset.php
index 9280b7b5..a85c8efa 100644
--- a/src/Routes/Users/FinishPasswordReset.php
+++ b/src/Routes/Users/FinishPasswordReset.php
@@ -5,30 +5,30 @@ use Szurubooru\Services\UserService;
 
 class FinishPasswordReset extends AbstractUserRoute
 {
-	private $userService;
-	private $tokenService;
+    private $userService;
+    private $tokenService;
 
-	public function __construct(
-		UserService $userService,
-		TokenService $tokenService)
-	{
-		$this->userService = $userService;
-		$this->tokenService = $tokenService;
-	}
+    public function __construct(
+        UserService $userService,
+        TokenService $tokenService)
+    {
+        $this->userService = $userService;
+        $this->tokenService = $tokenService;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/finish-password-reset/:tokenName';
-	}
+    public function getUrl()
+    {
+        return '/api/finish-password-reset/:tokenName';
+    }
 
-	public function work($args)
-	{
-		$token = $this->tokenService->getByName($args['tokenName']);
-		return ['newPassword' => $this->userService->finishPasswordReset($token)];
-	}
+    public function work($args)
+    {
+        $token = $this->tokenService->getByName($args['tokenName']);
+        return ['newPassword' => $this->userService->finishPasswordReset($token)];
+    }
 }
diff --git a/src/Routes/Users/GetUser.php b/src/Routes/Users/GetUser.php
index c9c4a46b..c3d1209e 100644
--- a/src/Routes/Users/GetUser.php
+++ b/src/Routes/Users/GetUser.php
@@ -8,39 +8,39 @@ use Szurubooru\ViewProxies\UserViewProxy;
 
 class GetUser extends AbstractUserRoute
 {
-	private $privilegeService;
-	private $userService;
-	private $userSearchParser;
-	private $userViewProxy;
+    private $privilegeService;
+    private $userService;
+    private $userSearchParser;
+    private $userViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		UserService $userService,
-		UserSearchParser $userSearchParser,
-		UserViewProxy $userViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->userService = $userService;
-		$this->userSearchParser = $userSearchParser;
-		$this->userViewProxy = $userViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        UserService $userService,
+        UserSearchParser $userSearchParser,
+        UserViewProxy $userViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->userService = $userService;
+        $this->userSearchParser = $userSearchParser;
+        $this->userViewProxy = $userViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/users/:userNameOrEmail';
-	}
+    public function getUrl()
+    {
+        return '/api/users/:userNameOrEmail';
+    }
 
-	public function work($args)
-	{
-		$userNameOrEmail = $args['userNameOrEmail'];
-		if (!$this->privilegeService->isLoggedIn($userNameOrEmail))
-			$this->privilegeService->assertPrivilege(Privilege::VIEW_USERS);
-		$user = $this->userService->getByNameOrEmail($userNameOrEmail);
-		return $this->userViewProxy->fromEntity($user);
-	}
+    public function work($args)
+    {
+        $userNameOrEmail = $args['userNameOrEmail'];
+        if (!$this->privilegeService->isLoggedIn($userNameOrEmail))
+            $this->privilegeService->assertPrivilege(Privilege::VIEW_USERS);
+        $user = $this->userService->getByNameOrEmail($userNameOrEmail);
+        return $this->userViewProxy->fromEntity($user);
+    }
 }
diff --git a/src/Routes/Users/GetUserAvatar.php b/src/Routes/Users/GetUserAvatar.php
index 41d18d76..0ea66a0b 100644
--- a/src/Routes/Users/GetUserAvatar.php
+++ b/src/Routes/Users/GetUserAvatar.php
@@ -9,87 +9,87 @@ use Szurubooru\Services\UserService;
 
 class GetUserAvatar extends AbstractUserRoute
 {
-	private $fileDao;
-	private $userService;
-	private $networkingService;
-	private $thumbnailService;
+    private $fileDao;
+    private $userService;
+    private $networkingService;
+    private $thumbnailService;
 
-	public function __construct(
-		PublicFileDao $fileDao,
-		UserService $userService,
-		NetworkingService $networkingService,
-		ThumbnailService $thumbnailService)
-	{
-		$this->fileDao = $fileDao;
-		$this->userService = $userService;
-		$this->networkingService = $networkingService;
-		$this->thumbnailService = $thumbnailService;
-	}
+    public function __construct(
+        PublicFileDao $fileDao,
+        UserService $userService,
+        NetworkingService $networkingService,
+        ThumbnailService $thumbnailService)
+    {
+        $this->fileDao = $fileDao;
+        $this->userService = $userService;
+        $this->networkingService = $networkingService;
+        $this->thumbnailService = $thumbnailService;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/users/:userName/avatar/:size';
-	}
+    public function getUrl()
+    {
+        return '/api/users/:userName/avatar/:size';
+    }
 
-	public function work($args)
-	{
-		$userName = $args['userName'];
-		$size = $args['size'];
+    public function work($args)
+    {
+        $userName = $args['userName'];
+        $size = $args['size'];
 
-		try
-		{
-			$user = $this->userService->getByName($userName);
-		}
-		catch (\Exception $e)
-		{
-			$this->serveBlankFile($size);
-		}
+        try
+        {
+            $user = $this->userService->getByName($userName);
+        }
+        catch (\Exception $e)
+        {
+            $this->serveBlankFile($size);
+        }
 
-		switch ($user->getAvatarStyle())
-		{
-			case User::AVATAR_STYLE_GRAVATAR:
-				$hash = md5(strtolower(trim($user->getEmail() ? $user->getEmail() : $user->getId() . $user->getName())));
-				$url = 'https://www.gravatar.com/avatar/' . $hash . '?d=retro&s=' . $size;
-				$this->serveFromUrl($url);
-				break;
+        switch ($user->getAvatarStyle())
+        {
+            case User::AVATAR_STYLE_GRAVATAR:
+                $hash = md5(strtolower(trim($user->getEmail() ? $user->getEmail() : $user->getId() . $user->getName())));
+                $url = 'https://www.gravatar.com/avatar/' . $hash . '?d=retro&s=' . $size;
+                $this->serveFromUrl($url);
+                break;
 
-			case User::AVATAR_STYLE_BLANK:
-				$this->serveBlankFile($size);
-				break;
+            case User::AVATAR_STYLE_BLANK:
+                $this->serveBlankFile($size);
+                break;
 
-			case User::AVATAR_STYLE_MANUAL:
-				$this->serveFromFile($user->getCustomAvatarSourceContentPath(), $size);
-				break;
+            case User::AVATAR_STYLE_MANUAL:
+                $this->serveFromFile($user->getCustomAvatarSourceContentPath(), $size);
+                break;
 
-			default:
-				$this->serveBlankFile($size);
-				break;
-		}
-	}
+            default:
+                $this->serveBlankFile($size);
+                break;
+        }
+    }
 
-	private function serveFromUrl($url)
-	{
-		$this->networkingService->redirect($url);
-	}
+    private function serveFromUrl($url)
+    {
+        $this->networkingService->redirect($url);
+    }
 
-	private function serveFromFile($sourceName, $size)
-	{
-		$thumbnailName = $this->thumbnailService->generateIfNeeded($sourceName, $size, $size);
-		$this->networkingService->serveFile($this->fileDao->getFullPath($thumbnailName));
-	}
+    private function serveFromFile($sourceName, $size)
+    {
+        $thumbnailName = $this->thumbnailService->generateIfNeeded($sourceName, $size, $size);
+        $this->networkingService->serveFile($this->fileDao->getFullPath($thumbnailName));
+    }
 
-	private function serveBlankFile($size)
-	{
-		$this->serveFromFile($this->getBlankAvatarSourceContentPath(), $size);
-	}
+    private function serveBlankFile($size)
+    {
+        $this->serveFromFile($this->getBlankAvatarSourceContentPath(), $size);
+    }
 
-	private function getBlankAvatarSourceContentPath()
-	{
-		return 'avatars/blank.png';
-	}
+    private function getBlankAvatarSourceContentPath()
+    {
+        return 'avatars/blank.png';
+    }
 }
diff --git a/src/Routes/Users/GetUsers.php b/src/Routes/Users/GetUsers.php
index 624e3717..b9a8a9a3 100644
--- a/src/Routes/Users/GetUsers.php
+++ b/src/Routes/Users/GetUsers.php
@@ -10,50 +10,50 @@ use Szurubooru\ViewProxies\UserViewProxy;
 
 class GetUsers extends AbstractUserRoute
 {
-	private $config;
-	private $privilegeService;
-	private $userService;
-	private $userSearchParser;
-	private $inputReader;
-	private $userViewProxy;
+    private $config;
+    private $privilegeService;
+    private $userService;
+    private $userSearchParser;
+    private $inputReader;
+    private $userViewProxy;
 
-	public function __construct(
-		Config $config,
-		PrivilegeService $privilegeService,
-		UserService $userService,
-		UserSearchParser $userSearchParser,
-		InputReader $inputReader,
-		UserViewProxy $userViewProxy)
-	{
-		$this->config = $config;
-		$this->privilegeService = $privilegeService;
-		$this->userService = $userService;
-		$this->userSearchParser = $userSearchParser;
-		$this->inputReader = $inputReader;
-		$this->userViewProxy = $userViewProxy;
-	}
+    public function __construct(
+        Config $config,
+        PrivilegeService $privilegeService,
+        UserService $userService,
+        UserSearchParser $userSearchParser,
+        InputReader $inputReader,
+        UserViewProxy $userViewProxy)
+    {
+        $this->config = $config;
+        $this->privilegeService = $privilegeService;
+        $this->userService = $userService;
+        $this->userSearchParser = $userSearchParser;
+        $this->inputReader = $inputReader;
+        $this->userViewProxy = $userViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['GET'];
-	}
+    public function getMethods()
+    {
+        return ['GET'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/users';
-	}
+    public function getUrl()
+    {
+        return '/api/users';
+    }
 
-	public function work($args)
-	{
-		$this->privilegeService->assertPrivilege(Privilege::LIST_USERS);
+    public function work($args)
+    {
+        $this->privilegeService->assertPrivilege(Privilege::LIST_USERS);
 
-		$filter = $this->userSearchParser->createFilterFromInputReader($this->inputReader);
-		$filter->setPageSize($this->config->users->usersPerPage);
-		$result = $this->userService->getFiltered($filter);
-		$entities = $this->userViewProxy->fromArray($result->getEntities());
-		return [
-			'data' => $entities,
-			'pageSize' => $result->getPageSize(),
-			'totalRecords' => $result->getTotalRecords()];
-	}
+        $filter = $this->userSearchParser->createFilterFromInputReader($this->inputReader);
+        $filter->setPageSize($this->config->users->usersPerPage);
+        $result = $this->userService->getFiltered($filter);
+        $entities = $this->userViewProxy->fromArray($result->getEntities());
+        return [
+            'data' => $entities,
+            'pageSize' => $result->getPageSize(),
+            'totalRecords' => $result->getTotalRecords()];
+    }
 }
diff --git a/src/Routes/Users/PasswordReset.php b/src/Routes/Users/PasswordReset.php
index 866ed808..b70344fc 100644
--- a/src/Routes/Users/PasswordReset.php
+++ b/src/Routes/Users/PasswordReset.php
@@ -4,24 +4,24 @@ use Szurubooru\Services\UserService;
 
 class PasswordReset extends AbstractUserRoute
 {
-	public function __construct(UserService $userService)
-	{
-		$this->userService = $userService;
-	}
+    public function __construct(UserService $userService)
+    {
+        $this->userService = $userService;
+    }
 
-	public function getMethods()
-	{
-		return ['POST', 'PUT'];
-	}
+    public function getMethods()
+    {
+        return ['POST', 'PUT'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/password-reset/:userNameOrEmail';
-	}
+    public function getUrl()
+    {
+        return '/api/password-reset/:userNameOrEmail';
+    }
 
-	public function work($args)
-	{
-		$user = $this->userService->getByNameOrEmail($args['userNameOrEmail']);
-		return $this->userService->sendPasswordResetEmail($user);
-	}
+    public function work($args)
+    {
+        $user = $this->userService->getByNameOrEmail($args['userNameOrEmail']);
+        return $this->userService->sendPasswordResetEmail($user);
+    }
 }
diff --git a/src/Routes/Users/UpdateUser.php b/src/Routes/Users/UpdateUser.php
index 9d9d4775..e7c74072 100644
--- a/src/Routes/Users/UpdateUser.php
+++ b/src/Routes/Users/UpdateUser.php
@@ -9,88 +9,88 @@ use Szurubooru\ViewProxies\UserViewProxy;
 
 class UpdateUser extends AbstractUserRoute
 {
-	private $privilegeService;
-	private $userService;
-	private $inputReader;
-	private $userViewProxy;
+    private $privilegeService;
+    private $userService;
+    private $inputReader;
+    private $userViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		UserService $userService,
-		InputReader $inputReader,
-		UserViewProxy $userViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->userService = $userService;
-		$this->inputReader = $inputReader;
-		$this->userViewProxy = $userViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        UserService $userService,
+        InputReader $inputReader,
+        UserViewProxy $userViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->userService = $userService;
+        $this->inputReader = $inputReader;
+        $this->userViewProxy = $userViewProxy;
+    }
 
-	public function getMethods()
-	{
-		return ['POST'];
-	}
+    public function getMethods()
+    {
+        return ['POST'];
+    }
 
-	public function getUrl()
-	{
-		return '/api/users/:userNameOrEmail';
-	}
+    public function getUrl()
+    {
+        return '/api/users/:userNameOrEmail';
+    }
 
-	public function work($args)
-	{
-		$userNameOrEmail = $args['userNameOrEmail'];
+    public function work($args)
+    {
+        $userNameOrEmail = $args['userNameOrEmail'];
 
-		$user = $this->userService->getByNameOrEmail($userNameOrEmail);
-		$formData = new UserEditFormData($this->inputReader);
+        $user = $this->userService->getByNameOrEmail($userNameOrEmail);
+        $formData = new UserEditFormData($this->inputReader);
 
-		if ($formData->avatarStyle !== null || $formData->avatarContent !== null)
-		{
-			$this->privilegeService->assertPrivilege(
-				$this->privilegeService->isLoggedIn($userNameOrEmail)
-					? Privilege::CHANGE_OWN_AVATAR_STYLE
-					: Privilege::CHANGE_ALL_AVATAR_STYLES);
-		}
+        if ($formData->avatarStyle !== null || $formData->avatarContent !== null)
+        {
+            $this->privilegeService->assertPrivilege(
+                $this->privilegeService->isLoggedIn($userNameOrEmail)
+                    ? Privilege::CHANGE_OWN_AVATAR_STYLE
+                    : Privilege::CHANGE_ALL_AVATAR_STYLES);
+        }
 
-		if ($formData->userName !== null)
-		{
-			$this->privilegeService->assertPrivilege(
-				$this->privilegeService->isLoggedIn($userNameOrEmail)
-					? Privilege::CHANGE_OWN_NAME
-					: Privilege::CHANGE_ALL_NAMES);
-		}
+        if ($formData->userName !== null)
+        {
+            $this->privilegeService->assertPrivilege(
+                $this->privilegeService->isLoggedIn($userNameOrEmail)
+                    ? Privilege::CHANGE_OWN_NAME
+                    : Privilege::CHANGE_ALL_NAMES);
+        }
 
-		if ($formData->password !== null)
-		{
-			$this->privilegeService->assertPrivilege(
-				$this->privilegeService->isLoggedIn($userNameOrEmail)
-					? Privilege::CHANGE_OWN_PASSWORD
-					: Privilege::CHANGE_ALL_PASSWORDS);
-		}
+        if ($formData->password !== null)
+        {
+            $this->privilegeService->assertPrivilege(
+                $this->privilegeService->isLoggedIn($userNameOrEmail)
+                    ? Privilege::CHANGE_OWN_PASSWORD
+                    : Privilege::CHANGE_ALL_PASSWORDS);
+        }
 
-		if ($formData->email !== null)
-		{
-			$this->privilegeService->assertPrivilege(
-				$this->privilegeService->isLoggedIn($userNameOrEmail)
-					? Privilege::CHANGE_OWN_EMAIL_ADDRESS
-					: Privilege::CHANGE_ALL_EMAIL_ADDRESSES);
-		}
+        if ($formData->email !== null)
+        {
+            $this->privilegeService->assertPrivilege(
+                $this->privilegeService->isLoggedIn($userNameOrEmail)
+                    ? Privilege::CHANGE_OWN_EMAIL_ADDRESS
+                    : Privilege::CHANGE_ALL_EMAIL_ADDRESSES);
+        }
 
-		if ($formData->accessRank)
-		{
-			$this->privilegeService->assertPrivilege(Privilege::CHANGE_ACCESS_RANK);
-		}
+        if ($formData->accessRank)
+        {
+            $this->privilegeService->assertPrivilege(Privilege::CHANGE_ACCESS_RANK);
+        }
 
-		if ($formData->browsingSettings)
-		{
-			$this->privilegeService->assertLoggedIn($userNameOrEmail);
-		}
+        if ($formData->browsingSettings)
+        {
+            $this->privilegeService->assertLoggedIn($userNameOrEmail);
+        }
 
-		if ($formData->banned !== null)
-		{
-			$this->privilegeService->assertPrivilege(Privilege::BAN_USERS);
-		}
+        if ($formData->banned !== null)
+        {
+            $this->privilegeService->assertPrivilege(Privilege::BAN_USERS);
+        }
 
-		$user = $this->userService->updateUser($user, $formData);
-		return $this->userViewProxy->fromEntity($user);
-	}
+        $user = $this->userService->updateUser($user, $formData);
+        return $this->userViewProxy->fromEntity($user);
+    }
 }
diff --git a/src/Search/Filters/BasicFilter.php b/src/Search/Filters/BasicFilter.php
index 41100c83..376a42e2 100644
--- a/src/Search/Filters/BasicFilter.php
+++ b/src/Search/Filters/BasicFilter.php
@@ -4,59 +4,59 @@ use Szurubooru\Search\Requirements\Requirement;
 
 class BasicFilter implements IFilter
 {
-	private $order = [];
-	private $requirements = [];
-	private $pageNumber;
-	private $pageSize;
+    private $order = [];
+    private $requirements = [];
+    private $pageNumber;
+    private $pageSize;
 
-	public function getOrder()
-	{
-		return $this->order;
-	}
+    public function getOrder()
+    {
+        return $this->order;
+    }
 
-	public function setOrder($order)
-	{
-		$this->order = $order;
-	}
+    public function setOrder($order)
+    {
+        $this->order = $order;
+    }
 
-	public function addRequirement(Requirement $requirement)
-	{
-		$this->requirements[] = $requirement;
-	}
+    public function addRequirement(Requirement $requirement)
+    {
+        $this->requirements[] = $requirement;
+    }
 
-	public function getRequirements()
-	{
-		return $this->requirements;
-	}
+    public function getRequirements()
+    {
+        return $this->requirements;
+    }
 
-	public function getRequirementsByType($type)
-	{
-		$requirements = [];
-		foreach ($this->getRequirements() as $key => $requirement)
-		{
-			if ($requirement->getType() === $type)
-				$requirements[$key] = $requirement;
-		}
-		return $requirements;
-	}
+    public function getRequirementsByType($type)
+    {
+        $requirements = [];
+        foreach ($this->getRequirements() as $key => $requirement)
+        {
+            if ($requirement->getType() === $type)
+                $requirements[$key] = $requirement;
+        }
+        return $requirements;
+    }
 
-	public function getPageSize()
-	{
-		return $this->pageSize;
-	}
+    public function getPageSize()
+    {
+        return $this->pageSize;
+    }
 
-	public function setPageSize($pageSize)
-	{
-		$this->pageSize = $pageSize;
-	}
+    public function setPageSize($pageSize)
+    {
+        $this->pageSize = $pageSize;
+    }
 
-	public function getPageNumber()
-	{
-		return $this->pageNumber;
-	}
+    public function getPageNumber()
+    {
+        return $this->pageNumber;
+    }
 
-	public function setPageNumber($pageNumber)
-	{
-		$this->pageNumber = $pageNumber;
-	}
+    public function setPageNumber($pageNumber)
+    {
+        $this->pageNumber = $pageNumber;
+    }
 }
diff --git a/src/Search/Filters/CommentFilter.php b/src/Search/Filters/CommentFilter.php
index 7346425c..ddcba99e 100644
--- a/src/Search/Filters/CommentFilter.php
+++ b/src/Search/Filters/CommentFilter.php
@@ -3,12 +3,12 @@ namespace Szurubooru\Search\Filters;
 
 class CommentFilter extends BasicFilter implements IFilter
 {
-	const ORDER_ID = 'id';
+    const ORDER_ID = 'id';
 
-	const REQUIREMENT_POST_ID = 'postId';
+    const REQUIREMENT_POST_ID = 'postId';
 
-	public function __construct()
-	{
-		$this->setOrder([self::ORDER_ID => self::ORDER_DESC]);
-	}
+    public function __construct()
+    {
+        $this->setOrder([self::ORDER_ID => self::ORDER_DESC]);
+    }
 }
diff --git a/src/Search/Filters/IFilter.php b/src/Search/Filters/IFilter.php
index 31fed929..22cd20d3 100644
--- a/src/Search/Filters/IFilter.php
+++ b/src/Search/Filters/IFilter.php
@@ -4,24 +4,24 @@ use Szurubooru\Search\Requirements\Requirement;
 
 interface IFilter
 {
-	const ORDER_RANDOM = 'random';
+    const ORDER_RANDOM = 'random';
 
-	const ORDER_ASC = 1;
-	const ORDER_DESC = -1;
+    const ORDER_ASC = 1;
+    const ORDER_DESC = -1;
 
-	public function getOrder();
+    public function getOrder();
 
-	public function setOrder($order);
+    public function setOrder($order);
 
-	public function getRequirements();
+    public function getRequirements();
 
-	public function addRequirement(Requirement $requirement);
+    public function addRequirement(Requirement $requirement);
 
-	public function getPageSize();
+    public function getPageSize();
 
-	public function getPageNumber();
+    public function getPageNumber();
 
-	public function setPageSize($pageSize);
+    public function setPageSize($pageSize);
 
-	public function setPageNumber($pageNumber);
+    public function setPageNumber($pageNumber);
 }
diff --git a/src/Search/Filters/PostFilter.php b/src/Search/Filters/PostFilter.php
index 2dbe3845..a90491f7 100644
--- a/src/Search/Filters/PostFilter.php
+++ b/src/Search/Filters/PostFilter.php
@@ -3,34 +3,34 @@ namespace Szurubooru\Search\Filters;
 
 class PostFilter extends BasicFilter implements IFilter
 {
-	const ORDER_ID = 'id';
-	const ORDER_FAV_COUNT = 'favCount';
-	const ORDER_TAG_COUNT = 'tagCount';
-	const ORDER_COMMENT_COUNT = 'commentCount';
-	const ORDER_SCORE = 'score';
-	const ORDER_LAST_EDIT_TIME = 'lastEditTime';
-	const ORDER_FILE_SIZE = 'originalFileSize';
-	const ORDER_LAST_COMMENT_TIME = 'lastCommentTime';
-	const ORDER_LAST_FAV_TIME = 'lastFavTime';
-	const ORDER_LAST_FEATURE_TIME = 'lastFeatureTime';
+    const ORDER_ID = 'id';
+    const ORDER_FAV_COUNT = 'favCount';
+    const ORDER_TAG_COUNT = 'tagCount';
+    const ORDER_COMMENT_COUNT = 'commentCount';
+    const ORDER_SCORE = 'score';
+    const ORDER_LAST_EDIT_TIME = 'lastEditTime';
+    const ORDER_FILE_SIZE = 'originalFileSize';
+    const ORDER_LAST_COMMENT_TIME = 'lastCommentTime';
+    const ORDER_LAST_FAV_TIME = 'lastFavTime';
+    const ORDER_LAST_FEATURE_TIME = 'lastFeatureTime';
 
-	const REQUIREMENT_TAG = 'tag';
-	const REQUIREMENT_ID = 'id';
-	const REQUIREMENT_DATE = 'uploadTime';
-	const REQUIREMENT_HASH = 'name';
-	const REQUIREMENT_TAG_COUNT = 'tagCount';
-	const REQUIREMENT_FAV_COUNT = 'favCount';
-	const REQUIREMENT_COMMENT_COUNT = 'commentCount';
-	const REQUIREMENT_SCORE = 'score';
-	const REQUIREMENT_UPLOADER = 'uploader.name';
-	const REQUIREMENT_SAFETY = 'safety';
-	const REQUIREMENT_FAVORITE = 'favoritedBy.name';
-	const REQUIREMENT_COMMENT_AUTHOR = 'commentedBy.name';
-	const REQUIREMENT_TYPE = 'contentType';
-	const REQUIREMENT_USER_SCORE = 'userScore';
+    const REQUIREMENT_TAG = 'tag';
+    const REQUIREMENT_ID = 'id';
+    const REQUIREMENT_DATE = 'uploadTime';
+    const REQUIREMENT_HASH = 'name';
+    const REQUIREMENT_TAG_COUNT = 'tagCount';
+    const REQUIREMENT_FAV_COUNT = 'favCount';
+    const REQUIREMENT_COMMENT_COUNT = 'commentCount';
+    const REQUIREMENT_SCORE = 'score';
+    const REQUIREMENT_UPLOADER = 'uploader.name';
+    const REQUIREMENT_SAFETY = 'safety';
+    const REQUIREMENT_FAVORITE = 'favoritedBy.name';
+    const REQUIREMENT_COMMENT_AUTHOR = 'commentedBy.name';
+    const REQUIREMENT_TYPE = 'contentType';
+    const REQUIREMENT_USER_SCORE = 'userScore';
 
-	public function __construct()
-	{
-		$this->setOrder([self::ORDER_ID => self::ORDER_DESC]);
-	}
+    public function __construct()
+    {
+        $this->setOrder([self::ORDER_ID => self::ORDER_DESC]);
+    }
 }
diff --git a/src/Search/Filters/SnapshotFilter.php b/src/Search/Filters/SnapshotFilter.php
index 4fd14e60..e919a7ca 100644
--- a/src/Search/Filters/SnapshotFilter.php
+++ b/src/Search/Filters/SnapshotFilter.php
@@ -3,13 +3,13 @@ namespace Szurubooru\Search\Filters;
 
 class SnapshotFilter extends BasicFilter implements IFilter
 {
-	const ORDER_ID = 'id';
+    const ORDER_ID = 'id';
 
-	const REQUIREMENT_PRIMARY_KEY = 'primaryKey';
-	const REQUIREMENT_TYPE = 'type';
+    const REQUIREMENT_PRIMARY_KEY = 'primaryKey';
+    const REQUIREMENT_TYPE = 'type';
 
-	public function __construct()
-	{
-		$this->setOrder([self::ORDER_ID => self::ORDER_DESC]);
-	}
+    public function __construct()
+    {
+        $this->setOrder([self::ORDER_ID => self::ORDER_DESC]);
+    }
 }
diff --git a/src/Search/Filters/TagFilter.php b/src/Search/Filters/TagFilter.php
index 7d3b32ee..da7cb6f1 100644
--- a/src/Search/Filters/TagFilter.php
+++ b/src/Search/Filters/TagFilter.php
@@ -3,16 +3,16 @@ namespace Szurubooru\Search\Filters;
 
 class TagFilter extends BasicFilter implements IFilter
 {
-	const ORDER_ID = 'id';
-	const ORDER_NAME = 'name';
-	const ORDER_CREATION_TIME = 'creationTime';
-	const ORDER_USAGE_COUNT = 'usages';
+    const ORDER_ID = 'id';
+    const ORDER_NAME = 'name';
+    const ORDER_CREATION_TIME = 'creationTime';
+    const ORDER_USAGE_COUNT = 'usages';
 
-	const REQUIREMENT_PARTIAL_TAG_NAME = 'partialTagName';
-	const REQUIREMENT_CATEGORY = 'category';
+    const REQUIREMENT_PARTIAL_TAG_NAME = 'partialTagName';
+    const REQUIREMENT_CATEGORY = 'category';
 
-	public function __construct()
-	{
-		$this->setOrder([self::ORDER_ID => self::ORDER_DESC]);
-	}
+    public function __construct()
+    {
+        $this->setOrder([self::ORDER_ID => self::ORDER_DESC]);
+    }
 }
diff --git a/src/Search/Filters/UserFilter.php b/src/Search/Filters/UserFilter.php
index cc87e3e7..40569387 100644
--- a/src/Search/Filters/UserFilter.php
+++ b/src/Search/Filters/UserFilter.php
@@ -3,11 +3,11 @@ namespace Szurubooru\Search\Filters;
 
 class UserFilter extends BasicFilter implements IFilter
 {
-	const ORDER_NAME = 'name';
-	const ORDER_REGISTRATION_TIME = 'registrationTime';
+    const ORDER_NAME = 'name';
+    const ORDER_REGISTRATION_TIME = 'registrationTime';
 
-	public function __construct()
-	{
-		$this->setOrder([self::ORDER_NAME => self::ORDER_ASC]);
-	}
+    public function __construct()
+    {
+        $this->setOrder([self::ORDER_NAME => self::ORDER_ASC]);
+    }
 }
diff --git a/src/Search/Parsers/AbstractSearchParser.php b/src/Search/Parsers/AbstractSearchParser.php
index 3a859403..79c8fccb 100644
--- a/src/Search/Parsers/AbstractSearchParser.php
+++ b/src/Search/Parsers/AbstractSearchParser.php
@@ -11,180 +11,180 @@ use Szurubooru\Search\Tokens\SearchToken;
 
 abstract class AbstractSearchParser
 {
-	const ALLOW_COMPOSITE = 1;
-	const ALLOW_RANGES = 2;
+    const ALLOW_COMPOSITE = 1;
+    const ALLOW_RANGES = 2;
 
-	public function createFilterFromInputReader(InputReader $inputReader)
-	{
-		$filter = $this->createFilter();
-		$filter->setOrder($this->getOrder($inputReader->order, false) + $filter->getOrder());
+    public function createFilterFromInputReader(InputReader $inputReader)
+    {
+        $filter = $this->createFilter();
+        $filter->setOrder($this->getOrder($inputReader->order, false) + $filter->getOrder());
 
-		if ($inputReader->page)
-		{
-			$filter->setPageNumber($inputReader->page);
-			$filter->setPageSize(25);
-		}
+        if ($inputReader->page)
+        {
+            $filter->setPageNumber($inputReader->page);
+            $filter->setPageSize(25);
+        }
 
-		$tokens = $this->tokenize($inputReader->query);
+        $tokens = $this->tokenize($inputReader->query);
 
-		foreach ($tokens as $token)
-		{
-			if ($token instanceof NamedSearchToken)
-			{
-				if ($token->getKey() === 'order')
-					$filter->setOrder($this->getOrder($token->getValue(), $token->isNegated()) + $filter->getOrder());
-				else
-					$this->decorateFilterFromNamedToken($filter, $token);
-			}
-			elseif ($token instanceof SearchToken)
-				$this->decorateFilterFromToken($filter, $token);
-			else
-				throw new \RuntimeException('Invalid search token type: ' . get_class($token));
-		}
+        foreach ($tokens as $token)
+        {
+            if ($token instanceof NamedSearchToken)
+            {
+                if ($token->getKey() === 'order')
+                    $filter->setOrder($this->getOrder($token->getValue(), $token->isNegated()) + $filter->getOrder());
+                else
+                    $this->decorateFilterFromNamedToken($filter, $token);
+            }
+            elseif ($token instanceof SearchToken)
+                $this->decorateFilterFromToken($filter, $token);
+            else
+                throw new \RuntimeException('Invalid search token type: ' . get_class($token));
+        }
 
-		return $filter;
-	}
+        return $filter;
+    }
 
-	protected abstract function createFilter();
+    protected abstract function createFilter();
 
-	protected abstract function decorateFilterFromToken(IFilter $filter, SearchToken $token);
+    protected abstract function decorateFilterFromToken(IFilter $filter, SearchToken $token);
 
-	protected abstract function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $namedToken);
+    protected abstract function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $namedToken);
 
-	protected abstract function getOrderColumn($tokenText);
+    protected abstract function getOrderColumn($tokenText);
 
-	protected function createRequirementValue($text, $flags = 0, callable $valueDecorator = null)
-	{
-		if ($valueDecorator === null)
-		{
-			$valueDecorator = function($value)
-			{
-				return $value;
-			};
-		}
+    protected function createRequirementValue($text, $flags = 0, callable $valueDecorator = null)
+    {
+        if ($valueDecorator === null)
+        {
+            $valueDecorator = function($value)
+            {
+                return $value;
+            };
+        }
 
-		if ((($flags & self::ALLOW_RANGES) === self::ALLOW_RANGES) && substr_count($text, '..') === 1)
-		{
-			list ($minValue, $maxValue) = explode('..', $text);
-			$minValue = $valueDecorator($minValue);
-			$maxValue = $valueDecorator($maxValue);
-			$tokenValue = new RequirementRangedValue();
-			$tokenValue->setMinValue($minValue);
-			$tokenValue->setMaxValue($maxValue);
-			return $tokenValue;
-		}
-		else if ((($flags & self::ALLOW_COMPOSITE) === self::ALLOW_COMPOSITE) && strpos($text, ',') !== false)
-		{
-			$values = explode(',', $text);
-			$values = array_map($valueDecorator, $values);
-			$tokenValue = new RequirementCompositeValue();
-			$tokenValue->setValues($values);
-			return $tokenValue;
-		}
+        if ((($flags & self::ALLOW_RANGES) === self::ALLOW_RANGES) && substr_count($text, '..') === 1)
+        {
+            list ($minValue, $maxValue) = explode('..', $text);
+            $minValue = $valueDecorator($minValue);
+            $maxValue = $valueDecorator($maxValue);
+            $tokenValue = new RequirementRangedValue();
+            $tokenValue->setMinValue($minValue);
+            $tokenValue->setMaxValue($maxValue);
+            return $tokenValue;
+        }
+        else if ((($flags & self::ALLOW_COMPOSITE) === self::ALLOW_COMPOSITE) && strpos($text, ',') !== false)
+        {
+            $values = explode(',', $text);
+            $values = array_map($valueDecorator, $values);
+            $tokenValue = new RequirementCompositeValue();
+            $tokenValue->setValues($values);
+            return $tokenValue;
+        }
 
-		$value = $valueDecorator($text);
-		return new RequirementSingleValue($value);
-	}
+        $value = $valueDecorator($text);
+        return new RequirementSingleValue($value);
+    }
 
-	protected function addRequirementFromToken($filter, $token, $type, $flags, callable $valueDecorator = null)
-	{
-		$requirement = new Requirement();
-		$requirement->setType($type);
-		$requirement->setValue($this->createRequirementValue($token->getValue(), $flags, $valueDecorator));
-		$requirement->setNegated($token->isNegated());
-		$filter->addRequirement($requirement);
-	}
+    protected function addRequirementFromToken($filter, $token, $type, $flags, callable $valueDecorator = null)
+    {
+        $requirement = new Requirement();
+        $requirement->setType($type);
+        $requirement->setValue($this->createRequirementValue($token->getValue(), $flags, $valueDecorator));
+        $requirement->setNegated($token->isNegated());
+        $filter->addRequirement($requirement);
+    }
 
-	private function getOrder($query, $negated)
-	{
-		$order = [];
-		$tokens = array_filter(preg_split('/\s+/', trim($query)));
+    private function getOrder($query, $negated)
+    {
+        $order = [];
+        $tokens = array_filter(preg_split('/\s+/', trim($query)));
 
-		foreach ($tokens as $token)
-		{
-			$token = preg_split('/,|\s+/', $token);
-			$orderToken = $token[0];
+        foreach ($tokens as $token)
+        {
+            $token = preg_split('/,|\s+/', $token);
+            $orderToken = $token[0];
 
-			if (count($token) === 1)
-			{
-				$orderDir = IFilter::ORDER_DESC;
-			}
-			elseif (count($token) === 2)
-			{
-				if ($token[1] === 'desc')
-					$orderDir = IFilter::ORDER_DESC;
-				elseif ($token[1] === 'asc')
-					$orderDir = IFilter::ORDER_ASC;
-				else
-					throw new \Exception('Wrong search order direction');
-			}
-			else
-				throw new \Exception('Wrong search order token');
+            if (count($token) === 1)
+            {
+                $orderDir = IFilter::ORDER_DESC;
+            }
+            elseif (count($token) === 2)
+            {
+                if ($token[1] === 'desc')
+                    $orderDir = IFilter::ORDER_DESC;
+                elseif ($token[1] === 'asc')
+                    $orderDir = IFilter::ORDER_ASC;
+                else
+                    throw new \Exception('Wrong search order direction');
+            }
+            else
+                throw new \Exception('Wrong search order token');
 
-			$orderColumn = $this->getOrderColumn($orderToken);
-			if ($orderColumn === null)
-				throw new \InvalidArgumentException('Invalid search order token: ' . $orderToken);
+            $orderColumn = $this->getOrderColumn($orderToken);
+            if ($orderColumn === null)
+                throw new \InvalidArgumentException('Invalid search order token: ' . $orderToken);
 
-			if ($negated)
-			{
-				$orderDir = $orderDir == IFilter::ORDER_DESC ? IFilter::ORDER_ASC : IFilter::ORDER_DESC;
-			}
+            if ($negated)
+            {
+                $orderDir = $orderDir == IFilter::ORDER_DESC ? IFilter::ORDER_ASC : IFilter::ORDER_DESC;
+            }
 
 
-			$order[$orderColumn] = $orderDir;
-		}
+            $order[$orderColumn] = $orderDir;
+        }
 
-		return $order;
-	}
+        return $order;
+    }
 
-	private function tokenize($query)
-	{
-		$searchTokens = [];
+    private function tokenize($query)
+    {
+        $searchTokens = [];
 
-		foreach (array_filter(preg_split('/\s+/', trim($query))) as $tokenText)
-		{
-			$negated = false;
-			if (substr($tokenText, 0, 1) === '-')
-			{
-				$negated = true;
-				$tokenText = substr($tokenText, 1);
-			}
+        foreach (array_filter(preg_split('/\s+/', trim($query))) as $tokenText)
+        {
+            $negated = false;
+            if (substr($tokenText, 0, 1) === '-')
+            {
+                $negated = true;
+                $tokenText = substr($tokenText, 1);
+            }
 
-			$colonPosition = strpos($tokenText, ':');
-			if (($colonPosition !== false) && ($colonPosition > 0))
-			{
-				$searchToken = new NamedSearchToken();
-				list ($tokenKey, $tokenValue) = explode(':', $tokenText, 2);
-				$searchToken->setKey($tokenKey);
-				$searchToken->setValue($tokenValue);
-			}
-			else
-			{
-				$searchToken = new SearchToken();
-				$searchToken->setValue($tokenText);
-			}
+            $colonPosition = strpos($tokenText, ':');
+            if (($colonPosition !== false) && ($colonPosition > 0))
+            {
+                $searchToken = new NamedSearchToken();
+                list ($tokenKey, $tokenValue) = explode(':', $tokenText, 2);
+                $searchToken->setKey($tokenKey);
+                $searchToken->setValue($tokenValue);
+            }
+            else
+            {
+                $searchToken = new SearchToken();
+                $searchToken->setValue($tokenText);
+            }
 
-			$searchToken->setNegated($negated);
-			$searchTokens[] = $searchToken;
-		}
+            $searchToken->setNegated($negated);
+            $searchTokens[] = $searchToken;
+        }
 
-		return $searchTokens;
-	}
+        return $searchTokens;
+    }
 
-	protected function matches($text, $array)
-	{
-		$text = $this->transformText($text);
-		foreach ($array as $elem)
-		{
-			if ($this->transformText($elem) === $text)
-				return true;
-		}
-		return false;
-	}
+    protected function matches($text, $array)
+    {
+        $text = $this->transformText($text);
+        foreach ($array as $elem)
+        {
+            if ($this->transformText($elem) === $text)
+                return true;
+        }
+        return false;
+    }
 
-	protected function transformText($text)
-	{
-		return str_replace('_', '', strtolower($text));
-	}
+    protected function transformText($text)
+    {
+        return str_replace('_', '', strtolower($text));
+    }
 
 }
diff --git a/src/Search/Parsers/PostSearchParser.php b/src/Search/Parsers/PostSearchParser.php
index 8dcf7ce9..a8d33893 100644
--- a/src/Search/Parsers/PostSearchParser.php
+++ b/src/Search/Parsers/PostSearchParser.php
@@ -13,359 +13,359 @@ use Szurubooru\Services\PrivilegeService;
 
 class PostSearchParser extends AbstractSearchParser
 {
-	private $authService;
-	private $privilegeService;
+    private $authService;
+    private $privilegeService;
 
-	public function __construct(
-		AuthService $authService,
-		PrivilegeService $privilegeService)
-	{
-		$this->authService = $authService;
-		$this->privilegeService = $privilegeService;
-	}
+    public function __construct(
+        AuthService $authService,
+        PrivilegeService $privilegeService)
+    {
+        $this->authService = $authService;
+        $this->privilegeService = $privilegeService;
+    }
 
-	protected function createFilter()
-	{
-		return new PostFilter;
-	}
+    protected function createFilter()
+    {
+        return new PostFilter;
+    }
 
-	protected function decorateFilterFromToken(IFilter $filter, SearchToken $token)
-	{
-		$requirement = new Requirement();
-		$requirement->setType(PostFilter::REQUIREMENT_TAG);
-		$requirement->setValue($this->createRequirementValue($token->getValue()));
-		$requirement->setNegated($token->isNegated());
-		$filter->addRequirement($requirement);
-	}
+    protected function decorateFilterFromToken(IFilter $filter, SearchToken $token)
+    {
+        $requirement = new Requirement();
+        $requirement->setType(PostFilter::REQUIREMENT_TAG);
+        $requirement->setValue($this->createRequirementValue($token->getValue()));
+        $requirement->setNegated($token->isNegated());
+        $filter->addRequirement($requirement);
+    }
 
-	protected function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $token)
-	{
-		$tokenKey = $token->getKey();
-		$tokenValue = $token->getValue();
+    protected function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $token)
+    {
+        $tokenKey = $token->getKey();
+        $tokenValue = $token->getValue();
 
-		$countAliases =
-		[
-			'tag_count' => 'tags',
-			'fav_count' => 'favs',
-			'score' => 'score',
-			'comment_count' => 'comments',
-		];
-		foreach ($countAliases as $realKey => $baseAlias)
-		{
-			if ($this->matches($tokenKey, [$baseAlias . '_min', $baseAlias . '_max']))
-			{
-				$token = new NamedSearchToken();
-				$token->setKey($realKey);
-				$token->setValue(strpos($tokenKey, 'min') !== false ? $tokenValue . '..' : '..' . $tokenValue);
-				return $this->decorateFilterFromNamedToken($filter, $token);
-			}
-		}
+        $countAliases =
+        [
+            'tag_count' => 'tags',
+            'fav_count' => 'favs',
+            'score' => 'score',
+            'comment_count' => 'comments',
+        ];
+        foreach ($countAliases as $realKey => $baseAlias)
+        {
+            if ($this->matches($tokenKey, [$baseAlias . '_min', $baseAlias . '_max']))
+            {
+                $token = new NamedSearchToken();
+                $token->setKey($realKey);
+                $token->setValue(strpos($tokenKey, 'min') !== false ? $tokenValue . '..' : '..' . $tokenValue);
+                return $this->decorateFilterFromNamedToken($filter, $token);
+            }
+        }
 
-		$map =
-		[
-			[['id'], [$this, 'addIdRequirement']],
-			[['hash', 'name'], [$this, 'addHashRequirement']],
-			[['date', 'time'], [$this, 'addDateRequirement']],
-			[['tag_count', 'tags'], [$this, 'addTagCountRequirement']],
-			[['fav_count', 'favs'], [$this, 'addFavCountRequirement']],
-			[['comment_count', 'comments'], [$this, 'addCommentCountRequirement']],
-			[['score'], [$this, 'addScoreRequirement']],
-			[['uploader', 'uploader', 'uploaded', 'submit', 'submitter', 'submitted'], [$this, 'addUploaderRequirement']],
-			[['safety', 'rating'], [$this, 'addSafetyRequirement']],
-			[['fav'], [$this, 'addFavRequirement']],
-			[['type'], [$this, 'addTypeRequirement']],
-			[['comment', 'comment_author', 'commented'], [$this, 'addCommentAuthorRequirement']],
-		];
+        $map =
+        [
+            [['id'], [$this, 'addIdRequirement']],
+            [['hash', 'name'], [$this, 'addHashRequirement']],
+            [['date', 'time'], [$this, 'addDateRequirement']],
+            [['tag_count', 'tags'], [$this, 'addTagCountRequirement']],
+            [['fav_count', 'favs'], [$this, 'addFavCountRequirement']],
+            [['comment_count', 'comments'], [$this, 'addCommentCountRequirement']],
+            [['score'], [$this, 'addScoreRequirement']],
+            [['uploader', 'uploader', 'uploaded', 'submit', 'submitter', 'submitted'], [$this, 'addUploaderRequirement']],
+            [['safety', 'rating'], [$this, 'addSafetyRequirement']],
+            [['fav'], [$this, 'addFavRequirement']],
+            [['type'], [$this, 'addTypeRequirement']],
+            [['comment', 'comment_author', 'commented'], [$this, 'addCommentAuthorRequirement']],
+        ];
 
-		foreach ($map as $item)
-		{
-			list ($aliases, $callback) = $item;
-			if ($this->matches($tokenKey, $aliases))
-				return $callback($filter, $token);
-		}
+        foreach ($map as $item)
+        {
+            list ($aliases, $callback) = $item;
+            if ($this->matches($tokenKey, $aliases))
+                return $callback($filter, $token);
+        }
 
-		if ($this->matches($tokenKey, ['special']))
-		{
-			$specialMap =
-			[
-				[['liked'], [$this, 'addOwnLikedRequirement']],
-				[['disliked'], [$this, 'addOwnDislikedRequirement']],
-				[['fav'], [$this, 'addOwnFavRequirement']],
-			];
+        if ($this->matches($tokenKey, ['special']))
+        {
+            $specialMap =
+            [
+                [['liked'], [$this, 'addOwnLikedRequirement']],
+                [['disliked'], [$this, 'addOwnDislikedRequirement']],
+                [['fav'], [$this, 'addOwnFavRequirement']],
+            ];
 
-			foreach ($specialMap as $item)
-			{
-				list ($aliases, $callback) = $item;
-				if ($this->matches($token->getValue(), $aliases))
-					return $callback($filter, $token);
-			}
+            foreach ($specialMap as $item)
+            {
+                list ($aliases, $callback) = $item;
+                if ($this->matches($token->getValue(), $aliases))
+                    return $callback($filter, $token);
+            }
 
-			throw new NotSupportedException(
-				'Unknown value for special search term: ' . $token->getValue()
-				. '. Possible search terms: '
-				. join(', ', array_map(function($term) { return join('/', $term[0]); }, $specialMap)));
-		}
+            throw new NotSupportedException(
+                'Unknown value for special search term: ' . $token->getValue()
+                . '. Possible search terms: '
+                . join(', ', array_map(function($term) { return join('/', $term[0]); }, $specialMap)));
+        }
 
-		throw new NotSupportedException('Unknown search term: ' . $token->getKey()
-			. '. Possible search terms: special, '
-			. join(', ', array_map(function($term) { return join('/', $term[0]); }, $map)));
-	}
+        throw new NotSupportedException('Unknown search term: ' . $token->getKey()
+            . '. Possible search terms: special, '
+            . join(', ', array_map(function($term) { return join('/', $term[0]); }, $map)));
+    }
 
-	protected function getOrderColumn($tokenText)
-	{
-		if ($this->matches($tokenText, ['random']))
-			return PostFilter::ORDER_RANDOM;
+    protected function getOrderColumn($tokenText)
+    {
+        if ($this->matches($tokenText, ['random']))
+            return PostFilter::ORDER_RANDOM;
 
-		if ($this->matches($tokenText, ['id']))
-			return PostFilter::ORDER_ID;
+        if ($this->matches($tokenText, ['id']))
+            return PostFilter::ORDER_ID;
 
-		if ($this->matches($tokenText, ['time', 'date']))
-			return PostFilter::ORDER_LAST_EDIT_TIME;
+        if ($this->matches($tokenText, ['time', 'date']))
+            return PostFilter::ORDER_LAST_EDIT_TIME;
 
-		if ($this->matches($tokenText, ['score']))
-			return PostFilter::ORDER_SCORE;
+        if ($this->matches($tokenText, ['score']))
+            return PostFilter::ORDER_SCORE;
 
-		if ($this->matches($tokenText, ['file_size']))
-			return PostFilter::ORDER_FILE_SIZE;
+        if ($this->matches($tokenText, ['file_size']))
+            return PostFilter::ORDER_FILE_SIZE;
 
-		if ($this->matches($tokenText, ['tag_count', 'tags', 'tag']))
-			return PostFilter::ORDER_TAG_COUNT;
+        if ($this->matches($tokenText, ['tag_count', 'tags', 'tag']))
+            return PostFilter::ORDER_TAG_COUNT;
 
-		if ($this->matches($tokenText, ['fav_count', 'fags', 'fav']))
-			return PostFilter::ORDER_FAV_COUNT;
+        if ($this->matches($tokenText, ['fav_count', 'fags', 'fav']))
+            return PostFilter::ORDER_FAV_COUNT;
 
-		if ($this->matches($tokenText, ['comment_count', 'comments', 'comment']))
-			return PostFilter::ORDER_COMMENT_COUNT;
+        if ($this->matches($tokenText, ['comment_count', 'comments', 'comment']))
+            return PostFilter::ORDER_COMMENT_COUNT;
 
-		if ($this->matches($tokenText, ['fav_time', 'fav_date']))
-			return PostFilter::ORDER_LAST_FAV_TIME;
+        if ($this->matches($tokenText, ['fav_time', 'fav_date']))
+            return PostFilter::ORDER_LAST_FAV_TIME;
 
-		if ($this->matches($tokenText, ['comment_time', 'comment_date']))
-			return PostFilter::ORDER_LAST_COMMENT_TIME;
+        if ($this->matches($tokenText, ['comment_time', 'comment_date']))
+            return PostFilter::ORDER_LAST_COMMENT_TIME;
 
-		if ($this->matches($tokenText, ['feature_time', 'feature_date', 'featured', 'feature']))
-			return PostFilter::ORDER_LAST_FEATURE_TIME;
+        if ($this->matches($tokenText, ['feature_time', 'feature_date', 'featured', 'feature']))
+            return PostFilter::ORDER_LAST_FEATURE_TIME;
 
-		throw new NotSupportedException();
-	}
+        throw new NotSupportedException();
+    }
 
-	private function addOwnLikedRequirement($filter, $token)
-	{
-		$this->privilegeService->assertLoggedIn();
-		$this->addUserScoreRequirement(
-			$filter,
-			$this->authService->getLoggedInUser()->getName(),
-			1,
-			$token->isNegated());
-	}
+    private function addOwnLikedRequirement($filter, $token)
+    {
+        $this->privilegeService->assertLoggedIn();
+        $this->addUserScoreRequirement(
+            $filter,
+            $this->authService->getLoggedInUser()->getName(),
+            1,
+            $token->isNegated());
+    }
 
-	private function addOwnDislikedRequirement($filter, $token)
-	{
-		$this->privilegeService->assertLoggedIn();
-		$this->addUserScoreRequirement(
-			$filter,
-			$this->authService->getLoggedInUser()->getName(),
-			-1,
-			$token->isNegated());
-	}
+    private function addOwnDislikedRequirement($filter, $token)
+    {
+        $this->privilegeService->assertLoggedIn();
+        $this->addUserScoreRequirement(
+            $filter,
+            $this->authService->getLoggedInUser()->getName(),
+            -1,
+            $token->isNegated());
+    }
 
-	private function addOwnFavRequirement($filter, $token)
-	{
-		$this->privilegeService->assertLoggedIn();
-		$token = new NamedSearchToken();
-		$token->setKey('fav');
-		$token->setValue($this->authService->getLoggedInUser()->getName());
-		$this->decorateFilterFromNamedToken($filter, $token);
-	}
+    private function addOwnFavRequirement($filter, $token)
+    {
+        $this->privilegeService->assertLoggedIn();
+        $token = new NamedSearchToken();
+        $token->setKey('fav');
+        $token->setValue($this->authService->getLoggedInUser()->getName());
+        $this->decorateFilterFromNamedToken($filter, $token);
+    }
 
-	private function addIdRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_ID,
-			self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
-	}
+    private function addIdRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_ID,
+            self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
+    }
 
-	private function addHashRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_HASH,
-			self::ALLOW_COMPOSITE);
-	}
+    private function addHashRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_HASH,
+            self::ALLOW_COMPOSITE);
+    }
 
-	private function addDateRequirement($filter, $token)
-	{
-		if (substr_count($token->getValue(), '..') === 1)
-		{
-			list ($dateMin, $dateMax) = explode('..', $token->getValue());
-			$timeMin = $this->dateToTime($dateMin)[0];
-			$timeMax = $this->dateToTime($dateMax)[1];
-		}
-		else
-		{
-			$date = $token->getValue();
-			list ($timeMin, $timeMax) = $this->dateToTime($date);
-		}
+    private function addDateRequirement($filter, $token)
+    {
+        if (substr_count($token->getValue(), '..') === 1)
+        {
+            list ($dateMin, $dateMax) = explode('..', $token->getValue());
+            $timeMin = $this->dateToTime($dateMin)[0];
+            $timeMax = $this->dateToTime($dateMax)[1];
+        }
+        else
+        {
+            $date = $token->getValue();
+            list ($timeMin, $timeMax) = $this->dateToTime($date);
+        }
 
-		$finalString = '';
-		if ($timeMin)
-			$finalString .= date('c', $timeMin);
-		$finalString .= '..';
-		if ($timeMax)
-			$finalString .= date('c', $timeMax);
+        $finalString = '';
+        if ($timeMin)
+            $finalString .= date('c', $timeMin);
+        $finalString .= '..';
+        if ($timeMax)
+            $finalString .= date('c', $timeMax);
 
-		$token->setValue($finalString);
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_DATE,
-			self::ALLOW_RANGES);
-	}
+        $token->setValue($finalString);
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_DATE,
+            self::ALLOW_RANGES);
+    }
 
-	private function addTagCountRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_TAG_COUNT,
-			self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
-	}
+    private function addTagCountRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_TAG_COUNT,
+            self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
+    }
 
-	private function addFavCountRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_FAV_COUNT,
-			self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
-	}
+    private function addFavCountRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_FAV_COUNT,
+            self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
+    }
 
-	private function addCommentCountRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_COMMENT_COUNT,
-			self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
-	}
+    private function addCommentCountRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_COMMENT_COUNT,
+            self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
+    }
 
-	private function addScoreRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_SCORE,
-			self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
-	}
+    private function addScoreRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_SCORE,
+            self::ALLOW_COMPOSITE | self::ALLOW_RANGES);
+    }
 
-	private function addUploaderRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_UPLOADER,
-			self::ALLOW_COMPOSITE);
-	}
+    private function addUploaderRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_UPLOADER,
+            self::ALLOW_COMPOSITE);
+    }
 
-	private function addSafetyRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_SAFETY,
-			self::ALLOW_COMPOSITE,
-			function ($value)
-			{
-				return EnumHelper::postSafetyFromString($value);
-			});
-	}
+    private function addSafetyRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_SAFETY,
+            self::ALLOW_COMPOSITE,
+            function ($value)
+            {
+                return EnumHelper::postSafetyFromString($value);
+            });
+    }
 
-	private function addFavRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_FAVORITE,
-			self::ALLOW_COMPOSITE);
-	}
+    private function addFavRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_FAVORITE,
+            self::ALLOW_COMPOSITE);
+    }
 
-	private function addTypeRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_TYPE,
-			self::ALLOW_COMPOSITE,
-			function ($value)
-			{
-				return EnumHelper::postTypeFromString($value);
-			});
-	}
+    private function addTypeRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_TYPE,
+            self::ALLOW_COMPOSITE,
+            function ($value)
+            {
+                return EnumHelper::postTypeFromString($value);
+            });
+    }
 
-	private function addCommentAuthorRequirement($filter, $token)
-	{
-		$this->addRequirementFromToken(
-			$filter,
-			$token,
-			PostFilter::REQUIREMENT_COMMENT_AUTHOR,
-			self::ALLOW_COMPOSITE);
-	}
+    private function addCommentAuthorRequirement($filter, $token)
+    {
+        $this->addRequirementFromToken(
+            $filter,
+            $token,
+            PostFilter::REQUIREMENT_COMMENT_AUTHOR,
+            self::ALLOW_COMPOSITE);
+    }
 
-	private function addUserScoreRequirement($filter, $userName, $score, $isNegated)
-	{
-		$tokenValue = new RequirementCompositeValue();
-		$tokenValue->setValues([$userName, $score]);
-		$requirement = new Requirement();
-		$requirement->setType(PostFilter::REQUIREMENT_USER_SCORE);
-		$requirement->setValue($tokenValue);
-		$requirement->setNegated($isNegated);
-		$filter->addRequirement($requirement);
-	}
+    private function addUserScoreRequirement($filter, $userName, $score, $isNegated)
+    {
+        $tokenValue = new RequirementCompositeValue();
+        $tokenValue->setValues([$userName, $score]);
+        $requirement = new Requirement();
+        $requirement->setType(PostFilter::REQUIREMENT_USER_SCORE);
+        $requirement->setValue($tokenValue);
+        $requirement->setNegated($isNegated);
+        $filter->addRequirement($requirement);
+    }
 
-	private function dateToTime($value)
-	{
-		$value = strtolower(trim($value));
-		if (!$value)
-		{
-			return null;
-		}
-		elseif ($value === 'today')
-		{
-			$timeMin = mktime(0, 0, 0);
-			$timeMax = mktime(24, 0, -1);
-		}
-		elseif ($value === 'yesterday')
-		{
-			$timeMin = mktime(-24, 0, 0);
-			$timeMax = mktime(0, 0, -1);
-		}
-		elseif (preg_match('/^(\d{4})$/', $value, $matches))
-		{
-			$year = intval($matches[1]);
-			$timeMin = mktime(0, 0, 0, 1, 1, $year);
-			$timeMax = mktime(0, 0, -1, 1, 1, $year + 1);
-		}
-		elseif (preg_match('/^(\d{4})-(\d{1,2})$/', $value, $matches))
-		{
-			$year = intval($matches[1]);
-			$month = intval($matches[2]);
-			$timeMin = mktime(0, 0, 0, $month, 1, $year);
-			$timeMax = mktime(0, 0, -1, $month + 1, 1, $year);
-		}
-		elseif (preg_match('/^(\d{4})-(\d{1,2})-(\d{1,2})$/', $value, $matches))
-		{
-			$year = intval($matches[1]);
-			$month = intval($matches[2]);
-			$day = intval($matches[3]);
-			$timeMin = mktime(0, 0, 0, $month, $day, $year);
-			$timeMax = mktime(0, 0, -1, $month, $day + 1, $year);
-		}
-		else
-			throw new \Exception('Invalid date format: ' . $value);
+    private function dateToTime($value)
+    {
+        $value = strtolower(trim($value));
+        if (!$value)
+        {
+            return null;
+        }
+        elseif ($value === 'today')
+        {
+            $timeMin = mktime(0, 0, 0);
+            $timeMax = mktime(24, 0, -1);
+        }
+        elseif ($value === 'yesterday')
+        {
+            $timeMin = mktime(-24, 0, 0);
+            $timeMax = mktime(0, 0, -1);
+        }
+        elseif (preg_match('/^(\d{4})$/', $value, $matches))
+        {
+            $year = intval($matches[1]);
+            $timeMin = mktime(0, 0, 0, 1, 1, $year);
+            $timeMax = mktime(0, 0, -1, 1, 1, $year + 1);
+        }
+        elseif (preg_match('/^(\d{4})-(\d{1,2})$/', $value, $matches))
+        {
+            $year = intval($matches[1]);
+            $month = intval($matches[2]);
+            $timeMin = mktime(0, 0, 0, $month, 1, $year);
+            $timeMax = mktime(0, 0, -1, $month + 1, 1, $year);
+        }
+        elseif (preg_match('/^(\d{4})-(\d{1,2})-(\d{1,2})$/', $value, $matches))
+        {
+            $year = intval($matches[1]);
+            $month = intval($matches[2]);
+            $day = intval($matches[3]);
+            $timeMin = mktime(0, 0, 0, $month, $day, $year);
+            $timeMax = mktime(0, 0, -1, $month, $day + 1, $year);
+        }
+        else
+            throw new \Exception('Invalid date format: ' . $value);
 
-		return [$timeMin, $timeMax];
-	}
+        return [$timeMin, $timeMax];
+    }
 }
diff --git a/src/Search/Parsers/SnapshotSearchParser.php b/src/Search/Parsers/SnapshotSearchParser.php
index 2b531e81..caa76532 100644
--- a/src/Search/Parsers/SnapshotSearchParser.php
+++ b/src/Search/Parsers/SnapshotSearchParser.php
@@ -10,39 +10,39 @@ use Szurubooru\Search\Tokens\SearchToken;
 
 class SnapshotSearchParser extends AbstractSearchParser
 {
-	protected function createFilter()
-	{
-		return new SnapshotFilter;
-	}
+    protected function createFilter()
+    {
+        return new SnapshotFilter;
+    }
 
-	protected function decorateFilterFromToken(IFilter $filter, SearchToken $token)
-	{
-		if (substr_count($token->getValue(), ',') !== 1)
-			throw new NotSupportedException();
+    protected function decorateFilterFromToken(IFilter $filter, SearchToken $token)
+    {
+        if (substr_count($token->getValue(), ',') !== 1)
+            throw new NotSupportedException();
 
-		if ($token->isNegated())
-			throw new NotSupportedException();
+        if ($token->isNegated())
+            throw new NotSupportedException();
 
-		list ($type, $primaryKey) = explode(',', $token->getValue());
+        list ($type, $primaryKey) = explode(',', $token->getValue());
 
-		$requirement = new Requirement();
-		$requirement->setType(SnapshotFilter::REQUIREMENT_PRIMARY_KEY);
-		$requirement->setValue($this->createRequirementValue($primaryKey));
-		$filter->addRequirement($requirement);
+        $requirement = new Requirement();
+        $requirement->setType(SnapshotFilter::REQUIREMENT_PRIMARY_KEY);
+        $requirement->setValue($this->createRequirementValue($primaryKey));
+        $filter->addRequirement($requirement);
 
-		$requirement = new Requirement();
-		$requirement->setType(SnapshotFilter::REQUIREMENT_TYPE);
-		$requirement->setValue($this->createRequirementValue(EnumHelper::snapshotTypeFromString($type)));
-		$filter->addRequirement($requirement);
-	}
+        $requirement = new Requirement();
+        $requirement->setType(SnapshotFilter::REQUIREMENT_TYPE);
+        $requirement->setValue($this->createRequirementValue(EnumHelper::snapshotTypeFromString($type)));
+        $filter->addRequirement($requirement);
+    }
 
-	protected function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $namedToken)
-	{
-		throw new NotSupportedException();
-	}
+    protected function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $namedToken)
+    {
+        throw new NotSupportedException();
+    }
 
-	protected function getOrderColumn($tokenText)
-	{
-		throw new NotSupportedException();
-	}
+    protected function getOrderColumn($tokenText)
+    {
+        throw new NotSupportedException();
+    }
 }
diff --git a/src/Search/Parsers/TagSearchParser.php b/src/Search/Parsers/TagSearchParser.php
index 45f5be27..a271d3dc 100644
--- a/src/Search/Parsers/TagSearchParser.php
+++ b/src/Search/Parsers/TagSearchParser.php
@@ -10,48 +10,48 @@ use Szurubooru\Search\Tokens\SearchToken;
 
 class TagSearchParser extends AbstractSearchParser
 {
-	protected function createFilter()
-	{
-		return new TagFilter;
-	}
+    protected function createFilter()
+    {
+        return new TagFilter;
+    }
 
-	protected function decorateFilterFromToken(IFilter $filter, SearchToken $token)
-	{
-		$requirement = new Requirement();
-		$requirement->setType(TagFilter::REQUIREMENT_PARTIAL_TAG_NAME);
-		$requirement->setValue(new RequirementSingleValue($token->getValue()));
-		$requirement->setNegated($token->isNegated());
-		$filter->addRequirement($requirement);
-	}
+    protected function decorateFilterFromToken(IFilter $filter, SearchToken $token)
+    {
+        $requirement = new Requirement();
+        $requirement->setType(TagFilter::REQUIREMENT_PARTIAL_TAG_NAME);
+        $requirement->setValue(new RequirementSingleValue($token->getValue()));
+        $requirement->setNegated($token->isNegated());
+        $filter->addRequirement($requirement);
+    }
 
-	protected function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $namedToken)
-	{
-		if ($this->matches($namedToken->getKey(), ['category']))
-		{
-			return $this->addRequirementFromToken(
-				$filter,
-				$namedToken,
-				TagFilter::REQUIREMENT_CATEGORY,
-				self::ALLOW_COMPOSITE);
-		}
+    protected function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $namedToken)
+    {
+        if ($this->matches($namedToken->getKey(), ['category']))
+        {
+            return $this->addRequirementFromToken(
+                $filter,
+                $namedToken,
+                TagFilter::REQUIREMENT_CATEGORY,
+                self::ALLOW_COMPOSITE);
+        }
 
-		throw new NotSupportedException();
-	}
+        throw new NotSupportedException();
+    }
 
-	protected function getOrderColumn($tokenText)
-	{
-		if ($this->matches($tokenText, ['id']))
-			return TagFilter::ORDER_ID;
+    protected function getOrderColumn($tokenText)
+    {
+        if ($this->matches($tokenText, ['id']))
+            return TagFilter::ORDER_ID;
 
-		if ($this->matches($tokenText, ['name']))
-			return TagFilter::ORDER_NAME;
+        if ($this->matches($tokenText, ['name']))
+            return TagFilter::ORDER_NAME;
 
-		if ($this->matches($tokenText, ['creation_time', 'creation_date']))
-			return TagFilter::ORDER_CREATION_TIME;
+        if ($this->matches($tokenText, ['creation_time', 'creation_date']))
+            return TagFilter::ORDER_CREATION_TIME;
 
-		if ($this->matches($tokenText, ['usage_count', 'usages']))
-			return TagFilter::ORDER_USAGE_COUNT;
+        if ($this->matches($tokenText, ['usage_count', 'usages']))
+            return TagFilter::ORDER_USAGE_COUNT;
 
-		throw new NotSupportedException();
-	}
+        throw new NotSupportedException();
+    }
 }
diff --git a/src/Search/Parsers/UserSearchParser.php b/src/Search/Parsers/UserSearchParser.php
index 6a360c5a..143a9b4b 100644
--- a/src/Search/Parsers/UserSearchParser.php
+++ b/src/Search/Parsers/UserSearchParser.php
@@ -8,29 +8,29 @@ use Szurubooru\Search\Tokens\SearchToken;
 
 class UserSearchParser extends AbstractSearchParser
 {
-	protected function createFilter()
-	{
-		return new UserFilter;
-	}
+    protected function createFilter()
+    {
+        return new UserFilter;
+    }
 
-	protected function decorateFilterFromToken(IFilter $filter, SearchToken $token)
-	{
-		throw new NotSupportedException();
-	}
+    protected function decorateFilterFromToken(IFilter $filter, SearchToken $token)
+    {
+        throw new NotSupportedException();
+    }
 
-	protected function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $namedToken)
-	{
-		throw new NotSupportedException();
-	}
+    protected function decorateFilterFromNamedToken(IFilter $filter, NamedSearchToken $namedToken)
+    {
+        throw new NotSupportedException();
+    }
 
-	protected function getOrderColumn($tokenText)
-	{
-		if ($this->matches($tokenText, ['name']))
-			return UserFilter::ORDER_NAME;
+    protected function getOrderColumn($tokenText)
+    {
+        if ($this->matches($tokenText, ['name']))
+            return UserFilter::ORDER_NAME;
 
-		if ($this->matches($tokenText, ['registration_time', 'registration_date']))
-			return UserFilter::ORDER_REGISTRATION_TIME;
+        if ($this->matches($tokenText, ['registration_time', 'registration_date']))
+            return UserFilter::ORDER_REGISTRATION_TIME;
 
-		throw new NotSupportedException();
-	}
+        throw new NotSupportedException();
+    }
 }
diff --git a/src/Search/Requirements/IRequirementValue.php b/src/Search/Requirements/IRequirementValue.php
index 17befaa8..9ff7472c 100644
--- a/src/Search/Requirements/IRequirementValue.php
+++ b/src/Search/Requirements/IRequirementValue.php
@@ -3,5 +3,5 @@ namespace Szurubooru\Search\Requirements;
 
 interface IRequirementValue
 {
-	public function getValues();
+    public function getValues();
 }
diff --git a/src/Search/Requirements/Requirement.php b/src/Search/Requirements/Requirement.php
index e73c35a7..9f22eec7 100644
--- a/src/Search/Requirements/Requirement.php
+++ b/src/Search/Requirements/Requirement.php
@@ -3,37 +3,37 @@ namespace Szurubooru\Search\Requirements;
 
 class Requirement
 {
-	private $negated = false;
-	private $type;
-	private $value;
+    private $negated = false;
+    private $type;
+    private $value;
 
-	public function isNegated()
-	{
-		return $this->negated;
-	}
+    public function isNegated()
+    {
+        return $this->negated;
+    }
 
-	public function setNegated($negated)
-	{
-		$this->negated = $negated;
-	}
+    public function setNegated($negated)
+    {
+        $this->negated = $negated;
+    }
 
-	public function getType()
-	{
-		return $this->type;
-	}
+    public function getType()
+    {
+        return $this->type;
+    }
 
-	public function setType($type)
-	{
-		$this->type = $type;
-	}
+    public function setType($type)
+    {
+        $this->type = $type;
+    }
 
-	public function getValue()
-	{
-		return $this->value;
-	}
+    public function getValue()
+    {
+        return $this->value;
+    }
 
-	public function setValue(IRequirementValue $value)
-	{
-		$this->value = $value;
-	}
+    public function setValue(IRequirementValue $value)
+    {
+        $this->value = $value;
+    }
 }
diff --git a/src/Search/Requirements/RequirementCompositeValue.php b/src/Search/Requirements/RequirementCompositeValue.php
index 6de957f9..93145adf 100644
--- a/src/Search/Requirements/RequirementCompositeValue.php
+++ b/src/Search/Requirements/RequirementCompositeValue.php
@@ -3,20 +3,20 @@ namespace Szurubooru\Search\Requirements;
 
 class RequirementCompositeValue implements IRequirementValue
 {
-	private $values = [];
+    private $values = [];
 
-	public function __construct(array $values = [])
-	{
-		$this->setValues($values);
-	}
+    public function __construct(array $values = [])
+    {
+        $this->setValues($values);
+    }
 
-	public function getValues()
-	{
-		return $this->values;
-	}
+    public function getValues()
+    {
+        return $this->values;
+    }
 
-	public function setValues(array $values)
-	{
-		$this->values = $values;
-	}
+    public function setValues(array $values)
+    {
+        $this->values = $values;
+    }
 }
diff --git a/src/Search/Requirements/RequirementRangedValue.php b/src/Search/Requirements/RequirementRangedValue.php
index 4035e2d5..b871e658 100644
--- a/src/Search/Requirements/RequirementRangedValue.php
+++ b/src/Search/Requirements/RequirementRangedValue.php
@@ -3,31 +3,31 @@ namespace Szurubooru\Search\Requirements;
 
 class RequirementRangedValue implements IRequirementValue
 {
-	private $minValue = null;
-	private $maxValue = null;
+    private $minValue = null;
+    private $maxValue = null;
 
-	public function getMinValue()
-	{
-		return $this->minValue;
-	}
+    public function getMinValue()
+    {
+        return $this->minValue;
+    }
 
-	public function setMinValue($minValue)
-	{
-		$this->minValue = $minValue;
-	}
+    public function setMinValue($minValue)
+    {
+        $this->minValue = $minValue;
+    }
 
-	public function getMaxValue()
-	{
-		return $this->maxValue;
-	}
+    public function getMaxValue()
+    {
+        return $this->maxValue;
+    }
 
-	public function setMaxValue($maxValue)
-	{
-		$this->maxValue = $maxValue;
-	}
+    public function setMaxValue($maxValue)
+    {
+        $this->maxValue = $maxValue;
+    }
 
-	public function getValues()
-	{
-		return range($this->minValue, $this->maxValue);
-	}
+    public function getValues()
+    {
+        return range($this->minValue, $this->maxValue);
+    }
 }
diff --git a/src/Search/Requirements/RequirementSingleValue.php b/src/Search/Requirements/RequirementSingleValue.php
index 5a59616b..594a0f79 100644
--- a/src/Search/Requirements/RequirementSingleValue.php
+++ b/src/Search/Requirements/RequirementSingleValue.php
@@ -3,25 +3,25 @@ namespace Szurubooru\Search\Requirements;
 
 class RequirementSingleValue implements IRequirementValue
 {
-	private $value;
+    private $value;
 
-	public function __construct($value)
-	{
-		$this->setValue($value);
-	}
+    public function __construct($value)
+    {
+        $this->setValue($value);
+    }
 
-	public function getValue()
-	{
-		return $this->value;
-	}
+    public function getValue()
+    {
+        return $this->value;
+    }
 
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
+    public function setValue($value)
+    {
+        $this->value = $value;
+    }
 
-	public function getValues()
-	{
-		return [$this->value];
-	}
+    public function getValues()
+    {
+        return [$this->value];
+    }
 }
diff --git a/src/Search/Result.php b/src/Search/Result.php
index 1563bf94..feae8d8d 100644
--- a/src/Search/Result.php
+++ b/src/Search/Result.php
@@ -4,59 +4,59 @@ use Szurubooru\Search\Filters\IFilter;
 
 class Result
 {
-	public $pageNumber;
-	public $pageSize;
-	public $searchFilter;
-	public $entities;
-	public $totalRecords;
+    public $pageNumber;
+    public $pageSize;
+    public $searchFilter;
+    public $entities;
+    public $totalRecords;
 
-	public function setSearchFilter(IFilter $searchFilter = null)
-	{
-		$this->searchFilter = $searchFilter;
-	}
+    public function setSearchFilter(IFilter $searchFilter = null)
+    {
+        $this->searchFilter = $searchFilter;
+    }
 
-	public function getSearchFilter()
-	{
-		return $this->searchFilter;
-	}
+    public function getSearchFilter()
+    {
+        return $this->searchFilter;
+    }
 
-	public function setPageNumber($pageNumber)
-	{
-		$this->pageNumber = $pageNumber;
-	}
+    public function setPageNumber($pageNumber)
+    {
+        $this->pageNumber = $pageNumber;
+    }
 
-	public function getPageNumber()
-	{
-		return $this->pageNumber;
-	}
+    public function getPageNumber()
+    {
+        return $this->pageNumber;
+    }
 
-	public function setPageSize($pageSize)
-	{
-		$this->pageSize = $pageSize;
-	}
+    public function setPageSize($pageSize)
+    {
+        $this->pageSize = $pageSize;
+    }
 
-	public function getPageSize()
-	{
-		return $this->pageSize;
-	}
+    public function getPageSize()
+    {
+        return $this->pageSize;
+    }
 
-	public function setEntities(array $entities)
-	{
-		$this->entities = $entities;
-	}
+    public function setEntities(array $entities)
+    {
+        $this->entities = $entities;
+    }
 
-	public function getEntities()
-	{
-		return $this->entities;
-	}
+    public function getEntities()
+    {
+        return $this->entities;
+    }
 
-	public function setTotalRecords($totalRecords)
-	{
-		$this->totalRecords = $totalRecords;
-	}
+    public function setTotalRecords($totalRecords)
+    {
+        $this->totalRecords = $totalRecords;
+    }
 
-	public function getTotalRecords()
-	{
-		return $this->totalRecords;
-	}
+    public function getTotalRecords()
+    {
+        return $this->totalRecords;
+    }
 }
diff --git a/src/Search/Tokens/NamedSearchToken.php b/src/Search/Tokens/NamedSearchToken.php
index 2bbe63a4..91c60ca4 100644
--- a/src/Search/Tokens/NamedSearchToken.php
+++ b/src/Search/Tokens/NamedSearchToken.php
@@ -3,15 +3,15 @@ namespace Szurubooru\Search\Tokens;
 
 class NamedSearchToken extends SearchToken
 {
-	private $key = false;
+    private $key = false;
 
-	public function setKey($key)
-	{
-		$this->key = $key;
-	}
+    public function setKey($key)
+    {
+        $this->key = $key;
+    }
 
-	public function getKey()
-	{
-		return $this->key;
-	}
+    public function getKey()
+    {
+        return $this->key;
+    }
 }
diff --git a/src/Search/Tokens/SearchToken.php b/src/Search/Tokens/SearchToken.php
index cdde59aa..49afb0ad 100644
--- a/src/Search/Tokens/SearchToken.php
+++ b/src/Search/Tokens/SearchToken.php
@@ -3,26 +3,26 @@ namespace Szurubooru\Search\Tokens;
 
 class SearchToken
 {
-	private $negated = false;
-	private $value;
+    private $negated = false;
+    private $value;
 
-	public function isNegated()
-	{
-		return $this->negated;
-	}
+    public function isNegated()
+    {
+        return $this->negated;
+    }
 
-	public function setNegated($negated)
-	{
-		$this->negated = $negated;
-	}
+    public function setNegated($negated)
+    {
+        $this->negated = $negated;
+    }
 
-	public function getValue()
-	{
-		return $this->value;
-	}
+    public function getValue()
+    {
+        return $this->value;
+    }
 
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
+    public function setValue($value)
+    {
+        $this->value = $value;
+    }
 }
diff --git a/src/Services/AuthService.php b/src/Services/AuthService.php
index e5ce8fd4..ff619f63 100644
--- a/src/Services/AuthService.php
+++ b/src/Services/AuthService.php
@@ -10,110 +10,110 @@ use Szurubooru\Services\UserService;
 
 class AuthService
 {
-	private $loggedInUser = null;
-	private $loginToken = null;
+    private $loggedInUser = null;
+    private $loginToken = null;
 
-	private $config;
-	private $passwordService;
-	private $timeService;
-	private $userService;
-	private $tokenService;
+    private $config;
+    private $passwordService;
+    private $timeService;
+    private $userService;
+    private $tokenService;
 
-	public function __construct(
-		Config $config,
-		PasswordService $passwordService,
-		TimeService $timeService,
-		TokenService $tokenService,
-		UserService $userService)
-	{
-		$this->config = $config;
-		$this->passwordService = $passwordService;
-		$this->timeService = $timeService;
-		$this->tokenService = $tokenService;
-		$this->userService = $userService;
+    public function __construct(
+        Config $config,
+        PasswordService $passwordService,
+        TimeService $timeService,
+        TokenService $tokenService,
+        UserService $userService)
+    {
+        $this->config = $config;
+        $this->passwordService = $passwordService;
+        $this->timeService = $timeService;
+        $this->tokenService = $tokenService;
+        $this->userService = $userService;
 
-		$this->loggedInUser = $this->getAnonymousUser();
-	}
+        $this->loggedInUser = $this->getAnonymousUser();
+    }
 
-	public function isLoggedIn()
-	{
-		return $this->loginToken !== null;
-	}
+    public function isLoggedIn()
+    {
+        return $this->loginToken !== null;
+    }
 
-	public function getLoggedInUser()
-	{
-		return $this->loggedInUser;
-	}
+    public function getLoggedInUser()
+    {
+        return $this->loggedInUser;
+    }
 
-	public function getLoginToken()
-	{
-		return $this->loginToken;
-	}
+    public function getLoginToken()
+    {
+        return $this->loginToken;
+    }
 
-	public function loginFromCredentials($formData)
-	{
-		$user = $this->userService->getByNameOrEmail($formData->userNameOrEmail);
-		$this->doFinalChecksOnUser($user);
+    public function loginFromCredentials($formData)
+    {
+        $user = $this->userService->getByNameOrEmail($formData->userNameOrEmail);
+        $this->doFinalChecksOnUser($user);
 
-		$hashValid = $this->passwordService->isHashValid(
-			$formData->password,
-			$user->getPasswordSalt(),
-			$user->getPasswordHash());
+        $hashValid = $this->passwordService->isHashValid(
+            $formData->password,
+            $user->getPasswordSalt(),
+            $user->getPasswordHash());
 
-		if (!$hashValid)
-			throw new \InvalidArgumentException('Specified password is invalid.');
+        if (!$hashValid)
+            throw new \InvalidArgumentException('Specified password is invalid.');
 
-		$this->loginToken = $this->createAndSaveLoginToken($user);
-		$this->loggedInUser = $user;
-	}
+        $this->loginToken = $this->createAndSaveLoginToken($user);
+        $this->loggedInUser = $user;
+    }
 
-	public function loginFromToken(Token $token)
-	{
-		if ($token->getPurpose() !== Token::PURPOSE_LOGIN)
-			throw new \Exception('This token is not a login token.');
+    public function loginFromToken(Token $token)
+    {
+        if ($token->getPurpose() !== Token::PURPOSE_LOGIN)
+            throw new \Exception('This token is not a login token.');
 
-		$user = $this->userService->getById($token->getAdditionalData());
-		$this->doFinalChecksOnUser($user);
+        $user = $this->userService->getById($token->getAdditionalData());
+        $this->doFinalChecksOnUser($user);
 
-		$this->loginToken = $token;
-		$this->loggedInUser = $user;
-	}
+        $this->loginToken = $token;
+        $this->loggedInUser = $user;
+    }
 
-	public function getAnonymousUser()
-	{
-		$user = new User();
-		$user->setName('Anonymous user');
-		$user->setAccessRank(User::ACCESS_RANK_ANONYMOUS);
-		$user->setAvatarStyle(User::AVATAR_STYLE_BLANK);
-		return $user;
-	}
+    public function getAnonymousUser()
+    {
+        $user = new User();
+        $user->setName('Anonymous user');
+        $user->setAccessRank(User::ACCESS_RANK_ANONYMOUS);
+        $user->setAvatarStyle(User::AVATAR_STYLE_BLANK);
+        return $user;
+    }
 
-	public function loginAnonymous()
-	{
-		$this->loginToken = null;
-		$this->loggedInUser = $this->getAnonymousUser();
-	}
+    public function loginAnonymous()
+    {
+        $this->loginToken = null;
+        $this->loggedInUser = $this->getAnonymousUser();
+    }
 
-	public function logout()
-	{
-		if (!$this->isLoggedIn())
-			throw new \Exception('Not logged in.');
+    public function logout()
+    {
+        if (!$this->isLoggedIn())
+            throw new \Exception('Not logged in.');
 
-		$this->tokenService->invalidateByName($this->loginToken);
-		$this->loginToken = null;
-	}
+        $this->tokenService->invalidateByName($this->loginToken);
+        $this->loginToken = null;
+    }
 
-	private function createAndSaveLoginToken(User $user)
-	{
-		return $this->tokenService->createAndSaveToken($user->getId(), Token::PURPOSE_LOGIN);
-	}
+    private function createAndSaveLoginToken(User $user)
+    {
+        return $this->tokenService->createAndSaveToken($user->getId(), Token::PURPOSE_LOGIN);
+    }
 
-	private function doFinalChecksOnUser($user)
-	{
-		if (!$user->isAccountConfirmed() && $this->config->security->needEmailActivationToRegister)
-			throw new \DomainException('User didn\'t confirm account yet.');
+    private function doFinalChecksOnUser($user)
+    {
+        if (!$user->isAccountConfirmed() && $this->config->security->needEmailActivationToRegister)
+            throw new \DomainException('User didn\'t confirm account yet.');
 
-		if ($user->isBanned())
-			throw new \DomainException('Banned!');
-	}
+        if ($user->isBanned())
+            throw new \DomainException('Banned!');
+    }
 }
diff --git a/src/Services/CommentService.php b/src/Services/CommentService.php
index ca6d7aed..75240f9b 100644
--- a/src/Services/CommentService.php
+++ b/src/Services/CommentService.php
@@ -11,97 +11,97 @@ use Szurubooru\Validator;
 
 class CommentService
 {
-	private $validator;
-	private $commentDao;
-	private $transactionManager;
-	private $authService;
-	private $timeService;
+    private $validator;
+    private $commentDao;
+    private $transactionManager;
+    private $authService;
+    private $timeService;
 
-	public function __construct(
-		Validator $validator,
-		CommentDao $commentDao,
-		TransactionManager $transactionManager,
-		AuthService $authService,
-		TimeService $timeService)
-	{
-		$this->validator = $validator;
-		$this->commentDao = $commentDao;
-		$this->transactionManager = $transactionManager;
-		$this->authService = $authService;
-		$this->timeService = $timeService;
-	}
+    public function __construct(
+        Validator $validator,
+        CommentDao $commentDao,
+        TransactionManager $transactionManager,
+        AuthService $authService,
+        TimeService $timeService)
+    {
+        $this->validator = $validator;
+        $this->commentDao = $commentDao;
+        $this->transactionManager = $transactionManager;
+        $this->authService = $authService;
+        $this->timeService = $timeService;
+    }
 
-	public function getById($commentId)
-	{
-		$transactionFunc = function() use ($commentId)
-		{
-			$comment = $this->commentDao->findById($commentId);
-			if (!$comment)
-				throw new \InvalidArgumentException('Comment with ID "' . $commentId . '" was not found.');
-			return $comment;
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getById($commentId)
+    {
+        $transactionFunc = function() use ($commentId)
+        {
+            $comment = $this->commentDao->findById($commentId);
+            if (!$comment)
+                throw new \InvalidArgumentException('Comment with ID "' . $commentId . '" was not found.');
+            return $comment;
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getByPost(Post $post)
-	{
-		$transactionFunc = function() use ($post)
-		{
-			return $this->commentDao->findByPost($post);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getByPost(Post $post)
+    {
+        $transactionFunc = function() use ($post)
+        {
+            return $this->commentDao->findByPost($post);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getFiltered(CommentFilter $filter)
-	{
-		$transactionFunc = function() use ($filter)
-		{
-			return $this->commentDao->findFiltered($filter);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getFiltered(CommentFilter $filter)
+    {
+        $transactionFunc = function() use ($filter)
+        {
+            return $this->commentDao->findFiltered($filter);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function createComment(Post $post, $text)
-	{
-		$transactionFunc = function() use ($post, $text)
-		{
-			$comment = new Comment();
-			$comment->setCreationTime($this->timeService->getCurrentTime());
-			$comment->setLastEditTime($this->timeService->getCurrentTime());
-			$comment->setUser($this->authService->isLoggedIn() ? $this->authService->getLoggedInUser() : null);
-			$comment->setPost($post);
+    public function createComment(Post $post, $text)
+    {
+        $transactionFunc = function() use ($post, $text)
+        {
+            $comment = new Comment();
+            $comment->setCreationTime($this->timeService->getCurrentTime());
+            $comment->setLastEditTime($this->timeService->getCurrentTime());
+            $comment->setUser($this->authService->isLoggedIn() ? $this->authService->getLoggedInUser() : null);
+            $comment->setPost($post);
 
-			$this->updateCommentText($comment, $text);
+            $this->updateCommentText($comment, $text);
 
-			return $this->commentDao->save($comment);
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            return $this->commentDao->save($comment);
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function updateComment(Comment $comment, $newText)
-	{
-		$transactionFunc = function() use ($comment, $newText)
-		{
-			$comment->setLastEditTime($this->timeService->getCurrentTime());
+    public function updateComment(Comment $comment, $newText)
+    {
+        $transactionFunc = function() use ($comment, $newText)
+        {
+            $comment->setLastEditTime($this->timeService->getCurrentTime());
 
-			$this->updateCommentText($comment, $newText);
-			return $this->commentDao->save($comment);
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            $this->updateCommentText($comment, $newText);
+            return $this->commentDao->save($comment);
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function deleteComment(Comment $comment)
-	{
-		$transactionFunc = function() use ($comment)
-		{
-			$this->commentDao->deleteById($comment->getId());
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function deleteComment(Comment $comment)
+    {
+        $transactionFunc = function() use ($comment)
+        {
+            $this->commentDao->deleteById($comment->getId());
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	private function updateCommentText(Comment $comment, $text)
-	{
-		$this->validator->validateLength($text, 5, 2000, 'Comment text');
-		$comment->setText($text);
-	}
+    private function updateCommentText(Comment $comment, $text)
+    {
+        $this->validator->validateLength($text, 5, 2000, 'Comment text');
+        $comment->setText($text);
+    }
 }
diff --git a/src/Services/EmailService.php b/src/Services/EmailService.php
index 17951dc7..c4d7809e 100644
--- a/src/Services/EmailService.php
+++ b/src/Services/EmailService.php
@@ -6,89 +6,89 @@ use \Szurubooru\Entities\User;
 
 class EmailService
 {
-	private $config;
+    private $config;
 
-	public function __construct(Config $config)
-	{
-		$this->config = $config;
-	}
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
 
-	public function sendPasswordResetEmail(User $user, Token $token)
-	{
-		if (!$user->getEmail())
-			throw new \BadMethodCall('An activated e-mail addreses is needed to reset the password.');
+    public function sendPasswordResetEmail(User $user, Token $token)
+    {
+        if (!$user->getEmail())
+            throw new \BadMethodCall('An activated e-mail addreses is needed to reset the password.');
 
-		$mailSubject = $this->tokenize($this->config->mail->passwordResetSubject);
-		$mailBody = $this->tokenizeFile(
-			$this->config->mail->passwordResetBodyPath,
-			[
-				'link' => $this->config->basic->serviceBaseUrl . '#/password-reset/' . $token->getName(),
-			]);
+        $mailSubject = $this->tokenize($this->config->mail->passwordResetSubject);
+        $mailBody = $this->tokenizeFile(
+            $this->config->mail->passwordResetBodyPath,
+            [
+                'link' => $this->config->basic->serviceBaseUrl . '#/password-reset/' . $token->getName(),
+            ]);
 
-		$this->sendEmail($user->getEmail(), $mailSubject, $mailBody);
-	}
+        $this->sendEmail($user->getEmail(), $mailSubject, $mailBody);
+    }
 
-	public function sendActivationEmail(User $user, Token $token)
-	{
-		if (!$user->getEmailUnconfirmed())
-			throw new \BadMethodCallException('An e-mail address is needed to activate the account.');
+    public function sendActivationEmail(User $user, Token $token)
+    {
+        if (!$user->getEmailUnconfirmed())
+            throw new \BadMethodCallException('An e-mail address is needed to activate the account.');
 
-		$mailSubject = $this->tokenize($this->config->mail->activationSubject);
-		$mailBody = $this->tokenizeFile(
-			$this->config->mail->activationBodyPath,
-			[
-				'link' => $this->config->basic->serviceBaseUrl . '#/activate/' . $token->getName(),
-			]);
+        $mailSubject = $this->tokenize($this->config->mail->activationSubject);
+        $mailBody = $this->tokenizeFile(
+            $this->config->mail->activationBodyPath,
+            [
+                'link' => $this->config->basic->serviceBaseUrl . '#/activate/' . $token->getName(),
+            ]);
 
-		$this->sendEmail($user->getEmailUnconfirmed(), $mailSubject, $mailBody);
-	}
+        $this->sendEmail($user->getEmailUnconfirmed(), $mailSubject, $mailBody);
+    }
 
-	private function sendEmail($recipientEmail, $subject, $body)
-	{
-		$domain = substr($this->config->mail->botEmail, strpos($this->config->mail->botEmail, '@') + 1);
+    private function sendEmail($recipientEmail, $subject, $body)
+    {
+        $domain = substr($this->config->mail->botEmail, strpos($this->config->mail->botEmail, '@') + 1);
 
-		$clientIp = isset($_SERVER['SERVER_ADDR'])
-			? $_SERVER['SERVER_ADDR']
-			: '';
+        $clientIp = isset($_SERVER['SERVER_ADDR'])
+            ? $_SERVER['SERVER_ADDR']
+            : '';
 
-		$body = wordwrap($body, 70);
-		if (empty($recipientEmail))
-			throw new \InvalidArgumentException('Destination e-mail address was not found');
+        $body = wordwrap($body, 70);
+        if (empty($recipientEmail))
+            throw new \InvalidArgumentException('Destination e-mail address was not found');
 
-		$messageId = sha1(date('r') . uniqid()) . '@' . $domain;
+        $messageId = sha1(date('r') . uniqid()) . '@' . $domain;
 
-		$headers = [];
-		$headers[] = sprintf('MIME-Version: 1.0');
-		$headers[] = sprintf('Content-Transfer-Encoding: 7bit');
-		$headers[] = sprintf('Date: %s', date('r'));
-		$headers[] = sprintf('Message-ID: <%s>', $messageId);
-		$headers[] = sprintf('From: %s <%s>', $this->config->mail->botName, $this->config->mail->botEmail);
-		$headers[] = sprintf('Reply-To: %s', $this->config->mail->botEmail);
-		$headers[] = sprintf('Return-Path: %s', $this->config->mail->botEmail);
-		$headers[] = sprintf('Subject: %s', $subject);
-		$headers[] = sprintf('Content-Type: text/plain; charset=utf-8');
-		$headers[] = sprintf('X-Mailer: PHP/%s', phpversion());
-		$headers[] = sprintf('X-Originating-IP: %s', $clientIp);
+        $headers = [];
+        $headers[] = sprintf('MIME-Version: 1.0');
+        $headers[] = sprintf('Content-Transfer-Encoding: 7bit');
+        $headers[] = sprintf('Date: %s', date('r'));
+        $headers[] = sprintf('Message-ID: <%s>', $messageId);
+        $headers[] = sprintf('From: %s <%s>', $this->config->mail->botName, $this->config->mail->botEmail);
+        $headers[] = sprintf('Reply-To: %s', $this->config->mail->botEmail);
+        $headers[] = sprintf('Return-Path: %s', $this->config->mail->botEmail);
+        $headers[] = sprintf('Subject: %s', $subject);
+        $headers[] = sprintf('Content-Type: text/plain; charset=utf-8');
+        $headers[] = sprintf('X-Mailer: PHP/%s', phpversion());
+        $headers[] = sprintf('X-Originating-IP: %s', $clientIp);
 
-		$encodedSubject = '=?UTF-8?B?' . base64_encode($subject) . '?=';
+        $encodedSubject = '=?UTF-8?B?' . base64_encode($subject) . '?=';
 
-		mail($recipientEmail, $encodedSubject, $body, implode("\r\n", $headers), '-f' . $this->config->mail->botEmail);
-	}
+        mail($recipientEmail, $encodedSubject, $body, implode("\r\n", $headers), '-f' . $this->config->mail->botEmail);
+    }
 
-	private function tokenizeFile($templatePath, $tokens = [])
-	{
-		$text = file_get_contents($this->config->getDataDirectory() . DIRECTORY_SEPARATOR . $templatePath);
-		return $this->tokenize($text, $tokens);
-	}
+    private function tokenizeFile($templatePath, $tokens = [])
+    {
+        $text = file_get_contents($this->config->getDataDirectory() . DIRECTORY_SEPARATOR . $templatePath);
+        return $this->tokenize($text, $tokens);
+    }
 
-	private function tokenize($text, $tokens = [])
-	{
-		$tokens['serviceBaseUrl'] = $this->config->basic->serviceBaseUrl;
-		$tokens['serviceName'] = $this->config->basic->serviceName;
+    private function tokenize($text, $tokens = [])
+    {
+        $tokens['serviceBaseUrl'] = $this->config->basic->serviceBaseUrl;
+        $tokens['serviceName'] = $this->config->basic->serviceName;
 
-		foreach ($tokens as $key => $value)
-			$text = str_ireplace('{' . $key . '}', $value, $text);
+        foreach ($tokens as $key => $value)
+            $text = str_ireplace('{' . $key . '}', $value, $text);
 
-		return $text;
-	}
+        return $text;
+    }
 }
diff --git a/src/Services/FavoritesService.php b/src/Services/FavoritesService.php
index 2270237b..64b6fb7d 100644
--- a/src/Services/FavoritesService.php
+++ b/src/Services/FavoritesService.php
@@ -10,58 +10,58 @@ use Szurubooru\Services\TimeService;
 
 class FavoritesService
 {
-	private $favoritesDao;
-	private $scoreDao;
-	private $userDao;
-	private $transactionManager;
-	private $timeService;
+    private $favoritesDao;
+    private $scoreDao;
+    private $userDao;
+    private $transactionManager;
+    private $timeService;
 
-	public function __construct(
-		FavoritesDao $favoritesDao,
-		ScoreDao $scoreDao,
-		UserDao $userDao,
-		TransactionManager $transactionManager,
-		TimeService $timeService)
-	{
-		$this->favoritesDao = $favoritesDao;
-		$this->scoreDao = $scoreDao;
-		$this->userDao = $userDao;
-		$this->transactionManager = $transactionManager;
-		$this->timeService = $timeService;
-	}
+    public function __construct(
+        FavoritesDao $favoritesDao,
+        ScoreDao $scoreDao,
+        UserDao $userDao,
+        TransactionManager $transactionManager,
+        TimeService $timeService)
+    {
+        $this->favoritesDao = $favoritesDao;
+        $this->scoreDao = $scoreDao;
+        $this->userDao = $userDao;
+        $this->transactionManager = $transactionManager;
+        $this->timeService = $timeService;
+    }
 
-	public function getFavoriteUsers(Entity $entity)
-	{
-		$transactionFunc = function() use ($entity)
-		{
-			$favorites = $this->favoritesDao->findByEntity($entity);
-			$userIds = [];
-			foreach ($favorites as $favorite)
-			{
-				$userIds[] = $favorite->getUserId();
-			}
-			return $this->userDao->findByIds($userIds);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getFavoriteUsers(Entity $entity)
+    {
+        $transactionFunc = function() use ($entity)
+        {
+            $favorites = $this->favoritesDao->findByEntity($entity);
+            $userIds = [];
+            foreach ($favorites as $favorite)
+            {
+                $userIds[] = $favorite->getUserId();
+            }
+            return $this->userDao->findByIds($userIds);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function addFavorite(User $user, Entity $entity)
-	{
-		$transactionFunc = function() use ($user, $entity)
-		{
-			$this->scoreDao->setUserScore($user, $entity, 1);
+    public function addFavorite(User $user, Entity $entity)
+    {
+        $transactionFunc = function() use ($user, $entity)
+        {
+            $this->scoreDao->setUserScore($user, $entity, 1);
 
-			return $this->favoritesDao->set($user, $entity);
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            return $this->favoritesDao->set($user, $entity);
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function deleteFavorite(User $user, Entity $entity)
-	{
-		$transactionFunc = function() use ($user, $entity)
-		{
-			$this->favoritesDao->delete($user, $entity);
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function deleteFavorite(User $user, Entity $entity)
+    {
+        $transactionFunc = function() use ($user, $entity)
+        {
+            $this->favoritesDao->delete($user, $entity);
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 }
diff --git a/src/Services/HistoryService.php b/src/Services/HistoryService.php
index d737917b..e0b5c1ed 100644
--- a/src/Services/HistoryService.php
+++ b/src/Services/HistoryService.php
@@ -9,120 +9,120 @@ use Szurubooru\Services\TimeService;
 
 class HistoryService
 {
-	private $snapshotDao;
-	private $timeService;
-	private $authService;
-	private $transactionManager;
+    private $snapshotDao;
+    private $timeService;
+    private $authService;
+    private $transactionManager;
 
-	public function __construct(
-		SnapshotDao $snapshotDao,
-		TransactionManager $transactionManager,
-		TimeService $timeService,
-		AuthService $authService)
-	{
-		$this->snapshotDao = $snapshotDao;
-		$this->timeService = $timeService;
-		$this->authService = $authService;
-		$this->transactionManager = $transactionManager;
-	}
+    public function __construct(
+        SnapshotDao $snapshotDao,
+        TransactionManager $transactionManager,
+        TimeService $timeService,
+        AuthService $authService)
+    {
+        $this->snapshotDao = $snapshotDao;
+        $this->timeService = $timeService;
+        $this->authService = $authService;
+        $this->transactionManager = $transactionManager;
+    }
 
-	public function getFiltered(SnapshotFilter $filter)
-	{
-		$transactionFunc = function() use ($filter)
-		{
-			return $this->snapshotDao->findFiltered($filter);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getFiltered(SnapshotFilter $filter)
+    {
+        $transactionFunc = function() use ($filter)
+        {
+            return $this->snapshotDao->findFiltered($filter);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function saveSnapshot(Snapshot $snapshot)
-	{
-		$transactionFunc = function() use ($snapshot)
-		{
-			$snapshot->setTime($this->timeService->getCurrentTime());
-			$snapshot->setUser($this->authService->getLoggedInUser());
+    public function saveSnapshot(Snapshot $snapshot)
+    {
+        $transactionFunc = function() use ($snapshot)
+        {
+            $snapshot->setTime($this->timeService->getCurrentTime());
+            $snapshot->setUser($this->authService->getLoggedInUser());
 
-			$earlierSnapshots = array_values($this->snapshotDao->findEarlierSnapshots($snapshot));
-			$snapshotsLeft = count($earlierSnapshots);
+            $earlierSnapshots = array_values($this->snapshotDao->findEarlierSnapshots($snapshot));
+            $snapshotsLeft = count($earlierSnapshots);
 
-			while (true)
-			{
-				$lastSnapshot = array_shift($earlierSnapshots);
-				$dataDifference = $this->getSnapshotDataDifference($snapshot, $lastSnapshot);
-				$snapshot->setDataDifference($dataDifference);
+            while (true)
+            {
+                $lastSnapshot = array_shift($earlierSnapshots);
+                $dataDifference = $this->getSnapshotDataDifference($snapshot, $lastSnapshot);
+                $snapshot->setDataDifference($dataDifference);
 
-				if ($lastSnapshot === null)
-					break;
+                if ($lastSnapshot === null)
+                    break;
 
-				//recent snapshots should be merged
-				$isFresh = ((strtotime($snapshot->getTime()) - strtotime($lastSnapshot->getTime())) <= 5 * 60);
-				if (!$isFresh || $lastSnapshot->getUserId() !== $snapshot->getUserId())
-					break;
+                //recent snapshots should be merged
+                $isFresh = ((strtotime($snapshot->getTime()) - strtotime($lastSnapshot->getTime())) <= 5 * 60);
+                if (!$isFresh || $lastSnapshot->getUserId() !== $snapshot->getUserId())
+                    break;
 
-				//delete the current snapshot
-				if ($snapshot->getId())
-					$this->snapshotDao->deleteById($snapshot->getId());
+                //delete the current snapshot
+                if ($snapshot->getId())
+                    $this->snapshotDao->deleteById($snapshot->getId());
 
-				//become previous snapshot, but keep the current data
-				$snapshot->setId($lastSnapshot->getId());
-				if ($snapshot->getOperation() !== Snapshot::OPERATION_DELETE)
-					$snapshot->setOperation($lastSnapshot->getOperation());
+                //become previous snapshot, but keep the current data
+                $snapshot->setId($lastSnapshot->getId());
+                if ($snapshot->getOperation() !== Snapshot::OPERATION_DELETE)
+                    $snapshot->setOperation($lastSnapshot->getOperation());
 
-				-- $snapshotsLeft;
-			}
+                -- $snapshotsLeft;
+            }
 
-			$onlyRemovalLeft = (!$snapshotsLeft && $snapshot->getOperation() === Snapshot::OPERATION_DELETE);
+            $onlyRemovalLeft = (!$snapshotsLeft && $snapshot->getOperation() === Snapshot::OPERATION_DELETE);
 
-			$emptyDiff = (empty($dataDifference['+']) && empty($dataDifference['-']));
-			if ($onlyRemovalLeft || $emptyDiff)
-			{
-				if ($snapshot->getId())
-					$this->snapshotDao->deleteById($snapshot->getId());
-				return array_shift($earlierSnapshots);
-			}
+            $emptyDiff = (empty($dataDifference['+']) && empty($dataDifference['-']));
+            if ($onlyRemovalLeft || $emptyDiff)
+            {
+                if ($snapshot->getId())
+                    $this->snapshotDao->deleteById($snapshot->getId());
+                return array_shift($earlierSnapshots);
+            }
 
-			return $this->snapshotDao->save($snapshot);
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            return $this->snapshotDao->save($snapshot);
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function getSnapshotDataDifference(Snapshot $newSnapshot, Snapshot $oldSnapshot = null)
-	{
-		return $this->getDataDifference(
-			$newSnapshot->getData(),
-			$oldSnapshot ? $oldSnapshot->getData() : []);
-	}
+    public function getSnapshotDataDifference(Snapshot $newSnapshot, Snapshot $oldSnapshot = null)
+    {
+        return $this->getDataDifference(
+            $newSnapshot->getData(),
+            $oldSnapshot ? $oldSnapshot->getData() : []);
+    }
 
-	public function getDataDifference($newData, $oldData)
-	{
-		$diffFunction = function($base, $other)
-		{
-			$result = [];
-			foreach ($base as $key => $value)
-			{
-				if (is_array($base[$key]))
-				{
-					$result[$key] = [];
-					foreach ($base[$key] as $subValue)
-					{
-						if (!isset($other[$key]) || !in_array($subValue, $other[$key]))
-							$result[$key] []= $subValue;
-					}
-					if (empty($result[$key]))
-						unset($result[$key]);
-				}
-				elseif (!isset($other[$key]) || $base[$key] !== $other[$key])
-				{
-					$result[$key] = $value;
-				}
-			}
-			return $result;
+    public function getDataDifference($newData, $oldData)
+    {
+        $diffFunction = function($base, $other)
+        {
+            $result = [];
+            foreach ($base as $key => $value)
+            {
+                if (is_array($base[$key]))
+                {
+                    $result[$key] = [];
+                    foreach ($base[$key] as $subValue)
+                    {
+                        if (!isset($other[$key]) || !in_array($subValue, $other[$key]))
+                            $result[$key] []= $subValue;
+                    }
+                    if (empty($result[$key]))
+                        unset($result[$key]);
+                }
+                elseif (!isset($other[$key]) || $base[$key] !== $other[$key])
+                {
+                    $result[$key] = $value;
+                }
+            }
+            return $result;
 
-		};
+        };
 
-		return [
-			'+' => $diffFunction($newData, $oldData),
-			'-' => $diffFunction($oldData, $newData),
-		];
-	}
+        return [
+            '+' => $diffFunction($newData, $oldData),
+            '-' => $diffFunction($oldData, $newData),
+        ];
+    }
 }
diff --git a/src/Services/ISnapshotProvider.php b/src/Services/ISnapshotProvider.php
index 78db0f04..576c38d8 100644
--- a/src/Services/ISnapshotProvider.php
+++ b/src/Services/ISnapshotProvider.php
@@ -4,7 +4,7 @@ use Szurubooru\Entities\Entity;
 
 interface ISnapshotProvider
 {
-	public function getCreationSnapshot(Entity $entity);
-	public function getChangeSnapshot(Entity $entity);
-	public function getDeleteSnapshot(Entity $entity);
+    public function getCreationSnapshot(Entity $entity);
+    public function getChangeSnapshot(Entity $entity);
+    public function getDeleteSnapshot(Entity $entity);
 }
diff --git a/src/Services/ImageConverter.php b/src/Services/ImageConverter.php
index 7956bf3a..242baeea 100644
--- a/src/Services/ImageConverter.php
+++ b/src/Services/ImageConverter.php
@@ -6,117 +6,117 @@ use Szurubooru\Services\ImageManipulation\ImageManipulator;
 
 class ImageConverter
 {
-	const PROGRAM_NAME_DUMP_GNASH = 'dump-gnash';
-	const PROGRAM_NAME_SWFRENDER = 'swfrender';
-	const PROGRAM_NAME_FFMPEG = 'ffmpeg';
-	const PROGRAM_NAME_FFMPEGTHUMBNAILER = 'ffmpegthumbnailer';
+    const PROGRAM_NAME_DUMP_GNASH = 'dump-gnash';
+    const PROGRAM_NAME_SWFRENDER = 'swfrender';
+    const PROGRAM_NAME_FFMPEG = 'ffmpeg';
+    const PROGRAM_NAME_FFMPEGTHUMBNAILER = 'ffmpegthumbnailer';
 
-	private $imageManipulator;
+    private $imageManipulator;
 
-	public function __construct(ImageManipulator $imageManipulator)
-	{
-		$this->imageManipulator = $imageManipulator;
-	}
+    public function __construct(ImageManipulator $imageManipulator)
+    {
+        $this->imageManipulator = $imageManipulator;
+    }
 
-	public function createImageFromBuffer($source)
-	{
-		$tmpSourcePath = tempnam(sys_get_temp_dir(), 'thumb') . '.dat';
-		$tmpTargetPath = tempnam(sys_get_temp_dir(), 'thumb') . '.png';
-		try
-		{
-			file_put_contents($tmpSourcePath, $source);
-			$this->convert($tmpSourcePath, $tmpTargetPath);
+    public function createImageFromBuffer($source)
+    {
+        $tmpSourcePath = tempnam(sys_get_temp_dir(), 'thumb') . '.dat';
+        $tmpTargetPath = tempnam(sys_get_temp_dir(), 'thumb') . '.png';
+        try
+        {
+            file_put_contents($tmpSourcePath, $source);
+            $this->convert($tmpSourcePath, $tmpTargetPath);
 
-			$tmpSource = file_get_contents($tmpTargetPath);
-			return $this->imageManipulator->loadFromBuffer($tmpSource);
-		}
-		finally
-		{
-			$this->deleteIfExists($tmpSourcePath);
-			$this->deleteIfExists($tmpTargetPath);
-		}
-	}
+            $tmpSource = file_get_contents($tmpTargetPath);
+            return $this->imageManipulator->loadFromBuffer($tmpSource);
+        }
+        finally
+        {
+            $this->deleteIfExists($tmpSourcePath);
+            $this->deleteIfExists($tmpTargetPath);
+        }
+    }
 
-	public function convert($sourcePath, $targetPath)
-	{
-		$mime = MimeHelper::getMimeTypeFromFile($sourcePath);
+    public function convert($sourcePath, $targetPath)
+    {
+        $mime = MimeHelper::getMimeTypeFromFile($sourcePath);
 
-		if (MimeHelper::isImage($mime))
-			copy($sourcePath, $targetPath);
+        if (MimeHelper::isImage($mime))
+            copy($sourcePath, $targetPath);
 
-		elseif (MimeHelper::isFlash($mime))
-			$this->convertFromFlash($sourcePath, $targetPath);
+        elseif (MimeHelper::isFlash($mime))
+            $this->convertFromFlash($sourcePath, $targetPath);
 
-		elseif (MimeHelper::isVideo($mime))
-			$this->convertFromVideo($sourcePath, $targetPath);
+        elseif (MimeHelper::isVideo($mime))
+            $this->convertFromVideo($sourcePath, $targetPath);
 
-		else
-			throw new \Exception('Error while converting file to image - unrecognized MIME: ' . $mime);
-	}
+        else
+            throw new \Exception('Error while converting file to image - unrecognized MIME: ' . $mime);
+    }
 
-	private function convertFromFlash($sourcePath, $targetPath)
-	{
-		if (ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_DUMP_GNASH))
-		{
-			ProgramExecutor::run(
-				self::PROGRAM_NAME_DUMP_GNASH,
-				[
-					'--screenshot', 'last',
-					'--screenshot-file', $targetPath,
-					'-1',
-					'-r1',
-					'--max-advances', '15',
-					$sourcePath,
-				]);
-		}
+    private function convertFromFlash($sourcePath, $targetPath)
+    {
+        if (ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_DUMP_GNASH))
+        {
+            ProgramExecutor::run(
+                self::PROGRAM_NAME_DUMP_GNASH,
+                [
+                    '--screenshot', 'last',
+                    '--screenshot-file', $targetPath,
+                    '-1',
+                    '-r1',
+                    '--max-advances', '15',
+                    $sourcePath,
+                ]);
+        }
 
-		if (!file_exists($targetPath) && ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_SWFRENDER))
-		{
-			ProgramExecutor::run(
-				self::PROGRAM_NAME_SWFRENDER,
-				[
-					'swfrender',
-					$sourcePath,
-					'-o',
-					$targetPath,
-				]);
-		}
+        if (!file_exists($targetPath) && ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_SWFRENDER))
+        {
+            ProgramExecutor::run(
+                self::PROGRAM_NAME_SWFRENDER,
+                [
+                    'swfrender',
+                    $sourcePath,
+                    '-o',
+                    $targetPath,
+                ]);
+        }
 
-		if (!file_exists($targetPath))
-			throw new \Exception('Error while converting Flash file to image');
-	}
+        if (!file_exists($targetPath))
+            throw new \Exception('Error while converting Flash file to image');
+    }
 
-	private function convertFromVideo($sourcePath, $targetPath)
-	{
-		if (ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_FFMPEGTHUMBNAILER))
-		{
-			ProgramExecutor::run(
-				self::PROGRAM_NAME_FFMPEGTHUMBNAILER,
-				[
-					'-i' . $sourcePath,
-					'-o' . $targetPath,
-					'-s0',
-					'-t12%%'
-				]);
-		}
+    private function convertFromVideo($sourcePath, $targetPath)
+    {
+        if (ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_FFMPEGTHUMBNAILER))
+        {
+            ProgramExecutor::run(
+                self::PROGRAM_NAME_FFMPEGTHUMBNAILER,
+                [
+                    '-i' . $sourcePath,
+                    '-o' . $targetPath,
+                    '-s0',
+                    '-t12%%'
+                ]);
+        }
 
-		if (!file_exists($targetPath) && ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_FFMPEG))
-		{
-			ProgramExecutor::run(self::PROGRAM_NAME_FFMPEG,
-				[
-					'-i', $sourcePath,
-					'-vframes', '1',
-					$targetPath
-				]);
-		}
+        if (!file_exists($targetPath) && ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_FFMPEG))
+        {
+            ProgramExecutor::run(self::PROGRAM_NAME_FFMPEG,
+                [
+                    '-i', $sourcePath,
+                    '-vframes', '1',
+                    $targetPath
+                ]);
+        }
 
-		if (!file_exists($targetPath))
-			throw new \Exception('Error while converting video file to image');
-	}
+        if (!file_exists($targetPath))
+            throw new \Exception('Error while converting video file to image');
+    }
 
-	private function deleteIfExists($path)
-	{
-		if (file_exists($path))
-			unlink($path);
-	}
+    private function deleteIfExists($path)
+    {
+        if (file_exists($path))
+            unlink($path);
+    }
 }
diff --git a/src/Services/ImageManipulation/GdImageManipulator.php b/src/Services/ImageManipulation/GdImageManipulator.php
index 9f8aa58d..eea75bfb 100644
--- a/src/Services/ImageManipulation/GdImageManipulator.php
+++ b/src/Services/ImageManipulation/GdImageManipulator.php
@@ -3,92 +3,92 @@ namespace Szurubooru\Services\ImageManipulation;
 
 class GdImageManipulator implements IImageManipulator
 {
-	public function loadFromBuffer($source)
-	{
-		try
-		{
-			return imagecreatefromstring($source);
-		}
-		catch (\Exception $e)
-		{
-			return null;
-		}
-	}
+    public function loadFromBuffer($source)
+    {
+        try
+        {
+            return imagecreatefromstring($source);
+        }
+        catch (\Exception $e)
+        {
+            return null;
+        }
+    }
 
-	public function getImageWidth($imageResource)
-	{
-		return imagesx($imageResource);
-	}
+    public function getImageWidth($imageResource)
+    {
+        return imagesx($imageResource);
+    }
 
-	public function getImageHeight($imageResource)
-	{
-		return imagesy($imageResource);
-	}
+    public function getImageHeight($imageResource)
+    {
+        return imagesy($imageResource);
+    }
 
-	public function resizeImage(&$imageResource, $width, $height)
-	{
-		$targetImageResource = imagecreatetruecolor($width, $height);
+    public function resizeImage(&$imageResource, $width, $height)
+    {
+        $targetImageResource = imagecreatetruecolor($width, $height);
 
-		imagecopyresampled(
-			$targetImageResource,
-			$imageResource,
-			0, 0,
-			0, 0,
-			$width,
-			$height,
-			imagesx($imageResource),
-			imagesy($imageResource));
+        imagecopyresampled(
+            $targetImageResource,
+            $imageResource,
+            0, 0,
+            0, 0,
+            $width,
+            $height,
+            imagesx($imageResource),
+            imagesy($imageResource));
 
-		$imageResource = $targetImageResource;
-	}
+        $imageResource = $targetImageResource;
+    }
 
-	public function cropImage(&$imageResource, $width, $height, $originX, $originY)
-	{
-		if ($originX + $width > imagesx($imageResource))
-			$width = imagesx($imageResource) - $originX;
-		if ($originY + $height > imagesy($imageResource))
-			$height = imagesy($imageResource) - $originY;
+    public function cropImage(&$imageResource, $width, $height, $originX, $originY)
+    {
+        if ($originX + $width > imagesx($imageResource))
+            $width = imagesx($imageResource) - $originX;
+        if ($originY + $height > imagesy($imageResource))
+            $height = imagesy($imageResource) - $originY;
 
-		if ($originX < 0)
-			$width = $width + $originX;
-		if ($originY < 0)
-			$height = $height + $originY;
+        if ($originX < 0)
+            $width = $width + $originX;
+        if ($originY < 0)
+            $height = $height + $originY;
 
-		if ($width < 1)
-			$width = 1;
-		if ($height < 1)
-			$height = 1;
+        if ($width < 1)
+            $width = 1;
+        if ($height < 1)
+            $height = 1;
 
-		$imageResource = imagecrop($imageResource, [
-			'x' => $originX,
-			'y' => $originY,
-			'width' => $width,
-			'height' => $height]);
-	}
+        $imageResource = imagecrop($imageResource, [
+            'x' => $originX,
+            'y' => $originY,
+            'width' => $width,
+            'height' => $height]);
+    }
 
-	public function saveToBuffer($imageResource, $format)
-	{
-		ob_start();
+    public function saveToBuffer($imageResource, $format)
+    {
+        ob_start();
 
-		switch ($format)
-		{
-			case self::FORMAT_JPEG:
-				imagejpeg($imageResource);
-				break;
+        switch ($format)
+        {
+            case self::FORMAT_JPEG:
+                imagejpeg($imageResource);
+                break;
 
-			case self::FORMAT_PNG:
-				imagepng($imageResource);
-				break;
+            case self::FORMAT_PNG:
+                imagepng($imageResource);
+                break;
 
-			default:
-				throw new \InvalidArgumentException('Not supported');
-		}
+            default:
+                throw new \InvalidArgumentException('Not supported');
+        }
 
-		$buffer = ob_get_contents();
-		ob_end_clean();
+        $buffer = ob_get_contents();
+        ob_end_clean();
 
-		if (!$buffer)
-			throw new \InvalidArgumentException('Not supported');
-		return $buffer;
-	}
+        if (!$buffer)
+            throw new \InvalidArgumentException('Not supported');
+        return $buffer;
+    }
 }
diff --git a/src/Services/ImageManipulation/IImageManipulator.php b/src/Services/ImageManipulation/IImageManipulator.php
index c0a638ca..1d36558c 100644
--- a/src/Services/ImageManipulation/IImageManipulator.php
+++ b/src/Services/ImageManipulation/IImageManipulator.php
@@ -3,18 +3,18 @@ namespace Szurubooru\Services\ImageManipulation;
 
 interface IImageManipulator
 {
-	const FORMAT_JPEG = 0;
-	const FORMAT_PNG = 1;
+    const FORMAT_JPEG = 0;
+    const FORMAT_PNG = 1;
 
-	public function loadFromBuffer($source);
+    public function loadFromBuffer($source);
 
-	public function getImageWidth($imageResource);
+    public function getImageWidth($imageResource);
 
-	public function getImageHeight($imageResource);
+    public function getImageHeight($imageResource);
 
-	public function resizeImage(&$imageResource, $width, $height);
+    public function resizeImage(&$imageResource, $width, $height);
 
-	public function cropImage(&$imageResource, $width, $height, $originX, $originY);
+    public function cropImage(&$imageResource, $width, $height, $originX, $originY);
 
-	public function saveToBuffer($imageResource, $format);
+    public function saveToBuffer($imageResource, $format);
 }
diff --git a/src/Services/ImageManipulation/ImageManipulator.php b/src/Services/ImageManipulation/ImageManipulator.php
index 3f23fa51..a5ec7481 100644
--- a/src/Services/ImageManipulation/ImageManipulator.php
+++ b/src/Services/ImageManipulation/ImageManipulator.php
@@ -5,53 +5,53 @@ use Szurubooru\Services\ImageManipulation\ImagickImageManipulator;
 
 class ImageManipulator implements IImageManipulator
 {
-	private $strategy;
+    private $strategy;
 
-	public function __construct(
-		ImagickImageManipulator $imagickImageManipulator,
-		GdImageManipulator $gdImageManipulator)
-	{
-		if (extension_loaded('imagick'))
-		{
-			$this->strategy = $imagickImageManipulator;
-		}
-		else if (extension_loaded('gd'))
-		{
-			$this->strategy = $gdImageManipulator;
-		}
-		else
-		{
-			throw new \RuntimeException('Neither imagick or gd image extensions are enabled');
-		}
-	}
+    public function __construct(
+        ImagickImageManipulator $imagickImageManipulator,
+        GdImageManipulator $gdImageManipulator)
+    {
+        if (extension_loaded('imagick'))
+        {
+            $this->strategy = $imagickImageManipulator;
+        }
+        else if (extension_loaded('gd'))
+        {
+            $this->strategy = $gdImageManipulator;
+        }
+        else
+        {
+            throw new \RuntimeException('Neither imagick or gd image extensions are enabled');
+        }
+    }
 
-	public function loadFromBuffer($source)
-	{
-		return $this->strategy->loadFromBuffer($source);
-	}
+    public function loadFromBuffer($source)
+    {
+        return $this->strategy->loadFromBuffer($source);
+    }
 
-	public function getImageWidth($imageResource)
-	{
-		return $this->strategy->getImageWidth($imageResource);
-	}
+    public function getImageWidth($imageResource)
+    {
+        return $this->strategy->getImageWidth($imageResource);
+    }
 
-	public function getImageHeight($imageResource)
-	{
-		return $this->strategy->getImageHeight($imageResource);
-	}
+    public function getImageHeight($imageResource)
+    {
+        return $this->strategy->getImageHeight($imageResource);
+    }
 
-	public function resizeImage(&$imageResource, $width, $height)
-	{
-		return $this->strategy->resizeImage($imageResource, $width, $height);
-	}
+    public function resizeImage(&$imageResource, $width, $height)
+    {
+        return $this->strategy->resizeImage($imageResource, $width, $height);
+    }
 
-	public function cropImage(&$imageResource, $width, $height, $originX, $originY)
-	{
-		return $this->strategy->cropImage($imageResource, $width, $height, $originX, $originY);
-	}
+    public function cropImage(&$imageResource, $width, $height, $originX, $originY)
+    {
+        return $this->strategy->cropImage($imageResource, $width, $height, $originX, $originY);
+    }
 
-	public function saveToBuffer($source, $format)
-	{
-		return $this->strategy->saveToBuffer($source, $format);
-	}
+    public function saveToBuffer($source, $format)
+    {
+        return $this->strategy->saveToBuffer($source, $format);
+    }
 }
diff --git a/src/Services/ImageManipulation/ImagickImageManipulator.php b/src/Services/ImageManipulation/ImagickImageManipulator.php
index d2e189cb..9779a436 100644
--- a/src/Services/ImageManipulation/ImagickImageManipulator.php
+++ b/src/Services/ImageManipulation/ImagickImageManipulator.php
@@ -3,63 +3,63 @@ namespace Szurubooru\Services\ImageManipulation;
 
 class ImagickImageManipulator implements IImageManipulator
 {
-	public function loadFromBuffer($source)
-	{
-		try
-		{
-			$image = new \Imagick();
-			$image->readImageBlob($source);
-			if ($image->getImageFormat() == 'GIF')
-				$image = $image->coalesceImages();
-			return $image;
-		}
-		catch (\Exception $e)
-		{
-			return null;
-		}
-	}
+    public function loadFromBuffer($source)
+    {
+        try
+        {
+            $image = new \Imagick();
+            $image->readImageBlob($source);
+            if ($image->getImageFormat() == 'GIF')
+                $image = $image->coalesceImages();
+            return $image;
+        }
+        catch (\Exception $e)
+        {
+            return null;
+        }
+    }
 
-	public function getImageWidth($imageResource)
-	{
-		return $imageResource->getImageWidth();
-	}
+    public function getImageWidth($imageResource)
+    {
+        return $imageResource->getImageWidth();
+    }
 
-	public function getImageHeight($imageResource)
-	{
-		return $imageResource->getImageHeight();
-	}
+    public function getImageHeight($imageResource)
+    {
+        return $imageResource->getImageHeight();
+    }
 
-	public function resizeImage(&$imageResource, $width, $height)
-	{
-		$imageResource->resizeImage($width, $height, \Imagick::FILTER_LANCZOS, 0.9);
-	}
+    public function resizeImage(&$imageResource, $width, $height)
+    {
+        $imageResource->resizeImage($width, $height, \Imagick::FILTER_LANCZOS, 0.9);
+    }
 
-	public function cropImage(&$imageResource, $width, $height, $originX, $originY)
-	{
-		$imageResource->cropImage($width, $height, $originX, $originY);
-		$imageResource->setImagePage(0, 0, 0, 0);
-	}
+    public function cropImage(&$imageResource, $width, $height, $originX, $originY)
+    {
+        $imageResource->cropImage($width, $height, $originX, $originY);
+        $imageResource->setImagePage(0, 0, 0, 0);
+    }
 
-	public function saveToBuffer($imageResource, $format)
-	{
-		switch ($format)
-		{
-			case self::FORMAT_JPEG:
-				$matte = new \Imagick();
-				$matte->newImage($imageResource->getImageWidth(), $imageResource->getImageHeight(), 'white');
-				$matte->compositeimage($imageResource, \Imagick::COMPOSITE_OVER, 0, 0);
-				$imageResource = $matte;
-				$imageResource->setImageFormat('jpeg');
-				break;
+    public function saveToBuffer($imageResource, $format)
+    {
+        switch ($format)
+        {
+            case self::FORMAT_JPEG:
+                $matte = new \Imagick();
+                $matte->newImage($imageResource->getImageWidth(), $imageResource->getImageHeight(), 'white');
+                $matte->compositeimage($imageResource, \Imagick::COMPOSITE_OVER, 0, 0);
+                $imageResource = $matte;
+                $imageResource->setImageFormat('jpeg');
+                break;
 
-			case self::FORMAT_PNG:
-				$imageResource->setImageFormat('png');
-				break;
+            case self::FORMAT_PNG:
+                $imageResource->setImageFormat('png');
+                break;
 
-			default:
-				throw new \InvalidArgumentException('Not supported');
-		}
+            default:
+                throw new \InvalidArgumentException('Not supported');
+        }
 
-		return $imageResource->getImageBlob();
-	}
+        return $imageResource->getImageBlob();
+    }
 }
diff --git a/src/Services/NetworkingService.php b/src/Services/NetworkingService.php
index 453cdd58..3ffefc14 100644
--- a/src/Services/NetworkingService.php
+++ b/src/Services/NetworkingService.php
@@ -5,98 +5,98 @@ use Szurubooru\Helpers\HttpHelper;
 
 class NetworkingService
 {
-	private $httpHelper;
+    private $httpHelper;
 
-	public function __construct(HttpHelper $httpHelper)
-	{
-		$this->httpHelper = $httpHelper;
-	}
+    public function __construct(HttpHelper $httpHelper)
+    {
+        $this->httpHelper = $httpHelper;
+    }
 
-	public function serveFile($fullPath, $customFileName = null)
-	{
-		if (!file_exists($fullPath))
-			throw new \Exception('File "' . $fullPath . '" does not exist.');
+    public function serveFile($fullPath, $customFileName = null)
+    {
+        if (!file_exists($fullPath))
+            throw new \Exception('File "' . $fullPath . '" does not exist.');
 
-		$daysToLive = 7;
-		$secondsToLive = $daysToLive * 24 * 60 * 60;
-		$lastModified = filemtime($fullPath);
-		$eTag = md5($fullPath . $lastModified);
+        $daysToLive = 7;
+        $secondsToLive = $daysToLive * 24 * 60 * 60;
+        $lastModified = filemtime($fullPath);
+        $eTag = md5($fullPath . $lastModified);
 
-		$ifModifiedSince = isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])
-			? $_SERVER['HTTP_IF_MODIFIED_SINCE']
-			: false;
+        $ifModifiedSince = isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])
+            ? $_SERVER['HTTP_IF_MODIFIED_SINCE']
+            : false;
 
-		$eTagHeader = isset($_SERVER['HTTP_IF_NONE_MATCH'])
-			? trim($_SERVER['HTTP_IF_NONE_MATCH'], "\" \t\r\n")
-			: null;
+        $eTagHeader = isset($_SERVER['HTTP_IF_NONE_MATCH'])
+            ? trim($_SERVER['HTTP_IF_NONE_MATCH'], "\" \t\r\n")
+            : null;
 
-		$this->httpHelper->setHeader('ETag', '"' . $eTag . '"');
-		$this->httpHelper->setHeader('Last-Modified', gmdate('D, d M Y H:i:s \G\M\T', $lastModified));
-		$this->httpHelper->setHeader('Pragma', 'public');
-		$this->httpHelper->setHeader('Cache-Control', 'public, max-age=' . $secondsToLive);
-		$this->httpHelper->setHeader('Expires', gmdate('D, d M Y H:i:s \G\M\T', time() + $secondsToLive));
-		$this->httpHelper->setHeader('Content-Type', MimeHelper::getMimeTypeFromFile($fullPath));
+        $this->httpHelper->setHeader('ETag', '"' . $eTag . '"');
+        $this->httpHelper->setHeader('Last-Modified', gmdate('D, d M Y H:i:s \G\M\T', $lastModified));
+        $this->httpHelper->setHeader('Pragma', 'public');
+        $this->httpHelper->setHeader('Cache-Control', 'public, max-age=' . $secondsToLive);
+        $this->httpHelper->setHeader('Expires', gmdate('D, d M Y H:i:s \G\M\T', time() + $secondsToLive));
+        $this->httpHelper->setHeader('Content-Type', MimeHelper::getMimeTypeFromFile($fullPath));
 
-		if ($customFileName)
-			$this->httpHelper->setHeader('Content-Disposition', 'inline; filename="' . $customFileName . '"');
+        if ($customFileName)
+            $this->httpHelper->setHeader('Content-Disposition', 'inline; filename="' . $customFileName . '"');
 
-		if (strtotime($ifModifiedSince) === $lastModified || $eTagHeader === $eTag)
-		{
-			$this->httpHelper->setResponseCode(304);
-		}
-		else
-		{
-			$this->httpHelper->setResponseCode(200);
-			readfile($fullPath);
-		}
-		exit;
-	}
+        if (strtotime($ifModifiedSince) === $lastModified || $eTagHeader === $eTag)
+        {
+            $this->httpHelper->setResponseCode(304);
+        }
+        else
+        {
+            $this->httpHelper->setResponseCode(200);
+            readfile($fullPath);
+        }
+        exit;
+    }
 
-	public function download($url, $maxBytes = null)
-	{
-		set_time_limit(60);
-		try
-		{
-			$srcHandle = fopen($url, 'rb');
-		}
-		catch (Exception $e)
-		{
-			throw new \Exception('Cannot open URL for reading: ' . $e->getMessage());
-		}
+    public function download($url, $maxBytes = null)
+    {
+        set_time_limit(60);
+        try
+        {
+            $srcHandle = fopen($url, 'rb');
+        }
+        catch (Exception $e)
+        {
+            throw new \Exception('Cannot open URL for reading: ' . $e->getMessage());
+        }
 
-		if (!$srcHandle)
-			throw new \Exception('Cannot open URL for reading');
+        if (!$srcHandle)
+            throw new \Exception('Cannot open URL for reading');
 
-		$result = '';
-		try
-		{
-			while (!feof($srcHandle))
-			{
-				$buffer = fread($srcHandle, 4 * 1024);
-				if ($maxBytes !== null && strlen($result) > $maxBytes)
-				{
-					throw new \Exception(
-						'File is too big (maximum size: %s)',
-						TextHelper::useBytesUnits($maxBytes));
-				}
-				$result .= $buffer;
-			}
-		}
-		finally
-		{
-			fclose($srcHandle);
-		}
+        $result = '';
+        try
+        {
+            while (!feof($srcHandle))
+            {
+                $buffer = fread($srcHandle, 4 * 1024);
+                if ($maxBytes !== null && strlen($result) > $maxBytes)
+                {
+                    throw new \Exception(
+                        'File is too big (maximum size: %s)',
+                        TextHelper::useBytesUnits($maxBytes));
+                }
+                $result .= $buffer;
+            }
+        }
+        finally
+        {
+            fclose($srcHandle);
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function redirect($destination)
-	{
-		$this->httpHelper->redirect($destination);
-	}
+    public function redirect($destination)
+    {
+        $this->httpHelper->redirect($destination);
+    }
 
-	public function nonCachedRedirect($destination)
-	{
-		$this->httpHelper->nonCachedRedirect($destination);
-	}
+    public function nonCachedRedirect($destination)
+    {
+        $this->httpHelper->nonCachedRedirect($destination);
+    }
 }
diff --git a/src/Services/PasswordService.php b/src/Services/PasswordService.php
index cc5cc250..3e40e598 100644
--- a/src/Services/PasswordService.php
+++ b/src/Services/PasswordService.php
@@ -4,52 +4,52 @@ use Szurubooru\Config;
 
 class PasswordService
 {
-	private $config;
-	private $alphabet;
-	private $pattern;
+    private $config;
+    private $alphabet;
+    private $pattern;
 
-	public function __construct(Config $config)
-	{
-		$this->config = $config;
-		$this->alphabet =
-		[
-			'c' => str_split('bcdfghjklmnpqrstvwxyz'),
-			'v' => str_split('aeiou'),
-			'n' => str_split('0123456789'),
-		];
-		$this->pattern = str_split('cvcvnncvcv');
-	}
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+        $this->alphabet =
+        [
+            'c' => str_split('bcdfghjklmnpqrstvwxyz'),
+            'v' => str_split('aeiou'),
+            'n' => str_split('0123456789'),
+        ];
+        $this->pattern = str_split('cvcvnncvcv');
+    }
 
-	public function getLegacyHash($password, $salt)
-	{
-		//hash used by old szurubooru version
-		return sha1('1A2/$_4xVa' . $salt . $password);
-	}
+    public function getLegacyHash($password, $salt)
+    {
+        //hash used by old szurubooru version
+        return sha1('1A2/$_4xVa' . $salt . $password);
+    }
 
-	public function getHash($password, $salt)
-	{
-		return hash('sha256', $this->config->security->secret . $salt . $password);
-	}
+    public function getHash($password, $salt)
+    {
+        return hash('sha256', $this->config->security->secret . $salt . $password);
+    }
 
-	public function isHashValid($password, $salt, $expectedPasswordHash)
-	{
-		$hashes =
-		[
-			$this->getLegacyHash($password, $salt),
-			$this->getHash($password, $salt),
-		];
-		return in_array($expectedPasswordHash, $hashes);
-	}
+    public function isHashValid($password, $salt, $expectedPasswordHash)
+    {
+        $hashes =
+        [
+            $this->getLegacyHash($password, $salt),
+            $this->getHash($password, $salt),
+        ];
+        return in_array($expectedPasswordHash, $hashes);
+    }
 
-	public function getRandomPassword()
-	{
-		$password = '';
-		foreach ($this->pattern as $token)
-		{
-			$subAlphabet = $this->alphabet[$token];
-			$character = $subAlphabet[mt_rand(0, count($subAlphabet) - 1)];
-			$password .= $character;
-		}
-		return $password;
-	}
+    public function getRandomPassword()
+    {
+        $password = '';
+        foreach ($this->pattern as $token)
+        {
+            $subAlphabet = $this->alphabet[$token];
+            $character = $subAlphabet[mt_rand(0, count($subAlphabet) - 1)];
+            $password .= $character;
+        }
+        return $password;
+    }
 }
diff --git a/src/Services/PostFeatureService.php b/src/Services/PostFeatureService.php
index 0a1835a9..55b67483 100644
--- a/src/Services/PostFeatureService.php
+++ b/src/Services/PostFeatureService.php
@@ -13,83 +13,83 @@ use Szurubooru\Validator;
 
 class PostFeatureService
 {
-	private $transactionManager;
-	private $postDao;
-	private $userDao;
-	private $globalParamDao;
-	private $authService;
-	private $timeService;
-	private $postHistoryService;
+    private $transactionManager;
+    private $postDao;
+    private $userDao;
+    private $globalParamDao;
+    private $authService;
+    private $timeService;
+    private $postHistoryService;
 
-	public function __construct(
-		TransactionManager $transactionManager,
-		PostDao $postDao,
-		UserDao $userDao,
-		GlobalParamDao $globalParamDao,
-		AuthService $authService,
-		TimeService $timeService,
-		PostHistoryService $postHistoryService)
-	{
-		$this->transactionManager = $transactionManager;
-		$this->postDao = $postDao;
-		$this->userDao = $userDao;
-		$this->globalParamDao = $globalParamDao;
-		$this->authService = $authService;
-		$this->timeService = $timeService;
-		$this->postHistoryService = $postHistoryService;
-	}
+    public function __construct(
+        TransactionManager $transactionManager,
+        PostDao $postDao,
+        UserDao $userDao,
+        GlobalParamDao $globalParamDao,
+        AuthService $authService,
+        TimeService $timeService,
+        PostHistoryService $postHistoryService)
+    {
+        $this->transactionManager = $transactionManager;
+        $this->postDao = $postDao;
+        $this->userDao = $userDao;
+        $this->globalParamDao = $globalParamDao;
+        $this->authService = $authService;
+        $this->timeService = $timeService;
+        $this->postHistoryService = $postHistoryService;
+    }
 
-	public function getFeaturedPost()
-	{
-		$transactionFunc = function()
-		{
-			$globalParam = $this->globalParamDao->findByKey(GlobalParam::KEY_FEATURED_POST);
-			if (!$globalParam)
-				return null;
-			return $this->postDao->findById($globalParam->getValue());
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getFeaturedPost()
+    {
+        $transactionFunc = function()
+        {
+            $globalParam = $this->globalParamDao->findByKey(GlobalParam::KEY_FEATURED_POST);
+            if (!$globalParam)
+                return null;
+            return $this->postDao->findById($globalParam->getValue());
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getFeaturedPostUser()
-	{
-		$transactionFunc = function()
-		{
-			$globalParam = $this->globalParamDao->findByKey(GlobalParam::KEY_FEATURED_POST_USER);
-			if (!$globalParam)
-				return null;
-			return $this->userDao->findById($globalParam->getValue());
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getFeaturedPostUser()
+    {
+        $transactionFunc = function()
+        {
+            $globalParam = $this->globalParamDao->findByKey(GlobalParam::KEY_FEATURED_POST_USER);
+            if (!$globalParam)
+                return null;
+            return $this->userDao->findById($globalParam->getValue());
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function featurePost(Post $post)
-	{
-		$transactionFunc = function() use ($post)
-		{
-			$previousFeaturedPost = $this->getFeaturedPost();
+    public function featurePost(Post $post)
+    {
+        $transactionFunc = function() use ($post)
+        {
+            $previousFeaturedPost = $this->getFeaturedPost();
 
-			if (($previousFeaturedPost === null) || ($previousFeaturedPost->getId() !== $post->getId()))
-			{
-				$post->setLastFeatureTime($this->timeService->getCurrentTime());
-				$post->setFeatureCount($post->getFeatureCount() + 1);
-				$this->postDao->save($post);
-			}
+            if (($previousFeaturedPost === null) || ($previousFeaturedPost->getId() !== $post->getId()))
+            {
+                $post->setLastFeatureTime($this->timeService->getCurrentTime());
+                $post->setFeatureCount($post->getFeatureCount() + 1);
+                $this->postDao->save($post);
+            }
 
-			$globalParam = new GlobalParam();
-			$globalParam->setKey(GlobalParam::KEY_FEATURED_POST);
-			$globalParam->setValue($post->getId());
-			$this->globalParamDao->save($globalParam);
+            $globalParam = new GlobalParam();
+            $globalParam->setKey(GlobalParam::KEY_FEATURED_POST);
+            $globalParam->setValue($post->getId());
+            $this->globalParamDao->save($globalParam);
 
-			$globalParam = new GlobalParam();
-			$globalParam->setKey(GlobalParam::KEY_FEATURED_POST_USER);
-			$globalParam->setValue($this->authService->getLoggedInUser()->getId());
-			$this->globalParamDao->save($globalParam);
+            $globalParam = new GlobalParam();
+            $globalParam->setKey(GlobalParam::KEY_FEATURED_POST_USER);
+            $globalParam->setValue($this->authService->getLoggedInUser()->getId());
+            $this->globalParamDao->save($globalParam);
 
-			if ($previousFeaturedPost)
-				$this->postHistoryService->savePostChange($previousFeaturedPost);
-			$this->postHistoryService->savePostChange($post);
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+            if ($previousFeaturedPost)
+                $this->postHistoryService->savePostChange($previousFeaturedPost);
+            $this->postHistoryService->savePostChange($post);
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 }
diff --git a/src/Services/PostHistoryService.php b/src/Services/PostHistoryService.php
index 40832fa6..5bf0eb65 100644
--- a/src/Services/PostHistoryService.php
+++ b/src/Services/PostHistoryService.php
@@ -11,53 +11,53 @@ use Szurubooru\Services\PostSnapshotProvider;
 
 class PostHistoryService
 {
-	private $transactionManager;
-	private $historyService;
-	private $postSnapshotProvider;
+    private $transactionManager;
+    private $historyService;
+    private $postSnapshotProvider;
 
-	public function __construct(
-		TransactionManager $transactionManager,
-		HistoryService $historyService,
-		PostSnapshotProvider $postSnapshotProvider)
-	{
-		$this->transactionManager = $transactionManager;
-		$this->historyService = $historyService;
-		$this->postSnapshotProvider = $postSnapshotProvider;
-	}
+    public function __construct(
+        TransactionManager $transactionManager,
+        HistoryService $historyService,
+        PostSnapshotProvider $postSnapshotProvider)
+    {
+        $this->transactionManager = $transactionManager;
+        $this->historyService = $historyService;
+        $this->postSnapshotProvider = $postSnapshotProvider;
+    }
 
-	public function getPostHistory(Post $post)
-	{
-		$transactionFunc = function() use ($post)
-		{
-			$filter = new SnapshotFilter();
+    public function getPostHistory(Post $post)
+    {
+        $transactionFunc = function() use ($post)
+        {
+            $filter = new SnapshotFilter();
 
-			$requirement = new Requirement();
-			$requirement->setType(SnapshotFilter::REQUIREMENT_PRIMARY_KEY);
-			$requirement->setValue(new RequirementSingleValue($post->getId()));
-			$filter->addRequirement($requirement);
+            $requirement = new Requirement();
+            $requirement->setType(SnapshotFilter::REQUIREMENT_PRIMARY_KEY);
+            $requirement->setValue(new RequirementSingleValue($post->getId()));
+            $filter->addRequirement($requirement);
 
-			$requirement = new Requirement();
-			$requirement->setType(SnapshotFilter::REQUIREMENT_TYPE);
-			$requirement->setValue(new RequirementSingleValue(Snapshot::TYPE_POST));
-			$filter->addRequirement($requirement);
+            $requirement = new Requirement();
+            $requirement->setType(SnapshotFilter::REQUIREMENT_TYPE);
+            $requirement->setValue(new RequirementSingleValue(Snapshot::TYPE_POST));
+            $filter->addRequirement($requirement);
 
-			return $this->historyService->getFiltered($filter)->getEntities();
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+            return $this->historyService->getFiltered($filter)->getEntities();
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function savePostCreation(Post $post)
-	{
-		$this->historyService->saveSnapshot($this->postSnapshotProvider->getCreationSnapshot($post));
-	}
+    public function savePostCreation(Post $post)
+    {
+        $this->historyService->saveSnapshot($this->postSnapshotProvider->getCreationSnapshot($post));
+    }
 
-	public function savePostChange(Post $post)
-	{
-		$this->historyService->saveSnapshot($this->postSnapshotProvider->getChangeSnapshot($post));
-	}
+    public function savePostChange(Post $post)
+    {
+        $this->historyService->saveSnapshot($this->postSnapshotProvider->getChangeSnapshot($post));
+    }
 
-	public function savePostDeletion(Post $post)
-	{
-		$this->historyService->saveSnapshot($this->postSnapshotProvider->getDeleteSnapshot($post));
-	}
+    public function savePostDeletion(Post $post)
+    {
+        $this->historyService->saveSnapshot($this->postSnapshotProvider->getDeleteSnapshot($post));
+    }
 }
diff --git a/src/Services/PostNotesService.php b/src/Services/PostNotesService.php
index 47c09151..516873db 100644
--- a/src/Services/PostNotesService.php
+++ b/src/Services/PostNotesService.php
@@ -10,90 +10,90 @@ use Szurubooru\Validator;
 
 class PostNotesService
 {
-	private $validator;
-	private $transactionManager;
-	private $postNoteDao;
-	private $postHistoryService;
+    private $validator;
+    private $transactionManager;
+    private $postNoteDao;
+    private $postHistoryService;
 
-	public function __construct(
-		Validator $validator,
-		TransactionManager $transactionManager,
-		PostNoteDao $postNoteDao,
-		PostHistoryService $postHistoryService)
-	{
-		$this->validator = $validator;
-		$this->transactionManager = $transactionManager;
-		$this->postNoteDao = $postNoteDao;
-		$this->postHistoryService = $postHistoryService;
-	}
+    public function __construct(
+        Validator $validator,
+        TransactionManager $transactionManager,
+        PostNoteDao $postNoteDao,
+        PostHistoryService $postHistoryService)
+    {
+        $this->validator = $validator;
+        $this->transactionManager = $transactionManager;
+        $this->postNoteDao = $postNoteDao;
+        $this->postHistoryService = $postHistoryService;
+    }
 
-	public function getById($postNoteId)
-	{
-		$transactionFunc = function() use ($postNoteId)
-		{
-			$postNote = $this->postNoteDao->findById($postNoteId);
-			if (!$postNote)
-				throw new \InvalidArgumentException('Post note with ID "' . $postNoteId . '" was not found.');
-			return $postNote;
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getById($postNoteId)
+    {
+        $transactionFunc = function() use ($postNoteId)
+        {
+            $postNote = $this->postNoteDao->findById($postNoteId);
+            if (!$postNote)
+                throw new \InvalidArgumentException('Post note with ID "' . $postNoteId . '" was not found.');
+            return $postNote;
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getByPost(Post $post)
-	{
-		$transactionFunc = function() use ($post)
-		{
-			return $this->postNoteDao->findByPostId($post->getId());
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getByPost(Post $post)
+    {
+        $transactionFunc = function() use ($post)
+        {
+            return $this->postNoteDao->findByPostId($post->getId());
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function createPostNote(Post $post, PostNoteFormData $formData)
-	{
-		$transactionFunc = function() use ($post, $formData)
-		{
-			$postNote = new PostNote();
-			$postNote->setPostId($post->getId());
+    public function createPostNote(Post $post, PostNoteFormData $formData)
+    {
+        $transactionFunc = function() use ($post, $formData)
+        {
+            $postNote = new PostNote();
+            $postNote->setPostId($post->getId());
 
-			$this->updatePostNoteWithFormData($postNote, $formData);
-			$this->postNoteDao->save($postNote);
+            $this->updatePostNoteWithFormData($postNote, $formData);
+            $this->postNoteDao->save($postNote);
 
-			$this->postHistoryService->savePostChange($post);
-			return $postNote;
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            $this->postHistoryService->savePostChange($post);
+            return $postNote;
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function updatePostNote(PostNote $postNote, PostNoteFormData $formData)
-	{
-		$transactionFunc = function() use ($postNote, $formData)
-		{
-			$this->updatePostNoteWithFormData($postNote, $formData);
-			$this->postNoteDao->save($postNote);
+    public function updatePostNote(PostNote $postNote, PostNoteFormData $formData)
+    {
+        $transactionFunc = function() use ($postNote, $formData)
+        {
+            $this->updatePostNoteWithFormData($postNote, $formData);
+            $this->postNoteDao->save($postNote);
 
-			$this->postHistoryService->savePostChange($postNote->getPost());
-			return $postNote;
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            $this->postHistoryService->savePostChange($postNote->getPost());
+            return $postNote;
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function deletePostNote(PostNote $postNote)
-	{
-		$transactionFunc = function() use ($postNote)
-		{
-			$this->postNoteDao->deleteById($postNote->getId());
-			$this->postHistoryService->savePostChange($postNote->getPost());
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function deletePostNote(PostNote $postNote)
+    {
+        $transactionFunc = function() use ($postNote)
+        {
+            $this->postNoteDao->deleteById($postNote->getId());
+            $this->postHistoryService->savePostChange($postNote->getPost());
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	private function updatePostNoteWithFormData(PostNote $postNote, PostNoteFormData $formData)
-	{
-		$formData->validate($this->validator);
-		$postNote->setLeft($formData->left);
-		$postNote->setTop($formData->top);
-		$postNote->setWidth($formData->width);
-		$postNote->setHeight($formData->height);
-		$postNote->setText($formData->text);
-	}
+    private function updatePostNoteWithFormData(PostNote $postNote, PostNoteFormData $formData)
+    {
+        $formData->validate($this->validator);
+        $postNote->setLeft($formData->left);
+        $postNote->setTop($formData->top);
+        $postNote->setWidth($formData->width);
+        $postNote->setHeight($formData->height);
+        $postNote->setText($formData->text);
+    }
 }
diff --git a/src/Services/PostService.php b/src/Services/PostService.php
index 7837bdc5..3a6d211e 100644
--- a/src/Services/PostService.php
+++ b/src/Services/PostService.php
@@ -27,388 +27,388 @@ use Szurubooru\Validator;
 
 class PostService
 {
-	private $config;
-	private $validator;
-	private $transactionManager;
-	private $postDao;
-	private $globalParamDao;
-	private $timeService;
-	private $authService;
-	private $networkingService;
-	private $tagService;
-	private $postHistoryService;
-	private $imageConverter;
-	private $imageManipulator;
+    private $config;
+    private $validator;
+    private $transactionManager;
+    private $postDao;
+    private $globalParamDao;
+    private $timeService;
+    private $authService;
+    private $networkingService;
+    private $tagService;
+    private $postHistoryService;
+    private $imageConverter;
+    private $imageManipulator;
 
-	public function __construct(
-		Config $config,
-		Validator $validator,
-		TransactionManager $transactionManager,
-		PostDao $postDao,
-		GlobalParamDao $globalParamDao,
-		AuthService $authService,
-		TimeService $timeService,
-		NetworkingService $networkingService,
-		TagService $tagService,
-		PostHistoryService $postHistoryService,
-		ImageConverter $imageConverter,
-		ImageManipulator $imageManipulator)
-	{
-		$this->config = $config;
-		$this->validator = $validator;
-		$this->transactionManager = $transactionManager;
-		$this->postDao = $postDao;
-		$this->globalParamDao = $globalParamDao;
-		$this->timeService = $timeService;
-		$this->authService = $authService;
-		$this->networkingService = $networkingService;
-		$this->tagService = $tagService;
-		$this->postHistoryService = $postHistoryService;
-		$this->imageConverter = $imageConverter;
-		$this->imageManipulator = $imageManipulator;
-	}
+    public function __construct(
+        Config $config,
+        Validator $validator,
+        TransactionManager $transactionManager,
+        PostDao $postDao,
+        GlobalParamDao $globalParamDao,
+        AuthService $authService,
+        TimeService $timeService,
+        NetworkingService $networkingService,
+        TagService $tagService,
+        PostHistoryService $postHistoryService,
+        ImageConverter $imageConverter,
+        ImageManipulator $imageManipulator)
+    {
+        $this->config = $config;
+        $this->validator = $validator;
+        $this->transactionManager = $transactionManager;
+        $this->postDao = $postDao;
+        $this->globalParamDao = $globalParamDao;
+        $this->timeService = $timeService;
+        $this->authService = $authService;
+        $this->networkingService = $networkingService;
+        $this->tagService = $tagService;
+        $this->postHistoryService = $postHistoryService;
+        $this->imageConverter = $imageConverter;
+        $this->imageManipulator = $imageManipulator;
+    }
 
-	public function getByNameOrId($postNameOrId)
-	{
-		$transactionFunc = function() use ($postNameOrId)
-		{
-			$post = $this->postDao->findByName($postNameOrId);
-			if (!$post)
-				$post = $this->postDao->findById($postNameOrId);
-			if (!$post)
-				throw new \InvalidArgumentException('Post with name "' . $postNameOrId . '" was not found.');
-			return $post;
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getByNameOrId($postNameOrId)
+    {
+        $transactionFunc = function() use ($postNameOrId)
+        {
+            $post = $this->postDao->findByName($postNameOrId);
+            if (!$post)
+                $post = $this->postDao->findById($postNameOrId);
+            if (!$post)
+                throw new \InvalidArgumentException('Post with name "' . $postNameOrId . '" was not found.');
+            return $post;
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getByName($postName)
-	{
-		$transactionFunc = function() use ($postName)
-		{
-			$post = $this->postDao->findByName($postName);
-			if (!$post)
-				throw new \InvalidArgumentException('Post with name "' . $postName . '" was not found.');
-			return $post;
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getByName($postName)
+    {
+        $transactionFunc = function() use ($postName)
+        {
+            $post = $this->postDao->findByName($postName);
+            if (!$post)
+                throw new \InvalidArgumentException('Post with name "' . $postName . '" was not found.');
+            return $post;
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getFiltered(PostFilter $filter)
-	{
-		$transactionFunc = function() use ($filter)
-		{
-			return $this->postDao->findFiltered($filter);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getFiltered(PostFilter $filter)
+    {
+        $transactionFunc = function() use ($filter)
+        {
+            return $this->postDao->findFiltered($filter);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function createPost(UploadFormData $formData)
-	{
-		$transactionFunc = function() use ($formData)
-		{
-			$formData->validate($this->validator);
+    public function createPost(UploadFormData $formData)
+    {
+        $transactionFunc = function() use ($formData)
+        {
+            $formData->validate($this->validator);
 
-			if ($formData->anonymous)
-				$this->authService->loginAnonymous();
+            if ($formData->anonymous)
+                $this->authService->loginAnonymous();
 
-			$post = new Post();
-			$post->setUploadTime($this->timeService->getCurrentTime());
-			$post->setLastEditTime($this->timeService->getCurrentTime());
-			$post->setUser($this->authService->getLoggedInUser());
-			$post->setOriginalFileName($formData->contentFileName);
-			$post->setName($this->getUniqueRandomPostName());
+            $post = new Post();
+            $post->setUploadTime($this->timeService->getCurrentTime());
+            $post->setLastEditTime($this->timeService->getCurrentTime());
+            $post->setUser($this->authService->getLoggedInUser());
+            $post->setOriginalFileName($formData->contentFileName);
+            $post->setName($this->getUniqueRandomPostName());
 
-			$this->updatePostSafety($post, $formData->safety);
-			$this->updatePostSource($post, $formData->source);
-			$this->updatePostTags($post, $formData->tags);
-			$this->updatePostContentFromStringOrUrl($post, $formData->content, $formData->url);
+            $this->updatePostSafety($post, $formData->safety);
+            $this->updatePostSource($post, $formData->source);
+            $this->updatePostTags($post, $formData->tags);
+            $this->updatePostContentFromStringOrUrl($post, $formData->content, $formData->url);
 
-			$savedPost = $this->postDao->save($post);
+            $savedPost = $this->postDao->save($post);
 
-			$this->postHistoryService->savePostCreation($savedPost);
-			return $savedPost;
-		};
-		$ret = $this->transactionManager->commit($transactionFunc);
-		$this->tagService->exportJson();
-		return $ret;
-	}
+            $this->postHistoryService->savePostCreation($savedPost);
+            return $savedPost;
+        };
+        $ret = $this->transactionManager->commit($transactionFunc);
+        $this->tagService->exportJson();
+        return $ret;
+    }
 
-	public function updatePost(Post $post, PostEditFormData $formData)
-	{
-		$transactionFunc = function() use ($post, $formData)
-		{
-			$this->validator->validate($formData);
+    public function updatePost(Post $post, PostEditFormData $formData)
+    {
+        $transactionFunc = function() use ($post, $formData)
+        {
+            $this->validator->validate($formData);
 
-			if ($post->getLastEditTime() !== $formData->seenEditTime)
-				throw new \DomainException('Someone has already edited this post in the meantime.');
+            if ($post->getLastEditTime() !== $formData->seenEditTime)
+                throw new \DomainException('Someone has already edited this post in the meantime.');
 
-			$post->setLastEditTime($this->timeService->getCurrentTime());
+            $post->setLastEditTime($this->timeService->getCurrentTime());
 
-			if ($formData->content !== null)
-				$this->updatePostContentFromString($post, $formData->content);
+            if ($formData->content !== null)
+                $this->updatePostContentFromString($post, $formData->content);
 
-			if ($formData->thumbnail !== null)
-				$this->updatePostThumbnailFromString($post, $formData->thumbnail);
+            if ($formData->thumbnail !== null)
+                $this->updatePostThumbnailFromString($post, $formData->thumbnail);
 
-			if ($formData->safety !== null)
-				$this->updatePostSafety($post, $formData->safety);
+            if ($formData->safety !== null)
+                $this->updatePostSafety($post, $formData->safety);
 
-			if ($formData->source !== null)
-				$this->updatePostSource($post, $formData->source);
+            if ($formData->source !== null)
+                $this->updatePostSource($post, $formData->source);
 
-			if ($formData->tags !== null)
-				$this->updatePostTags($post, $formData->tags);
+            if ($formData->tags !== null)
+                $this->updatePostTags($post, $formData->tags);
 
-			if ($formData->relations !== null)
-				$this->updatePostRelations($post, $formData->relations);
+            if ($formData->relations !== null)
+                $this->updatePostRelations($post, $formData->relations);
 
-			if (count($formData->flags) > 0)
-				$this->updatePostFlags($post, $formData->flags);
+            if (count($formData->flags) > 0)
+                $this->updatePostFlags($post, $formData->flags);
 
-			$this->postHistoryService->savePostChange($post);
-			return $this->postDao->save($post);
-		};
-		$ret = $this->transactionManager->commit($transactionFunc);
-		$this->tagService->exportJson();
-		return $ret;
-	}
+            $this->postHistoryService->savePostChange($post);
+            return $this->postDao->save($post);
+        };
+        $ret = $this->transactionManager->commit($transactionFunc);
+        $this->tagService->exportJson();
+        return $ret;
+    }
 
-	private function updatePostSafety(Post $post, $newSafety)
-	{
-		$post->setSafety($newSafety);
-	}
+    private function updatePostSafety(Post $post, $newSafety)
+    {
+        $post->setSafety($newSafety);
+    }
 
-	private function updatePostSource(Post $post, $newSource)
-	{
-		$post->setSource($newSource);
-	}
+    private function updatePostSource(Post $post, $newSource)
+    {
+        $post->setSource($newSource);
+    }
 
-	private function updatePostContentFromStringOrUrl(Post $post, $content, $url)
-	{
-		if ($url)
-			$this->updatePostContentFromUrl($post, $url);
-		else if ($content)
-			$this->updatePostContentFromString($post, $content);
-		else
-			throw new \DomainException('No content specified');
-	}
+    private function updatePostContentFromStringOrUrl(Post $post, $content, $url)
+    {
+        if ($url)
+            $this->updatePostContentFromUrl($post, $url);
+        else if ($content)
+            $this->updatePostContentFromString($post, $content);
+        else
+            throw new \DomainException('No content specified');
+    }
 
-	private function updatePostContentFromString(Post $post, $content)
-	{
-		if (!$content)
-			throw new \DomainException('File cannot be empty.');
+    private function updatePostContentFromString(Post $post, $content)
+    {
+        if (!$content)
+            throw new \DomainException('File cannot be empty.');
 
-		if (strlen($content) > $this->config->database->maxPostSize)
-			throw new \DomainException('Upload is too big.');
+        if (strlen($content) > $this->config->database->maxPostSize)
+            throw new \DomainException('Upload is too big.');
 
-		$mime = MimeHelper::getMimeTypeFromBuffer($content);
-		$post->setContentMimeType($mime);
+        $mime = MimeHelper::getMimeTypeFromBuffer($content);
+        $post->setContentMimeType($mime);
 
-		if (MimeHelper::isFlash($mime))
-		{
-			$post->setContentType(Post::POST_TYPE_FLASH);
-		}
-		elseif (MimeHelper::isImage($mime))
-		{
-			$post->setContentType(
-				MimeHelper::isBufferAnimatedGif($content)
-					? Post::POST_TYPE_ANIMATED_IMAGE
-					: Post::POST_TYPE_IMAGE);
-		}
-		elseif (MimeHelper::isVideo($mime))
-		{
-			$post->setContentType(Post::POST_TYPE_VIDEO);
-		}
-		else
-		{
-			throw new \DomainException('Unhandled file type: "' . $mime . '"');
-		}
+        if (MimeHelper::isFlash($mime))
+        {
+            $post->setContentType(Post::POST_TYPE_FLASH);
+        }
+        elseif (MimeHelper::isImage($mime))
+        {
+            $post->setContentType(
+                MimeHelper::isBufferAnimatedGif($content)
+                    ? Post::POST_TYPE_ANIMATED_IMAGE
+                    : Post::POST_TYPE_IMAGE);
+        }
+        elseif (MimeHelper::isVideo($mime))
+        {
+            $post->setContentType(Post::POST_TYPE_VIDEO);
+        }
+        else
+        {
+            throw new \DomainException('Unhandled file type: "' . $mime . '"');
+        }
 
-		$post->setContentChecksum(sha1($content));
-		$this->assertNoPostWithThisContentChecksum($post);
+        $post->setContentChecksum(sha1($content));
+        $this->assertNoPostWithThisContentChecksum($post);
 
-		$post->setContent($content);
+        $post->setContent($content);
 
-		try
-		{
-			$image = $this->imageConverter->createImageFromBuffer($content);
-			$post->setImageWidth($this->imageManipulator->getImageWidth($image));
-			$post->setImageHeight($this->imageManipulator->getImageHeight($image));
-		}
-		catch (\Exception $e)
-		{
-			$post->setImageWidth(null);
-			$post->setImageHeight(null);
-		}
+        try
+        {
+            $image = $this->imageConverter->createImageFromBuffer($content);
+            $post->setImageWidth($this->imageManipulator->getImageWidth($image));
+            $post->setImageHeight($this->imageManipulator->getImageHeight($image));
+        }
+        catch (\Exception $e)
+        {
+            $post->setImageWidth(null);
+            $post->setImageHeight(null);
+        }
 
-		$post->setOriginalFileSize(strlen($content));
-	}
+        $post->setOriginalFileSize(strlen($content));
+    }
 
-	private function updatePostContentFromUrl(Post $post, $url)
-	{
-		if (!preg_match('/^https?:\/\//', $url))
-			throw new \InvalidArgumentException('Invalid URL "' . $url . '"');
+    private function updatePostContentFromUrl(Post $post, $url)
+    {
+        if (!preg_match('/^https?:\/\//', $url))
+            throw new \InvalidArgumentException('Invalid URL "' . $url . '"');
 
-		$youtubeId = null;
-		if (preg_match('/youtube.com\/watch.*?=([a-zA-Z0-9_-]+)/', $url, $matches))
-			$youtubeId = $matches[1];
+        $youtubeId = null;
+        if (preg_match('/youtube.com\/watch.*?=([a-zA-Z0-9_-]+)/', $url, $matches))
+            $youtubeId = $matches[1];
 
-		if ($youtubeId)
-		{
-			$post->setContentType(Post::POST_TYPE_YOUTUBE);
-			$post->setImageWidth(null);
-			$post->setImageHeight(null);
-			$post->setContentChecksum($url);
-			$post->setOriginalFileName($url);
-			$post->setOriginalFileSize(null);
-			$post->setContentChecksum($youtubeId);
+        if ($youtubeId)
+        {
+            $post->setContentType(Post::POST_TYPE_YOUTUBE);
+            $post->setImageWidth(null);
+            $post->setImageHeight(null);
+            $post->setContentChecksum($url);
+            $post->setOriginalFileName($url);
+            $post->setOriginalFileSize(null);
+            $post->setContentChecksum($youtubeId);
 
-			$this->assertNoPostWithThisContentChecksum($post);
-			$youtubeThumbnailUrl = 'http://img.youtube.com/vi/' . $youtubeId . '/mqdefault.jpg';
-			$youtubeThumbnail = $this->networkingService->download($youtubeThumbnailUrl);
-			$post->setThumbnailSourceContent($youtubeThumbnail);
-		}
-		else
-		{
-			$contents = $this->networkingService->download($url);
-			$this->updatePostContentFromString($post, $contents);
-		}
-	}
+            $this->assertNoPostWithThisContentChecksum($post);
+            $youtubeThumbnailUrl = 'http://img.youtube.com/vi/' . $youtubeId . '/mqdefault.jpg';
+            $youtubeThumbnail = $this->networkingService->download($youtubeThumbnailUrl);
+            $post->setThumbnailSourceContent($youtubeThumbnail);
+        }
+        else
+        {
+            $contents = $this->networkingService->download($url);
+            $this->updatePostContentFromString($post, $contents);
+        }
+    }
 
-	private function updatePostThumbnailFromString(Post $post, $newThumbnail)
-	{
-		if (strlen($newThumbnail) > $this->config->database->maxCustomThumbnailSize)
-			throw new \DomainException('Thumbnail is too big.');
+    private function updatePostThumbnailFromString(Post $post, $newThumbnail)
+    {
+        if (strlen($newThumbnail) > $this->config->database->maxCustomThumbnailSize)
+            throw new \DomainException('Thumbnail is too big.');
 
-		$post->setThumbnailSourceContent($newThumbnail);
-	}
+        $post->setThumbnailSourceContent($newThumbnail);
+    }
 
-	private function updatePostTags(Post $post, array $newTagNames)
-	{
-		$tags = [];
-		foreach ($newTagNames as $tagName)
-		{
-			$tag = new Tag();
-			$tag->setName($tagName);
-			$tags[] = $tag;
-		}
-		$tags = $this->tagService->createTags($tags);
-		foreach ($tags as $tag)
-		{
-			if ($tag->isBanned())
-				throw new \DomainException('Cannot use banned tag "' . $tag->getName() . '"');
-		}
-		$post->setTags($tags);
-	}
+    private function updatePostTags(Post $post, array $newTagNames)
+    {
+        $tags = [];
+        foreach ($newTagNames as $tagName)
+        {
+            $tag = new Tag();
+            $tag->setName($tagName);
+            $tags[] = $tag;
+        }
+        $tags = $this->tagService->createTags($tags);
+        foreach ($tags as $tag)
+        {
+            if ($tag->isBanned())
+                throw new \DomainException('Cannot use banned tag "' . $tag->getName() . '"');
+        }
+        $post->setTags($tags);
+    }
 
-	private function updatePostRelations(Post $post, array $newRelatedPostIds)
-	{
-		$relatedPosts = $this->postDao->findByIds($newRelatedPostIds);
-		foreach ($newRelatedPostIds as $postId)
-		{
-			if (!isset($relatedPosts[$postId]))
-				throw new \DomainException('Post with id "' . $postId . '" was not found.');
-		}
+    private function updatePostRelations(Post $post, array $newRelatedPostIds)
+    {
+        $relatedPosts = $this->postDao->findByIds($newRelatedPostIds);
+        foreach ($newRelatedPostIds as $postId)
+        {
+            if (!isset($relatedPosts[$postId]))
+                throw new \DomainException('Post with id "' . $postId . '" was not found.');
+        }
 
-		$post->setRelatedPosts($relatedPosts);
-	}
+        $post->setRelatedPosts($relatedPosts);
+    }
 
-	private function updatePostFlags(Post $post, \StdClass $flags)
-	{
-		$value = 0;
-		if (!empty($flags->loop))
-			$value |= Post::FLAG_LOOP;
-		$post->setFlags($value);
-	}
+    private function updatePostFlags(Post $post, \StdClass $flags)
+    {
+        $value = 0;
+        if (!empty($flags->loop))
+            $value |= Post::FLAG_LOOP;
+        $post->setFlags($value);
+    }
 
-	public function deletePost(Post $post)
-	{
-		$transactionFunc = function() use ($post)
-		{
-			$this->postHistoryService->savePostDeletion($post);
-			$this->postDao->deleteById($post->getId());
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function deletePost(Post $post)
+    {
+        $transactionFunc = function() use ($post)
+        {
+            $this->postHistoryService->savePostDeletion($post);
+            $this->postDao->deleteById($post->getId());
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function updatePostGlobals()
-	{
-		$transactionFunc = function()
-		{
-			$countParam = new GlobalParam();
-			$countParam->setKey(GlobalParam::KEY_POST_COUNT);
-			$countParam->setValue($this->postDao->getCount());
-			$this->globalParamDao->save($countParam);
+    public function updatePostGlobals()
+    {
+        $transactionFunc = function()
+        {
+            $countParam = new GlobalParam();
+            $countParam->setKey(GlobalParam::KEY_POST_COUNT);
+            $countParam->setValue($this->postDao->getCount());
+            $this->globalParamDao->save($countParam);
 
-			$fileSizeParam = new GlobalParam();
-			$fileSizeParam->setKey(GlobalParam::KEY_POST_SIZE);
-			$fileSizeParam->setValue($this->postDao->getTotalFileSize());
-			$this->globalParamDao->save($fileSizeParam);
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+            $fileSizeParam = new GlobalParam();
+            $fileSizeParam->setKey(GlobalParam::KEY_POST_SIZE);
+            $fileSizeParam->setValue($this->postDao->getTotalFileSize());
+            $this->globalParamDao->save($fileSizeParam);
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function decorateFilterFromBrowsingSettings(PostFilter $filter)
-	{
-		$currentUser = $this->authService->getLoggedInUser();
-		$userSettings = $currentUser->getBrowsingSettings();
-		if (!$userSettings)
-			return;
+    public function decorateFilterFromBrowsingSettings(PostFilter $filter)
+    {
+        $currentUser = $this->authService->getLoggedInUser();
+        $userSettings = $currentUser->getBrowsingSettings();
+        if (!$userSettings)
+            return;
 
-		if (!empty($userSettings->listPosts) && !count($filter->getRequirementsByType(PostFilter::REQUIREMENT_SAFETY)))
-		{
-			$values = [];
-			if (!TypeHelper::toBool($userSettings->listPosts->safe))
-				$values[] = Post::POST_SAFETY_SAFE;
-			if (!TypeHelper::toBool($userSettings->listPosts->sketchy))
-				$values[] = Post::POST_SAFETY_SKETCHY;
-			if (!TypeHelper::toBool($userSettings->listPosts->unsafe))
-				$values[] = Post::POST_SAFETY_UNSAFE;
-			if (count($values))
-			{
-				$requirementValue = new RequirementCompositeValue();
-				$requirementValue->setValues($values);
-				$requirement = new Requirement();
-				$requirement->setType(PostFilter::REQUIREMENT_SAFETY);
-				$requirement->setValue($requirementValue);
-				$requirement->setNegated(true);
-				$filter->addRequirement($requirement);
-			}
-		}
+        if (!empty($userSettings->listPosts) && !count($filter->getRequirementsByType(PostFilter::REQUIREMENT_SAFETY)))
+        {
+            $values = [];
+            if (!TypeHelper::toBool($userSettings->listPosts->safe))
+                $values[] = Post::POST_SAFETY_SAFE;
+            if (!TypeHelper::toBool($userSettings->listPosts->sketchy))
+                $values[] = Post::POST_SAFETY_SKETCHY;
+            if (!TypeHelper::toBool($userSettings->listPosts->unsafe))
+                $values[] = Post::POST_SAFETY_UNSAFE;
+            if (count($values))
+            {
+                $requirementValue = new RequirementCompositeValue();
+                $requirementValue->setValues($values);
+                $requirement = new Requirement();
+                $requirement->setType(PostFilter::REQUIREMENT_SAFETY);
+                $requirement->setValue($requirementValue);
+                $requirement->setNegated(true);
+                $filter->addRequirement($requirement);
+            }
+        }
 
-		if (!empty($userSettings->hideDownvoted) && !count($filter->getRequirementsByType(PostFilter::REQUIREMENT_USER_SCORE)))
-		{
-			$requirementValue = new RequirementCompositeValue();
-			$requirementValue->setValues([$currentUser->getName(), -1]);
-			$requirement = new Requirement();
-			$requirement->setType(PostFilter::REQUIREMENT_USER_SCORE);
-			$requirement->setValue($requirementValue);
-			$requirement->setNegated(true);
-			$filter->addRequirement($requirement);
-		}
-	}
+        if (!empty($userSettings->hideDownvoted) && !count($filter->getRequirementsByType(PostFilter::REQUIREMENT_USER_SCORE)))
+        {
+            $requirementValue = new RequirementCompositeValue();
+            $requirementValue->setValues([$currentUser->getName(), -1]);
+            $requirement = new Requirement();
+            $requirement->setType(PostFilter::REQUIREMENT_USER_SCORE);
+            $requirement->setValue($requirementValue);
+            $requirement->setNegated(true);
+            $filter->addRequirement($requirement);
+        }
+    }
 
-	private function assertNoPostWithThisContentChecksum(Post $parent)
-	{
-		$checksumToCheck = $parent->getContentChecksum();
-		$postWithThisChecksum = $this->postDao->findByContentChecksum($checksumToCheck);
-		if ($postWithThisChecksum && $postWithThisChecksum->getId() !== $parent->getId())
-			throw new \DomainException('Duplicate post: ' . $postWithThisChecksum->getIdMarkdown());
-	}
+    private function assertNoPostWithThisContentChecksum(Post $parent)
+    {
+        $checksumToCheck = $parent->getContentChecksum();
+        $postWithThisChecksum = $this->postDao->findByContentChecksum($checksumToCheck);
+        if ($postWithThisChecksum && $postWithThisChecksum->getId() !== $parent->getId())
+            throw new \DomainException('Duplicate post: ' . $postWithThisChecksum->getIdMarkdown());
+    }
 
-	private function getRandomPostName()
-	{
-		return sha1(microtime(true) . mt_rand() . uniqid());
-	}
+    private function getRandomPostName()
+    {
+        return sha1(microtime(true) . mt_rand() . uniqid());
+    }
 
-	private function getUniqueRandomPostName()
-	{
-		while (true)
-		{
-			$name = $this->getRandomPostName();
-			if (!$this->postDao->findByName($name))
-				return $name;
-		}
-	}
+    private function getUniqueRandomPostName()
+    {
+        while (true)
+        {
+            $name = $this->getRandomPostName();
+            if (!$this->postDao->findByName($name))
+                return $name;
+        }
+    }
 }
diff --git a/src/Services/PostSnapshotProvider.php b/src/Services/PostSnapshotProvider.php
index 6f024bae..7e030a9b 100644
--- a/src/Services/PostSnapshotProvider.php
+++ b/src/Services/PostSnapshotProvider.php
@@ -12,106 +12,106 @@ use Szurubooru\Helpers\EnumHelper;
 
 class PostSnapshotProvider implements ISnapshotProvider
 {
-	private $globalParamDao;
-	private $postNoteDao;
+    private $globalParamDao;
+    private $postNoteDao;
 
-	public function __construct(
-		GlobalParamDao $globalParamDao,
-		PostNoteDao $postNoteDao)
-	{
-		$this->globalParamDao = $globalParamDao;
-		$this->postNoteDao = $postNoteDao;
-	}
+    public function __construct(
+        GlobalParamDao $globalParamDao,
+        PostNoteDao $postNoteDao)
+    {
+        $this->globalParamDao = $globalParamDao;
+        $this->postNoteDao = $postNoteDao;
+    }
 
-	public function getCreationSnapshot(Entity $post)
-	{
-		$snapshot = $this->getPostSnapshot($post);
-		$snapshot->setOperation(Snapshot::OPERATION_CREATION);
-		$snapshot->setData($this->getFullData($post));
-		return $snapshot;
-	}
+    public function getCreationSnapshot(Entity $post)
+    {
+        $snapshot = $this->getPostSnapshot($post);
+        $snapshot->setOperation(Snapshot::OPERATION_CREATION);
+        $snapshot->setData($this->getFullData($post));
+        return $snapshot;
+    }
 
-	public function getChangeSnapshot(Entity $post)
-	{
-		$snapshot = $this->getPostSnapshot($post);
-		$snapshot->setOperation(Snapshot::OPERATION_CHANGE);
-		$snapshot->setData($this->getFullData($post));
-		return $snapshot;
-	}
+    public function getChangeSnapshot(Entity $post)
+    {
+        $snapshot = $this->getPostSnapshot($post);
+        $snapshot->setOperation(Snapshot::OPERATION_CHANGE);
+        $snapshot->setData($this->getFullData($post));
+        return $snapshot;
+    }
 
-	public function getDeleteSnapshot(Entity $post)
-	{
-		$snapshot = $this->getPostSnapshot($post);
-		$snapshot->setData([]);
-		$snapshot->setOperation(Snapshot::OPERATION_DELETE);
-		return $snapshot;
-	}
+    public function getDeleteSnapshot(Entity $post)
+    {
+        $snapshot = $this->getPostSnapshot($post);
+        $snapshot->setData([]);
+        $snapshot->setOperation(Snapshot::OPERATION_DELETE);
+        return $snapshot;
+    }
 
-	private function getPostSnapshot(Post $post)
-	{
-		$snapshot = new Snapshot();
-		$snapshot->setType(Snapshot::TYPE_POST);
-		$snapshot->setPrimaryKey($post->getId());
-		return $snapshot;
-	}
+    private function getPostSnapshot(Post $post)
+    {
+        $snapshot = new Snapshot();
+        $snapshot->setType(Snapshot::TYPE_POST);
+        $snapshot->setPrimaryKey($post->getId());
+        return $snapshot;
+    }
 
-	private function getFullData(Post $post)
-	{
-		static $featuredPostParam = null;
-		if ($featuredPostParam === null)
-			$featuredPostParam = $this->globalParamDao->findByKey(GlobalParam::KEY_FEATURED_POST);
-		$isFeatured = ($featuredPostParam && intval($featuredPostParam->getValue()) === $post->getId());
+    private function getFullData(Post $post)
+    {
+        static $featuredPostParam = null;
+        if ($featuredPostParam === null)
+            $featuredPostParam = $this->globalParamDao->findByKey(GlobalParam::KEY_FEATURED_POST);
+        $isFeatured = ($featuredPostParam && intval($featuredPostParam->getValue()) === $post->getId());
 
-		$flags = [];
-		if ($post->getFlags() & Post::FLAG_LOOP)
-			$flags[] = 'loop';
+        $flags = [];
+        if ($post->getFlags() & Post::FLAG_LOOP)
+            $flags[] = 'loop';
 
-		$data =
-		[
-			'source' => $post->getSource(),
-			'safety' => EnumHelper::postSafetyToString($post->getSafety()),
-			'contentChecksum' => $post->getContentChecksum(),
-			'featured' => $isFeatured,
+        $data =
+        [
+            'source' => $post->getSource(),
+            'safety' => EnumHelper::postSafetyToString($post->getSafety()),
+            'contentChecksum' => $post->getContentChecksum(),
+            'featured' => $isFeatured,
 
-			'notes' => array_values(array_map(function (PostNote $note)
-				{
-					return [
-						'x' => round(floatval($note->getLeft()), 2),
-						'y' => round(floatval($note->getTop()), 2),
-						'w' => round(floatval($note->getWidth()), 2),
-						'h' => round(floatval($note->getHeight()), 2),
-						'text' => trim($note->getText()),
-					];
-				},
-				$this->postNoteDao->findByPostId($post->getId()))),
+            'notes' => array_values(array_map(function (PostNote $note)
+                {
+                    return [
+                        'x' => round(floatval($note->getLeft()), 2),
+                        'y' => round(floatval($note->getTop()), 2),
+                        'w' => round(floatval($note->getWidth()), 2),
+                        'h' => round(floatval($note->getHeight()), 2),
+                        'text' => trim($note->getText()),
+                    ];
+                },
+                $this->postNoteDao->findByPostId($post->getId()))),
 
-			'tags' =>
-				array_values(array_map(
-					function (Tag $tag)
-					{
-						return $tag->getName();
-					},
-					$post->getTags())),
+            'tags' =>
+                array_values(array_map(
+                    function (Tag $tag)
+                    {
+                        return $tag->getName();
+                    },
+                    $post->getTags())),
 
-			'relations' =>
-				array_values(array_map(
-					function (Post $post)
-					{
-						return $post->getId();
-					},
-					$post->getRelatedPosts())),
+            'relations' =>
+                array_values(array_map(
+                    function (Post $post)
+                    {
+                        return $post->getId();
+                    },
+                    $post->getRelatedPosts())),
 
-			'flags' => $flags,
-		];
+            'flags' => $flags,
+        ];
 
-		sort($data['tags']);
-		sort($data['relations']);
-		usort($data['notes'],
-			function ($note1, $note2)
-			{
-				return $note1['x'] - $note2['x'];
-			});
+        sort($data['tags']);
+        sort($data['relations']);
+        usort($data['notes'],
+            function ($note1, $note2)
+            {
+                return $note1['x'] - $note2['x'];
+            });
 
-		return $data;
-	}
+        return $data;
+    }
 }
diff --git a/src/Services/PostThumbnailService.php b/src/Services/PostThumbnailService.php
index a8174208..4d5514a9 100644
--- a/src/Services/PostThumbnailService.php
+++ b/src/Services/PostThumbnailService.php
@@ -6,23 +6,23 @@ use Szurubooru\Services\ThumbnailService;
 
 class PostThumbnailService
 {
-	private $thumbnailService;
-	private $fileDao;
+    private $thumbnailService;
+    private $fileDao;
 
-	public function __construct(
-		PublicFileDao $fileDao,
-		ThumbnailService $thumbnailService)
-	{
-		$this->fileDao = $fileDao;
-		$this->thumbnailService = $thumbnailService;
-	}
+    public function __construct(
+        PublicFileDao $fileDao,
+        ThumbnailService $thumbnailService)
+    {
+        $this->fileDao = $fileDao;
+        $this->thumbnailService = $thumbnailService;
+    }
 
-	public function generateIfNeeded(Post $post, $width, $height)
-	{
-		$sourceName = $post->getThumbnailSourceContentPath();
-		if (!$this->fileDao->exists($sourceName))
-			$sourceName = $post->getContentPath();
+    public function generateIfNeeded(Post $post, $width, $height)
+    {
+        $sourceName = $post->getThumbnailSourceContentPath();
+        if (!$this->fileDao->exists($sourceName))
+            $sourceName = $post->getContentPath();
 
-		return $this->thumbnailService->generateIfNeeded($sourceName, $width, $height);
-	}
+        return $this->thumbnailService->generateIfNeeded($sourceName, $width, $height);
+    }
 }
diff --git a/src/Services/PrivilegeService.php b/src/Services/PrivilegeService.php
index 744301a0..3927d439 100644
--- a/src/Services/PrivilegeService.php
+++ b/src/Services/PrivilegeService.php
@@ -7,88 +7,88 @@ use Szurubooru\Services\AuthService;
 
 class PrivilegeService
 {
-	private $authService;
-	private $privilegeMap;
+    private $authService;
+    private $privilegeMap;
 
-	public function __construct(
-		Config $config,
-		AuthService $authService)
-	{
-		$this->authService = $authService;
+    public function __construct(
+        Config $config,
+        AuthService $authService)
+    {
+        $this->authService = $authService;
 
-		if (isset($config->security->privileges))
-		{
-			foreach ($config->security->privileges as $privilegeName => $allowedAccessRanks)
-			{
-				$allowedAccessRanks = array_filter(preg_split('/[;,\s]+/', $allowedAccessRanks));
-				foreach ($allowedAccessRanks as $allowedAccessRank)
-				{
-					if (!isset($this->privilegeMap[$allowedAccessRank]))
-						$this->privilegeMap[$allowedAccessRank] = [];
-					$this->privilegeMap[$allowedAccessRank][] = $privilegeName;
-				}
-			}
-		}
-	}
+        if (isset($config->security->privileges))
+        {
+            foreach ($config->security->privileges as $privilegeName => $allowedAccessRanks)
+            {
+                $allowedAccessRanks = array_filter(preg_split('/[;,\s]+/', $allowedAccessRanks));
+                foreach ($allowedAccessRanks as $allowedAccessRank)
+                {
+                    if (!isset($this->privilegeMap[$allowedAccessRank]))
+                        $this->privilegeMap[$allowedAccessRank] = [];
+                    $this->privilegeMap[$allowedAccessRank][] = $privilegeName;
+                }
+            }
+        }
+    }
 
-	public function getCurrentPrivileges()
-	{
-		$currentAccessRank = $this->authService->getLoggedInUser()->getAccessRank();
-		$currentAccessRankName = EnumHelper::accessRankToString($currentAccessRank);
-		if (!isset($this->privilegeMap[$currentAccessRankName]))
-			return [];
-		return $this->privilegeMap[$currentAccessRankName];
-	}
+    public function getCurrentPrivileges()
+    {
+        $currentAccessRank = $this->authService->getLoggedInUser()->getAccessRank();
+        $currentAccessRankName = EnumHelper::accessRankToString($currentAccessRank);
+        if (!isset($this->privilegeMap[$currentAccessRankName]))
+            return [];
+        return $this->privilegeMap[$currentAccessRankName];
+    }
 
-	public function hasPrivilege($privilege)
-	{
-		return in_array($privilege, $this->getCurrentPrivileges());
-	}
+    public function hasPrivilege($privilege)
+    {
+        return in_array($privilege, $this->getCurrentPrivileges());
+    }
 
-	public function assertPrivilege($privilege)
-	{
-		if (!$this->hasPrivilege($privilege))
-			$this->fail($privilege);
-	}
+    public function assertPrivilege($privilege)
+    {
+        if (!$this->hasPrivilege($privilege))
+            $this->fail($privilege);
+    }
 
-	public function assertLoggedIn($userIdentifier = null)
-	{
-		if ($userIdentifier)
-		{
-			if (!$this->isLoggedIn($userIdentifier))
-				$this->fail('not logged in');
-		}
-		else
-		{
-			if (!$this->authService->isLoggedIn())
-				$this->fail('not logged in');
-		}
-	}
+    public function assertLoggedIn($userIdentifier = null)
+    {
+        if ($userIdentifier)
+        {
+            if (!$this->isLoggedIn($userIdentifier))
+                $this->fail('not logged in');
+        }
+        else
+        {
+            if (!$this->authService->isLoggedIn())
+                $this->fail('not logged in');
+        }
+    }
 
-	public function isLoggedIn($userIdentifier)
-	{
-		$loggedInUser = $this->authService->getLoggedInUser();
-		if ($userIdentifier instanceof User)
-		{
-			return $loggedInUser->getId() && ($loggedInUser->getId() === $userIdentifier->getId());
-		}
-		elseif (is_string($userIdentifier))
-		{
-			if ($loggedInUser->getEmail())
-			{
-				if ($loggedInUser->getEmail() === $userIdentifier)
-					return true;
-			}
-			return $loggedInUser->getName() === $userIdentifier;
-		}
-		else
-		{
-			throw new \InvalidArgumentException('Invalid user identifier.');
-		}
-	}
+    public function isLoggedIn($userIdentifier)
+    {
+        $loggedInUser = $this->authService->getLoggedInUser();
+        if ($userIdentifier instanceof User)
+        {
+            return $loggedInUser->getId() && ($loggedInUser->getId() === $userIdentifier->getId());
+        }
+        elseif (is_string($userIdentifier))
+        {
+            if ($loggedInUser->getEmail())
+            {
+                if ($loggedInUser->getEmail() === $userIdentifier)
+                    return true;
+            }
+            return $loggedInUser->getName() === $userIdentifier;
+        }
+        else
+        {
+            throw new \InvalidArgumentException('Invalid user identifier.');
+        }
+    }
 
-	private function fail($reason)
-	{
-		throw new \DomainException('Unprivileged operation' . ($reason ? ' (' . $reason . ')' : ''));
-	}
+    private function fail($reason)
+    {
+        throw new \DomainException('Unprivileged operation' . ($reason ? ' (' . $reason . ')' : ''));
+    }
 }
diff --git a/src/Services/ScoreService.php b/src/Services/ScoreService.php
index df8ed3ca..1ffe8cd4 100644
--- a/src/Services/ScoreService.php
+++ b/src/Services/ScoreService.php
@@ -11,64 +11,64 @@ use Szurubooru\Services\TimeService;
 
 class ScoreService
 {
-	private $scoreDao;
-	private $favoritesDao;
-	private $userDao;
-	private $transactionManager;
-	private $timeService;
+    private $scoreDao;
+    private $favoritesDao;
+    private $userDao;
+    private $transactionManager;
+    private $timeService;
 
-	public function __construct(
-		ScoreDao $scoreDao,
-		FavoritesDao $favoritesDao,
-		UserDao $userDao,
-		TransactionManager $transactionManager,
-		TimeService $timeService)
-	{
-		$this->scoreDao = $scoreDao;
-		$this->favoritesDao = $favoritesDao;
-		$this->userDao = $userDao;
-		$this->transactionManager = $transactionManager;
-		$this->timeService = $timeService;
-	}
+    public function __construct(
+        ScoreDao $scoreDao,
+        FavoritesDao $favoritesDao,
+        UserDao $userDao,
+        TransactionManager $transactionManager,
+        TimeService $timeService)
+    {
+        $this->scoreDao = $scoreDao;
+        $this->favoritesDao = $favoritesDao;
+        $this->userDao = $userDao;
+        $this->transactionManager = $transactionManager;
+        $this->timeService = $timeService;
+    }
 
-	public function getScoreValue(Entity $entity)
-	{
-		$transactionFunc = function() use ($entity)
-		{
-			return $this->scoreDao->getScoreValue($entity);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getScoreValue(Entity $entity)
+    {
+        $transactionFunc = function() use ($entity)
+        {
+            return $this->scoreDao->getScoreValue($entity);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getUserScore(User $user, Entity $entity)
-	{
-		$transactionFunc = function() use ($user, $entity)
-		{
-			return $this->scoreDao->getUserScore($user, $entity);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getUserScore(User $user, Entity $entity)
+    {
+        $transactionFunc = function() use ($user, $entity)
+        {
+            return $this->scoreDao->getUserScore($user, $entity);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getUserScoreValue(User $user, Entity $entity)
-	{
-		$score = $this->getUserScore($user, $entity);
-		if (!$score)
-			return 0;
-		return $score->getScore();
-	}
+    public function getUserScoreValue(User $user, Entity $entity)
+    {
+        $score = $this->getUserScore($user, $entity);
+        if (!$score)
+            return 0;
+        return $score->getScore();
+    }
 
-	public function setUserScore(User $user, Entity $entity, $scoreValue)
-	{
-		if ($scoreValue !== 1 && $scoreValue !== 0 && $scoreValue !== -1)
-			throw new \DomainException('Bad score');
+    public function setUserScore(User $user, Entity $entity, $scoreValue)
+    {
+        if ($scoreValue !== 1 && $scoreValue !== 0 && $scoreValue !== -1)
+            throw new \DomainException('Bad score');
 
-		$transactionFunc = function() use ($user, $entity, $scoreValue)
-		{
-			if (($scoreValue !== 1) && ($entity instanceof Post))
-				$this->favoritesDao->delete($user, $entity);
+        $transactionFunc = function() use ($user, $entity, $scoreValue)
+        {
+            if (($scoreValue !== 1) && ($entity instanceof Post))
+                $this->favoritesDao->delete($user, $entity);
 
-			return $this->scoreDao->setUserScore($user, $entity, $scoreValue);
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            return $this->scoreDao->setUserScore($user, $entity, $scoreValue);
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 }
diff --git a/src/Services/TagHistoryService.php b/src/Services/TagHistoryService.php
index 262a80df..8a331649 100644
--- a/src/Services/TagHistoryService.php
+++ b/src/Services/TagHistoryService.php
@@ -11,54 +11,54 @@ use Szurubooru\Services\TagSnapshotProvider;
 
 class TagHistoryService
 {
-	private $transactionManager;
-	private $historyService;
-	private $tagSnapshotProvider;
+    private $transactionManager;
+    private $historyService;
+    private $tagSnapshotProvider;
 
-	public function __construct(
-		TransactionManager $transactionManager,
-		HistoryService $historyService,
-		TagSnapshotProvider $tagSnapshotProvider)
-	{
-		$this->transactionManager = $transactionManager;
-		$this->historyService = $historyService;
-		$this->tagSnapshotProvider = $tagSnapshotProvider;
-	}
+    public function __construct(
+        TransactionManager $transactionManager,
+        HistoryService $historyService,
+        TagSnapshotProvider $tagSnapshotProvider)
+    {
+        $this->transactionManager = $transactionManager;
+        $this->historyService = $historyService;
+        $this->tagSnapshotProvider = $tagSnapshotProvider;
+    }
 
-	public function getTagHistory(Tag $tag)
-	{
-		$transactionFunc = function() use ($tag)
-		{
-			$filter = new SnapshotFilter();
+    public function getTagHistory(Tag $tag)
+    {
+        $transactionFunc = function() use ($tag)
+        {
+            $filter = new SnapshotFilter();
 
-			$requirement = new Requirement();
-			$requirement->setType(SnapshotFilter::REQUIREMENT_PRIMARY_KEY);
-			$requirement->setValue(new RequirementSingleValue($tag->getId()));
-			$filter->addRequirement($requirement);
+            $requirement = new Requirement();
+            $requirement->setType(SnapshotFilter::REQUIREMENT_PRIMARY_KEY);
+            $requirement->setValue(new RequirementSingleValue($tag->getId()));
+            $filter->addRequirement($requirement);
 
-			$requirement = new Requirement();
-			$requirement->setType(SnapshotFilter::REQUIREMENT_TYPE);
-			$requirement->setValue(new RequirementSingleValue(Snapshot::TYPE_TAG));
-			$filter->addRequirement($requirement);
+            $requirement = new Requirement();
+            $requirement->setType(SnapshotFilter::REQUIREMENT_TYPE);
+            $requirement->setValue(new RequirementSingleValue(Snapshot::TYPE_TAG));
+            $filter->addRequirement($requirement);
 
-			return $this->historyService->getFiltered($filter)->getEntities();
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+            return $this->historyService->getFiltered($filter)->getEntities();
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function saveTagCreation(Tag $tag)
-	{
-		$this->historyService->saveSnapshot($this->tagSnapshotProvider->getCreationSnapshot($tag));
-	}
+    public function saveTagCreation(Tag $tag)
+    {
+        $this->historyService->saveSnapshot($this->tagSnapshotProvider->getCreationSnapshot($tag));
+    }
 
-	public function saveTagChange(Tag $tag)
-	{
-		$this->historyService->saveSnapshot($this->tagSnapshotProvider->getChangeSnapshot($tag));
-	}
+    public function saveTagChange(Tag $tag)
+    {
+        $this->historyService->saveSnapshot($this->tagSnapshotProvider->getChangeSnapshot($tag));
+    }
 
-	public function saveTagDeletion(Tag $tag)
-	{
-		$this->historyService->saveSnapshot($this->tagSnapshotProvider->getDeleteSnapshot($tag));
-	}
+    public function saveTagDeletion(Tag $tag)
+    {
+        $this->historyService->saveSnapshot($this->tagSnapshotProvider->getDeleteSnapshot($tag));
+    }
 }
 
diff --git a/src/Services/TagService.php b/src/Services/TagService.php
index 68251b75..d454c443 100644
--- a/src/Services/TagService.php
+++ b/src/Services/TagService.php
@@ -12,233 +12,233 @@ use Szurubooru\Validator;
 
 class TagService
 {
-	private $validator;
-	private $transactionManager;
-	private $postDao;
-	private $tagDao;
-	private $fileDao;
-	private $timeService;
-	private $postHistoryService;
-	private $tagHistoryService;
+    private $validator;
+    private $transactionManager;
+    private $postDao;
+    private $tagDao;
+    private $fileDao;
+    private $timeService;
+    private $postHistoryService;
+    private $tagHistoryService;
 
-	public function __construct(
-		Validator $validator,
-		TransactionManager $transactionManager,
-		PostDao $postDao,
-		TagDao $tagDao,
-		PublicFileDao $fileDao,
-		PostHistoryService $postHistoryService,
-		TagHistoryService $tagHistoryService,
-		TimeService $timeService)
-	{
-		$this->validator = $validator;
-		$this->transactionManager = $transactionManager;
-		$this->postDao = $postDao;
-		$this->tagDao = $tagDao;
-		$this->fileDao = $fileDao;
-		$this->postHistoryService = $postHistoryService;
-		$this->tagHistoryService = $tagHistoryService;
-		$this->timeService = $timeService;
-	}
+    public function __construct(
+        Validator $validator,
+        TransactionManager $transactionManager,
+        PostDao $postDao,
+        TagDao $tagDao,
+        PublicFileDao $fileDao,
+        PostHistoryService $postHistoryService,
+        TagHistoryService $tagHistoryService,
+        TimeService $timeService)
+    {
+        $this->validator = $validator;
+        $this->transactionManager = $transactionManager;
+        $this->postDao = $postDao;
+        $this->tagDao = $tagDao;
+        $this->fileDao = $fileDao;
+        $this->postHistoryService = $postHistoryService;
+        $this->tagHistoryService = $tagHistoryService;
+        $this->timeService = $timeService;
+    }
 
-	public function getByName($tagName)
-	{
-		$transactionFunc = function() use ($tagName)
-		{
-			$tag = $this->tagDao->findByName($tagName);
-			if (!$tag)
-				throw new \InvalidArgumentException('Tag with name "' . $tagName . '" was not found.');
-			return $tag;
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getByName($tagName)
+    {
+        $transactionFunc = function() use ($tagName)
+        {
+            $tag = $this->tagDao->findByName($tagName);
+            if (!$tag)
+                throw new \InvalidArgumentException('Tag with name "' . $tagName . '" was not found.');
+            return $tag;
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getFiltered(TagFilter $filter)
-	{
-		$transactionFunc = function() use ($filter)
-		{
-			return $this->tagDao->findFiltered($filter);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getFiltered(TagFilter $filter)
+    {
+        $transactionFunc = function() use ($filter)
+        {
+            return $this->tagDao->findFiltered($filter);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getSiblings($tagName)
-	{
-		$transactionFunc = function() use ($tagName)
-		{
-			return $this->tagDao->findSiblings($tagName);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getSiblings($tagName)
+    {
+        $transactionFunc = function() use ($tagName)
+        {
+            return $this->tagDao->findSiblings($tagName);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function exportJson()
-	{
-		$exported = $this->tagDao->export();
-		$json = json_encode($exported);
-		$this->fileDao->save('tags.json', $json);
-	}
+    public function exportJson()
+    {
+        $exported = $this->tagDao->export();
+        $json = json_encode($exported);
+        $this->fileDao->save('tags.json', $json);
+    }
 
-	public function createTags(array $tags)
-	{
-		$transactionFunc = function() use ($tags)
-		{
-			$tagNameGetter = function($tag)
-				{
-					return strtolower(is_string($tag) ? $tag : $tag->getName());
-				};
+    public function createTags(array $tags)
+    {
+        $transactionFunc = function() use ($tags)
+        {
+            $tagNameGetter = function($tag)
+                {
+                    return strtolower(is_string($tag) ? $tag : $tag->getName());
+                };
 
-			$tagsNotToCreate = [];
-			$tagNames = array_map($tagNameGetter, $tags);
-			$tagNames = array_filter(array_unique($tagNames));
-			foreach ($this->tagDao->findByNames($tagNames) as $tag)
-				$tagsNotToCreate[$tagNameGetter($tag)] = $tag;
+            $tagsNotToCreate = [];
+            $tagNames = array_map($tagNameGetter, $tags);
+            $tagNames = array_filter(array_unique($tagNames));
+            foreach ($this->tagDao->findByNames($tagNames) as $tag)
+                $tagsNotToCreate[$tagNameGetter($tag)] = $tag;
 
-			$tagsToCreate = [];
-			foreach ($tags as $key => $tag)
-			{
-				if (isset($tagsNotToCreate[$tagNameGetter($tag)]))
-					continue;
+            $tagsToCreate = [];
+            foreach ($tags as $key => $tag)
+            {
+                if (isset($tagsNotToCreate[$tagNameGetter($tag)]))
+                    continue;
 
-				if (is_string($tag))
-				{
-					$tagName = $tag;
-					$tag = new Tag();
-					$tag->setName($tagName);
-				}
-				$tag->setCreationTime($this->timeService->getCurrentTime());
-				$tagsToCreate[$tagNameGetter($tag)] = $tag;
-			}
+                if (is_string($tag))
+                {
+                    $tagName = $tag;
+                    $tag = new Tag();
+                    $tag->setName($tagName);
+                }
+                $tag->setCreationTime($this->timeService->getCurrentTime());
+                $tagsToCreate[$tagNameGetter($tag)] = $tag;
+            }
 
-			$createdTags = [];
-			foreach ($this->tagDao->batchSave($tagsToCreate) as $tag)
-			{
-				$createdTags[$tagNameGetter($tag)] = $tag;
-				$this->tagHistoryService->saveTagCreation($tag);
-			}
+            $createdTags = [];
+            foreach ($this->tagDao->batchSave($tagsToCreate) as $tag)
+            {
+                $createdTags[$tagNameGetter($tag)] = $tag;
+                $this->tagHistoryService->saveTagCreation($tag);
+            }
 
-			$result = [];
-			foreach ($tags as $key => $tag)
-			{
-				$result[$key] =
-					isset($tagsToCreate[$tagNameGetter($tag)])
-						? $createdTags[$tagNameGetter($tag)]
-						: $tagsNotToCreate[$tagNameGetter($tag)];
-			}
-			return $result;
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            $result = [];
+            foreach ($tags as $key => $tag)
+            {
+                $result[$key] =
+                    isset($tagsToCreate[$tagNameGetter($tag)])
+                        ? $createdTags[$tagNameGetter($tag)]
+                        : $tagsNotToCreate[$tagNameGetter($tag)];
+            }
+            return $result;
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function updateTag(Tag $tag, TagEditFormData $formData)
-	{
-		$oldName = $tag->getName();
+    public function updateTag(Tag $tag, TagEditFormData $formData)
+    {
+        $oldName = $tag->getName();
 
-		$transactionFunc = function() use ($tag, $formData)
-		{
-			$this->validator->validate($formData);
+        $transactionFunc = function() use ($tag, $formData)
+        {
+            $this->validator->validate($formData);
 
-			if ($formData->name !== null)
-				$this->updateTagName($tag, $formData->name);
+            if ($formData->name !== null)
+                $this->updateTagName($tag, $formData->name);
 
-			if ($formData->category !== null)
-				$this->updateTagCategory($tag, $formData->category);
+            if ($formData->category !== null)
+                $this->updateTagCategory($tag, $formData->category);
 
-			if ($formData->banned !== $tag->isBanned())
-				$tag->setBanned(boolval($formData->banned));
+            if ($formData->banned !== $tag->isBanned())
+                $tag->setBanned(boolval($formData->banned));
 
-			if ($formData->implications !== null)
-				$this->updateImplications($tag, $formData->implications);
+            if ($formData->implications !== null)
+                $this->updateImplications($tag, $formData->implications);
 
-			if ($formData->suggestions !== null)
-				$this->updateSuggestions($tag, $formData->suggestions);
+            if ($formData->suggestions !== null)
+                $this->updateSuggestions($tag, $formData->suggestions);
 
-			$this->tagHistoryService->saveTagChange($tag);
-			return $this->tagDao->save($tag);
-		};
-		$ret = $this->transactionManager->commit($transactionFunc);
+            $this->tagHistoryService->saveTagChange($tag);
+            return $this->tagDao->save($tag);
+        };
+        $ret = $this->transactionManager->commit($transactionFunc);
 
-		if ($oldName !== $tag->getName())
-		{
-			$transactionFunc = function() use ($tag)
-			{
-				$posts = $this->postDao->findByTagName($tag->getName());
-				foreach ($posts as $post)
-					$this->postHistoryService->savePostChange($post);
-			};
-			$this->transactionManager->commit($transactionFunc);
-		}
+        if ($oldName !== $tag->getName())
+        {
+            $transactionFunc = function() use ($tag)
+            {
+                $posts = $this->postDao->findByTagName($tag->getName());
+                foreach ($posts as $post)
+                    $this->postHistoryService->savePostChange($post);
+            };
+            $this->transactionManager->commit($transactionFunc);
+        }
 
-		$this->exportJson();
-		return $ret;
-	}
+        $this->exportJson();
+        return $ret;
+    }
 
-	public function deleteTag(Tag $tag)
-	{
-		if ($tag->getUsages() !== 0)
-			throw new \DomainException('Only tags with no usages can be deleted.');
+    public function deleteTag(Tag $tag)
+    {
+        if ($tag->getUsages() !== 0)
+            throw new \DomainException('Only tags with no usages can be deleted.');
 
-		$transactionFunc = function() use ($tag)
-		{
-			$this->tagDao->deleteById($tag->getId());
-			$this->tagHistoryService->saveTagDeletion($tag);
-		};
+        $transactionFunc = function() use ($tag)
+        {
+            $this->tagDao->deleteById($tag->getId());
+            $this->tagHistoryService->saveTagDeletion($tag);
+        };
 
-		$this->transactionManager->commit($transactionFunc);
-	}
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function mergeTag(Tag $sourceTag, Tag $targetTag)
-	{
-		$transactionFunc = function() use ($sourceTag, $targetTag)
-		{
-			$posts = $this->postDao->findByTagName($sourceTag->getName());
-			foreach ($posts as $post)
-			{
-				$newTags = $post->getTags();
-				$newTags[] = $targetTag;
+    public function mergeTag(Tag $sourceTag, Tag $targetTag)
+    {
+        $transactionFunc = function() use ($sourceTag, $targetTag)
+        {
+            $posts = $this->postDao->findByTagName($sourceTag->getName());
+            foreach ($posts as $post)
+            {
+                $newTags = $post->getTags();
+                $newTags[] = $targetTag;
 
-				$newTags = array_filter(
-					$newTags,
-					function(Tag $tag) use ($sourceTag)
-					{
-						return $tag->getId() !== $sourceTag->getId();
-					});
+                $newTags = array_filter(
+                    $newTags,
+                    function(Tag $tag) use ($sourceTag)
+                    {
+                        return $tag->getId() !== $sourceTag->getId();
+                    });
 
-				$post->setTags($newTags);
-				$this->postDao->save($post);
-				$this->postHistoryService->savePostChange($post);
-			}
+                $post->setTags($newTags);
+                $this->postDao->save($post);
+                $this->postHistoryService->savePostChange($post);
+            }
 
-			$this->tagHistoryService->saveTagDeletion($sourceTag);
-			$this->tagDao->deleteById($sourceTag->getId());
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+            $this->tagHistoryService->saveTagDeletion($sourceTag);
+            $this->tagDao->deleteById($sourceTag->getId());
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	private function updateTagName(Tag $tag, $newName)
-	{
-		$otherTag = $this->tagDao->findByName($newName);
-		if ($otherTag && $otherTag->getId() !== $tag->getId())
-			throw new \DomainException('Tag with this name already exists.');
-		$tag->setName($newName);
-	}
+    private function updateTagName(Tag $tag, $newName)
+    {
+        $otherTag = $this->tagDao->findByName($newName);
+        if ($otherTag && $otherTag->getId() !== $tag->getId())
+            throw new \DomainException('Tag with this name already exists.');
+        $tag->setName($newName);
+    }
 
-	private function updateTagCategory(Tag $tag, $newCategory)
-	{
-		if ($newCategory === 'default')
-			$tag->setCategory($newCategory);
-		else
-			$tag->setCategory($newCategory);
-	}
+    private function updateTagCategory(Tag $tag, $newCategory)
+    {
+        if ($newCategory === 'default')
+            $tag->setCategory($newCategory);
+        else
+            $tag->setCategory($newCategory);
+    }
 
-	private function updateImplications(Tag $tag, array $relatedNames)
-	{
-		$relatedNames = array_udiff($relatedNames, [$tag->getName()], 'strcasecmp');
-		$tag->setImpliedTags($this->createTags($relatedNames));
-	}
+    private function updateImplications(Tag $tag, array $relatedNames)
+    {
+        $relatedNames = array_udiff($relatedNames, [$tag->getName()], 'strcasecmp');
+        $tag->setImpliedTags($this->createTags($relatedNames));
+    }
 
-	private function updateSuggestions(Tag $tag, array $relatedNames)
-	{
-		$relatedNames = array_udiff($relatedNames, [$tag->getName()], 'strcasecmp');
-		$tag->setSuggestedTags($this->createTags($relatedNames));
-	}
+    private function updateSuggestions(Tag $tag, array $relatedNames)
+    {
+        $relatedNames = array_udiff($relatedNames, [$tag->getName()], 'strcasecmp');
+        $tag->setSuggestedTags($this->createTags($relatedNames));
+    }
 }
diff --git a/src/Services/TagSnapshotProvider.php b/src/Services/TagSnapshotProvider.php
index f33cca92..09871fb5 100644
--- a/src/Services/TagSnapshotProvider.php
+++ b/src/Services/TagSnapshotProvider.php
@@ -6,59 +6,59 @@ use Szurubooru\Entities\Tag;
 
 class TagSnapshotProvider implements ISnapshotProvider
 {
-	public function getCreationSnapshot(Entity $tag)
-	{
-		$snapshot = $this->getTagSnapshot($tag);
-		$snapshot->setOperation(Snapshot::OPERATION_CREATION);
-		$snapshot->setData($this->getFullData($tag));
-		return $snapshot;
-	}
+    public function getCreationSnapshot(Entity $tag)
+    {
+        $snapshot = $this->getTagSnapshot($tag);
+        $snapshot->setOperation(Snapshot::OPERATION_CREATION);
+        $snapshot->setData($this->getFullData($tag));
+        return $snapshot;
+    }
 
-	public function getChangeSnapshot(Entity $tag)
-	{
-		$snapshot = $this->getTagSnapshot($tag);
-		$snapshot->setOperation(Snapshot::OPERATION_CHANGE);
-		$snapshot->setData($this->getFullData($tag));
-		return $snapshot;
-	}
+    public function getChangeSnapshot(Entity $tag)
+    {
+        $snapshot = $this->getTagSnapshot($tag);
+        $snapshot->setOperation(Snapshot::OPERATION_CHANGE);
+        $snapshot->setData($this->getFullData($tag));
+        return $snapshot;
+    }
 
-	public function getDeleteSnapshot(Entity $tag)
-	{
-		$snapshot = $this->getTagSnapshot($tag);
-		$snapshot->setData(['name' => $tag->getName()]);
-		$snapshot->setOperation(Snapshot::OPERATION_DELETE);
-		return $snapshot;
-	}
+    public function getDeleteSnapshot(Entity $tag)
+    {
+        $snapshot = $this->getTagSnapshot($tag);
+        $snapshot->setData(['name' => $tag->getName()]);
+        $snapshot->setOperation(Snapshot::OPERATION_DELETE);
+        return $snapshot;
+    }
 
-	private function getTagSnapshot(Tag $tag)
-	{
-		$snapshot = new Snapshot();
-		$snapshot->setType(Snapshot::TYPE_TAG);
-		$snapshot->setPrimaryKey($tag->getId());
-		return $snapshot;
-	}
+    private function getTagSnapshot(Tag $tag)
+    {
+        $snapshot = new Snapshot();
+        $snapshot->setType(Snapshot::TYPE_TAG);
+        $snapshot->setPrimaryKey($tag->getId());
+        return $snapshot;
+    }
 
-	private function getFullData(Tag $tag)
-	{
-		$data =
-		[
-			'name' => $tag->getName(),
-			'banned' => $tag->isBanned(),
-			'category' => $tag->getCategory(),
+    private function getFullData(Tag $tag)
+    {
+        $data =
+        [
+            'name' => $tag->getName(),
+            'banned' => $tag->isBanned(),
+            'category' => $tag->getCategory(),
 
-			'implications' => array_values(array_map(function (Tag $impliedTag)
-				{
-					return $impliedTag->getName();
-				}, $tag->getImpliedTags())),
+            'implications' => array_values(array_map(function (Tag $impliedTag)
+                {
+                    return $impliedTag->getName();
+                }, $tag->getImpliedTags())),
 
-			'suggestions' => array_values(array_map(function (Tag $suggestedTag)
-				{
-					return $suggestedTag->getName();
-				}, $tag->getSuggestedTags())),
-		];
+            'suggestions' => array_values(array_map(function (Tag $suggestedTag)
+                {
+                    return $suggestedTag->getName();
+                }, $tag->getSuggestedTags())),
+        ];
 
-		sort($data['implications']);
-		sort($data['suggestions']);
-		return $data;
-	}
+        sort($data['implications']);
+        sort($data['suggestions']);
+        return $data;
+    }
 }
diff --git a/src/Services/ThumbnailGenerator.php b/src/Services/ThumbnailGenerator.php
index f948a11e..37568458 100644
--- a/src/Services/ThumbnailGenerator.php
+++ b/src/Services/ThumbnailGenerator.php
@@ -4,76 +4,76 @@ use Szurubooru\Services\ImageManipulation\ImageManipulator;
 
 class ThumbnailGenerator
 {
-	const CROP_OUTSIDE = 0;
-	const CROP_INSIDE = 1;
+    const CROP_OUTSIDE = 0;
+    const CROP_INSIDE = 1;
 
-	private $imageManipulator;
-	private $imageConverter;
+    private $imageManipulator;
+    private $imageConverter;
 
-	public function __construct(ImageManipulator $imageManipulator, ImageConverter $imageConverter)
-	{
-		$this->imageManipulator = $imageManipulator;
-		$this->imageConverter = $imageConverter;
-	}
+    public function __construct(ImageManipulator $imageManipulator, ImageConverter $imageConverter)
+    {
+        $this->imageManipulator = $imageManipulator;
+        $this->imageConverter = $imageConverter;
+    }
 
-	public function generate($source, $width, $height, $cropStyle, $format)
-	{
-		$image = $this->imageConverter->createImageFromBuffer($source);
-		if (!$image)
-			throw new \Exception('Error while loading supplied image');
+    public function generate($source, $width, $height, $cropStyle, $format)
+    {
+        $image = $this->imageConverter->createImageFromBuffer($source);
+        if (!$image)
+            throw new \Exception('Error while loading supplied image');
 
-		$srcWidth = $this->imageManipulator->getImageWidth($image);
-		$srcHeight = $this->imageManipulator->getImageHeight($image);
+        $srcWidth = $this->imageManipulator->getImageWidth($image);
+        $srcHeight = $this->imageManipulator->getImageHeight($image);
 
-		switch ($cropStyle)
-		{
-			case ThumbnailGenerator::CROP_OUTSIDE:
-				$this->cropOutside($image, $srcWidth, $srcHeight, $width, $height);
-				break;
+        switch ($cropStyle)
+        {
+            case ThumbnailGenerator::CROP_OUTSIDE:
+                $this->cropOutside($image, $srcWidth, $srcHeight, $width, $height);
+                break;
 
-			case ThumbnailGenerator::CROP_INSIDE:
-				$this->cropInside($image, $srcWidth, $srcHeight, $width, $height);
-				break;
+            case ThumbnailGenerator::CROP_INSIDE:
+                $this->cropInside($image, $srcWidth, $srcHeight, $width, $height);
+                break;
 
-			default:
-				throw new \InvalidArgumentException('Unknown thumbnail crop style');
-		}
+            default:
+                throw new \InvalidArgumentException('Unknown thumbnail crop style');
+        }
 
-		return $this->imageManipulator->saveToBuffer($image, $format);
-	}
+        return $this->imageManipulator->saveToBuffer($image, $format);
+    }
 
-	private function cropOutside(&$image, $srcWidth, $srcHeight, $dstWidth, $dstHeight)
-	{
-		if (($dstHeight / $dstWidth) > ($srcHeight / $srcWidth))
-		{
-			$cropHeight = $dstHeight;
-			$cropWidth = $dstHeight * $srcWidth / $srcHeight;
-		}
-		else
-		{
-			$cropWidth = $dstWidth;
-			$cropHeight = $dstWidth * $srcHeight / $srcWidth;
-		}
-		$cropX = ($cropWidth - $dstWidth) >> 1;
-		$cropY = ($cropHeight - $dstHeight) >> 1;
+    private function cropOutside(&$image, $srcWidth, $srcHeight, $dstWidth, $dstHeight)
+    {
+        if (($dstHeight / $dstWidth) > ($srcHeight / $srcWidth))
+        {
+            $cropHeight = $dstHeight;
+            $cropWidth = $dstHeight * $srcWidth / $srcHeight;
+        }
+        else
+        {
+            $cropWidth = $dstWidth;
+            $cropHeight = $dstWidth * $srcHeight / $srcWidth;
+        }
+        $cropX = ($cropWidth - $dstWidth) >> 1;
+        $cropY = ($cropHeight - $dstHeight) >> 1;
 
-		$this->imageManipulator->resizeImage($image, $cropWidth, $cropHeight);
-		$this->imageManipulator->cropImage($image, $dstWidth, $dstHeight, $cropX, $cropY);
-	}
+        $this->imageManipulator->resizeImage($image, $cropWidth, $cropHeight);
+        $this->imageManipulator->cropImage($image, $dstWidth, $dstHeight, $cropX, $cropY);
+    }
 
-	private function cropInside(&$image, $srcWidth, $srcHeight, $dstWidth, $dstHeight)
-	{
-		if (($dstHeight / $dstWidth) < ($srcHeight / $srcWidth))
-		{
-			$cropHeight = $dstHeight;
-			$cropWidth = $dstHeight * $srcWidth / $srcHeight;
-		}
-		else
-		{
-			$cropWidth = $dstWidth;
-			$cropHeight = $dstWidth * $srcHeight / $srcWidth;
-		}
+    private function cropInside(&$image, $srcWidth, $srcHeight, $dstWidth, $dstHeight)
+    {
+        if (($dstHeight / $dstWidth) < ($srcHeight / $srcWidth))
+        {
+            $cropHeight = $dstHeight;
+            $cropWidth = $dstHeight * $srcWidth / $srcHeight;
+        }
+        else
+        {
+            $cropWidth = $dstWidth;
+            $cropHeight = $dstWidth * $srcHeight / $srcWidth;
+        }
 
-		$this->imageManipulator->resizeImage($image, $cropWidth, $cropHeight);
-	}
+        $this->imageManipulator->resizeImage($image, $cropWidth, $cropHeight);
+    }
 }
diff --git a/src/Services/ThumbnailService.php b/src/Services/ThumbnailService.php
index ba6d422d..f9d9ea9a 100644
--- a/src/Services/ThumbnailService.php
+++ b/src/Services/ThumbnailService.php
@@ -8,131 +8,131 @@ use Szurubooru\Services\ThumbnailGenerator;
 
 class ThumbnailService
 {
-	const PROGRAM_NAME_JPEGOPTIM = 'jpegoptim';
-	const PROGRAM_NAME_OPTIPNG = 'optipng';
+    const PROGRAM_NAME_JPEGOPTIM = 'jpegoptim';
+    const PROGRAM_NAME_OPTIPNG = 'optipng';
 
-	private $config;
-	private $fileDao;
-	private $thumbnailGenerator;
+    private $config;
+    private $fileDao;
+    private $thumbnailGenerator;
 
-	public function __construct(
-		Config $config,
-		PublicFileDao $fileDao,
-		ThumbnailGenerator $thumbnailGenerator)
-	{
-		$this->config = $config;
-		$this->fileDao = $fileDao;
-		$this->thumbnailGenerator = $thumbnailGenerator;
-	}
+    public function __construct(
+        Config $config,
+        PublicFileDao $fileDao,
+        ThumbnailGenerator $thumbnailGenerator)
+    {
+        $this->config = $config;
+        $this->fileDao = $fileDao;
+        $this->thumbnailGenerator = $thumbnailGenerator;
+    }
 
-	public function deleteUsedThumbnails($sourceName)
-	{
-		foreach ($this->getUsedThumbnailSizes() as $size)
-		{
-			list ($width, $height) = $size;
-			$target = $this->getTargetName($sourceName, $width, $height);
-			$this->fileDao->delete($target);
-		}
-	}
+    public function deleteUsedThumbnails($sourceName)
+    {
+        foreach ($this->getUsedThumbnailSizes() as $size)
+        {
+            list ($width, $height) = $size;
+            $target = $this->getTargetName($sourceName, $width, $height);
+            $this->fileDao->delete($target);
+        }
+    }
 
-	public function generateIfNeeded($sourceName, $width, $height)
-	{
-		$targetName = $this->getTargetName($sourceName, $width, $height);
+    public function generateIfNeeded($sourceName, $width, $height)
+    {
+        $targetName = $this->getTargetName($sourceName, $width, $height);
 
-		if (!$this->fileDao->exists($targetName))
-			return $this->generate($sourceName, $width, $height);
+        if (!$this->fileDao->exists($targetName))
+            return $this->generate($sourceName, $width, $height);
 
-		return $targetName;
-	}
+        return $targetName;
+    }
 
-	public function generate($sourceName, $width, $height)
-	{
-		switch ($this->config->misc->thumbnailCropStyle)
-		{
-			case 'outside':
-				$cropStyle = ThumbnailGenerator::CROP_OUTSIDE;
-				break;
+    public function generate($sourceName, $width, $height)
+    {
+        switch ($this->config->misc->thumbnailCropStyle)
+        {
+            case 'outside':
+                $cropStyle = ThumbnailGenerator::CROP_OUTSIDE;
+                break;
 
-			case 'inside':
-				$cropStyle = humbnailGenerator::CROP_INSIDE;
-				break;
+            case 'inside':
+                $cropStyle = humbnailGenerator::CROP_INSIDE;
+                break;
 
-			default:
-				throw new \InvalidArgumentException('Invalid thumbnail crop style');
-		}
+            default:
+                throw new \InvalidArgumentException('Invalid thumbnail crop style');
+        }
 
-		$source = $this->fileDao->load($sourceName);
-		if ($source)
-		{
-			$format = $this->getFormat();
-			$thumbnailContent = $this->thumbnailGenerator->generate($source, $width, $height, $cropStyle, $format);
-			if ($thumbnailContent)
-			{
-				$targetName = $this->getTargetName($sourceName, $width, $height);
-				$this->fileDao->save($targetName, $thumbnailContent);
-				$this->optimize($targetName, $format);
-				return $targetName;
-			}
-		}
+        $source = $this->fileDao->load($sourceName);
+        if ($source)
+        {
+            $format = $this->getFormat();
+            $thumbnailContent = $this->thumbnailGenerator->generate($source, $width, $height, $cropStyle, $format);
+            if ($thumbnailContent)
+            {
+                $targetName = $this->getTargetName($sourceName, $width, $height);
+                $this->fileDao->save($targetName, $thumbnailContent);
+                $this->optimize($targetName, $format);
+                return $targetName;
+            }
+        }
 
-		return $this->getBlankThumbnailName();
-	}
+        return $this->getBlankThumbnailName();
+    }
 
-	public function getUsedThumbnailSizes()
-	{
-		foreach (glob($this->fileDao->getFullPath('thumbnails') . DIRECTORY_SEPARATOR . '*x*') as $fn)
-		{
-			if (!is_dir($fn))
-				continue;
+    public function getUsedThumbnailSizes()
+    {
+        foreach (glob($this->fileDao->getFullPath('thumbnails') . DIRECTORY_SEPARATOR . '*x*') as $fn)
+        {
+            if (!is_dir($fn))
+                continue;
 
-			preg_match('/(?P<width>\d+)x(?P<height>\d+)/', $fn, $matches);
-			if ($matches)
-			{
-				$width = intval($matches['width']);
-				$height = intval($matches['height']);
-				yield [$width, $height];
-			}
-		}
-	}
+            preg_match('/(?P<width>\d+)x(?P<height>\d+)/', $fn, $matches);
+            if ($matches)
+            {
+                $width = intval($matches['width']);
+                $height = intval($matches['height']);
+                yield [$width, $height];
+            }
+        }
+    }
 
-	public function getTargetName($source, $width, $height)
-	{
-		return 'thumbnails' . DIRECTORY_SEPARATOR . $width . 'x' . $height . DIRECTORY_SEPARATOR . $source;
-	}
+    public function getTargetName($source, $width, $height)
+    {
+        return 'thumbnails' . DIRECTORY_SEPARATOR . $width . 'x' . $height . DIRECTORY_SEPARATOR . $source;
+    }
 
-	public function getBlankThumbnailName()
-	{
-		return 'thumbnails' . DIRECTORY_SEPARATOR . 'blank.png';
-	}
+    public function getBlankThumbnailName()
+    {
+        return 'thumbnails' . DIRECTORY_SEPARATOR . 'blank.png';
+    }
 
-	private function getFormat()
-	{
-		return IImageManipulator::FORMAT_JPEG;
-	}
+    private function getFormat()
+    {
+        return IImageManipulator::FORMAT_JPEG;
+    }
 
-	private function optimize($sourceName, $format)
-	{
-		$sourcePath = $this->fileDao->getFullPath($sourceName);
+    private function optimize($sourceName, $format)
+    {
+        $sourcePath = $this->fileDao->getFullPath($sourceName);
 
-		if ($format === IImageManipulator::FORMAT_JPEG && ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_JPEGOPTIM))
-		{
-			ProgramExecutor::run(
-				self::PROGRAM_NAME_JPEGOPTIM,
-				[
-					'--quiet',
-					'--strip-all',
-					$sourcePath,
-				]);
-		}
+        if ($format === IImageManipulator::FORMAT_JPEG && ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_JPEGOPTIM))
+        {
+            ProgramExecutor::run(
+                self::PROGRAM_NAME_JPEGOPTIM,
+                [
+                    '--quiet',
+                    '--strip-all',
+                    $sourcePath,
+                ]);
+        }
 
-		elseif ($format === IImageManipulator::FORMAT_PNG && ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_OPTIPNG))
-		{
-			ProgramExecutor::run(
-				self::PROGRAM_NAME_OPTIPNG,
-				[
-					'-o2',
-					$sourcePath,
-				]);
-		}
-	}
+        elseif ($format === IImageManipulator::FORMAT_PNG && ProgramExecutor::isProgramAvailable(self::PROGRAM_NAME_OPTIPNG))
+        {
+            ProgramExecutor::run(
+                self::PROGRAM_NAME_OPTIPNG,
+                [
+                    '-o2',
+                    $sourcePath,
+                ]);
+        }
+    }
 }
diff --git a/src/Services/TimeService.php b/src/Services/TimeService.php
index c38f10e7..0be1ea22 100644
--- a/src/Services/TimeService.php
+++ b/src/Services/TimeService.php
@@ -3,13 +3,13 @@ namespace Szurubooru\Services;
 
 class TimeService
 {
-	public function __construct()
-	{
-		date_default_timezone_set('UTC');
-	}
+    public function __construct()
+    {
+        date_default_timezone_set('UTC');
+    }
 
-	public function getCurrentTime()
-	{
-		return date('c');
-	}
+    public function getCurrentTime()
+    {
+        return date('c');
+    }
 }
diff --git a/src/Services/TokenService.php b/src/Services/TokenService.php
index acefe29f..1db13e1a 100644
--- a/src/Services/TokenService.php
+++ b/src/Services/TokenService.php
@@ -6,64 +6,64 @@ use Szurubooru\Entities\Token;
 
 class TokenService
 {
-	private $transactionManager;
-	private $tokenDao;
+    private $transactionManager;
+    private $tokenDao;
 
-	public function __construct(
-		TransactionManager $transactionManager,
-		TokenDao $tokenDao)
-	{
-		$this->transactionManager = $transactionManager;
-		$this->tokenDao = $tokenDao;
-	}
+    public function __construct(
+        TransactionManager $transactionManager,
+        TokenDao $tokenDao)
+    {
+        $this->transactionManager = $transactionManager;
+        $this->tokenDao = $tokenDao;
+    }
 
-	public function getByName($tokenName)
-	{
-		$transactionFunc = function() use ($tokenName)
-		{
-			$token = $this->tokenDao->findByName($tokenName);
-			if (!$token)
-				throw new \InvalidArgumentException('Token with identifier "' . $tokenName . '" not found.');
-			return $token;
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getByName($tokenName)
+    {
+        $transactionFunc = function() use ($tokenName)
+        {
+            $token = $this->tokenDao->findByName($tokenName);
+            if (!$token)
+                throw new \InvalidArgumentException('Token with identifier "' . $tokenName . '" not found.');
+            return $token;
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function invalidateByName($tokenName)
-	{
-		$transactionFunc = function() use ($tokenName)
-		{
-			$this->tokenDao->deleteByName($tokenName);
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function invalidateByName($tokenName)
+    {
+        $transactionFunc = function() use ($tokenName)
+        {
+            $this->tokenDao->deleteByName($tokenName);
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function invalidateByAdditionalData($additionalData)
-	{
-		$transactionFunc = function() use ($additionalData)
-		{
-			$this->tokenDao->deleteByAdditionalData($additionalData);
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function invalidateByAdditionalData($additionalData)
+    {
+        $transactionFunc = function() use ($additionalData)
+        {
+            $this->tokenDao->deleteByAdditionalData($additionalData);
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function createAndSaveToken($additionalData, $tokenPurpose)
-	{
-		$transactionFunc = function() use ($additionalData, $tokenPurpose)
-		{
-			$token = $this->tokenDao->findByAdditionalDataAndPurpose($additionalData, $tokenPurpose);
+    public function createAndSaveToken($additionalData, $tokenPurpose)
+    {
+        $transactionFunc = function() use ($additionalData, $tokenPurpose)
+        {
+            $token = $this->tokenDao->findByAdditionalDataAndPurpose($additionalData, $tokenPurpose);
 
-			if (!$token)
-			{
-				$token = new Token();
-				$token->setName(sha1(date('r') . uniqid() . microtime(true)));
-				$token->setAdditionalData($additionalData);
-				$token->setPurpose($tokenPurpose);
-				$this->tokenDao->save($token);
-			}
+            if (!$token)
+            {
+                $token = new Token();
+                $token->setName(sha1(date('r') . uniqid() . microtime(true)));
+                $token->setAdditionalData($additionalData);
+                $token->setPurpose($tokenPurpose);
+                $this->tokenDao->save($token);
+            }
 
-			return $token;
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            return $token;
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 }
diff --git a/src/Services/UpgradeService.php b/src/Services/UpgradeService.php
index 0f340c3c..9323bd9b 100644
--- a/src/Services/UpgradeService.php
+++ b/src/Services/UpgradeService.php
@@ -7,89 +7,89 @@ use Szurubooru\Upgrades\UpgradeRepository;
 
 final class UpgradeService
 {
-	private $config;
-	private $upgrades;
-	private $databaseConnection;
-	private $executedUpgradeNumbers = [];
+    private $config;
+    private $upgrades;
+    private $databaseConnection;
+    private $executedUpgradeNumbers = [];
 
-	public function __construct(
-		Config $config,
-		DatabaseConnection $databaseConnection,
-		UpgradeRepository $upgradeRepository)
-	{
-		$this->config = $config;
-		$this->databaseConnection = $databaseConnection;
-		$this->upgrades = $upgradeRepository->getUpgrades();
-		$this->loadExecutedUpgradeNumbers();
-	}
+    public function __construct(
+        Config $config,
+        DatabaseConnection $databaseConnection,
+        UpgradeRepository $upgradeRepository)
+    {
+        $this->config = $config;
+        $this->databaseConnection = $databaseConnection;
+        $this->upgrades = $upgradeRepository->getUpgrades();
+        $this->loadExecutedUpgradeNumbers();
+    }
 
-	public function runUpgradesVerbose()
-	{
-		echo $this->config->database->user . '@' . $this->config->database->dsn . PHP_EOL;
-		$this->runUpgrades(true);
-	}
+    public function runUpgradesVerbose()
+    {
+        echo $this->config->database->user . '@' . $this->config->database->dsn . PHP_EOL;
+        $this->runUpgrades(true);
+    }
 
-	public function runUpgradesQuiet()
-	{
-		$this->runUpgrades(false);
-	}
+    public function runUpgradesQuiet()
+    {
+        $this->runUpgrades(false);
+    }
 
-	private function runUpgrades($verbose)
-	{
-		foreach ($this->upgrades as $upgrade)
-		{
-			if ($this->isUpgradeNeeded($upgrade))
-			{
-				if ($verbose)
-					$this->log('Running ' . get_class($upgrade));
-				$this->runUpgrade($upgrade);
-				if ($verbose)
-					$this->log(PHP_EOL);
-			}
-		}
-	}
+    private function runUpgrades($verbose)
+    {
+        foreach ($this->upgrades as $upgrade)
+        {
+            if ($this->isUpgradeNeeded($upgrade))
+            {
+                if ($verbose)
+                    $this->log('Running ' . get_class($upgrade));
+                $this->runUpgrade($upgrade);
+                if ($verbose)
+                    $this->log(PHP_EOL);
+            }
+        }
+    }
 
-	private function isUpgradeNeeded(IUpgrade $upgrade)
-	{
-		return !in_array($this->getUpgradeNumber($upgrade), $this->executedUpgradeNumbers);
-	}
+    private function isUpgradeNeeded(IUpgrade $upgrade)
+    {
+        return !in_array($this->getUpgradeNumber($upgrade), $this->executedUpgradeNumbers);
+    }
 
-	private function runUpgrade(IUpgrade $upgrade)
-	{
-		$upgrade->run($this->databaseConnection);
-		$number = $this->getUpgradeNumber($upgrade);
-		$this->executedUpgradeNumbers[] = $number;
-		$this->databaseConnection->getPDO()->insertInto('executedUpgrades')->values(['number' => $number])->execute();
-	}
+    private function runUpgrade(IUpgrade $upgrade)
+    {
+        $upgrade->run($this->databaseConnection);
+        $number = $this->getUpgradeNumber($upgrade);
+        $this->executedUpgradeNumbers[] = $number;
+        $this->databaseConnection->getPDO()->insertInto('executedUpgrades')->values(['number' => $number])->execute();
+    }
 
-	private function loadExecutedUpgradeNumbers()
-	{
-		$this->executedUpgradeNumbers = [];
-		try
-		{
-			foreach ($this->databaseConnection->getPDO()->from('executedUpgrades') as $row)
-			{
-				$this->executedUpgradeNumbers[] = intval($row['number']);
-			}
-		}
-		catch (\Exception $e)
-		{
-			//most probably, no table found - need to execute all upgrades
-		}
-	}
+    private function loadExecutedUpgradeNumbers()
+    {
+        $this->executedUpgradeNumbers = [];
+        try
+        {
+            foreach ($this->databaseConnection->getPDO()->from('executedUpgrades') as $row)
+            {
+                $this->executedUpgradeNumbers[] = intval($row['number']);
+            }
+        }
+        catch (\Exception $e)
+        {
+            //most probably, no table found - need to execute all upgrades
+        }
+    }
 
-	private function getUpgradeNumber(IUpgrade $upgrade)
-	{
-		$className = get_class($upgrade);
-		preg_match('/(\d+)/', $className, $matches);
-		return intval($matches[1]);
-	}
+    private function getUpgradeNumber(IUpgrade $upgrade)
+    {
+        $className = get_class($upgrade);
+        preg_match('/(\d+)/', $className, $matches);
+        return intval($matches[1]);
+    }
 
-	private function log($message)
-	{
-		echo $message;
-		if (ob_get_level())
-			ob_flush();
-		flush();
-	}
+    private function log($message)
+    {
+        echo $message;
+        if (ob_get_level())
+            ob_flush();
+        flush();
+    }
 }
diff --git a/src/Services/UserService.php b/src/Services/UserService.php
index af760a0b..6d991413 100644
--- a/src/Services/UserService.php
+++ b/src/Services/UserService.php
@@ -18,316 +18,316 @@ use Szurubooru\Validator;
 
 class UserService
 {
-	private $config;
-	private $validator;
-	private $transactionManager;
-	private $userDao;
-	private $passwordService;
-	private $emailService;
-	private $timeService;
-	private $tokenService;
+    private $config;
+    private $validator;
+    private $transactionManager;
+    private $userDao;
+    private $passwordService;
+    private $emailService;
+    private $timeService;
+    private $tokenService;
 
-	public function __construct(
-		Config $config,
-		Validator $validator,
-		TransactionManager $transactionManager,
-		UserDao $userDao,
-		PasswordService $passwordService,
-		EmailService $emailService,
-		TimeService $timeService,
-		TokenService $tokenService)
-	{
-		$this->config = $config;
-		$this->validator = $validator;
-		$this->transactionManager = $transactionManager;
-		$this->userDao = $userDao;
-		$this->passwordService = $passwordService;
-		$this->emailService = $emailService;
-		$this->timeService = $timeService;
-		$this->tokenService = $tokenService;
-	}
+    public function __construct(
+        Config $config,
+        Validator $validator,
+        TransactionManager $transactionManager,
+        UserDao $userDao,
+        PasswordService $passwordService,
+        EmailService $emailService,
+        TimeService $timeService,
+        TokenService $tokenService)
+    {
+        $this->config = $config;
+        $this->validator = $validator;
+        $this->transactionManager = $transactionManager;
+        $this->userDao = $userDao;
+        $this->passwordService = $passwordService;
+        $this->emailService = $emailService;
+        $this->timeService = $timeService;
+        $this->tokenService = $tokenService;
+    }
 
-	public function getByNameOrEmail($userNameOrEmail, $allowUnconfirmed = false)
-	{
-		$transactionFunc = function() use ($userNameOrEmail, $allowUnconfirmed)
-		{
-			$user = $this->userDao->findByName($userNameOrEmail);
-			if ($user)
-				return $user;
+    public function getByNameOrEmail($userNameOrEmail, $allowUnconfirmed = false)
+    {
+        $transactionFunc = function() use ($userNameOrEmail, $allowUnconfirmed)
+        {
+            $user = $this->userDao->findByName($userNameOrEmail);
+            if ($user)
+                return $user;
 
-			$user = $this->userDao->findByEmail($userNameOrEmail, $allowUnconfirmed);
-			if ($user)
-				return $user;
+            $user = $this->userDao->findByEmail($userNameOrEmail, $allowUnconfirmed);
+            if ($user)
+                return $user;
 
-			throw new \InvalidArgumentException('User "' . $userNameOrEmail . '" was not found.');
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+            throw new \InvalidArgumentException('User "' . $userNameOrEmail . '" was not found.');
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getByName($userName)
-	{
-		$transactionFunc = function() use ($userName)
-		{
-			$user = $this->userDao->findByName($userName);
-			if (!$user)
-				throw new \InvalidArgumentException('User with name "' . $userName . '" was not found.');
-			return $user;
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getByName($userName)
+    {
+        $transactionFunc = function() use ($userName)
+        {
+            $user = $this->userDao->findByName($userName);
+            if (!$user)
+                throw new \InvalidArgumentException('User with name "' . $userName . '" was not found.');
+            return $user;
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getById($userId)
-	{
-		$transactionFunc = function() use ($userId)
-		{
-			$user = $this->userDao->findById($userId);
-			if (!$user)
-				throw new \InvalidArgumentException('User with id "' . $userId . '" was not found.');
-			return $user;
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getById($userId)
+    {
+        $transactionFunc = function() use ($userId)
+        {
+            $user = $this->userDao->findById($userId);
+            if (!$user)
+                throw new \InvalidArgumentException('User with id "' . $userId . '" was not found.');
+            return $user;
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function getFiltered(UserFilter $filter)
-	{
-		$transactionFunc = function() use ($filter)
-		{
-			return $this->userDao->findFiltered($filter);
-		};
-		return $this->transactionManager->rollback($transactionFunc);
-	}
+    public function getFiltered(UserFilter $filter)
+    {
+        $transactionFunc = function() use ($filter)
+        {
+            return $this->userDao->findFiltered($filter);
+        };
+        return $this->transactionManager->rollback($transactionFunc);
+    }
 
-	public function createUser(RegistrationFormData $formData)
-	{
-		$transactionFunc = function() use ($formData)
-		{
-			$formData->validate($this->validator);
+    public function createUser(RegistrationFormData $formData)
+    {
+        $transactionFunc = function() use ($formData)
+        {
+            $formData->validate($this->validator);
 
-			$user = new User();
-			$user->setRegistrationTime($this->timeService->getCurrentTime());
-			$user->setLastLoginTime(null);
-			$user->setAccessRank($this->userDao->hasAnyUsers()
-				? $this->getDefaultAccessRank()
-				: User::ACCESS_RANK_ADMINISTRATOR);
-			$user->setPasswordSalt($this->passwordService->getRandomPassword());
+            $user = new User();
+            $user->setRegistrationTime($this->timeService->getCurrentTime());
+            $user->setLastLoginTime(null);
+            $user->setAccessRank($this->userDao->hasAnyUsers()
+                ? $this->getDefaultAccessRank()
+                : User::ACCESS_RANK_ADMINISTRATOR);
+            $user->setPasswordSalt($this->passwordService->getRandomPassword());
 
-			$this->updateUserName($user, $formData->userName);
-			$this->updateUserPassword($user, $formData->password);
-			$this->updateUserAvatarStyle($user, User::AVATAR_STYLE_GRAVATAR);
-			$this->updateUserEmail($user, $formData->email);
-			return $this->userDao->save($user);
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            $this->updateUserName($user, $formData->userName);
+            $this->updateUserPassword($user, $formData->password);
+            $this->updateUserAvatarStyle($user, User::AVATAR_STYLE_GRAVATAR);
+            $this->updateUserEmail($user, $formData->email);
+            return $this->userDao->save($user);
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function updateUser(User $user, UserEditFormData $formData)
-	{
-		$transactionFunc = function() use ($user, $formData)
-		{
-			$this->validator->validate($formData);
+    public function updateUser(User $user, UserEditFormData $formData)
+    {
+        $transactionFunc = function() use ($user, $formData)
+        {
+            $this->validator->validate($formData);
 
-			if ($formData->avatarStyle !== null)
-				$this->updateUserAvatarStyle($user, $formData->avatarStyle);
+            if ($formData->avatarStyle !== null)
+                $this->updateUserAvatarStyle($user, $formData->avatarStyle);
 
-			if ($formData->avatarContent !== null)
-				$this->updateUserAvatarContent($user, $formData->avatarContent);
+            if ($formData->avatarContent !== null)
+                $this->updateUserAvatarContent($user, $formData->avatarContent);
 
-			if ($formData->userName !== null)
-				$this->updateUserName($user, $formData->userName);
+            if ($formData->userName !== null)
+                $this->updateUserName($user, $formData->userName);
 
-			if ($formData->password !== null)
-				$this->updateUserPassword($user, $formData->password);
+            if ($formData->password !== null)
+                $this->updateUserPassword($user, $formData->password);
 
-			if ($formData->email !== null)
-				$this->updateUserEmail($user, $formData->email);
+            if ($formData->email !== null)
+                $this->updateUserEmail($user, $formData->email);
 
-			if ($formData->accessRank !== null)
-				$this->updateUserAccessRank($user, $formData->accessRank);
+            if ($formData->accessRank !== null)
+                $this->updateUserAccessRank($user, $formData->accessRank);
 
-			if ($formData->browsingSettings !== null)
-				$this->updateUserBrowsingSettings($user, $formData->browsingSettings);
+            if ($formData->browsingSettings !== null)
+                $this->updateUserBrowsingSettings($user, $formData->browsingSettings);
 
-			if ($formData->banned !== $user->isBanned())
-				$user->setBanned(boolval($formData->banned));
+            if ($formData->banned !== $user->isBanned())
+                $user->setBanned(boolval($formData->banned));
 
-			return $this->userDao->save($user);
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            return $this->userDao->save($user);
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function deleteUser(User $user)
-	{
-		$transactionFunc = function() use ($user)
-		{
-			$this->userDao->deleteById($user->getId());
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function deleteUser(User $user)
+    {
+        $transactionFunc = function() use ($user)
+        {
+            $this->userDao->deleteById($user->getId());
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function sendPasswordResetEmail(User $user)
-	{
-		$transactionFunc = function() use ($user)
-		{
-			$token = $this->tokenService->createAndSaveToken($user->getName(), Token::PURPOSE_PASSWORD_RESET);
-			$this->emailService->sendPasswordResetEmail($user, $token);
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function sendPasswordResetEmail(User $user)
+    {
+        $transactionFunc = function() use ($user)
+        {
+            $token = $this->tokenService->createAndSaveToken($user->getName(), Token::PURPOSE_PASSWORD_RESET);
+            $this->emailService->sendPasswordResetEmail($user, $token);
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function finishPasswordReset(Token $token)
-	{
-		$transactionFunc = function() use ($token)
-		{
-			if ($token->getPurpose() !== Token::PURPOSE_PASSWORD_RESET)
-				throw new \Exception('This token is not a password reset token.');
+    public function finishPasswordReset(Token $token)
+    {
+        $transactionFunc = function() use ($token)
+        {
+            if ($token->getPurpose() !== Token::PURPOSE_PASSWORD_RESET)
+                throw new \Exception('This token is not a password reset token.');
 
-			$user = $this->getByName($token->getAdditionalData());
-			$newPassword = $this->passwordService->getRandomPassword();
-			$this->updateUserPassword($user, $newPassword);
-			$this->userDao->save($user);
-			$this->tokenService->invalidateByName($token->getName());
-			return $newPassword;
-		};
-		return $this->transactionManager->commit($transactionFunc);
-	}
+            $user = $this->getByName($token->getAdditionalData());
+            $newPassword = $this->passwordService->getRandomPassword();
+            $this->updateUserPassword($user, $newPassword);
+            $this->userDao->save($user);
+            $this->tokenService->invalidateByName($token->getName());
+            return $newPassword;
+        };
+        return $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function sendActivationEmail(User $user)
-	{
-		$transactionFunc = function() use ($user)
-		{
-			$token = $this->tokenService->createAndSaveToken($user->getName(), Token::PURPOSE_ACTIVATE);
-			$this->emailService->sendActivationEmail($user, $token);
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function sendActivationEmail(User $user)
+    {
+        $transactionFunc = function() use ($user)
+        {
+            $token = $this->tokenService->createAndSaveToken($user->getName(), Token::PURPOSE_ACTIVATE);
+            $this->emailService->sendActivationEmail($user, $token);
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	public function finishActivation(Token $token)
-	{
-		$transactionFunc = function() use ($token)
-		{
-			if ($token->getPurpose() !== Token::PURPOSE_ACTIVATE)
-				throw new \Exception('This token is not an activation token.');
+    public function finishActivation(Token $token)
+    {
+        $transactionFunc = function() use ($token)
+        {
+            if ($token->getPurpose() !== Token::PURPOSE_ACTIVATE)
+                throw new \Exception('This token is not an activation token.');
 
-			$user = $this->getByName($token->getAdditionalData());
-			$user = $this->confirmUserEmail($user);
-			$this->userDao->save($user);
-			$this->tokenService->invalidateByName($token->getName());
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+            $user = $this->getByName($token->getAdditionalData());
+            $user = $this->confirmUserEmail($user);
+            $this->userDao->save($user);
+            $this->tokenService->invalidateByName($token->getName());
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	private function updateUserAvatarStyle(User $user, $newAvatarStyle)
-	{
-		$user->setAvatarStyle($newAvatarStyle);
-	}
+    private function updateUserAvatarStyle(User $user, $newAvatarStyle)
+    {
+        $user->setAvatarStyle($newAvatarStyle);
+    }
 
-	private function updateUserAvatarContent(User $user, $newAvatarContent)
-	{
-		$mime = MimeHelper::getMimeTypeFromBuffer($newAvatarContent);
-		if (!MimeHelper::isImage($mime))
-			throw new \DomainException('Avatar must be an image.');
+    private function updateUserAvatarContent(User $user, $newAvatarContent)
+    {
+        $mime = MimeHelper::getMimeTypeFromBuffer($newAvatarContent);
+        if (!MimeHelper::isImage($mime))
+            throw new \DomainException('Avatar must be an image.');
 
-		if (strlen($newAvatarContent) > $this->config->database->maxCustomThumbnailSize)
-			throw new \DomainException('Upload is too big.');
+        if (strlen($newAvatarContent) > $this->config->database->maxCustomThumbnailSize)
+            throw new \DomainException('Upload is too big.');
 
-		$user->setCustomAvatarSourceContent($newAvatarContent);
-	}
+        $user->setCustomAvatarSourceContent($newAvatarContent);
+    }
 
-	private function updateUserName(User $user, $newName)
-	{
-		$this->assertNoUserWithThisName($user, $newName);
-		$user->setName($newName);
-	}
+    private function updateUserName(User $user, $newName)
+    {
+        $this->assertNoUserWithThisName($user, $newName);
+        $user->setName($newName);
+    }
 
-	private function updateUserPassword(User $user, $newPassword)
-	{
-		$user->setPasswordHash($this->passwordService->getHash($newPassword, $user->getPasswordSalt()));
-	}
+    private function updateUserPassword(User $user, $newPassword)
+    {
+        $user->setPasswordHash($this->passwordService->getHash($newPassword, $user->getPasswordSalt()));
+    }
 
-	private function updateUserEmail(User $user, $newEmail)
-	{
-		if ($user->getEmail() === $newEmail)
-		{
-			$user->setEmailUnconfirmed(null);
-		}
-		else
-		{
-			$this->assertNoUserWithThisEmail($user, $newEmail);
-			$user->setEmailUnconfirmed($newEmail);
-			$user = $this->sendActivationEmailIfNeeded($user);
-		}
-	}
+    private function updateUserEmail(User $user, $newEmail)
+    {
+        if ($user->getEmail() === $newEmail)
+        {
+            $user->setEmailUnconfirmed(null);
+        }
+        else
+        {
+            $this->assertNoUserWithThisEmail($user, $newEmail);
+            $user->setEmailUnconfirmed($newEmail);
+            $user = $this->sendActivationEmailIfNeeded($user);
+        }
+    }
 
-	private function updateUserAccessRank(User $user, $newAccessRank)
-	{
-		$user->setAccessRank($newAccessRank);
-	}
+    private function updateUserAccessRank(User $user, $newAccessRank)
+    {
+        $user->setAccessRank($newAccessRank);
+    }
 
-	private function updateUserBrowsingSettings(User $user, $newBrowsingSettings)
-	{
-		$user->setBrowsingSettings($newBrowsingSettings);
-	}
+    private function updateUserBrowsingSettings(User $user, $newBrowsingSettings)
+    {
+        $user->setBrowsingSettings($newBrowsingSettings);
+    }
 
-	public function updateUserLastLoginTime(User $user)
-	{
-		$transactionFunc = function() use ($user)
-		{
-			$user->setLastLoginTime($this->timeService->getCurrentTime());
-			$this->userDao->save($user);
-		};
-		$this->transactionManager->commit($transactionFunc);
-	}
+    public function updateUserLastLoginTime(User $user)
+    {
+        $transactionFunc = function() use ($user)
+        {
+            $user->setLastLoginTime($this->timeService->getCurrentTime());
+            $this->userDao->save($user);
+        };
+        $this->transactionManager->commit($transactionFunc);
+    }
 
-	private function sendActivationEmailIfNeeded(User $user)
-	{
-		if ($user->getAccessRank() === User::ACCESS_RANK_ADMINISTRATOR
-			or !$this->config->security->needEmailActivationToRegister)
-		{
-			$user = $this->confirmUserEmail($user);
-		}
-		else
-		{
-			$this->sendActivationEmail($user);
-		}
-		return $user;
-	}
+    private function sendActivationEmailIfNeeded(User $user)
+    {
+        if ($user->getAccessRank() === User::ACCESS_RANK_ADMINISTRATOR
+            or !$this->config->security->needEmailActivationToRegister)
+        {
+            $user = $this->confirmUserEmail($user);
+        }
+        else
+        {
+            $this->sendActivationEmail($user);
+        }
+        return $user;
+    }
 
-	private function confirmUserEmail(User $user)
-	{
-		//security issue:
-		//1. two users set their unconfirmed mail to godzilla@empire.gov
-		//2. activation mail is sent to both of them
-		//3. first user confirms, ok
-		//4. second user confirms, ok
-		//5. two users share the same mail --> problem.
-		//by checking here again for users with such mail, this problem is solved with first-come first-serve approach:
-		//whoever confirms e-mail first, wins.
-		$this->assertNoUserWithThisEmail($user, $user->getEmailUnconfirmed());
+    private function confirmUserEmail(User $user)
+    {
+        //security issue:
+        //1. two users set their unconfirmed mail to godzilla@empire.gov
+        //2. activation mail is sent to both of them
+        //3. first user confirms, ok
+        //4. second user confirms, ok
+        //5. two users share the same mail --> problem.
+        //by checking here again for users with such mail, this problem is solved with first-come first-serve approach:
+        //whoever confirms e-mail first, wins.
+        $this->assertNoUserWithThisEmail($user, $user->getEmailUnconfirmed());
 
-		$user->setAccountConfirmed(true);
-		$user->setEmail($user->getEmailUnconfirmed());
-		$user->setEmailUnconfirmed(null);
-		return $user;
-	}
+        $user->setAccountConfirmed(true);
+        $user->setEmail($user->getEmailUnconfirmed());
+        $user->setEmailUnconfirmed(null);
+        return $user;
+    }
 
-	private function assertNoUserWithThisName(User $owner, $nameToCheck)
-	{
-		$userWithThisName = $this->userDao->findByName($nameToCheck);
-		if ($userWithThisName && $userWithThisName->getId() !== $owner->getId())
-			throw new \DomainException('User with this name already exists.');
-	}
+    private function assertNoUserWithThisName(User $owner, $nameToCheck)
+    {
+        $userWithThisName = $this->userDao->findByName($nameToCheck);
+        if ($userWithThisName && $userWithThisName->getId() !== $owner->getId())
+            throw new \DomainException('User with this name already exists.');
+    }
 
-	private function assertNoUserWithThisEmail(User $owner, $emailToCheck)
-	{
-		if (!$emailToCheck)
-			return;
-		$userWithThisEmail = $this->userDao->findByEmail($emailToCheck);
-		if ($userWithThisEmail && $userWithThisEmail->getId() !== $owner->getId())
-			throw new \DomainException('User with this e-mail already exists.');
-	}
+    private function assertNoUserWithThisEmail(User $owner, $emailToCheck)
+    {
+        if (!$emailToCheck)
+            return;
+        $userWithThisEmail = $this->userDao->findByEmail($emailToCheck);
+        if ($userWithThisEmail && $userWithThisEmail->getId() !== $owner->getId())
+            throw new \DomainException('User with this e-mail already exists.');
+    }
 
-	private function getDefaultAccessRank()
-	{
-		return EnumHelper::accessRankFromString($this->config->security->defaultAccessRank);
-	}
+    private function getDefaultAccessRank()
+    {
+        return EnumHelper::accessRankFromString($this->config->security->defaultAccessRank);
+    }
 }
diff --git a/src/Upgrades/IUpgrade.php b/src/Upgrades/IUpgrade.php
index 90e66ee9..92a5835a 100644
--- a/src/Upgrades/IUpgrade.php
+++ b/src/Upgrades/IUpgrade.php
@@ -4,5 +4,5 @@ use Szurubooru\DatabaseConnection;
 
 interface IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection);
+    public function run(DatabaseConnection $databaseConnection);
 }
diff --git a/src/Upgrades/Upgrade00.php b/src/Upgrades/Upgrade00.php
index 3b06be63..d41a43ae 100644
--- a/src/Upgrades/Upgrade00.php
+++ b/src/Upgrades/Upgrade00.php
@@ -4,23 +4,23 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade00 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$pdo->exec('CREATE TABLE executedUpgrades (number INT NOT NULL)');
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $pdo->exec('CREATE TABLE executedUpgrades (number INT NOT NULL)');
 
-		$oldFilePath = __DIR__ . '/../../data/executed_upgrades.txt';
-		if (file_exists($oldFilePath))
-		{
-			foreach (explode("\n", file_get_contents($oldFilePath)) as $className)
-			{
-				if (preg_match('/(\d+)/', $className, $matches))
-				{
-					$number = intval($matches[1]);
-					$pdo->insertInto('executedUpgrades')->values(['number' => $number])->execute();
-				}
-			}
-			unlink($oldFilePath);
-		}
-	}
+        $oldFilePath = __DIR__ . '/../../data/executed_upgrades.txt';
+        if (file_exists($oldFilePath))
+        {
+            foreach (explode("\n", file_get_contents($oldFilePath)) as $className)
+            {
+                if (preg_match('/(\d+)/', $className, $matches))
+                {
+                    $number = intval($matches[1]);
+                    $pdo->insertInto('executedUpgrades')->values(['number' => $number])->execute();
+                }
+            }
+            unlink($oldFilePath);
+        }
+    }
 }
diff --git a/src/Upgrades/Upgrade01.php b/src/Upgrades/Upgrade01.php
index cc5cb024..118c4f9b 100644
--- a/src/Upgrades/Upgrade01.php
+++ b/src/Upgrades/Upgrade01.php
@@ -4,40 +4,40 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade01 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $driver = $databaseConnection->getDriver();
 
-		$databaseConnection->getPDO()->exec('
-			CREATE TABLE users
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				name VARCHAR(50) NOT NULL,
-				passwordHash VARCHAR(64) NOT NULL,
-				email VARCHAR(200),
-				emailUnconfirmed VARCHAR(200),
-				accessRank INTEGER NOT NULL,
-				browsingSettings VARCHAR(300),
-				banned BOOLEAN DEFAULT FALSE,
-				registrationTime DATETIME DEFAULT NULL,
-				lastLoginTime DATETIME DEFAULT NULL,
-				avatarStyle INTEGER DEFAULT 1
-			);');
+        $databaseConnection->getPDO()->exec('
+            CREATE TABLE users
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                name VARCHAR(50) NOT NULL,
+                passwordHash VARCHAR(64) NOT NULL,
+                email VARCHAR(200),
+                emailUnconfirmed VARCHAR(200),
+                accessRank INTEGER NOT NULL,
+                browsingSettings VARCHAR(300),
+                banned BOOLEAN DEFAULT FALSE,
+                registrationTime DATETIME DEFAULT NULL,
+                lastLoginTime DATETIME DEFAULT NULL,
+                avatarStyle INTEGER DEFAULT 1
+            );');
 
-		$databaseConnection->getPDO()->exec('
-			CREATE TABLE tokens
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				name VARCHAR(200) NOT NULL,
-				purpose INTEGER NOT NULL,
-				additionalData VARCHAR(200)
-			);');
+        $databaseConnection->getPDO()->exec('
+            CREATE TABLE tokens
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                name VARCHAR(200) NOT NULL,
+                purpose INTEGER NOT NULL,
+                additionalData VARCHAR(200)
+            );');
 
-		$databaseConnection->getPDO()->exec('
-			CREATE TABLE posts
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				name VARCHAR(200) NOT NULL
-			);');
-	}
+        $databaseConnection->getPDO()->exec('
+            CREATE TABLE posts
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                name VARCHAR(200) NOT NULL
+            );');
+    }
 }
diff --git a/src/Upgrades/Upgrade02.php b/src/Upgrades/Upgrade02.php
index 80254361..30d78888 100644
--- a/src/Upgrades/Upgrade02.php
+++ b/src/Upgrades/Upgrade02.php
@@ -4,9 +4,9 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade02 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$databaseConnection->getPDO()->exec('
-			ALTER TABLE users ADD COLUMN accountConfirmed BOOLEAN NOT NULL DEFAULT FALSE');
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $databaseConnection->getPDO()->exec('
+            ALTER TABLE users ADD COLUMN accountConfirmed BOOLEAN NOT NULL DEFAULT FALSE');
+    }
 }
diff --git a/src/Upgrades/Upgrade03.php b/src/Upgrades/Upgrade03.php
index 3750054e..0e780eb6 100644
--- a/src/Upgrades/Upgrade03.php
+++ b/src/Upgrades/Upgrade03.php
@@ -4,43 +4,43 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade03 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('DROP TABLE IF EXISTS posts');
+        $pdo->exec('DROP TABLE IF EXISTS posts');
 
-		$pdo->exec('
-			CREATE TABLE posts
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				name VARCHAR(40) NOT NULL,
-				userId INTEGER,
-				uploadTime DATETIME NOT NULL,
-				lastEditTime DATETIME,
-				safety INTEGER NOT NULL,
-				contentType INTEGER NOT NULL,
-				contentChecksum VARCHAR(64) NOT NULL,
-				source VARCHAR(200),
-				imageWidth INTEGER,
-				imageHeight INTEGER,
-				originalFileSize INTEGER,
-				originalFileName VARCHAR(200)
-			)');
+        $pdo->exec('
+            CREATE TABLE posts
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                name VARCHAR(40) NOT NULL,
+                userId INTEGER,
+                uploadTime DATETIME NOT NULL,
+                lastEditTime DATETIME,
+                safety INTEGER NOT NULL,
+                contentType INTEGER NOT NULL,
+                contentChecksum VARCHAR(64) NOT NULL,
+                source VARCHAR(200),
+                imageWidth INTEGER,
+                imageHeight INTEGER,
+                originalFileSize INTEGER,
+                originalFileName VARCHAR(200)
+            )');
 
-		$pdo->exec('
-			CREATE TABLE tags
-			(
-				name VARCHAR(64) PRIMARY KEY NOT NULL
-			)');
+        $pdo->exec('
+            CREATE TABLE tags
+            (
+                name VARCHAR(64) PRIMARY KEY NOT NULL
+            )');
 
-		$pdo->exec('
-			CREATE TABLE postTags
-			(
-				postId INTEGER NOT NULL,
-				tagName VARCHAR(64) NOT NULL,
-				PRIMARY KEY (postId, tagName)
-			)');
-	}
+        $pdo->exec('
+            CREATE TABLE postTags
+            (
+                postId INTEGER NOT NULL,
+                tagName VARCHAR(64) NOT NULL,
+                PRIMARY KEY (postId, tagName)
+            )');
+    }
 }
diff --git a/src/Upgrades/Upgrade04.php b/src/Upgrades/Upgrade04.php
index 321f2b4c..90e39711 100644
--- a/src/Upgrades/Upgrade04.php
+++ b/src/Upgrades/Upgrade04.php
@@ -9,34 +9,34 @@ use Szurubooru\Services\PostService;
 
 class Upgrade04 implements IUpgrade
 {
-	private $postDao;
-	private $postService;
-	private $fileDao;
+    private $postDao;
+    private $postService;
+    private $fileDao;
 
-	public function __construct(
-		PostDao $postDao,
-		PostService $postService,
-		PublicFileDao $fileDao)
-	{
-		$this->postDao = $postDao;
-		$this->postService = $postService;
-		$this->fileDao = $fileDao;
-	}
+    public function __construct(
+        PostDao $postDao,
+        PostService $postService,
+        PublicFileDao $fileDao)
+    {
+        $this->postDao = $postDao;
+        $this->postService = $postService;
+        $this->fileDao = $fileDao;
+    }
 
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$databaseConnection->getPDO()->exec('ALTER TABLE posts ADD COLUMN contentMimeType VARCHAR(64) DEFAULT NULL');
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $databaseConnection->getPDO()->exec('ALTER TABLE posts ADD COLUMN contentMimeType VARCHAR(64) DEFAULT NULL');
 
-		$posts = $this->postDao->findAll();
-		foreach ($posts as $post)
-		{
-			if ($post->getContentType() !== Post::POST_TYPE_YOUTUBE)
-			{
-				$fullPath = $this->fileDao->getFullPath($post->getContentPath());
-				$mime = MimeHelper::getMimeTypeFromFile($fullPath);
-				$post->setContentMimeType($mime);
-				$this->postDao->save($post);
-			}
-		}
-	}
+        $posts = $this->postDao->findAll();
+        foreach ($posts as $post)
+        {
+            if ($post->getContentType() !== Post::POST_TYPE_YOUTUBE)
+            {
+                $fullPath = $this->fileDao->getFullPath($post->getContentPath());
+                $mime = MimeHelper::getMimeTypeFromFile($fullPath);
+                $post->setContentMimeType($mime);
+                $this->postDao->save($post);
+            }
+        }
+    }
 }
diff --git a/src/Upgrades/Upgrade05.php b/src/Upgrades/Upgrade05.php
index 1f2db4c2..7c7b5251 100644
--- a/src/Upgrades/Upgrade05.php
+++ b/src/Upgrades/Upgrade05.php
@@ -4,31 +4,31 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade05 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('
-			CREATE TABLE tags2
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				name VARCHAR(64) UNIQUE NOT NULL,
-				usages INTEGER NOT NULL DEFAULT 0
-			)');
-		$pdo->exec('INSERT INTO tags2(name, usages) SELECT name, (SELECT COUNT(1) FROM postTags WHERE tagName = tags.name) FROM tags');
-		$pdo->exec('DROP TABLE tags');
-		$pdo->exec('ALTER TABLE tags2 RENAME TO tags');
+        $pdo->exec('
+            CREATE TABLE tags2
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                name VARCHAR(64) UNIQUE NOT NULL,
+                usages INTEGER NOT NULL DEFAULT 0
+            )');
+        $pdo->exec('INSERT INTO tags2(name, usages) SELECT name, (SELECT COUNT(1) FROM postTags WHERE tagName = tags.name) FROM tags');
+        $pdo->exec('DROP TABLE tags');
+        $pdo->exec('ALTER TABLE tags2 RENAME TO tags');
 
-		$pdo->exec('
-			CREATE TABLE postTags2
-			(
-				postId INTEGER NOT NULL,
-				tagId INTEGER NOT NULL,
-				PRIMARY KEY (postId, tagId)
-			)');
-		$pdo->exec('INSERT INTO postTags2(postId, tagId) SELECT postId, (SELECT tags.id FROM tags WHERE tags.name = postTags.tagName) FROM postTags');
-		$pdo->exec('DROP TABLE postTags');
-		$pdo->exec('ALTER TABLE postTags2 RENAME TO postTags');
-	}
+        $pdo->exec('
+            CREATE TABLE postTags2
+            (
+                postId INTEGER NOT NULL,
+                tagId INTEGER NOT NULL,
+                PRIMARY KEY (postId, tagId)
+            )');
+        $pdo->exec('INSERT INTO postTags2(postId, tagId) SELECT postId, (SELECT tags.id FROM tags WHERE tags.name = postTags.tagName) FROM postTags');
+        $pdo->exec('DROP TABLE postTags');
+        $pdo->exec('ALTER TABLE postTags2 RENAME TO postTags');
+    }
 }
diff --git a/src/Upgrades/Upgrade06.php b/src/Upgrades/Upgrade06.php
index 05166178..8a85a29c 100644
--- a/src/Upgrades/Upgrade06.php
+++ b/src/Upgrades/Upgrade06.php
@@ -4,36 +4,36 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade06 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('
-			CREATE TRIGGER postTagsDelete BEFORE DELETE ON postTags
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET tagCount = tagCount - 1 WHERE posts.id = OLD.postId;
-				UPDATE tags SET usages = usages - 1 WHERE tags.id = OLD.tagId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER postTagsDelete BEFORE DELETE ON postTags
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET tagCount = tagCount - 1 WHERE posts.id = OLD.postId;
+                UPDATE tags SET usages = usages - 1 WHERE tags.id = OLD.tagId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER postTagsInsert AFTER INSERT ON postTags
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET tagCount = tagCount + 1 WHERE posts.id = NEW.postId;
-				UPDATE tags SET usages = usages + 1 WHERE tags.id = NEW.tagId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER postTagsInsert AFTER INSERT ON postTags
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET tagCount = tagCount + 1 WHERE posts.id = NEW.postId;
+                UPDATE tags SET usages = usages + 1 WHERE tags.id = NEW.tagId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER postTagsUpdate AFTER UPDATE ON postTags
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET tagCount = tagCount + 1 WHERE posts.id = NEW.postId;
-				UPDATE posts SET tagCount = tagCount - 1 WHERE posts.id = OLD.postId;
-				UPDATE tags SET usages = usages + 1 WHERE tags.id = NEW.tagId;
-				UPDATE tags SET usages = usages - 1 WHERE tags.id = OLD.tagId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER postTagsUpdate AFTER UPDATE ON postTags
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET tagCount = tagCount + 1 WHERE posts.id = NEW.postId;
+                UPDATE posts SET tagCount = tagCount - 1 WHERE posts.id = OLD.postId;
+                UPDATE tags SET usages = usages + 1 WHERE tags.id = NEW.tagId;
+                UPDATE tags SET usages = usages - 1 WHERE tags.id = OLD.tagId;
+            END');
 
-		$pdo->exec('ALTER TABLE posts ADD COLUMN tagCount INTEGER NOT NULL DEFAULT 0');
-	}
+        $pdo->exec('ALTER TABLE posts ADD COLUMN tagCount INTEGER NOT NULL DEFAULT 0');
+    }
 }
diff --git a/src/Upgrades/Upgrade07.php b/src/Upgrades/Upgrade07.php
index 4be6d3f1..14111552 100644
--- a/src/Upgrades/Upgrade07.php
+++ b/src/Upgrades/Upgrade07.php
@@ -4,19 +4,19 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade07 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('CREATE TABLE globals
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				dataKey VARCHAR(32) UNIQUE NOT NULL,
-				dataValue VARCHAR(64)
-			)');
+        $pdo->exec('CREATE TABLE globals
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                dataKey VARCHAR(32) UNIQUE NOT NULL,
+                dataValue VARCHAR(64)
+            )');
 
-		$pdo->exec('ALTER TABLE posts ADD COLUMN featureCount INTEGER NOT NULL DEFAULT 0');
-		$pdo->exec('ALTER TABLE posts ADD COLUMN lastFeatureTime DATETIME');
-	}
+        $pdo->exec('ALTER TABLE posts ADD COLUMN featureCount INTEGER NOT NULL DEFAULT 0');
+        $pdo->exec('ALTER TABLE posts ADD COLUMN lastFeatureTime DATETIME');
+    }
 }
diff --git a/src/Upgrades/Upgrade08.php b/src/Upgrades/Upgrade08.php
index 6ae259cf..5156b498 100644
--- a/src/Upgrades/Upgrade08.php
+++ b/src/Upgrades/Upgrade08.php
@@ -4,17 +4,17 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade08 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('CREATE TABLE postRelations
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				post1id INTEGER NOT NULL,
-				post2id INTEGER NOT NULL,
-				UNIQUE (post1id, post2id)
-			)');
-	}
+        $pdo->exec('CREATE TABLE postRelations
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                post1id INTEGER NOT NULL,
+                post2id INTEGER NOT NULL,
+                UNIQUE (post1id, post2id)
+            )');
+    }
 }
diff --git a/src/Upgrades/Upgrade09.php b/src/Upgrades/Upgrade09.php
index 69e02c02..94604a30 100644
--- a/src/Upgrades/Upgrade09.php
+++ b/src/Upgrades/Upgrade09.php
@@ -6,39 +6,39 @@ use Szurubooru\Services\HistoryService;
 
 class Upgrade09 implements IUpgrade
 {
-	private $postDao;
-	private $historyService;
+    private $postDao;
+    private $historyService;
 
-	public function __construct(
-		PostDao $postDao,
-		HistoryService $historyService)
-	{
-		$this->postDao = $postDao;
-		$this->historyService = $historyService;
-	}
+    public function __construct(
+        PostDao $postDao,
+        HistoryService $historyService)
+    {
+        $this->postDao = $postDao;
+        $this->historyService = $historyService;
+    }
 
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('DROP TABLE IF EXISTS snapshots');
+        $pdo->exec('DROP TABLE IF EXISTS snapshots');
 
-		$pdo->exec('CREATE TABLE snapshots
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				time DATETIME NOT NULL,
-				type INTEGER NOT NULL,
-				primaryKey TEXT NOT NULL,
-				operation INTEGER NOT NULL,
-				userId INTEGER,
-				data BLOB,
-				dataDifference BLOB
-			)');
+        $pdo->exec('CREATE TABLE snapshots
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                time DATETIME NOT NULL,
+                type INTEGER NOT NULL,
+                primaryKey TEXT NOT NULL,
+                operation INTEGER NOT NULL,
+                userId INTEGER,
+                data BLOB,
+                dataDifference BLOB
+            )');
 
-		foreach ($this->postDao->findAll() as $post)
-		{
-			$this->historyService->saveSnapshot($this->historyService->getPostChangeSnapshot($post));
-		}
-	}
+        foreach ($this->postDao->findAll() as $post)
+        {
+            $this->historyService->saveSnapshot($this->historyService->getPostChangeSnapshot($post));
+        }
+    }
 }
diff --git a/src/Upgrades/Upgrade10.php b/src/Upgrades/Upgrade10.php
index f6fa78c3..d82aec79 100644
--- a/src/Upgrades/Upgrade10.php
+++ b/src/Upgrades/Upgrade10.php
@@ -4,58 +4,58 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade10 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('CREATE TABLE favorites
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				userId INTEGER NOT NULL,
-				postId INTEGER NOT NULL,
-				time DATETIME NOT NULL,
-				UNIQUE (userId, postId)
-			)');
+        $pdo->exec('CREATE TABLE favorites
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                userId INTEGER NOT NULL,
+                postId INTEGER NOT NULL,
+                time DATETIME NOT NULL,
+                UNIQUE (userId, postId)
+            )');
 
-		$pdo->exec('
-			CREATE TRIGGER favoritesDelete BEFORE DELETE ON favorites
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET favCount = favCount - 1 WHERE posts.id = OLD.postId;
+        $pdo->exec('
+            CREATE TRIGGER favoritesDelete BEFORE DELETE ON favorites
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET favCount = favCount - 1 WHERE posts.id = OLD.postId;
 
-				UPDATE posts SET lastFavTime = (
-					SELECT MAX(time) FROM favorites
-					WHERE favorites.postId = posts.id)
-					WHERE posts.id = OLD.postId;
-			END');
+                UPDATE posts SET lastFavTime = (
+                    SELECT MAX(time) FROM favorites
+                    WHERE favorites.postId = posts.id)
+                    WHERE posts.id = OLD.postId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER favoritesInsert AFTER INSERT ON favorites
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET favCount = favCount + 1 WHERE posts.id = NEW.postId;
+        $pdo->exec('
+            CREATE TRIGGER favoritesInsert AFTER INSERT ON favorites
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET favCount = favCount + 1 WHERE posts.id = NEW.postId;
 
-				UPDATE posts SET lastFavTime = (
-					SELECT MAX(time) FROM favorites
-					WHERE favorites.postId = posts.id)
-					WHERE posts.id = NEW.postId;
-			END');
+                UPDATE posts SET lastFavTime = (
+                    SELECT MAX(time) FROM favorites
+                    WHERE favorites.postId = posts.id)
+                    WHERE posts.id = NEW.postId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER favoritesUpdate AFTER UPDATE ON favorites
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET favCount = favCount + 1 WHERE posts.id = NEW.postId;
-				UPDATE posts SET favCount = favCount - 1 WHERE posts.id = OLD.postId;
+        $pdo->exec('
+            CREATE TRIGGER favoritesUpdate AFTER UPDATE ON favorites
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET favCount = favCount + 1 WHERE posts.id = NEW.postId;
+                UPDATE posts SET favCount = favCount - 1 WHERE posts.id = OLD.postId;
 
-				UPDATE posts SET lastFavTime = (
-					SELECT MAX(time) FROM favorites
-					WHERE favorites.postId = posts.id)
-					WHERE posts.id IN (OLD.postId, NEW.postId);
-			END');
+                UPDATE posts SET lastFavTime = (
+                    SELECT MAX(time) FROM favorites
+                    WHERE favorites.postId = posts.id)
+                    WHERE posts.id IN (OLD.postId, NEW.postId);
+            END');
 
-		$pdo->exec('ALTER TABLE posts ADD COLUMN favCount INTEGER NOT NULL DEFAULT 0');
-		$pdo->exec('ALTER TABLE posts ADD COLUMN lastFavTime DATETIME');
-	}
+        $pdo->exec('ALTER TABLE posts ADD COLUMN favCount INTEGER NOT NULL DEFAULT 0');
+        $pdo->exec('ALTER TABLE posts ADD COLUMN lastFavTime DATETIME');
+    }
 }
diff --git a/src/Upgrades/Upgrade11.php b/src/Upgrades/Upgrade11.php
index 1ab3d945..f2ba803a 100644
--- a/src/Upgrades/Upgrade11.php
+++ b/src/Upgrades/Upgrade11.php
@@ -4,57 +4,57 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade11 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('CREATE TABLE postScores
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				userId INTEGER NOT NULL,
-				postId INTEGER NOT NULL,
-				time DATETIME NOT NULL,
-				score INTEGER NOT NULL,
-				UNIQUE (userId, postId)
-			)');
+        $pdo->exec('CREATE TABLE postScores
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                userId INTEGER NOT NULL,
+                postId INTEGER NOT NULL,
+                time DATETIME NOT NULL,
+                score INTEGER NOT NULL,
+                UNIQUE (userId, postId)
+            )');
 
-		$pdo->exec('
-			CREATE TRIGGER postScoresDelete AFTER DELETE ON postScores
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET score = (
-					SELECT SUM(score) FROM postScores
-					WHERE postScores.postId = posts.id)
-				WHERE posts.id = OLD.postId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER postScoresDelete AFTER DELETE ON postScores
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET score = (
+                    SELECT SUM(score) FROM postScores
+                    WHERE postScores.postId = posts.id)
+                WHERE posts.id = OLD.postId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER postScoresInsert AFTER INSERT ON postScores
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET score = (
-					SELECT SUM(score) FROM postScores
-					WHERE postScores.postId = posts.id)
-				WHERE posts.id = NEW.postId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER postScoresInsert AFTER INSERT ON postScores
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET score = (
+                    SELECT SUM(score) FROM postScores
+                    WHERE postScores.postId = posts.id)
+                WHERE posts.id = NEW.postId;
+            END');
 
 
-		$pdo->exec('
-			CREATE TRIGGER postScoresUpdate AFTER UPDATE ON postScores
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET score = (
-					SELECT SUM(score) FROM postScores
-					WHERE postScores.postId = posts.id)
-				WHERE posts.id = OLD.postId;
+        $pdo->exec('
+            CREATE TRIGGER postScoresUpdate AFTER UPDATE ON postScores
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET score = (
+                    SELECT SUM(score) FROM postScores
+                    WHERE postScores.postId = posts.id)
+                WHERE posts.id = OLD.postId;
 
-				UPDATE posts SET score = (
-					SELECT SUM(score) FROM postScores
-					WHERE postScores.postId = posts.id)
-				WHERE posts.id = NEW.postId;
-			END');
+                UPDATE posts SET score = (
+                    SELECT SUM(score) FROM postScores
+                    WHERE postScores.postId = posts.id)
+                WHERE posts.id = NEW.postId;
+            END');
 
-		$pdo->exec('ALTER TABLE posts ADD COLUMN score INTEGER NOT NULL DEFAULT 0');
-	}
+        $pdo->exec('ALTER TABLE posts ADD COLUMN score INTEGER NOT NULL DEFAULT 0');
+    }
 }
diff --git a/src/Upgrades/Upgrade12.php b/src/Upgrades/Upgrade12.php
index 3c4d1bed..e4a14e04 100644
--- a/src/Upgrades/Upgrade12.php
+++ b/src/Upgrades/Upgrade12.php
@@ -5,15 +5,15 @@ use Szurubooru\Services\TagService;
 
 class Upgrade12 implements IUpgrade
 {
-	private $tagService;
+    private $tagService;
 
-	public function __construct(TagService $tagService)
-	{
-		$this->tagService = $tagService;
-	}
+    public function __construct(TagService $tagService)
+    {
+        $this->tagService = $tagService;
+    }
 
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$this->tagService->exportJson();
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $this->tagService->exportJson();
+    }
 }
diff --git a/src/Upgrades/Upgrade13.php b/src/Upgrades/Upgrade13.php
index 70aaf79d..209892dc 100644
--- a/src/Upgrades/Upgrade13.php
+++ b/src/Upgrades/Upgrade13.php
@@ -4,52 +4,52 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade13 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('DROP TRIGGER postTagsDelete');
-		$pdo->exec('DROP TRIGGER favoritesDelete');
-		$pdo->exec('DROP TRIGGER favoritesInsert');
-		$pdo->exec('DROP TRIGGER favoritesUpdate');
+        $pdo->exec('DROP TRIGGER postTagsDelete');
+        $pdo->exec('DROP TRIGGER favoritesDelete');
+        $pdo->exec('DROP TRIGGER favoritesInsert');
+        $pdo->exec('DROP TRIGGER favoritesUpdate');
 
-		$pdo->exec('
-			CREATE TRIGGER postTagsDelete AFTER DELETE ON postTags
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET tagCount = tagCount - 1 WHERE posts.id = OLD.postId;
-				UPDATE tags SET usages = usages - 1 WHERE tags.id = OLD.tagId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER postTagsDelete AFTER DELETE ON postTags
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET tagCount = tagCount - 1 WHERE posts.id = OLD.postId;
+                UPDATE tags SET usages = usages - 1 WHERE tags.id = OLD.tagId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER favoritesDelete AFTER DELETE ON favorites
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					favCount = (SELECT COUNT(1) FROM favorites WHERE favorites.postId = posts.id),
-					lastFavTime = (SELECT MAX(time) FROM favorites WHERE favorites.postId = posts.id)
-					WHERE posts.id = OLD.postId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER favoritesDelete AFTER DELETE ON favorites
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    favCount = (SELECT COUNT(1) FROM favorites WHERE favorites.postId = posts.id),
+                    lastFavTime = (SELECT MAX(time) FROM favorites WHERE favorites.postId = posts.id)
+                    WHERE posts.id = OLD.postId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER favoritesInsert AFTER INSERT ON favorites
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					favCount = (SELECT COUNT(1) FROM favorites WHERE favorites.postId = posts.id),
-					lastFavTime = (SELECT MAX(time) FROM favorites WHERE favorites.postId = posts.id)
-					WHERE posts.id = NEW.postId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER favoritesInsert AFTER INSERT ON favorites
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    favCount = (SELECT COUNT(1) FROM favorites WHERE favorites.postId = posts.id),
+                    lastFavTime = (SELECT MAX(time) FROM favorites WHERE favorites.postId = posts.id)
+                    WHERE posts.id = NEW.postId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER favoritesUpdate AFTER UPDATE ON favorites
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					favCount = (SELECT COUNT(1) FROM favorites WHERE favorites.postId = posts.id),
-					lastFavTime = (SELECT MAX(time) FROM favorites WHERE favorites.postId = posts.id)
-					WHERE posts.id IN (OLD.postId, NEW.postId);
-			END');
+        $pdo->exec('
+            CREATE TRIGGER favoritesUpdate AFTER UPDATE ON favorites
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    favCount = (SELECT COUNT(1) FROM favorites WHERE favorites.postId = posts.id),
+                    lastFavTime = (SELECT MAX(time) FROM favorites WHERE favorites.postId = posts.id)
+                    WHERE posts.id IN (OLD.postId, NEW.postId);
+            END');
 
-	}
+    }
 }
diff --git a/src/Upgrades/Upgrade14.php b/src/Upgrades/Upgrade14.php
index ad42b4dd..9115d7a9 100644
--- a/src/Upgrades/Upgrade14.php
+++ b/src/Upgrades/Upgrade14.php
@@ -4,52 +4,52 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade14 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('CREATE TABLE comments
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				postId INTEGER NOT NULL,
-				userId INTEGER,
-				creationTime DATETIME NOT NULL,
-				lastEditTime DATETIME NOT NULL,
-				text TEXT
-			)');
+        $pdo->exec('CREATE TABLE comments
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                postId INTEGER NOT NULL,
+                userId INTEGER,
+                creationTime DATETIME NOT NULL,
+                lastEditTime DATETIME NOT NULL,
+                text TEXT
+            )');
 
-		$pdo->exec('
-			CREATE TRIGGER commentsDelete AFTER DELETE ON comments
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					commentCount = (SELECT COUNT(1) FROM comments WHERE comments.postId = posts.id),
-					lastCommentTime = (SELECT MAX(lastEditTime) FROM comments WHERE comments.postId = posts.id)
-					WHERE posts.id = OLD.postId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER commentsDelete AFTER DELETE ON comments
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    commentCount = (SELECT COUNT(1) FROM comments WHERE comments.postId = posts.id),
+                    lastCommentTime = (SELECT MAX(lastEditTime) FROM comments WHERE comments.postId = posts.id)
+                    WHERE posts.id = OLD.postId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER commentsInsert AFTER INSERT ON comments
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					commentCount = (SELECT COUNT(1) FROM comments WHERE comments.postId = posts.id),
-					lastCommentTime = (SELECT MAX(lastEditTime) FROM comments WHERE comments.postId = posts.id)
-					WHERE posts.id = NEW.postId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER commentsInsert AFTER INSERT ON comments
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    commentCount = (SELECT COUNT(1) FROM comments WHERE comments.postId = posts.id),
+                    lastCommentTime = (SELECT MAX(lastEditTime) FROM comments WHERE comments.postId = posts.id)
+                    WHERE posts.id = NEW.postId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER commentsUpdate AFTER UPDATE ON comments
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					commentCount = (SELECT COUNT(1) FROM comments WHERE comments.postId = posts.id),
-					lastCommentTime = (SELECT MAX(lastEditTime) FROM comments WHERE comments.postId = posts.id)
-					WHERE posts.id IN (OLD.postId, NEW.postId);
-			END');
+        $pdo->exec('
+            CREATE TRIGGER commentsUpdate AFTER UPDATE ON comments
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    commentCount = (SELECT COUNT(1) FROM comments WHERE comments.postId = posts.id),
+                    lastCommentTime = (SELECT MAX(lastEditTime) FROM comments WHERE comments.postId = posts.id)
+                    WHERE posts.id IN (OLD.postId, NEW.postId);
+            END');
 
-		$pdo->exec('ALTER TABLE posts ADD COLUMN commentCount INTEGER NOT NULL DEFAULT 0');
-		$pdo->exec('ALTER TABLE posts ADD COLUMN lastCommentTime DATETIME');
-	}
+        $pdo->exec('ALTER TABLE posts ADD COLUMN commentCount INTEGER NOT NULL DEFAULT 0');
+        $pdo->exec('ALTER TABLE posts ADD COLUMN lastCommentTime DATETIME');
+    }
 }
diff --git a/src/Upgrades/Upgrade15.php b/src/Upgrades/Upgrade15.php
index 638bec43..8f006c44 100644
--- a/src/Upgrades/Upgrade15.php
+++ b/src/Upgrades/Upgrade15.php
@@ -4,58 +4,58 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade15 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('DROP TABLE IF EXISTS scores');
+        $pdo->exec('DROP TABLE IF EXISTS scores');
 
-		$pdo->exec('CREATE TABLE scores
-			(
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				userId INTEGER NOT NULL,
-				postId INTEGER,
-				time DATETIME NOT NULL,
-				score INTEGER NOT NULL
-			)');
+        $pdo->exec('CREATE TABLE scores
+            (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                userId INTEGER NOT NULL,
+                postId INTEGER,
+                time DATETIME NOT NULL,
+                score INTEGER NOT NULL
+            )');
 
-		$pdo->exec('INSERT INTO scores (userId, postId, time, score) SELECT userId, postId, time, score FROM postScores');
+        $pdo->exec('INSERT INTO scores (userId, postId, time, score) SELECT userId, postId, time, score FROM postScores');
 
-		$pdo->exec('DROP TABLE IF EXISTS postScores');
-		$pdo->exec('DROP TRIGGER IF EXISTS postScoresDelete');
-		$pdo->exec('DROP TRIGGER IF EXISTS postScoresInsert');
-		$pdo->exec('DROP TRIGGER IF EXISTS postScoresUpdate');
+        $pdo->exec('DROP TABLE IF EXISTS postScores');
+        $pdo->exec('DROP TRIGGER IF EXISTS postScoresDelete');
+        $pdo->exec('DROP TRIGGER IF EXISTS postScoresInsert');
+        $pdo->exec('DROP TRIGGER IF EXISTS postScoresUpdate');
 
-		$pdo->exec('DROP TRIGGER IF EXISTS scoresDelete');
-		$pdo->exec('DROP TRIGGER IF EXISTS scoresInsert');
-		$pdo->exec('DROP TRIGGER IF EXISTS scoresUpdate');
+        $pdo->exec('DROP TRIGGER IF EXISTS scoresDelete');
+        $pdo->exec('DROP TRIGGER IF EXISTS scoresInsert');
+        $pdo->exec('DROP TRIGGER IF EXISTS scoresUpdate');
 
-		$pdo->exec('
-			CREATE TRIGGER scoresDelete AFTER DELETE ON scores
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
-				WHERE posts.id = OLD.postId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER scoresDelete AFTER DELETE ON scores
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
+                WHERE posts.id = OLD.postId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER scoresInsert AFTER INSERT ON scores
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
-				WHERE posts.id = NEW.postId;
-			END');
+        $pdo->exec('
+            CREATE TRIGGER scoresInsert AFTER INSERT ON scores
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
+                WHERE posts.id = NEW.postId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER scoresUpdate AFTER UPDATE ON scores
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
-				WHERE posts.id IN (OLD.postId, NEW.postId);
-			END');
-	}
+        $pdo->exec('
+            CREATE TRIGGER scoresUpdate AFTER UPDATE ON scores
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
+                WHERE posts.id IN (OLD.postId, NEW.postId);
+            END');
+    }
 }
diff --git a/src/Upgrades/Upgrade16.php b/src/Upgrades/Upgrade16.php
index 30269078..c0af1f5a 100644
--- a/src/Upgrades/Upgrade16.php
+++ b/src/Upgrades/Upgrade16.php
@@ -4,55 +4,55 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade16 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('ALTER TABLE scores ADD COLUMN commentId INTEGER');
-		$pdo->exec('ALTER TABLE comments ADD COLUMN score INTEGER NOT NULL DEFAULT 0');
+        $pdo->exec('ALTER TABLE scores ADD COLUMN commentId INTEGER');
+        $pdo->exec('ALTER TABLE comments ADD COLUMN score INTEGER NOT NULL DEFAULT 0');
 
-		$pdo->exec('DROP TRIGGER IF EXISTS scoresDelete');
-		$pdo->exec('DROP TRIGGER IF EXISTS scoresInsert');
-		$pdo->exec('DROP TRIGGER IF EXISTS scoresUpdate');
+        $pdo->exec('DROP TRIGGER IF EXISTS scoresDelete');
+        $pdo->exec('DROP TRIGGER IF EXISTS scoresInsert');
+        $pdo->exec('DROP TRIGGER IF EXISTS scoresUpdate');
 
-		$pdo->exec('
-			CREATE TRIGGER scoresDelete AFTER DELETE ON scores
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
-				WHERE posts.id = OLD.postId;
+        $pdo->exec('
+            CREATE TRIGGER scoresDelete AFTER DELETE ON scores
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
+                WHERE posts.id = OLD.postId;
 
-				UPDATE comments SET
-					score = (SELECT SUM(score) FROM scores WHERE scores.commentId = comments.id)
-				WHERE comments.id = OLD.commentId;
-			END');
+                UPDATE comments SET
+                    score = (SELECT SUM(score) FROM scores WHERE scores.commentId = comments.id)
+                WHERE comments.id = OLD.commentId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER scoresInsert AFTER INSERT ON scores
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
-				WHERE posts.id = NEW.postId;
+        $pdo->exec('
+            CREATE TRIGGER scoresInsert AFTER INSERT ON scores
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
+                WHERE posts.id = NEW.postId;
 
-				UPDATE comments SET
-					score = (SELECT SUM(score) FROM scores WHERE scores.commentId = comments.id)
-				WHERE comments.id = NEW.commentId;
-			END');
+                UPDATE comments SET
+                    score = (SELECT SUM(score) FROM scores WHERE scores.commentId = comments.id)
+                WHERE comments.id = NEW.commentId;
+            END');
 
-		$pdo->exec('
-			CREATE TRIGGER scoresUpdate AFTER UPDATE ON scores
-			FOR EACH ROW
-			BEGIN
-				UPDATE posts SET
-					score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
-				WHERE posts.id IN (OLD.postId, NEW.postId);
+        $pdo->exec('
+            CREATE TRIGGER scoresUpdate AFTER UPDATE ON scores
+            FOR EACH ROW
+            BEGIN
+                UPDATE posts SET
+                    score = (SELECT SUM(score) FROM scores WHERE scores.postId = posts.id)
+                WHERE posts.id IN (OLD.postId, NEW.postId);
 
-				UPDATE comments SET
-					score = (SELECT SUM(score) FROM scores WHERE scores.commentId = comments.id)
-				WHERE comments.id IN (OLD.commentId, NEW.commentId);
-			END');
-	}
+                UPDATE comments SET
+                    score = (SELECT SUM(score) FROM scores WHERE scores.commentId = comments.id)
+                WHERE comments.id IN (OLD.commentId, NEW.commentId);
+            END');
+    }
 }
 
diff --git a/src/Upgrades/Upgrade17.php b/src/Upgrades/Upgrade17.php
index 35fb5f73..5103cb81 100644
--- a/src/Upgrades/Upgrade17.php
+++ b/src/Upgrades/Upgrade17.php
@@ -4,11 +4,11 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade17 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('ALTER TABLE users ADD COLUMN passwordSalt VARCHAR(32)');
-		$pdo->exec('UPDATE users SET passwordSalt = "/"');
-	}
+        $pdo->exec('ALTER TABLE users ADD COLUMN passwordSalt VARCHAR(32)');
+        $pdo->exec('UPDATE users SET passwordSalt = "/"');
+    }
 }
diff --git a/src/Upgrades/Upgrade18.php b/src/Upgrades/Upgrade18.php
index afb5f205..9acf66b7 100644
--- a/src/Upgrades/Upgrade18.php
+++ b/src/Upgrades/Upgrade18.php
@@ -4,10 +4,10 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade18 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('ALTER TABLE tags ADD COLUMN creationTime TIMESTAMP NOT NULL DEFAULT 0');
-	}
+        $pdo->exec('ALTER TABLE tags ADD COLUMN creationTime TIMESTAMP NOT NULL DEFAULT 0');
+    }
 }
diff --git a/src/Upgrades/Upgrade19.php b/src/Upgrades/Upgrade19.php
index 02752275..5c783149 100644
--- a/src/Upgrades/Upgrade19.php
+++ b/src/Upgrades/Upgrade19.php
@@ -4,10 +4,10 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade19 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('ALTER TABLE posts ADD COLUMN flags INT(8) NOT NULL DEFAULT 0');
-	}
+        $pdo->exec('ALTER TABLE posts ADD COLUMN flags INT(8) NOT NULL DEFAULT 0');
+    }
 }
diff --git a/src/Upgrades/Upgrade20.php b/src/Upgrades/Upgrade20.php
index 16a4616c..c1152c91 100644
--- a/src/Upgrades/Upgrade20.php
+++ b/src/Upgrades/Upgrade20.php
@@ -4,9 +4,9 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade20 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$pdo->exec('CREATE INDEX idx_postTags_tagId ON postTags(tagId)');
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $pdo->exec('CREATE INDEX idx_postTags_tagId ON postTags(tagId)');
+    }
 }
diff --git a/src/Upgrades/Upgrade21.php b/src/Upgrades/Upgrade21.php
index b489731c..ceb0e9a9 100644
--- a/src/Upgrades/Upgrade21.php
+++ b/src/Upgrades/Upgrade21.php
@@ -4,9 +4,9 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade21 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$pdo->exec('UPDATE users SET accessRank = accessRank + 1 WHERE accessRank > 1');
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $pdo->exec('UPDATE users SET accessRank = accessRank + 1 WHERE accessRank > 1');
+    }
 }
diff --git a/src/Upgrades/Upgrade22.php b/src/Upgrades/Upgrade22.php
index 44410d71..b864c74f 100644
--- a/src/Upgrades/Upgrade22.php
+++ b/src/Upgrades/Upgrade22.php
@@ -4,33 +4,33 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade22 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec('
-			CREATE TABLE snapshots2 (
-					id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-					time DATETIME NOT NULL,
-					type INTEGER NOT NULL,
-					primaryKey INTEGER NOT NULL,
-					operation INTEGER NOT NULL,
-					userId INTEGER DEFAULT NULL,
-					data BLOB,
-					dataDifference BLOB)');
+        $pdo->exec('
+            CREATE TABLE snapshots2 (
+                    id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                    time DATETIME NOT NULL,
+                    type INTEGER NOT NULL,
+                    primaryKey INTEGER NOT NULL,
+                    operation INTEGER NOT NULL,
+                    userId INTEGER DEFAULT NULL,
+                    data BLOB,
+                    dataDifference BLOB)');
 
-		$pdo->exec('
-			INSERT INTO snapshots2
-				(id, time, type, primaryKey, operation, userId, data, dataDifference)
-			SELECT
-				id, time, type, primaryKey, operation, userId, data, dataDifference
-			FROM snapshots');
+        $pdo->exec('
+            INSERT INTO snapshots2
+                (id, time, type, primaryKey, operation, userId, data, dataDifference)
+            SELECT
+                id, time, type, primaryKey, operation, userId, data, dataDifference
+            FROM snapshots');
 
-		$pdo->exec('DROP TABLE snapshots');
-		$pdo->exec('ALTER TABLE snapshots2 RENAME TO snapshots');
+        $pdo->exec('DROP TABLE snapshots');
+        $pdo->exec('ALTER TABLE snapshots2 RENAME TO snapshots');
 
-		$pdo->exec('CREATE INDEX idx_snapshots_time ON snapshots(time)');
-		$pdo->exec('CREATE INDEX idx_snapshots_typePK ON snapshots(type, primaryKey)');
-	}
+        $pdo->exec('CREATE INDEX idx_snapshots_time ON snapshots(time)');
+        $pdo->exec('CREATE INDEX idx_snapshots_typePK ON snapshots(type, primaryKey)');
+    }
 }
diff --git a/src/Upgrades/Upgrade23.php b/src/Upgrades/Upgrade23.php
index a0b0ef1a..1fbccdf1 100644
--- a/src/Upgrades/Upgrade23.php
+++ b/src/Upgrades/Upgrade23.php
@@ -5,18 +5,18 @@ use Szurubooru\Services\TagService;
 
 class Upgrade23 implements IUpgrade
 {
-	private $tagService;
+    private $tagService;
 
-	public function __construct(TagService $tagService)
-	{
-		$this->tagService = $tagService;
-	}
+    public function __construct(TagService $tagService)
+    {
+        $this->tagService = $tagService;
+    }
 
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$pdo->exec('ALTER TABLE tags ADD COLUMN banned BOOLEAN NOT NULL DEFAULT 0');
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $pdo->exec('ALTER TABLE tags ADD COLUMN banned BOOLEAN NOT NULL DEFAULT 0');
 
-		$this->tagService->exportJson();
-	}
+        $this->tagService->exportJson();
+    }
 }
diff --git a/src/Upgrades/Upgrade24.php b/src/Upgrades/Upgrade24.php
index 67b4dad9..6d36e7ed 100644
--- a/src/Upgrades/Upgrade24.php
+++ b/src/Upgrades/Upgrade24.php
@@ -4,18 +4,18 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade24 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec(
-			'CREATE TABLE tagRelations (
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				tag1id INTEGER NOT NULL,
-				tag2id INTEGER NOT NULL,
-				type INTEGER(2) NOT NULL,
-				UNIQUE (tag1id, tag2id, type)
-			)');
-	}
+        $pdo->exec(
+            'CREATE TABLE tagRelations (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                tag1id INTEGER NOT NULL,
+                tag2id INTEGER NOT NULL,
+                type INTEGER(2) NOT NULL,
+                UNIQUE (tag1id, tag2id, type)
+            )');
+    }
 }
diff --git a/src/Upgrades/Upgrade25.php b/src/Upgrades/Upgrade25.php
index ee3ef53d..1a32258a 100644
--- a/src/Upgrades/Upgrade25.php
+++ b/src/Upgrades/Upgrade25.php
@@ -4,9 +4,9 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade25 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$pdo->exec('ALTER TABLE tags ADD COLUMN category VARCHAR(25)');
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $pdo->exec('ALTER TABLE tags ADD COLUMN category VARCHAR(25)');
+    }
 }
diff --git a/src/Upgrades/Upgrade26.php b/src/Upgrades/Upgrade26.php
index 9d14f159..47b0bbfd 100644
--- a/src/Upgrades/Upgrade26.php
+++ b/src/Upgrades/Upgrade26.php
@@ -4,10 +4,10 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade26 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$pdo->exec('CREATE INDEX idx_scores_commentId ON scores(commentId)');
-		$pdo->exec('CREATE INDEX idx_scores_postId ON scores(postId)');
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $pdo->exec('CREATE INDEX idx_scores_commentId ON scores(commentId)');
+        $pdo->exec('CREATE INDEX idx_scores_postId ON scores(postId)');
+    }
 }
diff --git a/src/Upgrades/Upgrade27.php b/src/Upgrades/Upgrade27.php
index 9161c729..6a260cde 100644
--- a/src/Upgrades/Upgrade27.php
+++ b/src/Upgrades/Upgrade27.php
@@ -4,20 +4,20 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade27 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$driver = $databaseConnection->getDriver();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $driver = $databaseConnection->getDriver();
 
-		$pdo->exec(
-			'CREATE TABLE postNotes (
-				id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
-				postId INTEGER NOT NULL,
-				x DECIMAL(6,2) NOT NULL,
-				y DECIMAL(6,2) NOT NULL,
-				height DECIMAL(6,2) NOT NULL,
-				width DECIMAL(6,2) NOT NULL,
-				text TEXT NOT NULL
-			)');
-	}
+        $pdo->exec(
+            'CREATE TABLE postNotes (
+                id INTEGER PRIMARY KEY ' . ($driver === 'mysql' ? 'AUTO_INCREMENT' : 'AUTOINCREMENT') . ',
+                postId INTEGER NOT NULL,
+                x DECIMAL(6,2) NOT NULL,
+                y DECIMAL(6,2) NOT NULL,
+                height DECIMAL(6,2) NOT NULL,
+                width DECIMAL(6,2) NOT NULL,
+                text TEXT NOT NULL
+            )');
+    }
 }
diff --git a/src/Upgrades/Upgrade28.php b/src/Upgrades/Upgrade28.php
index a2eb9bef..bcda12ba 100644
--- a/src/Upgrades/Upgrade28.php
+++ b/src/Upgrades/Upgrade28.php
@@ -4,9 +4,9 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade28 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$pdo->exec('CREATE INDEX idx_comments_postId ON comments(postId)');
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $pdo->exec('CREATE INDEX idx_comments_postId ON comments(postId)');
+    }
 }
diff --git a/src/Upgrades/Upgrade29.php b/src/Upgrades/Upgrade29.php
index 092b81cc..e2e39f5a 100644
--- a/src/Upgrades/Upgrade29.php
+++ b/src/Upgrades/Upgrade29.php
@@ -6,20 +6,20 @@ use Szurubooru\Services\TagHistoryService;
 
 class Upgrade29 implements IUpgrade
 {
-	private $tagDao;
-	private $tagHistoryService;
+    private $tagDao;
+    private $tagHistoryService;
 
-	public function __construct(TagDao $tagDao, TagHistoryService $tagHistoryService)
-	{
-		$this->tagDao = $tagDao;
-		$this->tagHistoryService = $tagHistoryService;
-	}
+    public function __construct(TagDao $tagDao, TagHistoryService $tagHistoryService)
+    {
+        $this->tagDao = $tagDao;
+        $this->tagHistoryService = $tagHistoryService;
+    }
 
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		foreach ($this->tagDao->findAll() as $tag)
-		{
-			$this->tagHistoryService->saveTagChange($tag);
-		}
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        foreach ($this->tagDao->findAll() as $tag)
+        {
+            $this->tagHistoryService->saveTagChange($tag);
+        }
+    }
 }
diff --git a/src/Upgrades/Upgrade30.php b/src/Upgrades/Upgrade30.php
index 396302c2..52f9951e 100644
--- a/src/Upgrades/Upgrade30.php
+++ b/src/Upgrades/Upgrade30.php
@@ -4,45 +4,45 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade30 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('
-			CREATE TABLE sequencer (
-				tableName VARCHAR(32) NOT NULL,
-				lastUsedId INT(11) NOT NULL DEFAULT 0
-			)');
+        $pdo->exec('
+            CREATE TABLE sequencer (
+                tableName VARCHAR(32) NOT NULL,
+                lastUsedId INT(11) NOT NULL DEFAULT 0
+            )');
 
-		$tables = [
-			'favorites',
-			'tags',
-			'comments',
-			'globals',
-			'postNotes',
-			'posts',
-			'scores',
-			'snapshots',
-			'tags',
-			'tokens',
-			'users'];
+        $tables = [
+            'favorites',
+            'tags',
+            'comments',
+            'globals',
+            'postNotes',
+            'posts',
+            'scores',
+            'snapshots',
+            'tags',
+            'tokens',
+            'users'];
 
-		foreach ($tables as $table)
-		{
-			$this->removeAutoIncrement($pdo, $table);
-			$this->createSequencer($pdo, $table);
-		}
-	}
+        foreach ($tables as $table)
+        {
+            $this->removeAutoIncrement($pdo, $table);
+            $this->createSequencer($pdo, $table);
+        }
+    }
 
-	private function removeAutoIncrement($pdo, $table)
-	{
-		$pdo->exec('ALTER TABLE ' . $table . ' CHANGE id id INT(11) UNSIGNED NOT NULL');
-	}
+    private function removeAutoIncrement($pdo, $table)
+    {
+        $pdo->exec('ALTER TABLE ' . $table . ' CHANGE id id INT(11) UNSIGNED NOT NULL');
+    }
 
-	private function createSequencer($pdo, $table)
-	{
-		$pdo->exec(sprintf('
-			INSERT INTO sequencer (tableName, lastUsedId)
-			VALUES (\'%s\', IFNULL((SELECT MAX(id) FROM %s), 0))', $table, $table));
-	}
+    private function createSequencer($pdo, $table)
+    {
+        $pdo->exec(sprintf('
+            INSERT INTO sequencer (tableName, lastUsedId)
+            VALUES (\'%s\', IFNULL((SELECT MAX(id) FROM %s), 0))', $table, $table));
+    }
 }
diff --git a/src/Upgrades/Upgrade31.php b/src/Upgrades/Upgrade31.php
index a909db94..f25167db 100644
--- a/src/Upgrades/Upgrade31.php
+++ b/src/Upgrades/Upgrade31.php
@@ -4,21 +4,21 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade31 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		foreach (array_chunk(iterator_to_array($pdo->from('snapshots')), 100) as $chunk)
-		{
-			$pdo->beginTransaction();
-			foreach ($chunk as $array)
-			{
-				$pdo->update('snapshots')->set([
-					'data' => json_encode(unserialize($array['data'])),
-					'dataDifference' => json_encode(unserialize($array['dataDifference']))
-				])->where('id', $array['id'])->execute();
-			}
-			$pdo->commit();
-		}
-	}
+        foreach (array_chunk(iterator_to_array($pdo->from('snapshots')), 100) as $chunk)
+        {
+            $pdo->beginTransaction();
+            foreach ($chunk as $array)
+            {
+                $pdo->update('snapshots')->set([
+                    'data' => json_encode(unserialize($array['data'])),
+                    'dataDifference' => json_encode(unserialize($array['dataDifference']))
+                ])->where('id', $array['id'])->execute();
+            }
+            $pdo->commit();
+        }
+    }
 }
diff --git a/src/Upgrades/Upgrade32.php b/src/Upgrades/Upgrade32.php
index 4d2a2a6c..6234cbf0 100644
--- a/src/Upgrades/Upgrade32.php
+++ b/src/Upgrades/Upgrade32.php
@@ -4,16 +4,16 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade32 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('
-			UPDATE snapshots SET
-				data = REPLACE(data, \'"category":null\', \'"category":"default"\'),
-				dataDifference = REPLACE(dataDifference, \'"category",null\', \'"category","default"\')');
+        $pdo->exec('
+            UPDATE snapshots SET
+                data = REPLACE(data, \'"category":null\', \'"category":"default"\'),
+                dataDifference = REPLACE(dataDifference, \'"category",null\', \'"category","default"\')');
 
-		$pdo->exec('UPDATE tags SET category = \'default\' WHERE category IS NULL');
-		$pdo->exec('ALTER TABLE tags CHANGE category category VARCHAR(25) NOT NULL DEFAULT \'default\'');
-	}
+        $pdo->exec('UPDATE tags SET category = \'default\' WHERE category IS NULL');
+        $pdo->exec('ALTER TABLE tags CHANGE category category VARCHAR(25) NOT NULL DEFAULT \'default\'');
+    }
 }
diff --git a/src/Upgrades/Upgrade33.php b/src/Upgrades/Upgrade33.php
index 27755749..96b40049 100644
--- a/src/Upgrades/Upgrade33.php
+++ b/src/Upgrades/Upgrade33.php
@@ -4,16 +4,16 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade33 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('UPDATE snapshots SET operation = 2 WHERE operation = 1');
-		$pdo->exec('UPDATE snapshots SET operation = 1 WHERE operation = 0');
-		$pdo->exec('CREATE INDEX tempIndex ON snapshots(primaryKey)');
-		$pdo->exec('CREATE TABLE tempTable AS SELECT MIN(id) AS id FROM snapshots GROUP BY type, primaryKey');
-		$pdo->exec('DROP INDEX tempIndex ON snapshots');
-		$pdo->exec('UPDATE snapshots SET operation = 0 WHERE id IN (SELECT id FROM tempTable)');
-		$pdo->exec('DROP TABLE tempTable');
-	}
+        $pdo->exec('UPDATE snapshots SET operation = 2 WHERE operation = 1');
+        $pdo->exec('UPDATE snapshots SET operation = 1 WHERE operation = 0');
+        $pdo->exec('CREATE INDEX tempIndex ON snapshots(primaryKey)');
+        $pdo->exec('CREATE TABLE tempTable AS SELECT MIN(id) AS id FROM snapshots GROUP BY type, primaryKey');
+        $pdo->exec('DROP INDEX tempIndex ON snapshots');
+        $pdo->exec('UPDATE snapshots SET operation = 0 WHERE id IN (SELECT id FROM tempTable)');
+        $pdo->exec('DROP TABLE tempTable');
+    }
 }
diff --git a/src/Upgrades/Upgrade34.php b/src/Upgrades/Upgrade34.php
index 0328acfa..145d68b0 100644
--- a/src/Upgrades/Upgrade34.php
+++ b/src/Upgrades/Upgrade34.php
@@ -4,40 +4,40 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade34 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$pdo->exec('ALTER TABLE snapshots CHANGE operation operation INT(1) NOT NULL');
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $pdo->exec('ALTER TABLE snapshots CHANGE operation operation INT(1) NOT NULL');
 
-		foreach ($pdo->from('snapshots') as $row)
-		{
-			$newDifference = ['+' => [], '-' => []];
-			$oldDifference = json_decode($row['dataDifference'], true);
-			foreach (['+', '-'] as $type)
-			{
-				foreach ($oldDifference[$type] as $item)
-				{
-					$target = &$newDifference[$type][$item[0]];
-					if (isset($target))
-					{
-						if (!is_array($target))
-							$target = [$target];
-						$target []= $item[1];
-					}
-					else
-					{
-						$target = $item[1];
-					}
-				}
-			}
-			$newDifference = json_encode($newDifference);
+        foreach ($pdo->from('snapshots') as $row)
+        {
+            $newDifference = ['+' => [], '-' => []];
+            $oldDifference = json_decode($row['dataDifference'], true);
+            foreach (['+', '-'] as $type)
+            {
+                foreach ($oldDifference[$type] as $item)
+                {
+                    $target = &$newDifference[$type][$item[0]];
+                    if (isset($target))
+                    {
+                        if (!is_array($target))
+                            $target = [$target];
+                        $target []= $item[1];
+                    }
+                    else
+                    {
+                        $target = $item[1];
+                    }
+                }
+            }
+            $newDifference = json_encode($newDifference);
 
-			$pdo->update('snapshots')
-				->set([
-					'data' => gzdeflate($row['data']),
-					'dataDifference' => gzdeflate($newDifference)])
-				->where('id', $row['id'])
-				->execute();
-		}
-	}
+            $pdo->update('snapshots')
+                ->set([
+                    'data' => gzdeflate($row['data']),
+                    'dataDifference' => gzdeflate($newDifference)])
+                ->where('id', $row['id'])
+                ->execute();
+        }
+    }
 }
diff --git a/src/Upgrades/Upgrade35.php b/src/Upgrades/Upgrade35.php
index 12aceee0..c606f653 100644
--- a/src/Upgrades/Upgrade35.php
+++ b/src/Upgrades/Upgrade35.php
@@ -4,96 +4,96 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade35 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
-		$this->removeOrphans($pdo);
-		$this->addPostForeignKeys($pdo);
-		$this->addTagForeignKeys($pdo);
-		$this->addUserForeignKeys($pdo);
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $this->removeOrphans($pdo);
+        $this->addPostForeignKeys($pdo);
+        $this->addTagForeignKeys($pdo);
+        $this->addUserForeignKeys($pdo);
+    }
 
-	private function addPostForeignKeys($pdo)
-	{
-		$pdo->exec('ALTER TABLE favorites MODIFY postId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE favorites ADD FOREIGN KEY (postId) REFERENCES posts(id) ON DELETE CASCADE');
+    private function addPostForeignKeys($pdo)
+    {
+        $pdo->exec('ALTER TABLE favorites MODIFY postId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE favorites ADD FOREIGN KEY (postId) REFERENCES posts(id) ON DELETE CASCADE');
 
-		$pdo->exec('ALTER TABLE postNotes MODIFY postId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE postNotes ADD FOREIGN KEY (postId) REFERENCES posts(id) ON DELETE CASCADE');
+        $pdo->exec('ALTER TABLE postNotes MODIFY postId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE postNotes ADD FOREIGN KEY (postId) REFERENCES posts(id) ON DELETE CASCADE');
 
-		$pdo->exec('ALTER TABLE postRelations MODIFY post1id INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE postRelations MODIFY post2id INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE postRelations ADD FOREIGN KEY (post1id) REFERENCES posts(id) ON DELETE CASCADE');
-		$pdo->exec('ALTER TABLE postRelations ADD FOREIGN KEY (post2id) REFERENCES posts(id) ON DELETE CASCADE');
+        $pdo->exec('ALTER TABLE postRelations MODIFY post1id INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE postRelations MODIFY post2id INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE postRelations ADD FOREIGN KEY (post1id) REFERENCES posts(id) ON DELETE CASCADE');
+        $pdo->exec('ALTER TABLE postRelations ADD FOREIGN KEY (post2id) REFERENCES posts(id) ON DELETE CASCADE');
 
-		$pdo->exec('ALTER TABLE postTags MODIFY postId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE postTags ADD FOREIGN KEY (postId) REFERENCES posts(id) ON DELETE CASCADE');
+        $pdo->exec('ALTER TABLE postTags MODIFY postId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE postTags ADD FOREIGN KEY (postId) REFERENCES posts(id) ON DELETE CASCADE');
 
-		$pdo->exec('ALTER TABLE scores MODIFY postId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE scores ADD FOREIGN KEY (postId) REFERENCES posts(id) ON DELETE CASCADE');
-	}
+        $pdo->exec('ALTER TABLE scores MODIFY postId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE scores ADD FOREIGN KEY (postId) REFERENCES posts(id) ON DELETE CASCADE');
+    }
 
-	private function addTagForeignKeys($pdo)
-	{
-		$pdo->exec('ALTER TABLE tagRelations MODIFY tag1id INT(11) UNSIGNED NOT NULL');
-		$pdo->exec('ALTER TABLE tagRelations MODIFY tag2id INT(11) UNSIGNED NOT NULL');
-		$pdo->exec('ALTER TABLE tagRelations ADD FOREIGN KEY (tag1id) REFERENCES tags(id) ON DELETE CASCADE');
-		$pdo->exec('ALTER TABLE tagRelations ADD FOREIGN KEY (tag2id) REFERENCES tags(id) ON DELETE CASCADE');
+    private function addTagForeignKeys($pdo)
+    {
+        $pdo->exec('ALTER TABLE tagRelations MODIFY tag1id INT(11) UNSIGNED NOT NULL');
+        $pdo->exec('ALTER TABLE tagRelations MODIFY tag2id INT(11) UNSIGNED NOT NULL');
+        $pdo->exec('ALTER TABLE tagRelations ADD FOREIGN KEY (tag1id) REFERENCES tags(id) ON DELETE CASCADE');
+        $pdo->exec('ALTER TABLE tagRelations ADD FOREIGN KEY (tag2id) REFERENCES tags(id) ON DELETE CASCADE');
 
-		$pdo->exec('ALTER TABLE postTags MODIFY tagId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE postTags ADD FOREIGN KEY (tagId) REFERENCES tags(id) ON DELETE CASCADE');
-	}
+        $pdo->exec('ALTER TABLE postTags MODIFY tagId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE postTags ADD FOREIGN KEY (tagId) REFERENCES tags(id) ON DELETE CASCADE');
+    }
 
-	private function addUserForeignKeys($pdo)
-	{
-		$pdo->exec('ALTER TABLE comments MODIFY userId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE comments ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE SET NULL');
+    private function addUserForeignKeys($pdo)
+    {
+        $pdo->exec('ALTER TABLE comments MODIFY userId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE comments ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE SET NULL');
 
-		$pdo->exec('ALTER TABLE favorites MODIFY userId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE favorites ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE CASCADE');
+        $pdo->exec('ALTER TABLE favorites MODIFY userId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE favorites ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE CASCADE');
 
-		$pdo->exec('ALTER TABLE posts MODIFY userId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE posts ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE SET NULL');
+        $pdo->exec('ALTER TABLE posts MODIFY userId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE posts ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE SET NULL');
 
-		$pdo->exec('ALTER TABLE scores MODIFY userId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE scores ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE CASCADE');
+        $pdo->exec('ALTER TABLE scores MODIFY userId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE scores ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE CASCADE');
 
-		$pdo->exec('ALTER TABLE snapshots MODIFY userId INT(11) UNSIGNED');
-		$pdo->exec('ALTER TABLE snapshots ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE SET NULL');
-	}
+        $pdo->exec('ALTER TABLE snapshots MODIFY userId INT(11) UNSIGNED');
+        $pdo->exec('ALTER TABLE snapshots ADD FOREIGN KEY (userId) REFERENCES users(id) ON DELETE SET NULL');
+    }
 
-	private function removeOrphans($pdo)
-	{
-		$pdo->exec('
-			CREATE TEMPORARY TABLE tempTable
-				(SELECT postId FROM postTags WHERE
-					(SELECT COUNT(1) FROM posts WHERE posts.id = postId) = 0)');
-		$pdo->exec(
-			'DELETE FROM postTags WHERE EXISTS (SELECT 1 FROM tempTable WHERE tempTable.postId = postTags.postId)');
-		$pdo->exec('DROP TABLE tempTable');
+    private function removeOrphans($pdo)
+    {
+        $pdo->exec('
+            CREATE TEMPORARY TABLE tempTable
+                (SELECT postId FROM postTags WHERE
+                    (SELECT COUNT(1) FROM posts WHERE posts.id = postId) = 0)');
+        $pdo->exec(
+            'DELETE FROM postTags WHERE EXISTS (SELECT 1 FROM tempTable WHERE tempTable.postId = postTags.postId)');
+        $pdo->exec('DROP TABLE tempTable');
 
-		$pdo->exec('
-			CREATE TEMPORARY TABLE tempTable
-				(SELECT postId FROM scores WHERE
-					(SELECT COUNT(1) FROM posts WHERE posts.id = postId) = 0)');
-		$pdo->exec(
-			'DELETE FROM scores WHERE EXISTS (SELECT 1 FROM tempTable WHERE tempTable.postId = scores.postId)');
-		$pdo->exec('DROP TABLE tempTable');
+        $pdo->exec('
+            CREATE TEMPORARY TABLE tempTable
+                (SELECT postId FROM scores WHERE
+                    (SELECT COUNT(1) FROM posts WHERE posts.id = postId) = 0)');
+        $pdo->exec(
+            'DELETE FROM scores WHERE EXISTS (SELECT 1 FROM tempTable WHERE tempTable.postId = scores.postId)');
+        $pdo->exec('DROP TABLE tempTable');
 
-		$pdo->exec('
-			DELETE FROM favorites
-			WHERE (SELECT COUNT(1) FROM posts WHERE posts.id = postId) = 0');
+        $pdo->exec('
+            DELETE FROM favorites
+            WHERE (SELECT COUNT(1) FROM posts WHERE posts.id = postId) = 0');
 
-		$pdo->exec('
-			DELETE FROM postNotes
-			WHERE (SELECT COUNT(1) FROM posts WHERE posts.id = postId) = 0');
+        $pdo->exec('
+            DELETE FROM postNotes
+            WHERE (SELECT COUNT(1) FROM posts WHERE posts.id = postId) = 0');
 
-		$pdo->exec('
-			DELETE FROM postRelations
-			WHERE (SELECT COUNT(1) FROM posts WHERE (posts.id = post1id) OR (posts.id = post2id)) = 0');
+        $pdo->exec('
+            DELETE FROM postRelations
+            WHERE (SELECT COUNT(1) FROM posts WHERE (posts.id = post1id) OR (posts.id = post2id)) = 0');
 
-		$pdo->exec('
-			DELETE FROM tagRelations
-			WHERE (SELECT COUNT(1) FROM tags WHERE (tags.id = tag1id) OR (tags.id = tag2id)) = 0');
-	}
+        $pdo->exec('
+            DELETE FROM tagRelations
+            WHERE (SELECT COUNT(1) FROM tags WHERE (tags.id = tag1id) OR (tags.id = tag2id)) = 0');
+    }
 }
diff --git a/src/Upgrades/Upgrade36.php b/src/Upgrades/Upgrade36.php
index d2c0344e..2b2da7b2 100644
--- a/src/Upgrades/Upgrade36.php
+++ b/src/Upgrades/Upgrade36.php
@@ -4,13 +4,13 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade36 implements IUpgrade
 {
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$pdo = $databaseConnection->getPDO();
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
 
-		$pdo->exec('ALTER TABLE postNotes MODIFY x DOUBLE(7,3)');
-		$pdo->exec('ALTER TABLE postNotes MODIFY y DOUBLE(7,3)');
-		$pdo->exec('ALTER TABLE postNotes MODIFY width DOUBLE(7,3)');
-		$pdo->exec('ALTER TABLE postNotes MODIFY height DOUBLE(7,3)');
-	}
+        $pdo->exec('ALTER TABLE postNotes MODIFY x DOUBLE(7,3)');
+        $pdo->exec('ALTER TABLE postNotes MODIFY y DOUBLE(7,3)');
+        $pdo->exec('ALTER TABLE postNotes MODIFY width DOUBLE(7,3)');
+        $pdo->exec('ALTER TABLE postNotes MODIFY height DOUBLE(7,3)');
+    }
 }
diff --git a/src/Upgrades/Upgrade37.php b/src/Upgrades/Upgrade37.php
index 5d2f163f..463c1e55 100644
--- a/src/Upgrades/Upgrade37.php
+++ b/src/Upgrades/Upgrade37.php
@@ -5,24 +5,24 @@ use Szurubooru\DatabaseConnection;
 
 class Upgrade37 implements IUpgrade
 {
-	private $userDao;
+    private $userDao;
 
-	public function __construct(UserDao $userDao)
-	{
-		$this->userDao = $userDao;
-	}
+    public function __construct(UserDao $userDao)
+    {
+        $this->userDao = $userDao;
+    }
 
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		foreach ($this->userDao->findAll() as $user)
-		{
-			echo $user->getName() . PHP_EOL;
-			$browsingSettings = $user->getBrowsingSettings();
-			if ($browsingSettings === null)
-				$browsingSettings = new \StdClass;
-			$browsingSettings->keyboardShortcuts = true;
-			$user->setBrowsingSettings($browsingSettings);
-			$this->userDao->save($user);
-		}
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        foreach ($this->userDao->findAll() as $user)
+        {
+            echo $user->getName() . PHP_EOL;
+            $browsingSettings = $user->getBrowsingSettings();
+            if ($browsingSettings === null)
+                $browsingSettings = new \StdClass;
+            $browsingSettings->keyboardShortcuts = true;
+            $user->setBrowsingSettings($browsingSettings);
+            $this->userDao->save($user);
+        }
+    }
 }
diff --git a/src/Upgrades/Upgrade38.php b/src/Upgrades/Upgrade38.php
index da648493..e028fcbf 100644
--- a/src/Upgrades/Upgrade38.php
+++ b/src/Upgrades/Upgrade38.php
@@ -8,45 +8,45 @@ use Szurubooru\Helpers\MimeHelper;
 
 class Upgrade38 implements IUpgrade
 {
-	private $postDao;
-	private $fileDao;
+    private $postDao;
+    private $fileDao;
 
-	public function __construct(
-		PostDao $postDao,
-		PublicFileDao $fileDao)
-	{
-		$this->postDao = $postDao;
-		$this->fileDao = $fileDao;
-	}
+    public function __construct(
+        PostDao $postDao,
+        PublicFileDao $fileDao)
+    {
+        $this->postDao = $postDao;
+        $this->fileDao = $fileDao;
+    }
 
-	public function run(DatabaseConnection $databaseConnection)
-	{
-		$posts = $this->postDao->findAll();
-		$progress = 0;
-		foreach ($posts as $post)
-		{
-			if ($post->getContentType() === Post::POST_TYPE_IMAGE)
-			{
-				$fullPath = $this->fileDao->getFullPath($post->getContentPath());
-				try
-				{
-					$contents = file_get_contents($fullPath);
-				}
-				catch (\Exception $e)
-				{
-					continue;
-				}
-				if (MimeHelper::isBufferAnimatedGif($contents))
-				{
-					$post->setContentType(Post::POST_TYPE_ANIMATED_IMAGE);
-					$this->postDao->save($post);
-				}
-				if (++ $progress == 100)
-				{
-					echo '.';
-					$progress = 0;
-				}
-			}
-		}
-	}
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $posts = $this->postDao->findAll();
+        $progress = 0;
+        foreach ($posts as $post)
+        {
+            if ($post->getContentType() === Post::POST_TYPE_IMAGE)
+            {
+                $fullPath = $this->fileDao->getFullPath($post->getContentPath());
+                try
+                {
+                    $contents = file_get_contents($fullPath);
+                }
+                catch (\Exception $e)
+                {
+                    continue;
+                }
+                if (MimeHelper::isBufferAnimatedGif($contents))
+                {
+                    $post->setContentType(Post::POST_TYPE_ANIMATED_IMAGE);
+                    $this->postDao->save($post);
+                }
+                if (++ $progress == 100)
+                {
+                    echo '.';
+                    $progress = 0;
+                }
+            }
+        }
+    }
 }
diff --git a/src/Upgrades/UpgradeRepository.php b/src/Upgrades/UpgradeRepository.php
index fcf9f9b5..efc9f41d 100644
--- a/src/Upgrades/UpgradeRepository.php
+++ b/src/Upgrades/UpgradeRepository.php
@@ -3,15 +3,15 @@ namespace Szurubooru\Upgrades;
 
 class UpgradeRepository
 {
-	private $upgrades = [];
+    private $upgrades = [];
 
-	public function __construct(array $upgrades)
-	{
-		$this->upgrades = $upgrades;
-	}
+    public function __construct(array $upgrades)
+    {
+        $this->upgrades = $upgrades;
+    }
 
-	public function getUpgrades()
-	{
-		return $this->upgrades;
-	}
+    public function getUpgrades()
+    {
+        return $this->upgrades;
+    }
 }
diff --git a/src/Validator.php b/src/Validator.php
index 8bd7c651..421b78a7 100644
--- a/src/Validator.php
+++ b/src/Validator.php
@@ -5,131 +5,131 @@ use Szurubooru\IValidatable;
 
 class Validator
 {
-	private $config;
+    private $config;
 
-	public function __construct(Config $config)
-	{
-		$this->config = $config;
-	}
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
 
-	public function validate(IValidatable $validatable)
-	{
-		$validatable->validate($this);
-	}
+    public function validate(IValidatable $validatable)
+    {
+        $validatable->validate($this);
+    }
 
-	public function validateNumber($subject)
-	{
-		if (!preg_match('/^-?[0-9]+$/', $subject))
-			throw new \DomainException($subject . ' does not look like a number.');
-	}
+    public function validateNumber($subject)
+    {
+        if (!preg_match('/^-?[0-9]+$/', $subject))
+            throw new \DomainException($subject . ' does not look like a number.');
+    }
 
-	public function validateNonEmpty($subject, $subjectName = 'Object')
-	{
-		if (!$subject)
-			throw new \DomainException($subjectName . ' cannot be empty.');
-	}
+    public function validateNonEmpty($subject, $subjectName = 'Object')
+    {
+        if (!$subject)
+            throw new \DomainException($subjectName . ' cannot be empty.');
+    }
 
-	public function validateLength($subject, $minLength, $maxLength, $subjectName = 'Object')
-	{
-		$this->validateMinLength($subject, $minLength, $subjectName);
-		$this->validateMaxLength($subject, $maxLength, $subjectName);
-	}
+    public function validateLength($subject, $minLength, $maxLength, $subjectName = 'Object')
+    {
+        $this->validateMinLength($subject, $minLength, $subjectName);
+        $this->validateMaxLength($subject, $maxLength, $subjectName);
+    }
 
-	public function validateMinLength($subject, $minLength, $subjectName = 'Object')
-	{
-		if (strlen($subject) < $minLength)
-			throw new \DomainException($subjectName . ' must have at least ' . $minLength . ' character(s).');
-	}
+    public function validateMinLength($subject, $minLength, $subjectName = 'Object')
+    {
+        if (strlen($subject) < $minLength)
+            throw new \DomainException($subjectName . ' must have at least ' . $minLength . ' character(s).');
+    }
 
-	public function validateMaxLength($subject, $maxLength, $subjectName = 'Object')
-	{
-		if (strlen($subject) > $maxLength)
-			throw new \DomainException($subjectName . ' must have at most ' . $maxLength . ' character(s).');
-	}
+    public function validateMaxLength($subject, $maxLength, $subjectName = 'Object')
+    {
+        if (strlen($subject) > $maxLength)
+            throw new \DomainException($subjectName . ' must have at most ' . $maxLength . ' character(s).');
+    }
 
-	public function validateUserName($userName)
-	{
-		$minUserNameLength = intval($this->config->users->minUserNameLength);
-		$maxUserNameLength = intval($this->config->users->maxUserNameLength);
-		$this->validateNonEmpty($userName, 'User name');
-		$this->validateLength($userName, $minUserNameLength, $maxUserNameLength, 'User name');
+    public function validateUserName($userName)
+    {
+        $minUserNameLength = intval($this->config->users->minUserNameLength);
+        $maxUserNameLength = intval($this->config->users->maxUserNameLength);
+        $this->validateNonEmpty($userName, 'User name');
+        $this->validateLength($userName, $minUserNameLength, $maxUserNameLength, 'User name');
 
-		if (preg_match('/[^a-zA-Z0-9_-]/', $userName))
-		{
-			throw new \DomainException('User name may contain only characters, numbers, underscore (_) and dash (-).');
-		}
-	}
+        if (preg_match('/[^a-zA-Z0-9_-]/', $userName))
+        {
+            throw new \DomainException('User name may contain only characters, numbers, underscore (_) and dash (-).');
+        }
+    }
 
-	public function validateEmail($email)
-	{
-		if (!$email)
-			return;
+    public function validateEmail($email)
+    {
+        if (!$email)
+            return;
 
-		if (!preg_match('/^[^@]+@[^@]+\.\w+$/', $email))
-			throw new \DomainException('Specified e-mail appears to be invalid.');
-	}
+        if (!preg_match('/^[^@]+@[^@]+\.\w+$/', $email))
+            throw new \DomainException('Specified e-mail appears to be invalid.');
+    }
 
-	public function validatePassword($password)
-	{
-		$minPasswordLength = intval($this->config->security->minPasswordLength);
-		$this->validateNonEmpty($password, 'Password');
-		$this->validateMinLength($password, $minPasswordLength, 'Password');
+    public function validatePassword($password)
+    {
+        $minPasswordLength = intval($this->config->security->minPasswordLength);
+        $this->validateNonEmpty($password, 'Password');
+        $this->validateMinLength($password, $minPasswordLength, 'Password');
 
-		if (preg_match('/[^\x20-\x7f]/', $password))
-		{
-			throw new \DomainException(
-				'Password may contain only characters from ASCII range to avoid potential problems with encoding.');
-		}
-	}
+        if (preg_match('/[^\x20-\x7f]/', $password))
+        {
+            throw new \DomainException(
+                'Password may contain only characters from ASCII range to avoid potential problems with encoding.');
+        }
+    }
 
-	public function validatePostTags($tags)
-	{
-		if (empty($tags))
-			throw new \DomainException('Tags cannot be empty.');
+    public function validatePostTags($tags)
+    {
+        if (empty($tags))
+            throw new \DomainException('Tags cannot be empty.');
 
-		//<> causes HTML injection and problems with Markdown.
-		//\/?& causes problems with URLs.
-		//#; causes problems with search argument parsing in JS frontend.
-		//whitespace causes problems with search.
-		$illegalCharacters = str_split("<>#;\\/?&\r\n\t " . chr(160));
-		foreach ($tags as $tag)
-		{
-			if (empty($tag))
-				throw new \DomainException('Tags cannot be empty.');
+        //<> causes HTML injection and problems with Markdown.
+        //\/?& causes problems with URLs.
+        //#; causes problems with search argument parsing in JS frontend.
+        //whitespace causes problems with search.
+        $illegalCharacters = str_split("<>#;\\/?&\r\n\t " . chr(160));
+        foreach ($tags as $tag)
+        {
+            if (empty($tag))
+                throw new \DomainException('Tags cannot be empty.');
 
-			//: causes problems with complex search (e.g. id:5).
-			if (strpos($tag, ':') > 0)
-				throw new \DomainException('Colon in tag may appear only at the beginning.');
+            //: causes problems with complex search (e.g. id:5).
+            if (strpos($tag, ':') > 0)
+                throw new \DomainException('Colon in tag may appear only at the beginning.');
 
-			$this->validateMaxLength($tag, 64, 'Tag');
+            $this->validateMaxLength($tag, 64, 'Tag');
 
-			foreach ($illegalCharacters as $char)
-			{
-				if (strpos($tag, $char) !== false)
-				{
-					throw new \DomainException(
-						sprintf('Tags cannot contain any of following characters: %s.',
-						implode(', ', array_map(function($char)
-							{
-								if ($char === "\n") return "new line";
-								if ($char === "\r") return "carriage return";
-								if ($char === "\t") return "tab";
-								if ($char === " ") return "space";
-								if ($char === chr(160)) return "hard space";
-								return $char;
-							}, $illegalCharacters))));
-				}
-			}
-		}
-	}
+            foreach ($illegalCharacters as $char)
+            {
+                if (strpos($tag, $char) !== false)
+                {
+                    throw new \DomainException(
+                        sprintf('Tags cannot contain any of following characters: %s.',
+                        implode(', ', array_map(function($char)
+                            {
+                                if ($char === "\n") return "new line";
+                                if ($char === "\r") return "carriage return";
+                                if ($char === "\t") return "tab";
+                                if ($char === " ") return "space";
+                                if ($char === chr(160)) return "hard space";
+                                return $char;
+                            }, $illegalCharacters))));
+                }
+            }
+        }
+    }
 
-	public function validatePostSource($source)
-	{
-		$this->validateMaxLength($source, 200, 'Source');
-	}
+    public function validatePostSource($source)
+    {
+        $this->validateMaxLength($source, 200, 'Source');
+    }
 
-	public function validateToken($token)
-	{
-		$this->validateNonEmpty($token, 'Token');
-	}
+    public function validateToken($token)
+    {
+        $this->validateNonEmpty($token, 'Token');
+    }
 }
diff --git a/src/ViewProxies/AbstractViewProxy.php b/src/ViewProxies/AbstractViewProxy.php
index 3cb4cbde..728a6989 100644
--- a/src/ViewProxies/AbstractViewProxy.php
+++ b/src/ViewProxies/AbstractViewProxy.php
@@ -3,15 +3,15 @@ namespace Szurubooru\ViewProxies;
 
 abstract class AbstractViewProxy
 {
-	public abstract function fromEntity($entity, $config = []);
+    public abstract function fromEntity($entity, $config = []);
 
-	public function fromArray($entities, $config = [])
-	{
-		return array_values(array_map(
-			function($entity) use ($config)
-			{
-				return static::fromEntity($entity, $config);
-			},
-			$entities));
-	}
+    public function fromArray($entities, $config = [])
+    {
+        return array_values(array_map(
+            function($entity) use ($config)
+            {
+                return static::fromEntity($entity, $config);
+            },
+            $entities));
+    }
 }
diff --git a/src/ViewProxies/CommentViewProxy.php b/src/ViewProxies/CommentViewProxy.php
index ca63562e..505cff61 100644
--- a/src/ViewProxies/CommentViewProxy.php
+++ b/src/ViewProxies/CommentViewProxy.php
@@ -5,38 +5,38 @@ use Szurubooru\Services\ScoreService;
 
 class CommentViewProxy extends AbstractViewProxy
 {
-	private $authService;
-	private $scoreService;
-	private $userViewProxy;
+    private $authService;
+    private $scoreService;
+    private $userViewProxy;
 
-	const FETCH_OWN_SCORE = 'fetchOwnScore';
+    const FETCH_OWN_SCORE = 'fetchOwnScore';
 
-	public function __construct(
-		AuthService $authService,
-		ScoreService $scoreService,
-		UserViewProxy $userViewProxy)
-	{
-		$this->authService = $authService;
-		$this->scoreService = $scoreService;
-		$this->userViewProxy = $userViewProxy;
-	}
+    public function __construct(
+        AuthService $authService,
+        ScoreService $scoreService,
+        UserViewProxy $userViewProxy)
+    {
+        $this->authService = $authService;
+        $this->scoreService = $scoreService;
+        $this->userViewProxy = $userViewProxy;
+    }
 
-	public function fromEntity($comment, $config = [])
-	{
-		$result = new \StdClass;
-		if ($comment)
-		{
-			$result->id = $comment->getId();
-			$result->creationTime = $comment->getCreationTime();
-			$result->lastEditTime = $comment->getLastEditTime();
-			$result->text = $comment->getText();
-			$result->postId = $comment->getPostId();
-			$result->user = $this->userViewProxy->fromEntity($comment->getUser());
-			$result->score = $comment->getScore();
+    public function fromEntity($comment, $config = [])
+    {
+        $result = new \StdClass;
+        if ($comment)
+        {
+            $result->id = $comment->getId();
+            $result->creationTime = $comment->getCreationTime();
+            $result->lastEditTime = $comment->getLastEditTime();
+            $result->text = $comment->getText();
+            $result->postId = $comment->getPostId();
+            $result->user = $this->userViewProxy->fromEntity($comment->getUser());
+            $result->score = $comment->getScore();
 
-			if (!empty($config[self::FETCH_OWN_SCORE]) && $this->authService->isLoggedIn())
-				$result->ownScore = $this->scoreService->getUserScoreValue($this->authService->getLoggedInUser(), $comment);
-		}
-		return $result;
-	}
+            if (!empty($config[self::FETCH_OWN_SCORE]) && $this->authService->isLoggedIn())
+                $result->ownScore = $this->scoreService->getUserScoreValue($this->authService->getLoggedInUser(), $comment);
+        }
+        return $result;
+    }
 }
diff --git a/src/ViewProxies/PostNoteViewProxy.php b/src/ViewProxies/PostNoteViewProxy.php
index c1b335e2..8b73bb0c 100644
--- a/src/ViewProxies/PostNoteViewProxy.php
+++ b/src/ViewProxies/PostNoteViewProxy.php
@@ -3,19 +3,19 @@ namespace Szurubooru\ViewProxies;
 
 class PostNoteViewProxy extends AbstractViewProxy
 {
-	public function fromEntity($postNote, $config = [])
-	{
-		$result = new \StdClass;
-		if ($postNote)
-		{
-			$result->id = $postNote->getId();
-			$result->postId = $postNote->getPostId();
-			$result->text = $postNote->getText();
-			$result->left = $postNote->getLeft();
-			$result->top = $postNote->getTop();
-			$result->width = $postNote->getWidth();
-			$result->height = $postNote->getHeight();
-		}
-		return $result;
-	}
+    public function fromEntity($postNote, $config = [])
+    {
+        $result = new \StdClass;
+        if ($postNote)
+        {
+            $result->id = $postNote->getId();
+            $result->postId = $postNote->getPostId();
+            $result->text = $postNote->getText();
+            $result->left = $postNote->getLeft();
+            $result->top = $postNote->getTop();
+            $result->width = $postNote->getWidth();
+            $result->height = $postNote->getHeight();
+        }
+        return $result;
+    }
 }
diff --git a/src/ViewProxies/PostViewProxy.php b/src/ViewProxies/PostViewProxy.php
index 31e7445b..0ae5029a 100644
--- a/src/ViewProxies/PostViewProxy.php
+++ b/src/ViewProxies/PostViewProxy.php
@@ -13,109 +13,109 @@ use Szurubooru\Services\ScoreService;
 
 class PostViewProxy extends AbstractViewProxy
 {
-	const FETCH_USER = 'fetchUser';
-	const FETCH_TAGS = 'fetchTags';
-	const FETCH_RELATIONS = 'fetchRelations';
-	const FETCH_HISTORY = 'fetchHistory';
-	const FETCH_OWN_SCORE = 'fetchOwnScore';
-	const FETCH_FAVORITES = 'fetchFavorites';
-	const FETCH_NOTES = 'fetchNotes';
+    const FETCH_USER = 'fetchUser';
+    const FETCH_TAGS = 'fetchTags';
+    const FETCH_RELATIONS = 'fetchRelations';
+    const FETCH_HISTORY = 'fetchHistory';
+    const FETCH_OWN_SCORE = 'fetchOwnScore';
+    const FETCH_FAVORITES = 'fetchFavorites';
+    const FETCH_NOTES = 'fetchNotes';
 
-	private $privilegeService;
-	private $authService;
-	private $postHistoryService;
-	private $favoritesService;
-	private $scoreService;
-	private $postNotesService;
-	private $tagViewProxy;
-	private $userViewProxy;
-	private $snapshotViewProxy;
-	private $postNoteViewProxy;
+    private $privilegeService;
+    private $authService;
+    private $postHistoryService;
+    private $favoritesService;
+    private $scoreService;
+    private $postNotesService;
+    private $tagViewProxy;
+    private $userViewProxy;
+    private $snapshotViewProxy;
+    private $postNoteViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		AuthService $authService,
-		PostHistoryService $postHistoryService,
-		FavoritesService $favoritesService,
-		ScoreService $scoreService,
-		PostNotesService $postNotesService,
-		TagViewProxy $tagViewProxy,
-		UserViewProxy $userViewProxy,
-		SnapshotViewProxy $snapshotViewProxy,
-		PostNoteViewProxy $postNoteViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->authService = $authService;
-		$this->postHistoryService = $postHistoryService;
-		$this->favoritesService = $favoritesService;
-		$this->scoreService = $scoreService;
-		$this->postNotesService = $postNotesService;
-		$this->tagViewProxy = $tagViewProxy;
-		$this->userViewProxy = $userViewProxy;
-		$this->snapshotViewProxy = $snapshotViewProxy;
-		$this->postNoteViewProxy = $postNoteViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        AuthService $authService,
+        PostHistoryService $postHistoryService,
+        FavoritesService $favoritesService,
+        ScoreService $scoreService,
+        PostNotesService $postNotesService,
+        TagViewProxy $tagViewProxy,
+        UserViewProxy $userViewProxy,
+        SnapshotViewProxy $snapshotViewProxy,
+        PostNoteViewProxy $postNoteViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->authService = $authService;
+        $this->postHistoryService = $postHistoryService;
+        $this->favoritesService = $favoritesService;
+        $this->scoreService = $scoreService;
+        $this->postNotesService = $postNotesService;
+        $this->tagViewProxy = $tagViewProxy;
+        $this->userViewProxy = $userViewProxy;
+        $this->snapshotViewProxy = $snapshotViewProxy;
+        $this->postNoteViewProxy = $postNoteViewProxy;
+    }
 
-	public function fromEntity($post, $config = [])
-	{
-		$result = new \StdClass;
-		if (!$post)
-			return $result;
+    public function fromEntity($post, $config = [])
+    {
+        $result = new \StdClass;
+        if (!$post)
+            return $result;
 
-		$result->id = $post->getId();
-		$result->idMarkdown = $post->getIdMarkdown();
-		$result->name = $post->getName();
-		$result->uploadTime = $post->getUploadTime();
-		$result->lastEditTime = $post->getLastEditTime();
-		$result->safety = EnumHelper::postSafetyToString($post->getSafety());
-		$result->contentType = EnumHelper::postTypeToString($post->getContentType());
-		$result->contentChecksum = $post->getContentChecksum();
-		$result->contentMimeType = $post->getContentMimeType();
-		$result->contentExtension = MimeHelper::getExtension($post->getContentMimeType());
-		$result->source = $post->getSource();
-		$result->imageWidth = $post->getImageWidth();
-		$result->imageHeight = $post->getImageHeight();
-		$result->featureCount = $post->getFeatureCount();
-		$result->lastFeatureTime = $post->getLastFeatureTime();
-		$result->originalFileSize = $post->getOriginalFileSize();
-		$result->favoriteCount = $post->getFavoriteCount();
-		$result->score = $post->getScore();
-		$result->commentCount = $post->getCommentCount();
-		$result->flags = new \StdClass;
-		$result->flags->loop = ($post->getFlags() & Post::FLAG_LOOP);
+        $result->id = $post->getId();
+        $result->idMarkdown = $post->getIdMarkdown();
+        $result->name = $post->getName();
+        $result->uploadTime = $post->getUploadTime();
+        $result->lastEditTime = $post->getLastEditTime();
+        $result->safety = EnumHelper::postSafetyToString($post->getSafety());
+        $result->contentType = EnumHelper::postTypeToString($post->getContentType());
+        $result->contentChecksum = $post->getContentChecksum();
+        $result->contentMimeType = $post->getContentMimeType();
+        $result->contentExtension = MimeHelper::getExtension($post->getContentMimeType());
+        $result->source = $post->getSource();
+        $result->imageWidth = $post->getImageWidth();
+        $result->imageHeight = $post->getImageHeight();
+        $result->featureCount = $post->getFeatureCount();
+        $result->lastFeatureTime = $post->getLastFeatureTime();
+        $result->originalFileSize = $post->getOriginalFileSize();
+        $result->favoriteCount = $post->getFavoriteCount();
+        $result->score = $post->getScore();
+        $result->commentCount = $post->getCommentCount();
+        $result->flags = new \StdClass;
+        $result->flags->loop = ($post->getFlags() & Post::FLAG_LOOP);
 
-		if (!empty($config[self::FETCH_TAGS]))
-		{
-			$result->tags = $this->tagViewProxy->fromArray($post->getTags());
-			usort($result->tags, function($tag1, $tag2)
-				{
-					return strcasecmp($tag1->name, $tag2->name);
-				});
-		}
+        if (!empty($config[self::FETCH_TAGS]))
+        {
+            $result->tags = $this->tagViewProxy->fromArray($post->getTags());
+            usort($result->tags, function($tag1, $tag2)
+                {
+                    return strcasecmp($tag1->name, $tag2->name);
+                });
+        }
 
-		if (!empty($config[self::FETCH_USER]))
-			$result->user = $this->userViewProxy->fromEntity($post->getUser());
+        if (!empty($config[self::FETCH_USER]))
+            $result->user = $this->userViewProxy->fromEntity($post->getUser());
 
-		if (!empty($config[self::FETCH_RELATIONS]))
-			$result->relations = $this->fromArray($post->getRelatedPosts());
+        if (!empty($config[self::FETCH_RELATIONS]))
+            $result->relations = $this->fromArray($post->getRelatedPosts());
 
-		if (!empty($config[self::FETCH_HISTORY]))
-		{
-			if ($this->privilegeService->hasPrivilege(Privilege::VIEW_HISTORY))
-				$result->history = $this->snapshotViewProxy->fromArray($this->postHistoryService->getPostHistory($post));
-			else
-				$result->history = [];
-		}
+        if (!empty($config[self::FETCH_HISTORY]))
+        {
+            if ($this->privilegeService->hasPrivilege(Privilege::VIEW_HISTORY))
+                $result->history = $this->snapshotViewProxy->fromArray($this->postHistoryService->getPostHistory($post));
+            else
+                $result->history = [];
+        }
 
-		if (!empty($config[self::FETCH_OWN_SCORE]) && $this->authService->isLoggedIn())
-			$result->ownScore = $this->scoreService->getUserScoreValue($this->authService->getLoggedInUser(), $post);
+        if (!empty($config[self::FETCH_OWN_SCORE]) && $this->authService->isLoggedIn())
+            $result->ownScore = $this->scoreService->getUserScoreValue($this->authService->getLoggedInUser(), $post);
 
-		if (!empty($config[self::FETCH_FAVORITES]))
-			$result->favorites = $this->userViewProxy->fromArray($this->favoritesService->getFavoriteUsers($post));
+        if (!empty($config[self::FETCH_FAVORITES]))
+            $result->favorites = $this->userViewProxy->fromArray($this->favoritesService->getFavoriteUsers($post));
 
-		if (!empty($config[self::FETCH_NOTES]))
-			$result->notes = $this->postNoteViewProxy->fromArray($this->postNotesService->getByPost($post));
+        if (!empty($config[self::FETCH_NOTES]))
+            $result->notes = $this->postNoteViewProxy->fromArray($this->postNotesService->getByPost($post));
 
-		return $result;
-	}
+        return $result;
+    }
 }
diff --git a/src/ViewProxies/SnapshotViewProxy.php b/src/ViewProxies/SnapshotViewProxy.php
index bea7f202..6c96d739 100644
--- a/src/ViewProxies/SnapshotViewProxy.php
+++ b/src/ViewProxies/SnapshotViewProxy.php
@@ -3,26 +3,26 @@ namespace Szurubooru\ViewProxies;
 
 class SnapshotViewProxy extends AbstractViewProxy
 {
-	private $userViewProxy;
+    private $userViewProxy;
 
-	public function __construct(UserViewProxy $userViewProxy)
-	{
-		$this->userViewProxy = $userViewProxy;
-	}
+    public function __construct(UserViewProxy $userViewProxy)
+    {
+        $this->userViewProxy = $userViewProxy;
+    }
 
-	public function fromEntity($snapshot, $config = [])
-	{
-		$result = new \StdClass;
-		if ($snapshot)
-		{
-			$result->time = $snapshot->getTime();
-			$result->type = $snapshot->getType();
-			$result->primaryKey = $snapshot->getPrimaryKey();
-			$result->operation = $snapshot->getOperation();
-			$result->user = $this->userViewProxy->fromEntity($snapshot->getUser());
-			$result->data = $snapshot->getData();
-			$result->dataDifference = $snapshot->getDataDifference();
-		}
-		return $result;
-	}
+    public function fromEntity($snapshot, $config = [])
+    {
+        $result = new \StdClass;
+        if ($snapshot)
+        {
+            $result->time = $snapshot->getTime();
+            $result->type = $snapshot->getType();
+            $result->primaryKey = $snapshot->getPrimaryKey();
+            $result->operation = $snapshot->getOperation();
+            $result->user = $this->userViewProxy->fromEntity($snapshot->getUser());
+            $result->data = $snapshot->getData();
+            $result->dataDifference = $snapshot->getDataDifference();
+        }
+        return $result;
+    }
 }
diff --git a/src/ViewProxies/TagViewProxy.php b/src/ViewProxies/TagViewProxy.php
index 67a7c389..1fc244aa 100644
--- a/src/ViewProxies/TagViewProxy.php
+++ b/src/ViewProxies/TagViewProxy.php
@@ -6,47 +6,47 @@ use Szurubooru\Services\TagHistoryService;
 
 class TagViewProxy extends AbstractViewProxy
 {
-	const FETCH_IMPLICATIONS = 'fetchImplications';
-	const FETCH_SUGGESTIONS = 'fetchSuggestions';
-	const FETCH_HISTORY = 'fetchHistory';
+    const FETCH_IMPLICATIONS = 'fetchImplications';
+    const FETCH_SUGGESTIONS = 'fetchSuggestions';
+    const FETCH_HISTORY = 'fetchHistory';
 
-	private $privilegeService;
-	private $tagHistoryService;
-	private $snapshotViewProxy;
+    private $privilegeService;
+    private $tagHistoryService;
+    private $snapshotViewProxy;
 
-	public function __construct(
-		PrivilegeService $privilegeService,
-		TagHistoryService $tagHistoryService,
-		SnapshotViewProxy $snapshotViewProxy)
-	{
-		$this->privilegeService = $privilegeService;
-		$this->tagHistoryService = $tagHistoryService;
-		$this->snapshotViewProxy = $snapshotViewProxy;
-	}
+    public function __construct(
+        PrivilegeService $privilegeService,
+        TagHistoryService $tagHistoryService,
+        SnapshotViewProxy $snapshotViewProxy)
+    {
+        $this->privilegeService = $privilegeService;
+        $this->tagHistoryService = $tagHistoryService;
+        $this->snapshotViewProxy = $snapshotViewProxy;
+    }
 
-	public function fromEntity($tag, $config = [])
-	{
-		$result = new \StdClass;
-		if ($tag)
-		{
-			$result->name = $tag->getName();
-			$result->usages = $tag->getUsages();
-			$result->banned = $tag->isBanned();
-			$result->category = $tag->getCategory();
+    public function fromEntity($tag, $config = [])
+    {
+        $result = new \StdClass;
+        if ($tag)
+        {
+            $result->name = $tag->getName();
+            $result->usages = $tag->getUsages();
+            $result->banned = $tag->isBanned();
+            $result->category = $tag->getCategory();
 
-			if (!empty($config[self::FETCH_IMPLICATIONS]))
-				$result->implications = $this->fromArray($tag->getImpliedTags());
+            if (!empty($config[self::FETCH_IMPLICATIONS]))
+                $result->implications = $this->fromArray($tag->getImpliedTags());
 
-			if (!empty($config[self::FETCH_SUGGESTIONS]))
-				$result->suggestions = $this->fromArray($tag->getSuggestedTags());
+            if (!empty($config[self::FETCH_SUGGESTIONS]))
+                $result->suggestions = $this->fromArray($tag->getSuggestedTags());
 
-			if (!empty($config[self::FETCH_HISTORY]))
-			{
-				$result->history = $this->privilegeService->hasPrivilege(Privilege::VIEW_HISTORY)
-					? $this->snapshotViewProxy->fromArray($this->tagHistoryService->getTagHistory($tag))
-					: [];
-			}
-		}
-		return $result;
-	}
+            if (!empty($config[self::FETCH_HISTORY]))
+            {
+                $result->history = $this->privilegeService->hasPrivilege(Privilege::VIEW_HISTORY)
+                    ? $this->snapshotViewProxy->fromArray($this->tagHistoryService->getTagHistory($tag))
+                    : [];
+            }
+        }
+        return $result;
+    }
 }
diff --git a/src/ViewProxies/TokenViewProxy.php b/src/ViewProxies/TokenViewProxy.php
index 6555fb35..14cf7b28 100644
--- a/src/ViewProxies/TokenViewProxy.php
+++ b/src/ViewProxies/TokenViewProxy.php
@@ -3,14 +3,14 @@ namespace Szurubooru\ViewProxies;
 
 class TokenViewProxy extends AbstractViewProxy
 {
-	public function fromEntity($token, $config = [])
-	{
-		$result = new \StdClass;
-		if ($token)
-		{
-			$result->name = $token->getName();
-			$result->purpose = $token->getPurpose();
-		}
-		return $result;
-	}
+    public function fromEntity($token, $config = [])
+    {
+        $result = new \StdClass;
+        if ($token)
+        {
+            $result->name = $token->getName();
+            $result->purpose = $token->getPurpose();
+        }
+        return $result;
+    }
 }
diff --git a/src/ViewProxies/UserViewProxy.php b/src/ViewProxies/UserViewProxy.php
index 5c272897..3de68d8a 100644
--- a/src/ViewProxies/UserViewProxy.php
+++ b/src/ViewProxies/UserViewProxy.php
@@ -6,45 +6,45 @@ use Szurubooru\Services\PrivilegeService;
 
 class UserViewProxy extends AbstractViewProxy
 {
-	private $privilegeService;
+    private $privilegeService;
 
-	public function __construct(PrivilegeService $privilegeService)
-	{
-		$this->privilegeService = $privilegeService;
-	}
+    public function __construct(PrivilegeService $privilegeService)
+    {
+        $this->privilegeService = $privilegeService;
+    }
 
-	public function fromEntity($user, $config = [])
-	{
-		$result = new \StdClass;
-		if ($user)
-		{
-			$result->id = $user->getId();
-			$result->name = $user->getName();
-			$result->registrationTime = $user->getRegistrationTime();
-			$result->lastLoginTime = $user->getLastLoginTime();
-			$result->avatarStyle = EnumHelper::avatarStyleToString($user->getAvatarStyle());
-			$result->banned = $user->isBanned();
+    public function fromEntity($user, $config = [])
+    {
+        $result = new \StdClass;
+        if ($user)
+        {
+            $result->id = $user->getId();
+            $result->name = $user->getName();
+            $result->registrationTime = $user->getRegistrationTime();
+            $result->lastLoginTime = $user->getLastLoginTime();
+            $result->avatarStyle = EnumHelper::avatarStyleToString($user->getAvatarStyle());
+            $result->banned = $user->isBanned();
 
-			if ($this->privilegeService->isLoggedIn($user))
-			{
-				$result->browsingSettings = $user->getBrowsingSettings();
-			}
+            if ($this->privilegeService->isLoggedIn($user))
+            {
+                $result->browsingSettings = $user->getBrowsingSettings();
+            }
 
-			if ($this->privilegeService->hasPrivilege(Privilege::VIEW_ALL_ACCESS_RANKS) or
-				$this->privilegeService->isLoggedin($user))
-			{
-				$result->accessRank = EnumHelper::accessRankToString($user->getAccessRank());
-			}
+            if ($this->privilegeService->hasPrivilege(Privilege::VIEW_ALL_ACCESS_RANKS) or
+                $this->privilegeService->isLoggedin($user))
+            {
+                $result->accessRank = EnumHelper::accessRankToString($user->getAccessRank());
+            }
 
-			if ($this->privilegeService->hasPrivilege(Privilege::VIEW_ALL_EMAIL_ADDRESSES) or
-				$this->privilegeService->isLoggedIn($user))
-			{
-				$result->email = $user->getEmail();
-				$result->emailUnconfirmed = $user->getEmailUnconfirmed();
-			}
+            if ($this->privilegeService->hasPrivilege(Privilege::VIEW_ALL_EMAIL_ADDRESSES) or
+                $this->privilegeService->isLoggedIn($user))
+            {
+                $result->email = $user->getEmail();
+                $result->emailUnconfirmed = $user->getEmailUnconfirmed();
+            }
 
-			$result->confirmed = $user->isAccountConfirmed();
-		}
-		return $result;
-	}
+            $result->confirmed = $user->isAccountConfirmed();
+        }
+        return $result;
+    }
 }
diff --git a/src/di.php b/src/di.php
index 35cb09e8..ba7c9a29 100644
--- a/src/di.php
+++ b/src/di.php
@@ -1,109 +1,109 @@
 <?php
 $dataDirectory = __DIR__
-	. DIRECTORY_SEPARATOR . '..'
-	. DIRECTORY_SEPARATOR . 'data';
+    . DIRECTORY_SEPARATOR . '..'
+    . DIRECTORY_SEPARATOR . 'data';
 
 $publicDataDirectory = __DIR__
-	. DIRECTORY_SEPARATOR . '..'
-	. DIRECTORY_SEPARATOR . 'public_html'
-	. DIRECTORY_SEPARATOR . 'data';
+    . DIRECTORY_SEPARATOR . '..'
+    . DIRECTORY_SEPARATOR . 'public_html'
+    . DIRECTORY_SEPARATOR . 'data';
 
 return [
-	\Szurubooru\Config::class => DI\object()->constructor($dataDirectory, $publicDataDirectory),
+    \Szurubooru\Config::class => DI\object()->constructor($dataDirectory, $publicDataDirectory),
 
-	\Szurubooru\RouteRepository::class => DI\object()->constructor(DI\link('routes')),
-	\Szurubooru\Upgrades\UpgradeRepository::class => DI\object()->constructor(DI\link('upgrades')),
+    \Szurubooru\RouteRepository::class => DI\object()->constructor(DI\link('routes')),
+    \Szurubooru\Upgrades\UpgradeRepository::class => DI\object()->constructor(DI\link('upgrades')),
 
-	'upgrades' => DI\factory(function (DI\container $container) {
-		return [
-			$container->get(\Szurubooru\Upgrades\Upgrade00::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade01::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade02::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade03::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade04::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade05::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade06::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade07::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade08::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade09::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade10::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade11::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade12::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade13::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade14::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade15::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade16::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade17::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade18::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade19::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade20::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade21::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade22::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade23::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade24::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade25::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade26::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade27::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade28::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade29::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade30::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade31::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade32::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade33::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade34::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade35::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade36::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade37::class),
-			$container->get(\Szurubooru\Upgrades\Upgrade38::class),
-		];
-	}),
+    'upgrades' => DI\factory(function (DI\container $container) {
+        return [
+            $container->get(\Szurubooru\Upgrades\Upgrade00::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade01::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade02::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade03::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade04::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade05::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade06::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade07::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade08::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade09::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade10::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade11::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade12::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade13::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade14::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade15::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade16::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade17::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade18::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade19::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade20::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade21::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade22::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade23::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade24::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade25::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade26::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade27::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade28::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade29::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade30::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade31::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade32::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade33::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade34::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade35::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade36::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade37::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade38::class),
+        ];
+    }),
 
-	'routes' => DI\factory(function (DI\container $container) {
-		return [
-			$container->get(\Szurubooru\Routes\Login::class),
-			$container->get(\Szurubooru\Routes\GetGlobals::class),
-			$container->get(\Szurubooru\Routes\GetHistory::class),
-			$container->get(\Szurubooru\Routes\Comments\AddComment::class),
-			$container->get(\Szurubooru\Routes\Comments\EditComment::class),
-			$container->get(\Szurubooru\Routes\Comments\DeleteComment::class),
-			$container->get(\Szurubooru\Routes\Comments\GetComments::class),
-			$container->get(\Szurubooru\Routes\Comments\GetPostComments::class),
-			$container->get(\Szurubooru\Routes\Favorites\GetFavoriteUsers::class),
-			$container->get(\Szurubooru\Routes\Favorites\AddToFavorites::class),
-			$container->get(\Szurubooru\Routes\Favorites\RemoveFromFavorites::class),
-			$container->get(\Szurubooru\Routes\Posts\CreatePost::class),
-			$container->get(\Szurubooru\Routes\Posts\DeletePost::class),
-			$container->get(\Szurubooru\Routes\Posts\FeaturePost::class),
-			$container->get(\Szurubooru\Routes\Posts\GetFeaturedPost::class),
-			$container->get(\Szurubooru\Routes\Posts\GetPost::class),
-			$container->get(\Szurubooru\Routes\Posts\GetPostContent::class),
-			$container->get(\Szurubooru\Routes\Posts\GetPostThumbnail::class),
-			$container->get(\Szurubooru\Routes\Posts\GetPosts::class),
-			$container->get(\Szurubooru\Routes\Posts\UpdatePost::class),
-			$container->get(\Szurubooru\Routes\Posts\Notes\AddPostNote::class),
-			$container->get(\Szurubooru\Routes\Posts\Notes\DeletePostNote::class),
-			$container->get(\Szurubooru\Routes\Posts\Notes\GetPostNotes::class),
-			$container->get(\Szurubooru\Routes\Posts\Notes\UpdatePostNote::class),
-			$container->get(\Szurubooru\Routes\Tags\DeleteTag::class),
-			$container->get(\Szurubooru\Routes\Tags\GetTag::class),
-			$container->get(\Szurubooru\Routes\Tags\GetTagSiblings::class),
-			$container->get(\Szurubooru\Routes\Tags\GetTags::class),
-			$container->get(\Szurubooru\Routes\Tags\MergeTags::class),
-			$container->get(\Szurubooru\Routes\Tags\UpdateTag::class),
-			$container->get(\Szurubooru\Routes\Users\ActivateAccount::class),
-			$container->get(\Szurubooru\Routes\Users\CreateUser::class),
-			$container->get(\Szurubooru\Routes\Users\DeleteUser::class),
-			$container->get(\Szurubooru\Routes\Users\FinishActivation::class),
-			$container->get(\Szurubooru\Routes\Users\FinishPasswordReset::class),
-			$container->get(\Szurubooru\Routes\Users\GetUser::class),
-			$container->get(\Szurubooru\Routes\Users\GetUserAvatar::class),
-			$container->get(\Szurubooru\Routes\Users\GetUsers::class),
-			$container->get(\Szurubooru\Routes\Users\PasswordReset::class),
-			$container->get(\Szurubooru\Routes\Users\UpdateUser::class),
-			$container->get(\Szurubooru\Routes\Scores\GetCommentScore::class),
-			$container->get(\Szurubooru\Routes\Scores\SetCommentScore::class),
-			$container->get(\Szurubooru\Routes\Scores\GetPostScore::class),
-			$container->get(\Szurubooru\Routes\Scores\SetPostScore::class),
-		];
-	}),
+    'routes' => DI\factory(function (DI\container $container) {
+        return [
+            $container->get(\Szurubooru\Routes\Login::class),
+            $container->get(\Szurubooru\Routes\GetGlobals::class),
+            $container->get(\Szurubooru\Routes\GetHistory::class),
+            $container->get(\Szurubooru\Routes\Comments\AddComment::class),
+            $container->get(\Szurubooru\Routes\Comments\EditComment::class),
+            $container->get(\Szurubooru\Routes\Comments\DeleteComment::class),
+            $container->get(\Szurubooru\Routes\Comments\GetComments::class),
+            $container->get(\Szurubooru\Routes\Comments\GetPostComments::class),
+            $container->get(\Szurubooru\Routes\Favorites\GetFavoriteUsers::class),
+            $container->get(\Szurubooru\Routes\Favorites\AddToFavorites::class),
+            $container->get(\Szurubooru\Routes\Favorites\RemoveFromFavorites::class),
+            $container->get(\Szurubooru\Routes\Posts\CreatePost::class),
+            $container->get(\Szurubooru\Routes\Posts\DeletePost::class),
+            $container->get(\Szurubooru\Routes\Posts\FeaturePost::class),
+            $container->get(\Szurubooru\Routes\Posts\GetFeaturedPost::class),
+            $container->get(\Szurubooru\Routes\Posts\GetPost::class),
+            $container->get(\Szurubooru\Routes\Posts\GetPostContent::class),
+            $container->get(\Szurubooru\Routes\Posts\GetPostThumbnail::class),
+            $container->get(\Szurubooru\Routes\Posts\GetPosts::class),
+            $container->get(\Szurubooru\Routes\Posts\UpdatePost::class),
+            $container->get(\Szurubooru\Routes\Posts\Notes\AddPostNote::class),
+            $container->get(\Szurubooru\Routes\Posts\Notes\DeletePostNote::class),
+            $container->get(\Szurubooru\Routes\Posts\Notes\GetPostNotes::class),
+            $container->get(\Szurubooru\Routes\Posts\Notes\UpdatePostNote::class),
+            $container->get(\Szurubooru\Routes\Tags\DeleteTag::class),
+            $container->get(\Szurubooru\Routes\Tags\GetTag::class),
+            $container->get(\Szurubooru\Routes\Tags\GetTagSiblings::class),
+            $container->get(\Szurubooru\Routes\Tags\GetTags::class),
+            $container->get(\Szurubooru\Routes\Tags\MergeTags::class),
+            $container->get(\Szurubooru\Routes\Tags\UpdateTag::class),
+            $container->get(\Szurubooru\Routes\Users\ActivateAccount::class),
+            $container->get(\Szurubooru\Routes\Users\CreateUser::class),
+            $container->get(\Szurubooru\Routes\Users\DeleteUser::class),
+            $container->get(\Szurubooru\Routes\Users\FinishActivation::class),
+            $container->get(\Szurubooru\Routes\Users\FinishPasswordReset::class),
+            $container->get(\Szurubooru\Routes\Users\GetUser::class),
+            $container->get(\Szurubooru\Routes\Users\GetUserAvatar::class),
+            $container->get(\Szurubooru\Routes\Users\GetUsers::class),
+            $container->get(\Szurubooru\Routes\Users\PasswordReset::class),
+            $container->get(\Szurubooru\Routes\Users\UpdateUser::class),
+            $container->get(\Szurubooru\Routes\Scores\GetCommentScore::class),
+            $container->get(\Szurubooru\Routes\Scores\SetCommentScore::class),
+            $container->get(\Szurubooru\Routes\Scores\GetPostScore::class),
+            $container->get(\Szurubooru\Routes\Scores\SetPostScore::class),
+        ];
+    }),
 ];