Welcome

" + printf("

" . "%s %s

", - $id, $post->getName(), $post->getCreated(), $post->getEmail(), $post->getEmail()); + $GLOBALS['CONFIG']['urlroot'], + $id, $post->getName(), + $post->getCreated(), + $post->getEmail(), $post->getEmail()); } } else { echo "

No posts awaiting approval

"; } -require_once('footer.inc.php'); +require_once('src/footer.inc.php'); ?> diff --git a/htdocs/moderate/moderate.php b/htdocs/moderate/moderate.php new file mode 100644 index 0000000..0d3a67d --- /dev/null +++ b/htdocs/moderate/moderate.php @@ -0,0 +1,45 @@ + + * + */ + +require_once('../src/base.inc.php'); + +if (!isset($_SESSION['currentUser'])) { + header('Location: ' . $CONFIG['urlroot'].'/moderate/login.php'); + exit(); +} + +// If we have a valid id. +if (isset($_GET['id']) and is_numeric($_GET['id'])) { + + // Get the post. + $post = Post::getById($_GET['id']); + + if ($post) { + // Accept or Reject. + if (isset($_GET['action'])) { + switch ($_GET['action']) { + case 'approve': + $post->approve(); + break; + + case 'reject': + $post->reject(); + break; + } + + $post->save(); + } + } +} + +// Redirect back to the moderation index. +header('Location: ' . $CONFIG['urlroot'] . '/moderate'); + +?> diff --git a/htdocs/moderate/src/footer.inc.php b/htdocs/moderate/src/footer.inc.php index 96d3e78..5b85fcc 100644 --- a/htdocs/moderate/src/footer.inc.php +++ b/htdocs/moderate/src/footer.inc.php @@ -1,4 +1,3 @@ -

Foursquare Admin Panel

Navigation

Online Services -
- Online Attendance
-

Moderation

Moderate Posts
Pages
Users
Account Settings
Logout

diff --git a/htdocs/new-post.php b/htdocs/new-post.php index cef238e..3c2fe42 100644 --- a/htdocs/new-post.php +++ b/htdocs/new-post.php @@ -43,11 +43,16 @@ if (isset($_POST['category'])) { $error .= "

You must accept the terms of service.

"; } + $category = Category::getByShortname(addslashes($values['category'])); + if (!$category) { + $error .= "

Invalid category.

"; + } + if ($error == '') { $post = new Post(); $post->setEmail($values['email']); - $post->setCategory($values['category']); + $post->setCategory($category->getId()); $post->setName($values['title']); $post->setDescription($values['description']); @@ -75,26 +80,33 @@ require_once "src/footer.inc.php"; function render_form($error="") { + global $values; + if ($error != '') { - echo "

$error

"; + echo "

$error

"; } echo "

"; echo "

Category: "; - echo "

Title:

"; + echo "

Title:

"; echo "

Description:

"; echo "

"; + . " cols=\"80\">${values[description]}

"; - echo "

Email Address: " + echo "

Email Address: " . "

"; - echo "

Confirm Email: " + echo "

Confirm Email: " . "

"; // TODO: Link to terms of service. diff --git a/htdocs/postings.php b/htdocs/postings.php index e43f24e..5c3dd55 100644 --- a/htdocs/postings.php +++ b/htdocs/postings.php @@ -28,10 +28,24 @@ if (!is_numeric($id)) { // Get the post. $post = Post::getById($id); -if (!$post or $post->getStage() != 'approved') { +if (!$post or (!isset($_GET['moderate']) and $post->getStage() != 'approved')) { errorNotFound(); } +if (isset($_GET['moderate'])) { + if (!isset($_SESSION['currentUser'])) { + header('Location: ' . $CONFIG['urlroot'].'/moderate/login.php'); + exit(); + } + 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 820ca97..8c936d9 100644 --- a/htdocs/src/Post.inc.php +++ b/htdocs/src/Post.inc.php @@ -128,6 +128,10 @@ class Post { } } + public function reject() { + $this->info['stage'] = 'rejected'; + } + public function getCreated() { return $this->info['created']; } diff --git a/htdocs/src/User.inc.php b/htdocs/src/User.inc.php index 6821042..6ad5ebb 100644 --- a/htdocs/src/User.inc.php +++ b/htdocs/src/User.inc.php @@ -69,6 +69,10 @@ class User { public function authenticate($password) { return sha1($password) == $this->info['password']; } + + public function isAdmin() { + return $this->info['admin'] == 1; + } } ?> diff --git a/htdocs/src/header.inc.php b/htdocs/src/header.inc.php index f6c5eb8..3d7f4b0 100644 --- a/htdocs/src/header.inc.php +++ b/htdocs/src/header.inc.php @@ -8,8 +8,9 @@