MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into kevin-prototype

Browse Source
This commit is contained in:
K. Nobel
2017-01-20 14:29:55 +01:00
parent 0e5f7dc9fb 756589b323
commit ea3f1c9693
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/public/API/loadMessages.php
View File

@@ -3,11 +3,10 @@
session_start(); session_start();
require_once("../../queries/connect.php"); require_once("../../queries/connect.php");
require_once("../../queries/private_message.php"); require_once("../../queries/private_message.php");
require_once("../../queries/checkInput.php");
if (isset($_POST["lastID"]) && $_POST["lastID"] != "") { if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"]));
echo getNewChatMessages($_POST["lastID"], $_POST["destination"]);
} else { } else {
echo getOldChatMessages($_POST["destination"]); echo getOldChatMessages(test_input($_POST["destination"]));
} }

15
website/public/API/sendMessage.php
View File

@@ -3,16 +3,15 @@
session_start(); session_start();
require_once("../../queries/connect.php"); require_once("../../queries/connect.php");
require_once("../../queries/private_message.php"); require_once("../../queries/private_message.php");
require_once("../../queries/checkInput.php");
if (isset($_POST["destination"]) && if (!empty(test_input($_POST["destination"])) &&
isset($_POST["content"])) { !empty(test_input($_POST["content"]))) {
if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) {
if (sendMessage($_POST["destination"], $_POST["content"])) { echo 1;
echo $_POST["content"] . " is naar " . $_POST["destination"] . " gestuurd";
} else { } else {
echo "YOU FAILED!!!"; echo 0;
} }
} else { } else {
echo "maybe dont try to hax the system?"; echo 0;
} }

6
website/public/js/chat.js
View File

@@ -10,7 +10,6 @@ function loadMessages() {
$("#lastIDForm").serialize() $("#lastIDForm").serialize()
).done(function(data) { ).done(function(data) {
if (data && data != "[]") { if (data && data != "[]") {
console.log(data);
messages = JSON.parse(data); messages = JSON.parse(data);
addMessages(messages); addMessages(messages);
$("#lastID").val(messages[messages.length - 1].messageID); $("#lastID").val(messages[messages.length - 1].messageID);
@@ -23,13 +22,10 @@ function loadMessages() {
function sendMessage() { function sendMessage() {
console.log($("#sendMessageForm").serialize());
$.post( $.post(
"API/sendMessage.php", "API/sendMessage.php",
$("#sendMessageForm").serialize() $("#sendMessageForm").serialize()
).done(function( data ) { );
console.log(data);
});
$("#newContent").val(""); $("#newContent").val("");
} }