Changeset 31245 for extensions/GDThumb/admin.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/admin.php (modified) (7 diffs)

extensions/GDThumb/admin.php

@@ -3 +3 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-function delete_gdthumb_cache($height) {
-  $pattern = '#.*-cu_s9999x'.$height.'\.[a-zA-Z0-9]{3,4}$#';
-  if ($contents = @opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR)):
+function int_delete_gdthumb_cache($pattern) {
+  if ($contents = @opendir(PHPWG_ROOT_PATH . PWG_DERIVATIVE_DIR)):
     while (($node = readdir($contents)) !== false):
       if ($node != '.'
           and $node != '..'
-          and is_dir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$node)):
-        clear_derivative_cache_rec(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$node, $pattern);
+          and is_dir(PHPWG_ROOT_PATH . PWG_DERIVATIVE_DIR . $node)):
+        clear_derivative_cache_rec(PHPWG_ROOT_PATH . PWG_DERIVATIVE_DIR . $node, $pattern);
       endif;
     endwhile;
@@ -16 +15 @@
   endif;
 }
+
+function delete_gdthumb_cache($height) {
+  int_delete_gdthumb_cache('#.*-cu_s9999x' . $height . '\.[a-zA-Z0-9]{3,4}$#');
+  int_delete_gdthumb_cache('#.*-cu_s' . $height . 'x9999\.[a-zA-Z0-9]{3,4}$#');
+}
+
+global $template, $conf, $page;
+
+load_language('plugin.lang', GDTHUMB_PATH);
+include(dirname(__FILE__).'/config_default.inc.php');
+$params = $conf['gdThumb'];
 
 if (isset($_GET['getMissingDerivative'])) {
@@ -43 +53 @@
       if ($src_image->is_mimetype())
         continue;
-      $derivative = new DerivativeImage(ImageStdParams::get_custom(9999, $conf['gdThumb']['height']), $src_image);
+      if (($params['method'] == "slide") || ($params['method'] == "square")):
+        $derivative = new DerivativeImage(ImageStdParams::get_custom($params['height'], 9999), $src_image);
+      else:
+        $derivative = new DerivativeImage(ImageStdParams::get_custom(9999, $params['height']), $src_image);
+      endif;
       if (@filemtime($derivative->get_path())===false) {
         $urls[] = $derivative->get_url().$uid;
@@ -64 +78 @@
 }
 
-global $template, $conf, $page;
-
-load_language('plugin.lang', GDTHUMB_PATH);
-include(dirname(__FILE__).'/config_default.inc.php');
-$params = $conf['gdThumb'];
-
 // Delete cache
 if (isset($_POST['cachedelete'])) {
   check_pwg_token();
-  delete_gdthumb_cache($conf['gdThumb']['height']);
-  delete_gdthumb_cache($conf['gdThumb']['height'] * 2 + $conf['gdThumb']['margin']);
+  delete_gdthumb_cache($params['height']);
+  delete_gdthumb_cache($params['height'] * 2 + $params['margin']);
   redirect('admin.php?page=plugin-GDThumb');
 }
@@ -92 +100 @@
   endif;
 
-  $big_thumb = !empty($_POST['big_thumb']);
+  $big_thumb        = !empty($_POST['big_thumb']);
+  $big_thumb_noinpw = !empty($_POST['big_thumb_noinpw']);
+  $thumb_animate    = !empty($_POST['thumb_animate']);
+  $thumb_mode_album = $_POST['thumb_mode_album'];
+  $thumb_mode_photo = $_POST['thumb_mode_photo'];
+
+  if ($method == "slide"):
+    if ($big_thumb):
+      $big_thumb = false;
+      array_push($page['warnings'], l10n('Big thumb cannot be used in Slide mode. Disabled'));
+    endif;
+    if ($thumb_animate):
+      $thumb_animate = false;
+      array_push($page['warnings'], l10n('Thumb animation cannot be used in Slide mode. Disabled'));
+    endif;
+
+    if (($thumb_mode_album == "overlay-ex") || ($thumb_mode_album == "overlay") || ($thumb_mode_album == "top") || ($thumb_mode_album == "bottom")):
+      $thumb_mode_album = "bottom_static";
+      array_push($page['warnings'], l10n('This Thumb mode cannot be used in Slide mode. Changed to default'));
+    endif;
+
+    if (($thumb_mode_photo == "overlay-ex") || ($thumb_mode_photo == "overlay") || ($thumb_mode_photo == "top") || ($thumb_mode_photo == "bottom")):
+      $thumb_mode_photo = "bottom_static";
+      array_push($page['warnings'], l10n('This Thumb mode cannot be used in Slide mode. Changed to default'));
+    endif;
+  endif;
+
+  if (($big_thumb_noinpw) && (!$big_thumb)):
+    $big_thumb_noinpw = false;
+  endif;
+
   $params  = array(
       'height'          => $_POST['height']
@@ -98 +136 @@
     , 'nb_image_page'   => $_POST['nb_image_page']
     , 'big_thumb'       => $big_thumb
-    , 'big_thumb_noinpw'=> !empty($_POST['big_thumb_noinpw'])
+    , 'big_thumb_noinpw'=> $big_thumb_noinpw
     , 'cache_big_thumb' => !empty($_POST['cache_big_thumb'])
     , 'normalize_title' => $normalize
     , 'method'          => $method
-    , 'thumb_mode_album'=> $_POST['thumb_mode_album']
-    , 'thumb_mode_photo'=> $_POST['thumb_mode_photo']
+    , 'thumb_mode_album'=> $thumb_mode_album
+    , 'thumb_mode_photo'=> $thumb_mode_photo
     , 'thumb_metamode'  => $_POST['thumb_metamode']
     , 'no_wordwrap'     => !empty($_POST['no_wordwrap'])
-    , 'thumb_animate'   => !empty($_POST['thumb_animate'])
+    , 'thumb_animate'   => $thumb_animate
   );
 
   if (!is_numeric($params['height'])) {
-    array_push($page['errors'], 'Thumbnails max height must be an integer.');
+    array_push($page['errors'], l10n('Thumbnails max height must be an integer'));
   }
   if (!is_numeric($params['margin'])) {
-    array_push($page['errors'], 'Margin between thumbnails must be an integer.');
+    array_push($page['errors'], l10n('Margin between thumbnails must be an integer'));
   }
   if (!is_numeric($params['nb_image_page'])) {
-    array_push($page['errors'], 'Number of photos per page must be an integer.');
+    array_push($page['errors'], l10n('Number of photos per page must be an integer'));
   }
 
@@ -127 +165 @@
 
   if (empty($page['errors'])) {
-    $query = '
-  UPDATE ' . CONFIG_TABLE . '
-    SET value="' . addslashes(serialize($params)) . '"
-    WHERE param="gdThumb"
-    LIMIT 1';
-    pwg_query($query);
-    
+    conf_update_param('gdThumb', $params);
     array_push($page['infos'], l10n('Information data registered in database'));
   }