Merge branch 'master' into joey-testing

2017-01-20 16:18:57 +01:00
parent 6ff70440e6 7e3648d36c
commit e456591db6
22 changed files with 548 additions and 224 deletions
--- a/website/public/.htaccess
+++ b/website/public/.htaccess
@@ -0,0 +1,12 @@
+Options +FollowSymLinks
+RewriteEngine On
+
+ErrorDocument 404 /error404.jpg
+
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteCond %{SCRIPT_FILENAME} !-f
+
+# Resolve .php file for extensionless php urls
+RewriteRule ^([^/.]+)$ $1.php [L]
+
+RewriteRule ^profile/([A-z0-9]+)$ profile.php?username=$1 [NC]
--- a/website/public/API/loadMessages.php
+++ b/website/public/API/loadMessages.php
@@ -3,11 +3,10 @@
 session_start();
 require_once("../../queries/connect.php");
 require_once("../../queries/private_message.php");
+require_once("../../queries/checkInput.php");

 if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
-
-    echo getNewChatMessages($_POST["lastID"], $_POST["destination"]);
-
+    echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"]));
 } else {
-    echo getOldChatMessages($_POST["destination"]);
+    echo getOldChatMessages(test_input($_POST["destination"]));
 }
--- a/website/public/API/sendMessage.php
+++ b/website/public/API/sendMessage.php
@@ -3,16 +3,15 @@
 session_start();
 require_once("../../queries/connect.php");
 require_once("../../queries/private_message.php");
+require_once("../../queries/checkInput.php");

-if (isset($_POST["destination"]) &&
-    isset($_POST["content"])) {
-
-    if (sendMessage($_POST["destination"], $_POST["content"])) {
-        echo $_POST["content"] . " is naar " . $_POST["destination"] . " gestuurd";
+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 "YOU FAILED!!!";
+        echo 0;
    }
-
 } else {
-    echo "maybe dont try to hax the system?";
+    echo 0;
 }
