From 49c61dde90f44e18a707cd3477be490d2a1e9e40 Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 31 May 2012 13:46:22 +0000 Subject: feature 2632: convert 2.3 thumbnails/websize/hd settings into 2.4 derivatives settings git-svn-id: http://piwigo.org/svn/trunk@15449 68402e56-0260-453c-a942-63ccdbb3a9ee --- install/db/123-database.php | 218 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 install/db/123-database.php diff --git a/install/db/123-database.php b/install/db/123-database.php new file mode 100644 index 000000000..af3c21234 --- /dev/null +++ b/install/db/123-database.php @@ -0,0 +1,218 @@ + $thumb_width_max) +{ + $dbconf['upload_form_thumb_maxwidth'] = $thumb_width_max; +} + +if ($dbconf['upload_form_thumb_maxheight'] < $thumb_height_min) +{ + $dbconf['upload_form_thumb_maxheight'] = $thumb_height_min; +} + +if ($dbconf['upload_form_thumb_maxheight'] > $thumb_height_max) +{ + $dbconf['upload_form_thumb_maxheight'] = $thumb_height_max; +} + +if ($thumb_is_square) +{ + $dbconf['upload_form_thumb_maxheight'] = $dbconf['upload_form_thumb_maxwidth']; +} + +$size = array($dbconf['upload_form_thumb_maxwidth'], $dbconf['upload_form_thumb_maxheight']); + +$thumb = new DerivativeParams( + new SizingParams( + $size, + $dbconf['upload_form_thumb_crop'] ? 1 : 0, + $dbconf['upload_form_thumb_crop'] ? $size : null + ) + ); + +$types[IMG_THUMB] = $thumb; + +// slightly enlarge XSS to be bigger than thumbnail size (but smaller than XS) +if ($dbconf['upload_form_thumb_maxwidth'] >= $types[IMG_XXSMALL]->sizing->ideal_size[0] + or $dbconf['upload_form_thumb_maxheight'] >= $types[IMG_XXSMALL]->sizing->ideal_size[1]) +{ + $xxs_maxwidth = $types[IMG_XXSMALL]->sizing->ideal_size[0]; + if ($dbconf['upload_form_thumb_maxwidth'] >= $xxs_maxwidth) + { + $xxs_maxwidth = 350; + } + + $xxs_maxheight = $types[IMG_XXSMALL]->sizing->ideal_size[1]; + if ($dbconf['upload_form_thumb_maxheight'] >= $xxs_maxheight) + { + $xxs_maxheight = 310; + } + + $xxs = new DerivativeParams(new SizingParams(array($xxs_maxwidth, $xxs_maxheight))); + + $types[IMG_XXSMALL] = $xxs; +} + +// +// Piwigo 2.3 "websize" becomes "medium" size in Piwigo 2.4 +// + +// if there was no "websize resize" on Piwigo 2.3, we can't take the resize +// settings into account, we keep the default settings of Piwigo 2.4. +if ($dbconf['upload_form_websize_resize']) +{ + $medium_width_min = 577; // default S maxwidth + 1 pixel + $medium_width_max = 1007; // default L maxwidth - 1 pixel + $medium_height_min = 433; // default S maxheight + 1 pixel + $medium_height_max = 755; // default L maxheight - 1 pixel + + // width + if (!is_numeric($dbconf['upload_form_websize_maxwidth'])) // sometimes maxwidth="false" + { + $dbconf['upload_form_websize_maxwidth'] = $medium_width_max; + } + + if ($dbconf['upload_form_websize_maxwidth'] < $medium_width_min) + { + $dbconf['upload_form_websize_maxwidth'] = $medium_width_min; + } + + if ($dbconf['upload_form_websize_maxwidth'] > $medium_width_max) + { + $dbconf['upload_form_websize_maxwidth'] = $medium_width_max; + } + + // height + if (!is_numeric($dbconf['upload_form_websize_maxheight'])) // sometimes maxheight="false" + { + $dbconf['upload_form_websize_maxheight'] = $medium_height_max; + } + + if ($dbconf['upload_form_websize_maxheight'] < $medium_height_min) + { + $dbconf['upload_form_websize_maxheight'] = $medium_height_min; + } + + if ($dbconf['upload_form_websize_maxheight'] > $medium_height_max) + { + $dbconf['upload_form_websize_maxheight'] = $medium_height_max; + } + + $medium = new DerivativeParams( + new SizingParams( + array( + $dbconf['upload_form_websize_maxwidth'], + $dbconf['upload_form_websize_maxheight'] + ) + ) + ); + + $types[IMG_MEDIUM] = $medium; +} + +// +// Save derivative new settings +// + +ImageStdParams::set_and_save($types); + +pwg_query('DELETE FROM '.CONFIG_TABLE.' WHERE param = \'disabled_derivatives\''); +clear_derivative_cache(); + +echo "\n".$upgrade_description."\n"; +?> \ No newline at end of file -- cgit v1.2.3