[pLog-svn] r487 - in plugins/trunk: atom atom/templates contentfilter contentfilter/templates feedreader feedreader/templates hostblock hostblock/templates karma karma/templates linktracker moderate moderate/templates port port/templates print secret secret/templates smileys smileys/templates submissions submissions/templates templateeditor templateeditor/templates textparser textparser/class/action textparser/templates

oscar at devel.plogworld.net oscar at devel.plogworld.net
Mon Dec 13 23:44:34 GMT 2004 

Author: oscar
Date: 2004-12-13 23:44:34 +0000 (Mon, 13 Dec 2004)
New Revision: 487

Modified:
   plugins/trunk/atom/pluginatom.class.php
   plugins/trunk/atom/templates/pluginsettings.template
   plugins/trunk/contentfilter/plugincontentfilter.class.php
   plugins/trunk/contentfilter/templates/addblogfilteredcontent.template
   plugins/trunk/contentfilter/templates/addfilteredcontent.template
   plugins/trunk/contentfilter/templates/blogfilteredcontent.template
   plugins/trunk/contentfilter/templates/editblogfilteredcontent.template
   plugins/trunk/contentfilter/templates/editfilteredcontent.template
   plugins/trunk/contentfilter/templates/filteredcontent.template
   plugins/trunk/feedreader/pluginfeedreader.class.php
   plugins/trunk/feedreader/templates/feed.template
   plugins/trunk/feedreader/templates/main.template
   plugins/trunk/hostblock/pluginhostblock.class.php
   plugins/trunk/hostblock/templates/addblockedhost.template
   plugins/trunk/hostblock/templates/addblogblockedhost.template
   plugins/trunk/hostblock/templates/blockedhosts.template
   plugins/trunk/hostblock/templates/blogblockedhosts.template
   plugins/trunk/hostblock/templates/editblockedhost.template
   plugins/trunk/hostblock/templates/editblogblockedhost.template
   plugins/trunk/karma/pluginkarma.class.php
   plugins/trunk/karma/templates/moderateddownlist.template
   plugins/trunk/karma/templates/pluginsettings.template
   plugins/trunk/linktracker/pluginlinktracker.class.php
   plugins/trunk/moderate/pluginmoderate.class.php
   plugins/trunk/moderate/templates/pluginsettings.template
   plugins/trunk/moderate/templates/unmoderatedcomments.template
   plugins/trunk/port/pluginport.class.php
   plugins/trunk/port/templates/pluginsettings.template
   plugins/trunk/print/pluginprint.class.php
   plugins/trunk/secret/pluginsecret.class.php
   plugins/trunk/secret/templates/pluginsettings.template
   plugins/trunk/smileys/pluginsmileys.class.php
   plugins/trunk/smileys/templates/smileys.template
   plugins/trunk/submissions/pluginsubmissions.class.php
   plugins/trunk/submissions/templates/pluginsettings.template
   plugins/trunk/templateeditor/plugintemplateeditor.class.php
   plugins/trunk/templateeditor/templates/main.template
   plugins/trunk/textparser/class/action/adminplugintextparsersettingsaction.class.php
   plugins/trunk/textparser/class/action/adminplugintextparserupdatesettingsaction.class.php
   plugins/trunk/textparser/plugintextparser.class.php
   plugins/trunk/textparser/templates/settings.template
Log:
removed unneded includes from the plugin*.class.php files, since now actions, even those used by plugins, are loaded dynamically.

Modified: plugins/trunk/atom/pluginatom.class.php
===================================================================
--- plugins/trunk/atom/pluginatom.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/atom/pluginatom.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,9 +1,7 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/atom/class/action/adminatompluginsettingsaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/atom/class/action/adminatompluginupdatesettingsaction.class.php" );
-
+	
 	/**
 	 * plugin registration and stuff like that...
 	 */

