X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=upload.php;h=f6a196b0ccd790d2368246fe09bba45270dc7a82;hb=23ac7dc3675119a6f7a3876837bd6c656b0d2cce;hp=b8762b723363f2249caf836b2de2296cfe625faa;hpb=c4e3ec54f995df5a6db8c497fb826f0d21d35cbc;p=wfpl.git diff --git a/upload.php b/upload.php index b8762b7..f6a196b 100644 --- a/upload.php +++ b/upload.php @@ -4,20 +4,19 @@ # # This file is part of wfpl. # -# wfpl is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# wfpl is free software; you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) # any later version. # -# wfpl is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. +# wfpl is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for +# more details. # -# You should have received a copy of the GNU General Public License -# along with wfpl; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA. +# You should have received a copy of the GNU Lesser General Public License +# along with wfpl; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This file contains functions to accept files being uplodad with the 'txt', 'text/html' => 'html', 'image/jpeg' => 'jpg', + 'image/jpe' => 'jpg', 'image/jpg' => 'jpg', 'image/gif' => 'gif', 'image/png' => 'png', @@ -117,7 +116,7 @@ function generate_filename($path, $mime = 'text/plain') { # replace symbols with underscores $filename = ereg_replace('[^a-z0-9_.]', '_', $filename); - # remove dots from the begning (no invisible files) + # remove dots from the beginning (no invisible files) $filename = ereg_replace('^\.*', '', $filename); # fix extension @@ -157,12 +156,47 @@ function save_uploaded_file($key, $path) { } if(!move_uploaded_file($_FILES[$key]['tmp_name'], $filename)) { - die('file upload failed'); + return false; } return $filename; } +# this function exists to deal with cases where binaries are installed in very +# standard places (like /usr/bin or /usr/local bin) and PHP's PATH environment +# variable is not set appropriately. +function path_to($prog, $or_die = true) { + $prog = ereg_replace('[^a-zA-Z0-9_.-]', '', $prog); + $prog = ereg_replace('^[-.]*', '', $prog); + if($prog == '') { + die('Invalid argument to path_to()'); + } + + if(!isset($GLOBALS["path_to_$prog"])) { + $ret = _path_to($prog, $or_die); + if($ret == false) { + return false; + } + $GLOBALS["path_to_$prog"] = $ret; + } + + return $GLOBALS["path_to_$prog"]; +} + +function _path_to($prog, $or_die) { + # relies on PHP's short-circuit mechanism + if(file_exists($path = "/usr/local/bin/$prog") || + file_exists($path = "/usr/bin/$prog") || + ($path = `which $prog` != '' && file_exists($path))) { + return $path; + } else { + if($or_die) { + die("Failed to locate '$prog' executable."); + } + return false; + } +} + # returns new filename with .png extension function gif_to_png($filename, $new_filename = 'just change extension') { @@ -175,17 +209,8 @@ function gif_to_png($filename, $new_filename = 'just change extension') { $new_filename .= '.png'; } - $convert = '/usr/local/bin/convert'; - if(!file_exists($convert)) { - $convert = '/usr/bin/convert'; - } - if(!file_exists($convert)) { - $convert = `which convert`; - } - if(!file_exists($convert)) { - die("can't find imagemagick's 'convert' program"); - } - + $convert = path_to('convert'); + $command = "$convert " . escapeshellarg($filename) . ' ' . escapeshellarg($new_filename); exec($command, $dummy, $ret); @@ -196,6 +221,61 @@ function gif_to_png($filename, $new_filename = 'just change extension') { return $new_filename; } +# make a thumbnail image. +# +# Thumbnail will have the same filename, except "_thumb" will be added right +# before the dot preceding the extension. so foo.png yields foo_thumb.png +# +# Thumbnail will retain aspect ratio, and be either $max_width wide or +# $max_height tall (or, if the aspect is just right, both) +function make_thumbnail($filename, $max_width = '70', $max_height = '70') { + $last_dot = strrpos($filename, '.'); + if($last_dot === false) { + die("couldn't make thumbnail because filename has no extension."); + } + + $thumb = substr($filename, 0, $last_dot); + $thumb .= '_thumb'; + $thumb .= substr($filename, $last_dot); + + $convert = path_to('convert'); + + # can't be too careful + $max_width = ereg_replace('[^0-9]', '', $max_width); + if($max_width == '') { + $max_width = '70'; + } + $max_height = ereg_replace('[^0-9]', '', $max_height); + if($max_height == '') { + $max_height = '70'; + } + + $command = "$convert -geometry ${max_width}x$max_height " . escapeshellarg($filename) . ' ' . escapeshellarg($thumb); + + exec($command, $dummy, $ret); + if($ret != 0) { + die("Thumbnail creation failed. Convert called exit($ret)"); + } + + return $thumb; +} + +# Argument: path to image file +# +# Return: string in the format WIDTHxHEIGHT, or boolean false +# +# Example: image_dimensions('uploads/foo.png'); ==> "124x58" +function image_dimensions($image) { + $identify = path_to('identify'); + $command = "$identify -format '%wx%h' " . escapeshellarg($image); + $dimensions = rtrim(`$command`); + if($dimensions == '') { + return false; + } else { + return $dimensions; + } +} + # like save_uploaded_file() (above) except it converts gifs to pngs. # # FIXME: if a filename is passed in the end of path, we should check if the file type matches, and if not run convert.