Changeset 16987

Timestamp:

07/24/12 22:34:52 (11 months ago)

Author:

rvelices

Message:

refactor code when selected derivative on index page is changed by a plugin ...

Location:

trunk

Files:

• include/category_default.inc.php (modified) (2 diffs)
• index.php (modified) (2 diffs)

trunk/include/category_default.inc.php

@@ -152 +152 @@
 }
 
-$derivative_params = trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) );
-
 $template->assign( array(
-  'derivative_params' =>$derivative_params,
+  'derivative_params' => trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) ),
   'SHOW_THUMBNAIL_CAPTION' =>$conf['show_thumbnail_caption'],
     ) );
@@ -163 +161 @@
 $template->assign_var_from_handle('THUMBNAILS', 'index_thumbnails');
 unset($pictures, $selection, $tpl_thumbnails_var);
-$template->clear_assign( array('thumbnails', 'derivative_params') );
+$template->clear_assign( 'thumbnails' );
 pwg_debug('end include/category_default.inc.php');
 ?>

trunk/index.php

@@ -274 +274 @@
 }
 
-if ( count($page['items']) > 0 )
-{
+// category comment
+if ($page['start']==0 and !isset($page['chronology_field']) and !empty($page['comment']) )
+{
+  $template->assign('CONTENT_DESCRIPTION', $page['comment'] );
+}
+
+// include menubar
+include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
+
+if ( isset($page['category']['count_categories']) and $page['category']['count_categories']==0 )
+{// count_categories might be computed by menubar - if the case unassign flat link if no sub albums
+        $template->clear_assign('U_MODE_FLAT');
+}
+
+//------------------------------------------------------ main part : thumbnails
+if ( 0==$page['start']
+    and !isset($page['flat'])
+    and !isset($page['chronology_field'])
+    and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
+    and (!isset($page['category']['count_categories']) or $page['category']['count_categories']>0 )
+  )
+{
+  include(PHPWG_ROOT_PATH.'include/category_cats.inc.php');
+}
+if ( !empty($page['items']) )
+{
+  include(PHPWG_ROOT_PATH.'include/category_default.inc.php');
   $url = add_url_params(
           duplicate_index_url(),
           array('display' => '')
         );
-  $selected_type = trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) )->type;
+  $selected_type = $template->get_template_vars('derivative_params')->type;
+  $template->clear_assign( 'derivative_params' );
   $type_map = ImageStdParams::get_defined_type_map();
   unset($type_map[IMG_XXLARGE], $type_map[IMG_XLARGE]);
@@ -294 +320 @@
       );
   }
-}
-
-// category comment
-if ($page['start']==0 and !isset($page['chronology_field']) and !empty($page['comment']) )
-{
-  $template->assign('CONTENT_DESCRIPTION', $page['comment'] );
-}
-
-// include menubar
-include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
-
-if ( isset($page['category']['count_categories']) and $page['category']['count_categories']==0 )
-{// count_categories might be computed by menubar - if the case unassign flat link if no sub albums
-        $template->clear_assign('U_MODE_FLAT');
-}
-
-//------------------------------------------------------ main part : thumbnails
-if ( 0==$page['start']
-    and !isset($page['flat'])
-    and !isset($page['chronology_field'])
-    and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
-    and (!isset($page['category']['count_categories']) or $page['category']['count_categories']>0 )
-  )
-{
-  include(PHPWG_ROOT_PATH.'include/category_cats.inc.php');
-}
-if ( !empty($page['items']) )
-{
-  include(PHPWG_ROOT_PATH.'include/category_default.inc.php');
 }
 //------------------------------------------------------- category informations