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

Merge branch 'master' into lars

Browse Source
This commit is contained in:
Lars van Hijfte
2017-02-01 14:20:03 +01:00
parent b7a6fae4d9 fb6b392a42
commit 89cff4da8c
12 changed files with 177 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
website/public/API/getPosts.php
View File

@@ -1,7 +1,10 @@
<?php
if(empty($_POST["usr"]) and empty($_POST["grp"])) {
header('HTTP/1.1 500 Non enough arguments');
if(!isset($_POST["offset"]) or !isset($_POST["limit"])) {
header('HTTP/1.1 500 Not enough arguments');
}
if(!isset($_POST["usr"]) and !isset($_POST["grp"])) {
header('HTTP/1.1 500 Not enough arguments');
}
session_start();
@@ -12,24 +15,23 @@ require_once("../../queries/user.php");
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
if (empty($_POST["usr"])) {
$posts = selectAllPosts(0, $_POST["grp"]);
if(empty($_POST["usr"])) {
$posts = selectSomePosts(0, $_POST["grp"], $_POST["offset"], $_POST["limit"]);
} else {
$posts = selectAllPosts($_POST["usr"], 0);
$posts = selectSomePosts($_POST["usr"], 0, $_POST["offset"], $_POST["limit"]);
}
if (!$posts) {
header('HTTP/1.1 500 Query failed');
if(!$posts) {
echo false;
} else {
$results = $posts->fetchAll(PDO::FETCH_ASSOC);
for($i = 0; $i < sizeof($results); $i++) {
$results[$i]["nicetime"] = nicetime($results[$i]["creationdate"]);
}
echo json_encode($results);
}
$results = $posts->fetchAll(PDO::FETCH_ASSOC);
for ($i = 0; $i < sizeof($results); $i++) {
$results[$i]["nicetime"] = nicetime($results[$i]["creationdate"]);
}
echo json_encode($results);
} else {
header('HTTP/1.0 403 Forbidden');
}
}

BIN
website/public/img/nietslecht_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

117
website/public/js/masonry.js
View File

@@ -45,6 +45,21 @@ function postPost() {
}
var masonryMode = 0;
var windowWidth;
var columnCount;
var columns;
var postLimit;
var postAmount = 0;
var noposts = false;
$(document).ready(function () {
windowWidth = $(window).width();
columnCount = Math.floor($(".posts").width() / 250);
columns = new Array(columnCount);
postLimit = columnCount * 7;
});
$(window).on("load", function() {
$(".modal-close").click(function () {
$(".modal").hide();
@@ -52,17 +67,30 @@ $(window).on("load", function() {
$('#modal-response').hide();
$('.modal-default').show();
});
});
var masonryMode = 0;
var windowWidth = $(window).width();
// http://stackoverflow.com/questions/9439725/javascript-how-to-detect-if-browser-window-is-scrolled-to-bottom
// $(window).on("scroll", function () {
// if ((window.innerHeight + window.pageYOffset) >= document.body.offsetHeight) {
// loadMorePosts(userID, groupID, postAmount, postLimit);
// }
// });
window.onscroll = function(ev) {
if($(window).scrollTop() + $(window).height() == $(document).height() ) {
loadMorePosts(userID, groupID, postAmount, postLimit);
}
};
});
$(window).resize(function() {
clearTimeout(window.resizedFinished);
window.resizeFinished = setTimeout(function() {
if ($(window).width() != windowWidth) {
windowWidth = $(window).width();
masonry(masonryMode);
if (columnCount != Math.floor($(".posts").width() / 250)) {
columnCount = Math.floor($(".posts").width() / 250);
masonry(masonryMode);
}
}
}, 250);
});
@@ -72,12 +100,10 @@ var $container = $(".posts");
function masonry(mode) {
masonryMode = mode;
$container.children().remove();
columnCount = Math.floor($(".posts").width() / 250);
/*
* Initialise columns.
*/
var columns = new Array(columnCount);
for (i = 0; i < columnCount; i++) {
$column = $("<div class=\"column\">");
@@ -106,38 +132,61 @@ function masonry(mode) {
/*
* Function will find the column with the shortest height.
*/
function getShortestColumn(columns) {
column = columns[0];
for (i = 1; i < columnCount; i++) {
if (column[0] > columns[i][0]) {
column = columns[i];
}
}
return column;
}
/*
* Get the posts from the server.
*/
$.post("API/getPosts.php", { usr : userID, grp : groupID })
.done(function(data) {
posts = JSON.parse(data);
/*
* Rearange the objects.
*/
$.each(posts, function() {
$post = $("<div class=\"post platform\" onclick=\"requestPost(\'"+this['postID']+"\')\">");
$post.append($("<h2>").html(this["title"]));
$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"]));
shortestColumn = getShortestColumn(columns);
shortestColumn[1].append($post);
shortestColumn[0] = shortestColumn[0] + $post.height() + margin;
});
});
loadMorePosts(userID, groupID, 0, postLimit);
}
function getShortestColumn(columns) {
column = columns[0];
for (i = 1; i < columnCount; i++) {
if (column[0] > columns[i][0]) {
column = columns[i];
}
}
return column;
}
function loadMorePosts(uID, gID, offset, limit) {
if (noposts) {
return;
}
console.log(uID, gID, offset, limit);
$.post("API/getPosts.php", { usr : uID,
grp : gID,
offset : offset,
limit : limit})
.done(function(data) {
if (!data) {
$('.noposts').show();
noposts = true;
return;
}
posts = JSON.parse(data);
/*
* Rearange the objects.
*/
$.each(posts, function() {
$post = $("<div class=\"post platform\" onclick=\"requestPost(\'"+this['postID']+"\')\">");
$post.append($("<h2>").html(this["title"]));
$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"]));
shortestColumn = getShortestColumn(columns);
shortestColumn[1].append($post);
shortestColumn[0] = shortestColumn[0] + $post.height() + margin;
});
});
postAmount += limit;
}

2
website/public/styles/post-popup.css
View File

@@ -14,7 +14,7 @@
/* Modal Content/Box */
.modal-content {
margin: 5% auto;
margin: 50px auto;
width: 70%; /* Could be more or less, depending on screen size */
overflow-y: auto;
}

5
website/public/styles/profile.css
View File

@@ -123,6 +123,11 @@ div.posts .post form textarea.newpost {
font-size: 0.8em;
}
.noposts {
display: none;
text-align: center;
}
@media only screen and (max-width: 1500px) {
.post-box {
width: calc(50% - 68px);

6
website/queries/login.php
View File

@@ -19,7 +19,7 @@ function getUser() {
}
function getUserID() {
$stmt = $GLOBALS["db"]->prepare("
$stmt = prepareQuery("
SELECT
`userID`
FROM
@@ -73,7 +73,7 @@ function validateLogin($username, $password){
}
function fbLogin($fbID) {
$stmt = $GLOBALS["db"]->prepare("
$stmt = prepareQuery("
SELECT
`email`,
`userID`,
@@ -91,7 +91,7 @@ function fbLogin($fbID) {
}
function getfbUserID($fbID) {
$stmt = $GLOBALS["db"]->prepare("
$stmt = prepareQuery("
SELECT
`userID`,
`role`

51
website/queries/post.php
View File

@@ -46,6 +46,57 @@ function selectAllPosts($userID, $groupID) {
}
function selectSomePosts($userID, $groupID, $offset, $limit) {
$stmt = prepareQuery("
SELECT
`post`.`postID`,
`post`.`author`,
`title`,
CASE LENGTH(`post`.`content`) >= 150 AND `post`.`content` NOT LIKE '<img%'
WHEN TRUE THEN
CONCAT(LEFT(`post`.`content`, 150), '...')
WHEN FALSE THEN
`post`.`content`
END
AS `content`,
`post`.`creationdate`,
COUNT(DISTINCT `commentID`) AS `comments`,
COUNT(DISTINCT `niet_slecht`.`postID`) AS `niet_slechts`
FROM
`post`
LEFT JOIN
`niet_slecht`
ON
`post`.`postID` = `niet_slecht`.`postID`
LEFT JOIN
`comment`
ON
`post`.`postID` = `comment`.`postID`
WHERE
`post`.`author` = :userID AND
`groupID` IS NULL OR
`groupID` = :groupID
GROUP BY
`post`.`postID`
ORDER BY
`post`.`creationdate` DESC
LIMIT
:offset, :limit
");
$stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
$stmt->bindParam(':groupID', $groupID , PDO::PARAM_INT);
$stmt->bindParam(':offset', intval($offset), PDO::PARAM_INT);
$stmt->bindParam(':limit', intval($limit), PDO::PARAM_INT);
if(!$stmt->execute()) {
return False;
}
if($stmt->rowCount() == 0) {
return False;
}
return $stmt;
}
function selectPostById($postID) {
$stmt = prepareQuery("
SELECT

6
website/queries/register.php
View File

@@ -17,7 +17,7 @@ function getExistingUsername() {
}
function getExistingFBUsername() {
$stmt = $GLOBALS["db"]->prepare("
$stmt = prepareQuery("
SELECT
`username`
FROM
@@ -49,7 +49,7 @@ function getExistingEmail() {
}
function getExistingFBEmail() {
$stmt = $GLOBALS["db"]->prepare("
$stmt = prepareQuery("
SELECT
`email`,
`userID`
@@ -120,7 +120,7 @@ function registerAccount() {
}
function fbRegisterAccount() {
$stmt = $GLOBALS["db"]->prepare("
$stmt = prepareQuery("
INSERT INTO
`user`(fname,
lname,

4
website/views/facebookRegisterModal.php
View File

@@ -81,18 +81,14 @@
<input type="hidden"
name="fbName"
value="<?php echo $fbName ?>">
<?php echo $fbName ?>
<input type="hidden"
name="fbSurname"
value="<?php echo $fbSurname ?>">
<?php echo $fbSurname ?>
<input type="hidden"
name="fbUserID"
value="<?php echo $fbUserID ?>">
<?php echo $fbUserID ?>
<input type="hidden"
name="fbEmail"
value="<?php echo $fbEmail ?>">
<?php echo $fbEmail ?>
</form>
</div>

9
website/views/homeLoginRegister.php
View File

@@ -58,7 +58,7 @@ $fb = new Facebook\Facebook([
'app_secret' => $appSecret,
'default_graph_version' => 'v2.2',
]);
$redirect = "https://myhyvesbookplus.nl/~joey/login.php";
$redirect = "https://myhyvesbookplus.nl/login.php";
$helper = $fb->getRedirectLoginHelper();
try {
@@ -80,12 +80,6 @@ if(!isset($acces_token)){
$response = $fb->get('/me?fields=email,name,birthday');
$usernode = $response->getGraphUser();
// echo $usernode->getName() . "</br>";
echo $usernode->getID() . "</br>";
// echo $usernode->getProperty("email") . "<br><br>";
// echo "Picture<br>";
// echo "<img src='$image' /><br><br>";
$nameSplit = explode(" ", $usernode->getName());
$fbName = $nameSplit[0];
$fbSurname = $nameSplit[1];
@@ -93,7 +87,6 @@ if(!isset($acces_token)){
$fbEmail = $usernode->getProperty("email");
// $image = 'https://graph.facebook.com/' . $usernode->getId() . '/picture?width=200';
if (fbLogin($fbUserID) == 1) {
$fbID = getfbUserID($fbUserID)["userID"];
$fbRole = getfbUserID($fbUserID)["role"];

15
website/views/post-view.php
View File

@@ -3,22 +3,21 @@ $postID = $_GET['postID'];
$post = selectPostById($postID)->fetch(PDO::FETCH_ASSOC);
$fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . ")";
session_start();
echo("
?>
<div class='post-header header'>
<h4>" . $post['title'] . "</h4>
<h4><?=$post['title']?></h4>
<form method="post" onclick=""><span class="delete-post">verwijder post</span><br /></form>
<span class='postinfo'>
gepost door $fullname,
<span class='posttime' title='" . $post['creationdate'] . "'>
" . nicetime($post['creationdate']) . "
gepost door <?=$fullname?>,
<span class='posttime' title='<?=$post['creationdate']?>'>
<?=nicetime($post['creationdate'])?>
</span>
</span>
</div>
<div class='post-content'>
<p>" . $post['content'] . "</p>
<p><?=$post['content']?></p>
</div>
"); ?>
<div class='post-comments'>
<div class="commentfield">

4
website/views/profile.php
View File

@@ -71,6 +71,10 @@
</div>
<div class="noposts platform">
<p>Geen posts meer!</p>
</div>
<div class="modal">
<div class="modal-content platform">
<div class="modal-close">