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

Lars chat #107

Merged
11291680 merged 11 commits from lars-chat into master 2017-01-24 14:30:12 +01:00
Conversation 2 Commits 11 Files Changed 13 +7 -7
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1359920e0 - Show all commits

BIN
website/public/img/avatar-standard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
website/public/img/notbad.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

4
website/queries/friendship.php
View File

@@ -7,7 +7,7 @@ function selectAllFriends($userID) {
`username`, `username`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'../img/notbad.jpg' '../img/avatar-standard.png'
) AS profilepicture, ) AS profilepicture,
`onlinestatus`, `onlinestatus`,
`role` `role`
@@ -38,7 +38,7 @@ function selectAllFriendRequests() {
`username`, `username`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'../img/notbad.jpg' '../img/avatar-standard.png'
) AS profilepicture, ) AS profilepicture,
`onlinestatus`, `onlinestatus`,
`role` `role`

2
website/queries/header.php
View File

@@ -6,7 +6,7 @@ function getHeaderInfo() {
`lname`, `lname`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'img/notbad.jpg' 'img/avatar-standard.png'
) AS profilepicture ) AS profilepicture
FROM FROM
`user` `user`

2
website/queries/user.php
View File

@@ -23,7 +23,7 @@ function selectUser($userID) {
`username`, `username`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'../img/notbad.jpg' '../img/avatar-standard.png'
) AS profilepicture, ) AS profilepicture,
`bio`, `bio`,
`role`, `role`,

2
website/views/chat-view.php
View File

@@ -17,7 +17,7 @@
// Set default values of a friend. // Set default values of a friend.
$username = $friend["username"]; $username = $friend["username"];
$userID = $friend["userID"]; $userID = $friend["userID"];
$pf = "img/notbad.jpg"; $pf = "img/avatar-standard.png";
// Change values if needed. // Change values if needed.
if (!empty($friend["profilepicture"])) if (!empty($friend["profilepicture"]))

4
website/views/menu.php
View File

@@ -21,7 +21,7 @@
// Set default values of a friend. // Set default values of a friend.
$username = $friend["username"]; $username = $friend["username"];
$extraItem = ""; $extraItem = "";
$pf = "img/notbad.jpg"; $pf = "img/avatar-standard.png";
// Change values if needed. // Change values if needed.
if (!empty($friend["profilepicture"])) if (!empty($friend["profilepicture"]))
@@ -95,7 +95,7 @@
// Set default values of a friend. // Set default values of a friend.
$name = $group["name"]; $name = $group["name"];
$extraItem = ""; $extraItem = "";
$picture = "img/notbad.jpg"; $picture = "img/avatar-standard.png";
// Change values if needed. // Change values if needed.
if (!empty($group["picture"])) if (!empty($group["picture"]))