mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00
Code Issues Releases Wiki Activity

Thumbnail cropping fixes. thumbUrl() support added.

Browse Source
This commit is contained in:
Cameron 2016-10-11 14:58:08 -07:00
parent a4636ba66e
commit 29bcee56ec
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/e_parse_class.php
View File

@ -2400,6 +2400,12 @@ class e_parse extends e_parser
$thurl .= 'aw='.intval($options['w']).'&ah='.intval($options['h']); $thurl .= 'aw='.intval($options['w']).'&ah='.intval($options['h']);
if(is_string($options['crop']))
{
$thurl .= '&c='.$options['crop'];
$options['nosef'] = true;
}
} }
else else
{ {
@ -2409,7 +2415,7 @@ class e_parse extends e_parser
} }
if(e_MOD_REWRITE_MEDIA == true && empty($options['nosef']))// Experimental SEF URL support. if(e_MOD_REWRITE_MEDIA == true && empty($options['nosef']) )// Experimental SEF URL support.
{ {
$options['full'] = $full; $options['full'] = $full;
$options['ext'] = substr($url,-3); $options['ext'] = substr($url,-3);
@ -2570,7 +2576,17 @@ class e_parse extends e_parser
} }
elseif(!empty($options['crop'])) elseif(!empty($options['crop']))
{ {
$sefUrl .= 'a'.intval($options['w']) .'xa'. intval($options['h']);
if(is_string($options['crop']))
{
$sefUrl .= strtolower($options['crop']).intval($options['w']) .'x'.strtolower($options['crop']). intval($options['h']);
}
else
{
$sefUrl .= 'a'.intval($options['w']) .'xa'. intval($options['h']);
}
} }
else else
{ {

20
thumb.php
View File

@ -256,7 +256,13 @@ class e_thumbpage
$thumbnfo = pathinfo($this->_src_path); $thumbnfo = pathinfo($this->_src_path);
$options = $this->getRequestOptions(); $options = $this->getRequestOptions();
$cache_str = md5(serialize($options). $this->_src_path. $this->_thumbQuality); if($this->_debug === true)
{
var_dump($options);
// return false;
}
$cache_str = md5(serialize($options). $this->_src_path. $this->_thumbQuality. $options['c']);
$fname = strtolower('Thumb_'.$thumbnfo['filename'].'_'.$cache_str.'.'.$thumbnfo['extension']).'.cache.bin'; $fname = strtolower('Thumb_'.$thumbnfo['filename'].'_'.$cache_str.'.'.$thumbnfo['extension']).'.cache.bin';
@ -317,7 +323,7 @@ class e_thumbpage
} }
// Image Cropping by Quadrant. // Image Cropping by Quadrant.
if(!empty($this->_request['c'])) // $quadrant T(op), B(ottom), C(enter), L(eft), R(right) if(!empty($options['c'])) // $quadrant T(op), B(ottom), C(enter), L(eft), R(right)
{ {
if(!empty($this->_request['ah'])) if(!empty($this->_request['ah']))
{ {
@ -329,7 +335,9 @@ class e_thumbpage
$this->_request['w'] = $this->_request['aw']; $this->_request['w'] = $this->_request['aw'];
} }
$thumb->adaptiveResizeQuadrant((integer) vartrue($this->_request['w'], 0), (integer) vartrue($this->_request['h'], 0), $this->_request['c']);
$thumb->adaptiveResizeQuadrant((integer) vartrue($this->_request['w'], 0), (integer) vartrue($this->_request['h'], 0), $options['c']);
} }
if(isset($this->_request['w']) || isset($this->_request['h'])) if(isset($this->_request['w']) || isset($this->_request['h']))
{ {
@ -393,6 +401,12 @@ class e_thumbpage
$ret['ah'] = isset($this->_request['ah']) ? intval($this->_request['ah']) : $ret['aw']; $ret['ah'] = isset($this->_request['ah']) ? intval($this->_request['ah']) : $ret['aw'];
$ret['c'] = isset($this->_request['c']) ? strtoupper(substr(filter_var($this->_request['c'],FILTER_SANITIZE_STRING),0,1)) : false; $ret['c'] = isset($this->_request['c']) ? strtoupper(substr(filter_var($this->_request['c'],FILTER_SANITIZE_STRING),0,1)) : false;
// $ret['wm'] = isset($this->_request['wm']) ? intval($this->_request['wm']) : $ret['wm']; // $ret['wm'] = isset($this->_request['wm']) ? intval($this->_request['wm']) : $ret['wm'];
if($ret['c'] == 'A') // auto
{
$ret['c'] = 'T'; // default is 'Top';
}
return $ret; return $ret;
} }