Changeset 26298 for extensions/header_manager/include/banner.class.php

Timestamp:

Dec 28, 2013, 6:08:42 PM (10 years ago)

Author:

mistic100

Message:

update for 2.6 + better calculation + option to force ratio
TODO: issue with PNG (unable to generate thumbnail with IM)

File:

• extensions/header_manager/include/banner.class.php (modified) (6 diffs)

extensions/header_manager/include/banner.class.php

@@ -1 +1 @@
 <?php
-if (!defined('HEADER_MANAGER_PATH')) die('Hacking attempt!');
+defined('HEADER_MANAGER_PATH') or die('Hacking attempt!');
 
 include_once(PHPWG_ROOT_PATH . 'admin/include/image.class.php');
@@ -9 +9 @@
 class banner_image extends pwg_image
 {
-  function banner_resize($destination_filepath, $x, $y, $x2, $y2, $width, $height)
+  function banner_resize($destination_filepath, $selection)
   {
     global $conf;
@@ -18 +18 @@
     $source_height = $this->image->get_height();
 
-    $resize_dimensions = array(
-      'width' => $width,
-      'height'=> $height,
-      'crop' => array(
-        'width' => $x2-$x,
-        'height' => $y2-$y,
-        'x' => $x,
-        'y' => $y,
-        ),
+    $crop = array(
+      'width' => $selection['x2']-$selection['x'],
+      'height' => $selection['y2']-$selection['y'],
+      'x' => $selection['x'],
+      'y' => $selection['y'],
       );
     
-    // maybe resizing/croping is useless ?
-    if ( $resize_dimensions['crop']['width'] == $source_width and $resize_dimensions['crop']['height'] == $source_height )
+    // maybe resizing/cropping is useless ?
+    if ($conf['header_manager']['width'] == $source_width and $conf['header_manager']['height'] == $source_height)
     {
       // the image doesn't need any resize! We just copy it to the destination
       copy($this->source_filepath, $destination_filepath);
-      return $this->get_resize_result($destination_filepath, $resize_dimensions['width'], $resize_dimensions['height'], $starttime);
+      return $this->get_resize_result($destination_filepath, $source_width, $source_height, $starttime);
     }
     
@@ -40 +36 @@
     $this->image->strip();
     
+    // crop
+    $this->image->crop($crop['width'], $crop['height'], $crop['x'], $crop['y']);
+    
     // resize to what is displayed on crop screen
-    if ($source_width > $conf['header_manager']['width'])
+    if ($crop['width'] > $conf['header_manager']['width'])
     {
-      $this->image->resize($resize_dimensions['width'], $source_height*$resize_dimensions['width']/$source_width);
+      $this->image->resize($conf['header_manager']['width'], $crop['height']*$conf['header_manager']['width']/$crop['width']);
     }
-    
-    // crop
-    $this->image->crop($resize_dimensions['crop']['width'], $resize_dimensions['crop']['height'], $resize_dimensions['crop']['x'], $resize_dimensions['crop']['y']);
     
     // save
@@ -53 +49 @@
 
     // everything should be OK if we are here!
-    return $this->get_resize_result($destination_filepath, $resize_dimensions['crop']['width'], $resize_dimensions['crop']['height'], $starttime);
+    return $this->get_resize_result($destination_filepath, $crop['width'], $crop['height'], $starttime);
   }
   
@@ -69 +65 @@
   }
 }
-
-?>