Changeset 18127 for extensions/Autosize
- Timestamp:
- Sep 22, 2012, 11:46:42 AM (12 years ago)
- Location:
- extensions/Autosize
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Autosize/autosize.inc.php
r18115 r18127 38 38 global $template,$version,$icon_path,$page,$picture,$conf; 39 39 40 $current = $template->get_template_vars('current'); 41 $has_pamoorama=isset($template->files['pamooramics_content']); 42 //==================================================================== 43 $pictureDeriv = pwg_get_session_var('picture_deriv',$conf['derivative_default_size']); 44 $SRC_IMG=""; 45 if(isset($current['derivatives']['Autosize'])) 46 $_COOKIE['picture_deriv']="Autosize"; 47 if(isset( $_COOKIE['picture_deriv'])) 48 $model= $_COOKIE['picture_deriv'] ; 49 else 50 $model= $pictureDeriv ; 51 52 $selected_derivative = $current['derivatives'][$model]; 53 if (!isset($current['selected_derivative'])){ 54 55 $_COOKIE['picture_deriv']="Autosize"; 56 $model= $_COOKIE['picture_deriv'] ; 57 $current['SelMaxi']=ImageStdParams::get_custom(900,900); 58 $current['derivatives'][$model]=ImageStdParams::get_custom($_COOKIE['theImageWidth'], $_COOKIE['theImageHeight']); 59 60 61 $selected_derivative=$current['derivatives'][$model]; 62 $selected_derivative->type="Autosize"; 63 $template->append('current', array( 64 'selected_derivative' => $selected_derivative 65 ), 66 true); 67 $current = $template->get_template_vars('current'); 68 } 69 70 if(isset($current['derivatives'][$model])) { 71 $selected_derivative = $current['derivatives'][$model]; 72 $template->assign('current[selected_derivative]', $selected_derivative 73 , true); 74 $current = $template->get_template_vars('current'); 75 } 76 77 return $content; 40 $current = $template->get_template_vars('current'); 41 $has_pamoorama=isset($template->files['pamooramics_content']); 42 //==================================================================== 43 $pictureDeriv = pwg_get_session_var('picture_deriv',$conf['derivative_default_size']); 44 $SRC_IMG=""; 45 if(isset($current['derivatives']['Autosize'])) 46 $_COOKIE['picture_deriv']="Autosize"; 47 if(isset( $_COOKIE['picture_deriv'])) 48 $model= $_COOKIE['picture_deriv'] ; 49 else 50 $model= $pictureDeriv ; 51 52 $selected_derivative = $current['derivatives'][$model]; 53 if (!isset($current['selected_derivative'])){ 54 $_COOKIE['picture_deriv']="Autosize"; 55 $model= $_COOKIE['picture_deriv'] ; 56 $current['SelMaxi']=ImageStdParams::get_custom(900,900); 57 $current['derivatives'][$model]=ImageStdParams::get_custom($_COOKIE['theImageWidth'], $_COOKIE['theImageHeight']); 58 $selected_derivative=$current['derivatives'][$model]; 59 $selected_derivative->type="Autosize"; 60 $template->append('current', array( 61 'selected_derivative' => $selected_derivative 62 ), 63 true); 64 $current = $template->get_template_vars('current'); 65 } 66 67 if(isset($current['derivatives'][$model])) { 68 $selected_derivative = $current['derivatives'][$model]; 69 $template->assign('current[selected_derivative]', $selected_derivative , true); 70 $current = $template->get_template_vars('current'); 71 } 72 73 return $content; 78 74 79 75 }//INIT … … 171 167 if ($img_type=="square" || $img_type=="thumb" ) continue ; 172 168 if (!isset($last_img)) $last_img=$img_select; 169 173 170 $img_url = $img_select->get_url(); 174 171 $imgSizeWH = $img_select->get_size(); 172 175 173 if($img_type=="Autosize" || $img_type=="SelMaxi"){ 176 174 $img_url = $img_select->src_image->get_url(); … … 178 176 $liste_type[$img_type]=$img_type.",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ; 179 177 }else{ 180 $liste_type[$img_type]=$img_type.",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ; 181 if ($img_type=="Original"){ 182 183 break ; 178 $liste_type[$img_type]=$img_type.",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ; 179 if ($img_type=="Original"){ 180 $maxi_img= $img_type; 181 $maxi_url= $img_url; 182 $maxi_i=$img_select; 183 break ; 184 185 184 186 } 185 187 … … 235 237 pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']); 236 238 }else{ 237 echo "<pre>".$_COOKIE['picture_deriv']. "No exist " ;239 /* echo "<pre>".$_COOKIE['picture_deriv']. "No exist " ; 238 240 print_r($img_all ); 239 241 die(); 242 */ 240 243 } 241 244 setcookie('picture_deriv', false, 0, cookie_path() ); … … 262 265 263 266 if ('kardon' == $user['theme'] and isset($_GET['slideshow'])) return ; 267 if ('stripped' == $user['theme'] ) return ; 268 264 269 load_language('plugin.lang', AUTOSIZE_PATH); 265 270 $AUTOSIZE_PATH = dirname(__FILE__).'/'; … … 318 323 return $template->parse( 'autosize_content', false); 319 324 } 320 } 325 } 321 326 322 327 } //public function cl_autosize_affiche … … 335 340 $has_pamoorama=isset($template->files['pamooramics_content']); 336 341 if (!$has_pamoorama) return ; 342 if ('stripped' == $user['theme'] ) return ; 337 343 338 344 $template->set_filenames(array('autosize_init'=>AUTOSIZE_PATH_ABS. "template/conflit.tpl" ) ); … … 372 378 global $has_pamoorama; 373 379 if (!$has_pamoorama) return ; 374 380 if ('stripped' == $user['theme'] ) return ; 381 375 382 $AUTOSIZE_PATH = dirname(__FILE__).'/'; 376 383 //================================================================ -
extensions/Autosize/js/Affiche_script.js
r18115 r18127 443 443 marges_llgbo = 0; 444 444 //========================================================================================== 445 445 446 446 init_gen(); 447 447 jQuery(window).resize(); -
extensions/Autosize/main.inc.php
r18115 r18127 2 2 /* 3 3 Plugin Name: AutoSize 4 Version: auto4 Version: 2.08 5 5 Description: Ajuste l'affichage des photos en fonction de la hauteur de la fenetre de navigation 6 6 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=448 7 7 Author: cljosse 8 8 Author URI:http://cljosse.free.fr 9 */ 9 */ 10 10 11 11 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); -
extensions/Autosize/maintain.inc.php
r17503 r18127 59 59 function plugin_deactivate(){ 60 60 global $conf ; 61 61 62 if (isset($conf['cl_derivatives_sav'])) { 62 63 $arr = @unserialize($conf['cl_derivatives_sav']); 63 64 if(isset($arr['d'])){ 65 $conf['derivatives'] = $conf['cl_derivatives_sav']; 64 66 $query = ' 65 67 UPDATE '.CONFIG_TABLE.' … … 72 74 pwg_query($q); 73 75 } 74 } 76 } 77 $model= $conf['derivative_default_size']; 78 $_COOKIE ['picture_deriv'] = $model; 79 $_COOKIE ['picture_map'] = $model; 80 pwg_set_session_var('picture_deriv', $model); 81 75 82 } 76 83
Note: See TracChangeset
for help on using the changeset viewer.