X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/ead5bed24e07383fbcf783c3b5c70a755dbc1982..4486f69521f03fe56549394f13f7c529f57fa962:/thumb/index.php

diff --git a/thumb/index.php b/thumb/index.php
index d296fbf..bd08d88 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,5 +1,10 @@
 <?php
-list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 2);
+if (!$User) return;
+$imgpath = ltrim($Page->path, '/');
+if (!preg_match('{^[0-9x]+/}', $imgpath)) {
+	return;
+}
+list ($size, $imgpath) = explode('/', $imgpath, 2);
 $imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
 
 if (!file_exists($imgpath)) {
@@ -90,10 +95,11 @@ function mkthumb_exec($source, $target, $width, $height)
 		'-delete', '1--1', # static
 		'-trim',
 		'-background', 'white', '-layers', 'flatten', # opaque
+		'-auto-orient', # apply exif rotation
 		'-interlace', 'plane', # progressive
 		'-strip', '-taint', # omit metadata
 		'-sampling-factor', '4:2:0', '-colorspace', 'sRGB', # half chroma
-		'-resize', "${width}x${height}",
+		'-resize', "${width}x${height}>",
 		'-quality', '85%',
 		$source, "jpg:$target"
 	]));