[Phpslash-commit] CVS: phpslash-ft/public_html config-dist.php3,1.20,1.21

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv5169/phpslash-ft/public_html

Modified Files:
	config-dist.php3 
Log Message:
attempt to sync config-dist.php3 with config.php3

Index: config-dist.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** config-dist.php3	3 Dec 2002 20:27:35 -0000	1.20
--- config-dist.php3	13 Dec 2002 21:59:59 -0000	1.21
***************
*** 9,13 ****

  // Specify full path to ini file
! $psl_inifile = "/var/www/sandbox/config.ini.php3";

  // end of required configuration.  config.ini.php3 contains the phpSlash 
--- 9,13 ----

  // Specify full path to ini file
! $psl_inifile = "config.ini.php3";

  // end of required configuration.  config.ini.php3 contains the phpSlash 
***************
*** 87,92 ****
  // 1.1 Uncomment this only if you can't use a local php.ini or .htaccess 

! if( !empty($_PSL['prependfile'])) {
!    require($_PSL['prependfile']); 
  }
  // 1.11) Global Variables.  (Don't add trailing slashes)
--- 87,94 ----
  // 1.1 Uncomment this only if you can't use a local php.ini or .htaccess 

! if( !empty($_PSL['phplibdir'])) {
!    $_PHPLIB['libdir'] = $_PSL['phplibdir']; 
! } else {
!    $_PHPLIB['libdir'] = '/var/www/phplib/phplib-0.74.20021016/php/';
  }
  // 1.11) Global Variables.  (Don't add trailing slashes)
***************
*** 129,132 ****
--- 131,223 ----
  }

