[Bobs-cvs] CVS: bobs systemcheck.php,1.6,1.7

[Joe Z. <jz...@us...>]

Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31807/bobs

Modified Files:
	systemcheck.php 
Log Message:
Applied Rene's patch to allow db3 or db4.


Index: systemcheck.php
===================================================================
RCS file: /cvsroot/bobs/bobs/systemcheck.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- systemcheck.php	20 Jan 2004 04:14:47 -0000	1.6
+++ systemcheck.php	26 Mar 2004 21:33:51 -0000	1.7
@@ -292,20 +292,24 @@
     putfail();
 }
 
-$t->assign ('ITEM', "Checking for db3 database support");
+$t->assign ('ITEM', "Checking for dba (db3 or db4) database support");
 $tempfile = '/tmp/bobstest' . posix_getpid();
-$handle = dba_open("$tempfile", "c", "db3");          // open a temporary database
+$handle = @dba_open("$tempfile", "c", "db3");          // open a temporary database
+if (!$handle) {
+    $handle = @dba_open("$tempfile", "c", "db4");      // open a temporary database
+    if (!$handle) {
+        $t->assign ('STATUS', 'FAIL');
+        $t->assign ('HELP', "dba database support is not working.<br>
+                             You need to check your php configuration and<br>
+                             include dba database support.");
+        putfail();
+    }
+}
 if ($handle) {
     dba_close($handle);                               // close it
     unlink($tempfile);                                // and delete it.
     $t->assign ('STATUS', 'PASS');
     putpass();
-} else {
-    $t->assign ('STATUS', 'FAIL');
-    $t->assign ('HELP', "db3 database support is not working.<br>
-                You need to check your php configuration and<br>
-                include db3 database support.");
-    putfail();
 }
 
 // ----------------------------