make pagination more robust. add undelete method for posts, if you know the id.

2 files changed, 25 insertions, 1 deletions

diff --git a/templates/single.inc.php b/templates/single.inc.php
index af486d5..cd01127 100644
--- a/templates/single.inc.php
+++ b/templates/single.inc.php
@@ -1,11 +1,11 @@
 <?php
 	if(!defined('ROOT')) die('Don\'t call this directly.');
-	header('Content-Type: text/html; charset=utf-8');
 
 	$id = (!empty(path(0))) ? (int) path(0) : 0;
 
 	$action = 'display';
 	if(mb_strtolower(path(1)) == 'delete') $action = 'delete';
+	if(mb_strtolower(path(1)) == 'undelete') $action = 'undelete';
 	if(mb_strtolower(path(1)) == 'edit') $action = 'edit';
 
 	$error = false;
@@ -25,6 +25,17 @@
 			}
 		}
 
+		// undelete post
+		if($action == 'undelete') {
+			$result = db_delete((int) $id, true);
+
+			if(!$result) {
+				$error = 'Post could not be restored!';
+			} else {
+				rebuild_feeds();
+			}
+		}
+
 		// edit post
 		if(!empty($_POST['action']) && $_POST['action'] == 'edit') {
 
@@ -43,6 +54,11 @@
 
 	// load the actual post
 	$post = db_select_post($id);
+	if(is_numeric($post['post_deleted'])) {
+		if(!$config['logged_in']) {
+			header('Location: '.$config['url']);
+		}
+	}
 
 	$title_suffix = 'entry #' . $id;
 	require(ROOT.DS.'snippets'.DS.'header.snippet.php');
@@ -73,8 +89,12 @@
 				<span class="post-timestamp"><time datetime="<?= $datetime ?>" data-unix-time="<?= $post['post_timestamp'] ?>"><?= $formatted_time ?></time></span>
 				<nav class="post-meta">
 					<?php if($config['logged_in']): ?><ul>
+						<?php if(is_numeric($post['post_deleted'])): ?>
+						<li><a href="<?= $config['url'] ?>/<?= $post['id'] ?>/undelete" title="Restore">Deleted on <?= date('M d Y', $post['post_deleted']) ?></a></li>
+						<?php else: ?>
 						<li><a href="<?= $config['url'] ?>/<?= $post['id'] ?>/edit">Edit</a></li>
 						<li><a href="<?= $config['url'] ?>/<?= $post['id'] ?>/delete">Delete</a></li>
+						<?php endif; ?>
 					</ul><?php endif; ?>
 				</nav>
 				<p class="post-content"><?= nl2br(autolink($post['post_content'])) ?></p>
diff --git a/templates/timeline.inc.php b/templates/timeline.inc.php
index 234ea83..a29e9dd 100644
--- a/templates/timeline.inc.php
+++ b/templates/timeline.inc.php
@@ -15,6 +15,10 @@
 
 	// get posts
 	$posts = db_select_posts(NOW, $config['posts_per_page'], 'desc', $offset);
+	if(empty($posts)) {
+		header('Location: '.$config['url']);
+		die();
+	}
 
 	$title_suffix = '';
 	require(ROOT.DS.'snippets'.DS.'header.snippet.php');