[phpLiteAdmin-Commits] phpLiteAdmin db.php5,1.1,1.2 navbar.php5,1.2,1.3

[Gordon P. H. <gph...@us...>]

Update of /cvsroot/phpliteadmin/phpLiteAdmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27459

Modified Files:
	db.php5 navbar.php5 
Log Message:
Code cleanup and GUI formatting.

Index: navbar.php5
===================================================================
RCS file: /cvsroot/phpliteadmin/phpLiteAdmin/navbar.php5,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- navbar.php5	4 Aug 2004 21:06:24 -0000	1.2
+++ navbar.php5	7 Aug 2004 10:19:50 -0000	1.3
@@ -10,67 +10,57 @@
  * Side navigation panel
  */
 
+include_once( 'config.php5' );
+
 header( 'Content-Type: text/xml; charset=UTF-8' );
 
 include( 'lib/sqlite.php5' );
 
-$Database = new Database( 'db/mysqlitedb.sqlite', 0777, $sqlite_error );
-
 print '<?xml version="1.0" encoding="UTF-8" ?>' . "\n";
 print '<?xml-stylesheet href="style/navbar.xsl" type="text/xsl" ?>' . "\n";
 
 print "<databases>\n";
 
-if( $Database->connected )
-{
-/*	var_dump( $Database );
-
-	$Database->query( 'CREATE TABLE foo3 (bar varchar(10))' );
-	$Database->query( "INSERT INTO foo VALUES ('fnord')" );
-	$result = $Database->query( 'SELECT bar FROM foo' );
-	var_dump( $Database->fetch_array( $result ) );*/
-
-	$databases = array();
-	$dir = @opendir( 'db/' );
+$databases = array();
+$dir = @opendir( 'db/' );
 
-	while( ( $file = @readdir( $dir ) ) !== FALSE )
+while( ( $file = @readdir( $dir ) ) !== FALSE )
+{
+	if( preg_match( '#(.*?)\.sqlite$#', $file ) )
 	{
-		if( preg_match( '#(.*?)\.sqlite$#', $file ) )
-		{
-			$contents = (string) fread( fopen( "db/$file", 'r' ), 50 );
+		$contents = (string) fread( fopen( "db/$file", 'r' ), 50 );
 
-			if( preg_match( '#\*\* This file contains an SQLite (\d*\.\d*) database \*\*#', $contents ) )
-			{
-				$databases[] = $file;
-			}
+		if( preg_match( '#\*\* This file contains an SQLite (\d*\.\d*) database \*\*#', $contents ) )
+		{
+			$databases[] = $file;
 		}
 	}
+}
 
-//	var_dump( $databases );
+//var_dump( $databases );
 
-	foreach( $databases as $db )
-	{
-		print "\t" . '<database name="' . substr( $db, 0, -7 ) . '">' . "\n";
+foreach( $databases as $db )
+{
+	$Database = new Database( "db/$db", 0777, &$sqlite_error );
 
-		$sql = "SELECT name
-			FROM sqlite_master
-			WHERE type = 'table'
-			ORDER BY name ASC";
+	print "\t" . '<database name="' . substr( $db, 0, -7 ) . '">' . "\n";
 
-		$result = $Database->query( $sql );
+	$sql = "SELECT name
+		FROM sqlite_master
+		WHERE type = 'table'
+		ORDER BY name ASC";
 
-		while( $row = $Database->fetch_array( $result ) )
-		{
-			print "\t\t<table>" . $row['name'] . "</table>\n";
-		}
+	$result = $Database->query( $sql );
 
-		print "\t</database>\n";
+	while( $row = $Database->fetch_array( $result ) )
+	{
+		print "\t\t<table>" . $row['name'] . "</table>\n";
 	}
+
+	print "\t</database>\n";
 }
-else
-{
-   die( $sqlite_error );
-}
+
+unset( $Database );
 
 print "</databases>\n";
 

Index: db.php5
===================================================================
RCS file: /cvsroot/phpliteadmin/phpLiteAdmin/db.php5,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db.php5	4 Aug 2004 21:06:24 -0000	1.1
+++ db.php5	7 Aug 2004 10:19:50 -0000	1.2
@@ -10,19 +10,23 @@
  * Stucture for databases
  */
 
-if ( isset($_GET['db']) || isset($_POST['db']) )
+include_once( 'config.php5' );
+
+if( isset( $_REQUEST['db'] ) )
 {
-	$db_path = ( $_GET['db'] ) ? $_GET['db'] : $_POST['db'];
+	$db_path = $_REQUEST['db'];
 
-	if ( !preg_match("/db\//i", $db_path) )
+	if ( !( preg_match( '#db/#i', $db_path ) ) )
 	{
 		$db_path = 'db/' . $db_path;
 	}
-	if ( !preg_match("/\.sqlite/i", $db_path) )
+
+	if ( !( preg_match( '#\.sqlite#i', $db_path ) ) )
 	{
 		$db_path .= '.sqlite';
 	}
-	$db_name = preg_replace("/db\/(.*?)\.sqlite/i", "\\1", $db_path);
+
+	$db_name = preg_replace( '#db/(.*?)\.sqlite#i', '\\1', $db_path );
 }
 else
 {
@@ -30,72 +34,55 @@
 	exit;
 }
 
-if ( isset($_GET['mode']) || isset($_POST['mode']) )
-{
-	$mode = ( $_GET['mode'] ) ? $_GET['mode'] : $_POST['mode'];
-}
-else
-{
-	$mode = '';
-}
+$mode = ( isset( $_REQUEST['mode'] ) ) ? $_REQUEST['mode'] : '';
 	
-
 header( 'Content-Type: text/xml; charset=UTF-8' );
 
 include( 'lib/sqlite.php5' );
 
-$Database = new Database( $db_path, 0777, $sqlite_error );
+$Database = new Database( $db_path, 0777, &$sqlite_error );
 
 print '<?xml version="1.0" encoding="UTF-8" ?>' . "\n";
 print '<?xml-stylesheet href="style/db_structure.xsl" type="text/xsl" ?>' . "\n";
 
-if( $Database->connected )
+switch( $mode )
 {
+	// Execute an SQL query
+	case 'sql':
 
-	switch( $mode )
-	{
-		// execute a sql query
-		case 'sql':
-
-			break;
+	break;
 
-		// export the database
-		case 'export':
+	// Export the database
+	case 'export':
 
-			break;
+	break;
 
-		//drop the database
-		case 'drop':
+	// Drop the database
+	case 'drop':
 
-			break;
+	break;
 
-		// list tables, the db structure
-		default:
-			print "<tables>\n";
+	// List tables, the DB structure
+	default:
+		print "<tables>\n";
 
-			
-				$sql = "SELECT name
-						FROM sqlite_master
-						WHERE type = 'table'
-						ORDER BY name ASC";
+		$sql = "SELECT name
+			FROM sqlite_master
+			WHERE type = 'table'
+			ORDER BY name ASC";
 
-				$result = $Database->query( $sql );
+		$result = $Database->query( $sql );
 
-				while( $row = $Database->fetch_array( $result ) )
-				{
-					print "\t<table>" . "\n";
-					print "\t\t<name>" . $row['name'] . "</name>\n";
-					print "\t\t<db>" . $db_name . "</db>\n";
-					print "\t</table>\n";
-				}
+		while( $row = $Database->fetch_array( $result ) )
+		{
+			print "\t<table>" . "\n";
+			print "\t\t<name>" . $row['name'] . "</name>\n";
+			print "\t\t<db>" . $db_name . "</db>\n";
+			print "\t</table>\n";
+		}
 
-				print "</tables>\n";
-			break;
-	}
-}
-else
-{
-   die( $sqlite_error );
+		print "</tables>\n";
+	break;
 }
 
 ?>
\ No newline at end of file