apply same standard to all plugins

22 files changed, 80 insertions, 78 deletions

diff --git a/plugins/data.adsense.php b/plugins/data.adsense.php
index 8016a04..e5d27ad 100644
--- a/plugins/data.adsense.php
+++ b/plugins/data.adsense.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.2 $
+ * @version  $Revision: 1.3 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -15,7 +15,7 @@
 // +----------------------------------------------------------------------+
 // | Author:  xing
 // +----------------------------------------------------------------------+
-// $Id: data.adsense.php,v 1.2 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.adsense.php,v 1.3 2006/08/07 22:14:57 squareing Exp $
 
 /**
  * definitions
@@ -24,7 +24,7 @@
 * Initialization *
 ******************/
 global $gLibertySystem;
-define( 'PLUGIN_GUID_ADSENSE', 'adsense' );
+define( 'PLUGIN_GUID_DATAADSENSE', 'dataadsense' );
 $pluginParams = array (
 	'tag' => 'ADSENSE',
 	'auto_activate' => FALSE,
@@ -39,8 +39,8 @@ $pluginParams = array (
 	'security' => 'registered',
 	'plugin_type' => DATA_PLUGIN
 );
-$gLibertySystem->registerPlugin( PLUGIN_GUID_ADSENSE, $pluginParams );
-$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_ADSENSE );
+$gLibertySystem->registerPlugin( PLUGIN_GUID_DATAADSENSE, $pluginParams );
+$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_DATAADSENSE );
 /*****************
 * Help Function *
 *****************/
