6 files changed, 47 insertions, 24 deletions
diff --git a/plugins/event_tracer/event_list.php b/plugins/event_tracer/event_list.php
index 1f1969629..ae617fe87 100644
--- a/plugins/event_tracer/event_list.php
+++ b/plugins/event_tracer/event_list.php
@@ -67,16 +67,17 @@ global $template;
 
 $url = get_admin_plugin_menu_link(__FILE__);
 
-$template->assign_vars( array(
+$template->assign( array(
   'NB_EVENTS' => count($events),
   'U_SORT0' => add_url_params($url, array('sort'=>0) ),
   'U_SORT1' => add_url_params($url, array('sort'=>1) ),
   'U_SORT2' => add_url_params($url, array('sort'=>2) ),
   ) );
 
+$template->assign('events', array());
 foreach ($events as $e)
 {
-  $template->assign_block_vars( 'event', array(
+  $template->append( 'events', array(
     'TYPE' => $e[0],
     'NAME' => $e[1],
     'FILE' => $e[2],
diff --git a/plugins/event_tracer/event_list.tpl b/plugins/event_tracer/event_list.tpl
index fd294e66b..accc27278 100644
--- a/plugins/event_tracer/event_list.tpl
+++ b/plugins/event_tracer/event_list.tpl
@@ -1,17 +1,17 @@
-<!-- DEV TAG: not smarty migrated -->
-There are {NB_EVENTS} calls to triger_event or triger_action.
+{* $Id$ *}
+There are {$NB_EVENTS} calls to triger_event or triger_action.
 
 <table width="99%" class="table2">
 <tr class="throw">
-  <th><a href="{U_SORT0}">Type</a></th>
-  <th><a href="{U_SORT1}">Name</a></th>
-  <th><a href="{U_SORT2}">File</a></th>
+  <th><a href="{$U_SORT0}">Type</a></th>
+  <th><a href="{$U_SORT1}">Name</a></th>
+  <th><a href="{$U_SORT2}">File</a></th>
 </tr>
-<!-- BEGIN event -->
+{foreach from=$events item=event}
 <tr>
-  <td>{event.TYPE}</td>
-  <td>{event.NAME}</td>
-  <td>{event.FILE}</td>
+  <td>{$event.TYPE}</td>
+  <td>{$event.NAME}</td>
+  <td>{$event.FILE}</td>
 </tr>
-<!-- END event -->
+{/foreach}
 </table>
diff --git a/plugins/event_tracer/main.inc.php b/plugins/event_tracer/main.inc.php
index c2676bd27..633ca697d 100644
--- a/plugins/event_tracer/main.inc.php
+++ b/plugins/event_tracer/main.inc.php
@@ -1,6 +1,6 @@
 <?php /*
 Plugin Name: Event tracer
-Version: 1.8
+Version: 1.8.a
 Description: For developers. Shows all calls to trigger_event.
 Plugin URI: http://www.phpwebgallery.net
 Author: PhpWebGallery team
@@ -18,9 +18,20 @@ class EventTracer
     $this->me_working=0;
   }
 
+  function get_config_file_dir()
+  {
+    global $conf;
+    return $conf['local_data_dir'].'/plugins/';
+  }
+
+  function get_config_file_name()
+  {
+    return basename(dirname(__FILE__)).'.dat';
+  }
+
   function load_config()
   {
-    $x = @file_get_contents( dirname(__FILE__).'/data.dat' );
+    $x = @file_get_contents( $this->get_config_file_dir().$this->get_config_file_name() );
     if ($x!==false)
     {
       $c = unserialize($x);
@@ -38,7 +49,9 @@ class EventTracer
 
   function save_config()
   {
-    $file = fopen( dirname(__FILE__).'/data.dat', 'w' );
+    $dir = $this->get_config_file_dir();
+    @mkdir($dir);
+    $file = fopen( $dir.$this->get_config_file_name(), 'w' );
     fwrite($file, serialize($this->my_config) );
     fclose( $file );
   }
@@ -97,4 +110,4 @@ 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/maintain.inc.php b/plugins/event_tracer/maintain.inc.php
new file mode 100644
index 000000000..f7d0131c5
--- /dev/null
+++ b/plugins/event_tracer/maintain.inc.php
@@ -0,0 +1,9 @@
+<?php
+if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+
+function plugin_uninstall($plugin_id)
+{
+  global $conf;
+  @unlink( $conf['local_data_dir'].'/plugins/'.$plugin_id.'.dat' );
+}
+?>
diff --git a/plugins/event_tracer/tracer_admin.php b/plugins/event_tracer/tracer_admin.php
index 5b405ba5a..b17f2a301 100644
--- a/plugins/event_tracer/tracer_admin.php
+++ b/plugins/event_tracer/tracer_admin.php
@@ -21,9 +21,9 @@ if ( isset($_POST['eventTracer_filters']) )
   global $page;
   array_push($page['infos'], 'event tracer options saved');
 }
-$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('EVENT_TRACER_FILTERS', implode("\n", $me->my_config['filters'] ) );
+$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_var('EVENT_TRACER_F_ACTION', $my_url);
 
diff --git a/plugins/event_tracer/tracer_admin.tpl b/plugins/event_tracer/tracer_admin.tpl
index 2d859563e..4830a8b85 100644
--- a/plugins/event_tracer/tracer_admin.tpl
+++ b/plugins/event_tracer/tracer_admin.tpl
@@ -1,4 +1,4 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div class="titrePage">
   <h2>Event Tracer</h2>
 </div>
@@ -8,22 +8,22 @@ The event tracer is a developer tool that logs in the footer of the window all c
 You can use this plugin to see what events is PhpWebGallery calling.
 <b>Note that $conf['show_queries'] must be true.</b>
 </p>
-<form method="post" action="{EVENT_TRACER_F_ACTION}" class="general">
+<form method="post" action="{$EVENT_TRACER_F_ACTION}" class="general">
 <fieldset>
 	<legend>Event Tracer</legend>
 
 <label>Show event argument
-	<input type="checkbox" name="eventTracer_show_args" {EVENT_TRACER_SHOW_ARGS} />
+	<input type="checkbox" name="eventTracer_show_args" {$EVENT_TRACER_SHOW_ARGS} />
 </label>
 <br/>
 <label>Fill below a list of regular expressions (one per line).
 An event will be logged if its name matches at least one expression in the list.
-	<textarea name="eventTracer_filters" id="eventTracer_filters"rows="10" cols="80">{EVENT_TRACER_FILTERS}</textarea>
+	<textarea name="eventTracer_filters" id="eventTracer_filters"rows="10" cols="80">{$EVENT_TRACER_FILTERS}</textarea>
 </label>
 
 </fieldset>
 
 <p><input class="submit" 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>
+<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>