+ // 1.3) PHPSlash functions library
+ require_once($_PSL['classdir'] . '/functions.inc');
+ require_once($_PSL['classdir'] . '/lib.resources.php');
+ 
+ /* now that the functions are in, we can define the arg_separator */
+ 
+ $_PSL['amp'] = arg_separator("1");
+  
+ // 1.99) Add any other require()'s or include()'s you need here and they
+ //       should  be prepended to all phpSlash pages
+ 
+ // comment to enable setting lang in url
+ $lang = false;                         
+ 
+ $_PSL['languagefile'] = $_PSL['localedir'] . "/" . $_PSL['language'] . ".php3";
+ 
+ // comment to disable auto lang detection
+ $_PSL['languagefile'] = setLang($lang);  
+ 
+ // comment to disable auto tpl lang detection
+ $_PSL['templatedir'] = setLangTpl($lang);  
+ 
+ // comment out this block to disable setting theme in url
+ if (!empty($HTTP_GET_VARS['skin'])) {
+   $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], "cookie");  
+ } else {
+   $_PSL['templatedir'] = setSkinTpl("", "cookie");  
+ }
+ 
+ 
+ /** 
+  * Class information.  Add any class replacements like this:
+  *
+  * AddClassReplacement("template","myTemplate");
+  *
+  * This will make PHPSlash use your class instead of its defaults.
+  *
+  * First we load the PHPLIB basic classes.  This next block of code does
+  * the work of $_PHPLIB['libdir'] . 'prepend.php3', so make sure that
+  * file's not processed automatically.
+  **/
+ foreach(array("db_mysql","ct_sql","session","auth","perm","template")
+ 	as $class) {
+    addClassRequirement($class,$_PHPLIB['libdir'] ."$class.inc");
+    addLibraryRequirement("phplib",classURN($class));
+ }
+ addLibraryRequirement("phplib",$_PHPLIB['libdir'] . "page.inc");
+ loadLibrary("phplib");
+ 
+ /**
+  * These classes are PHPSlash's extensions to the PHPLIB base classes.
+  * We only configure the ones which are required to get the page open
+  * and restore session data.
+  * 
+  * Note: author IS needed now because slashAuth uses it to fill in perms 
+  **/
+ addClassRequirement("slash_sql","ct_sql");
+ addClassRequirement("slash_sql",$_PSL['classdir'] . "/slash_sql.class");
+ addClassRequirement("slashDB","db_mysql");
+ addClassRequirement("slashDB",$_PSL['classdir'] . "/slashDB.class");
+ addClassRequirement("slashSess","session");
+ addClassRequirement("slashSess",$_PSL['classdir'] . "/slashSess.class");
+ addClassRequirement("slashAuth",$_PSL['classdir'] . "/slashAuthCR.class");
+ addClassRequirement("slashPerm","perm");
+ addClassRequirement("slashPerm",$_PSL['classdir'] . "/slashPerm.class");
+ addClassRequirement("author",$_PSL['classdir'] . "/Author.class");
+ addLibraryRequirement("phpslash",$_PSL['classdir'] . "/functions.inc");
+ 
+ /**
+  * Register like above any classes instantiations of which you intend to
+  * use for session variables.
+  *
+  * For example, say you want to sessionize the time zone:
+  **/ 
+ //AddClassRequirement("tz",$_PSL['classdir'] . "/tz.class");
+ //AddLibraryRequirement("tz",$_PSL['classdir'] . "/tz_functions.inc");
+ //AddClassRequirement("tz_env","tz");
+ //AddClassRequirement("tz_env",$_PSL['classdir'] . "/tz_env.class");
+ //AddClassRequirement("tz_nonnative","tz");
+ //AddClassRequirement("tz_nonnative",$_PSL['classdir'] . "/tz_nonnative.class");
+ //AddClassRequirement("tz_posix","tz_nonnative");
+ //AddClassRequirement("tz_posix",$_PSL['classdir'] . "/tz_posix.class");
+ //AddClassRequirement("tz_file","tz_nonnative");
+ //AddClassRequirement("tz_file",$_PSL['classdir'] . "/tz_file.class");
+ /**
+  * this necessity will change when the entire resource hash becomes 
+  * sessionized.
+  */
+ 
  // begin built-in jpcache
  if(empty($GLOBALS['JPCACHE_TYPE'])) {
***************
*** 148,152 ****
     $JPCACHE_DEBUG        =   0;   // Turn debugging on/off
     $JPCACHE_IGNORE_DOMAIN=   1;   // Ignore domain name in request(single site)
!    $JPCACHE_ON           =   1;   // Turn caching on/off
     $JPCACHE_USE_GZIP     =   0;   // Whether or not to use GZIP
     $JPCACHE_POST         =   1;   // Should POST's be cached
--- 239,243 ----
     $JPCACHE_DEBUG        =   0;   // Turn debugging on/off
     $JPCACHE_IGNORE_DOMAIN=   1;   // Ignore domain name in request(single site)
!    $JPCACHE_ON           =   0;   // Turn caching on/off
     $JPCACHE_USE_GZIP     =   0;   // Whether or not to use GZIP
     $JPCACHE_POST         =   1;   // Should POST's be cached
***************
*** 179,186 ****

     // Standard jpcache functions
!    require $_PSL['jpcachedir']. "/jpcache-main.php";
!        
     // Type specific jpcache implementations
!    require $_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php";

     // end of jpcache configuration
--- 270,283 ----

     // Standard jpcache functions
!    // require $_PSL['jpcachedir']. "/jpcache-main.php";
!    addLibraryRequirement("jpcache",$_PSL['jpcachedir'] . "/jpcache-main.php");
     // Type specific jpcache implementations
!    if ('phplib' == $JPCACHE_TYPE) {
!       addClassRequirement("jpcacheDB","db_mysql");
!       addClassRequirement("jpcacheDB",$_PSL['jpcachedir'] ."/type/phplib.php");
!    }
!    addLibraryRequirement("jpcache",$_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php");
!    loadLibrary("jpcache");
!    // require $_PSL['jpcachedir'] ."/type/$JPCACHE_TYPE.php";

     // end of jpcache configuration
***************
*** 244,252 ****
  //       is something you've already dealt with in prepend.php3 

- require($_PHPLIB['libdir'] . 'template.inc');
- 
- // 1.3) PHPSlash functions library
- require($_PSL['classdir'] . '/functions.inc');

  $ary = array();
  if(!empty($HTTP_GET_VARS)) {
--- 341,349 ----
  //       is something you've already dealt with in prepend.php3 

+ /**
+  * $ary is used by story::getStory and block_i::getBlocks
+  * this block just merges in the default section
+  */
  $ary = array();
  if(!empty($HTTP_GET_VARS)) {
***************
*** 262,316 ****
  }

- /* now that the functions are in, we can define the arg_separator */
- 
  $_PSL['amp'] = arg_separator("1");
-  
- // 1.99) Add any other require()'s or include()'s you need here and they
- //       should  be prepended to all phpSlash pages
- 
- // comment to enable setting lang in url
- $lang = false;                         
- 
- $_PSL['languagefile'] = $_PSL['localedir'] . "/" . $_PSL['language'] . ".php3";
- 
- // comment to disable auto lang detection
- $_PSL['languagefile'] = setLang($lang);  

! // comment to disable auto tpl lang detection
! $_PSL['templatedir'] = setLangTpl($lang);  
! 
! // comment out this block to disable setting theme in url
! if (!empty($HTTP_GET_VARS['skin'])) {
!   $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], "cookie");  
! } else {
!   $_PSL['templatedir'] = setSkinTpl("", "cookie");  
  }

! if ($_PSL['timezone']['engine']) {
!    include($_PSL['classdir'] . '/tz.class');
!    include($_PSL['classdir'] . '/tz_env.class');
!    include($_PSL['classdir'] . '/tz_nonnative.class');
!    include($_PSL['classdir'] . '/tz_posix.class');
!    include($_PSL['classdir'] . '/tz_file.class');
!    include($_PSL['classdir'] . '/tz_functions.inc');
!    // set up the time zone environment array
!    $_TZ = $_PSL['timezone'];
!    $_TZ['templatedir'] = $_PSL['templatedir'];
!    $_TZ['show_format'] = psl_getLocalInfo('LC_TIME','%a %b %e %H:%M:%S %Z %Y');
!    /*   $_TZ['available'] = array("America/New_York",
! 	                          "America/Chicago",
!                                   "America/Denver",
! 				  "America/Los_Angeles",
! 				  "Pacific/Honolulu");
!     */
!     // to enable setting of time zone in URL
!     if(!empty($HTTP_GET_VARS['TZ'])) {
!        set_TZ($HTTP_GET_VARS['TZ'],'cookie');
!     } else {
!        set_TZ('','cookie');
!     }
!     // to disable setting in URL and to set $_PSL['timezone']['name'] as the time zone
!     // set_TZ();
! }

--- 359,444 ----
  }

  $_PSL['amp'] = arg_separator("1");