diff --git a/plugins/data.article.php b/plugins/data.article.php
index da6e1cd..3c61928 100644
--- a/plugins/data.article.php
+++ b/plugins/data.article.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.7 $
+ * @version  $Revision: 1.8 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@users.sourceforge.net>
 // | Reworked from: wikiplugin_article.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.article.php,v 1.7 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.article.php,v 1.8 2006/08/07 22:14:57 squareing Exp $
 
 /**
  * definitions
@@ -32,7 +32,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => FALSE,
 	'load_function' => 'data_article',
-	'title' => 'Article<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin
+	'title' => 'Article - This plugin is not yet functional.', // Remove this line when the plugin
 //	'title' => 'Article',	// and Remove the comment from the start of this line
 	'help_page' => 'DataPluginArticle',
 	'description' => tra("This plugin will display the data from a single field in the specified Article."),
diff --git a/plugins/data.avatar.php b/plugins/data.avatar.php
index 26a8405..6eeb120 100644
--- a/plugins/data.avatar.php
+++ b/plugins/data.avatar.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.8 $
+ * @version  $Revision: 1.9 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@users.sourceforge.net>
 // | Reworked from: wikiplugin_avatar.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.avatar.php,v 1.8 2006/04/30 17:43:37 squareing Exp $
+// $Id: data.avatar.php,v 1.9 2006/08/07 22:14:57 squareing Exp $
 
 /**
  * definitions
@@ -32,7 +32,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => FALSE,
 	'load_function' => 'data_avatar',
-	'title' => 'Avatar<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'Avatar - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'Avatar',	// and Remove the comment from the start of this line
 	'help_page' => 'DataPluginAvatar',
 	'description' => tra("This plugin will display a User's Avatar as a Link to a page."),
diff --git a/plugins/data.backlinks.php b/plugins/data.backlinks.php
index 15190bd..b9b8c0e 100644
--- a/plugins/data.backlinks.php
+++ b/plugins/data.backlinks.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.8 $
+ * @version  $Revision: 1.9 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@users.sourceforge.net>
 // | Reworked from: wikiplugin_backlinks.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.backlinks.php,v 1.8 2006/04/14 19:36:18 squareing Exp $
+// $Id: data.backlinks.php,v 1.9 2006/08/07 22:14:57 squareing Exp $
 
 /**
  * definitions
@@ -32,7 +32,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => FALSE,
 	'load_function' => 'data_backlinks',
-	'title' => 'BackLinks<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'BackLinks - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'BackLinks',                                                                             // and Remove the comment from the start of this line
 	'help_page' => 'DataPluginBackLinks',
 	'description' => tra("This plugin will list all Wiki pages which contains a link to the specified page."),
diff --git a/plugins/data.category.php b/plugins/data.category.php
index 09caa34..0097f3d 100644
--- a/plugins/data.category.php
+++ b/plugins/data.category.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.8 $
+ * @version  $Revision: 1.9 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@users.sourceforge.net>
 // | Reworked from: wikiplugin_category.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.category.php,v 1.8 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.category.php,v 1.9 2006/08/07 22:14:57 squareing Exp $
 
 /**
  * definitions
@@ -32,7 +32,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => FALSE,
 	'load_function' => 'data_category',
-	'title' => 'Category<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'Category - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'Category',	// and Remove the comment from the start of this line
 	'help_page' => 'DataPluginCategory',
 	'description' => tra("This plugin insert a list of items for the current category or a given category."),
diff --git a/plugins/data.catorphans.php b/plugins/data.catorphans.php
index 0ac3f0c..e1da9c1 100644
--- a/plugins/data.catorphans.php
+++ b/plugins/data.catorphans.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.7 $
+ * @version  $Revision: 1.8 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@users.sourceforge.net>
 // | Reworked from: wikiplugin_catorphans.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.catorphans.php,v 1.7 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.catorphans.php,v 1.8 2006/08/07 22:14:57 squareing Exp $
 
 /**
  * definitions
@@ -32,7 +32,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => FALSE,
 	'load_function' => 'data_catorphans',
-	'title' => 'CatOrphans<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'CatOrphans - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'CatOrphans',	// and Remove the comment from the start of this line
 	'help_page' => 'DataPluginCatOrphans',
 	'description' => tra("Creates a listing of bitweaver objects that have not been categorized."),
diff --git a/plugins/data.comment.php b/plugins/data.comment.php
index 7c7ca0c..b8cf90b 100644
--- a/plugins/data.comment.php
+++ b/plugins/data.comment.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.7 $
+ * @version  $Revision: 1.8 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -15,13 +15,13 @@
 // +----------------------------------------------------------------------+
 // | Author: StarRider <starrrider@sourceforge.net>
 // +----------------------------------------------------------------------+
-// $Id: data.comment.php,v 1.7 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.comment.php,v 1.8 2006/08/07 22:14:57 squareing Exp $
 
 /******************
  * Initialization *
  ******************/
 global $gLibertySystem;
-define( 'PLUGIN_GUID_COMMENT', 'comment' );
+define( 'PLUGIN_GUID_DATACOMMENT', 'datacomment' );
 global $gLibertySystem;
 $pluginParams = array (
 	'tag' => 'COMMENT',
@@ -37,8 +37,8 @@ $pluginParams = array (
 	'security' => 'registered',
 	'plugin_type' => DATA_PLUGIN
 );
-$gLibertySystem->registerPlugin( PLUGIN_GUID_COMMENT, $pluginParams );
-$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_COMMENT );
+$gLibertySystem->registerPlugin( PLUGIN_GUID_DATACOMMENT, $pluginParams );
+$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_DATACOMMENT );
 /*****************
  * Help Function *
  *****************/
diff --git a/plugins/data.dropdown.php b/plugins/data.dropdown.php
index 7119aaf..760ed44 100644
--- a/plugins/data.dropdown.php
+++ b/plugins/data.dropdown.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.12 $
+ * @version  $Revision: 1.13 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -21,7 +21,7 @@
  * Initialization
  */
 global $gLibertySystem;