Modified: plugins/trunk/atom/templates/pluginsettings.template
===================================================================
--- plugins/trunk/atom/templates/pluginsettings.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/atom/templates/pluginsettings.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=atomSettings title=$locale->tr("atomSettings")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=atomSettings title=$locale->tr("atomSettings")}
 <form name="pluginAtomSettings" method="post" action="admin.php">
 <!-- article categories -->
 <h2>Articles</h2>
@@ -53,5 +53,5 @@
 <input type="hidden" name="op" value="updateAtomSettings" />
 <input type="submit" name="submit" value="Update Settings" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/contentfilter/plugincontentfilter.class.php
===================================================================
--- plugins/trunk/contentfilter/plugincontentfilter.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/contentfilter/plugincontentfilter.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -2,7 +2,7 @@
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/security/contentfilter.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/adminaddblogfilteredcontentaction.class.php" );	
+	/*include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/adminaddblogfilteredcontentaction.class.php" );	
 	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/adminaddfilteredcontentaction.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/adminblogfilteredcontentsaction.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/admindeleteblogfilteredcontentaction.class.php" );
@@ -13,7 +13,7 @@
 	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/adminnewblogfilteredcontentaction.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/adminnewfilteredcontentaction.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/adminupdateblogfilteredcontentaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/adminupdatefilteredcontentaction.class.php" );
+	include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/action/adminupdatefilteredcontentaction.class.php" );*/
 	
 	/**
 	 * events that this plugin generates

Modified: plugins/trunk/contentfilter/templates/addblogfilteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/addblogfilteredcontent.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/contentfilter/templates/addblogfilteredcontent.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=newBlogFilteredContent title=$locale->tr("newBlogFilteredContent")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=newBlogFilteredContent title=$locale->tr("newBlogFilteredContent")}
 <p>{$locale->tr("add_filtered_content_intro")}</p>
 <form name="newBlogFilteredContent" action="admin.php" method="post">
  <table width="100%">
@@ -20,7 +20,7 @@
   </tr>
  </table>
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
 
 

Modified: plugins/trunk/contentfilter/templates/addfilteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/addfilteredcontent.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/contentfilter/templates/addfilteredcontent.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=newFilteredContent title=$locale->tr("newFilteredContent")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=newFilteredContent title=$locale->tr("newFilteredContent")}
 <p>{$locale->tr("global_add_filtered_content_intro")}</p>
 <form name="newBlogFilteredContent" action="admin.php" method="post">
  <table width="100%">
@@ -20,5 +20,5 @@
   </tr>
  </table>
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/contentfilter/templates/blogfilteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/blogfilteredcontent.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/contentfilter/templates/blogfilteredcontent.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=blogFilteredContent title=$locale->tr("blogFilteredContent")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=blogFilteredContent title=$locale->tr("blogFilteredContent")}
 <p>
 {$locale->tr("filtered_content_intro")}
 </p>
@@ -24,7 +24,7 @@
 <input type="hidden" name="op" value="deleteBlogFilteredContent" />
 <input type="submit" value="{$locale->tr("delete_selected")}" name="deleteSelected" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
 
 

Modified: plugins/trunk/contentfilter/templates/editblogfilteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/editblogfilteredcontent.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/contentfilter/templates/editblogfilteredcontent.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=blogFilteredContent title=$locale->tr("blogFilteredContent")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=blogFilteredContent title=$locale->tr("blogFilteredContent")}
 <p>Anything added here will not be allowed as valid text in a comment, and any attempt
 by a casual user to post a comment with blocked content will block the comment. Regular
 expressions or a simple string can be used. Regular expressions are much more powerful
@@ -25,6 +25,6 @@
   </tr>
  </table>
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
 

Modified: plugins/trunk/contentfilter/templates/editfilteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/editfilteredcontent.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/contentfilter/templates/editfilteredcontent.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=filteredContent title=$locale->tr("filteredContent")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=filteredContent title=$locale->tr("filteredContent")}
 <p>Anything added here will not be allowed as valid text in a comment, and any attempt
 by a casual user to post a comment with blocked content will block the comment. Regular
 expressions or a simple string can be used. Regular expressions are much more powerful
@@ -25,5 +25,5 @@
   </tr>
  </table>
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/contentfilter/templates/filteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/filteredcontent.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/contentfilter/templates/filteredcontent.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=filteredContent title=$locale->tr("filteredContent")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=filteredContent title=$locale->tr("filteredContent")}
 <p>{$locale->tr("global_filtered_content_intro")}</p>
 <form name="filteredContent" action="admin.php" method="post">
 <table width="100%" border="1">
@@ -24,5 +24,5 @@
 <input type="hidden" name="op" value="deleteFilteredContent" />
 <input type="submit" value="{$locale->tr("delete_selected")}" name="deleteSelected" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/feedreader/pluginfeedreader.class.php
===================================================================
--- plugins/trunk/feedreader/pluginfeedreader.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/feedreader/pluginfeedreader.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,8 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/feedreader/class/action/feedreaderaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/feedreader/class/action/readfeedaction.class.php" );	
 	
 	class PluginFeedReader extends PluginBase 
 	{

Modified: plugins/trunk/feedreader/templates/feed.template
===================================================================
--- plugins/trunk/feedreader/templates/feed.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/feedreader/templates/feed.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=feedReader title=$locale->tr("feedReader")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=feedReader title=$locale->tr("feedReader")}
 {assign var=channel value=$rss->getChannel()}
 <h1>{$channel->getTitle()}</h1>
 <p>{$channel->getDescription()}</p>
@@ -22,5 +22,5 @@
   </li>
 {/foreach}
 </ul>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/feedreader/templates/main.template
===================================================================
--- plugins/trunk/feedreader/templates/main.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/feedreader/templates/main.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=feedReader title=$locale->tr("feedReader")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=feedReader title=$locale->tr("feedReader")}
 <table cols="2">
  <tr>
   <th style="text-align:left">{$locale->tr("feed")}</th>
@@ -27,5 +27,5 @@
    </tr> 
  {/foreach}
 </table>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/hostblock/pluginhostblock.class.php
===================================================================
--- plugins/trunk/hostblock/pluginhostblock.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/hostblock/pluginhostblock.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -3,7 +3,7 @@
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
 	
 	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/security/hostsblacklist.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminaddblockedhostaction.class.php" );	
+	/*include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminaddblockedhostaction.class.php" );	
 	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminaddblogblockedhostaction.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminblogblockhostfrompostingaction.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminblockedhostsaction.class.php" );
@@ -15,7 +15,7 @@
 	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminnewblockedhostaction.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminnewblogblockedhostaction.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminupdateblockedhostaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminupdateblogblockedhostaction.class.php" );
+	include_once( PLOG_CLASS_PATH."plugins/hostblock/class/action/adminupdateblogblockedhostaction.class.php" );*/
 	
 	/**
 	 * events that this plugin generates

Modified: plugins/trunk/hostblock/templates/addblockedhost.template
===================================================================
--- plugins/trunk/hostblock/templates/addblockedhost.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/hostblock/templates/addblockedhost.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=newBlockedHost title=$locale->tr("newBlockedHost")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=newBlockedHost title=$locale->tr("newBlockedHost")}
 {include file="common.template"}
 <p>
 {$locale->tr("global_block_host_intro")}
@@ -44,5 +44,5 @@
  </table>
 </form>
 </div>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/hostblock/templates/addblogblockedhost.template
===================================================================
--- plugins/trunk/hostblock/templates/addblogblockedhost.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/hostblock/templates/addblogblockedhost.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=newBlogBlockedHost title=$locale->tr("newBlogBlockedHost")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=newBlogBlockedHost title=$locale->tr("newBlogBlockedHost")}
 {include file="common.template"}
 <p>
 {$locale->tr("block_host_intro")}
@@ -43,5 +43,5 @@
   </tr>
  </table>
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/hostblock/templates/blockedhosts.template
===================================================================
--- plugins/trunk/hostblock/templates/blockedhosts.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/hostblock/templates/blockedhosts.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=blockedHosts title=$locale->tr("blockedHosts")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=blockedHosts title=$locale->tr("blockedHosts")}
 <form name="blockedHosts" action="admin.php" method="post">
 <table width="100%" border="1">
  <tr>
@@ -27,5 +27,5 @@
 <input type="hidden" name="op" value="deleteBlockedHost" />
 <input type="submit" value="{$locale->tr("delete_selected")}" name="deleteSelected" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/hostblock/templates/blogblockedhosts.template
===================================================================
--- plugins/trunk/hostblock/templates/blogblockedhosts.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/hostblock/templates/blogblockedhosts.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=blogBlockedHost title=$locale->tr("blogBlockedHost")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=blogBlockedHost title=$locale->tr("blogBlockedHost")}
 <form name="blogBlockedHosts" action="admin.php" method="post">
 <table width="100%" border="1">
  <tr>
@@ -26,5 +26,5 @@
 <input type="hidden" name="op" value="blogDeleteBlockedHost" />
 <input type="submit" value="{$locale->tr("delete_selected")}" name="deleteSelected" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/hostblock/templates/editblockedhost.template
===================================================================
--- plugins/trunk/hostblock/templates/editblockedhost.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/hostblock/templates/editblockedhost.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=blockedHosts title=$locale->tr("blockedHosts")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=blockedHosts title=$locale->tr("blockedHosts")}
 {include file="common.template"}
 <form name="newBlockedHost" action="admin.php" method="post" onSubmit="return checkIpAddress(this);">
  <table width="100%">
@@ -41,5 +41,5 @@
   </tr>
  </table>
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/hostblock/templates/editblogblockedhost.template
===================================================================
--- plugins/trunk/hostblock/templates/editblogblockedhost.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/hostblock/templates/editblogblockedhost.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=blogBlockedHost title=$locale->tr("blogBlockedHost")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=blogBlockedHost title=$locale->tr("blogBlockedHost")}
 {include file="common.template"}
 <form name="newBlockedHost" action="admin.php" method="post" onSubmit="return checkIpAddress(this);">
  <table width="100%">
@@ -41,5 +41,5 @@
   </tr>
  </table>
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/karma/pluginkarma.class.php
===================================================================
--- plugins/trunk/karma/pluginkarma.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/karma/pluginkarma.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,11 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/karma/class/action/karmarateaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/karma/class/action/adminkarmapluginsettingsaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/karma/class/action/adminkarmapluginupdatesettingsaction.class.php" );	
-	include_once( PLOG_CLASS_PATH."plugins/karma/class/action/viewmoderateddownaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/karma/class/action/viewmoderateddownarticleaction.class.php" );	
 	
 	/**
 	 * our custom status for posts
@@ -54,7 +49,7 @@
 		 */
 		function getPositiveUrl( $post )
 		{
-			$url =& RequestGenerator::getRequestGenerator();
+			$url =& $this->blogInfo->getBlogRequestGenerator();
 			$karmaUrl = $url->getIndexUrl()."?op=karmaRate&amp;mode=1&amp;articleId=".$post->getId()."&amp;blogId=".$post->getBlog();
 			
 			return $karmaUrl;
@@ -68,7 +63,7 @@
 		 */
 		function getNegativeUrl( $post )
 		{
-			$url =& RequestGenerator::getRequestGenerator();
+			$url =& $this->blogInfo->getBlogRequestGenerator();
 			$karmaUrl = $url->getIndexUrl()."?op=karmaRate&amp;mode=2&amp;articleId=".$post->getId()."&amp;blogId=".$post->getBlog();
 			
 			return $karmaUrl;			
@@ -82,7 +77,7 @@
 		 */
 		function moderatedDownLink( $post )
 		{
-			$url =& RequestGenerator::getRequestGenerator();
+			$url =& $this->blogInfo->getBlogRequestGenerator();
 			$modDownLink = $url->getIndexUrl()."?op=viewModeratedDownArticle&amp;articleId=".$post->getId()."&amp;blogId=".$post->getBlog();
 			
 			return $modDownLink;
@@ -96,7 +91,7 @@
 		 */
 		function moderatedDownListLink( $blog )
 		{
-			$url =& RequestGenerator::getRequestGenerator();
+			$url =& $this->blogInfo->getBlogRequestGenerator();
 			$listLink = $url->getIndexUrl()."?op=viewModeratedDown&amp;blogId=".$blog->getId();
 			
 			return $listLink;

Modified: plugins/trunk/karma/templates/moderateddownlist.template
===================================================================
--- plugins/trunk/karma/templates/moderateddownlist.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/karma/templates/moderateddownlist.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,7 +1,7 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=Smileys title=$locale->tr("Smileys")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=Smileys title=$locale->tr("Smileys")}
 {foreach from=$moderateddown item=article}
  <a href="{$karma->moderatedDownLink($article)}">{$article->getTopic()}</a><br/>
 {/foreach}
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/karma/templates/pluginsettings.template
===================================================================
--- plugins/trunk/karma/templates/pluginsettings.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/karma/templates/pluginsettings.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=karmaPluginSettings title=$locale->tr("karmaPluginSettings")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=karmaPluginSettings title=$locale->tr("karmaPluginSettings")}
 <p>
 This plugin will allow your visitors to rate your postings. It works by creating two new
 custom fields that will be used to store the positive and negative scores of every post. When the
@@ -24,5 +24,5 @@
  <input type="hidden" name="op" value="pluginKarmaUpdateSettings" />
  <input type="submit" name="{$locale->tr("update")}" value="{$locale->tr("update")}" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/linktracker/pluginlinktracker.class.php
===================================================================
--- plugins/trunk/linktracker/pluginlinktracker.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/linktracker/pluginlinktracker.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,7 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/linktracker/action/linktrackeraction.class.php" );
 
 	/**
 	 * implements the functionality of a link tracker, that was previously included

Modified: plugins/trunk/moderate/pluginmoderate.class.php
===================================================================
--- plugins/trunk/moderate/pluginmoderate.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/moderate/pluginmoderate.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,14 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-	include_once( PLOG_CLASS_PATH."class/view/admin/adminmessageview.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/moderate/class/action/adminmoderatepluginsettingsaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/moderate/class/action/adminmoderatepluginupdatesettingsaction.class.php" );	
-	include_once( PLOG_CLASS_PATH."plugins/moderate/class/action/adminunmoderatedcommentsaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/moderate/class/action/adminupdateunmoderatedcommentsaction.class.php" );  
-	include_once( PLOG_CLASS_PATH."plugins/moderate/class/dao/unmoderatedcomments.class.php" );
 	
 	/**
 	 * implements moderation of comments

Modified: plugins/trunk/moderate/templates/pluginsettings.template
===================================================================
--- plugins/trunk/moderate/templates/pluginsettings.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/moderate/templates/pluginsettings.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=moderatePluginSettings title=$locale->tr("moderatePluginSettings")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=moderatePluginSettings title=$locale->tr("moderatePluginSettings")}
 <p>
  This plugin will allow you to put comments in a queue and will not be published until they have been
  either accepted or rejected by you. Accepting a comment will automatically publish it in the site, while
@@ -15,5 +15,5 @@
  <input type="hidden" name="op" value="moderatePluginUpdateSettings" />
  <input type="submit" name="{$locale->tr("update")}" value="{$locale->tr("update")}" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/moderate/templates/unmoderatedcomments.template
===================================================================
--- plugins/trunk/moderate/templates/unmoderatedcomments.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/moderate/templates/unmoderatedcomments.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=unmoderatedComments title=$locale->tr("unmoderatedComments")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=unmoderatedComments title=$locale->tr("unmoderatedComments")}
 <form name="comments" action="admin.php" method="post">
 <table  border="1" width="100%">
  <tr>
@@ -32,5 +32,5 @@
  <input type="submit" name="moderate" value="Moderate Selected Comemnts" /><br/>
  <input type="submit" name="reject" value="Reject Selected Comemnts" /><br/> 
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/port/pluginport.class.php
===================================================================
--- plugins/trunk/port/pluginport.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/port/pluginport.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -45,10 +45,7 @@
 
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/port/class/action/adminpluginportupdateconfigaction.class.php" );
-      include_once( PLOG_CLASS_PATH."plugins/port/class/action/adminpluginportconfigaction.class.php" );
-
+	
 	/**
 	 * data porter from other blogging software
 	 */

Modified: plugins/trunk/port/templates/pluginsettings.template
===================================================================
--- plugins/trunk/port/templates/pluginsettings.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/port/templates/pluginsettings.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=PortConfig title=$locale->tr("PortConfig")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=PortConfig title=$locale->tr("PortConfig")}
 <p>
 This plugin will allow you to import your entries from other blogging platforms.  
 Port currently only supports users, blogs, categories, articles, and comments.<br /><br />
@@ -68,5 +68,5 @@
  <input type="submit" name="{$locale->tr("continue")}" value="{$locale->tr("continue")}" />
 </form>
 </p>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/print/pluginprint.class.php
===================================================================
--- plugins/trunk/print/pluginprint.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/print/pluginprint.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,7 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/print/class/action/printpostaction.class.php" );
 	
 	/**
 	 * makes printable versions of posts

Modified: plugins/trunk/secret/pluginsecret.class.php
===================================================================
--- plugins/trunk/secret/pluginsecret.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/secret/pluginsecret.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -2,10 +2,6 @@
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/secret/class/security/secretitemfilter.class.php" );
-	include_once( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
-	include_once( PLOG_CLASS_PATH."class/dao/customfields/customfield.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/secret/class/action/adminsecretpluginsettingsaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/secret/class/action/adminsecretpluginupdatesettingsaction.class.php" );	
 	
 	/**
 	 * implements secret posts and categories

Modified: plugins/trunk/secret/templates/pluginsettings.template
===================================================================
--- plugins/trunk/secret/templates/pluginsettings.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/secret/templates/pluginsettings.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=pluginSecretSettings title=$locale->tr("pluginSecretSettings")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=pluginSecretSettings title=$locale->tr("pluginSecretSettings")}
 <p>
  This plugin will allow to set certain posts to "secret", and a password will be required to
  view those. The plugin uses the "custom fields" feature to add two new custom fields to your blog,
@@ -12,5 +12,5 @@
  <input type="hidden" name="op" value="pluginSecretUpdateSettings" />
  <input type="submit" name="{$locale->tr("update")}" value="{$locale->tr("update")}" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/smileys/pluginsmileys.class.php
===================================================================
--- plugins/trunk/smileys/pluginsmileys.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/smileys/pluginsmileys.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,8 +1,6 @@
 <?php
 
     include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );	
-	include_once( PLOG_CLASS_PATH."plugins/smileys/class/action/pluginsmileysupdateconfigaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/smileys/class/action/pluginsmileysconfigaction.class.php" );
 	include_once( PLOG_CLASS_PATH."plugins/smileys/class/smileys/smileys.class.php" );
 	
 	include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );

Modified: plugins/trunk/smileys/templates/smileys.template
===================================================================
--- plugins/trunk/smileys/templates/smileys.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/smileys/templates/smileys.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=Smileys title=$locale->tr("Smileys")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=Smileys title=$locale->tr("Smileys")}
 <form name="smileysPluginConfig" method="post">
   
  <p>{$locale->tr("smileys_select_one")}</p>
@@ -20,5 +20,5 @@
  <input type="hidden" name="op" value="updateSmileysConfig" />
  <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/submissions/pluginsubmissions.class.php
===================================================================
--- plugins/trunk/submissions/pluginsubmissions.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/submissions/pluginsubmissions.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,11 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/submissions/class/action/showsubmissionformaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/submissions/class/action/addsubmissionaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/submissions/class/action/adminsubmissionspluginsettingsaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/submissions/class/action/adminsubmissionspluginupdatesettingsaction.class.php" );
-	include_once( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
 	
 	define( "POST_STATUS_EXTERNAL_SUBMISSION", 200 );
 	

Modified: plugins/trunk/submissions/templates/pluginsettings.template
===================================================================
--- plugins/trunk/submissions/templates/pluginsettings.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/submissions/templates/pluginsettings.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=submissionsPluginSettings title=$locale->tr("submissionsPluginSettings")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=submissionsPluginSettings title=$locale->tr("submissionsPluginSettings")}
 <p>
 This plugin will allow you to allow visitors to send articles for publishing. It works by creating
 two additional custom fields that will be used to store the email address of the sender and the 
@@ -12,5 +12,5 @@
  <input type="hidden" name="op" value="pluginSubmissionsUpdateSettings" />
  <input type="submit" name="{$locale->tr("update")}" value="{$locale->tr("update")}" />
 </form>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/templateeditor/plugintemplateeditor.class.php
===================================================================
--- plugins/trunk/templateeditor/plugintemplateeditor.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/templateeditor/plugintemplateeditor.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,8 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/templateeditor/class/action/admintemplateeditoraction.class.php" );
 	
 	/**
 	 * on-line template editor

Modified: plugins/trunk/templateeditor/templates/main.template
===================================================================
--- plugins/trunk/templateeditor/templates/main.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/templateeditor/templates/main.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,8 +1,8 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=templateEditor title=$locale->tr("templateEditor")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=templateEditor title=$locale->tr("templateEditor")}
 <p>
  This is the main page! Here users will see a list of the templates currently installed,
  and what can be done with them...
 </p>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

Modified: plugins/trunk/textparser/class/action/adminplugintextparsersettingsaction.class.php
===================================================================
--- plugins/trunk/textparser/class/action/adminplugintextparsersettingsaction.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/textparser/class/action/adminplugintextparsersettingsaction.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,6 +1,7 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+	include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
 	
 	/**
 	 * shows a form with the current configuration

Modified: plugins/trunk/textparser/class/action/adminplugintextparserupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/textparser/class/action/adminplugintextparserupdatesettingsaction.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/textparser/class/action/adminplugintextparserupdatesettingsaction.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,6 +1,7 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+	include_once( PLOG_CLASS_PATH."class/view/admin/adminmessageview.class.php" );
 
 	/**
 	 * updates the plugin configuration

Modified: plugins/trunk/textparser/plugintextparser.class.php
===================================================================
--- plugins/trunk/textparser/plugintextparser.class.php	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/textparser/plugintextparser.class.php	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,8 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/textparser/class/action/adminplugintextparsersettingsaction.class.php" );
-	include_once( PLOG_CLASS_PATH."plugins/textparser/class/action/adminplugintextparserupdatesettingsaction.class.php" );	
 	
 	define( "PLUGIN_TEXTPARSER_FILTER_WIKI", 1 );
 	define( "PLUGIN_TEXTPARSER_FILTER_TEXTILE", 2 );

Modified: plugins/trunk/textparser/templates/settings.template
===================================================================
--- plugins/trunk/textparser/templates/settings.template	2004-12-13 23:43:26 UTC (rev 486)
+++ plugins/trunk/textparser/templates/settings.template	2004-12-13 23:44:34 UTC (rev 487)
@@ -1,5 +1,5 @@
-{include file="$admintemplatepath/_header.template"}
-{include file="$admintemplatepath/_navigation.template" showOpt=Textparser title=$locale->tr("Textparser")}
+{include file="$admintemplatepath/header.template"}
+{include file="$admintemplatepath/navigation.template" showOpt=Textparser title=$locale->tr("Textparser")}
 <p>
  <form name="settings" method="post">
   <input type="checkbox" name="pluginEnabled" value="1" {if $pluginEnabled}checked="checked"{/if}/>
@@ -16,5 +16,5 @@
   <input type="submit" name="update" value="{$locale->tr("update_settings")}" />
  </form>
 </p>
-{include file="$admintemplatepath/_footernavigation.template"}
-{include file="$admintemplatepath/_footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footernavigation.template"}
+{include file="$admintemplatepath/footer.template"}
\ No newline at end of file

More information about the pLog-svn mailing list