X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=admin_pages.php;h=7981bf6c64c48b8773a6728eca62ecb2adcd543f;hb=26e88a8fcd1bcbb101245a2243c6fb9cfeda3500;hp=f7124449501f7892e0cd9eb50ce8022c4c867536;hpb=6693ff479afca87acf937d7435121f9d7906e1c5;p=wfpl-cms.git

diff --git a/admin_pages.php b/admin_pages.php
index f712444..7981bf6 100644
--- a/admin_pages.php
+++ b/admin_pages.php
@@ -2,12 +2,9 @@
 
 # This form requires wfpl. See: http://sametwice.com/wfpl
 
-define('ADMIN_PAGES_DB_FIELDS', 'title,filename,navbar,nav_title,content,description,keywords');
+define('ADMIN_PAGES_DB_FIELDS', 'title,filename,navbar,nav_title,layout,content,sidebar_content,description,keywords');
 
 
-require_once(INC_WFPL . 'format.php');
-require_once(INC_WFPL . 'email.php');
-
 function format_cms_filename($str) {
 	$str = format_filename($str);
 	$str = str_replace('.', '_', $str);
@@ -22,19 +19,24 @@ function admin_pages_get_fields() {
 	$data['filename'] = format_cms_filename(_REQUEST_cut('filename'));
 	$data['navbar'] = format_options(_REQUEST_cut('navbar'), 'navbar');
 	$data['nav_title'] = format_oneline(_REQUEST_cut('nav_title'));
+	$data['layout'] = format_options(_REQUEST_cut('layout'), 'layout');
 	$data['content'] = format_unix(_REQUEST_cut('content'));
-	$data['description'] = format_unix(_REQUEST_cut('description'));
-	$data['keywords'] = format_unix(_REQUEST_cut('keywords'));
+	if (isset($_REQUEST['sidebar_content'])) { // probs not needed
+		$data['sidebar_content'] = format_unix(_REQUEST_cut('sidebar_content'));
+	}
+	if (isset($_REQUEST['description'])) {
+		$data['description'] = format_unix(_REQUEST_cut('description'));
+	}
+	if (isset($_REQUEST['keywords'])) {
+		$data['keywords'] = format_unix(_REQUEST_cut('keywords'));
+	}
 
 	return $data;
 }
 
 
 function admin_pages_main() {
-	if(!logged_in_as_admin()) {
-		$_REQUEST['url'] = this_url();
-		return 'admin_login';
-	}
+	session_auth_must('edit_page');
 
 	$id = _REQUEST_cut('edit_id');
 	if($id) {
@@ -70,6 +72,7 @@ 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);
+	$GLOBALS['wfpl_main_template']->data['$admin_links']['$edit_page_id'] = $id;
 }
 
 function admin_pages_main_delete($id) {
@@ -78,19 +81,43 @@ function admin_pages_main_delete($id) {
 	return './admin_pages';
 }
 
+# get all images from admin_images (for cms)
 function admin_pages_get_images() {
-	$images = db_get_assocs('cms_images', 'image,name,caption,sizes', 'order by name, caption, image');
-	$id = 0;
-	foreach($images as &$image) {
-		$image['id'] = '' . $id;
-		$id += 1;
+	$out = [];
+	$rows = db_get_assocs('cms_images', 'image,name,caption', "order by coalesce(nullif(name, ''), caption), created_at");
+	if ($rows) {
+		$id = -1;
+		foreach($rows as &$row) { $id += 1;
+			$parts = explode(' ', $row['image'] . '      ', 7);
+			$out[] = [
+				'id' => '' . $id,
+				'src' => $parts[0],
+				'aspect' => ''.(round(100000 * ((int)$parts[2]) / ((int)$parts[1]) / 1000)).'%',
+				'name' => $row['name'],
+				'caption' => $row['caption']
+			];
+		} unset($row);
 	}
-	return $images;
+	return $out;
 }
 
 function admin_pages_main_listing() {
-	$listing_rows = db_get_assocs('cms_pages', 'id,filename,coalesce(nullif(nav_title,\'\'), title) as title', 'order by concat(nav_title,title)');
-	tem_set('listings', $listing_rows);
+	$data = array();
+	$desc = '';
+	$sort = _REQUEST_cut('sort');
+	if ($sort && substr($sort, 0, 1) === '-') {
+		$sort = substr($sort, 1);
+		$desc = ' DESC ';
+	} else {
+		$data["sorting-by-$sort"] = '-';
+	}
+	$legal_sorts = explode(',', ADMIN_PAGES_DB_FIELDS);
+	if (!$sort || !in_array($sort, $legal_sorts)) {
+		$sort = 'filename';
+	}
+
+	$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) {
@@ -100,6 +127,12 @@ function admin_pages_main_form($id = false) {
 
 	tem_set('$basename', 'admin_pages');
 
+	pulldown('layout', [
+		['0', "Full (no sidebar)"],
+		['1', "With Plain Sidebar"],
+		['2', "With Bordered Sidebar"]
+	]);
+
 	$navbar_options = array(array('ignored', 'Not at all'), array('0', 'First'));
 	$rows = db_get_rows('cms_pages', 'id,coalesce(nullif(nav_title,\'\'), title) as title,navbar', 'where navbar != 0 order by navbar');
 	if($rows) for($i = 0; $i < count($rows); ++$i) {
@@ -149,7 +182,16 @@ function admin_pages_main_form($id = false) {
 		$data = array('filename' => format_cms_filename($_REQUEST['new_filename']));
 	}
 
-	tem_set('wfpl_images', admin_pages_get_images());
+	if (!isset($data['layout']) || $data['layout'] === '' || $data['layout'] === '0') {
+		$data['sidebar_editor_display'] = 'none';
+	} else {
+		$data['sidebar_editor_display'] = 'block';
+	}
+
+	tem_set('wfpl_images_json', json_encode(admin_pages_get_images()));
+	tem_set('wfpl_image_width_full', WFPL_IMAGE_WIDTH_FULL);
+	tem_set('wfpl_image_width_small', WFPL_IMAGE_WIDTH_SMALL);
+	tem_set('wfpl_image_width_thumb', WFPL_IMAGE_WIDTH_THUMB);
 	tem_set('form', $data);
 	tem_set('$head'); # wysiwyg init goes in <head>
 }