From 4abea1ff10cc1376308ba590ee4e97091fc997e1 Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Fri, 17 Jun 2011 10:45:18 -0700 Subject: Added delete post. Fixed logout --- htdocs/moderate/moderate.php | 6 ++++++ htdocs/moderate/src/header.inc.php | 8 +++++++- htdocs/postings.php | 35 ++++++++++++++++++++++++----------- htdocs/src/Post.inc.php | 6 ++---- 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/htdocs/moderate/moderate.php b/htdocs/moderate/moderate.php index 0d3a67d..29294ec 100644 --- a/htdocs/moderate/moderate.php +++ b/htdocs/moderate/moderate.php @@ -32,6 +32,12 @@ if (isset($_GET['id']) and is_numeric($_GET['id'])) { case 'reject': $post->reject(); break; + + case 'delete': + if ($_SESSION['currentUser']->isAdmin()) { + $post->delete(); + } + break; } $post->save(); diff --git a/htdocs/moderate/src/header.inc.php b/htdocs/moderate/src/header.inc.php index 901344a..f0abbe1 100644 --- a/htdocs/moderate/src/header.inc.php +++ b/htdocs/moderate/src/header.inc.php @@ -6,6 +6,12 @@ if (!isset($_SESSION['currentUser'])) { exit(); } +if (isset($_GET['logout'])) { + unset($_SESSION['currentUser']); + header('Location: ' . buildUrl()); + exit(); +} + ?> @@ -58,7 +64,7 @@ if (!isset($_SESSION['currentUser'])) {
  • Account Settings
    • -
  • Logout
    • +
  • Logout
    • diff --git a/htdocs/postings.php b/htdocs/postings.php index a52d939..b275858 100644 --- a/htdocs/postings.php +++ b/htdocs/postings.php @@ -28,24 +28,37 @@ if (!is_numeric($id)) { // Get the post. $post = Post::getById($id); -if (!$post or (!isset($_GET['moderate']) and $post->getStage() != 'approved')) { +if (!$post or (!isset($_SESSION['currentUser']) and $post->getStage() != 'approved')) { errorNotFound(); } -if (isset($_GET['moderate'])) { - if (!isset($_SESSION['currentUser'])) { - header('Location: ' . $CONFIG['urlroot'].'/moderate/login.php'); - exit(); +if (isset($_SESSION['currentUser'])) { + + if ($post->getStage() != 'approved') { + // Post waiting for approval... + echo "
    You are moderating this post: "; + printf("approve " + . "reject", + $post->getid(), $post->getid()); + echo "

    return to moderation

    "; + echo "
    "; + + + } else { + // Post already approved + if ($_SESSION['currentUser']->isAdmin()) { + echo "
    Administrative options:
    "; + + printf("delete post
    " + . "reject post", + $post->getid(), $post->getid()); + echo "
    "; + } } - echo "
    You are moderating this post: "; - printf("Approve " - . "Reject", - $post->getId(), $post->getId()); - echo "

    Return to moderation

    "; - echo "
    "; } + // Display the post. echo "

    ". $post->getName(); diff --git a/htdocs/src/Post.inc.php b/htdocs/src/Post.inc.php index d887694..c844830 100644 --- a/htdocs/src/Post.inc.php +++ b/htdocs/src/Post.inc.php @@ -168,10 +168,8 @@ class Post { } public function approve() { - if ($this->getStage() == 'moderation') { - $this->info['stage'] = 'approved'; - $this->sendAcceptance(); - } + $this->info['stage'] = 'approved'; + $this->sendAcceptance(); } public function verify() { -- cgit v1.2.3