X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=admin_images.php;h=2a5ae51511500ea1f05b8099b48d6c4111c999b2;hb=3fe5000888dd47ae4de76a1f6678b2e21cacc1bc;hp=8b6e5132e534ec66d018db16ac1baf5e60f759ac;hpb=c469d2530ad9684e56742d38f5817cb08ad98eef;p=wfpl-cms.git

diff --git a/admin_images.php b/admin_images.php
index 8b6e513..2a5ae51 100644
--- a/admin_images.php
+++ b/admin_images.php
@@ -1,37 +1,11 @@
 <?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:
-# inc/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');
 
-# Set this to the path to your uploads directory. It can be relative to the
-# location of this script. IT MUST END WITH A SLASH
-$GLOBALS['upload_directory'] = 'cms_images/';
-
-$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('inc/wfpl/format.php');
-require_once('inc/wfpl/upload.php');
+require_once(DOCROOT . 'inc/wfpl/format.php');
+require_once(DOCROOT . 'inc/wfpl/upload.php');
 
 # example: 200x300
 function format_width_height($str) {
@@ -52,15 +26,21 @@ function admin_images_get_fields() {
 
 	$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']);
+	if($_FILES['image'] && $_FILES['image']['error'] == 0 && file_exists($_FILES['image']['tmp_name'])) {
+		$image_fn_ext = path_or_mime_to_ext($_FILES['image']['name'], $_FILES['image']['type']);
+		$image_fn_ext = ext_to_web_image_ext($image_fn_ext);
+		$image_fn_base = sha1_file($_FILES['image']['tmp_name']);
+		if (strlen($image_fn_base) == 40) {
+			$image_fn_base = substr($image_fn_base, 0, 16);
+			$image_filename = 'cms_images/' . $image_fn_base . '.' . $image_fn_ext;
+			$data['image'] = convert_uploaded_image('image', $image_filename);
+		}
 	} else {
 		if(_REQUEST_cut('delete_image') == 'Yes') {
 			$data['image'] = '';
 		} else {
-			$data['image'] = format_image_w_h_thumb_w_h(_REQUEST_cut('old_image'));
+			$data['image'] = format_image_w_h(_REQUEST_cut('old_image'));
 		}
 	}
 	unset($_FILES['image']);
@@ -70,10 +50,7 @@ function admin_images_get_fields() {
 
 
 function admin_images_main() {
-	if(!logged_in_as_admin()) {
-		$_REQUEST['url'] = this_url();
-		return 'admin_login';
-	}
+	session_auth_must('admin_images');
 
 	$id = _REQUEST_cut('edit_id');
 	if($id) {
@@ -115,7 +92,7 @@ function admin_images_main_display($id) {
 
 	# Find pages that have this image on it
 	if($data['image']) {
-		$references = db_get_assocs('cms_pages', 'title,filename', 'where content like "%%%s%%" order by concat(nav_title,title)', substr(enc_image_src($data['image']), 0, -4)); # FIXME test that this works for smaller images
+		$references = db_get_assocs('cms_pages', 'title,filename', 'where content like "%%%s%%" order by concat(nav_title,title)', substr(enc_image_src($data['image']), 0, -4));
 		if($references) {
 			$data['references'] = array(
 				'data' => $references,
@@ -123,68 +100,22 @@ function admin_images_main_display($id) {
 		}
 	}
 
-	# display smaller versions with instructions and example code
-	$smaller == array();
-	if($data['image'] && $data['sizes']) {
-		$big_src = enc_image_src($data['image']);
-		$row = explode("\n", $data['sizes']);
-		foreach($row as $max_hw) {
-			$max_hw = format_width_height($max_hw);
-			if($max_hw == '') {
-				continue;
-			}
-			list($max_width, $max_height) = explode('x', $max_hw);
-			$src = str_replace('.', "-$max_width-$max_height.", $big_src);
-			$dimensions = image_dimensions($src);
-			if($dimensions) {
-				list($width, $height) = explode('x', $dimensions);
-			} else {
-				$width = $max_width;
-				$height = $max_height;
-			}
-
-			$smaller[] = array(
-				'src' => $src,
-				'max_width' => $max_width,
-				'max_height' => $max_height,
-				'width' => $width,
-				'height' => $height);
-		}
-	}
-	if($smaller) {
-		$data['smaller'] = $smaller;
-	} else {
-		tem_set('no_sizes');
-	}
-
 	tem_set('display', $data);
 }
 
 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
+		$src = enc_image_src($data['image']);
+		if ($src) {
+			$filenames = array($src);
+			foreach ($GLOBALS['wfpl_image_widths'] as $w) {
+				$filenames [] = substr($src, 0, -4) . 'w' . $w . substr($src, -4);
 			}
-		}
-		foreach ($filenames as $filename) {
-			if (file_exists($filename)) {
-				unlink($filename);
+			foreach ($filenames as $filename) {
+				if (file_exists($filename)) {
+					unlink($filename);
+				}
 			}
 		}
 		db_delete('cms_images', 'where id=%i', $id);
@@ -196,7 +127,22 @@ function admin_images_main_delete($id) {
 }
 
 function admin_images_main_listing() {
-	$listing_rows = db_get_assocs('cms_images', 'id,image,name,caption', 'order by name, caption');
+	$sort_by = 'name';
+	$sorts = array(
+		'age' => 'created_at desc',
+		'name' => "coalesce(nullif(name, ''), caption), created_at",
+		'caption' => "coalesce(nullif(caption, ''), name), created_at"
+	);
+	if (isset($_REQUEST['sort'])) {
+		foreach ($sorts as $s => $sql) {
+			if ($_REQUEST['sort'] == $s) {
+				$sort_by = $s;
+				break;
+			}
+		}
+	}
+	tem_set("sort_by_$sort_by");
+	$listing_rows = db_get_assocs('cms_images', 'id,image,name,caption', 'order by ' . $sorts[$sort_by]);
 	tem_set('listings', $listing_rows);
 }
 
@@ -211,23 +157,6 @@ function admin_images_main_form($id = false) {
 		# 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.)
 
-		# resize image as needed
-		if($data['image'] && $data['sizes']) {
-			$big_src = enc_image_src($data['image']);
-			$row = explode("\n", $data['sizes']);
-			foreach($row as $max_hw) {
-				$max_hw = format_width_height($max_hw);
-				if($max_hw == '') {
-					continue;
-				}
-				list($max_width, $max_height) = explode('x', $max_hw);
-				$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');
-				}
-			}
-		}
-
 		# save to database
 		if($id) {
 			db_update_assoc('cms_images', $data, 'where id=%i', $id);