X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=upload.php;h=143482cedbc78ca5cf3fb82ddf3500093764ae0b;hb=a679272cb862dd647da227cc720cd4d4853887c0;hp=b8762b723363f2249caf836b2de2296cfe625faa;hpb=c4e3ec54f995df5a6db8c497fb826f0d21d35cbc;p=wfpl.git

diff --git a/upload.php b/upload.php
index b8762b7..143482c 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 <input
@@ -66,6 +65,7 @@ $GLOBALS['mime_to_ext'] = array(
 	'text/plain' => 'txt',
 	'text/html'  => 'html',
 	'image/jpeg' => 'jpg',
+	'image/jpe' => 'jpg',
 	'image/jpg'  => 'jpg',
 	'image/gif'  => 'gif',
 	'image/png'  => 'png',
@@ -117,7 +117,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
@@ -182,7 +182,7 @@ function gif_to_png($filename, $new_filename = 'just change extension') {
 	if(!file_exists($convert)) {
 		$convert = `which convert`;
 	}
-	if(!file_exists($convert)) {
+	if($convert == '' || !file_exists($convert)) {
 		die("can't find imagemagick's 'convert' program");
 	}