Changeset 1793

Timestamp:

Feb 9, 2007, 2:41:49 AM (17 years ago)

Author:

rvelices

Message:

• added plugin action loc_end_picture
• enhanced the event tracer plugin to show a list of all events and actions trigered by pwg
• small reorganization in picture.php

Location:

trunk

Files:

• picture.php (modified) (6 diffs)
• plugins/event_tracer/event_list.php (added)
• plugins/event_tracer/event_list.tpl (added)
• plugins/event_tracer/tracer_admin.php (modified) (1 diff)
• plugins/event_tracer/tracer_admin.tpl (modified) (1 diff)

trunk/picture.php

@@ -70 +70 @@
     return $content;
   }
-  
-  global $user;
-  
+
+  global $user, $page;
+
   $my_template = new Template(
     PHPWG_ROOT_PATH.'template/'.$user['template'],
@@ -81 +81 @@
     );
 
-  if (isset($element_info['high_url']))
+  if ( !isset($page['slideshow']) and isset($element_info['high_url']) )
   {
     $uuid = uniqid(rand());
@@ -430 +430 @@
   );
 
+
+$template->set_filename('picture', 'picture.tpl');
+if ( isset( $_GET['slideshow'] ) )
+{
+  $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
+  $page['slideshow'] = true;
+  if ( $conf['light_slideshow'] )
+  {
+    $template->set_filename('picture', 'slideshow.tpl');
+  }
+  if ( isset($page['next_item']) )
+  {
+    // $redirect_msg, $refresh, $url_link and $title are required for creating
+    // an automated refresh page in header.tpl
+    $refresh= $_GET['slideshow'];
+    $url_link = add_url_params(
+        $picture['next']['url'],
+        array('slideshow'=>$refresh)
+      );
+    $redirect_msg = nl2br(l10n('redirect_msg'));
+  }
+}
+
 $title =  $picture['current']['name'];
-$refresh = 0;
-if ( isset( $_GET['slideshow'] ) and isset($page['next_item']) )
-{
-  // $redirect_msg, $refresh, $url_link and $title are required for creating
-  // an automated refresh page in header.tpl
-  $refresh= $_GET['slideshow'];
-  $url_link = add_url_params(
-      $picture['next']['url'],
-      array('slideshow'=>$refresh)
-    );
-  $redirect_msg = nl2br(l10n('redirect_msg'));
-  $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
-}
-
 $title_nb = ($page['current_rank'] + 1).'/'.$page['cat_nb_images'];
 
@@ -474 +483 @@
 $page['body_id'] = 'thePicturePage';
 
-//------------------------------------------------------------ light slideshow
-// Warning !!! Warning !!! Warning !!!
-// Notice for plugins writers check if you have to act on the active template
-// like this if ( $page['slideshow'] ) { return false; }
-//
-if ( isset($_GET['slideshow']) and $conf['light_slideshow'] )
-{
-  $page['display_tpl'] = 'slideshow.tpl';
-  $page['slideshow'] = true; 
-  unset($picture['current']['high_url']); 
-}
-else {
-  $page['display_tpl'] = 'picture.tpl';
-  $page['slideshow'] = false;  
-}
-
 // maybe someone wants a special display (call it before page_header so that
 // they can add stylesheets)
@@ -508 +501 @@
     );
 }
-
-$template->set_filenames(array( 'picture' => $page['display_tpl'] ));
 
 //------------------------------------------------------- navigation management
@@ -838 +829 @@
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
+trigger_action('loc_end_picture');
 $template->parse('picture');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');

trunk/plugins/event_tracer/tracer_admin.php

@@ -24 +24 @@
 $template->assign_var('EVENT_TRACER_FILTERS', implode("\n", $me->my_config['filters'] ) );
 $template->assign_var('EVENT_TRACER_SHOW_ARGS', $me->my_config['show_args'] ? 'checked="checked"' : '' );
+$template->assign_var('U_LIST_EVENTS', get_admin_plugin_menu_link(dirname(__FILE__).'/event_list.php'));
+
 //$template->assign_var('EVENT_TRACER_F_ACTION', $my_url);
 

trunk/plugins/event_tracer/tracer_admin.tpl

@@ -24 +24 @@
 
 <p><input type="submit" value="Submit" /></p>
+
+<p><a href="{U_LIST_EVENTS}">Click here to see a complete list of actions and events trigered by this PWG version</a>.</p>
 </form>