From 2de7be27f43afd1c2ea911cd3235b56a44f74573 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Tue, 20 Jun 2017 00:14:29 -0400 Subject: [PATCH] page edit history --- admin_pages.html | 70 ++++++++++++++++++++++++++---------- admin_pages.php | 100 ++++++++++++++++++++++++++++++++++++++++++---------- inc/cms.php | 15 ++++---- inc/db_upgrade.php | 51 +++++++++++++++++++++++++++ template.html | 2 +- 5 files changed, 191 insertions(+), 47 deletions(-) diff --git a/admin_pages.html b/admin_pages.html index faa0eab..26c7f18 100644 --- a/admin_pages.html +++ b/admin_pages.html @@ -365,30 +365,62 @@

~$host~ Admin Control Panel

-

Manage Pages

- -

[Add a new page]

+

Manage Pages

- +
+ + + + + - - - - - - - - - + + + + + + + + + -
(new) +
+
FilenameTitle 
~filename html~(offline)~title html~(untitled)[delete]
(home page) +
+ + +
+
~title html~(untitled) +
+
+
+
- - -

No pages in database.

- + + + +

~$host~ Admin Control Panel

+ +

Edit history for page "~title html~"

-

[Add a new page]

+ + + + + + + + + + + + + + + +
titleatby
~title html~(untitled)~timestamp~~who html~ +
+
diff --git a/admin_pages.php b/admin_pages.php index 4081f94..06aa3ea 100644 --- a/admin_pages.php +++ b/admin_pages.php @@ -43,6 +43,21 @@ function admin_pages_main() { return admin_pages_main_form($id); } + $id = _REQUEST_cut('edit_history_id'); + if($id) { + return admin_pages_main_form(null, $id); + } + + $id = _REQUEST_cut('history_page_id'); + if($id) { + return admin_pages_main_page_history($id); + } + + $id = _REQUEST_cut('history_id'); + if($id) { + return admin_pages_main_history($id); + } + $id = _REQUEST_cut('admin_pages_delete_id'); if($id) { return admin_pages_main_delete($id); @@ -71,7 +86,8 @@ function admin_pages_main() { # admin-only access to view pages with no filename function admin_pages_main_display($id) { - cms_display_content($GLOBALS['wfpl_main_template'], 'where id=%i', $id); + $page = db_get_assoc('cms_pages', 'id,title,keywords,description,layout,content,sidebar_content', 'where id=%"', $id); + cms_display_content($GLOBALS['wfpl_main_template'], $page); $GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_id'] = $id; } @@ -103,24 +119,57 @@ function admin_pages_get_images() { function admin_pages_main_listing() { $data = array(); - $desc = ''; - $sort = _REQUEST_cut('sort'); - if ($sort && substr($sort, 0, 1) === '-') { - $sort = substr($sort, 1); - $desc = ' DESC '; - } else { - $data["sorting-by-$sort"] = '-'; + + $rows = db_get_assocs('cms_pages', 'id,coalesce(nullif(nav_title,""), title) as title,filename', 'order by coalesce(nullif(nav_title,""), title), filename limit 2000'); + $have_home_page = false; + if (count($rows) !== 0) { + $data['rows'] = $rows; + foreach ($rows as &$row) { + if ($row['filename'] === 'index') { + $have_home_page = true; + break; + } + } unset($row); } - $legal_sorts = explode(',', ADMIN_PAGES_DB_FIELDS); - if (!$sort || !in_array($sort, $legal_sorts)) { - $sort = 'filename'; + if ($have_home_page === false) { + $data['no_home'] = true; } - - $data['rows'] = db_get_assocs('cms_pages', 'id,coalesce(nullif(nav_title,\'\'), title) as title,filename', "order by $sort $desc limit 1000"); tem_set('listing', $data); } -function admin_pages_main_form($id = false) { +function admin_pages_main_page_history ($id) { + $data = array(); + + $rows = db_get_assocs('history_cms_pages left join users on history_cms_pages.history_user_id = users.id', 'history_cms_pages.id as page_id,history_cms_pages.history_id,coalesce(nullif(history_cms_pages.nav_title,""), history_cms_pages.title) as title,history_when as timestamp,coalesce(nullif(users.name,""), users.username) as who', 'where history_cms_pages.id=%i order by history_id desc', $id); + if (count($rows) !== 0) { + $data['rows'] = $rows; + $data['title'] = $rows[0]['title']; + } + tem_set('page_history', $data); +} + +function admin_pages_main_history ($id) { + $cms_page = db_get_assoc('history_cms_pages', 'id,title,keywords,description,layout,content,sidebar_content', 'where history_id=%"', $id); + if (!$cms_page) { + message("Error 9393 please inform developer"); + return './admin_pages'; + } + message('You are viewing an archived version of this page. To publish this version (revert the page) click the "Edit this page" link at the top, then the "save" at the bottom of the editor page. Feel free to make changes before saving.'); + cms_display_content($GLOBALS['wfpl_main_template'], $cms_page); + $GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_id'] = null; + $GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_history_id'] = $id; +} + +function admin_pages_main_form($id = false, $history_id = false) { + if ($history_id) { + message('The fields below have been filled with an archived version of this page. To publish this version (revert the page) click "save" button at the bottom. Feel free to make changes before saving.'); + $history_data = db_get_assoc('history_cms_pages', 'id,'.ADMIN_PAGES_DB_FIELDS, 'where history_id=%i', $history_id); + if (!$history_data) { + message("Error 3938 please inform developer"); + return './admin_pages'; + } + $id = $history_data['id']; + } if($id) { tem_set('id', $id); } @@ -155,23 +204,38 @@ function admin_pages_main_form($id = false) { $data['navbar'] = 0; } + # save if($id) { db_update_assoc('cms_pages', $data, 'where id=%i', $id); - $id = $id; message('Page updated.'); } else { db_insert_assoc('cms_pages', $data); $id = db_auto_id(); message('Page saved.'); } - if($data['filename']) { - return "./$data[filename]"; + + # save to version history + $data['id'] = $id; + $data['history_when'] = time(); + $s = session_auth(); + $data['history_user_id'] = $s['id']; + db_insert_assoc('history_cms_pages', $data); + + # redirect + if ($data['filename'] === 'index') { + return './'; + } elseif($data['filename'] !== '') { + return "./{$data['filename']}"; } else { return "./admin_pages?id=$id"; } } elseif($id) { # we've recieved an edit id, but no data. So we grab the values to be edited from the database - $data = db_get_assoc('cms_pages', ADMIN_PAGES_DB_FIELDS, 'where id=%i', $id); + if ($history_id) { + $data = $history_data; + } else { + $data = db_get_assoc('cms_pages', ADMIN_PAGES_DB_FIELDS, 'where id=%i', $id); + } if($data['navbar']) { $data['navbar'] = db_count('cms_pages', 'where navbar!=0 && navbar<%i', $data['navbar']); } else { diff --git a/inc/cms.php b/inc/cms.php index 06324f0..5075dd7 100644 --- a/inc/cms.php +++ b/inc/cms.php @@ -53,7 +53,8 @@ function cms_display($basename, &$tem) { $tem->set('$cms_css', $hi_css); } - $cms_page_id = cms_display_content($tem, 'where filename=%"', $basename); + $cms_page = db_get_assoc('cms_pages', 'id,title,keywords,description,layout,content,sidebar_content', 'where filename=%"', $basename); + cms_display_content($tem, $cms_page); $footer = db_get_value('cms_pages', 'content', 'where filename="_footer"'); if ($footer) { @@ -62,23 +63,20 @@ function cms_display($basename, &$tem) { if(session_auth_can('admin_links')) { $admin_links = array(); - if($cms_page_id) { - $admin_links['$edit_page_id'] = $cms_page_id; + if($cms_page) { + $admin_links['$edit_page_id'] = $cms_page['id']; } $tem->set('$admin_links', $admin_links); } - if($cms_page_id) { + if($cms_page) { return true; } else { return false; } } -function cms_display_content(&$tem /*, 'where clause %", %i', string, int */) { - $args = array_slice(func_get_args(), 1); - $args = array_merge(array('cms_pages', 'id,title,keywords,description,layout,content,sidebar_content'), $args); - $row = call_user_func_array('db_get_assoc', $args); +function cms_display_content(&$tem, $row) { if($row) { $tem->set('$cms_title', $row['title']); $tem->set('$meta_keywords', $row['keywords']); @@ -99,5 +97,4 @@ function cms_display_content(&$tem /*, 'where clause %", %i', string, int */) { } else { $tem->set('$layout_centerer_class', 'full'); } - return false; } diff --git a/inc/db_upgrade.php b/inc/db_upgrade.php index 8bfa14f..c856fad 100644 --- a/inc/db_upgrade.php +++ b/inc/db_upgrade.php @@ -115,3 +115,54 @@ db_send_query(<< - + -- 1.7.10.4