[pLog-svn] r3317 - in plog/trunk/class: config dao gallery/dao locale

[mark at devel.lifetype.net]

Author: mark
Date: 2006-05-02 04:13:38 +0000 (Tue, 02 May 2006)
New Revision: 3317

Modified:
   plog/trunk/class/config/configdbstorage.class.php
   plog/trunk/class/dao/daocacheconstants.properties.php
   plog/trunk/class/gallery/dao/galleryalbums.class.php
   plog/trunk/class/gallery/dao/galleryresources.class.php
   plog/trunk/class/locale/locales.class.php
Log:
More changes, move the cache constand to daocacheconstants.properties.php

Modified: plog/trunk/class/config/configdbstorage.class.php
===================================================================
--- plog/trunk/class/config/configdbstorage.class.php	2006-05-02 00:50:46 UTC (rev 3316)
+++ plog/trunk/class/config/configdbstorage.class.php	2006-05-02 04:13:38 UTC (rev 3317)
@@ -3,10 +3,8 @@
     
     include_once( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
 	include_once( PLOG_CLASS_PATH."class/cache/cachemanager.class.php" );
+	include_once( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
 
-    define( "CACHE_GLOBAL", "pLog" );
-    define( "CACHE_CONFIGDBSTORAGE", "config_db_storage" );
-    
     /**
 	 * \ingroup Config
 	 *

Modified: plog/trunk/class/dao/daocacheconstants.properties.php
===================================================================
--- plog/trunk/class/dao/daocacheconstants.properties.php	2006-05-02 00:50:46 UTC (rev 3316)
+++ plog/trunk/class/dao/daocacheconstants.properties.php	2006-05-02 04:13:38 UTC (rev 3317)
@@ -1,4 +1,9 @@
 <?php
+	/**
+	 * article categories
+	 */
+    define( "CACHE_GLOBAL", "pLog" );
+    define( "CACHE_CONFIGDBSTORAGE", "config_db_storage" );
 
 	/**
 	 * article categories
@@ -71,6 +76,21 @@
 	define( "CACHE_MYLINKCATEGORIES", "mylinks_categories" );
 
 	/**
+	 * gallery albums
+	 */
+    define( "CACHE_USERALBUMS_NESTED", "useralbums_nested" );
+	define( "CACHE_USERALBUMS", "useralbums" );
+	define( "CACHE_GALLERYALBUM", "album" );
+	define( "CACHE_GALLERYALBUMBYNAME", "album_byname" );
+
+	/**
+	 * gallery resources
+	 */	
+	define( "CACHE_RESOURCES", "galleryresources" );
+	define( "CACHE_RESOURCES_BY_NAME", "galleryresources_name" );	
+	define( "CACHE_RESOURCES_USER", "galleryresources_user" );	
+
+	/**
 	 * users
 	 */
     define( "CACHE_USERINFO", "userinfo" );
@@ -79,5 +99,10 @@
 	/**
 	 * user permissions
 	 */
-	define( "CACHE_USER_PERMISSIONS", "user_permissions" );	 
+	define( "CACHE_USER_PERMISSIONS", "user_permissions" );
+	
+	/**
+	 * locales
+	 */	
+    define( "CACHE_LOCALES", "locales" );
 ?>
\ No newline at end of file

Modified: plog/trunk/class/gallery/dao/galleryalbums.class.php
===================================================================
--- plog/trunk/class/gallery/dao/galleryalbums.class.php	2006-05-02 00:50:46 UTC (rev 3316)
+++ plog/trunk/class/gallery/dao/galleryalbums.class.php	2006-05-02 04:13:38 UTC (rev 3317)
@@ -2,16 +2,9 @@
 
 	include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
     include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbum.class.php" );
-    include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );    
+    include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
+	include_once( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
     
-	//
-	// cache constants
-	//
-    define( "CACHE_USERALBUMS_NESTED", "useralbums_nested" );
-	define( "CACHE_USERALBUMS", "useralbums" );
-	define( "CACHE_GALLERYALBUM", "album" );
-	define( "CACHE_GALLERYALBUMBYNAME", "album_byname" );
-
     /**
 	 * \ingroup Gallery
 	 *

Modified: plog/trunk/class/gallery/dao/galleryresources.class.php
===================================================================
--- plog/trunk/class/gallery/dao/galleryresources.class.php	2006-05-02 00:50:46 UTC (rev 3316)
+++ plog/trunk/class/gallery/dao/galleryresources.class.php	2006-05-02 04:13:38 UTC (rev 3317)
@@ -15,10 +15,7 @@
 	include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
     include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
     include_once( PLOG_CLASS_PATH."class/gallery/galleryconstants.php" );
-	
-	define( "CACHE_RESOURCES", "galleryresources" );
-	define( "CACHE_RESOURCES_BY_NAME", "galleryresources_name" );	
-	define( "CACHE_RESOURCES_USER", "galleryresources_user" );	
+	include_once( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
 
     /**
 	 * \ingroup Gallery

Modified: plog/trunk/class/locale/locales.class.php
===================================================================
--- plog/trunk/class/locale/locales.class.php	2006-05-02 00:50:46 UTC (rev 3316)
+++ plog/trunk/class/locale/locales.class.php	2006-05-02 04:13:38 UTC (rev 3317)
@@ -4,10 +4,10 @@
 	include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
 	include_once( PLOG_CLASS_PATH."class/locale/locale.class.php" );
 	include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
+	include_once( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.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