Merge branch 'master' into joey-testing

This commit is contained in:
Joey Lai
2017-02-02 10:44:18 +01:00
22 changed files with 436 additions and 155 deletions

View File

@@ -2,23 +2,28 @@
$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>
<?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'] . "'>
" . 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">

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">

View File

@@ -96,6 +96,14 @@ $settings = getSettings();
<?=($settings["showEmail"] ? "checked" : "")?>
>
</li>
<li>
<label for="showProfile">Publiek profiel</label>
<input type="checkbox"
name="showProfile"
id="showProfile"
<?=($settings["showProfile"] ? "checked" : "")?>
>
</li>
<li>
<label for="bio">Bio</label>
<textarea name="bio"