From f82dd73b7de91479722ff1d3a63ffb4fbb465bcd Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Mon, 23 Jan 2017 16:23:47 +0100 Subject: [PATCH 1/5] Profile picrure old deletion (: --- website/public/settings.php | 5 ++--- website/queries/settings.php | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/website/public/settings.php b/website/public/settings.php index 06d17c0..b473f99 100644 --- a/website/public/settings.php +++ b/website/public/settings.php @@ -2,7 +2,7 @@ @@ -12,8 +12,6 @@ prepare(" + SELECT + `profilepicture` + FROM + `user` + WHERE + `userID` = :userID + "); + $stmt->bindParam(":userID", $_SESSION["userID"]); + $stmt->execute(); + $old_avatar = $stmt->fetch()["profilepicture"]; + unlink("/var/www/html/public/uploads/" . $old_avatar); +} function setProfilePictureToDatabase($url) { $stmt = $GLOBALS["db"]->prepare(" From 58ce5f1e7515198cace4d0aef031e1de63df01fb Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Mon, 23 Jan 2017 16:24:48 +0100 Subject: [PATCH 2/5] Menu, netjes, notification --- website/public/API/loadChatNotifications.php | 8 + ...php => loadFriendRequestNotifications.php} | 0 website/public/js/header.js | 6 +- website/public/js/notifications.js | 18 ++- website/public/styles/footer.css | 3 +- website/public/styles/main.css | 1 + website/public/styles/menu.css | 20 ++- website/public/styles/profile.css | 3 - website/queries/friendship.php | 8 +- website/queries/group_member.php | 11 +- website/views/menu.php | 140 ++++++++---------- 11 files changed, 114 insertions(+), 104 deletions(-) create mode 100644 website/public/API/loadChatNotifications.php rename website/public/API/{loadNotifications.php => loadFriendRequestNotifications.php} (100%) diff --git a/website/public/API/loadChatNotifications.php b/website/public/API/loadChatNotifications.php new file mode 100644 index 0000000..3b5835f --- /dev/null +++ b/website/public/API/loadChatNotifications.php @@ -0,0 +1,8 @@ + \
\ +
+