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

Merge branch 'kevin-prototype' into 'master'

Browse Source 
FIXED VISIBILITY ON PROFILE

See merge request !183
This commit was merged in pull request #187.
This commit is contained in:
Lars van Hijfte
2017-02-02 13:57:44 +01:00
parent 3abaeba52c 328ce69144
commit 5c1b2d1b21
6 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/public/group.php
View File

@@ -14,12 +14,7 @@
include_once("../queries/group_page.php");
$group = selectGroupByName($_GET["groupname"]);
$members = selectGroupMembers(2);
?>
<script>alert("<?= $members[0] ?>");</script>
<script>alert("<?= $members[1] ?>");</script>
<?php
$members = selectGroupMembers($group["groupID"]);
/*
* This view adds the main layout over the screen.

6
website/public/profile.php
View File

@@ -21,13 +21,19 @@ include_once("../queries/calcAge.php");
if(empty($_GET["username"])) {
$userID = $_SESSION["userID"];
$showProfile = True;
} else {
$userID = getUserID($_GET["username"]);
$showProfile = False;
}
$user = selectUser($_SESSION["userID"], $userID);
$profile_friends = selectAllFriends($userID);
$profile_groups = selectAllUserGroups($userID);
$showProfile = $showProfile || $user["showProfile"] || ($user["status"] == 'confirmed');
echo " friendship status: " . $user["status"];
echo " showprofile: $showProfile";
echo " userID: " . $user["userID"];
if ($userID == $_SESSION["userID"]) {