-define( 'PLUGIN_GUID_DROPDOWN', 'dropdown' );
+define( 'PLUGIN_GUID_DATADROPDOWN', 'datadropdown' );
 $pluginParams = array (
 	'tag' => 'DD',
 	'auto_activate' => TRUE,
@@ -36,8 +36,8 @@ $pluginParams = array (
 	'security' => 'registered',
 	'plugin_type' => DATA_PLUGIN
 );
-$gLibertySystem->registerPlugin( PLUGIN_GUID_DROPDOWN, $pluginParams );
-$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_DROPDOWN );
+$gLibertySystem->registerPlugin( PLUGIN_GUID_DATADROPDOWN, $pluginParams );
+$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_DATADROPDOWN );
 
 /**
  * Help Function
diff --git a/plugins/data.example.php b/plugins/data.example.php
index 3a4140a..3ac98bf 100644
--- a/plugins/data.example.php
+++ b/plugins/data.example.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.10 $
+ * @version  $Revision: 1.11 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -26,7 +26,7 @@ $pluginParams = array ( 'tag' => 'EXAM',
 	'auto_activate' => FALSE,
 	'requires_pair' => FALSE,
 	'load_function' => 'data_example',
-	'title' => 'Example (EXAM)',
+	'title' => 'Example',
 	'help_page' => 'DataPluginExample',
 	'description' => tra("This Plugin is an Example that does nothing. It functions as a template for the creation of new plugins."),
 	'help_function' => 'data_example_help',
diff --git a/plugins/data.freemind.php b/plugins/data.freemind.php
index 0dae137..3452fb5 100644
--- a/plugins/data.freemind.php
+++ b/plugins/data.freemind.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.8 $
+ * @version  $Revision: 1.9 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -15,14 +15,14 @@
 // +----------------------------------------------------------------------+
 // | Author: Southpaw <southpawz@users.sourceforge.net>
 // +----------------------------------------------------------------------+
-// $Id: data.freemind.php,v 1.8 2006/08/05 16:21:57 squareing Exp $
+// $Id: data.freemind.php,v 1.9 2006/08/07 22:14:58 squareing Exp $
 
 /**
  * definitions
  */
 global $gLibertySystem;
 
