Merge branch 'master' into hendrik-search
This commit is contained in:
@@ -1,16 +1,8 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Admin Panel</title>
|
||||
<script src="/js/admin.js" charset="utf-8"></script>
|
||||
<?php
|
||||
include_once("../queries/user.php");
|
||||
include_once("../queries/group_page.php");
|
||||
?>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<script src="js/admin.js" charset="utf-8"></script>
|
||||
<?php
|
||||
require_once ("../queries/user.php");
|
||||
require_once ("../queries/group_page.php");
|
||||
?>
|
||||
<!-- function test_input taken from http://www.w3schools.com/php/php_form_validation.asp -->
|
||||
<?php
|
||||
$search = "";
|
||||
@@ -66,48 +58,81 @@ $listm = $currentpage * $perpage;
|
||||
|
||||
<div class="content">
|
||||
<div class="platform admin-panel">
|
||||
<div class="admin-title">
|
||||
<h1>User Management Panel</h1>
|
||||
</div> <br>
|
||||
<h5>Zoek naar gebruikers of groepen:</h5>
|
||||
<div class="admin-options">
|
||||
<form class="admin-searchform"
|
||||
action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
|
||||
method="get">
|
||||
|
||||
<div class="admin-searchbar">
|
||||
<h2>Search</h2>
|
||||
<input type="text"
|
||||
Zoek: <input type="text"
|
||||
name="search"
|
||||
class="admin-searchinput"
|
||||
value="<?php echo $search;?>"> <br>
|
||||
<input type="submit" value="Search">
|
||||
placeholder="Naam"
|
||||
value="<?php echo $search;?>">
|
||||
Op: <select name="pagetype" id="pagetype" onchange="changeFilter()">
|
||||
<option value="user"
|
||||
<?php if (isset($pagetype) && $pagetype=="user") echo "selected";?>>
|
||||
Gerbuiker
|
||||
</option>
|
||||
<option value="group"
|
||||
<?php if (isset($pagetype) && $pagetype=="group") echo "selected";?>>
|
||||
Groep
|
||||
</option>
|
||||
</select>
|
||||
<button type="submit"><i class="fa fa-search"></i></button>
|
||||
</div>
|
||||
|
||||
<div class="admin-filter" id="admin-filter">
|
||||
<h2>Show:</h2>
|
||||
|
||||
<input type="checkbox" name="status[]" id="normal" value="1"
|
||||
<?php if (in_array("1", $status)) echo "checked";?>>
|
||||
<div id="admin-filter">
|
||||
<h5>Type gebruiker:</h5>
|
||||
<input type="checkbox"
|
||||
name="status[]"
|
||||
id="all"
|
||||
value="all"
|
||||
<?php if (in_array("all", $status)) echo "checked";?>>
|
||||
<label for="normal">Allemaal</label><br>
|
||||
<input type="checkbox"
|
||||
name="status[]"
|
||||
id="normal"
|
||||
value="user"
|
||||
<?php if (in_array("user", $status)) echo "checked";?>>
|
||||
<label for="normal">Normal</label><br>
|
||||
<input type="checkbox" name="status[]" id="frozen" value="2"
|
||||
<?php if (in_array("2", $status)) echo "checked";?>>
|
||||
<input type="checkbox"
|
||||
name="status[]"
|
||||
id="frozen"
|
||||
value="frozen"
|
||||
<?php if (in_array("frozen", $status)) echo "checked";?>>
|
||||
<label for="frozen">Frozen</label><br>
|
||||
<input type="checkbox" name="status[]" id="banned" value="3"
|
||||
<?php if (in_array("3", $status)) echo "checked";?>>
|
||||
<input type="checkbox"
|
||||
name="status[]"
|
||||
id="banned"
|
||||
value="banned"
|
||||
<?php if (in_array("banned", $status)) echo "checked";?>>
|
||||
<label for="banned">Banned</label><br>
|
||||
<input type="checkbox" name="status[]" id="admin" value="5"
|
||||
<?php if (in_array("5", $status)) echo "checked";?>>
|
||||
<input type="checkbox"
|
||||
name="status[]"
|
||||
id="admin"
|
||||
value="admin"
|
||||
<?php if (in_array("admin", $status)) echo "checked";?>>
|
||||
<label for="admin">Admin</label><br>
|
||||
<input type="checkbox" name="status[]" id="unvalidated" value="0"
|
||||
<?php if (in_array("0", $status)) echo "checked";?>>
|
||||
<input type="checkbox"
|
||||
name="status[]"
|
||||
id="unvalidated"
|
||||
value="unconfirmed"
|
||||
<?php if (in_array("unconfirmed", $status)) echo "checked";?>>
|
||||
<label for="unvalidated">Unvalidated</label><br>
|
||||
<input type="checkbox" name="status[]" id="owner" value="42"
|
||||
<?php if (in_array("42", $status)) echo "checked";?>>
|
||||
<input type="checkbox"
|
||||
name="status[]"
|
||||
id="owner"
|
||||
value="owner"
|
||||
<?php if (in_array("owner", $status)) echo "checked";?>>
|
||||
<label for="owner">Owner</label>
|
||||
</div>
|
||||
|
||||
<div class="admin-groupfilter" id="admin-groupfilter">
|
||||
<h2>Show:</h2>
|
||||
|
||||
<div id="admin-groupfilter">
|
||||
<h5>Type groep:</h5>
|
||||
<input type="checkbox" name="groupstatus[]" id="all" value="all"
|
||||
<?php if (in_array("all", $groupstatus)) echo "checked";?>>
|
||||
<label for="hidden">Allemaal</label><br>
|
||||
<input type="checkbox" name="groupstatus[]" id="hidden" value="0"
|
||||
<?php if (in_array("0", $groupstatus)) echo "checked";?>>
|
||||
<label for="hidden">Hidden</label><br>
|
||||
@@ -118,60 +143,12 @@ $listm = $currentpage * $perpage;
|
||||
<?php if (in_array("2", $groupstatus)) echo "checked";?>>
|
||||
<label for="membersonly">Members-only</label><br>
|
||||
</div>
|
||||
|
||||
<div class="admin-filtertype">
|
||||
<h2>Page Type:</h2>
|
||||
<input type="radio" name="pagetype" id="user" value="user"
|
||||
<?php if (isset($pagetype) && $pagetype=="user") echo "checked";?>
|
||||
onchange="changeFilter()">
|
||||
<label for="user">Users</label><br>
|
||||
<input type="radio" name="pagetype" id="group" value="group"
|
||||
<?php if (isset($pagetype) && $pagetype=="group") echo "checked";?>
|
||||
onchange="changeFilter()">
|
||||
<label for="group">Groups</label>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="admin-batchactions" id="admin-batchactions">
|
||||
<h2>Batch Actions: </h2>
|
||||
<form class="admin-batchform"
|
||||
id="admin-batchform"
|
||||
action="<?php htmlspecialchars(basename($_SERVER['REQUEST_URI'])) ?>"
|
||||
method="post">
|
||||
<input type="radio" name="batchactions" id="freeze" value="2">
|
||||
<label for="freeze">Freeze</label><br>
|
||||
<input type="radio" name="batchactions" id="ban" value="3">
|
||||
<label for="ban">Ban</label><br>
|
||||
<input type="radio" name="batchactions" id="restore" value="1">
|
||||
<label for="restore">Restore</label><br><br>
|
||||
<input type="submit" value="Confirm">
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="admin-groupbatchactions" id="admin-groupbatchactions">
|
||||
<h2>Batch Actions: </h2>
|
||||
<form class="admin-groupbatchform"
|
||||
id="admin-groupbatchform"
|
||||
action="<?php htmlspecialchars(basename($_SERVER['REQUEST_URI'])) ?>"
|
||||
method="post">
|
||||
<input type="radio" name="groupbatchactions" id="hide" value="0">
|
||||
<label for="hide">Hide</label><br>
|
||||
<input type="radio" name="groupbatchactions" id="public" value="1">
|
||||
<label for="public">Public</label><br>
|
||||
<input type="radio" name="groupbatchactions" id="membersonly" value="2">
|
||||
<label for="membersonly">Member</label><br><br>
|
||||
<input type="submit" value="Confirm">
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="admin-users">
|
||||
<div class="admin-usertitle">
|
||||
<div class="admin-userheading">
|
||||
<h2>Users:</h2>
|
||||
</div>
|
||||
<div class="admin-pageui">
|
||||
<h4>Resultaat:</h4>
|
||||
<span style="float: right">
|
||||
<?php
|
||||
if ($pagetype == "user") {
|
||||
$pages = countSomeUsersByStatus($search, $status);
|
||||
@@ -182,8 +159,7 @@ $listm = $currentpage * $perpage;
|
||||
$mincount = min($listm, $countresults);
|
||||
$minlist = min($listn + 1, $countresults);
|
||||
?>
|
||||
<p class="pagenumber">Current page:</p>
|
||||
<form class="admin-pageselector"
|
||||
Pagina: <form class="admin-pageselector"
|
||||
action="<?php htmlspecialchars(basename($_SERVER['REQUEST_URI'])) ?>"
|
||||
method="post">
|
||||
<select class="admin-pageselect"
|
||||
@@ -201,22 +177,27 @@ $listm = $currentpage * $perpage;
|
||||
?>
|
||||
</select>
|
||||
</form>
|
||||
<p class="entriesshown">
|
||||
<?php
|
||||
echo "Showing results $minlist to $mincount out of $countresults";
|
||||
echo "$minlist tot $mincount ($countresults totaal)";
|
||||
?>
|
||||
</div>
|
||||
</div> <br>
|
||||
</span>
|
||||
<form
|
||||
id="admin-batchform"
|
||||
action="<?php htmlspecialchars(basename($_SERVER['REQUEST_URI'])) ?>"
|
||||
method="post">
|
||||
|
||||
<button type="submit" name="batchactions" id="freeze" value="frozen">Bevries</button>
|
||||
<button type="submit" name="batchactions" id="ban" value="banned">Ban</button>
|
||||
<button type="submit" name="batchactions" id="restore" value="user">Activeer</button>
|
||||
</form>
|
||||
</div>
|
||||
<table class="usertable">
|
||||
<tr>
|
||||
<th class="table-checkbox">
|
||||
<input type="checkbox" id="checkall" name="checkall" onchange="checkAll(this)">
|
||||
</th>
|
||||
<th class="table-username">User</th>
|
||||
<th><input type="checkbox" id="checkall" name="checkall" onchange="checkAll(this)"></th>
|
||||
<th class="table-username">Gebruikersnaam</th>
|
||||
<th class="table-status">Status</th>
|
||||
<th class="table-comment">Comment</th>
|
||||
<th class="table-action">Action</th>
|
||||
<th class="table-comment">Aantekening</th>
|
||||
<th class="table-action">Actie</th>
|
||||
</tr>
|
||||
|
||||
<!-- Table construction via php PDO. -->
|
||||
@@ -226,7 +207,6 @@ $listm = $currentpage * $perpage;
|
||||
|
||||
if ($pagetype == 'user') {
|
||||
$q = searchSomeUsersByStatus($listn, $listm, $search, $status);
|
||||
|
||||
while($user = $q->fetch(PDO::FETCH_ASSOC)) {
|
||||
$userID = $user['userID'];
|
||||
$username = $user['username'];
|
||||
@@ -252,9 +232,9 @@ $listm = $currentpage * $perpage;
|
||||
action='$thispage'
|
||||
method='post'>
|
||||
<select class='action' name='actions'>
|
||||
<option value='2'>Freeze</option>
|
||||
<option value='3'>Ban</option>
|
||||
<option value='1'>Restore</option>
|
||||
<option value='frozen'>Bevries</option>
|
||||
<option value='banned'>Ban</option>
|
||||
<option value='user'>Activeer</option>
|
||||
</select>
|
||||
<input type='hidden' name='userID' value='$userID'>
|
||||
<input type='submit' value='Confirm'>
|
||||
|
||||
@@ -14,8 +14,9 @@ $userinfo = getHeaderInfo();
|
||||
placeholder="Zoek naar wat je wil"
|
||||
required
|
||||
/>
|
||||
<input type="submit"
|
||||
value="Zoek"/>
|
||||
<button type="submit">
|
||||
<i class="fa fa-search"></i>
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
<div class="right profile-menu">
|
||||
|
||||
@@ -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/notbad.jpg";
|
||||
$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/notbad.jpg";
|
||||
$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,27 +110,20 @@
|
||||
";
|
||||
}
|
||||
|
||||
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>
|
||||
|
||||
Reference in New Issue
Block a user