Merge branch 'master' into 'joey-testing'

# Conflicts:
#   website/views/homeLoginRegister.php
This commit is contained in:
Lars van Hijfte
2017-02-03 10:41:05 +01:00
54 changed files with 944 additions and 239 deletions

View File

@@ -29,6 +29,7 @@ $user = $psw = $remember ="";
$loginErr = $resetErr = $fbRegisterErr ="";
if ($_SERVER["REQUEST_METHOD"] == "POST") {
$url = $_POST["url"];
// Checks for which button is pressed
switch ($_POST["submit"]) {
case "login":