merge r3611 from trunk

improve event tracer: add the possibility to dump all the included php files

git-svn-id: http://piwigo.org/svn/branches/2.0@3612 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 20 insertions, 7 deletions

diff --git a/plugins/event_tracer/main.inc.php b/plugins/event_tracer/main.inc.php
index 06d15d45c..d43678a9a 100644
--- a/plugins/event_tracer/main.inc.php
+++ b/plugins/event_tracer/main.inc.php
@@ -23,7 +23,7 @@
 
 /*
 Plugin Name: Event tracer
-Version: 2.0.2
+Version: 2.0.3
 Description: For developers. Shows all calls to trigger_event.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=288
 Author: Piwigo team
@@ -65,7 +65,6 @@ class EventTracer
         or empty($this->my_config['filters']) )
     {
       $this->my_config['filters'] = array( '.*' );
-      $this->my_config['show_args'] = false;
       $this->my_config['show_registered'] = true;
       $this->save_config();
     }
@@ -82,9 +81,10 @@ class EventTracer
 
   function on_page_tail()
   {
-    if (1 || @$this->my_config['show_registered'])
+    global $debug;
+    if (@$this->my_config['show_registered'])
     {
-      global $debug, $pwg_event_handlers;
+      global $pwg_event_handlers;
       $out = '';
       foreach ($pwg_event_handlers as $event => $prio_array)
       {
@@ -111,6 +111,10 @@ class EventTracer
       }
       $debug .= '<pre>'.$out.'</pre>';
     }
+    if (@$this->my_config['show_included_files'])
+    {
+      $debug .= "<pre><em>Included files</em>\n".var_export( get_included_files(), true ).'</pre>';
+    }
   }
 
   function on_trigger($event_info)
@@ -122,7 +126,7 @@ class EventTracer
     {
       if ( preg_match( '/'.$filter.'/', $event_info['event'] ) )
       {
-        if ($this->my_config['show_args'])
+        if (@$this->my_config['show_args'])
         {
           $s = '<pre>';
           $s .= htmlspecialchars( var_export( $event_info['data'], true ) );
diff --git a/plugins/event_tracer/tracer_admin.php b/plugins/event_tracer/tracer_admin.php
index 6e5b864e0..bec6affa6 100644
--- a/plugins/event_tracer/tracer_admin.php
+++ b/plugins/event_tracer/tracer_admin.php
@@ -18,14 +18,19 @@ if ( isset($_POST['eventTracer_filters']) )
     $me->my_config['filters'] = array();
   $me->my_config['show_args'] = isset($_POST['eventTracer_show_args']);
   $me->my_config['show_registered'] = isset($_POST['eventTracer_show_registered']);
+  if (isset($_POST['eventTracer_show_included_files']) )
+    $me->my_config['show_included_files'] = true;
+  else
+    unset($me->my_config['show_included_files']);
   $me->save_config();
   global $page;
   array_push($page['infos'], 'event tracer options saved');
 }
 $template->assign('EVENT_TRACER_FILTERS', implode("\n", $me->my_config['filters'] ) );
-$template->assign('EVENT_TRACER_SHOW_ARGS', $me->my_config['show_args'] ? 'checked="checked"' : '' );
+$template->assign('EVENT_TRACER_SHOW_ARGS', @$me->my_config['show_args'] ? 'checked="checked"' : '' );
 $template->assign('U_LIST_EVENTS', get_admin_plugin_menu_link(dirname(__FILE__).'/event_list.php'));
-$template->assign('EVENT_TRACER_SHOW_REGISTERED', $me->my_config['show_registered'] ? 'checked="checked"' : '' );
+$template->assign('EVENT_TRACER_SHOW_REGISTERED', @$me->my_config['show_registered'] ? 'checked="checked"' : '' );
+$template->assign('EVENT_TRACER_SHOW_INCLUDED_FILES', @$me->my_config['show_included_files'] ? 'checked="checked"' : '' );
 
 //$template->assign_var('EVENT_TRACER_F_ACTION', $my_url);
 
diff --git a/plugins/event_tracer/tracer_admin.tpl b/plugins/event_tracer/tracer_admin.tpl
index 560459915..976ecbf2b 100644
--- a/plugins/event_tracer/tracer_admin.tpl
+++ b/plugins/event_tracer/tracer_admin.tpl
@@ -29,6 +29,10 @@ An event will be logged if its name matches at least one expression in the list.
 	<input type="checkbox" name="eventTracer_show_registered" {$EVENT_TRACER_SHOW_REGISTERED} />
 </label>
 
+<label>Show all included php files
+	<input type="checkbox" name="eventTracer_show_included_files" {$EVENT_TRACER_SHOW_INCLUDED_FILES} />
+</label>
+
 </fieldset>
 
 <p><input class="submit" type="submit" value="Submit" /></p>