X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl-cms.git;a=blobdiff_plain;f=admin_images.php;h=c2f4943fba53ec34f7a87362882d80ba4b0fff0e;hp=993088975ee36983f3de3d26e5d0fef2f76fb39f;hb=HEAD;hpb=abf27e3dd23a8fb52d766be615ebaa19a9dfc389

diff --git a/admin_images.php b/admin_images.php
index 9930889..c2f4943 100644
--- a/admin_images.php
+++ b/admin_images.php
@@ -2,240 +2,157 @@
 
 # This form requires wfpl. See: http://sametwice.com/wfpl
 
-define('ADMIN_IMAGES_DB_FIELDS', 'image,name,caption,sizes');
+define('ADMIN_IMAGES_DB_FIELDS', 'image,name,caption');
 
-# 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(DOCROOT . 'inc/wfpl/format.php');
-require_once(DOCROOT . 'inc/wfpl/upload.php');
+require_once(__DIR__.'/'.'inc/wfpl/format.php');
+require_once(__DIR__.'/'.'inc/wfpl/upload.php');
 
 # example: 200x300
 function format_width_height($str) {
-	$fields = explode('x', $str);
-	if(count($fields) != 2) {
-		return '';
-	}
+    $fields = explode('x', $str);
+    if(count($fields) != 2) {
+        return '';
+    }
 
-	list($width, $height) = $fields;
-	$width = format_int_0($width);
-	$height = format_int_0($height);
+    list($width, $height) = $fields;
+    $width = format_int_0($width);
+    $height = format_int_0($height);
 
-	return "${width}x$height";
+    return "${width}x$height";
 }
 
 function admin_images_get_fields() {
-	$data = array();
-
-	$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_cut('delete_image') == 'Yes') {
-			$data['image'] = '';
-		} else {
-			$data['image'] = format_image_w_h_thumb_w_h(_REQUEST_cut('old_image'));
-		}
-	}
-	unset($_FILES['image']);
-
-	return $data;
+    $data = array();
+
+    $data['name'] = format_oneline(_REQUEST_cut('name'));
+    $data['caption'] = format_oneline(_REQUEST_cut('caption'));
+
+    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'] = '';
+        }
+    }
+    unset($_FILES['image']);
+
+    return $data;
 }
 
 
 function admin_images_main() {
-	if(!logged_in_as_admin()) {
-		$_REQUEST['url'] = this_url();
-		return 'admin_login';
-	}
-
-	$id = _REQUEST_cut('edit_id');
-	if($id) {
-		return admin_images_main_form($id);
-	}
-
-	$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();
-}
+    session_auth_must('admin_images');
+
+    $id = _REQUEST_cut('edit_id');
+    if($id) {
+        return admin_images_main_form($id);
+    }
+
+    $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();
+    }
+
+    if(isset($_POST['name'])) {
+        return admin_images_main_form();
+    }
 
-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: Broken Link (Image #$id not found)");
-		return './admin_images';
-	}
-
-	# 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
-		if($references) {
-			$data['references'] = array(
-				'data' => $references,
-				'count' => count($references));
-		}
-	}
-
-	# 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);
+    # default action:
+    return admin_images_main_listing();
 }
 
 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.');
-	} else {
-		message("Couldn't find image to delete. Maybe it's already been deleted?");
-	}
-	return './admin_images';
+    $data = db_get_assoc('cms_images', 'image', 'where id=%i', $id);
+    if ($data) {
+        $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);
+                }
+            }
+        }
+        db_delete('cms_images', 'where id=%i', $id);
+        message('Image deleted.');
+    } else {
+        message("Couldn't find image to delete. Maybe it's already been deleted?");
+    }
+    return './admin_images';
 }
 
 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);
+    $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);
 }
 
 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.)
-
-		# 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);
-			message('Image updated.');
-			$saved_id = $id;
-		} else {
-			db_insert_assoc('cms_images', $data);
-			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";
-
-	} 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', $id);
-	} else {
-		# form not submitted, set default values:
-		$data = array('sizes' => '275x500');
-	}
-
-	tem_set('upload_max_filesize', upload_max_filesize());
-
-	tem_set('form', $data);
+    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.)
+
+        # save to database
+        if($id) {
+            db_update_assoc('cms_images', $data, 'where id=%i', $id);
+            message('Image updated.');
+            $saved_id = $id;
+            return "./admin_images";
+        } else {
+            $data['created_at'] = time();
+            db_insert_assoc('cms_images', $data);
+            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 "./admin_images?sort=age";
+        }
+
+    } 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', $id);
+    } else {
+        # form not submitted, set default values:
+        $data = array();
+    }
+
+    tem_set('upload_max_filesize', upload_max_filesize());
+
+    tem_set('form', $data);
 }