3 files changed, 33 insertions, 24 deletions

diff --git a/plugins/event_tracer/main.inc.php b/plugins/event_tracer/main.inc.php
index fef23296a..1eb89f094 100644
--- a/plugins/event_tracer/main.inc.php
+++ b/plugins/event_tracer/main.inc.php
@@ -11,10 +11,12 @@ class EventTracer
 {
   var $me_working;
   var $my_config;
-
-  function EventTracer()
+  var $my_id;
+  
+  function EventTracer($id)
   {
     $this->me_working=0;
+    $this->my_id=$id;
   }
 
   function load_config()
@@ -76,23 +78,24 @@ class EventTracer
     }
   }
 
-  function plugin_admin_menu()
+  function plugin_admin_menu($menu)
   {
-    add_plugin_admin_menu( "Event Tracer", array(&$this, 'do_admin') );
+    array_push($menu,
+        array(
+          'NAME' => 'Event Tracer',
+          'URL' => get_admin_plugin_menu_link($this->my_id, 'tracer_admin')
+        )
+      );
+    return $menu;
   }
-
-  function do_admin($my_url)
-  {
-    include( dirname(__FILE__).'/tracer_admin.php' );
-  }
-
 }
 
-$eventTracer = new EventTracer();
-$eventTracer->load_config();
+$obj = new EventTracer($plugin['id']);
+$obj->load_config();
 
-add_event_handler('plugin_admin_menu', array(&$eventTracer, 'plugin_admin_menu') );
-add_event_handler('pre_trigger_event', array(&$eventTracer, 'on_pre_trigger_event') );
-add_event_handler('post_trigger_event', array(&$eventTracer, 'on_post_trigger_event') );
-add_event_handler('trigger_action', array(&$eventTracer, 'on_trigger_action') );
+add_event_handler('get_admin_plugin_menu_links', array(&$obj, 'plugin_admin_menu') );
+add_event_handler('pre_trigger_event', array(&$obj, 'on_pre_trigger_event') );
+add_event_handler('post_trigger_event', array(&$obj, 'on_post_trigger_event') );
+add_event_handler('trigger_action', array(&$obj, 'on_trigger_action') );
+set_plugin_data($plugin['id'], $obj);
 ?>
\ No newline at end of file
diff --git a/plugins/event_tracer/tracer_admin.php b/plugins/event_tracer/tracer_admin.php
index 7371d2531..2495c0dc0 100644
--- a/plugins/event_tracer/tracer_admin.php
+++ b/plugins/event_tracer/tracer_admin.php
@@ -1,6 +1,8 @@
 <?php
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
+$me = get_plugin_data($plugin_id);
+
 global $template;
 $template->set_filenames( array('plugin_admin_content' => dirname(__FILE__).'/tracer_admin.tpl') );
 
@@ -11,17 +13,17 @@ if ( isset($_POST['eventTracer_filters']) )
   $v = str_replace( "\n\n", "\n", $v );
   $v = stripslashes($v);
   if (!empty($v))
-    $this->my_config['filters'] = explode("\n", $v);
+    $me->my_config['filters'] = explode("\n", $v);
   else
-    $this->my_config['filters'] = array();
-  $this->my_config['show_args'] = isset($_POST['eventTracer_show_args']);
-  $this->save_config();
+    $me->my_config['filters'] = array();
+  $me->my_config['show_args'] = isset($_POST['eventTracer_show_args']);
+  $me->save_config();
   global $page;
   array_push($page['infos'], 'event tracer options saved');
 }
-$template->assign_var('EVENT_TRACER_FILTERS', implode("\n", $this->my_config['filters'] ) );
-$template->assign_var('EVENT_TRACER_SHOW_ARGS', $this->my_config['show_args'] ? 'checked="checked"' : '' );
-$template->assign_var('EVENT_TRACER_F_ACTION', $my_url);
+$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('EVENT_TRACER_F_ACTION', $my_url);
 
-$template->assign_var_from_handle( 'PLUGIN_ADMIN_CONTENT', 'plugin_admin_content');
+$template->assign_var_from_handle( 'ADMIN_CONTENT', 'plugin_admin_content');
 ?>
\ No newline at end of file
diff --git a/plugins/event_tracer/tracer_admin.tpl b/plugins/event_tracer/tracer_admin.tpl
index 95ee65907..93deee3b0 100644
--- a/plugins/event_tracer/tracer_admin.tpl
+++ b/plugins/event_tracer/tracer_admin.tpl
@@ -1,3 +1,7 @@
+<div class="titrePage">
+  <h2>Event Tracer</h2>
+</div>
+
 <p>
 The event tracer is a developer tool that logs in the footer of the window all calls to trigger_event method.
 You can use this plugin to see what events is PhpWebGallery calling.