[phpwiki-checkins] CVS: phpwiki/lib dbalib.php,NONE,1.1 config.php,1.19,1.20

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv14244

Modified Files:
	config.php 
Added Files:
	dbalib.php 
Log Message:
Joel Uckelman <uck...@ia...> contributed code changes
including a new database library file 'dbalib.php' that uses the new
interface library for DBM files. The changes in config.php still 
default to the dbmlib.php library for now, and the user must set
'dba' in config.php if they are using PHP 4.0.4 or later. Tested
this (just barely) on a newly built PHP 4.0.4p1 on my RH6.2 box.


***** Error reading new file: [Errno 2] No such file or directory: 'dbalib.php'
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** config.php	2001/01/04 18:32:43	1.19
--- config.php	2001/01/19 22:20:30	1.20
***************
*** 1,4 ****
  <?php
!    // essential internal stuff -- skip it
     set_magic_quotes_runtime(0);
     error_reporting(E_ALL ^ E_NOTICE);
--- 1,8 ----
  <?php
! 
!    // essential internal stuff -- skip it. Go down to Part One. There
!    // are four parts to this file that interest you, all labeled Part
!    // One, Two, Three and Four.
! 
     set_magic_quotes_runtime(0);
     error_reporting(E_ALL ^ E_NOTICE);
***************
*** 12,15 ****
--- 16,20 ----
  
     /////////////////////////////////////////////////////////////////////
+    // Part One:
     // Constants and settings. Edit the values below for your site.
     /////////////////////////////////////////////////////////////////////
***************
*** 29,39 ****
  
     /////////////////////////////////////////////////////////////////////
     // Database section
!    // set your database here and edit the according section below
!    $WhichDatabase = 'dbm'; // use one of "dbm", "mysql", "pgsql", "msql",
! 			   // or "file"
     
!    // DBM settings (default)
!    if ($WhichDatabase == 'dbm') {
        $DBMdir = "/tmp";
        $WikiPageStore = "wiki";
--- 34,48 ----
  
     /////////////////////////////////////////////////////////////////////
+    // Part Two:
     // Database section
!    // set your database here and edit the according section below.
!    // For PHP 4.0.4 and later you must use "dba" if you are using 
!    // DBM files for storage. "dbm" uses the older deprecated interface.
! 
!    $WhichDatabase = 'dbm'; // use one of "dbm", "dba", "mysql",
!                            // "pgsql", "msql", or "file"
     
!    // DBM (default) and DBA settings
!    if ($WhichDatabase == 'dbm' or 'dba') {
        $DBMdir = "/tmp";
        $WikiPageStore = "wiki";
***************
*** 46,50 ****
        // try this many times if the dbm is unavailable
        define("MAX_DBM_ATTEMPTS", 20);
!       include "lib/dbmlib.php";
  
     // MySQL settings -- see INSTALL.mysql for details on using MySQL
--- 55,63 ----
        // try this many times if the dbm is unavailable
        define("MAX_DBM_ATTEMPTS", 20);
!       if ($WhichDatabase == 'dbm') {
!           include "lib/dbmlib.php";
!       } else {
!           include "lib/dbalib.php";
!       }
  
     // MySQL settings -- see INSTALL.mysql for details on using MySQL
***************
*** 102,106 ****
  
     /////////////////////////////////////////////////////////////////////
!    // Miscellanious
  
     // logo image (path relative to index.php)
--- 115,121 ----
  
     /////////////////////////////////////////////////////////////////////
!    // Part Three:
!    // Miscellaneous
!    /////////////////////////////////////////////////////////////////////
  
     // logo image (path relative to index.php)
***************
*** 138,142 ****
--- 153,159 ----
  
     /////////////////////////////////////////////////////////////////////
+    // Part Four:
     // Original pages and layout
+    /////////////////////////////////////////////////////////////////////
  
     // need to define localization function first -- skip this