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

diff --git a/admin_images.php b/admin_images.php
index a8c8a9b..3635b24 100644
--- a/admin_images.php
+++ b/admin_images.php
@@ -1,21 +1,6 @@
 <?php
 
-# This form requires wfpl. See: http://jasonwoof.org/wfpl
-
-# This form was initially auto-generated. If you would like to alter the
-# parameters and generate a new one try this URL:
-#
-# http://jasonwoof.com/metaform/?file_name=admin_images&table_name=cms_images&singular=image&plural=images&opt_email=No&opt_db=Yes&opt_listing=Yes&opt_display=Yes&opt_pass=Yes&fields=image+thumb%0D%0Aname+textbox%0D%0Acaption+textbox%0D%0Asizes+textarea&edit=yes
-
-
-# SETUP
-
-# To save results to a database, you'll need to create the cms_images table
-# (the file admin_images.sql should help with this), and create the file
-# 'code/db_connect.php' which calls db_connect() see:
-# code/wfpl/examples/db_connect.php
-#
-# if you rename any of the database fields, you'll need to update this:
+# This form requires wfpl. See: http://sametwice.com/wfpl
 
 define('ADMIN_IMAGES_DB_FIELDS', 'image,name,caption,sizes');
 
@@ -23,16 +8,15 @@ 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
 
 
-require_once('code/wfpl/format.php');
-require_once('code/wfpl/email.php');
-require_once('code/wfpl/upload.php');
+require_once(INC_WFPL . 'format.php');
+require_once(INC_WFPL . 'upload.php');
 
 # example: 200x300
 function format_width_height($str) {
@@ -51,66 +35,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';
 	}
 
@@ -135,7 +119,7 @@ function admin_images_display_main() {
 				continue;
 			}
 			list($max_width, $max_height) = explode('x', $max_hw);
-			$src = str_replace('.', "-$max_hw.", $big_src);
+			$src = str_replace('.', "-$max_width-$max_height.", $big_src);
 			$dimensions = image_dimensions($src);
 			if($dimensions) {
 				list($width, $height) = explode('x', $dimensions);
@@ -161,39 +145,56 @@ 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);
+function admin_images_main_delete($id) {
+	$data = db_get_assoc('cms_images', 'image,sizes', 'where id=%i', $id);
+	if ($data) {
+		$filenames = array();
+		$space = strpos($data['image'], ' ');
+		$dot = strpos($data['image'], '.');
+		if ($space !== false && $dot !== false && $dot < $space) {
+			$base = substr($data['image'], 0, $dot);
+			$ext = substr($data['image'], $dot, $space - $dot);
+			$filenames[] = "$base$ext";
+			$filenames[] = "{$base}_thumb$ext";
+			$sizes = explode("\n", $data['sizes']);
+			foreach ($sizes as $max_hw) {
+				$max_hw = format_width_height($max_hw);
+				if($max_hw == '') {
+					continue;
+				}
+				list($max_width, $max_height) = explode('x', $max_hw);
+				$filenames[] = "$base-{$max_width}x$max_height$ext"; # old naming scheme
+				$filenames[] = "$base-{$max_width}-$max_height$ext"; # new namich scheme
+			}
+		}
+		foreach ($filenames as $filename) {
+			if (file_exists($filename)) {
+				unlink($filename);
+			}
+		}
+		db_delete('cms_images', 'where id=%i', $id);
 		message('Image deleted.');
-
-		return './admin_images';
+	} else {
+		message("Couldn't find image to delete. Maybe it's already been 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']) {
@@ -205,7 +206,7 @@ function admin_images_edit_main() {
 					continue;
 				}
 				list($max_width, $max_height) = explode('x', $max_hw);
-				$src = str_replace('.', "-$max_hw.", $big_src);
+				$src = str_replace('.', "-$max_width-$max_height.", $big_src);
 				if(($_FILES['image'] && $_FILES['image']['error'] == 0) || !file_exists($src)) {
 					imagemagick_convert($big_src, $src, "-geometry $max_hw", 'Resizing image');
 				}
@@ -213,22 +214,22 @@ 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.');
+			message('Image saved. Next time you open a page editor, this image will be availble in the "Insert Image" dialog.');
 			$saved_id = db_auto_id();
 		}
 
 		# return user to display page where they can see instructions, etc
-		return "./admin_images?admin_images_id=$saved_id";
+		return "./admin_images";
 
-	} 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 +239,3 @@ function admin_images_edit_main() {
 
 	tem_set('form', $data);
 }
-
-?>