! /** 
!  * page features, all derived from PHPLIB classes and user-customizable
!  **/
! if (empty($_PSL['page_features'])) {
!    foreach(array("sess"=>"slashSess",
! 		 "auth"=>"slashAuth",
! 		 "perm"=>"slashPerm")
! 	   as $name => $class) {
!       $class = pslGetClass($class);
!       loadClass($class);
!       $_PSL['page_features'][$name] = $class;
!    }
  }

! page_open($_PSL['page_features']);
! /**
!  * Now the session has started.  What is below here will be moving into
!  * its own file to be called once per session.
!  **/
! 
! /**
!  * Rest of the class information
!  **/
! AddClassRequirement("block",$_PSL['classdir'] . "/Block.class");
! AddClassRequirement("block_i","block");
! AddClassRequirement("block_i",$_PSL['classdir'] . "/Block_i.class");
! AddClassRequirement("block_render_i",$_PSL['classdir'] . "/Block_render_i.class");
! AddClassRequirement("block_render_cal","block_render_i");
! AddClassRequirement("block_render_cal",$_PSL['classdir'] . "/Block_render_cal.class");
! AddClassRequirement("block_render_html","block_render_i");
! AddClassRequirement("block_render_html",$_PSL['classdir'] . "/Block_render_html.class");
! AddClassRequirement("block_render_login","block_render_i");
! AddClassRequirement("block_render_login",$_PSL['classdir'] . "/Block_render_login.class");
! AddClassRequirement("block_render_navbar","block_render_i");
! AddClassRequirement("block_render_navbar",$_PSL['classdir'] . "/Block_render_navbar.class");
! AddClassRequirement("block_render_poll","block_render_i");
! AddClassRequirement("block_render_poll",$_PSL['classdir'] . "/Block_render_poll.class");
! AddClassRequirement("block_render_query","block_render_i");
! AddClassRequirement("block_render_query",$_PSL['classdir'] . "/Block_render_query.class");
! AddClassRequirement("block_render_query","block_render_i");
! AddClassRequirement("block_render_quote",$_PSL['classdir'] . "/Block_render_quote.class");
! AddClassRequirement("block_render_section","block_render_i");
! AddClassRequirement("block_render_section",$_PSL['classdir'] . "/Block_render_section.class");
! AddClassRequirement("block_render_skin","block_render_i");
! AddClassRequirement("block_render_skin",$_PSL['classdir'] . "/Block_render_skin.class");
! AddClassRequirement("block_render_submission","block_render_i");
! AddClassRequirement("block_render_submission",$_PSL['classdir'] . "/Block_render_submission.class");
! AddClassRequirement("block_render_topic","block_render_i");
! AddClassRequirement("block_render_topic",$_PSL['classdir'] . "/Block_render_topic.class");
! AddClassRequirement("block_render_url","block_render_i");
! AddClassRequirement("block_render_url",$_PSL['classdir'] . "/Block_render_url.class");
! AddClassRequirement("block_admin","block_i");
! AddClassRequirement("block_admin",$_PSL['classdir'] . "/Block_admin.class");
! AddClassRequirement("comment",$_PSL['classdir'] . "/Comment.class");
! AddClassRequirement("glossary",$_PSL['classdir'] . "/Glossary.class");
! AddClassRequirement("group",$_PSL['classdir'] . "/Group.class");
! AddClassRequirement("infolog",$_PSL['classdir'] . "/Infolog.class");
! AddClassRequirement("mailinglist",$_PSL['classdir'] . "/MailingList.class");
! AddClassRequirement("navbar",$_PSL['classdir'] . "/NavBar.class");
! AddClassRequirement("poll",$_PSL['classdir'] . "/Poll.class");
! AddClassRequirement("section",$_PSL['classdir'] . "/Section.class");
! AddClassRequirement("submission",$_PSL['classdir'] . "/Submission.class");
! AddClassRequirement("story_base",$_PSL['classdir'] . "/Story_base.class");
! AddClassRequirement("story","story_base");
! AddClassRequirement("story",$_PSL['classdir'] . "/Story.class");
! AddClassRequirement("story_admin","story_base");
! AddClassRequirement("story_admin",$_PSL['classdir'] . "/Story_admin.class");
! AddClassRequirement("topic",$_PSL['classdir'] . "/Topic.class");
! AddClassRequirement("topicbar",$_PSL['classdir'] . "/TopicBar.class");
! AddClassRequirement("tz",$_PSL['classdir'] . "/tz.class");
! AddLibraryRequirement("tz",$_PSL['classdir'] . "/tz_functions.inc");
! AddClassRequirement("tz_env","tz");
! AddClassRequirement("tz_env",$_PSL['classdir'] . "/tz_env.class");
! AddClassRequirement("tz_nonnative","tz");
! AddClassRequirement("tz_nonnative",$_PSL['classdir'] . "/tz_nonnative.class");
! AddClassRequirement("tz_posix","tz_nonnative");
! AddClassRequirement("tz_posix",$_PSL['classdir'] . "/tz_posix.class");
! AddClassRequirement("tz_file","tz_nonnative");
! AddClassRequirement("tz_file",$_PSL['classdir'] . "/tz_file.class");
! AddClassRequirement("variable",$_PSL['classdir'] . "/variable.class");

