[pLog-svn] r1763 - in plog/branches/plog-1.1-ben/class: action dao view

[ork at devel.plogworld.net]

Author: ork
Date: 2005-04-05 22:20:35 +0000 (Tue, 05 Apr 2005)
New Revision: 1763

Modified:
   plog/branches/plog-1.1-ben/class/action/addcommentaction.class.php
   plog/branches/plog-1.1-ben/class/dao/articlecomments.class.php
   plog/branches/plog-1.1-ben/class/view/defaultview.class.php
   plog/branches/plog-1.1-ben/class/view/view.class.php
Log:
more includes reorganized..


Modified: plog/branches/plog-1.1-ben/class/action/addcommentaction.class.php
===================================================================
--- plog/branches/plog-1.1-ben/class/action/addcommentaction.class.php	2005-04-05 22:07:20 UTC (rev 1762)
+++ plog/branches/plog-1.1-ben/class/action/addcommentaction.class.php	2005-04-05 22:20:35 UTC (rev 1763)
@@ -8,7 +8,6 @@
     include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
     include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
     include_once( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
-    include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
     include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
     include_once( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
 	include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
@@ -62,6 +61,8 @@
 
         function _fetchFields()
         {
+            include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
             $this->_articleId = $this->_request->getValue( "articleId" );
             $this->_blogId    = $this->_request->getValue( "blogId" );
             $this->_opId      = $this->_request->getValue( "op" );

Modified: plog/branches/plog-1.1-ben/class/dao/articlecomments.class.php
===================================================================
--- plog/branches/plog-1.1-ben/class/dao/articlecomments.class.php	2005-04-05 22:07:20 UTC (rev 1762)
+++ plog/branches/plog-1.1-ben/class/dao/articlecomments.class.php	2005-04-05 22:20:35 UTC (rev 1763)
@@ -50,6 +50,7 @@
 					   Db::qstr($filter->normalizeText($comment->getTopic()))."');";
 
             $result = $this->Execute( $query );
+
 			
 			if( !$result )
 				return false;

Modified: plog/branches/plog-1.1-ben/class/view/defaultview.class.php
===================================================================
--- plog/branches/plog-1.1-ben/class/view/defaultview.class.php	2005-04-05 22:07:20 UTC (rev 1762)
+++ plog/branches/plog-1.1-ben/class/view/defaultview.class.php	2005-04-05 22:20:35 UTC (rev 1763)
@@ -1,7 +1,6 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/view/blogview.class.php" );
-    include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
 
 	define( "MAIN_TEMPLATE", "main" );
 
@@ -36,6 +35,7 @@
         	$posts = $this->_params->getValue( 'posts' );
             $locale = $this->_blogInfo->getLocale();
 
+            //include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
             //$textFilter = new TextFilter();
             $modifPosts = Array();
             $rg = $this->_blogInfo->getBlogRequestGenerator();

Modified: plog/branches/plog-1.1-ben/class/view/view.class.php
===================================================================
--- plog/branches/plog-1.1-ben/class/view/view.class.php	2005-04-05 22:07:20 UTC (rev 1762)
+++ plog/branches/plog-1.1-ben/class/view/view.class.php	2005-04-05 22:20:35 UTC (rev 1763)
@@ -17,8 +17,6 @@
 
 	include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
     include_once( PLOG_CLASS_PATH."class/config/properties.class.php" );
-	include_once( PLOG_CLASS_PATH."class/net/http/phpsniff/phpSniff.class.php" );
-    include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php");    	
 	
 	/**
 	 * constants that can be used for content types
@@ -280,6 +278,7 @@
 		 */
 		function getCurrentPageFromRequest()
 		{
+            include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php");    	
 			// get the value from the request
 			$page = HttpVars::getRequestValue( VIEW_DEFAULT_PAGE_PARAMETER );
 			// but first of all, validate it
@@ -301,6 +300,8 @@
          */
         function render()
         {
+	        include_once( PLOG_CLASS_PATH."class/net/http/phpsniff/phpSniff.class.php" );
+
             // send the headers we've been assigned if any, alognside the conten-type header
             foreach( $this->_headers as $header )
             header( $header );