plugin simplification: adding admin links does not require the plugin_id anymore...

git-svn-id: http://piwigo.org/svn/trunk@1731 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 6 insertions, 10 deletions

diff --git a/plugins/add_index/main.admin.inc.php b/plugins/add_index/main.admin.inc.php
index 457ea760a..a79d1f237 100644
--- a/plugins/add_index/main.admin.inc.php
+++ b/plugins/add_index/main.admin.inc.php
@@ -33,7 +33,6 @@ if ((!defined('PHPWG_ROOT_PATH')) or (!(defined('IN_ADMIN') and IN_ADMIN)))
 

 class AdminAddIndex extends AddIndex

 {

-  var $my_id;

   function load_params()

   {

     global $conf;

@@ -63,7 +62,7 @@ class AdminAddIndex extends AddIndex
       array

       (

         'CAPTION' => l10n('Advanced_Add_Index'),

-        'URL' => get_admin_plugin_menu_link($this->my_id, 'admin/main_page').'&overwrite'

+        'URL' => get_admin_plugin_menu_link(dirname(__FILE__).'/admin/main_page.php').'&overwrite'

       ));

 

     return $advanced_features;

@@ -76,7 +75,7 @@ class AdminAddIndex extends AddIndex
       array_push($site_manager_plugin_links,

         array

         (

-          'U_HREF' => get_admin_plugin_menu_link($this->my_id, 'admin/main_page').'&site_id='.$site_id,

+          'U_HREF' => get_admin_plugin_menu_link(dirname(__FILE__).'/admin/main_page.php').'&site_id='.$site_id,

           'U_CAPTION' => l10n('Manager_Add_Index'),

           'U_HINT' => l10n('Add_Index')

         ));

@@ -90,7 +89,7 @@ class AdminAddIndex extends AddIndex
     array_push($menu,

         array(

           'NAME' => l10n('Menu_Add_Index'),

-          'URL' => get_admin_plugin_menu_link($this->my_id, 'admin/admin_menu')

+          'URL' => get_admin_plugin_menu_link(dirname(__FILE__).'/admin/admin_menu.php')

         )

       );

     return $menu;

@@ -99,7 +98,6 @@ class AdminAddIndex extends AddIndex
 

 // Create object

 $add_index = new AdminAddIndex();

-$add_index->my_id = $plugin['id'];

 

 // Load Add Index parameters

 $add_index->load_params();

diff --git a/plugins/event_tracer/main.inc.php b/plugins/event_tracer/main.inc.php
index 1eb89f094..0976cae1c 100644
--- a/plugins/event_tracer/main.inc.php
+++ b/plugins/event_tracer/main.inc.php
@@ -11,12 +11,10 @@ class EventTracer
 {
   var $me_working;
   var $my_config;
-  var $my_id;
   
-  function EventTracer($id)
+  function EventTracer()
   {
     $this->me_working=0;
-    $this->my_id=$id;
   }
 
   function load_config()
@@ -83,14 +81,14 @@ class EventTracer
     array_push($menu,
         array(
           'NAME' => 'Event Tracer',
-          'URL' => get_admin_plugin_menu_link($this->my_id, 'tracer_admin')
+          'URL' => get_admin_plugin_menu_link(dirname(__FILE__).'/tracer_admin.php')
         )
       );
     return $menu;
   }
 }
 
-$obj = new EventTracer($plugin['id']);
+$obj = new EventTracer();
 $obj->load_config();
 
 add_event_handler('get_admin_plugin_menu_links', array(&$obj, 'plugin_admin_menu') );