[pLog-svn] r3435 - in plog/trunk/class/summary: action dao

[mark at devel.lifetype.net]

Author: mark
Date: 2006-05-18 16:30:01 +0000 (Thu, 18 May 2006)
New Revision: 3435

Added:
   plog/trunk/class/summary/dao/summarystatsconstants.class.php
Modified:
   plog/trunk/class/summary/action/summarydefaultaction.class.php
   plog/trunk/class/summary/dao/summarystats.class.php
Log:
I just separate the summary stats constants to another file summarystatsconstants.class.php and it will be easy for us to include it in another file instead of include the whole summarystats.class.php.

Also fix some error notices.


Modified: plog/trunk/class/summary/action/summarydefaultaction.class.php
===================================================================
--- plog/trunk/class/summary/action/summarydefaultaction.class.php	2006-05-18 15:53:18 UTC (rev 3434)
+++ plog/trunk/class/summary/action/summarydefaultaction.class.php	2006-05-18 16:30:01 UTC (rev 3435)
@@ -1,7 +1,8 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
-    include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );  
+    include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+    include_once( PLOG_CLASS_PATH."class/summary/dao/summarystatsconstants.class.php" );  
 
      /**
       * This is the one and only default action. It simply fetches all the most recent
@@ -65,12 +66,14 @@
             	$step = $min + 1;  
 			
 			if( $globalArticleCategoryId != ALL_GLOBAL_ARTICLE_CATEGORIES )
+			{
 				$currentGlobalArticleCategory = $categories->getGlobalArticleCategory( $globalArticleCategoryId );
-
+				$this->_view->setValue( "currentGlobalArticleCategory", $currentGlobalArticleCategory);
+			}
+			
 			// export the value for global article categories
 			$this->_view->setValue( "summaryStats", $stats );
 			$this->_view->setValue( "globalArticleCategories", $globalArticleCategories );
-			$this->_view->setValue( "currentGlobalArticleCategory", $currentGlobalArticleCategory); 
 			$this->_view->setValue( "min", $min );
 			$this->_view->setValue( "step", $step );
 		

Modified: plog/trunk/class/summary/dao/summarystats.class.php
===================================================================
--- plog/trunk/class/summary/dao/summarystats.class.php	2006-05-18 15:53:18 UTC (rev 3434)
+++ plog/trunk/class/summary/dao/summarystats.class.php	2006-05-18 16:30:01 UTC (rev 3435)
@@ -5,15 +5,8 @@
     include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
     include_once( PLOG_CLASS_PATH."class/dao/articlecommentstatus.class.php" );
     include_once( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
+    include_once( PLOG_CLASS_PATH."class/summary/dao/summarystatsconstants.class.php" ); 
 	
-	/**
-	 * maximum number of items that will be shown per page in the summary
-	 */
-	define( "SUMMARY_DEFAULT_ITEMS_PER_PAGE", 25 );
-	define( "SUMMARY_DEFAULT_PAGE_SHOW_MAX", 15 );
-	
-	define( "ALL_GLOBAL_ARTICLE_CATEGORIES", 0 );
-
     /**
      * This class implements a few methods that can be used to obtain the list of most recent blogs, posts, commets,
      * most commented articles, etc. It is mainly used by the summary.php script but it can also be used by users

Added: plog/trunk/class/summary/dao/summarystatsconstants.class.php
===================================================================
--- plog/trunk/class/summary/dao/summarystatsconstants.class.php	2006-05-18 15:53:18 UTC (rev 3434)
+++ plog/trunk/class/summary/dao/summarystatsconstants.class.php	2006-05-18 16:30:01 UTC (rev 3435)
@@ -0,0 +1,8 @@
+<?php
+	/**
+	 * maximum number of items that will be shown per page in the summary
+	 */
+	define( "SUMMARY_DEFAULT_ITEMS_PER_PAGE", 25 );
+	define( "SUMMARY_DEFAULT_PAGE_SHOW_MAX", 15 );
+	define( "ALL_GLOBAL_ARTICLE_CATEGORIES", 0 );
+?>
\ No newline at end of file