GROUP BUTTONS AND GROUP STYLE #171

Merged
11319801 merged 33 commits from kevin-prototype into master 2017-02-01 12:29:09 +01:00
5 changed files with 30 additions and 18 deletions
Showing only changes of commit 44408ee429 - Show all commits

View File

@@ -5,25 +5,33 @@ session_start();
require_once("../../queries/post.php"); require_once("../../queries/post.php");
require_once("../../queries/connect.php"); require_once("../../queries/connect.php");
require_once("../../queries/checkInput.php"); require_once("../../queries/checkInput.php");
require_once("../../queries/user.php");
if ($_POST['button'] == 'reaction') {
if (empty($_POST['newcomment-content'])) { if (isset($_SESSION["userID"]) &&
echo 0; getRoleByID($_SESSION["userID"]) != 'frozen' &&
} else { getRoleByID($_SESSION["userID"]) != 'banned') {
if (makeComment($_POST['postID'], if ($_POST['button'] == 'reaction') {
$_SESSION['userID'], if (empty($_POST['newcomment-content'])) {
test_input($_POST['newcomment-content']))) { echo 0;
} else {
if (makeComment($_POST['postID'],
$_SESSION['userID'],
test_input($_POST['newcomment-content']))) {
echo 1;
} else {
echo 0;
}
}
} else if ($_POST['button'] == 'nietslecht') {
if (makeNietSlecht($_POST["postID"], $_SESSION["userID"])) {
echo 1; echo 1;
} else { } else {
echo 0; echo 0;
} }
}
} else if ($_POST['button'] == 'nietslecht') {
if (makeNietSlecht($_POST["postID"], $_SESSION["userID"])) {
echo 1;
} else { } else {
echo 0; echo 0;
} }
} else { } else {
echo 0; echo "frozen";
} }

View File

@@ -21,5 +21,5 @@ if (isset($_SESSION["userID"]) &&
echo 0; echo 0;
} }
} else { } else {
echo 0; echo "frozen";
} }

View File

@@ -33,9 +33,9 @@ function sendMessage() {
$.post( $.post(
"API/sendMessage.php", "API/sendMessage.php",
$("#sendMessageForm").serialize() $("#sendMessageForm").serialize()
).done(function(data) { ).done(function(response) {
if (data == "0") { if (response == "frozen") {
alert("Je account is bevroren, dus je kan niet chat berichten versturen. Contacteer een admin als je denk dat dit onjuist is."); alert("Je account is bevroren, dus je kan niet chat berichten versturen. Contacteer een admin als je denkt dat dit onjuist is.");
} }
}); });

View File

@@ -4,7 +4,11 @@ function postComment(buttonValue) {
$.post( $.post(
"API/postComment.php", "API/postComment.php",
formData formData
); ).done(function (response) {
if (response == "frozen") {
alert("Je account is bevroren, dus je kan geen comments plaatsen of \"niet slechten\". Contacteer een admin als je denkt dat dit onjuist is.");
}
});
$("#newcomment").val(""); $("#newcomment").val("");

View File

@@ -1,6 +1,6 @@
<div class="content"> <div class="content">
<div class="user-box"> <div class="user-box">
<img class="profile-picture main-picture <?= $user["online"] ?>" src="<?= $user["profilepicture"] ?>"><br /> <img class="profile-picture main-picture <?= $user["onlinestatus"] ?>" src="<?= $user["profilepicture"] ?>"><br />
<div class="platform"> <div class="platform">
<div class="status-buttons-container"> <div class="status-buttons-container">
<button disabled class="gray"> <button disabled class="gray">