***************
*** 354,358 ****
     'name'   => "Add Story",
     'link'   => $_PSL['rooturl'] . "/submission.php3",
!    'perm'   => "submissionNew",
     'module' => "Submission"
  );
--- 482,486 ----
     'name'   => "Add Story",
     'link'   => $_PSL['rooturl'] . "/submission.php3",
!    'perm'   => "nobody",
     'module' => "Submission"
  );
***************
*** 490,502 ****
  //////////////////////////////////////////////////////////////////////////

- // 2.1) PHPLIB Auth Class extension
- // 2.2) PHPLIB Perm Class extension
- // 2.3) PHPSlash<->phplib interface classes
- require($_PSL['classdir'] . "/slashDB.class");
- require($_PSL['classdir'] . "/slash_sql.class");
- require($_PSL['classdir'] . "/slashSess.class");
- // require($_PSL['classdir'] . "/slashAuth.class");
- require($_PSL['classdir'] . "/slashAuthCR.class");
- require($_PSL['classdir'] . "/slashPerm.class");

  //  2.2) PHPLIB Session Support 
--- 618,621 ----
***************
*** 506,585 ****
  //////////////////////////////////////////////////////////////////////////

- require($_PSL['classdir'] . "/Topic.class");
- require($_PSL['classdir'] . "/Section.class");
- 
- foreach($_PSL['module'] as $key => $value) {
- 
-    switch ($key) {
- 
-       case 'Author':
- 
-          require($_PSL['classdir'] . "/Author.class");
-          break;
- 
-       case 'Block':
- 
-          require($_PSL['classdir'] . "/Block.class");
-          require($_PSL['classdir'] . "/Block_i.class");
-          // require($_PSL['classdir'] . "/Block_admin.class");
- 	      require($_PSL['classdir'] . "/Block_render_i.class");
-          break;
- 
-       case 'Comment':
- 
-          require($_PSL['classdir'] . "/Comment.class");
-          break;
- 
-       case 'Glossary':
- 
-          require($_PSL['classdir'] . "/Glossary.class");
-          break;
- 
-       case 'Group':
- 
-          require($_PSL['classdir'] . "/Group.class");
-          break;
- 
-       case 'MailingList':
- 
-          require($_PSL['classdir'] . "/MailingList.class");
-          break;
- 
- 
-       case 'NavBar':
- 
-          require($_PSL['classdir'] . "/NavBar.class");
-          break;
- 
-       case 'Poll':
- 
-          require($_PSL['classdir'] . "/Poll.class");
-          break;
- 
-       case 'Story':
- 
-          require($_PSL['classdir'] . "/Story_base.class");
-          require($_PSL['classdir'] . "/Story.class");
-          // require($_PSL['classdir'] . "/Story_admin.class");
-          break;
- 
-       case 'Submission':
- 
-          require($_PSL['classdir'] . "/Submission.class");
-          break;
- 
-       case 'TopicBar':
- 
-          require($_PSL['classdir'] . "/TopicBar.class");
-          break;
- 
-       case 'Variable':
- 
-          require($_PSL['classdir'] . "/Variable.class");
-          break;
-       
-    }
- 
- }

  //////////////////////////////////////////////////////////////////////////
--- 625,628 ----
***************
*** 589,595 ****
  define("ALLSECTIONS", "section_id0");

! page_open(array('sess' => 'slashSess',
!                 'auth' => 'slashAuth',
!                 'perm' => 'slashPerm'));

  /* ============= Things to deprecate ============= */
--- 632,653 ----
  define("ALLSECTIONS", "section_id0");

! if ($_PSL['timezone']['engine']) {
!    loadLibrary("tz");
!    // set up the time zone environment array
!    $_TZ =& $_PSL['timezone'];
!    $_TZ['templatedir'] = $_PSL['templatedir'];
!    $_TZ['show_format'] = psl_getLocalInfo('LC_TIME','%a %b %e %H:%M:%S %Z %Y');
!    /*   $_TZ['available'] = array("America/New_York",
! 	                          "America/Chicago",
!                                   "America/Denver",
! 				  "America/Los_Angeles",
! 				  "Pacific/Honolulu");
!     */
!     // to enable setting of time zone in URL
!     set_TZ($HTTP_GET_VARS['TZ'],'cookie');
!     // to disable setting in URL and to set $_PSL['timezone']['name'] as the time zone
!     // set_TZ();
! }
! 

  /* ============= Things to deprecate ============= */