Changeset 18949 for extensions/Autosize/autosize.inc.php

Timestamp:

Nov 6, 2012, 3:30:32 PM (11 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (charlie's)

File:

• extensions/Autosize/autosize.inc.php (modified) (3 diffs)

extensions/Autosize/autosize.inc.php

@@ -91 +91 @@
     $imgSizeWH = $derivative->get_size();
     $SRC_IMG    = $derivative->get_url(); 
+
     $picture['current']['scaled_width']=$imgSizeWH[0];
     $picture['current']['scaled_height']= $imgSizeWH[1];
     $picture['current']['high_url']= $SRC_IMG;   
     $picture['current']['image_url']=$SRC_IMG;  
+    $picture['current']['thumbnail']=$SRC_IMG;
+
 //==============================================================
     $autosize_parametres = cl_autosize_Get_Options();
@@ -240 +243 @@
  $pattern[3] = '/height=\"(\d+)\"/';$replacement[3] = ' ';
 
-if ( preg_match("|charlie|", $content, $val) ){   
+if ( strstr( $content,"iframe")||strstr($content,"charlie" )){  
+ 
+$pictureSelType="Autosize";
+$pictureDeriv=$conf['derivative_default_size'];
+
+$_COOKIE['picture_sel_type']=$pictureSelType;
+$_COOKIE['picture_deriv']=$pictureDeriv;
+
   $ncount=1;    
-  $content=str_replace( "<object" ,  "<object id='theMainImage_obj' name='theMainImage' "  ,$content,$ncount);
-  $content=str_replace( "<embed" ,  "<embed id='theMainImage_emb' name='theMainImage' "  ,$content,$ncount);
+  if (strstr($content,"charlie" )){   
+      $content=str_replace( "<object" , "<object id='theMainImage_obj' name='theMainImage' "  ,$content,$ncount);
+      $content=str_replace( "<embed" ,  "<embed id='theMainImage_emb' name='theMainImage' "  ,$content,$ncount);
+      $content=str_replace( 'id="video"',"id='theMainImage_obj'  name='theMainImage' " ,$content,$ncount);
+  }else{
+      $content=str_replace( "<iframe" ,  "<iframe id='iframe' name='theMainImage' "  ,$content,$ncount);
+  }
   $content=  preg_replace($pattern, "", $content);
-  $content= "<div id='theMainImage' style='height:".$theImageHeight."px  ;width:".$theImageWidth."px' >". $content . "<img src='".AUTOSIZE_PATH . "images/transparent.gif' /></div>";
+
+  $content= "<div id='theMainImage' style='height:".$theImageHeight."px  ;width:".$theImageWidth."px '>". $content . "<img src='".AUTOSIZE_PATH . "images/transparent.gif' /></div>";
  $content= "<style>#theImageAndInfos{height:auto;width:auto;position:relative}
   #theImage{height:auto;align:center;text-align:center;width:100%;position:relative}
-  #theMainImage{height:auto;align:center;text-align:center;position:static}   
+  #theMainImage{height:auto;align:center;text-align:center;position:static}  
+  #charlie{display:none }
+  #iframe{display:none }
  </style>".$content;
 return  $content;
@@ -591 +609 @@
      //   return ;
      } 
+         if (defined('GMAPS_VERSION')) $gmaps_function="true";
+          else $gmaps_function="false" ;
+
         $template->set_filenames(array('autosize_content_header'=> $file )); 
         $template->assign(      array( AUTOSIZE_PATH,$AUTOSIZE_PATH,
                                   'file_css' =>$file_css,
                                   'css_display' => $css_display,                                 
-                                  'theme' =>$theme
+                                  'theme' =>$theme,
+                                   'gmaps_function' => $gmaps_function
                           ));
         $template->concat('autosize_content', $template->parse('autosize_content_header', true));