Merge branch 'master' into 'marijn-settings'
# Conflicts: # website/views/menu.php
This commit is contained in:
@@ -1,36 +1,46 @@
|
||||
<nav class="menu">
|
||||
<section id="friends-menu-section platform">
|
||||
<h4>
|
||||
Vrienden
|
||||
</h4>
|
||||
<ul class="nav-list">
|
||||
<?php
|
||||
<section id="friends-menu-section">
|
||||
<?php
|
||||
|
||||
// Load file.
|
||||
require_once("../queries/friendship.php");
|
||||
require_once("../queries/user.php");
|
||||
// Load file.
|
||||
require_once("../queries/friendship.php");
|
||||
require_once("../queries/user.php");
|
||||
|
||||
// Get all the friends of a user.
|
||||
$friends = selectAllFriends($_SESSION["userID"]);
|
||||
$i = 0;
|
||||
// Get confirmed friends of the user and a random non-friend.
|
||||
$friends = selectAllFriends($_SESSION["userID"])->fetchAll();
|
||||
$randomUser = selectRandomNotFriendUser($_SESSION["userID"])["username"];
|
||||
$i = 0;
|
||||
|
||||
// Print all the users.
|
||||
while($friend = $friends->fetch(PDO::FETCH_ASSOC)) {
|
||||
$i ++;
|
||||
if (sizeof($friends) == 0) {
|
||||
echo "
|
||||
<ul class=\"nav-list\"><li class='friend-item'>
|
||||
<form action='profile.php' method='get'>
|
||||
<button type='submit'
|
||||
name='username'
|
||||
value='$randomUser'>
|
||||
<div class='friend'>
|
||||
Maak nieuwe vrienden :)
|
||||
</div>
|
||||
</button>
|
||||
</form>
|
||||
</li><ul class=\"nav-list\">
|
||||
";
|
||||
} else {
|
||||
echo "
|
||||
<h4>
|
||||
Vrienden
|
||||
</h4>
|
||||
<ul class=\"nav-list\">
|
||||
";
|
||||
|
||||
// Set default values of a friend.
|
||||
foreach ($friends as $i => $friend) {
|
||||
$username = $friend["username"];
|
||||
$extraItem = "";
|
||||
$pf = "img/avatar-standard.png";
|
||||
$pf = $friend["profilepicture"];
|
||||
|
||||
// Change values if needed.
|
||||
if (!empty($friend["profilepicture"]))
|
||||
$pf = $friend["profilepicture"];
|
||||
|
||||
if ($i > 5)
|
||||
if ($i >= 5)
|
||||
$extraItem = "extra-menu-items";
|
||||
|
||||
// Echo the friend.
|
||||
echo "
|
||||
<li class='friend-item $extraItem'>
|
||||
<form action='profile.php' method='get'>
|
||||
@@ -47,66 +57,45 @@
|
||||
";
|
||||
}
|
||||
|
||||
$randomUser = selectRandomNotFriendUser($_SESSION["userID"])["username"];
|
||||
|
||||
echo "
|
||||
<li class='friend-item'>
|
||||
<form action='/profile' method='get'>
|
||||
<button type='submit'
|
||||
name='username'
|
||||
value='$randomUser'>
|
||||
<div class='friend'>
|
||||
Klik hier voor een nieuw vriendje :)
|
||||
</div>
|
||||
</button>
|
||||
</form>
|
||||
</li>
|
||||
";
|
||||
if ($i > 5) {
|
||||
$i -= 5;
|
||||
if (sizeof($friends) > 5) {
|
||||
echo "
|
||||
<li class='more-item' id='more-friends-click'>
|
||||
En nog $i anderen...
|
||||
</li>
|
||||
Meer vrienden..
|
||||
</li>
|
||||
";
|
||||
}
|
||||
|
||||
?>
|
||||
</ul>
|
||||
}
|
||||
?>
|
||||
</section>
|
||||
<section id="groups-menu-section">
|
||||
<h4>
|
||||
Groepen
|
||||
</h4>
|
||||
<ul class="nav-list">
|
||||
<?php
|
||||
<?php
|
||||
|
||||
// Load file.
|
||||
include_once("../queries/group_member.php");
|
||||
// Load file.
|
||||
require_once("../queries/group_member.php");
|
||||
|
||||
// Get all the friends of a user.
|
||||
$groups = selectAllGroupsFromUser($_SESSION["userID"]);
|
||||
$i = 0;
|
||||
// Get all the friends of a user.
|
||||
$groups = selectAllGroupsFromUser($_SESSION["userID"]);
|
||||
|
||||
// Print all the users.
|
||||
while($group = $groups->fetch(PDO::FETCH_ASSOC)) {
|
||||
$i ++;
|
||||
if (sizeof($groups) > 0) {
|
||||
echo "
|
||||
<h4>
|
||||
Groepen
|
||||
</h4>
|
||||
<ul class=\"nav-list\">
|
||||
";
|
||||
|
||||
foreach ($groups as $i => $group) {
|
||||
// Set default values of a friend.
|
||||
$name = $group["name"];
|
||||
$extraItem = "";
|
||||
$picture = "img/avatar-standard.png";
|
||||
$picture = $group["picture"];
|
||||
|
||||
// Change values if needed.
|
||||
if (!empty($group["picture"]))
|
||||
$picture = $group["picture"];
|
||||
|
||||
if ($i > 3)
|
||||
$extraItem = "extra-menu-items";
|
||||
|
||||
// Echo the friend.
|
||||
echo "
|
||||
<li class='group-item'>
|
||||
<li class='group-item $extraItem'>
|
||||
<form action='group.php' method='get'>
|
||||
<button type='submit'
|
||||
name='groupname'
|
||||
@@ -121,28 +110,21 @@
|
||||
";
|
||||
}
|
||||
|
||||
if ($i == 0) {
|
||||
echo "<li class='group-item'>
|
||||
<div class='group'>
|
||||
Je hoort nergens bij.
|
||||
</div>
|
||||
</li>";
|
||||
} else if ($i > 3) {
|
||||
$i -= 3;
|
||||
if (sizeof($groups) > 3) {
|
||||
echo "
|
||||
<li class='more-item' id='more-groups-click'>
|
||||
En nog $i andere...
|
||||
</li>
|
||||
";
|
||||
<li class='more-item' id='more-groups-click'>
|
||||
Meer groepen..
|
||||
</li>
|
||||
";
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
}
|
||||
?>
|
||||
</section>
|
||||
<section>
|
||||
<ul>
|
||||
<li class="more-item" id="menu-back">
|
||||
Ga terug
|
||||
Terug naar het overzicht
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
</nav>
|
||||
</nav>
|
||||
Reference in New Issue
Block a user