From e7424acd48ed670f1b8bd8d7c1ff69b37ce6334b Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Fri, 6 Nov 2015 16:28:27 -0500 Subject: [PATCH] finish responsive images, revamp admin_images --- .htaccess | 8 +++- admin_images.html | 35 +++------------ admin_images.php | 108 +++++++++------------------------------------ admin_pages.html | 54 +++++++++-------------- admin_pages.php | 16 +++---- cms_images_autoresize.php | 76 +++++++++++++++++++++++++++++++ config.php | 10 +++++ inc/wfpl | 2 +- style.styl | 53 ++++++++++++++++------ 9 files changed, 186 insertions(+), 176 deletions(-) create mode 100644 cms_images_autoresize.php diff --git a/.htaccess b/.htaccess index 1c77df3..e2884e3 100644 --- a/.htaccess +++ b/.htaccess @@ -23,9 +23,15 @@ php_flag engine off RemoveHandler .cgi .php .php3 .php4 .php5 .phtml .pl .py .pyc .pyo # code execution exception: allow only /wfpl_main.php # matches regardless of directory/path, so rewrite php in subdirs -RewriteRule ^wfpl_main\.php$ - [L] +RewriteRule ^(wfpl_main\.php|cms_images_autoresize\.php)$ - [L] RewriteRule .*\.php$ - [L,R=404] php_flag engine on SetHandler application/x-httpd-php + + php_flag engine on + SetHandler application/x-httpd-php + +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^cms_images/[0-9a-f]+w[0-9]+\.[pj][np]g$ /cms_images_autoresize.php diff --git a/admin_images.html b/admin_images.html index 942dc06..f9d7063 100644 --- a/admin_images.html +++ b/admin_images.html @@ -10,11 +10,9 @@

~$host~ Admin Control Panel

-

Details for Image ~caption empty {~~name nonempty {~"~name html~"~}~~}~~caption nonempty {~"~caption html~"~}~

+

Details for Image ~caption empty {~~name nonempty {~"~name html~"~}~~}~~caption nonempty {~"~caption html~"~}~

-

Add another image

- -

Back to images

+

← Back to images

Edit this image

@@ -28,24 +26,8 @@

Now that you've uploaded this image, you can insert it into a page with the page editor. You can get to the page editor from the control panel or by going to a page you'd like to edit, then clicking "Edit this page" at the top.

- -

Sizes

- -

This image is available in the following sizes.

- -

Note: Currently only the first and last sizes are available in the page editor.

- - -
Width: ~width~ pixels, Height: ~height~ pixels
-
~caption nonempty {~~caption html~~}~
- -
Full Size (centered):
-
~caption nonempty {~~caption html~~}~
- - -

To display this image smaller, edit this image and enter display size(s).

- +
~caption nonempty {~~caption html~~}~
@@ -65,19 +47,14 @@
Name (optional)
-
This name is only displayed on the image administration page.
+
This name is only displayed on administration pages.
Caption (optional)
Here's some symbols you might want to paste in: ©   —   –
-
Sizes
-
(Enter the width and height (in pixels) at which you'd like to use this image. Put an x between them with no spaces, so it looks like this: 100x200. The image will be scaled so it maintains it's aspect ratio (shape) and just fits inside those dimentions. You can use this image at multiple different sizes, by entering a different set of dimensions (WIDTHxHEIGHT) on each line)
-
- -
 
-
+
@@ -96,7 +73,7 @@ - + diff --git a/admin_images.php b/admin_images.php index 3b0fef7..73d16c6 100644 --- a/admin_images.php +++ b/admin_images.php @@ -4,17 +4,6 @@ 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(DOCROOT . 'inc/wfpl/format.php'); require_once(DOCROOT . 'inc/wfpl/upload.php'); @@ -37,15 +26,21 @@ function admin_images_get_fields() { $data['name'] = format_oneline(_REQUEST_cut('name')); $data['caption'] = format_oneline(_REQUEST_cut('caption')); - $data['sizes'] = str_replace(' ', '', strtolower(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']); @@ -97,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, @@ -105,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); @@ -193,23 +142,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); diff --git a/admin_pages.html b/admin_pages.html index 59af576..c7ac728 100644 --- a/admin_pages.html +++ b/admin_pages.html @@ -62,6 +62,8 @@
ImageNameCaption 
~name html~(blank) ~caption html~(blank) [delete this image]