Changeset 17192 for extensions/Autosize/include/affiche.php

Timestamp:

Jul 28, 2012, 8:48:54 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, new options

File:

• extensions/Autosize/include/affiche.php (modified) (2 diffs)

extensions/Autosize/include/affiche.php

@@ -8 +8 @@
 
  ; 
-//=================================================================================================
+//==============================================================================
 $DEBUG_autosize = isset($_POST['cl_debug_conflit']) ? $_POST['cl_debug_conflit'] : "false" ;
 $DEBUG_autosize = isset($_GET['cl_debug_conflit']) ? $_GET['cl_debug_conflit'] : $DEBUG_autosize ;
@@ -28 +28 @@
   }
   $deriv_type = pwg_get_session_var('picture_deriv', $conf['derivative_default_size']);
+  $defined_types = array_keys(ImageStdParams::get_defined_type_map());  
 
-if (isset($current)){
- $derivative=$current['selected_derivative'] ;
-  $imgScaledWH=$derivative->src_image->get_size();
-        $imgSizeWH  =  $derivative->get_size(); 
-  $img_type  =  $derivative->get_type();        
-  $img_url  = $derivative->get_url();
-  $img_all= $derivative->get_all($derivative->src_image);
-  $scaled_size=$derivative->get_size_hr(); //792 x 441
-   $scaled_size=$derivative->get_scaled_size_htm(); // width="792" height="441"
-   //================= taille mis a l'échelle 
-   $scaled_size=$derivative->get_scaled_size(100,100); // array([0]=>100,[1]=>55)
-  $src= $derivative->src_image ;
-     
-    }
-
-          $defined_types = array_keys(ImageStdParams::get_defined_type_map());      
+if (isset($current)){ 
+    if (!isset($current['selected_derivative'])){  
+      $model= $defined_types[count($defined_types)-1];
+      $selected_derivative =      $current['derivatives'][$model];
+      $template->append('current', array(
+      'selected_derivative' => $selected_derivative
+    ), true);
 
 
+    $current = $template->get_template_vars('current');
+        } 
+         $derivative=$current['selected_derivative'] ;
+          $imgScaledWH=$derivative->src_image->get_size();
+          $imgSizeWH  =  $derivative->get_size();       
+          $img_type  =  $derivative->get_type();        
+          $img_url  = $derivative->get_url();
+          $img_all= $derivative->get_all($derivative->src_image);
+          $scaled_size=$derivative->get_size_hr(); //792 x 441
+          $scaled_size=$derivative->get_scaled_size_htm(); // width="792" height="441"
+         //================= taille mis a l'échelle 
+          $scaled_size=$derivative->get_scaled_size(100,100); // array([0]=>100,[1]=>55)
+          $src= $derivative->src_image ;
+       
+    }
+ 
 
+  
 $img_width=isset($imgScaledWH)?$imgSizeWH[0]:"480";
 $img_height=isset($imgScaledWH)?$imgSizeWH[1]:"320";