Merge branch 'lars' into 'master'

Lars

See merge request !159

website/public/API/loadFriendRequest.php

@@ -4,5 +4,12 @@ session_start();
 
 require_once ("../../queries/connect.php");
 require_once ("../../queries/friendship.php");
+require_once ("../../queries/user.php");
 
-echo selectAllFriendRequests();
+if (isset($_SESSION["userID"]) &&
+    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    getRoleByID($_SESSION["userID"]) != 'banned') {
+    echo selectAllFriendRequests();
+} else {
+    echo "[]";
+}

website/public/API/loadFriends.php

@@ -6,11 +6,15 @@ require_once ("../../queries/connect.php");
 require_once ("../../queries/checkInput.php");
 require_once ("../../queries/friendship.php");
 
-if (isset($_POST["limit"])) {
-    echo selectLimitedFriends($_SESSION["userID"], (int) test_input($_POST["limit"]));
-} else if (isset($_GET["limit"])) {
-    echo selectLimitedFriends($_SESSION["userID"], (int) test_input($_GET["limit"]));
+if (isset($_SESSION["userID"])) {
+    if (isset($_POST["limit"])) {
+        echo selectLimitedFriends($_SESSION["userID"], (int)test_input($_POST["limit"]));
+    } else if (isset($_GET["limit"])) {
+        echo selectLimitedFriends($_SESSION["userID"], (int)test_input($_GET["limit"]));
+    } else {
+        echo selectFriends($_SESSION["userID"]);
+    }
 } else {
-    echo selectFriends($_SESSION["userID"]);
+    echo "[]";
 }
 

website/public/API/postComment.php

@@ -2,28 +2,36 @@
 
 session_start();
 
-require("../../queries/post.php");
+require_once("../../queries/post.php");
 require_once("../../queries/connect.php");
-require("../../queries/checkInput.php");
-print_r($_POST);
-if ($_POST['button'] == 'reaction') {
-    if (empty($_POST['newcomment-content'])) {
-        echo 0;
-    } else {
-        if (makeComment($_POST['postID'],
-            $_SESSION['userID'],
-            test_input($_POST['newcomment-content']))) {
+require_once("../../queries/checkInput.php");
+require_once("../../queries/user.php");
+
+
+if (isset($_SESSION["userID"]) &&
+    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    getRoleByID($_SESSION["userID"]) != 'banned') {
+    if ($_POST['button'] == 'reaction') {
+        if (empty($_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;
         } else {
             echo 0;
         }
-    }
-} else if ($_POST['button'] == 'nietslecht') {
-    if (makeNietSlecht($_POST["postID"], $_SESSION["userID"])) {
-        echo 1;
     } else {
         echo 0;
     }
 } else {
-    echo 0;
+    echo "frozen";
 }

website/public/API/sendMessage.php

@@ -4,14 +4,22 @@ session_start();
 require_once("../../queries/connect.php");
 require_once("../../queries/private_message.php");
 require_once("../../queries/checkInput.php");
+require_once("../../queries/user.php");
 
-if (!empty(test_input($_POST["destination"])) &&
-    !empty(test_input($_POST["content"]))) {
-    if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) {
-        echo 1;
+if (isset($_SESSION["userID"]) &&
+    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    getRoleByID($_SESSION["userID"]) != 'banned') {
+    if (!empty(test_input($_POST["destination"])) &&
+        !empty(test_input($_POST["content"]))
+    ) {
+        if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) {
+            echo 1;
+        } else {
+            echo 0;
+        }
     } else {
         echo 0;
     }
 } else {
-    echo 0;
+    echo "frozen";
 }

website/public/admin.php

@@ -19,9 +19,9 @@
 include_once ("../queries/user.php");
 
 // auth
-$userinfo = getRoleByID($_SESSION['userID'])->fetch(PDO::FETCH_ASSOC);
+$role = getRoleByID($_SESSION['userID']);
 
-if ($userinfo['role'] != 'admin' AND $userinfo['role'] != 'owner') {
+if ($role != 'admin' AND $role != 'owner') {
     header("location:profile.php");
 }
 

website/public/bits/friend-item.php

@@ -33,7 +33,7 @@ foreach($friends as $i => $friend) {
                     }
                     ?>'>
                 <div class='friend'>
-                    <img alt='PF' class='profile-picture' src='<?= $friend->profilepicture ?>'/>
+                    <img alt='PF' class='profile-picture <?= $friend->onlinestatus ?>' src='<?= $friend->profilepicture ?>'/>
                     <div class='friend-name'>
                         <?= $friend->fullname ?><br/>
                         <span style='color: #666'><?php

website/public/group.php

@@ -11,7 +11,7 @@
 <body>
 <?php
 
-include("../queries/group_page.php");
+include_once("../queries/group_page.php");
 
 $group = selectGroupByName($_GET["groupname"]);
 $members = selectGroupMembers(2);

website/public/js/chat.js

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

website/public/js/main.js

@@ -3,7 +3,7 @@ var months = ["januari", "februari", "maart", "april", "mei", "juni", "juli", "a
 
 function fancyText(text) {
     // Add links, images, gifs and (youtube) video's.
-    var regex = /(https?:\/\/.[^ ]*)/ig;
+    var regex = /(https?:\/\/.[^ <>"]*)/ig;
     text = text.replace(regex, function(link) {
         // Add images
         if (link.match(/(https?:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) {
@@ -93,4 +93,14 @@ function showGroups(groups, list) {
     } else {
         return false;
     }
-}
+}
+
+$(document).ready(function() {
+    $("body").delegate("textarea[maxlength]", "keydown", function() {
+        if ($(this).val().length / .9 >= $(this).attr("maxlength")) {
+            $(this).next().text($(this).val().length + "/" + $(this).attr("maxlength"));
+        } else {
+            $(this).next().text("");
+        }
+    });
+});

website/public/js/masonry.js

@@ -19,7 +19,7 @@ function requestPost(postID) {
         var scrollBarWidth = window.innerWidth - document.body.offsetWidth;
         scrollbarMargin(scrollBarWidth, 'hidden');
         $('#modal-response').show();
-        $('#modal-response').html(data);
+        $('#modal-response').html(fancyText(data));
     });
 }
 
@@ -78,7 +78,7 @@ function masonry(mode) {
      * Initialise columns.
      */
     var columns = new Array(columnCount);
-    var $columns = new Array(columnCount);
+
     for (i = 0; i < columnCount; i++) {
         $column = $("<div class=\"column\">");
         $column.width(100/columnCount + "%");
@@ -96,7 +96,7 @@ function masonry(mode) {
         }
 
         $form.append($("<input class=\"newpost\" name=\"title\" placeholder=\"Titel\" type=\"text\">"));
-        $form.append($("<textarea class=\"newpost\" name=\"content\" placeholder=\"Schrijf een berichtje...\">"));
+        $form.append($("<textarea class=\"newpost\" name=\"content\" placeholder=\"Schrijf een berichtje...\" maxlength='1000'></textarea><span></span>"));
         $form.append($("<input value=\"Plaats!\" type=\"submit\">"));
         columns[0][1].append($postInput);
 
@@ -130,7 +130,7 @@ function masonry(mode) {
                $.each(posts, function() {
                    $post = $("<div class=\"post platform\" onclick=\"requestPost(\'"+this['postID']+"\')\">");
                    $post.append($("<h2>").html(this["title"]));
-                   $post.append($("<p>").html(this["content"]));
+                   $post.append($("<p>").html(fancyText(this["content"])));
                    $post.append($("<p class=\"subscript\">").text(this["nicetime"]));
                    $post.append($("<p class=\"subscript\">").text("comments: " + this["comments"] + ", niet slechts: " + this["niet_slechts"]));
 

website/public/js/post.js

@@ -4,8 +4,10 @@ function postComment(buttonValue) {
     $.post(
         "API/postComment.php",
         formData
-    ).done(function(data) {
-        console.log(data);
+    ).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("");
@@ -15,6 +17,6 @@ function postComment(buttonValue) {
         "API/loadPost.php",
         $("#newcommentform").serialize()
     ).done(function (data) {
-        $('#modal-response').html(data);
+        $('#modal-response').html(fancyText(data));
     });
 }

website/public/profile.php

@@ -13,10 +13,10 @@
 </head>
 <body>
 <?php
-include("../queries/user.php");
-include("../queries/friendship.php");
-include("../queries/nicetime.php");
-include("../queries/post.php");
+include_once("../queries/user.php");
+include_once("../queries/friendship.php");
+include_once("../queries/nicetime.php");
+include_once("../queries/post.php");
 
 if(empty($_GET["username"])) {
     $userID = $_SESSION["userID"];

website/public/styles/adminpanel.css

@@ -4,7 +4,7 @@
 
 .admin-panel input[type="radio"], input[type="checkbox"] {
     vertical-align: middle;
-    height: auto;
+    height: 28px;
     margin: 2px;
 }
 
@@ -34,7 +34,6 @@
     width: 100%;
 }
 
-.usertable .table-checkbox {width: 20px}
 .usertable .table-username {width: 150px}
 .usertable .table-status {width: 100px}
 .usertable .table-action {width: 200px}

website/public/styles/header.css

@@ -49,7 +49,7 @@ header div {
 }
 
 #open-notifications {
-    padding: 5px 20px 5px 0px;
+    padding: 20px 20px 20px 0px;
 }
 
 @media only screen and (max-width: 1080px) {

website/public/styles/main.css

@@ -92,6 +92,14 @@ p {
     border-radius: 50%;
 }
 
+.online {
+    border: #4CAF50 solid 3px;
+}
+
+.offline {
+    border: #666666 solid 3px;
+}
+
 .group-picture {
     border-radius: 5px;
 }
@@ -299,8 +307,16 @@ div[data-title]:hover:after {
     body {
         font-size: 28px!important;
     }
-    button {
+    button, input, select {
         font-size: 28px;
+        height: 42px;
+    }
+    textarea {
+        font-size: 28px;
+    }
+    input[type="checkbox"], input[type="radio"] {
+        width: 28px;
+        height: 28px;
     }
 
 }

website/public/styles/profile.css

@@ -45,7 +45,7 @@
 
 .main-picture {
     position: relative;
-    border: #4CAF50 solid 5px;
+    border-width: 5px;
 
     display: inline-block;
     width: 150px;
@@ -120,4 +120,8 @@ div.posts .post form textarea.newpost {
     .post-box {
         width: calc(100% - 65px);
     }
+    .modal {
+        left: 0!important;
+        width: 100%!important;
+    }
 }