[pLog-svn] r2936 - in plog/trunk/class: cache config dao/userdata gallery/dao locale

[mark at devel.lifetype.net]

Author: mark
Date: 2006-02-09 18:21:52 +0000 (Thu, 09 Feb 2006)
New Revision: 2936

Modified:
   plog/trunk/class/cache/cachemanager.class.php
   plog/trunk/class/config/configdbstorage.class.php
   plog/trunk/class/dao/userdata/baseuserdataprovider.class.php
   plog/trunk/class/gallery/dao/galleryalbums.class.php
   plog/trunk/class/locale/locales.class.php
Log:
Move all Cache ID definition to its own class file, just follow the same ruls as other DAO class files.

Modified: plog/trunk/class/cache/cachemanager.class.php
===================================================================
--- plog/trunk/class/cache/cachemanager.class.php	2006-02-09 18:14:55 UTC (rev 2935)
+++ plog/trunk/class/cache/cachemanager.class.php	2006-02-09 18:21:52 UTC (rev 2936)
@@ -1,15 +1,6 @@
 <?php
 
     require_once( PLOG_CLASS_PATH . "class/object/object.class.php" );
-
-
-    define( "CACHE_GLOBAL",            "pLog" );
-    define( "CACHE_LOCALES",           "locales" );
-    define( "CACHE_GALLERYALBUM",      "album" );
-    define( "CACHE_USERALBUMS",        "useralbums" );
-    define( "CACHE_USERINFO",          "userinfo" );
-    define( "CACHE_USERIDBYNAME",      "userinfo_idbyname" );
-    define( "CACHE_CONFIGDBSTORAGE",   "config_db_storage" );
     
     // :TODO: implement a cache-lifetime per cache-category, so e.g. blogInfo or
     //        locales have a lifetime of several days, whereas articles, comments,

Modified: plog/trunk/class/config/configdbstorage.class.php
===================================================================
--- plog/trunk/class/config/configdbstorage.class.php	2006-02-09 18:14:55 UTC (rev 2935)
+++ plog/trunk/class/config/configdbstorage.class.php	2006-02-09 18:21:52 UTC (rev 2936)
@@ -4,7 +4,9 @@
     include_once( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
 	include_once( PLOG_CLASS_PATH."class/cache/cachemanager.class.php" );
 
-
+    define( "CACHE_GLOBAL", "pLog" );
+    define( "CACHE_CONFIGDBSTORAGE", "config_db_storage" );
+    
     /**
 	 * \ingroup Config
 	 *

Modified: plog/trunk/class/dao/userdata/baseuserdataprovider.class.php
===================================================================
--- plog/trunk/class/dao/userdata/baseuserdataprovider.class.php	2006-02-09 18:14:55 UTC (rev 2935)
+++ plog/trunk/class/dao/userdata/baseuserdataprovider.class.php	2006-02-09 18:21:52 UTC (rev 2936)
@@ -2,7 +2,10 @@
 
 	include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
 	include_once( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
-    include_once( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );	
+    include_once( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );
+    
+    define( "CACHE_USERINFO", "userinfo" );
+    define( "CACHE_USERIDBYNAME", "userinfo_idbyname" );
 
 	/**
 	 * This is the base class that defines the methods that all user-data providers must implement.

Modified: plog/trunk/class/gallery/dao/galleryalbums.class.php
===================================================================
--- plog/trunk/class/gallery/dao/galleryalbums.class.php	2006-02-09 18:14:55 UTC (rev 2935)
+++ plog/trunk/class/gallery/dao/galleryalbums.class.php	2006-02-09 18:21:52 UTC (rev 2936)
@@ -5,7 +5,8 @@
     include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );    
     
     define( "CACHE_USERALBUMS_NESTED", "useralbums_nested" );
-	define( "CACHE_USERALBUMS", "useralbums" );    
+	define( "CACHE_USERALBUMS", "useralbums" );
+	define( "CACHE_GALLERYALBUM", "album" );
 
     /**
 	 * \ingroup Gallery

Modified: plog/trunk/class/locale/locales.class.php
===================================================================
--- plog/trunk/class/locale/locales.class.php	2006-02-09 18:14:55 UTC (rev 2935)
+++ plog/trunk/class/locale/locales.class.php	2006-02-09 18:21:52 UTC (rev 2936)
@@ -6,8 +6,8 @@
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
 
     define("DEFAULT_LOCALE", "en_UK");
-    
     define( "REGEXP_VALID_LOCALE", "/.*locale_([a-z]{2}_[A-Z]{2}_?([a-zA-Z0-9\-]*)+)\.php$/" );
+    define( "CACHE_LOCALES", "locales" );
 
 	/**
 	 * \ingroup Locale