[Phpslash-commit] CVS: phpslash-dev/public_html config-dist.php,1.36,1.37

[Luis M <le...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3640

Modified Files:
	config-dist.php 
Log Message:
renamed jpcachedir variable (key) to jpcache.classdir to avoid ambiguity with jpcache.cachedir and jpcache.fileprefix ... which are now customizable from config.ini.php by psl site admins.
the ability to change the jpcache.classdir value has been postpone because psl depends on the files of the jpcache classdir to be structured in a certain way and they are heavily customized from upstream sources to suit psl needs. jpcache ships with psl anyway, so no need to change/customize this. it can be easily added in the future by simply editing config.php at what is now line 316


Index: config-dist.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** config-dist.php	6 Nov 2004 22:18:41 -0000	1.36
--- config-dist.php	17 Nov 2004 17:29:35 -0000	1.37
***************
*** 1,4 ****
  <?php
! 
  /*
   * config.php - Configuration File for PHPSlash 
--- 1,4 ----
  <?php
! // vi: sts=3:ts=3 :
  /*
   * config.php - Configuration File for PHPSlash 
***************
*** 314,324 ****
  
     /* Full path to jpcache class dir */
!    if(empty($_PSL['jpcachedir'])) {
!       $_PSL['jpcachedir'] = $_PSL['classdir'] . "/jpcache";
!    }
  
! /**
!  * General jpcache configuration options. 
!  */
     $JPCACHE_TIME         =   900; // Default number of seconds to cache a page
     $JPCACHE_DEBUG        =   0;   // Turn debugging on/off
--- 314,325 ----
  
     /* Full path to jpcache class dir */
!    // FIXME is there a need for users to customize this ever? commented out for now
!    //if(empty($_PSL['jpcache.classdir'])) {
!    $_PSL['jpcache.classdir'] = $_PSL['classdir'] . "/jpcache";
!    //}
  
!    /**
!    * General jpcache configuration options. 
!    */
     $JPCACHE_TIME         =   900; // Default number of seconds to cache a page
     $JPCACHE_DEBUG        =   0;   // Turn debugging on/off
***************
*** 338,342 ****
                                     // generated files. Please use a dedicated
                                     // directory, and make it writable
!    $JPCACHE_FILEPREFIX   = "jpc";// Prefix used in the filename. This enables
                                     // us to (more accuratly) recognize jpcache-
                                     // files.
--- 339,343 ----
                                     // generated files. Please use a dedicated
                                     // directory, and make it writable
!    $JPCACHE_FILEPREFIX   = $_PSL['jpcache.fileprefix'];// Prefix used in the filename. This enables
                                     // us to (more accuratly) recognize jpcache-
                                     // files.
***************
*** 344,351 ****
  
  // Standard jpcache functions
!    // require $_PSL['jpcachedir']. "/jpcache-main.php";
!    addLibraryRequirement("jpcache",$_PSL['jpcachedir'] . "/jpcache-main.php");
     
!    // require $_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php";
  
     // end of jpcache configuration
--- 345,352 ----
  
  // Standard jpcache functions
!    // require $_PSL['jpcache.classdir']. "/jpcache-main.php";
!    addLibraryRequirement("jpcache",$_PSL['jpcache.classdir'] . "/jpcache-main.php");
     
!    // require $_PSL['jpcache.classdir'] ."/type/$JPCACHE_TYPE.php";
  
     // end of jpcache configuration
***************
*** 412,417 ****
     // PHPLIB Type specific jpcache implementations
     addClassRequirement("jpcacheDB","db_sql");
!    addClassRequirement("jpcacheDB",$_PSL['jpcachedir'] ."/type/phplib.php");
!    addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php");
     loadLibrary("jpcache");
     if (!array_key_exists('slashSess', $HTTP_COOKIE_VARS))  {
--- 413,418 ----
     // PHPLIB Type specific jpcache implementations
     addClassRequirement("jpcacheDB","db_sql");
!    addClassRequirement("jpcacheDB",$_PSL['jpcache.classdir'] ."/type/phplib.php");
!    addLibraryRequirement("jpcache",$_PSL['jpcache.classdir'] ."/type/$JPCACHE_TYPE.php");
     loadLibrary("jpcache");
     if (!array_key_exists('slashSess', $HTTP_COOKIE_VARS))  {
***************
*** 422,428 ****
     $JPCACHE_TYPE = "file";
     $JPCACHE_DIR  = $_PSL['jpcache.cachedir'];  
!    $JPCACHE_FILEPREFIX   = ""; 
     
!    addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php");
     loadLibrary("jpcache");
     
--- 423,429 ----
     $JPCACHE_TYPE = "file";
     $JPCACHE_DIR  = $_PSL['jpcache.cachedir'];  
!    $JPCACHE_FILEPREFIX   = $_PSL['jpcache.fileprefix']; 
     
!    addLibraryRequirement("jpcache",$_PSL['jpcache.classdir'] ."/type/$JPCACHE_TYPE.php");
     loadLibrary("jpcache");
     
***************
*** 455,459 ****
                                     // files.
  
!     addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php");
     loadLibrary("jpcache");
     
--- 456,460 ----
                                     // files.
  
!     addLibraryRequirement("jpcache",$_PSL['jpcache.classdir'] ."/type/$JPCACHE_TYPE.php");
     loadLibrary("jpcache");
     
***************
*** 471,475 ****
     $JPCACHE_MEMCACHE_HOST = "localhost"; // Memcache Server
     $JPCACHE_MEMCACHE_PORT = "11211";     // Port 
!    addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php");
     loadLibrary("jpcache"); // TODO this could be called from != off block
     if (!array_key_exists('slashSess', $HTTP_COOKIE_VARS))  {
--- 472,476 ----
     $JPCACHE_MEMCACHE_HOST = "localhost"; // Memcache Server
     $JPCACHE_MEMCACHE_PORT = "11211";     // Port 
!    addLibraryRequirement("jpcache",$_PSL['jpcache.classdir'] ."/type/$JPCACHE_TYPE.php");
     loadLibrary("jpcache"); // TODO this could be called from != off block
     if (!array_key_exists('slashSess', $HTTP_COOKIE_VARS))  {