MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Marijn button #99

Merged
11166932 merged 152 commits from marijn-button into master 2017-01-23 13:25:08 +01:00
Conversation 2 Commits 152 Files Changed 52 +6 -5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b37d06e2cc - Show all commits

5
website/queries/friendship.php
View File

@@ -2,12 +2,12 @@
require("connect.php"); require("connect.php");
function selectAllFriends($db, $userID) { function selectAllFriends($db, $userID) {
$stmt = $db->prepare(" $stmt = $GLOBALS["db"]->prepare("
SELECT SELECT
`username`, `username`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'img/notbad.png' '../img/notbad.jpg'
) AS profilepicture, ) AS profilepicture,
`onlinestatus`, `onlinestatus`,
`role` `role`
@@ -26,5 +26,6 @@ function selectAllFriends($db, $userID) {
$stmt->bindParam(':userID', $userID, PDO::PARAM_INT); $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
$stmt->execute(); $stmt->execute();
return $stmt; return $stmt;
} }

6
website/queries/user.php
View File

@@ -22,7 +22,7 @@ function selectUser($db, $userID) {
`username`, `username`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'img/notbad.png' '../img/notbad.jpg'
) AS profilepicture, ) AS profilepicture,
`bio`, `bio`,
`role`, `role`,
@@ -42,7 +42,7 @@ function selectUser($db, $userID) {
} }
function selectAllUserGroups($db, $userID) { function selectAllUserGroups($db, $userID) {
$stmt = $db->prepare(" $stmt = $GLOBALS["db"]->prepare("
SELECT SELECT
`group_page`.`groupID`, `group_page`.`groupID`,
`name`, `name`,
@@ -65,7 +65,7 @@ function selectAllUserGroups($db, $userID) {
} }
function selectAllUserPosts($db, $userID) { function selectAllUserPosts($db, $userID) {
$stmt = $db->prepare(" $stmt = $GLOBALS["db"]->prepare("
SELECT SELECT
`postID`, `postID`,
`author`, `author`,