X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=admin_images.php;h=b57f2a4115502c151cfb15e9b1bf582a6d7a2e11;hb=9b3a025f2298ab090fc574143b6664488ff4599b;hp=a8c8a9bbf29c5a2b8047926338e4d51728eebe10;hpb=059569fef59006c2ab9af689c582fc3e9b0d7e6e;p=wfpl-cms.git

diff --git a/admin_images.php b/admin_images.php
index a8c8a9b..b57f2a4 100644
--- a/admin_images.php
+++ b/admin_images.php
@@ -23,8 +23,8 @@ define('ADMIN_IMAGES_DB_FIELDS', 'image,name,caption,sizes');
 # location of this script. IT MUST END WITH A SLASH
 $GLOBALS['upload_directory'] = 'cms_images/';
 
-$GLOBALS['image_max_width'] = '596';
-$GLOBALS['image_max_height'] = '1600';
+$GLOBALS['image_max_width'] = '704';
+$GLOBALS['image_max_height'] = '1900';
 $GLOBALS['image_thumb_max_width'] = '70';
 $GLOBALS['image_thumb_max_height'] = '70';
 $GLOBALS['image_file_name'] = uniqid() . getmypid() . '.jpg'; # comment this out to use uploader's filename
@@ -51,66 +51,66 @@ function format_width_height($str) {
 function admin_images_get_fields() {
 	$data = array();
 
-	$data['name'] = format_oneline($_REQUEST['name']);
-	$data['caption'] = format_oneline($_REQUEST['caption']);
-	$data['sizes'] = format_unix($_REQUEST['sizes']);
+	$data['name'] = format_oneline(_REQUEST_cut('name'));
+	$data['caption'] = format_oneline(_REQUEST_cut('caption'));
+	$data['sizes'] = format_unix(_REQUEST_cut('sizes'));
+
 	if($_FILES['image'] && $_FILES['image']['error'] == 0) {
 		$data['image'] = convert_uploaded_image('image', $GLOBALS['upload_directory'] . $GLOBALS['image_file_name'], $GLOBALS['image_max_width'], $GLOBALS['image_max_height'], $GLOBALS['image_thumb_max_width'], $GLOBALS['image_thumb_max_height']);
 	} else {
-		if($_REQUEST['delete_image'] == 'Yes') {
+		if(_REQUEST_cut('delete_image') == 'Yes') {
 			$data['image'] = '';
 		} else {
-			$data['image'] = format_image_w_h_thumb_w_h($_REQUEST['old_image']);
+			$data['image'] = format_image_w_h_thumb_w_h(_REQUEST_cut('old_image'));
 		}
 	}
+	unset($_FILES['image']);
 
 	return $data;
 }
 
 
-# You may pass a "where clause" for the db query.
-function admin_images_display_listing($where = 'order by name, caption') {
-	$rows = db_get_assocs('cms_images', 'id,image,name,caption', $where);
-	if($rows == false || count($rows) == 0) {
-		tem_set('listings', array('empty_listing' => true));
-		return;
-	}
-
-	# make sure there's something clickable
-	foreach($rows as &$row) {
-		if($row['name'] == '') {
-			$row['name'] = '--';
-		}
-	}
-	tem_set('listings', array(
-		'populated_listing' => true,
-		'rows' => $rows));
-	return true;
-}
-
 function admin_images_main() {
 	if(!logged_in_as_admin()) {
 		$_REQUEST['url'] = this_url();
 		return 'admin_login';
 	}
 
-	if(isset($_REQUEST['admin_images_id'])) {
-		return admin_images_display_main();
-	} else {
-		return admin_images_edit_main();
+	$id = _REQUEST_cut('edit_id');
+	if($id) {
+		return admin_images_main_form($id);
 	}
-}
 
-function admin_images_display_main() {
-	$id = format_int($_REQUEST['admin_images_id']);
-	unset($_REQUEST['admin_images_id']);
-	if(!$id) {
-		message('Error: Broken link');
-		return './admin_images';
+	$id = _REQUEST_cut('admin_images_delete_id');
+	if($id) {
+		return admin_images_main_delete($id);
+	}
+
+	if(_REQUEST_cut('new')) {
+		return admin_images_main_form();
+	}
+
+	if(_REQUEST_cut('list')) {
+		return admin_images_main_listing();
+	}
+
+	$id = _REQUEST_cut('id');
+	if($id) {
+		return admin_images_main_display($id);
 	}
+
+	if(isset($_POST['name'])) {
+		return admin_images_main_form();
+	}
+
+	# default action:
+	return admin_images_main_listing();
+}
+
+function admin_images_main_display($id) {
 	$data = db_get_assoc('cms_images', 'id,'.ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $id);
 	if(!$data) {
-		message('Error: Image not found');
+		message("Error: Broken Link (Image #$id not found)");
 		return './admin_images';
 	}
 
@@ -161,39 +161,27 @@ function admin_images_display_main() {
 	tem_set('display', $data);
 }
 
-function admin_images_edit_main() {
-	$edit_id = format_int($_REQUEST['admin_images_edit_id']);
-	unset($_REQUEST['admin_images_edit_id']);
-	if($edit_id) {
-		# add hidden field for database id of row we're editing
-		tem_set('admin_images_edit_id', $edit_id);
-		tem_set('editing', 'show');
-		tem_set('edit_msg', 'show');
-	}
-
-	$delete_id = format_int($_REQUEST['admin_images_delete_id']);
-	unset($_REQUEST['admin_images_delete_id']);
-	if($delete_id) {
-		db_delete('cms_images', 'where id=%i', $delete_id);
-		message('Image deleted.');
-
-		return './admin_images';
-	}
+function admin_images_main_delete($id) {
+	db_delete('cms_images', 'where id=%i', $id);
+	message('Image deleted.');
+	return './admin_images';
+}
 
-	if(!$edit_id) {
-		if(!isset($_REQUEST['admin_images_new']) && !isset($_REQUEST['name'])) {
-			admin_images_display_listing();
-			return;
-		}
+function admin_images_main_listing() {
+	$listing_rows = db_get_assocs('cms_images', 'id,image,name,caption', 'order by name, caption');
+	tem_set('listings', $listing_rows);
+}
 
-		tem_set('new_msg', 'show');
+function admin_images_main_form($id = false) {
+	if($id) {
+		tem_set('id', $id);
 	}
 
 	if(isset($_POST['name'])) {
 		$data = admin_images_get_fields();
 
 		# save anything
-		# Note: If you change this to re-display the form in some cases, be sure to handle image uploads well (don't make them upload it again.
+		# Note: If you change this to re-display the form in some cases, be sure to handle image uploads well (don't make them upload it again.)
 
 		# resize image as needed
 		if($data['image'] && $data['sizes']) {
@@ -213,10 +201,10 @@ function admin_images_edit_main() {
 		}
 
 		# save to database
-		if($edit_id) {
-			db_update_assoc('cms_images', $data, 'where id=%i', $edit_id);
+		if($id) {
+			db_update_assoc('cms_images', $data, 'where id=%i', $id);
 			message('Image updated.');
-			$saved_id = $edit_id;
+			$saved_id = $id;
 		} else {
 			db_insert_assoc('cms_images', $data);
 			message('Image saved.');
@@ -224,11 +212,11 @@ function admin_images_edit_main() {
 		}
 
 		# return user to display page where they can see instructions, etc
-		return "./admin_images?admin_images_id=$saved_id";
+		return "./admin_images?id=$saved_id";
 
-	} elseif($edit_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_images', ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $edit_id);
+		$data = db_get_assoc('cms_images', ADMIN_IMAGES_DB_FIELDS, 'where id=%i', $id);
 	} else {
 		# form not submitted, set default values:
 		$data = array('sizes' => '275x500');
@@ -238,5 +226,3 @@ function admin_images_edit_main() {
 
 	tem_set('form', $data);
 }
-
-?>