[phpBT-dev] CVS: phpbt include.php,1.77,1.78

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv18718

Modified Files:
	include.php 
Log Message:
Code cleanup and getting ready for adodb conversion

Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- include.php	2001/11/19 16:49:20	1.77
+++ include.php	2001/11/23 05:10:44	1.78
@@ -92,6 +92,10 @@
 
 $q = new dbclass;
 
+//include INSTALL_PATH.'/'.INCLUDE_PATH.'inc/adodb/adodb.inc.php';
+//$db =& ADONewConnection(DB_TYPE);
+//$db->PConnect(DB_HOST, DB_USER, DB_PASSWORD, DB_DATABASE);
+
 // Set up the configuration variables
 $q->query('select varname, varvalue from '.TBL_CONFIGURATION);
 while (list($k, $v) = $q->grab()) {
@@ -231,7 +235,7 @@
   );
 
   $text = '';
-	if (in_array($box, $cfgDatabase)) {
+	if (isset($cfgDatabase[$box])) {
   	$querystart = "select {$box}_id, {$box}_name from $cfgDatabase[$box]";
   	$queries = array(
     	'group' => $querystart.' where group_name <> \'User\' order by group_name',
@@ -390,9 +394,8 @@
     srand((double)microtime()*1000000);
 
     $vowels = array("a", "e", "i", "o", "u");
-    $cons = array("b", "c", "d", "g", "h", "j", "k", "l", "m", "n", "p", "r", "s", "t", "u", "v", "w", "tr",
-
-    "cr", "br", "fr", "th", "dr", "ch", "ph", "wr", "st", "sp", "sw", "pr", "sl", "cl");
+    $cons = array("b", "c", "d", "g", "h", "j", "k", "l", "m", "n", "p", "r", "s", "t", "u", "v", "w", "tr", "cr", "br", "fr", "th", "dr", "ch", "ph", "wr", "st", "sp", "sw", "pr", "sl", "cl");
+		$password = '';
 
     $num_vowels = count($vowels);
     $num_cons = count($cons);