[phpLiteAdmin-Commits] phpLiteAdmin tbl.php5,1.1,1.2

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

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

Modified Files:
	tbl.php5 
Log Message:
Minor bug fixes and formatting changes.

Index: tbl.php5
===================================================================
RCS file: /cvsroot/phpliteadmin/phpLiteAdmin/tbl.php5,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tbl.php5	9 Aug 2004 22:14:42 -0000	1.1
+++ tbl.php5	10 Aug 2004 23:04:20 -0000	1.2
@@ -62,7 +62,7 @@
 		print '<?xml-stylesheet href="style/tbl_browse.xsl" type="text/xsl" ?>' . "\n";
 		print '<rows>' . "\n";
 
-		if ( $_REQUEST['order'] )
+		if( isset( $_REQUEST['order'] ) )
 		{
 			$order = ( $_REQUEST['order'] == 'ASC' ) ? 'ASC' : 'DESC';
 		}
@@ -70,11 +70,10 @@
 		{
 			$order = 'ASC';
 		}
-		
-		$order_by = ( $_REQUEST['order_by'] ) ? " ORDER BY " . $_REQUEST['order_by'] . " $order" : '';
-		
-		$start = ( $_REQUEST['start'] ) ? settype( $_REQUEST['start'], 'integer' ) : 0;
-		$end = ( $_REQUEST['end'] ) ? settype( $_REQUEST['end'], 'integer' ) : $config['default_rows'];
+
+		$order_by = ( isset( $_REQUEST['order_by'] ) ) ? ' ORDER BY ' . $_REQUEST['order_by'] . " $order" : '';
+		$start = ( isset( $_REQUEST['start'] ) ) ? settype( $_REQUEST['start'], 'integer' ) : 0;
+		$end = ( isset( $_REQUEST['end'] ) ) ? settype( $_REQUEST['end'], 'integer' ) : $config['default_rows'];
 
 		$sql = "SELECT *
 			FROM $tbl
@@ -88,25 +87,33 @@
 		while( $row = $Database->fetch_array( $result ) )
 		{
 			print "\t<row>\n";
+
 			foreach( $row as $key => $value )
 			{
-				if ( !in_array( $key, $columns_array ) )
+				if ( !( in_array( $key, $columns_array ) ) )
 				{
 					$columns_array[] = $key;
 				}
+
 				print "\t\t" . '<column name="' . $key . '">' . $value . '</column>' . "\n";
 				print "\t\t<tbl>$tbl</tbl>\n";
 				print "\t\t<db>$db_name</db>\n";
 			}
+
 			print "\t</row>\n";
 		}
 
-		print "\t<columns>\n";
-		for( $i = 0; $i < count($columns_array); $i++ )
+		if( count( $columns_array ) )
 		{
-			print "\t\t<name>" . $columns_array[$i] . "</name>\n";
+			print "\t<columns>\n";
+
+			for( $i = 0; $i < count( $columns_array ); $i++ )
+			{
+				print "\t\t<name>" . $columns_array[$i] . "</name>\n";
+			}
+
+			print "\t</columns>\n";		
 		}
-		print "\t</columns>\n";
 
 		print "</rows>\n";
 	break;