From b24fed57d997bf2377c57ee1e92e7d57d6655886 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Sun, 29 Jan 2017 14:01:25 +0100
Subject: [PATCH 1/2] Changed db connect and database query structure so
 PhpStorm can detect it.

---
 website/public/API/nietSlecht.php   |  4 +--
 website/queries/connect.php         |  4 +++
 website/queries/emailconfirm.php    |  4 +--
 website/queries/friendship.php      | 18 +++++-----
 website/queries/group_member.php    |  4 +--
 website/queries/group_page.php      | 27 +++++++-------
 website/queries/header.php          |  2 +-
 website/queries/login.php           |  3 +-
 website/queries/nicetime.php        | 56 ++++++++++++++---------------
 website/queries/post.php            | 14 ++++----
 website/queries/private_message.php |  8 ++---
 website/queries/register.php        |  8 ++---
 website/queries/requestpassword.php |  4 +--
 website/queries/settings.php        | 16 ++++-----
 website/queries/user.php            | 34 +++++++++---------
 15 files changed, 104 insertions(+), 102 deletions(-)

diff --git a/website/public/API/nietSlecht.php b/website/public/API/nietSlecht.php
index e37c8e0..1692cb3 100644
--- a/website/public/API/nietSlecht.php
+++ b/website/public/API/nietSlecht.php
@@ -5,7 +5,7 @@ require_once ("../queries/connect.php");
 require_once ("../queries/checkInput.php");
 
 function getNietSlechtCountForPost(int $postID) : int {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT 
         `userID`
     FROM 
@@ -19,7 +19,7 @@ function getNietSlechtCountForPost(int $postID) : int {
 }
 
 function getNietSlechtUsersForPost(int $postID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
       `fname`,
       `lname`,
diff --git a/website/queries/connect.php b/website/queries/connect.php
index ddb3c9b..3971a74 100644
--- a/website/queries/connect.php
+++ b/website/queries/connect.php
@@ -8,4 +8,8 @@ else {
     $GLOBALS["db"] = new PDO("mysql:host=$dbconf->mysql_host;dbname=$dbconf->mysql_database;charset=utf8",
         "$dbconf->mysql_username", "$dbconf->mysql_password")
     or die('Error connecting to mysql server');
+}
+
+function prepareQuery(string $query) : PDOStatement {
+    return $GLOBALS["db"]->prepare($query);
 }
\ No newline at end of file
diff --git a/website/queries/emailconfirm.php b/website/queries/emailconfirm.php
index 0b3224f..0e6aab1 100644
--- a/website/queries/emailconfirm.php
+++ b/website/queries/emailconfirm.php
@@ -1,7 +1,7 @@
 <?php
 
 function sendConfirmEmailUsername(string $username) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         `userID`
     FROM
@@ -16,7 +16,7 @@ function sendConfirmEmailUsername(string $username) {
 }
 
 function sendConfirmEmail(int $userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT 
         `email`,
         `fname`
diff --git a/website/queries/friendship.php b/website/queries/friendship.php
index a1a23d8..8d71376 100644
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -7,7 +7,7 @@ function selectFriends($userID) {
 }
 
 function selectLimitedFriends($userID, $limit) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
             `userID`,
             `username`,
@@ -41,7 +41,7 @@ function selectLimitedFriends($userID, $limit) {
 
 
 function selectAllFriends($userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
             `userID`,
             `username`,
@@ -73,7 +73,7 @@ function selectAllFriends($userID) {
 }
 
 function selectAllFriendRequests() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
             `userID`,
             `username`,
@@ -115,7 +115,7 @@ function getFriendshipStatus($userID) {
         return -1;
     }
 
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
       CASE `status` IS NULL
       WHEN TRUE THEN 0
@@ -148,7 +148,7 @@ function getFriendshipStatus($userID) {
 }
 
 function requestFriendship($userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         INSERT INTO `friendship` (user1ID, user2ID)
         VALUES (:user1, :user2)
     ");
@@ -159,7 +159,7 @@ function requestFriendship($userID) {
 }
 
 function removeFriendship($userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         DELETE FROM `friendship`
         WHERE
           `user1ID` = :user1 AND
@@ -175,7 +175,7 @@ function removeFriendship($userID) {
 }
 
 function acceptFriendship($userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         UPDATE `friendship`
         SET `status`='confirmed'
         WHERE 
@@ -190,7 +190,7 @@ function acceptFriendship($userID) {
 }
 
 function setLastVisited($friend) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         UPDATE
           `friendship`
         SET `friendship`.chatLastVisted1=(
@@ -220,7 +220,7 @@ function setLastVisited($friend) {
 }
 
 function searchSomeFriends($n, $m, $search) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
             `userID`,
             `username`,
diff --git a/website/queries/group_member.php b/website/queries/group_member.php
index cba339f..cea4dde 100644
--- a/website/queries/group_member.php
+++ b/website/queries/group_member.php
@@ -5,7 +5,7 @@ function selectAllGroupsFromUser($userID) {
 }
 
 function selectLimitedGroupsFromUser($userID, $limit) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         `group_page`.`name`,
         `group_page`.`picture`
@@ -28,7 +28,7 @@ function selectLimitedGroupsFromUser($userID, $limit) {
 }
 
 function searchSomeOwnGroups($n, $m, $search) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         `group_page`.`name`,
         `group_page`.`picture`
diff --git a/website/queries/group_page.php b/website/queries/group_page.php
index 5652e37..8921aa5 100644
--- a/website/queries/group_page.php
+++ b/website/queries/group_page.php
@@ -3,7 +3,7 @@
 require("connect.php");
 
 function selectGroupByName($name) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
           `group_page`.`groupID`,
           `name`,
@@ -29,7 +29,7 @@ function selectGroupByName($name) {
 }
 
 function selectGroupMembers(int $groupID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
           `username`,
           `fname`,
@@ -54,7 +54,7 @@ function selectGroupMembers(int $groupID) {
 }
 
 function selectGroupById($groupID) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         `group_page`.`name`,
         `group_page`.`picture`,
@@ -73,7 +73,7 @@ function selectGroupById($groupID) {
 }
 
 function select20GroupsFromN($n) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         `group_page`.`groupID`,
         `group_page`.`name`,
@@ -95,7 +95,7 @@ function select20GroupsFromN($n) {
 }
 
 function select20GroupsByStatusFromN($n, $status) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         `group_page`.`groupID`,
         `group_page`.`name`,
@@ -120,7 +120,7 @@ function select20GroupsByStatusFromN($n, $status) {
 }
 
 function search20GroupsFromNByStatus($n, $keyword, $status) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         `groupID`,
         `name`,
@@ -147,7 +147,7 @@ function search20GroupsFromNByStatus($n, $keyword, $status) {
 }
 
 function searchSomeGroupsByStatus($n, $m, $keyword, $status) {
-    $q = $GLOBALS['db']->prepare("
+    $q = prepareQuery("
     SELECT
         `groupID`,
         `name`,
@@ -175,7 +175,7 @@ function searchSomeGroupsByStatus($n, $m, $keyword, $status) {
 }
 
 function countSomeGroupsByStatus($keyword, $status) {
-    $q = $GLOBALS['db']->prepare("
+    $q = prepareQuery("
     SELECT
         COUNT(*)
     FROM
@@ -196,7 +196,7 @@ function countSomeGroupsByStatus($keyword, $status) {
 }
 
 function changeGroupStatusByID($id, $status) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     UPDATE
         `group_page`
     SET
@@ -212,7 +212,7 @@ function changeGroupStatusByID($id, $status) {
 }
 
 function changeMultipleGroupStatusByID($ids, $status) {
-    $q = $GLOBALS['db']->prepare("
+    $q = prepareQuery("
     UPDATE
         `group_page`
     SET
@@ -229,7 +229,7 @@ function changeMultipleGroupStatusByID($ids, $status) {
 }
 
 function searchSomeGroups($n, $m, $search) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         `name`,
         `picture`
@@ -252,7 +252,7 @@ function searchSomeGroups($n, $m, $search) {
 }
 
 function countSomeGroups($search) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         COUNT(*)
     FROM
@@ -267,5 +267,4 @@ function countSomeGroups($search) {
     $stmt->bindParam(':keyword', $search);
     $stmt->execute();
     return $stmt;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/website/queries/header.php b/website/queries/header.php
index b0dd42c..7410d17 100644
--- a/website/queries/header.php
+++ b/website/queries/header.php
@@ -1,6 +1,6 @@
 <?php
 function getHeaderInfo() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         `fname`,
         `lname`,
diff --git a/website/queries/login.php b/website/queries/login.php
index 384a3d5..c7e8383 100644
--- a/website/queries/login.php
+++ b/website/queries/login.php
@@ -1,7 +1,7 @@
 <?php
 
 function getUser() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
       `password`,
       `userID`,
@@ -61,5 +61,4 @@ class loginException extends Exception
         parent::__construct($message, $code, $previous);
     }
 }
-?>
 
diff --git a/website/queries/nicetime.php b/website/queries/nicetime.php
index 4db6cbd..e2e509e 100644
--- a/website/queries/nicetime.php
+++ b/website/queries/nicetime.php
@@ -1,39 +1,39 @@
 <?php
 function nicetime($date) {
-if(empty($date)) {
-return "No date provided";
-}
+    if(empty($date)) {
+        return "No date provided";
+    }
 
-$single_periods = array("seconde", "minuut", "uur", "dag", "week", "maand", "jaar", "decennium");
-$multiple_periods = array("seconden", "minuten", "uur", "dagen", "weken", "maanden", "jaar", "decennia");
-$lengths = array("60", "60", "24", "7", "4.35", "12", "10", "0");
+    $single_periods = array("seconde", "minuut", "uur", "dag", "week", "maand", "jaar", "decennium");
+    $multiple_periods = array("seconden", "minuten", "uur", "dagen", "weken", "maanden", "jaar", "decennia");
+    $lengths = array("60", "60", "24", "7", "4.35", "12", "10", "0");
 
-$now = time();
-$unix_date = strtotime($date);
+    $now = time();
+    $unix_date = strtotime($date);
 
-if(empty($unix_date)) {
-return "Bad date";
-}
+    if(empty($unix_date)) {
+        return "Bad date";
+    }
 
-if($now > $unix_date) {
-$difference = $now - $unix_date;
-$tense = "geleden";
-} else {
-$difference = $unix_date - $now;
-$tense = "vanaf nu";
-}
+    if($now > $unix_date) {
+        $difference = $now - $unix_date;
+        $tense = "geleden";
+    } else {
+        $difference = $unix_date - $now;
+        $tense = "vanaf nu";
+    }
 
-for($i = 0; $difference >= $lengths[$i] && $i < count($lengths) - 1; $i++) {
-$difference /= $lengths[$i];
-}
+    for($i = 0; $difference >= $lengths[$i] && $i < count($lengths) - 1; $i++) {
+        $difference /= $lengths[$i];
+    }
 
-$difference = round($difference);
+    $difference = round($difference);
 
-if($difference != 1) {
-$period = $multiple_periods[$i];
-} else {
-$period = $single_periods[$i];
-}
+    if($difference != 1) {
+        $period = $multiple_periods[$i];
+    } else {
+        $period = $single_periods[$i];
+    }
 
-return "$difference $period $tense";
+    return "$difference $period $tense";
 }
\ No newline at end of file
diff --git a/website/queries/post.php b/website/queries/post.php
index df1e227..1c09385 100644
--- a/website/queries/post.php
+++ b/website/queries/post.php
@@ -1,7 +1,7 @@
 <?php
 
 function selectPostById($postID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
             `user`.`fname`,
             `user`.`lname`,
@@ -26,7 +26,7 @@ function selectPostById($postID) {
 }
 
 function selectCommentsByPostId($postID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
             `comment`.`commentID`,
             `comment`.`postID`,
@@ -52,7 +52,7 @@ function selectCommentsByPostId($postID) {
 }
 
 function makePost($userID, $groupID, $title, $content) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         INSERT INTO
             `post` (
                 `author`,
@@ -76,7 +76,7 @@ function makePost($userID, $groupID, $title, $content) {
 }
 
 function makeComment($postID, $userID, $content) : int {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         INSERT INTO
             `comment` (
                 `postID`, 
@@ -106,7 +106,7 @@ function makeNietSlecht(int $postID, int $userID) : int {
 }
 
 function checkNietSlecht(int $postID, int $userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         *
     FROM
@@ -122,7 +122,7 @@ function checkNietSlecht(int $postID, int $userID) {
 }
 
 function addNietSlecht(int $postID, int $userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     INSERT INTO
         `niet_slecht` (`userID`, `postID`)
         VALUES (:userID, :postID)
@@ -134,7 +134,7 @@ function addNietSlecht(int $postID, int $userID) {
 }
 
 function deleteNietSlecht(int $postID, int $userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     DELETE FROM
         `niet_slecht`
     WHERE
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index 4d48d3a..6f3abb5 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -4,7 +4,7 @@ function getOldChatMessages($user2ID) {
     require_once ("friendship.php");
     $user1ID = $_SESSION["userID"];
     if (getFriendshipStatus($user2ID) == 1) {
-        $stmt = $GLOBALS["db"]->prepare("
+        $stmt = prepareQuery("
         SELECT
             *
         FROM
@@ -32,7 +32,7 @@ function getOldChatMessages($user2ID) {
 function sendMessage($destination, $content) {
     require_once("friendship.php");
     if (getFriendshipStatus($destination) == 1) {
-        $stmt = $GLOBALS["db"]->prepare("
+        $stmt = prepareQuery("
         INSERT INTO
             `private_message`
         (
@@ -61,7 +61,7 @@ function sendMessage($destination, $content) {
 function getNewChatMessages($lastID, $destination) {
     require_once("friendship.php");
     if (getFriendshipStatus($destination) == 1) {
-        $stmt = $GLOBALS["db"]->prepare("
+        $stmt = prepareQuery("
         SELECT
             *
         FROM
@@ -91,7 +91,7 @@ function getNewChatMessages($lastID, $destination) {
 
 
 function selectAllUnreadChat() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
       LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) AS `fullname`,
       `user`.`userID`,
diff --git a/website/queries/register.php b/website/queries/register.php
index bc44acf..1aed0ef 100644
--- a/website/queries/register.php
+++ b/website/queries/register.php
@@ -1,7 +1,7 @@
 <?php
 
 function getExistingUsername() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
       `username`
     FROM
@@ -17,7 +17,7 @@ function getExistingUsername() {
 }
 
 function getExistingEmail() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
       `email`
     FROM
@@ -33,7 +33,7 @@ function getExistingEmail() {
 }
 
 function getResetEmail() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
       `email`
     FROM
@@ -49,7 +49,7 @@ function getResetEmail() {
 }
 
 function registerAccount() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     INSERT INTO
       `user`(fname,
              lname,
diff --git a/website/queries/requestpassword.php b/website/queries/requestpassword.php
index bae825a..a54bd7d 100644
--- a/website/queries/requestpassword.php
+++ b/website/queries/requestpassword.php
@@ -3,7 +3,7 @@ include_once "../queries/connect.php";
 
 function sendPasswordRecovery(string $email) {
     if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
-        $stmt = $GLOBALS["db"]->prepare("
+        $stmt = prepareQuery("
         SELECT 
             `userID`,
             `username`
@@ -39,7 +39,7 @@ function doSendPasswordRecovery(int $userID, string $email, string $username, st
 }
 
 function setHashToDatabase(int $userID, string $hash) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     UPDATE
         `user`
     SET
diff --git a/website/queries/settings.php b/website/queries/settings.php
index 05e7fbf..f4c5403 100644
--- a/website/queries/settings.php
+++ b/website/queries/settings.php
@@ -50,7 +50,7 @@ class AngryAlert extends AlertMessage {
  * @return mixed Setting as an array.
  */
 function getSettings() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
       `fname`,
       `lname`,
@@ -77,7 +77,7 @@ function getSettings() {
  * @return mixed passwordhash
  */
 function getPasswordHash() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
       `password`,
       `username`
@@ -96,7 +96,7 @@ function getPasswordHash() {
  * @throws HappyAlert
  */
 function updateSettings() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     UPDATE
       `user`
     SET
@@ -146,7 +146,7 @@ function changePassword() {
  * @throws HappyAlert
  */
 function doChangePassword() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     UPDATE
       `user`
     SET
@@ -184,7 +184,7 @@ function changeEmail() {
 }
 
 function emailIsAvailableInDatabase($email) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         `email`
     FROM
@@ -201,7 +201,7 @@ function emailIsAvailableInDatabase($email) {
 }
 
 function doChangeEmail($email) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     UPDATE
         `user`
     SET
@@ -245,7 +245,7 @@ function updateAvatar() {
 }
 
 function removeOldAvatar() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         `profilepicture`
      FROM 
@@ -262,7 +262,7 @@ function removeOldAvatar() {
 }
 
 function setAvatarToDatabase(string $url) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     UPDATE
         `user`
     SET
diff --git a/website/queries/user.php b/website/queries/user.php
index 1d075ef..ec211c0 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -1,9 +1,9 @@
 <?php
 
-require("connect.php");
+require_once ("connect.php");
 
 function getUserID($username) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
             `userID`
         FROM
@@ -18,7 +18,7 @@ function getUserID($username) {
 }
 
 function getUsername($userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
             `username`
         FROM
@@ -33,7 +33,7 @@ function getUsername($userID) {
 }
 
 function selectUser($me, $other) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
           `userID`,
           `username`,
@@ -81,7 +81,7 @@ function selectUser($me, $other) {
 }
 
 function selectAllUserGroups($userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
             `group_page`.`groupID`,
             `name`,
@@ -104,7 +104,7 @@ function selectAllUserGroups($userID) {
 }
 
 function selectAllUserPosts($userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
           `post`.`postID`,
           `post`.`author`,
@@ -146,7 +146,7 @@ function selectAllUserPosts($userID) {
 }
 
 function select20UsersFromN($n) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         `userID`,
         `username`,
@@ -167,7 +167,7 @@ function select20UsersFromN($n) {
 }
 
 function search20UsersFromN($n, $keyword) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         `userID`,
         `username`,
@@ -191,7 +191,7 @@ function search20UsersFromN($n, $keyword) {
 }
 
 function search20UsersFromNByStatus($n, $keyword, $status) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         `userID`,
         `username`,
@@ -219,7 +219,7 @@ function search20UsersFromNByStatus($n, $keyword, $status) {
 }
 
 function searchSomeUsersByStatus($n, $m, $keyword, $status) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         `userID`,
         `username`,
@@ -248,7 +248,7 @@ function searchSomeUsersByStatus($n, $m, $keyword, $status) {
 }
 
 function countSomeUsersByStatus($keyword, $status) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         COUNT(*)
     FROM
@@ -271,7 +271,7 @@ function countSomeUsersByStatus($keyword, $status) {
 
 
 function changeUserStatusByID($id, $status) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     UPDATE
         `user`
     SET
@@ -287,7 +287,7 @@ function changeUserStatusByID($id, $status) {
 }
 
 function changeMultipleUserStatusByID($ids, $status) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     UPDATE
         `user`
     SET
@@ -304,7 +304,7 @@ function changeMultipleUserStatusByID($ids, $status) {
 }
 
 function selectRandomNotFriendUser($userID) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         `user`.`username`
     FROM
@@ -332,7 +332,7 @@ function selectRandomNotFriendUser($userID) {
 }
 
 function searchSomeUsers($n, $m, $search) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
     SELECT
         `userID`,
         `username`,
@@ -367,7 +367,7 @@ function searchSomeUsers($n, $m, $search) {
 }
 
 function countSomeUsers($search) {
-    $q = $GLOBALS["db"]->prepare("
+    $q = prepareQuery("
     SELECT
         COUNT(*)
     FROM
@@ -389,7 +389,7 @@ function countSomeUsers($search) {
 }
 
 function getRoleByID($userID) {
-    $stmt = $GLOBALS['db']->prepare("
+    $stmt = prepareQuery("
         SELECT
             `role`
         FROM

From c1a7ccc076112220f9a8285567f97d7b7f91bd27 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Sun, 29 Jan 2017 14:08:45 +0100
Subject: [PATCH 2/2] Found some extra statemensts

---
 website/public/emailconfirm.php  | 4 ++--
 website/public/resetpassword.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/public/emailconfirm.php b/website/public/emailconfirm.php
index 2812eaa..d0cc5a3 100644
--- a/website/public/emailconfirm.php
+++ b/website/public/emailconfirm.php
@@ -2,7 +2,7 @@
 include_once("../queries/connect.php");
 include_once("../views/messagepage.php");
 if (array_key_exists("u", $_GET) and array_key_exists("h", $_GET)) {
-   $checkHash = $GLOBALS["db"]->prepare("
+   $checkHash = prepareQuery("
    SELECT
       `email`,
       `role`
@@ -28,7 +28,7 @@ if (array_key_exists("u", $_GET) and array_key_exists("h", $_GET)) {
 
 function doActivate(string $email) {
     if (password_verify($email, $_GET["h"])) {
-        $confirmUser = $GLOBALS["db"]->prepare("
+        $confirmUser = prepareQuery("
         UPDATE
             `user`
         SET
diff --git a/website/public/resetpassword.php b/website/public/resetpassword.php
index 3ca2698..795e6e3 100644
--- a/website/public/resetpassword.php
+++ b/website/public/resetpassword.php
@@ -28,7 +28,7 @@ if ($_SERVER["REQUEST_METHOD"] == "GET") {
 }
 
 function changePassword() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         UPDATE
             `user`
         SET
@@ -42,7 +42,7 @@ function changePassword() {
 }
 
 function verifyLink(int $userID, string $hash) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
         SELECT
             `password`
         FROM