-define( 'PLUGIN_GUID_FREEMIND', 'datafreemind' );
+define( 'PLUGIN_GUID_DATAFREEMIND', 'datafreemind' );
 global $gLibertySystem;
 $pluginParams = array (
 	'tag' => 'MM',
@@ -38,8 +38,8 @@ $pluginParams = array (
 	'security' => 'registered',
 	'plugin_type' => DATA_PLUGIN
 );
-$gLibertySystem->registerPlugin( PLUGIN_GUID_FREEMIND, $pluginParams );
-$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_FREEMIND );
+$gLibertySystem->registerPlugin( PLUGIN_GUID_DATAFREEMIND, $pluginParams );
+$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_DATAFREEMIND );
 
 // Help Function
 function data_freemind_help() {
diff --git a/plugins/data.graphviz.php b/plugins/data.graphviz.php
index 07a3d22..053927d 100644
--- a/plugins/data.graphviz.php
+++ b/plugins/data.graphviz.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.1 $
+ * @version  $Revision: 1.2 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -28,7 +28,7 @@ $pluginParams = array ( 'tag' => 'GRAPHVIZ',
 	'auto_activate' => FALSE,
 	'requires_pair' => TRUE,
 	'load_function' => 'data_graphviz',
-	'title' => 'GraphViz (GRAPHVIZ)',
+	'title' => 'GraphViz',
 	'help_page' => 'DataPluginExample',
 	'description' => tra("This plugin renders it's content as a graphviz image (dot or neato)."),
 	'help_function' => 'data_graphviz_help',
diff --git a/plugins/data.lang.php b/plugins/data.lang.php
index f0ce124..e6b3fa0 100644
--- a/plugins/data.lang.php
+++ b/plugins/data.lang.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.5 $
+ * @version  $Revision: 1.6 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@users.sourceforge.net>
 // | Reworked from: wikiplugin_lang.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.lang.php,v 1.5 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.lang.php,v 1.6 2006/08/07 22:14:58 squareing Exp $
 
 /**
  * definitions
@@ -30,7 +30,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => TRUE,
 	'load_function' => 'data_lang',
-	'title' => 'Lang<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'Lang - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'Lang',	// and Remove the comment from the start of this line
 	'help_page' => 'DataPluginLang',
 	'description' => tra("This plugin will attempt to translate the text between the ") . "{LANG}" . tra(" blocks to the current language. If the translation fails - nothing is displayed."),
diff --git a/plugins/data.ledgertable.php b/plugins/data.ledgertable.php
index 09116a5..048192f 100644
--- a/plugins/data.ledgertable.php
+++ b/plugins/data.ledgertable.php
@@ -1,10 +1,10 @@
 <?php
-// $Id: data.ledgertable.php,v 1.3 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.ledgertable.php,v 1.4 2006/08/07 22:14:58 squareing Exp $
 /**
  * assigned_modules
  *
  * @author   KainX <mej@kainx.org>
- * @version  $Revision: 1.3 $
+ * @version  $Revision: 1.4 $
  * @package  liberty
  * @subpackage plugins_data
  * @copyright Copyright (c) 2004, bitweaver.org
@@ -20,7 +20,7 @@ $pluginParams = array ( 'tag' => 'LEDGERTABLE',
 	'auto_activate' => FALSE,
 	'requires_pair' => TRUE,
 	'load_function' => 'data_ledgertable',
-	'title' => 'Ledger Table (LEDGERTABLE)',
+	'title' => 'Ledger Table',
 	'help_page' => 'DataPluginLedgertable',
 	'description' => tra("This Plugin creates a ledger-like table with even/odd row colors, optional top- or left-placed headers, and support for row/column spans."),
 	'help_function' => 'data_ledgertable_help',
diff --git a/plugins/data.rss.php b/plugins/data.rss.php
index e114971..3439197 100644
--- a/plugins/data.rss.php
+++ b/plugins/data.rss.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.6 $
+ * @version  $Revision: 1.7 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -17,13 +17,13 @@
 // | Reworked for Bitweaver (& Undoubtedly Screwed-Up)
 // | by: StarRider <starrrider@users.sourceforge.net>
 // +----------------------------------------------------------------------+
-// $Id: data.rss.php,v 1.6 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.rss.php,v 1.7 2006/08/07 22:14:58 squareing Exp $
 
 /**
  * definitions
  */
 global $gLibertySystem;
-define( 'PLUGIN_GUID_RSS', 'datarss' );
+define( 'PLUGIN_GUID_DATARSS', 'datarss' );
 global $gLibertySystem;
 $pluginParams = array (
 	'tag' => 'RSS',
@@ -39,8 +39,8 @@ $pluginParams = array (
 	'security' => 'registered',
 	'plugin_type' => DATA_PLUGIN
 );
-$gLibertySystem->registerPlugin( PLUGIN_GUID_RSS, $pluginParams );
-$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_RSS );
+$gLibertySystem->registerPlugin( PLUGIN_GUID_DATARSS, $pluginParams );
+$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_DATARSS );
 
 function rss_extended_help() {
 	return 'NO HELP WRITTEN FOR {RSS}';
diff --git a/plugins/data.spytext.php b/plugins/data.spytext.php
index 77ddeaf..05aa63d 100644
--- a/plugins/data.spytext.php
+++ b/plugins/data.spytext.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.10 $
+ * @version  $Revision: 1.11 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -15,13 +15,13 @@
 // +----------------------------------------------------------------------+
 // | Author: StarRider starrrider@sourceforge.net
 // +----------------------------------------------------------------------+
-// $Id: data.spytext.php,v 1.10 2006/08/05 16:45:28 squareing Exp $
+// $Id: data.spytext.php,v 1.11 2006/08/07 22:14:58 squareing Exp $
 
 /******************
  * Initialization *
  ******************/
 global $gLibertySystem;
-define( 'PLUGIN_GUID_SPYTEXT', 'dataspytext' );
+define( 'PLUGIN_GUID_DATASPYTEXT', 'dataspytext' );
 $pluginParams = array (
 	'tag' => 'SPYTEXT',
 	'auto_activate' => TRUE,
@@ -36,8 +36,8 @@ $pluginParams = array (
 	'security' => 'registered',
 	'plugin_type' => DATA_PLUGIN
 );
-$gLibertySystem->registerPlugin( PLUGIN_GUID_SPYTEXT, $pluginParams );
-$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_SPYTEXT );
+$gLibertySystem->registerPlugin( PLUGIN_GUID_DATASPYTEXT, $pluginParams );
+$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_DATASPYTEXT );
 
 /*****************
  * Help Function *
diff --git a/plugins/data.titlesearch.php b/plugins/data.titlesearch.php
index 1f38521..133d7a4 100644
--- a/plugins/data.titlesearch.php
+++ b/plugins/data.titlesearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.6 $
+ * @version  $Revision: 1.7 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@users.sourceforge.net>
 // | Reworked from: wikiplugin_titlesearch.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.titlesearch.php,v 1.6 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.titlesearch.php,v 1.7 2006/08/07 22:14:58 squareing Exp $
 
 /**
  * definitions
@@ -30,7 +30,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => FALSE,
 	'load_function' => 'data_titlesearch',
-	'title' => 'TitleSearch<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'TitleSearch - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'TitleSearch',                                                                                         // and Remove the comment from the start of this line
 	'help_page' => 'DataPluginTitleSearch',
 	'description' => tra("This plugin search the titles of all pages in this wiki."),
diff --git a/plugins/data.toc.php b/plugins/data.toc.php
index 4ec0501..118d58f 100644
--- a/plugins/data.toc.php
+++ b/plugins/data.toc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.9 $
+ * @version  $Revision: 1.10 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -15,14 +15,14 @@
 // +----------------------------------------------------------------------+
 // | Author: Christian Fowler <spiderr@users.sourceforge.net>
 // +----------------------------------------------------------------------+
-// $Id: data.toc.php,v 1.9 2006/08/05 16:21:57 squareing Exp $
+// $Id: data.toc.php,v 1.10 2006/08/07 22:14:58 squareing Exp $
 
 /**
  * definitions
  */
 global $gLibertySystem;
 
-define( 'PLUGIN_GUID_TOC', 'datatoc' );
+define( 'PLUGIN_GUID_DATATOC', 'datatoc' );
 
 global $gLibertySystem;
 $pluginParams = array (
@@ -39,8 +39,8 @@ $pluginParams = array (
 	'security' => 'registered',
 	'plugin_type' => DATA_PLUGIN
 );
-$gLibertySystem->registerPlugin( PLUGIN_GUID_TOC, $pluginParams );
-$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_TOC );
+$gLibertySystem->registerPlugin( PLUGIN_GUID_DATATOC, $pluginParams );
+$gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_DATATOC );
 
 function data_toc_help() {
 	return '<table class="data help">'
diff --git a/plugins/data.translated.php b/plugins/data.translated.php
index be4d48d..6a07b6a 100644
--- a/plugins/data.translated.php
+++ b/plugins/data.translated.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.6 $
+ * @version  $Revision: 1.7 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@sourceforge.net>
 // | Reworked from: wikiplugin_translated.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.translated.php,v 1.6 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.translated.php,v 1.7 2006/08/07 22:14:58 squareing Exp $
 
 /**
  * definitions
@@ -30,7 +30,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => FALSE,
 	'load_function' => 'data_translated',
-	'title' => 'Translated<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'Translated - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'Translated',                                                                                       // and Remove the comment from the start of this line
 	'help_page' => 'DataPluginTranslated',
 	'description' => tra("This plugin is used to create a link to a page that contains a translation. The link can be shown as an Icon for the country or as an abreviation for the language."),
diff --git a/plugins/data.usercount.php b/plugins/data.usercount.php
index 12027d2..209efa8 100644
--- a/plugins/data.usercount.php
+++ b/plugins/data.usercount.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.6 $
+ * @version  $Revision: 1.7 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@sourceforge.net>
 // | Reworked from: wikiplugin_usercount.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.usercount.php,v 1.6 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.usercount.php,v 1.7 2006/08/07 22:14:58 squareing Exp $
 
 /**
  * definitions
@@ -30,7 +30,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => TRUE,
 	'load_function' => 'data_usercount',
-	'title' => 'UserCount<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'UserCount - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'UserCount',                                                                                       // and Remove the comment from the start of this line
 	'help_page' => 'DataPluginUserCount',
 	'description' => tra("Will show the number of users. If a Group Name can be included to filter the Groups."),
diff --git a/plugins/data.userlist.php b/plugins/data.userlist.php
index e1fce6b..a0c2a1c 100644
--- a/plugins/data.userlist.php
+++ b/plugins/data.userlist.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.8 $
+ * @version  $Revision: 1.9 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@sourceforge.net>
 // | Reworked from: wikiplugin_userlist.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.userlist.php,v 1.8 2006/04/30 18:07:05 squareing Exp $
+// $Id: data.userlist.php,v 1.9 2006/08/07 22:14:58 squareing Exp $
 
 /**
  * definitions
@@ -30,7 +30,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => TRUE,
 	'load_function' => 'data_userlist',
-	'title' => 'UserList<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'UserList - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'UserList',,                                                                                       // and Remove the comment from the start of this line
 	'help_page' => 'DataPluginUserList',
 	'description' => tra("This plugin will displays an alphabetically sorted list of registered users. A Group Name can be included to filter Groups to be listed."),
diff --git a/plugins/data.wikilist.php b/plugins/data.wikilist.php
index b518bfb..567c82b 100644
--- a/plugins/data.wikilist.php
+++ b/plugins/data.wikilist.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.7 $
+ * @version  $Revision: 1.8 $
  * @package  liberty
  * @subpackage plugins_data
  */
@@ -18,7 +18,7 @@
 // | by: StarRider <starrrider@sourceforge.net>
 // | Reworked from: wikiplugin_wikilist.php - see deprecated code below
 // +----------------------------------------------------------------------+
-// $Id: data.wikilist.php,v 1.7 2006/04/06 05:06:11 starrrider Exp $
+// $Id: data.wikilist.php,v 1.8 2006/08/07 22:14:58 squareing Exp $
 
 /**
  * definitions
@@ -30,7 +30,7 @@ $pluginParams = array (
 	'auto_activate' => FALSE,
 	'requires_pair' => TRUE,
 	'load_function' => 'data_wikilist',
-	'title' => 'WikiList<strong> - This plugin is not yet functional.</strong>', // Remove this line when the plugin becomes operational
+	'title' => 'WikiList - This plugin is not yet functional.', // Remove this line when the plugin becomes operational
 //	'title' => 'WikiList',                                                                             // and Remove the comment from the start of this line
 	'help_page' => 'DataPluginWikiList',
 	'description' => tra("Displays an alphabetically sorted list of WikiPages"),
diff --git a/templates/admin_plugins.tpl b/templates/admin_plugins.tpl
index 887f5e9..b677f44 100644
--- a/templates/admin_plugins.tpl
+++ b/templates/admin_plugins.tpl
@@ -34,11 +34,13 @@
 								{if $plugin.plugin_type eq $plugin_type}
 									<tr class="{cycle values="odd,even"}">
 										<td>
-											{if $plugin_type eq 'data'}
-												<h3>{$plugin.title|escape}</h3>
-											{/if}
 											<label for="{$guid}">
-												{$plugin.plugin_description}
+												{if $plugin_type eq 'data'}
+													<h3>{$plugin.title|escape}</h3>
+												{else}
+													<h3>{$plugin.edit_label}</h3>
+												{/if}
+												{$plugin.description}
 											</label>
 										</td>
 										<td>{$guid}</td>