Merge branch 'lars' into 'master'

Lars See merge request !199
2017-02-03 10:40:16 +01:00
parent 8949d14a5e 02349dbe28
commit 87b0ab5892
21 changed files with 124 additions and 108 deletions
--- a/website/public/API/deletePost.php
+++ b/website/public/API/deletePost.php
@@ -3,10 +3,10 @@ session_start();

 require_once "../../queries/post.php";
 require_once "../../queries/user.php";
-
-if (isset($_SESSION["userID"]) and
-    getRoleByID($_SESSION["userID"]) != 'frozen' and
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+if (!isset($_SESSION["userID"])) {
+    echo "logged out";
+} else if (getRoleByID($_SESSION["userID"]) != 'frozen' and
+           getRoleByID($_SESSION["userID"]) != 'banned') {

    if (empty($_POST["postID"]) or empty($_SESSION["userID"])) {
        header('HTTP/1.1 500 Non enough arguments');
--- a/website/public/API/postComment.php
+++ b/website/public/API/postComment.php
@@ -7,10 +7,10 @@ require_once("../../queries/connect.php");
 require_once("../../queries/checkInput.php");
 require_once("../../queries/user.php");

-
-if (isset($_SESSION["userID"]) &&
-    getRoleByID($_SESSION["userID"]) != 'frozen' &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+if (!isset($_SESSION["userID"])) {
+    echo "logged out";
+} else if (getRoleByID($_SESSION["userID"]) != 'frozen' &&
+           getRoleByID($_SESSION["userID"]) != 'banned') {
    if ($_POST['button'] == 'reaction') {
        if (empty($_POST['newcomment-content'])) {
            echo 0;
--- a/website/public/API/postPost.php
+++ b/website/public/API/postPost.php
@@ -8,9 +8,10 @@ require_once("../../queries/connect.php");
 require_once("../../queries/checkInput.php");
 require_once("../../queries/user.php");

-if (isset($_SESSION["userID"]) &&
-    getRoleByID($_SESSION["userID"]) != 'frozen' &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+if (!isset($_SESSION["userID"])) {
+    echo "logged out";
+} else if (getRoleByID($_SESSION["userID"]) != 'frozen' &&
+           getRoleByID($_SESSION["userID"]) != 'banned') {

    if (empty($_SESSION["userID"])) {
        header('HTTP/1.1 500 Non enough arguments');
--- a/website/public/API/sendMessage.php
+++ b/website/public/API/sendMessage.php
@@ -7,9 +7,10 @@ require_once("../../queries/checkInput.php");
 require_once("../../queries/user.php");

 // Check if the user is allowed to send a message.
-if (isset($_SESSION["userID"]) &&
-    getRoleByID($_SESSION["userID"]) != 'frozen' &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+if (!isset($_SESSION["userID"])) {
+    echo "logged out";
+} else if (getRoleByID($_SESSION["userID"]) != 'frozen' &&
+           getRoleByID($_SESSION["userID"]) != 'banned') {
    if (!empty(test_input($_POST["destination"])) &&
        !empty(test_input($_POST["content"]))
    ) {
--- a/website/public/js/chat.js
+++ b/website/public/js/chat.js
@@ -43,6 +43,8 @@ function sendMessage() {
    ).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.");
+        } else if (response == "logged out") {
+            window.location.href = "login.php?url=" + window.location.pathname;
        }
        // Load messages if the message has been send, so it shows in the chat.
        loadMessages();
--- a/website/public/js/friendButtons.js
+++ b/website/public/js/friendButtons.js
@@ -19,24 +19,24 @@ function placeFriendButtons() {
                    case "0":
                        value1 = "request";
                        class1 = "green";
-                        text1 = "Bevriend";
-                        icon1 = "fa-handshake-o";
+                        text1 = "Word vrienden";
+                        icon1 = "fa-user-plus";
                        break;
                    case "1":
                        value1 = userID;
                        class1 = "green";
                        text1 = "Chat";
-                        icon1 = "fa-comment-o";
+                        icon1 = "fa-comment";
                        value2 = "delete";
                        class2 = "red";
-                        text2 = "Verwijder";
-                        icon2 = "fa-times";
+                        text2 = "Ontvriend";
+                        icon2 = "fa-user-times";
                        break;
                    case "2":
                        value1 = "delete";
                        class1 = "red";
                        text1 = "Trek verzoek in";
-                        icon1 = "fa-cross";
+                        icon1 = "fa-times";
                        break;
                    case "3":
                        value1 = "accept";
@@ -51,16 +51,18 @@ function placeFriendButtons() {
                }

                $buttonContainer.append(
-                    "<button class='"+ class1 +" friend-button' value='"+ value1 +"'>" +
-                        "<i class='fa "+ icon1 +"'></i> " + text1 +
-                    "</button>");
+                    "<div><button class='"+ class1 +" fancy-button friend-button' value='"+ value1 +"'>" +
+                    "<span>"+ text1 +"</span>" +
+                    "<i class='fa fa-fw "+ icon1 +"'></i> " +
+                    "</button></div>");
                $buttonContainer.append(
-                    "<button class='"+ class2 +" friend-button' value='"+ value2 +"'>" +
-                        "<i class='fa "+ icon2 +"'></i> " + text2 +
-                    "</button>");
+                    "<div><button class='"+ class2 +" fancy-button friend-button' value='"+ value2 +"'>" +
+                    "<span>"+ text2 +"</span>" +
+                    "<i class='fa fa-fw "+ icon2 +"'></i> " +
+                    "</button></div>");


-            $buttonContainer.children().click(function() {
+            $buttonContainer.find("button").click(function() {
                if (isNaN(this.value))
                    editFriendship(userID, this.value);
                else if (this.value != "")
--- a/website/public/js/groupButtons.js
+++ b/website/public/js/groupButtons.js
@@ -5,23 +5,23 @@ function placeGroupButtons() {

            if (data == 'none') {
                $buttonContainer.append(
-                    "<button class='green group-button group-button-fixed' value='request'>" +
-                    "<i class='fa fa-plus'></i> Voeg toe" +
+                    "<button class='green group-button fancy-button' value='request'>" +
+                    "<span>Treed toe</span><i class='fa fa-plus'></i>" +
                    "</button>");
            } else if (data == 'request') {
                $buttonContainer.append(
-                    "<button class='red group-button group-button-fixed' value='none'>" +
-                    "<i class='fa fa-times'></i> Trek verzoek in" +
+                    "<button class='red group-button fancy-button' value='none'>" +
+                    "<span>Trek verzoek in</span><i class='fa fa-times'></i>" +
                    "</button>");
            } else if (data == 'admin') {
                $buttonContainer.append(
-                    "<button class='group-button group-button-fancy' value='admin'>" +
+                    "<button class='group-button fancy-button' value='admin'>" +
                        "<span>Instellingen</span><i class='fa fa-cogs'></i>" +
                        "</button>"
                );
            } else {
                $buttonContainer.append(
-                    "<button class='red group-button group-button-fancy' value='none'>" +
+                    "<button class='red group-button fancy-button' value='none'>" +
                    "<span>Verlaat groep</span><i class='fa fa-sign-out'></i>" +
                    "</button>");
            }
--- a/website/public/js/main.js
+++ b/website/public/js/main.js
@@ -3,8 +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;
-    text = text.replace(regex, function(link) {
+    text = text.replace(/(https?:\/\/.[^ \n<>"]*)/ig, function(link) {
        // Add images
        if (link.match(/(https?:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) {
            return "<img alt='" + link + "' src='" + link + "' />";
@@ -39,7 +38,7 @@ function fancyText(text) {
 }

 // This function gets the value of a cookie when given a key.
-// If didn´t find any compatible cookie, it returns false.
+// If it didn´t find any compatible cookie, it returns false.
 function getCookie(key) {
    cookies = document.cookie.split("; ");
    for (var i in cookies) {
--- a/website/public/js/masonry.js
+++ b/website/public/js/masonry.js
@@ -26,7 +26,7 @@ function requestPost(postID) {
 function postPost() {
    title = $("input.newpost[name='title']").val();
    content = $("textarea.newpost[name='content']").val();
-
+    console.log(masonryMode);
    if (masonryMode == 2) {
        $.post("API/postPost.php", { title: title,
                                     content : content,
@@ -36,6 +36,10 @@ function postPost() {
                    $('#alertbox').show();
                    $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in.");
                    window.scrollTo(0,0);
+                } else if (data == "logged out") {
+                    window.location.href = "login.php?url=" + window.location.pathname;
+                } else if (data == "frozen") {
+                    alert("Je account is bevroren, dus je kan geen posts plaatsen. Contacteer een admin als je denkt dat dit onjuist is.");
                } else {
                    $('#alertbox').hide();
                    masonry(masonryMode);
@@ -49,6 +53,10 @@ function postPost() {
                    $('#alertbox').show();
                    $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in.");
                    window.scrollTo(0,0);
+                } else if (data == "logged out") {
+                    window.location.href = "login.php?url=" + window.location.pathname;
+                } else if (data == "frozen") {
+                    alert("Je account is bevroren, dus je kan geen posts plaatsen. Contacteer een admin als je denkt dat dit onjuist is.");
                } else {
                    $('#alertbox').hide();
                    masonry(masonryMode);
--- a/website/public/js/post.js
+++ b/website/public/js/post.js
@@ -8,6 +8,8 @@ function postComment(buttonValue) {
    ).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.");
+        } else if (response == "logged out") {
+            window.location.href = "login.php?url=" + window.location.pathname;
        }
    });

@@ -30,6 +32,8 @@ function deletePost(postID) {
    ).done(function (response) {
        if (response == "frozen") {
            alert("Je account is bevroren, dus je kan geen posts verwijderen. Contacteer een admin als je denkt dat dit onjuist is.");
+        } else if (response == "logged out") {
+            window.location.href = "login.php?url=" + window.location.pathname;
        }
    });
    closeModal();
--- a/website/public/styles/main.css
+++ b/website/public/styles/main.css
@@ -256,8 +256,6 @@ div[data-title]:hover:after {
    top: 150%;
    z-index: 200;
    white-space: nowrap;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
    border-radius: 3px;
    box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
    background-color: #333;
--- a/website/public/styles/post-popup.css
+++ b/website/public/styles/post-popup.css
@@ -91,16 +91,5 @@

 .deleteButton {
    background-color: firebrick;
-}
-
-.deleteButton i {
-    display: inline-block;
-}
-
-.deleteButton:hover span {
-    display: inline-block;
-}
-
-.deleteButton span {
-    display: none;
+    float: right;
 }
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
@@ -27,16 +27,21 @@
    display: inline-block;
 }

+.friend-button-container div, .status-buttons-container div {
+    width: 200px;
+    display: inline-block;
+}
+
 .friend-button-container button, .status-buttons-container button, .group-button-container button {
    display: block;
+    float: right;

    margin: 7px 0;

    font-size: 18px;
 }
-
-.friend-button-container button, .status-buttons-container button, .group-button-fixed {
-    width: 200px;
+.status-buttons-container button {
+    float: left;
 }

 .group-button-container button {
@@ -74,22 +79,21 @@

 .group-picture {
    border: none;
-    margin-right: 15px;
 }

-.group-button-fancy span {
+.fancy-button span {
    display: none;
 }

-.group-button-fancy:hover {
+.fancy-button:hover {
    text-align: right;
 }

-.group-button-fancy i {
+.fancy-button i {
    display: inline-block;
 }

-.group-button-fancy:hover span {
+.fancy-button:hover span {
    display: inline-block;
    margin-right: 5px;
 }
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -6,18 +6,23 @@ function getOldChatMessages($user2ID) {
    if (getFriendshipStatus($user2ID) == 1) {
        $stmt = prepareQuery("
        SELECT
-            *
+          *
        FROM
-            `private_message`
-        WHERE
-            `origin` = :user1 AND 
-            `destination` = :user2 OR 
-            `origin` = :user2 AND
-            `destination` = :user1
+            (SELECT
+                *
+            FROM
+                `private_message`
+            WHERE
+                `origin` = :user1 AND 
+                `destination` = :user2 OR 
+                `origin` = :user2 AND
+                `destination` = :user1
+            ORDER BY
+                `messageID` DESC
+            LIMIT
+              100) sub
        ORDER BY
-            `creationdate` ASC
-        LIMIT
-          100
+            `messageID` ASC
        ");

        $stmt->bindParam(":user1", $user1ID);
@@ -76,7 +81,7 @@ function getNewChatMessages($lastID, $destination) {
            `destination` = :user1) AND
            `messageID` > :lastID
        ORDER BY
-            `creationdate` ASC
+            `messageID` ASC
        ");

        $stmt->bindParam(':user1', $_SESSION["userID"]);
--- a/website/views/group.php
+++ b/website/views/group.php
@@ -1,6 +1,6 @@
 <div class="content">
    <div class="user-box">
-        <img class="group-picture main-picture" src="<?= $group["picture"] ?>"><br />
+        <img alt="<?= $group["name"] ?>" class="group-picture main-picture" src="<?= $group["picture"] ?>"><br />
        <div class="platform">
            <div class="status-buttons-container">
                <button disabled class="gray"><?= $group["status"] ?></button>
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -1,5 +1,5 @@
 <meta charset="UTF-8">
-<meta name="description" content="MyHyvesbook+ is het sociaal media voor alle coole mensen.">
+<meta name="description" content="MyHyvesbook+ is het sociaal medium voor alle coole mensen. Stap nu over van facebook op het gloednieuwe en betere sociaal medium.">
 <meta name="keywords" content="MyHyvesbookPlus,Myhyvesbook+,sociaal,media">
 <meta name="author" content="MyHyvesbookplus corporation">
 <title>MyHyvesbook+</title>
@@ -26,8 +26,8 @@ require_once ("../queries/user.php");

 session_start();

-if(!isset($_SESSION["userID"])){
-    header("location:login.php");
+if(!isset($_SESSION["userID"])) {
+    header("location:login.php?url=" . "$_SERVER[REQUEST_URI]");
 } else {
    updateLastActivity();
 }
--- a/website/views/header.php
+++ b/website/views/header.php
@@ -23,9 +23,9 @@ $userinfo = getHeaderInfo();
            <div id="hello-loop">
                Hallo
            </div>
-            <?=$userinfo["fname"]?>
+            <?= $userinfo["fname"] ?>
        </div>
-        <img id="own-profile-picture" class="profile-picture" src="<?=$userinfo["profilepicture"]?>"/><i id="open-notifications" class="fa fa-bars"></i>
+        <img alt="<?= $userinfo["lname"] ?>" id="own-profile-picture" class="profile-picture" src="<?=$userinfo["profilepicture"]?>"/><i id="open-notifications" class="fa fa-bars"></i>
    </div>
 </header>
 <?php include("notification-center.php"); ?>
--- a/website/views/login_head.php
+++ b/website/views/login_head.php
@@ -1,6 +1,6 @@
 <head>
    <meta charset="UTF-8">
-    <meta name="description" content="MyHyvesbook+ is het sociaal media voor alle coole mensen.">
+    <meta name="description" content="MyHyvesbook+ is het sociaal medium voor alle coole mensen. Stap nu over van facebook op het gloednieuwe en betere sociaal medium.">
    <meta name="keywords" content="MyHyvesbookPlus,Myhyvesbook+,sociaal,media">
    <meta name="author" content="MyHyvesbookplus corporation">
    <title>MyHyvesbook+</title>
--- a/website/views/post-view.php
+++ b/website/views/post-view.php
@@ -5,14 +5,6 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
 ?>
 <div class='post-header header'>
    <h4><?=$post['title']?></h4>
-    <?php if (checkPermissionOnPost($postID, $_SESSION["userID"])) {?>
-    <button class="deleteButton"
-            onclick="deletePost('<?=$postID?>')"
-            type="submit">
-        <i class="fa fa-trash"></i>
-        <span>Verwijder post</span>
-    </button><br />
-    <?php } ?>
    <span class='postinfo'>
        gepost door <?=$fullname?>,
            <span class='posttime' title='<?=$post['creationdate']?>'>
@@ -20,7 +12,14 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
            </span>
    </span>
 </div>
-
+<?php if (checkPermissionOnPost($postID, $_SESSION["userID"])) {?>
+    <button class="deleteButton fancy-button"
+            onclick="deletePost('<?=$postID?>')"
+            type="submit">
+        <span>Verwijder post</span>
+        <i class="fa fa-trash"></i>
+    </button><br />
+<?php } ?>
 <div class='post-content'>
    <p><?=$post['content']?></p>
 </div>
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -4,13 +4,19 @@
    </div>

    <div class="user-box">
-        <img class="profile-picture main-picture <?= $user["onlinestatus"] ?>" src="<?= $user["profilepicture"] ?>"><br />
+        <img alt="<?= $user["fname"] ?>" class="profile-picture main-picture <?= $user["onlinestatus"] ?>" src="<?= $user["profilepicture"] ?>"><br />
        <div class="platform">
            <div class="status-buttons-container">
-                <button disabled class="gray">
-                    <?= $user["onlinestatus"] ?>
-                </button>
-                <button disabled class="gray"><?= $user["role"] ?></button>
+                <div>
+                    <button disabled class="gray">
+                        <?= $user["onlinestatus"] ?>
+                    </button>
+                </div>
+                <div>
+                    <button disabled class="gray">
+                        <?= $user["role"] ?>
+                    </button>
+                </div>
            </div>
            <div class="friend-button-container">
                <p>:)</p>
@@ -33,18 +39,16 @@
    <?php if($showProfile) { ?>
    <div class="item-box platform">
        <h3>Informatie</h3>
-        <p>
-            <ul>
-                <?php if ($user["showBday"]) { ?>
-                <li>Leeftijd: <?= getAge($user["birthdate"]) ?> jaar</li>
-                <?php } ?>
-                <?php if ($user["showEmail"]) { ?>
-                    <li>Email: <?= $user["email"] ?></li>
-                <?php } ?>
-                <li>Locatie: <?= $user["location"] ?></li>
-                <li>Lid sinds: <?= nicetime($user["creationdate"]) ?></li>
-            </ul>
-        </p>
+        <ul>
+            <?php if ($user["showBday"]) { ?>
+            <li>Leeftijd: <?= getAge($user["birthdate"]) ?> jaar</li>
+            <?php } ?>
+            <?php if ($user["showEmail"]) { ?>
+                <li>Email: <?= $user["email"] ?></li>
+            <?php } ?>
+            <li>Locatie: <?= $user["location"] ?></li>
+            <li>Lid sinds: <?= nicetime($user["creationdate"]) ?></li>
+        </ul>
    </div>

    <div class="item-box platform">
@@ -52,7 +56,7 @@
        <p>
            <?php
                while($friend = $profile_friends->fetch()) {
-                    echo "<a href='profile.php?username=${friend["username"]}' data-title='${friend["username"]}'><img class='profile-picture' src='${friend["profilepicture"]}' alt='${friend["username"]}'s profielfoto></a>";
+                    echo "<a href='profile.php?username=${friend["username"]}' data-title='${friend["username"]}'><img class='profile-picture' height='42' width='42' src='${friend["profilepicture"]}' alt='${friend["username"]}' /></a>";
                }


--- a/website/views/settings-view.php
+++ b/website/views/settings-view.php
@@ -45,8 +45,8 @@ $settings = getSettings();
                </li>
                <li>
                    <?php $currentbday = new DateTime($settings["birthdate"]); ?>
-                    <label for="bday">Geboortedatum</label>
-                    <select name='day' id="bday">
+                    <label>Geboortedatum</label>
+                    <select name='day'>
                        <?php for ($day = 1; $day <= 31; $day++): ?>
                        <option value='<?=$day?>'
                                <?=($day == $currentbday->format("d")) ? "selected" : ""?>
@@ -55,7 +55,7 @@ $settings = getSettings();
                        </option>
                        <?php endfor; ?>
                    </select>
-                    <select name='month' id="bday">
+                    <select name='month'>
                        <?php
                        $months = array ("januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus",
                            "september", "oktober", "november", "december");
@@ -68,7 +68,7 @@ $settings = getSettings();
                            </option>
                        <?php endfor; ?>
                    </select>
-                    <select name='year' id="bday">
+                    <select name='year'>
                        <?php
                        $now = (new DateTime)->format("Y");
                        for ($year = $now; $year >= 1900; $year--): ?>