--- a/website/public/js/admin.js
+++ b/website/public/js/admin.js
@@ -0,0 +1,44 @@
+window.onload = function() {
+    changeFilter();
+};
+
+function checkAll(allbox) {
+    var checkboxes = document.getElementsByClassName('checkbox-list');
+
+    for (var i = 0; i < checkboxes.length; i++) {
+        if (checkboxes[i].type == 'checkbox') {
+            checkboxes[i].checked = allbox.checked;
+        }
+    }
+}
+
+function checkCheckAll(allbox) {
+    var checkboxes = document.getElementsByClassName('checkbox-list');
+    var checked = true;
+
+    for (var i = 0; i < checkboxes.length; i++) {
+        if (checkboxes[i].type == 'checkbox') {
+            if (checkboxes[i].checked == false) {
+                checked = false;
+                break;
+            }
+        }
+    }
+    allbox.checked = checked;
+}
+
+function changeFilter() {
+    if (document.getElementById('group').checked) {
+        document.getElementById('admin-filter').style.display = 'none';
+        document.getElementById('admin-groupfilter').style.display = 'inline-block';
+
+        document.getElementById('admin-batchactions').style.display = 'none';
+        document.getElementById('admin-groupbatchactions').style.display = 'inline-block';
+    } else {
+        document.getElementById('admin-filter').style.display = 'inline-block';
+        document.getElementById('admin-groupfilter').style.display = 'none';
+
+        document.getElementById('admin-batchactions').style.display = 'inline-block';
+        document.getElementById('admin-groupbatchactions').style.display = 'none';
+    }
+}
--- a/website/public/js/chat.js
+++ b/website/public/js/chat.js
@@ -10,7 +10,6 @@ function loadMessages() {
        $("#lastIDForm").serialize()
    ).done(function(data) {
        if (data && data != "[]") {
-            console.log(data);
            messages = JSON.parse(data);
            addMessages(messages);
            $("#lastID").val(messages[messages.length - 1].messageID);
@@ -23,13 +22,10 @@ function loadMessages() {


 function sendMessage() {
-    console.log($("#sendMessageForm").serialize());
    $.post(
        "API/sendMessage.php",
        $("#sendMessageForm").serialize()
-    ).done(function( data ) {
-        console.log(data);
-    });
+    );

    $("#newContent").val("");
 }
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -1,45 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <?php include("../views/head.php"); ?>
+    <script src="/js/masonry.js"></script>
+    <style>
+        @import url("/styles/profile.css");
+    </style>
+</head>
+<body>
 <?php
 include("../queries/user.php");
 include("../queries/friendship.php");
-
-function nicetime($date) {
-    if(empty($date)) {
-        return "No date provided";
-    }
-
-    $single_periods = array("seconde", "minuut", "uur", "dag", "week", "maand", "jaar", "decennium");
-    $multiple_periods = array("seconden", "minuten", "uur", "dagen", "weken", "maanden", "jaar", "decennia");
-    $lengths = array("60", "60", "24", "7", "4.35", "12", "10", "0");
-
-    $now = time();
-    $unix_date = strtotime($date);
-
-    if(empty($unix_date)) {
-        return "Bad date";
-    }
-
-    if($now > $unix_date) {
-        $difference = $now - $unix_date;
-        $tense = "geleden";
-    } else {
-        $difference = $unix_date - $now;
-        $tense = "vanaf nu";
-    }
-
-    for($i = 0; $difference >= $lengths[$i] && $i < count($lengths) - 1; $i++) {
-        $difference /= $lengths[$i];
-    }
-
-    $difference = round($difference);
-
-    if($difference != 1) {
-        $period = $multiple_periods[$i];
-    } else {
-        $period = $single_periods[$i];
-    }
-
-    return "$difference $period $tense";
-}
+include("../queries/nicetime.php");

 if(empty($_GET["username"])) {
    $userID = $_SESSION["userID"];
@@ -52,18 +24,6 @@ $profile_friends = selectAllFriends($userID);
 $profile_groups = selectAllUserGroups($userID);
 $posts = selectAllUserPosts($userID);

-?>
-
-<!DOCTYPE html>
-<html>
-<head>
-    <?php include("../views/head.php"); ?>
-    <style>
-        @import url("styles/profile.css");
-    </style>
-</head>
-<body>
-<?php
 /*
 * This view adds the main layout over the screen.
 * Header, menu, footer.
--- a/website/public/settings.php
+++ b/website/public/settings.php
@@ -22,12 +22,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
            $result = updateSettings();
            break;
        case "password":
-            $result = updatePassword();
+            $result = changePassword();
            break;
        case "email":
            $result = changeEmail();
            break;
        case "picture":
+            updateProfilePicture();
            $result = $notImplemented;
            break;
    }
--- a/website/public/styles/adminpanel.css
+++ b/website/public/styles/adminpanel.css
@@ -13,7 +13,7 @@
    height: auto;
 }

-.admin-actions {
+.admin-batchactions, .admin-groupbatchactions {
    display: inline-block;
    padding: 8px;
    vertical-align: top;
@@ -22,6 +22,10 @@
    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
 }

+.admin-searchform {
+    display: inline-block;
+}
+
 .admin-searchbar {
    display: inline-block;
    margin: 10px;
@@ -44,18 +48,20 @@
    width: 120px;
 }

-.admin-groupfilter {
-    display: none;
-}
-
 .admin-users {
    margin: 10px;
 }

-.admin-userpage {
-    width: 170px;
-    margin-bottom: 20px;
+.admin-userheading {
+    width: auto;
+    float: left;
+}
+
+.admin-pageui {
+    text-align: right;
    float: right;
+    width: auto;
+    margin-bottom: 20px;
 }

 .usertitle {
--- a/website/public/styles/menu.css
+++ b/website/public/styles/menu.css
@@ -30,7 +30,7 @@
    cursor: pointer;
 }

-.friend-item:hover {
+.friend-item:hover, .group-item:hover {
    background: #845663;
    color: white;
 }