Merge branch 'hendrik-post' into 'master'

Hendrik post

See merge request !185

website/public/API/postPost.php

@@ -12,36 +12,39 @@ if (isset($_SESSION["userID"]) &&
     getRoleByID($_SESSION["userID"]) != 'frozen' &&
     getRoleByID($_SESSION["userID"]) != 'banned') {
 
-    if (empty($_POST["title"]) or
+    if (empty($_SESSION["userID"])) {
-        empty($_POST["content"]) or
-        empty($_SESSION["userID"])
-    ) {
         header('HTTP/1.1 500 Non enough arguments');
     }
 
-    if (empty($_POST["group"])) {
+    if (empty(test_input($_POST["title"])) or
-        // User Post
+        empty(test_input($_POST["content"]))
-        makePost(
+    ) {
-            $_SESSION["userID"],
+        echo "empty";
-            null,
-            test_input($_POST["title"]),
-            test_input($_POST["content"])
-        );
     } else {
-        // Group Post
+        if (empty($_POST["group"])) {
+            // User Post
+            makePost(
+                $_SESSION["userID"],
+                null,
+                test_input($_POST["title"]),
+                test_input($_POST["content"])
+            );
+        } else {
+            // Group Post
 
-        // Check if the user is an admin or mod of the group.
+            // Check if the user is an admin or mod of the group.
-        if (!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) {
+            if (!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) {
-            header('HTTP/1.1 500 Non enough rights');
+                header('HTTP/1.1 500 Non enough rights');
-            return;
+                return;
+            }
+
+            makePost(
+                $_SESSION["userID"],
+                $_POST["group"],
+                test_input($_POST["title"]),
+                test_input($_POST["content"])
+            );
         }
-
-        makePost(
-            $_SESSION["userID"],
-            $_POST["group"],
-            test_input($_POST["title"]),
-            test_input($_POST["content"])
-        );
     }
 } else {
     echo "frozen";

website/public/js/masonry.js

@@ -31,14 +31,28 @@ function postPost() {
         $.post("API/postPost.php", { title: title,
                                      content : content,
                                      group : groupID })
-            .done(function() {
+            .done(function(data) {
-                masonry(masonryMode);
+                if (data == "empty") {
+                    $('#alertbox').show();
+                    $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in.");
+                    window.scrollTo(0,0);
+                } else {
+                    $('#alertbox').hide();
+                    masonry(masonryMode);
+                }
             });
     } else {
         $.post("API/postPost.php", { title: title,
                                      content : content })
-            .done(function() {
+            .done(function(data) {
-                masonry(masonryMode);
+                if (data == "empty") {
+                    $('#alertbox').show();
+                    $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in.");
+                    window.scrollTo(0,0);
+                } else {
+                    $('#alertbox').hide();
+                    masonry(masonryMode);
+                }
             });
     }
 
@@ -98,6 +112,10 @@ function masonry(mode) {
     masonryMode = mode;
     $container.children().remove();
 
+    // reinit posts
+    noposts = false;
+    postAmount = 0;
+
     /*
      * Initialise columns.
      */
@@ -153,9 +171,6 @@ function loadMorePosts(uID, gID, offset, limit) {
         return;
     }
 
-    console.log(uID, gID, offset, limit);
-
-
     $.post("API/getPosts.php", { usr : uID,
                                  grp : gID,
                                  offset : offset,

website/public/styles/profile.css

@@ -1,5 +1,10 @@
 /* New */
 
+.alertbox {
+    display: none;
+    background-color: firebrick;
+}
+
 .user-box {
     text-align: center;
 }

website/views/profile.php

@@ -1,4 +1,8 @@
 <div class="content">
+    <div class='platform alertbox' id="alertbox">
+        <span id="alerttext"></span>
+    </div>
+
     <div class="user-box">
         <img class="profile-picture main-picture <?= $user["onlinestatus"] ?>" src="<?= $user["profilepicture"] ?>"><br />
         <div class="platform">