Merge branch 'master' into joey-testing

2017-02-03 10:48:14 +01:00
parent c8dbdfe70e 87b0ab5892
commit 0ac12f5110
54 changed files with 944 additions and 239 deletions
--- a/website/views/homeLoginRegister.php
+++ b/website/views/homeLoginRegister.php
@@ -35,6 +35,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
            try {
                $user = ($_POST["user"]);
                validateLogin($_POST["user"], $_POST["psw"], $_POST["url"]);
+
            } catch(loginException $e) {
                $loginErr = $e->getMessage();
            }