Changeset 31245 for extensions/GDThumb/main.inc.php

Timestamp:

Jul 20, 2015, 1:45:59 AM (9 years ago)

Author:

SergeD

Message:

version 1.0.18 - refer to changelog for more details

File:

• extensions/GDThumb/main.inc.php (modified) (5 diffs)

extensions/GDThumb/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: gdThumb
-Version: 1.0.17
+Version: 1.0.18
 Description: Apply Masonry style to album or image thumbs
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=771
@@ -19 +19 @@
 // | Plugin constants                                               |
 // +-----------------------------------------------------------------------+
-define('GDTHUMB_VERSION', '1.0.17');
+define('GDTHUMB_VERSION', '1.0.18');
 define('GDTHUMB_ID',      basename(dirname(__FILE__)));
 define('GDTHUMB_PATH' ,   PHPWG_PLUGINS_PATH . GDTHUMB_ID . '/');
@@ -28 +28 @@
 if (!isset($conf['gdThumb'])):
   include(dirname(__FILE__).'/config_default.inc.php');
-
-  $query = '
-INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
-VALUES ("gdThumb" , "'.addslashes(serialize($config_default)).'" , "GDThumb plugin parameters");';
-  pwg_query($query);
+  conf_update_param('gdThumb', $config_default);
   load_conf_from_db();
 endif;
@@ -113 +109 @@
   $template->set_filename( 'index_thumbnails', dirname(__FILE__) . '/template/gdthumb_thumb.tpl');
   $template->assign('GDThumb', $confTemp);
-  $template->assign('GDThumb_derivative_params', ImageStdParams::get_custom(9999, $confTemp['height']));
+  if (($confTemp['method'] == "slide") || ($confTemp['method'] == "square")):
+    $template->assign('GDThumb_derivative_params', ImageStdParams::get_custom($confTemp['height'], 9999));
+  else:
+    $template->assign('GDThumb_derivative_params', ImageStdParams::get_custom(9999, $confTemp['height']));
+  endif;
 
   if ($confTemp['big_thumb'] and !empty($tpl_vars[0])):
-    $derivative_params = ImageStdParams::get_custom(9999, 2 * $confTemp['height'] + $confTemp['margin']);
+    if (($confTemp['method'] == "slide") || ($confTemp['method'] == "square")):
+      $derivative_params = ImageStdParams::get_custom(2 * $confTemp['height'] + $confTemp['margin'], 9999);
+    else:
+      $derivative_params = ImageStdParams::get_custom(9999, 2 * $confTemp['height'] + $confTemp['margin']);
+    endif;
     $template->assign('GDThumb_big', new DerivativeImage($derivative_params, $tpl_vars[0]['src_image']));
   endif;
@@ -132 +136 @@
   $template->set_filename( 'index_category_thumbnails', dirname(__FILE__) . '/template/gdthumb_cat.tpl');
   $template->assign('GDThumb', $confTemp);
-  $template->assign('GDThumb_derivative_params', ImageStdParams::get_custom(9999, $confTemp['height']));
+  if (($confTemp['method'] == "slide") || ($confTemp['method'] == "square")):
+    $template->assign('GDThumb_derivative_params', ImageStdParams::get_custom($confTemp['height'], 9999));
+  else:
+    $template->assign('GDThumb_derivative_params', ImageStdParams::get_custom(9999, $confTemp['height']));
+  endif;
 
   if ($confTemp['big_thumb'] and !empty($tpl_vars[0])):
     $id = $tpl_vars[0]["representative_picture_id"];
     if (($id) && ($rep = $tpl_vars[0]["representative"])):
-      $derivative_params = ImageStdParams::get_custom(9999, 2 * $confTemp['height'] + $confTemp['margin']);
+      if (($confTemp['method'] == "slide") || ($confTemp['method'] == "square")):
+        $derivative_params = ImageStdParams::get_custom(2 * $confTemp['height'] + $confTemp['margin'], 9999);
+      else:
+        $derivative_params = ImageStdParams::get_custom(9999, 2 * $confTemp['height'] + $confTemp['margin']);
+      endif;
       $template->assign('GDThumb_big', new DerivativeImage($derivative_params, $rep['src_image']));
     endif;