diff --git a/system/admin/views/user-draft.html.php b/system/admin/views/user-draft.html.php
new file mode 100644
index 0000000..379cb08
--- /dev/null
+++ b/system/admin/views/user-draft.html.php
@@ -0,0 +1,33 @@
+
+
+
+
+ | Title |
+ Created |
+ Tag |
+ Operations |
+
+
+
+
+
+ | title ?> |
+ date) ?> |
+ tag) ?> |
+ Edit Delete |
+
+
+
+
\ No newline at end of file
diff --git a/system/admin/views/user-posts.html.php b/system/admin/views/user-posts.html.php
index f2312f2..b6623a6 100644
--- a/system/admin/views/user-posts.html.php
+++ b/system/admin/views/user-posts.html.php
@@ -3,8 +3,10 @@
| Title |
- Published |
- Views |
+ Published |
+
+ Views |
+
Tag |
Operations |
@@ -25,10 +27,10 @@
title ?> |
date) ?> |
- views ?> |
+ views ?> |
+
tag ?> |
- Edit Delete |
+ Edit Delete |
diff --git a/system/htmly.php b/system/htmly.php
index 8405dab..298f2da 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -255,12 +255,13 @@ post('/add/post', function () {
$content = from($_REQUEST, 'content');
$description = from($_REQUEST, 'description');
$user = $_SESSION[config("site.url")]['user'];
+ $draft = from($_REQUEST, 'draft');
if ($proper && !empty($title) && !empty($tag) && !empty($content)) {
if (!empty($url)) {
- add_post($title, $tag, $url, $content, $user, $description, $img, $vid);
+ add_post($title, $tag, $url, $content, $user, $description, $img, $vid, $draft);
} else {
$url = $title;
- add_post($title, $tag, $url, $content, $user, $description, $img, $vid);
+ add_post($title, $tag, $url, $content, $user, $description, $img, $vid, $draft);
}
} else {
$message['error'] = '';
@@ -483,6 +484,65 @@ get('/admin/mine', function () {
}
});
+// Show admin/draft
+get('/admin/draft', function () {
+
+ if (login()) {
+
+ config('views.root', 'system/admin/views');
+
+ $profile = $_SESSION[config("site.url")]['user'];
+
+ $page = from($_GET, 'page');
+ $page = $page ? (int)$page : 1;
+ $perpage = config('profile.perpage');
+
+ $posts = get_draft($profile, $page, $perpage);
+
+ $total = get_count($profile, 'dirname');
+
+ $bio = get_bio($profile);
+
+ if (isset($bio[0])) {
+ $bio = $bio[0];
+ } else {
+ $bio = default_profile($profile);
+ }
+
+ if (empty($posts) || $page < 1) {
+ render('user-draft', array(
+ 'title' => 'My draft - ' . blog_title(),
+ 'description' => blog_description(),
+ 'canonical' => site_url(),
+ 'page' => $page,
+ 'heading' => 'My draft',
+ 'posts' => null,
+ 'bio' => $bio->body,
+ 'name' => $bio->title,
+ 'bodyclass' => 'userdraft',
+ 'breadcrumb' => '
' . config('breadcrumb.home') . ' » Draft for: ' . $bio->title,
+ ));
+ die;
+ }
+
+ render('user-draft', array(
+ 'title' => 'My draft - ' . blog_title(),
+ 'description' => blog_description(),
+ 'canonical' => site_url(),
+ 'heading' => 'My draft',
+ 'page' => $page,
+ 'posts' => $posts,
+ 'bio' => $bio->body,
+ 'name' => $bio->title,
+ 'bodyclass' => 'userdraft',
+ 'breadcrumb' => '
' . config('breadcrumb.home') . ' » Draft for: ' . $bio->title,
+ ));
+ } else {
+ $login = site_url() . 'login';
+ header("location: $login");
+ }
+});
+
// Show import page
get('/admin/import', function () {
if (login()) {
@@ -1367,7 +1427,10 @@ get('/:year/:month/:name/edit', function ($year, $month, $name) {
$post = find_post($year, $month, $name);
if (!$post) {
- not_found();
+ $post = find_draft($year, $month, $name);
+ if (!$post) {
+ not_found();
+ }
}
$current = $post['current'];
@@ -1414,6 +1477,8 @@ post('/:year/:month/:name/edit', function () {
$date = from($_REQUEST, 'date');
$time = from($_REQUEST, 'time');
$dateTime = null;
+ $revertPost = from($_REQUEST, 'revertpost');
+ $publishDraft = from($_REQUEST, 'publishdraft');
if ($date !== null && $time !== null) {
$dateTime = $date . ' ' . $time;
}
@@ -1422,7 +1487,7 @@ post('/:year/:month/:name/edit', function () {
if (empty($url)) {
$url = $title;
}
- edit_post($title, $tag, $url, $content, $oldfile, $destination, $description, $dateTime, $img, $vid);
+ edit_post($title, $tag, $url, $content, $oldfile, $destination, $description, $dateTime, $img, $vid, $revertPost, $publishDraft);
} else {
$message['error'] = '';
if (empty($title)) {
@@ -1469,7 +1534,10 @@ get('/:year/:month/:name/delete', function ($year, $month, $name) {
$post = find_post($year, $month, $name);
if (!$post) {
- not_found();
+ $post = find_draft($year, $month, $name);
+ if (!$post) {
+ not_found();
+ }
}
$current = $post['current'];
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 9c334aa..b80f27f 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -108,6 +108,24 @@ function get_zip_files()
return $_zip;
}
+// Get user draft.
+function get_draft_posts()
+{
+ static $_draft = array();
+
+ if (empty($_draft)) {
+ $tmp = array();
+ $tmp = glob('content/*/draft/*.md', GLOB_NOSORT);
+ if (is_array($tmp)) {
+ foreach ($tmp as $file) {
+ $_draft[] = pathinfo($file);
+ }
+ }
+ usort($_draft, "sortfile");
+ }
+ return $_draft;
+}
+
// usort function. Sort by filename.
function sortfile($a, $b)
{
@@ -304,6 +322,50 @@ function find_post($year, $month, $name)
}
}
+// Find draft.
+function find_draft($year, $month, $name)
+{
+ $posts = get_draft_posts();
+
+ foreach ($posts as $index => $v) {
+ $url = $v['basename'];
+ if (strpos($url, "$year-$month") !== false && strpos($url, $name . '.md') !== false) {
+
+ // Use the get_posts method to return
+ // a properly parsed object
+
+ $ar = get_posts($posts, $index + 1, 1);
+ $nx = get_posts($posts, $index, 1);
+ $pr = get_posts($posts, $index + 2, 1);
+
+ if ($index == 0) {
+ if (isset($pr[0])) {
+ return array(
+ 'current' => $ar[0],
+ 'prev' => $pr[0]
+ );
+ } else {
+ return array(
+ 'current' => $ar[0],
+ 'prev' => null
+ );
+ }
+ } elseif (count($posts) == $index + 1) {
+ return array(
+ 'current' => $ar[0],
+ 'next' => $nx[0]
+ );
+ } else {
+ return array(
+ 'current' => $ar[0],
+ 'next' => $nx[0],
+ 'prev' => $pr[0]
+ );
+ }
+ }
+ }
+}
+
// Return tag page.
function get_tag($tag, $page, $perpage, $random)
{
@@ -384,6 +446,29 @@ function get_profile($profile, $page, $perpage)
return $tmp = get_posts($tmp, $page, $perpage);
}
+// Return draft list
+function get_draft($profile, $page, $perpage)
+{
+ $posts = get_draft_posts();
+
+ $tmp = array();
+
+ foreach ($posts as $index => $v) {
+ $url = $v['dirname'];
+ $str = explode('/', $url);
+ $author = $str[count($str) - 2];
+ if ($profile === $author) {
+ $tmp[] = $v;
+ }
+ }
+
+ if (empty($tmp)) {
+ return;
+ }
+
+ return $tmp = get_posts($tmp, $page, $perpage);
+}
+
// Return author bio.
function get_bio($author)
{
@@ -1655,6 +1740,7 @@ EOF;
echo '
Posts';
}
echo '
Mine';
+ echo '
Draft';
echo '
Add post';
echo '
Add page';
echo '
Edit profile';