From 19241a8128fa0e32e73f99bf8098bb9bf6ce438f Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Sun, 28 Dec 2014 10:16:28 +0000
Subject: [PATCH] Added deletion completion page and delete link to nav bar

---
 core.php              |  2 +-
 index.php             | 13 +++++++++----
 settings.fragment.php | 11 ++++++++---
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/core.php b/core.php
index ea0f7d5..a8e563c 100644
--- a/core.php
+++ b/core.php
@@ -541,7 +541,7 @@ switch($_GET["action"])
 		file_put_contents("./pageindex.json", json_encode($pageindex)); //save the new page index
 		unlink("./$page.md"); //delete the page from the disk
 
-		exit(renderpage("Deleting $pagename - $sitename", "Coming soon..."));
+		exit(renderpage("Deleting $page - $sitename", "<p>$page has been deleted. <a href='index.php'>Go back to the main page</a>.</p>"));
 		break;
 	
 	/*
diff --git a/index.php b/index.php
index ad7a8a6..8419994 100755
--- a/index.php
+++ b/index.php
@@ -68,6 +68,8 @@ $navlinks = [
 	[ "Edit", "index.php?action=edit&page={page}" ],
 	[ "Printable", "index.php?action=view&printable=yes&page={page}" ],
 	" | ",
+	[ $admindisplaychar . "Delete", "index.php?action=delete&page={page}" ],
+	" | ",
 	[ "All Pages", "index.php?action=list" ],
 	" | ",
 	[ "Credits", "index.php?action=credits" ],
@@ -95,12 +97,12 @@ $cookieprefix = preg_replace("/[^0-9a-z]/i", "", strtolower($sitename));
 /*
 Actions:
 	view - view a page
-		page - path to page
+		page - page name
 		printable=[yes/no] - make output printable
 	edit - open editor for page
-		page - path to page
+		page - page name
 	save - save edits to page
-		page - path to page
+		page - page name
 	list - list pages
 		category - the category to list [optional]
 	login - login to the site
@@ -110,6 +112,9 @@ Actions:
 		string - string to hash
 	help - get help
 	credits - view the credits
+	delete - delete a page
+		page - page name
+		delete=yes - actually do the deletion (otherwise we display a prompt)
 */
 
 
@@ -651,7 +656,7 @@ switch($_GET["action"])
 		file_put_contents("./pageindex.json", json_encode($pageindex)); //save the new page index
 		unlink("./$page.md"); //delete the page from the disk
 
-		exit(renderpage("Deleting $pagename - $sitename", "Coming soon..."));
+		exit(renderpage("Deleting $page - $sitename", "<p>$page has been deleted. <a href='index.php'>Go back to the main page</a>.</p>"));
 		break;
 	
 	/*
diff --git a/settings.fragment.php b/settings.fragment.php
index fa7f5cc..d4ee0cc 100644
--- a/settings.fragment.php
+++ b/settings.fragment.php
@@ -65,6 +65,8 @@ $navlinks = [
 	[ "Edit", "index.php?action=edit&page={page}" ],
 	[ "Printable", "index.php?action=view&printable=yes&page={page}" ],
 	" | ",
+	[ $admindisplaychar . "Delete", "index.php?action=delete&page={page}" ],
+	" | ",
 	[ "All Pages", "index.php?action=list" ],
 	" | ",
 	[ "Credits", "index.php?action=credits" ],
@@ -92,12 +94,12 @@ $cookieprefix = preg_replace("/[^0-9a-z]/i", "", strtolower($sitename));
 /*
 Actions:
 	view - view a page
-		page - path to page
+		page - page name
 		printable=[yes/no] - make output printable
 	edit - open editor for page
-		page - path to page
+		page - page name
 	save - save edits to page
-		page - path to page
+		page - page name
 	list - list pages
 		category - the category to list [optional]
 	login - login to the site
@@ -107,5 +109,8 @@ Actions:
 		string - string to hash
 	help - get help
 	credits - view the credits
+	delete - delete a page
+		page - page name
+		delete=yes - actually do the deletion (otherwise we display a prompt)
 */
 ?>