Changeset 14649 for trunk/admin/include/configuration_sizes_process.inc.php

Timestamp:

May 2, 2012, 6:29:56 AM (12 years ago)

Author:

rvelices

Message:

multi size:

• fix external imagick issues when rotation was required
• fix: derivative were generated continuosly until a first save performed in the admin screen
• added sharpen param in the new config screen
• increased the sharpen range (10% is less than before)

File:

• trunk/admin/include/configuration_sizes_process.inc.php (modified) (14 diffs)

trunk/admin/include/configuration_sizes_process.inc.php

@@ -98 +98 @@
       $errors[$type]['w'] = '>0';
     }
-    
+
     $h = intval($pderivative['h']);
     if ($h <= 0)
@@ -104 +104 @@
       $errors[$type]['h'] = '>0';
     }
-    
+
     if (max($w,$h) <= $prev_w)
     {
@@ -117 +117 @@
       $errors[$type]['w'] = '>'.$prev_w;
     }
-    
+
     $v = intval($pderivative['h']);
     if ($v <= 0 or $v <= $prev_h)
@@ -124 +124 @@
     }
   }
-  
+
   if (count($errors) == 0)
   {
@@ -130 +130 @@
     $prev_h = intval($pderivative['h']);
   }
+
+  $v = intval($pderivative['sharpen']);
+  if ($v<0 || $v>100)
+  {
+    $errors[$type]['sharpen'] = '[0..100]';
+  }
 }
 
@@ -135 +141 @@
 if (count($errors) == 0)
 {
+  $quality_changed = ImageStdParams::$quality != intval($_POST['resize_quality']);
+  ImageStdParams::$quality = intval($_POST['resize_quality']);
+
   $enabled = ImageStdParams::get_defined_type_map();
   $disabled = @unserialize( @$conf['disabled_derivatives'] );
@@ -146 +155 @@
   {
     $pderivative = $pderivatives[$type];
-    
+
     if ($pderivative['enabled'])
     {
@@ -156 +165 @@
           )
         );
-      
-      $new_params->quality = intval($_POST['resize_quality']);
-      
+      $new_params->sharpen = intval($pderivative['sharpen']);
+
       ImageStdParams::apply_global($new_params);
-      
+
       if (isset($enabled[$type]))
       {
@@ -170 +178 @@
           $same = false;
         }
-        
+
         if ($same
             and $new_params->sizing->max_crop != 0
@@ -177 +185 @@
           $same = false;
         }
-        
-        if ($new_params->quality != $old_params->quality)
+
+        if ($quality_changed
+            || $new_params->sharpen != $old_params->sharpen)
         {
           $same = false;
         }
-        
+
         if (!$same)
         {
@@ -210 +219 @@
     }
   }
-  
+
   $enabled_by = array(); // keys ordered by all types
   foreach(ImageStdParams::get_all_types() as $type)
@@ -219 +228 @@
     }
   }
-  
+
   ImageStdParams::set_and_save($enabled_by);
   if (count($disabled) == 0)
@@ -231 +240 @@
   }
   $conf['disabled_derivatives'] = serialize($disabled);
-  
+
   if (count($changed_types))
   {
     clear_derivative_cache($changed_types);
   }
-  
+
   array_push(
     $page['infos'],
@@ -257 +266 @@
     }
   }
-  
+
   $template->assign('derivatives', $pderivatives);
   $template->assign('ferrors', $errors);