adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-05 00:13:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 2548 multisize - custom sizes restricted to those requested by theme/plugin

Browse Source 
code refacto

git-svn-id: http://piwigo.org/svn/trunk@13021 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2012-02-02 20:59:41 +00:00
parent a68826cbb3
commit 18036a70fc
9 changed files with 142 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/template.class.php
+14 -12
View File
@@ -559,31 +559,33 @@ class Template {
!empty($params['width']) or fatal_error('define_derviative missing width');
!empty($params['height']) or fatal_error('define_derviative missing height');
$derivative = new DerivativeParams( SizingParams::classic( intval($params['width']), intval($params['height'])) );
$w = intval($params['width']);
$h = intval($params['height']);
$crop = 0;
$minw=null;
$minh=null;
if (isset($params['crop']))
{
if (is_bool($params['crop']))
{
$derivative->sizing->max_crop = $params['crop'] ? 1:0;
$crop = $params['crop'] ? 1:0;
}
else
{
$derivative->sizing->max_crop = round($params['crop']/100, 2);
$crop = round($params['crop']/100, 2);
}
if ($derivative->sizing->max_crop)
if ($crop)
{
$minw = empty($params['min_width']) ? $derivative->max_width() : intval($params['min_width']);
$minw <= $derivative->max_width() or fatal_error('define_derviative invalid min_width');
$minh = empty($params['min_height']) ? $derivative->max_height() : intval($params['min_height']);
$minh <= $derivative->max_height() or fatal_error('define_derviative invalid min_height');
$derivative->sizing->min_size = array($minw, $minh);
$minw = empty($params['min_width']) ? $w : intval($params['min_width']);
$minw <= $w or fatal_error('define_derviative invalid min_width');
$minh = empty($params['min_height']) ? $h : intval($params['min_height']);
$minh <= $h or fatal_error('define_derviative invalid min_height');
}
}
ImageStdParams::apply_global($derivative);
$smarty->assign( $params['name'], $derivative);
$smarty->assign( $params['name'], ImageStdParams::get_custom($w, $h, $crop, $minw, $minh) );
}
/**