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

Merge branch 'lars' into 'master'

Browse Source 
Lars

See merge request !180
This commit was merged in pull request #184.
This commit is contained in:
Lars van Hijfte
2017-02-02 12:46:42 +01:00
parent cc9866d3dd 1dfc14e6f0
commit 487e0a0523
22 changed files with 116 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
website/queries/friendship.php
View File

@@ -10,8 +10,8 @@ function selectLimitedFriends($userID, $limit) {
$stmt = prepareQuery("
SELECT
`userID`,
`username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
LEFT(`username`, 12) as `username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
IFNULL(
`profilepicture`,
'../img/avatar-standard.png'
@@ -50,8 +50,8 @@ function selectAllFriends($userID) {
$stmt = prepareQuery("
SELECT
`userID`,
`username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
LEFT(`username`, 12) as `username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
IFNULL(
`profilepicture`,
'../img/avatar-standard.png'
@@ -85,8 +85,8 @@ function selectAllFriendRequests() {
$stmt = prepareQuery("
SELECT
`userID`,
`username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
LEFT(`username`, 12) as `username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
IFNULL(
`profilepicture`,
'../img/avatar-standard.png'
@@ -235,8 +235,9 @@ function searchSomeFriends($n, $m, $search) {
$stmt = prepareQuery("
SELECT
`userID`,
`username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
LEFT(`username`, 12) as `username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
IFNULL(
`profilepicture`,
'../img/avatar-standard.png'

2
website/queries/private_message.php
View File

@@ -95,7 +95,7 @@ function getNewChatMessages($lastID, $destination) {
function selectAllUnreadChat() {
$stmt = prepareQuery("
SELECT
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) AS `fullname`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
`user`.`userID`,
IFNULL(
`profilepicture`,

8
website/queries/user.php
View File

@@ -52,6 +52,10 @@ function selectUser($me, $other) {
`username`,
`birthdate`,
`location`,
`showBday`,
`showEmail`,
`showProfile`,
`email`,
IFNULL(
`profilepicture`,
'../img/avatar-standard.png'
@@ -351,12 +355,12 @@ function searchSomeUsers($n, $m, $search) {
$stmt = prepareQuery("
SELECT
`userID`,
`username`,
LEFT(`username`, 12) as `username`,
IFNULL(
`profilepicture`,
'../img/avatar-standard.png'
) AS profilepicture,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE)
WHEN TRUE THEN 'online'
WHEN FALSE THEN 'offline'