Merge branch 'joey-testing' into 'master'

Fixed login/register and added logout.php See merge request !68
2017-01-19 13:37:56 +01:00
parent 2bdcca3ad9 049dee6381
commit e71054c654
10 changed files with 250 additions and 332 deletions
--- a/website/queries/login.php
+++ b/website/queries/login.php
@@ -1,6 +1,6 @@
 <?php

-function hashPassword() {
+function getUser() {
    $stmt = $GLOBALS["db"]->prepare("
    SELECT
      `password`,