X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=admin_pages.php;h=1a9b2cb9c735549a79fff8dbc393d8acc69d2cad;hb=6837191466fdee18aca62f5711ab764d95a7be10;hp=f7124449501f7892e0cd9eb50ce8022c4c867536;hpb=6693ff479afca87acf937d7435121f9d7906e1c5;p=wfpl-cms.git

diff --git a/admin_pages.php b/admin_pages.php
index f712444..1a9b2cb 100644
--- a/admin_pages.php
+++ b/admin_pages.php
@@ -5,8 +5,8 @@
 define('ADMIN_PAGES_DB_FIELDS', 'title,filename,navbar,nav_title,content,description,keywords');
 
 
-require_once(INC_WFPL . 'format.php');
-require_once(INC_WFPL . 'email.php');
+require_once(DOCROOT . 'inc/wfpl/format.php');
+require_once(DOCROOT . 'inc/wfpl/email.php');
 
 function format_cms_filename($str) {
 	$str = format_filename($str);
@@ -31,10 +31,7 @@ function admin_pages_get_fields() {
 
 
 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) {
@@ -80,12 +77,15 @@ function admin_pages_main_delete($id) {
 
 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;
+	if ($images) {
+		$id = 0;
+		foreach($images as &$image) {
+			$image['id'] = '' . $id;
+			$id += 1;
+		}
+		return $images;
 	}
-	return $images;
+	return null;
 }
 
 function admin_pages_main_listing() {