Changeset 1705 for trunk/plugins

Timestamp:

Jan 9, 2007, 12:38:54 PM (17 years ago)

Author:

rvelices

Message:

Plugins: new way of adding links and content to administration pages...

Location:

trunk/plugins

Files:

• add_index/admin/admin_menu.php (modified) (1 diff)
• add_index/admin/admin_menu.tpl (modified) (1 diff)
• add_index/main.admin.inc.php (modified) (5 diffs)
• add_index/main.inc.php (modified) (1 diff)
• admin_advices/main.inc.php (modified) (5 diffs)
• event_tracer/main.inc.php (modified) (2 diffs)
• event_tracer/tracer_admin.php (modified) (2 diffs)
• event_tracer/tracer_admin.tpl (modified) (1 diff)

trunk/plugins/add_index/admin/admin_menu.php

@@ -67 +67 @@
 $template->assign_var('filename', $conf['add_index_filename']);
 $template->assign_var('source_directory_path', $conf['add_index_source_directory_path']);
-$template->assign_var('F_ACTION', $my_url);
+//$template->assign_var('F_ACTION', $my_url);
 
 // +-----------------------------------------------------------------------+
 // | Sending html code                                                     |
 // +-----------------------------------------------------------------------+
-$template->assign_var_from_handle('PLUGIN_ADMIN_CONTENT', 'plugin_admin_content');
+$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
 
 ?>

trunk/plugins/add_index/admin/admin_menu.tpl

@@ -1 +1 @@
 <!-- $Id: admin_menu.tpl Ruben ARNAUD -->
+<div class="titrePage">
+  <h2>{lang:Add_Index}</h2>
+</div>
+
 <p>{lang:add_index_Description_1}</p>
 <p>{lang:add_index_Description_2}</p>

trunk/plugins/add_index/main.admin.inc.php

@@ -34 +34 @@
 class AdminAddIndex extends AddIndex
 {
+  var $my_id;
   function load_params()
   {
@@ -63 +64 @@
       (
         'CAPTION' => l10n('Advanced_Add_Index'),
-        'URL' => get_root_url().'admin.php?page=main_page&page_type=plugin&plugin_id=add_index&overwrite'
+        'URL' => get_admin_plugin_menu_link($this->my_id, 'admin/main_page').'&overwrite'
       ));
 
@@ -76 +77 @@
         array
         (
-          'U_HREF' => get_root_url().'admin.php?page=main_page&page_type=plugin&plugin_id=add_index&site_id='.$site_id,
+          'U_HREF' => get_admin_plugin_menu_link($this->my_id, 'admin/main_page').'&site_id='.$site_id,
           'U_CAPTION' => l10n('Manager_Add_Index'),
           'U_HINT' => l10n('Add_Index')
@@ -85 +86 @@
   }
 
-  function plugin_admin_menu()
+  function plugin_admin_menu($menu)
   {
-    add_plugin_admin_menu(l10n('Menu_Add_Index'), array(&$this, 'do_plugin_admin_menu'));
+    array_push($menu,
+        array(
+          'NAME' => l10n('Menu_Add_Index'),
+          'URL' => get_admin_plugin_menu_link($this->my_id, 'admin/admin_menu')
+        )
+      );
+    return $menu;
   }
-
-  function do_plugin_admin_menu($my_url)
-  {
-    include_once(dirname(__FILE__).'/admin/'.'admin_menu.php');
-  }
-
 }
 
 // Create object
 $add_index = new AdminAddIndex();
+$add_index->my_id = $plugin['id'];
 
 // Load Add Index parameters
@@ -107 +109 @@
 add_event_handler('get_admin_advanced_features_links', array(&$add_index, 'get_admin_advanced_features_links'));
 add_event_handler('get_admins_site_links', array(&$add_index, 'get_admins_site_links'), EVENT_HANDLER_PRIORITY_NEUTRAL, 3);
-add_event_handler('plugin_admin_menu', array(&$add_index, 'plugin_admin_menu') );
+add_event_handler('get_admin_plugin_menu_links', array(&$add_index, 'plugin_admin_menu') );
 
 ?>

trunk/plugins/add_index/main.inc.php

@@ -50 +50 @@
     include_once(dirname(__FILE__).'/'.'main.normal.inc.php');
   }
+  set_plugin_data($plugin['id'], $add_index);
 }
 

trunk/plugins/admin_advices/main.inc.php

@@ -11 +11 @@
 function set_admin_advice()
 {
-  global $page, $user, $template, $conf;  
+  global $page, $user, $template, $conf;
 
   // This Plugin works only on the Admin page
   if ( isset($page['body_id']) and $page['body_id']=='theAdminPage'
-    and isset($page['page']['name']) and $page['page']['name'] == 'intro' 
-    and isset($page['page']['type']) and $page['page']['type'] == 'standard'
+    and $page['page'] == 'intro'
     )
   {
-  // Setup Advice Language (Maybe there is already a variable)  
-    $advlang = ( isset($user['language']) ) ? 
+  // Setup Advice Language (Maybe there is already a variable)
+    $advlang = ( isset($user['language']) ) ?
       $user['language'] : $conf['default_language']; // en_UK.iso-8859-1
 
@@ -31 +30 @@
 //  If there is an advice
     if ( $cond )
-    {  
-//  $template->set_filenames( array( 'advice' => 'admin_advices.tpl' ));    
+    {
+//  $template->set_filenames( array( 'advice' => 'admin_advices.tpl' ));
       $template->set_filenames(array(
-        'admin_advice' => 
+        'admin_advice' =>
           PHPWG_ROOT_PATH.'/plugins/admin_advices/admin_advices.tpl')
         );
-        
+
 // Random Thumbnail
       $query = '
@@ -44 +43 @@
   ORDER BY RAND(NOW())
   LIMIT 0, 1
-;'; 
-      $result = pwg_query($query);  
-      $row = mysql_fetch_assoc($result); 
+;';
+      $result = pwg_query($query);
+      $row = mysql_fetch_assoc($result);
       if ( is_array($row) )
       {
@@ -57 +56 @@
            )
          );
-      }      
+      }
       $advice_text = array_shift($adv);
       $template->assign_vars(
         array(
-          'ADVICE_ABOUT' => '$conf[' . "'$confk'] ", 
-          'ADVICE_TEXT'  => $advice_text,    
+          'ADVICE_ABOUT' => '$conf[' . "'$confk'] ",
+          'ADVICE_TEXT'  => $advice_text,
            )
         );
@@ -72 +71 @@
               'ADVICE' => $advice
               )
-            );    
-      } 
+            );
+      }
     $template->parse('admin_advice');
     }

trunk/plugins/event_tracer/main.inc.php

@@ -12 +12 @@
   var $me_working;
   var $my_config;
-
-  function EventTracer()
+  var $my_id;
+  
+  function EventTracer($id)
   {
     $this->me_working=0;
+    $this->my_id=$id;
   }
 
@@ -77 +79 @@
   }
 
-  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);
 ?>

trunk/plugins/event_tracer/tracer_admin.php

@@ -1 +1 @@
 <?php
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+
+$me = get_plugin_data($plugin_id);
 
 global $template;
@@ -12 +14 @@
   $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');
 ?>

trunk/plugins/event_tracer/tracer_admin.tpl

@@ +1 @@
+<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.