EGroupware / egroupware

phpgwapi/inc/adodb/adodb-pager.inc.php

Doc Comments +6 added lines

@@ -273,6 +273,12 @@
 	
 	//------------------------------------------------------
 	// override this to control overall layout and formating
+
+	/**
+	 * @param string $header
+	 * @param string $grid
+	 * @param string $footer
+	 */
 	function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige')
 	{
 		echo "<table ".$attributes."><tr><td>",

Indentation +27 added lines, -27 removed lines

@@ -28,8 +28,8 @@ 
 	var $rs;	// recordset generated
 	var $curr_page;	// current page number before Render() called, calculated in constructor
 	var $rows;		// number of rows per page
-    var $linksPerPage=10; // number of links per page in navigation bar
-    var $showPageLinks; 
+	var $linksPerPage=10; // number of links per page in navigation bar
+	var $showPageLinks; 
 
 	var $gridAttributes = 'width=100% border=1 bgcolor=white';
 	
@@ -130,40 +130,40 @@ 
 	
 	//---------------------------------------------------
 	// original code by "Pablo Costa" <pablo@cbsp.com.br> 
-        function render_pagelinks()
-        {
-        global $PHP_SELF;
-            $pages        = $this->rs->LastPageNo();
-            $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages;
-            for($i=1; $i <= $pages; $i+=$linksperpage)
-            {
-                if($this->rs->AbsolutePage() >= $i)
-                {
-                    $start = $i;
-                }
-            }
+		function render_pagelinks()
+		{
+		global $PHP_SELF;
+			$pages        = $this->rs->LastPageNo();
+			$linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages;
+			for($i=1; $i <= $pages; $i+=$linksperpage)
+			{
+				if($this->rs->AbsolutePage() >= $i)
+				{
+					$start = $i;
+				}
+			}
 			$numbers = '';
-            $end = $start+$linksperpage-1;
+			$end = $start+$linksperpage-1;
 			$link = $this->id . "_next_page";
-            if($end > $pages) $end = $pages;
+			if($end > $pages) $end = $pages;
 			
 			
 			if ($this->startLinks && $start > 1) {
 				$pos = $start - 1;
 				$numbers .= "<a href=$PHP_SELF?$link=$pos>$this->startLinks</a>  ";
-            } 
+			} 
 			
 			for($i=$start; $i <= $end; $i++) {
-                if ($this->rs->AbsolutePage() == $i)
-                    $numbers .= "<font color=$this->linkSelectedColor><b>$i</b></font>  ";
-                else 
-                     $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
+				if ($this->rs->AbsolutePage() == $i)
+					$numbers .= "<font color=$this->linkSelectedColor><b>$i</b></font>  ";
+				else 
+					 $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
             
-            }
+			}
 			if ($this->moreLinks && $end < $pages) 
 				$numbers .= "<a href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
-            print $numbers . ' &nbsp; ';
-        }
+			print $numbers . ' &nbsp; ';
+		}
 	// Link to previous page
 	function render_prev($anchor=true)
 	{
@@ -208,9 +208,9 @@ 
 			$this->Render_First(false);
 			$this->Render_Prev(false);
 		}
-        if ($this->showPageLinks){
-            $this->Render_PageLinks();
-        }
+		if ($this->showPageLinks){
+			$this->Render_PageLinks();
+		}
 		if (!$this->rs->AtLastPage()) {
 			$this->Render_Next();
 			$this->Render_Last();

Spacing +31 added lines, -31 removed lines

@@ -22,13 +22,13 @@ 
 
 */
 class ADODB_Pager {
-	var $id; 	// unique id for pager (defaults to 'adodb')
-	var $db; 	// ADODB connection object
-	var $sql; 	// sql used
-	var $rs;	// recordset generated
-	var $curr_page;	// current page number before Render() called, calculated in constructor
-	var $rows;		// number of rows per page
-    var $linksPerPage=10; // number of links per page in navigation bar
+	var $id; // unique id for pager (defaults to 'adodb')
+	var $db; // ADODB connection object
+	var $sql; // sql used
+	var $rs; // recordset generated
+	var $curr_page; // current page number before Render() called, calculated in constructor
+	var $rows; // number of rows per page
+    var $linksPerPage = 10; // number of links per page in navigation bar
     var $showPageLinks; 
 
 	var $gridAttributes = 'width=100% border=1 bgcolor=white';
@@ -44,7 +44,7 @@ 
 	var $htmlSpecialChars = true;
 	var $page = 'Page';
 	var $linkSelectedColor = 'red';
-	var $cache = 0;  #secs to cache with CachePageExecute()
+	var $cache = 0; #secs to cache with CachePageExecute()
 	
 	//----------------------------------------------
 	// constructor
@@ -55,7 +55,7 @@ 
 	//		if you have multiple on 1 page. 
 	//		$id should be only be [a-z0-9]*
 	//
-	function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false)
+	function ADODB_Pager(&$db, $sql, $id = 'adodb', $showPageLinks = false)
 	{
 	global $PHP_SELF;
 	
@@ -80,12 +80,12 @@ 
 	
 	//---------------------------
 	// Display link to first page
-	function Render_First($anchor=true)
+	function Render_First($anchor = true)
 	{
 	global $PHP_SELF;
 		if ($anchor) {
 	?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a> &nbsp; 
+		<a href="<?php echo $PHP_SELF, '?', $this->id; ?>_next_page=1"><?php echo $this->first; ?></a> &nbsp; 
 	<?php
 		} else {
 			print "$this->first &nbsp; ";
@@ -94,13 +94,13 @@ 
 	
 	//--------------------------
 	// Display link to next page
-	function render_next($anchor=true)
+	function render_next($anchor = true)
 	{
 	global $PHP_SELF;
 	
 		if ($anchor) {
 		?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a> &nbsp; 
+		<a href="<?php echo $PHP_SELF, '?', $this->id, '_next_page=', $this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next; ?></a> &nbsp; 
 		<?php
 		} else {
 			print "$this->next &nbsp; ";
@@ -113,7 +113,7 @@ 
 	// for better performance with large recordsets, you can set
 	// $this->db->pageExecuteCountRows = false, which disables
 	// last page counting.
-	function render_last($anchor=true)
+	function render_last($anchor = true)
 	{
 	global $PHP_SELF;
 	
@@ -121,7 +121,7 @@ 
 		
 		if ($anchor) {
 		?>
-			<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a> &nbsp; 
+			<a href="<?php echo $PHP_SELF, '?', $this->id, '_next_page=', $this->rs->LastPageNo() ?>"><?php echo $this->last; ?></a> &nbsp; 
 		<?php
 		} else {
 			print "$this->last &nbsp; ";
@@ -135,17 +135,17 @@ 
         global $PHP_SELF;
             $pages        = $this->rs->LastPageNo();
             $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages;
-            for($i=1; $i <= $pages; $i+=$linksperpage)
+            for ($i = 1; $i <= $pages; $i += $linksperpage)
             {
-                if($this->rs->AbsolutePage() >= $i)
+                if ($this->rs->AbsolutePage() >= $i)
                 {
                     $start = $i;
                 }
             }
 			$numbers = '';
-            $end = $start+$linksperpage-1;
-			$link = $this->id . "_next_page";
-            if($end > $pages) $end = $pages;
+            $end = $start + $linksperpage - 1;
+			$link = $this->id."_next_page";
+            if ($end > $pages) $end = $pages;
 			
 			
 			if ($this->startLinks && $start > 1) {
@@ -153,7 +153,7 @@ 
 				$numbers .= "<a href=$PHP_SELF?$link=$pos>$this->startLinks</a>  ";
             } 
 			
-			for($i=$start; $i <= $end; $i++) {
+			for ($i = $start; $i <= $end; $i++) {
                 if ($this->rs->AbsolutePage() == $i)
                     $numbers .= "<font color=$this->linkSelectedColor><b>$i</b></font>  ";
                 else 
@@ -162,15 +162,15 @@ 
             }
 			if ($this->moreLinks && $end < $pages) 
 				$numbers .= "<a href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
-            print $numbers . ' &nbsp; ';
+            print $numbers.' &nbsp; ';
         }
 	// Link to previous page
-	function render_prev($anchor=true)
+	function render_prev($anchor = true)
 	{
 	global $PHP_SELF;
 		if ($anchor) {
 	?>
-		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a> &nbsp; 
+		<a href="<?php echo $PHP_SELF, '?', $this->id, '_next_page=', $this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev; ?></a> &nbsp; 
 	<?php 
 		} else {
 			print "$this->prev &nbsp; ";
@@ -188,7 +188,7 @@ 
 		include_once(ADODB_DIR.'/tohtml.inc.php');
 		ob_start();
 		$gSQLBlockRows = $this->rows;
-		rs2html($this->rs,$this->gridAttributes,$this->gridHeader,$this->htmlSpecialChars);
+		rs2html($this->rs, $this->gridAttributes, $this->gridHeader, $this->htmlSpecialChars);
 		$s = ob_get_contents();
 		ob_end_clean();
 		return $s;
@@ -208,7 +208,7 @@ 
 			$this->Render_First(false);
 			$this->Render_Prev(false);
 		}
-        if ($this->showPageLinks){
+        if ($this->showPageLinks) {
             $this->Render_PageLinks();
         }
 		if (!$this->rs->AtLastPage()) {
@@ -236,7 +236,7 @@ 
 	
 	//-----------------------------------
 	// Call this class to draw everything.
-	function Render($rows=10)
+	function Render($rows = 10)
 	{
 	global $ADODB_COUNTRECS;
 	
@@ -247,9 +247,9 @@ 
 		$savec = $ADODB_COUNTRECS;
 		if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
 		if ($this->cache)
-			$rs = &$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
+			$rs = &$this->db->CachePageExecute($this->cache, $this->sql, $rows, $this->curr_page);
 		else
-			$rs = &$this->db->PageExecute($this->sql,$rows,$this->curr_page);
+			$rs = &$this->db->PageExecute($this->sql, $rows, $this->curr_page);
 		$ADODB_COUNTRECS = $savec;
 		
 		$this->rs = &$rs;
@@ -268,12 +268,12 @@ 
 		$rs->Close();
 		$this->rs = false;
 		
-		$this->RenderLayout($header,$grid,$footer);
+		$this->RenderLayout($header, $grid, $footer);
 	}
 	
 	//------------------------------------------------------
 	// override this to control overall layout and formating
-	function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige')
+	function RenderLayout($header, $grid, $footer, $attributes = 'border=1 bgcolor=beige')
 	{
 		echo "<table ".$attributes."><tr><td>",
 				$header,

Braces +103 added lines, -39 removed lines

@@ -21,7 +21,8 @@ 
 	will be entertained by the author.
 
 */
-class ADODB_Pager {
+class ADODB_Pager
+{
 	var $id; 	// unique id for pager (defaults to 'adodb')
 	var $db; 	// ADODB connection object
 	var $sql; 	// sql used
@@ -60,7 +61,10 @@ 
 	global $PHP_SELF;
 	
 		$curr_page = $id.'_curr_page';
-		if (empty($PHP_SELF)) $PHP_SELF = $_SERVER['PHP_SELF'];
+		if (empty($PHP_SELF))
+		{
+			$PHP_SELF = $_SERVER['PHP_SELF'];
+		}
 		
 		$this->sql = $sql;
 		$this->id = $id;
@@ -69,10 +73,15 @@ 
 		
 		$next_page = $id.'_next_page';	
 		
-		if (isset($_GET[$next_page])) {
+		if (isset($_GET[$next_page]))
+		{
 			$_SESSION[$curr_page] = $_GET[$next_page];
 		}
-		if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page
+		if (empty($_SESSION[$curr_page]))
+		{
+			$_SESSION[$curr_page] = 1;
+		}
+		## at first page
 		
 		$this->curr_page = $_SESSION[$curr_page];
 		
@@ -83,11 +92,14 @@ 
 	function Render_First($anchor=true)
 	{
 	global $PHP_SELF;
-		if ($anchor) {
+		if ($anchor)
+		{
 	?>
 		<a href="<?php echo $PHP_SELF,'?',$this->id;?>_next_page=1"><?php echo $this->first;?></a> &nbsp; 
 	<?php
-		} else {
+		}
+		else
+		{
 			print "$this->first &nbsp; ";
 		}
 	}
@@ -98,11 +110,14 @@ 
 	{
 	global $PHP_SELF;
 	
-		if ($anchor) {
+		if ($anchor)
+		{
 		?>
 		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() + 1 ?>"><?php echo $this->next;?></a> &nbsp; 
 		<?php
-		} else {
+		}
+		else
+		{
 			print "$this->next &nbsp; ";
 		}
 	}
@@ -117,13 +132,19 @@ 
 	{
 	global $PHP_SELF;
 	
-		if (!$this->db->pageExecuteCountRows) return;
+		if (!$this->db->pageExecuteCountRows)
+		{
+			return;
+		}
 		
-		if ($anchor) {
+		if ($anchor)
+		{
 		?>
 			<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->LastPageNo() ?>"><?php echo $this->last;?></a> &nbsp; 
 		<?php
-		} else {
+		}
+		else
+		{
 			print "$this->last &nbsp; ";
 		}
 	}
@@ -145,34 +166,47 @@ 
 			$numbers = '';
             $end = $start+$linksperpage-1;
 			$link = $this->id . "_next_page";
-            if($end > $pages) $end = $pages;
+            if($end > $pages)
+            {
+            	$end = $pages;
+            }
 			
 			
-			if ($this->startLinks && $start > 1) {
+			if ($this->startLinks && $start > 1)
+			{
 				$pos = $start - 1;
 				$numbers .= "<a href=$PHP_SELF?$link=$pos>$this->startLinks</a>  ";
             } 
 			
-			for($i=$start; $i <= $end; $i++) {
+			for($i=$start; $i <= $end; $i++)
+			{
                 if ($this->rs->AbsolutePage() == $i)
-                    $numbers .= "<font color=$this->linkSelectedColor><b>$i</b></font>  ";
-                else 
-                     $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
+                {
+                                    $numbers .= "<font color=$this->linkSelectedColor><b>$i</b></font>  ";
+                }
+                else {
+                                     $numbers .= "<a href=$PHP_SELF?$link=$i>$i</a>  ";
+                }
             
             }
-			if ($this->moreLinks && $end < $pages) 
-				$numbers .= "<a href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
+			if ($this->moreLinks && $end < $pages)
+			{
+							$numbers .= "<a href=$PHP_SELF?$link=$i>$this->moreLinks</a>  ";
+			}
             print $numbers . ' &nbsp; ';
         }
 	// Link to previous page
 	function render_prev($anchor=true)
 	{
 	global $PHP_SELF;
-		if ($anchor) {
+		if ($anchor)
+		{
 	?>
 		<a href="<?php echo $PHP_SELF,'?',$this->id,'_next_page=',$this->rs->AbsolutePage() - 1 ?>"><?php echo $this->prev;?></a> &nbsp; 
 	<?php 
-		} else {
+		}
+		else
+		{
 			print "$this->prev &nbsp; ";
 		}
 	}
@@ -201,20 +235,27 @@ 
 	function RenderNav()
 	{
 		ob_start();
-		if (!$this->rs->AtFirstPage()) {
+		if (!$this->rs->AtFirstPage())
+		{
 			$this->Render_First();
 			$this->Render_Prev();
-		} else {
+		}
+		else
+		{
 			$this->Render_First(false);
 			$this->Render_Prev(false);
 		}
-        if ($this->showPageLinks){
+        if ($this->showPageLinks)
+        {
             $this->Render_PageLinks();
         }
-		if (!$this->rs->AtLastPage()) {
+		if (!$this->rs->AtLastPage())
+		{
 			$this->Render_Next();
 			$this->Render_Last();
-		} else {
+		}
+		else
+		{
 			$this->Render_Next(false);
 			$this->Render_Last(false);
 		}
@@ -227,10 +268,20 @@ 
 	// This is the footer
 	function RenderPageCount()
 	{
-		if (!$this->db->pageExecuteCountRows) return '';
+		if (!$this->db->pageExecuteCountRows)
+		{
+			return '';
+		}
 		$lastPage = $this->rs->LastPageNo();
-		if ($lastPage == -1) $lastPage = 1; // check for empty rs.
-		if ($this->curr_page > $lastPage) $this->curr_page = 1;
+		if ($lastPage == -1)
+		{
+			$lastPage = 1;
+		}
+		// check for empty rs.
+		if ($this->curr_page > $lastPage)
+		{
+			$this->curr_page = 1;
+		}
 		return "<font size=-1>$this->page ".$this->curr_page."/".$lastPage."</font>";
 	}
 	
@@ -242,26 +293,39 @@ 
 	
 		$this->rows = $rows;
 		
-		if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL;
+		if ($this->db->dataProvider == 'informix')
+		{
+			$this->db->cursorType = IFX_SCROLL;
+		}
 		
 		$savec = $ADODB_COUNTRECS;
-		if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
+		if ($this->db->pageExecuteCountRows)
+		{
+			$ADODB_COUNTRECS = true;
+		}
 		if ($this->cache)
-			$rs = &$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
-		else
-			$rs = &$this->db->PageExecute($this->sql,$rows,$this->curr_page);
+		{
+					$rs = &$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
+		}
+		else {
+					$rs = &$this->db->PageExecute($this->sql,$rows,$this->curr_page);
+		}
 		$ADODB_COUNTRECS = $savec;
 		
 		$this->rs = &$rs;
-		if (!$rs) {
+		if (!$rs)
+		{
 			print "<h3>Query failed: $this->sql</h3>";
 			return;
 		}
 		
-		if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) 
-			$header = $this->RenderNav();
-		else
-			$header = "&nbsp;";
+		if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage()))
+		{
+					$header = $this->RenderNav();
+		}
+		else {
+					$header = "&nbsp;";
+		}
 		
 		$grid = $this->RenderGrid();
 		$footer = $this->RenderPageCount();

phpgwapi/inc/adodb/adodb-perf.inc.php

Doc Comments +13 added lines, -3 removed lines

@@ -48,6 +48,9 @@ 
 }
 
 // avoids localization problems where , is used instead of .
+/**
+ * @param integer $prec
+ */
 function adodb_round($n,$prec)
 {
 	return number_format($n, $prec, '.', '');
@@ -547,6 +550,10 @@ 
 	/*
 		Raw function to return parameter value from $settings.
 	*/
+
+	/**
+	 * @param string $param
+	 */
 	function DBParameter($param)
 	{
 		if (empty($this->settings[$param])) return false;
@@ -949,6 +956,9 @@ 
 		return $arr;
 	}
 	
+	/**
+	 * @param string $m
+	 */
 	function undomq(&$m) 
 	{
 	if (get_magic_quotes_gpc()) {
@@ -984,7 +994,7 @@ 
      *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
      *      Default is LOW <code>ADODB_OPT_LOW</code> 
      * @author Markus Staab
-     * @return Returns <code>true</code> on success and <code>false</code> on error
+     * @return false|null <code>true</code> on success and <code>false</code> on error
      */
     function OptimizeTables()
     {
@@ -1015,7 +1025,7 @@ 
      *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
      *      Default is LOW <code>ADODB_OPT_LOW</code> 
      * @author Markus Staab
-     * @return Returns <code>true</code> on success and <code>false</code> on error
+     * @return boolean <code>true</code> on success and <code>false</code> on error
      */
     function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
     {
@@ -1029,7 +1039,7 @@ 
      * optimize each using <code>optmizeTable()</code>
      * 
      * @author Markus Staab
-     * @return Returns <code>true</code> on success and <code>false</code> on error
+     * @return boolean <code>true</code> on success and <code>false</code> on error
      */
     function optimizeDatabase() 
     {

Indentation +89 added lines, -89 removed lines

@@ -65,7 +65,7 @@ 
 function& adodb_log_sql(&$conn,$sql,$inputarr)
 {
 	
-    $perf_table = adodb_perf::table();
+	$perf_table = adodb_perf::table();
 	$conn->fnExecute = false;
 	$t0 = microtime();
 	$rs =& $conn->Execute($sql,$inputarr);
@@ -213,15 +213,15 @@ 
 	var $createTableSQL = false;
 	var $maxLength = 2000;
 	
-    // Sets the tablename to be used            
-    function table($newtable = false)
-    {
-        static $_table;
+	// Sets the tablename to be used            
+	function table($newtable = false)
+	{
+		static $_table;
 
-        if (!empty($newtable))  $_table = $newtable;
+		if (!empty($newtable))  $_table = $newtable;
 		if (empty($_table)) $_table = 'adodb_logsql';
-        return $_table;
-    }
+		return $_table;
+	}
 
 	// returns array with info to calculate CPU Load
 	function _CPULoad()
@@ -348,7 +348,7 @@ 
 	
 	function Tracer($sql)
 	{
-        $perf_table = adodb_perf::table();
+		$perf_table = adodb_perf::table();
 		$saveE = $this->conn->fnExecute;
 		$this->conn->fnExecute = false;
 		
@@ -394,7 +394,7 @@ 
 		$s = '<h3>Invalid SQL</h3>';
 		$saveE = $this->conn->fnExecute;
 		$this->conn->fnExecute = false;
-        $perf_table = adodb_perf::table();
+		$perf_table = adodb_perf::table();
 		$rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
 		$this->conn->fnExecute = $saveE;
 		if ($rs) {
@@ -413,7 +413,7 @@ 
 	{
 		global $ADODB_FETCH_MODE;
 		
-            $perf_table = adodb_perf::table();
+			$perf_table = adodb_perf::table();
 			$saveE = $this->conn->fnExecute;
 			$this->conn->fnExecute = false;
 			
@@ -492,7 +492,7 @@ 
 	{
 		global $ADODB_FETCH_MODE;
 		
-            $perf_table = adodb_perf::table();
+			$perf_table = adodb_perf::table();
 			$saveE = $this->conn->fnExecute;
 			$this->conn->fnExecute = false;
 			
@@ -635,7 +635,7 @@ 
 	function UI($pollsecs=5)
 	{
 	
-    $perf_table = adodb_perf::table();
+	$perf_table = adodb_perf::table();
 	$conn = $this->conn;
 	
 	$app = $conn->host;
@@ -963,91 +963,91 @@ 
     
    /************************************************************************/
    
-    /** 
-     * Reorganise multiple table-indices/statistics/..
-     * OptimizeMode could be given by last Parameter
-     * 
-     * @example
-     *      <pre>
-     *          optimizeTables( 'tableA');
-     *      </pre>
-     *      <pre>
-     *          optimizeTables( 'tableA', 'tableB', 'tableC');
-     *      </pre>
-     *      <pre>
-     *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
-     *      </pre>
-     * 
-     * @param string table name of the table to optimize
-     * @param int mode optimization-mode
-     *      <code>ADODB_OPT_HIGH</code> for full optimization 
-     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
-     *      Default is LOW <code>ADODB_OPT_LOW</code> 
-     * @author Markus Staab
-     * @return Returns <code>true</code> on success and <code>false</code> on error
-     */
-    function OptimizeTables()
-    {
-        $args = func_get_args();
-        $numArgs = func_num_args();
+	/** 
+	 * Reorganise multiple table-indices/statistics/..
+	 * OptimizeMode could be given by last Parameter
+	 * 
+	 * @example
+	 *      <pre>
+	 *          optimizeTables( 'tableA');
+	 *      </pre>
+	 *      <pre>
+	 *          optimizeTables( 'tableA', 'tableB', 'tableC');
+	 *      </pre>
+	 *      <pre>
+	 *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
+	 *      </pre>
+	 * 
+	 * @param string table name of the table to optimize
+	 * @param int mode optimization-mode
+	 *      <code>ADODB_OPT_HIGH</code> for full optimization 
+	 *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
+	 *      Default is LOW <code>ADODB_OPT_LOW</code> 
+	 * @author Markus Staab
+	 * @return Returns <code>true</code> on success and <code>false</code> on error
+	 */
+	function OptimizeTables()
+	{
+		$args = func_get_args();
+		$numArgs = func_num_args();
         
-        if ( $numArgs == 0) return false;
+		if ( $numArgs == 0) return false;
         
-        $mode = ADODB_OPT_LOW; 
-        $lastArg = $args[ $numArgs - 1];
-        if ( !is_string($lastArg)) {
-            $mode = $lastArg;
-            unset( $args[ $numArgs - 1]);
-        }
+		$mode = ADODB_OPT_LOW; 
+		$lastArg = $args[ $numArgs - 1];
+		if ( !is_string($lastArg)) {
+			$mode = $lastArg;
+			unset( $args[ $numArgs - 1]);
+		}
         
-        foreach( $args as $table) {
-            $this->optimizeTable( $table, $mode);
-        }
+		foreach( $args as $table) {
+			$this->optimizeTable( $table, $mode);
+		}
 	}
 
-    /** 
-     * Reorganise the table-indices/statistics/.. depending on the given mode.
-     * Default Implementation throws an error.
-     * 
-     * @param string table name of the table to optimize
-     * @param int mode optimization-mode
-     *      <code>ADODB_OPT_HIGH</code> for full optimization 
-     *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
-     *      Default is LOW <code>ADODB_OPT_LOW</code> 
-     * @author Markus Staab
-     * @return Returns <code>true</code> on success and <code>false</code> on error
-     */
-    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
-    {
-        ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
-        return false;
-    }
+	/** 
+	 * Reorganise the table-indices/statistics/.. depending on the given mode.
+	 * Default Implementation throws an error.
+	 * 
+	 * @param string table name of the table to optimize
+	 * @param int mode optimization-mode
+	 *      <code>ADODB_OPT_HIGH</code> for full optimization 
+	 *      <code>ADODB_OPT_LOW</code> for CPU-less optimization
+	 *      Default is LOW <code>ADODB_OPT_LOW</code> 
+	 * @author Markus Staab
+	 * @return Returns <code>true</code> on success and <code>false</code> on error
+	 */
+	function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
+	{
+		ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
+		return false;
+	}
     
-    /** 
-     * Reorganise current database.
-     * Default implementation loops over all <code>MetaTables()</code> and 
-     * optimize each using <code>optmizeTable()</code>
-     * 
-     * @author Markus Staab
-     * @return Returns <code>true</code> on success and <code>false</code> on error
-     */
-    function optimizeDatabase() 
-    {
-        $conn = $this->conn;
-        if ( !$conn) return false;
+	/** 
+	 * Reorganise current database.
+	 * Default implementation loops over all <code>MetaTables()</code> and 
+	 * optimize each using <code>optmizeTable()</code>
+	 * 
+	 * @author Markus Staab
+	 * @return Returns <code>true</code> on success and <code>false</code> on error
+	 */
+	function optimizeDatabase() 
+	{
+		$conn = $this->conn;
+		if ( !$conn) return false;
         
-        $tables = $conn->MetaTables( 'TABLES');
-        if ( !$tables ) return false;
+		$tables = $conn->MetaTables( 'TABLES');
+		if ( !$tables ) return false;
 
-        foreach( $tables as $table) {
-            if ( !$this->optimizeTable( $table)) {
-                return false;
-            }
-        }
+		foreach( $tables as $table) {
+			if ( !$this->optimizeTable( $table)) {
+				return false;
+			}
+		}
       
-        return true;
-    }
-    // end hack 
+		return true;
+	}
+	// end hack 
 }
 
 ?>
\ No newline at end of file

Spacing +117 added lines, -117 removed lines

@@ -19,21 +19,21 @@ 
 if (!defined(ADODB_DIR)) include_once(dirname(__FILE__).'/adodb.inc.php');
 include_once(ADODB_DIR.'/tohtml.inc.php');
 
-define( 'ADODB_OPT_HIGH', 2);
-define( 'ADODB_OPT_LOW', 1);
+define('ADODB_OPT_HIGH', 2);
+define('ADODB_OPT_LOW', 1);
 
 // returns in K the memory of current process, or 0 if not known
 function adodb_getmem()
 {
 	if (function_exists('memory_get_usage'))
-		return (integer) ((memory_get_usage()+512)/1024);
+		return (integer)((memory_get_usage() + 512) / 1024);
 	
 	$pid = getmypid();
 	
-	if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) {
+	if (strncmp(strtoupper(PHP_OS), 'WIN', 3) == 0) {
 		$output = array();
 	
-		exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output); 
+		exec('tasklist /FI "PID eq '.$pid.'" /FO LIST', $output); 
 		return substr($output[5], strpos($output[5], ':') + 1);
 	} 
 	
@@ -41,14 +41,14 @@ 
 	exec("ps --pid $pid --no-headers -o%mem,size", $output);
 	if (sizeof($output) == 0) return 0;
 	
-	$memarr = explode(' ',$output[0]);
-	if (sizeof($memarr)>=2) return (integer) $memarr[1];
+	$memarr = explode(' ', $output[0]);
+	if (sizeof($memarr) >= 2) return (integer)$memarr[1];
 	
 	return 0;
 }
 
 // avoids localization problems where , is used instead of .
-function adodb_round($n,$prec)
+function adodb_round($n, $prec)
 {
 	return number_format($n, $prec, '.', '');
 }
@@ -57,29 +57,29 @@ 
 function adodb_microtime()
 {
 	$t = microtime();
-	$t = explode(' ',$t);
-	return (float)$t[1]+ (float)$t[0];
+	$t = explode(' ', $t);
+	return (float)$t[1] + (float)$t[0];
 }
 
 /* sql code timing */
-function& adodb_log_sql(&$conn,$sql,$inputarr)
+function& adodb_log_sql(&$conn, $sql, $inputarr)
 {
 	
     $perf_table = adodb_perf::table();
 	$conn->fnExecute = false;
 	$t0 = microtime();
-	$rs =& $conn->Execute($sql,$inputarr);
+	$rs = & $conn->Execute($sql, $inputarr);
 	$t1 = microtime();
 
 	if (!empty($conn->_logsql)) {
 		$conn->_logsql = false; // disable logsql error simulation
 		$dbT = $conn->databaseType;
 		
-		$a0 = explode(' ',$t0);
-		$a0 = (float)$a0[1]+(float)$a0[0];
+		$a0 = explode(' ', $t0);
+		$a0 = (float)$a0[1] + (float)$a0[0];
 		
-		$a1 = explode(' ',$t1);
-		$a1 = (float)$a1[1]+(float)$a1[0];
+		$a1 = explode(' ', $t1);
+		$a1 = (float)$a1[1] + (float)$a1[0];
 		
 		$time = $a1 - $a0;
 	
@@ -87,7 +87,7 @@ 
 			$errM = $conn->ErrorMsg();
 			$errN = $conn->ErrorNo();
 			$conn->lastInsID = 0;
-			$tracer = substr('ERROR: '.htmlspecialchars($errM),0,250);
+			$tracer = substr('ERROR: '.htmlspecialchars($errM), 0, 250);
 		} else {
 			$tracer = '';
 			$errM = '';
@@ -106,7 +106,7 @@ 
 			if (isset($_SERVER['PHP_SELF'])) $tracer .= '<br>'.$_SERVER['PHP_SELF'];
 		//$tracer .= (string) adodb_backtrace(false);
 		
-		$tracer = (string) substr($tracer,0,500);
+		$tracer = (string)substr($tracer, 0, 500);
 		
 		if (is_array($inputarr)) {
 			if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr);
@@ -116,7 +116,7 @@ 
 				$xar_params = $inputarr;
 				foreach ($xar_params as $xar_param_key => $xar_param) {
 					if (gettype($xar_param) == 'string')
-					$xar_params[$xar_param_key] = '"' . $xar_param . '"';
+					$xar_params[$xar_param_key] = '"'.$xar_param.'"';
 				}
 				$params = implode(', ', $xar_params);
 				if (strlen($params) >= 3000) $params = substr($params, 0, 3000);
@@ -127,7 +127,7 @@ 
 		
 		if (is_array($sql)) $sql = $sql[0];
 		$arr = array('b'=>strlen($sql).'.'.crc32($sql),
-					'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6));
+					'c'=>substr($sql, 0, 3900), 'd'=>$params, 'e'=>$tracer, 'f'=>adodb_round($time, 6));
 		//var_dump($arr);
 		$saved = $conn->debug;
 		$conn->debug = 0;
@@ -138,7 +138,7 @@ 
 			$isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)";
 		} else if ($dbT == 'odbc_mssql' || $dbT == 'informix') {
 			$timer = $arr['f'];
-			if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
+			if ($dbT == 'informix') $sql2 = substr($sql2, 0, 230);
 
 			$sql1 = $conn->qstr($arr['b']);
 			$sql2 = $conn->qstr($arr['c']);
@@ -146,13 +146,13 @@ 
 			$tracer = $conn->qstr($arr['e']);
 			
 			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)";
-			if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql);
+			if ($dbT == 'informix') $isql = str_replace(chr(10), ' ', $isql);
 			$arr = false;
 		} else {
 			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";
 		}
 
-		$ok = $conn->Execute($isql,$arr);
+		$ok = $conn->Execute($isql, $arr);
 		$conn->debug = $saved;
 		
 		if ($ok) {
@@ -160,9 +160,9 @@ 
 		} else {
 			$err2 = $conn->ErrorMsg();
 			$conn->_logsql = true; // enable logsql error simulation
-			$perf =& NewPerfMonitor($conn);
+			$perf = & NewPerfMonitor($conn);
 			if ($perf) {
-				if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr);
+				if ($perf->CreateLogTable()) $ok = $conn->Execute($isql, $arr);
 			} else {
 				$ok = $conn->Execute("create table $perf_table (
 				created varchar(50),
@@ -173,7 +173,7 @@ 
 				timer decimal(16,6))");
 			}
 			if (!$ok) {
-				ADOConnection::outp( "<p><b>LOGSQL Insert Failed</b>: $isql<br>$err2</p>");
+				ADOConnection::outp("<p><b>LOGSQL Insert Failed</b>: $isql<br>$err2</p>");
 				$conn->_logsql = false;
 			}
 		}
@@ -207,7 +207,7 @@ 
 	var $warnRatio = 90;
 	var $tablesSQL = false;
 	var $cliFormat = "%32s => %s \r\n";
-	var $sql1 = 'sql1';  // used for casting sql1 to text for mssql
+	var $sql1 = 'sql1'; // used for casting sql1 to text for mssql
 	var $explain = true;
 	var $helpurl = "<a href=http://phplens.com/adodb/reference.functions.fnexecute.and.fncacheexecute.properties.html#logsql>LogSQL help</a>";
 	var $createTableSQL = false;
@@ -242,7 +242,7 @@ 
 */
 		// Algorithm is taken from
 		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp
-		if (strncmp(PHP_OS,'WIN',3)==0) {
+		if (strncmp(PHP_OS, 'WIN', 3) == 0) {
 			if (PHP_VERSION == '5.0.0') return false;
 			if (PHP_VERSION == '5.0.1') return false;
 			if (PHP_VERSION == '5.0.2') return false;
@@ -264,16 +264,16 @@ 
 		$statfile = '/proc/stat';
 		if (!file_exists($statfile)) return false;
 		
-		$fd = fopen($statfile,"r");
+		$fd = fopen($statfile, "r");
 		if (!$fd) return false;
 		
-		$statinfo = explode("\n",fgets($fd, 1024));
+		$statinfo = explode("\n", fgets($fd, 1024));
 		fclose($fd);
-		foreach($statinfo as $line) {
-			$info = explode(" ",$line);
-			if($info[0]=="cpu") {
-				array_shift($info);  // pop off "cpu"
-				if(!$info[0]) array_shift($info); // pop off blank space (if any)
+		foreach ($statinfo as $line) {
+			$info = explode(" ", $line);
+			if ($info[0] == "cpu") {
+				array_shift($info); // pop off "cpu"
+				if (!$info[0]) array_shift($info); // pop off blank space (if any)
 				return $info;
 			}
 		}
@@ -336,13 +336,13 @@ 
 		
 		//printf("Delta - User: %f  Nice: %f  System: %f  Idle: %f<br>",$d_user,$d_nice,$d_system,$d_idle);
 
-		if (strncmp(PHP_OS,'WIN',3)==0) {
+		if (strncmp(PHP_OS, 'WIN', 3) == 0) {
 			if ($d_idle < 1) $d_idle = 1;
-			return 100*(1-$d_user/$d_idle);
-		}else {
-			$total=$d_user+$d_nice+$d_system+$d_idle;
-			if ($total<1) $total=1;
-			return 100*($d_user+$d_nice+$d_system)/$total; 
+			return 100 * (1 - $d_user / $d_idle);
+		} else {
+			$total = $d_user + $d_nice + $d_system + $d_idle;
+			if ($total < 1) $total = 1;
+			return 100 * ($d_user + $d_nice + $d_system) / $total; 
 		}
 	}
 	
@@ -366,8 +366,8 @@ 
 		$s = '';
 		if ($arr) {
 			$s .= '<h3>Scripts Affected</h3>';
-			foreach($arr as $k) {
-				$s .= sprintf("%4d",$k[0]).' &nbsp; '.strip_tags($k[1]).'<br>';
+			foreach ($arr as $k) {
+				$s .= sprintf("%4d", $k[0]).' &nbsp; '.strip_tags($k[1]).'<br>';
 			}
 		}
 		
@@ -382,7 +382,7 @@ 
 		If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the 
 			actual sql.
 	*/
-	function Explain($sql,$partial=false)
+	function Explain($sql, $partial = false)
 	{	
 		return false;
 	}
@@ -395,10 +395,10 @@ 
 		$saveE = $this->conn->fnExecute;
 		$this->conn->fnExecute = false;
         $perf_table = adodb_perf::table();
-		$rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
+		$rs = & $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc", $numsql); //,$numsql);
 		$this->conn->fnExecute = $saveE;
 		if ($rs) {
-			$s .= rs2html($rs,false,false,false,false);
+			$s .= rs2html($rs, false, false, false, false);
 		} else
 			return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
 		
@@ -419,7 +419,7 @@ 
 			
 			if (isset($_GET['exps']) && isset($_GET['sql'])) {
 				$partial = !empty($_GET['part']);
-				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
+				echo "<a name=explain></a>".$this->Explain($_GET['sql'], $partial)."\n";
 			}
 			
 			if (isset($_GET['sql'])) return;
@@ -429,13 +429,13 @@ 
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
 			//$this->conn->debug=1;
-			$rs =& $this->conn->SelectLimit(
+			$rs = & $this->conn->SelectLimit(
 			"select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
 				from $perf_table
 				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT')
 				and (tracer is null or tracer not like 'ERROR:%')
 				group by sql1
-				order by 1 desc",$numsql);
+				order by 1 desc", $numsql);
 			if (isset($savem)) $this->conn->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 			$this->conn->fnExecute = $saveE;
@@ -448,17 +448,17 @@ 
 			while (!$rs->EOF) {
 				$sql = $rs->fields[1];
 				$raw = urlencode($sql);
-				if (strlen($raw)>$max-100) {
-					$sql2 = substr($sql,0,$max-500);
+				if (strlen($raw) > $max - 100) {
+					$sql2 = substr($sql, 0, $max - 500);
 					$raw = urlencode($sql2).'&part='.crc32($sql);
 				}
 				$prefix = "<a target=sql".rand()." href=\"?hidem=1&exps=1&sql=".$raw."&x#explain\">";
 				$suffix = "</a>";
-				if ($this->explain == false || strlen($prefix)>$max) {
+				if ($this->explain == false || strlen($prefix) > $max) {
 					$suffix = ' ... <i>String too long for GET parameter: '.strlen($prefix).'</i>';
 					$prefix = '';
 				}
-				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
+				$s .= "<tr><td>".adodb_round($rs->fields[0], 6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
 					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
 				$rs->MoveNext();
 			}
@@ -472,12 +472,12 @@ 
 	}
 	
 	
-	function SuspiciousSQL($numsql=10)
+	function SuspiciousSQL($numsql = 10)
 	{
 		return adodb_perf::_SuspiciousSQL($numsql);
 	}
 
-	function ExpensiveSQL($numsql=10)
+	function ExpensiveSQL($numsql = 10)
 	{
 		return adodb_perf::_ExpensiveSQL($numsql);
 	}
@@ -498,7 +498,7 @@ 
 			
 			if (isset($_GET['expe']) && isset($_GET['sql'])) {
 				$partial = !empty($_GET['part']);
-				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
+				echo "<a name=explain></a>".$this->Explain($_GET['sql'], $partial)."\n";
 			}
 			
 			if (isset($_GET['sql'])) return;
@@ -508,14 +508,14 @@ 
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
 			
-			$rs =& $this->conn->SelectLimit(
+			$rs = & $this->conn->SelectLimit(
 			"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
 				from $perf_table
 				where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5))  not in ('DROP ','INSER','COMMI','CREAT')
 				and (tracer is null or tracer not like 'ERROR:%')
 				group by sql1
 				having count(*)>1
-				order by 1 desc",$numsql);
+				order by 1 desc", $numsql);
 			if (isset($savem)) $this->conn->SetFetchMode($savem);
 			$this->conn->fnExecute = $saveE;
 			$ADODB_FETCH_MODE = $save;
@@ -527,17 +527,17 @@ 
 			while (!$rs->EOF) {
 				$sql = $rs->fields[1];
 				$raw = urlencode($sql);
-				if (strlen($raw)>$max-100) {
-					$sql2 = substr($sql,0,$max-500);
+				if (strlen($raw) > $max - 100) {
+					$sql2 = substr($sql, 0, $max - 500);
 					$raw = urlencode($sql2).'&part='.crc32($sql);
 				}
 				$prefix = "<a target=sqle".rand()." href=\"?hidem=1&expe=1&sql=".$raw."&x#explain\">";
 				$suffix = "</a>";
-				if($this->explain == false || strlen($prefix>$max)) {
+				if ($this->explain == false || strlen($prefix > $max)) {
 					$prefix = '';
 					$suffix = '';
 				}
-				$s .= "<tr><td>".adodb_round($rs->fields[0],6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
+				$s .= "<tr><td>".adodb_round($rs->fields[0], 6)."<td align=right>".$rs->fields[2]."<td><font size=-1>".$prefix.htmlspecialchars($sql).$suffix."</font>".
 					"<td>".$rs->fields[3]."<td>".$rs->fields[4]."</tr>";
 				$rs->MoveNext();
 			}
@@ -562,7 +562,7 @@ 
 		$arr[0] = (float)$this->DBParameter('data cache hit ratio');
 		$arr[1] = (float)$this->DBParameter('data reads');
 		$arr[2] = (float)$this->DBParameter('data writes');
-		$arr[3] = (integer) $this->DBParameter('current connections');
+		$arr[3] = (integer)$this->DBParameter('current connections');
 		return $arr;
 	}
 	
@@ -577,9 +577,9 @@ 
 		
 			$sql1 = $sql[0];
 			$key = $sql[1];
-			if (sizeof($sql)>2) $pos = $sql[2];
+			if (sizeof($sql) > 2) $pos = $sql[2];
 			else $pos = 1;
-			if (sizeof($sql)>3) $coef = $sql[3];
+			if (sizeof($sql) > 3) $coef = $sql[3];
 			else $coef = false;
 			$ret = false;
 			$save = $ADODB_FETCH_MODE;
@@ -605,11 +605,11 @@ 
 			$this->conn->LogSQL($savelog);
 			return $ret;
 		} else {
-			if (strncmp($sql,'=',1) == 0) {
-				$fn = substr($sql,1);
+			if (strncmp($sql, '=', 1) == 0) {
+				$fn = substr($sql, 1);
 				return $this->$fn();
 			}
-			$sql = str_replace('$DATABASE',$this->conn->database,$sql);
+			$sql = str_replace('$DATABASE', $this->conn->database, $sql);
 			$ret = $this->conn->GetOne($sql);
 			$this->conn->LogSQL($savelog);
 			
@@ -632,7 +632,7 @@ 
 	/***********************************************************************************************/
 
 	
-	function UI($pollsecs=5)
+	function UI($pollsecs = 5)
 	{
 	
     $perf_table = adodb_perf::table();
@@ -653,7 +653,7 @@ 
 	// magic quotes
 	
 	if (isset($_GET['sql']) && get_magic_quotes_gpc()) {
-		$_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']);
+		$_GET['sql'] = $_GET['sql'] = str_replace(array("\\'", '\"'), array("'", '"'), $_GET['sql']);
 	}
 	
 	if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10;
@@ -668,7 +668,7 @@ 
 	 else $do = 'stats';
 	 
 	if (isset($_GET['nsql'])) {
-		if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql'];
+		if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer)$_GET['nsql'];
 	}
 	echo "<title>ADOdb Performance Monitor on $app</title><body bgcolor=white>";
 	if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input type=submit value=Go></td></form>";
@@ -676,7 +676,7 @@ 
 	
 	$allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
 	
-	if  (empty($_GET['hidem']))
+	if (empty($_GET['hidem']))
 	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
 	<b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
 	<a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a href=?do=viewsql><b>View SQL</b></a>
@@ -724,30 +724,30 @@ 
 	/*
 		Runs in infinite loop, returning real-time statistics
 	*/
-	function Poll($secs=5)
+	function Poll($secs = 5)
 	{
 		$this->conn->fnExecute = false;
 		//$this->conn->debug=1;
 		if ($secs <= 1) $secs = 1;
-		echo "Accumulating statistics, every $secs seconds...\n";flush();
-		$arro =& $this->PollParameters();
+		echo "Accumulating statistics, every $secs seconds...\n"; flush();
+		$arro = & $this->PollParameters();
 		$cnt = 0;
 		set_time_limit(0);
 		sleep($secs);
 		while (1) {
 
-			$arr =& $this->PollParameters();
+			$arr = & $this->PollParameters();
 			
-			$hits   = sprintf('%2.2f',$arr[0]);
-			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
-			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
-			$sess = sprintf('%5d',$arr[3]);
+			$hits   = sprintf('%2.2f', $arr[0]);
+			$reads  = sprintf('%12.4f', ($arr[1] - $arro[1]) / $secs);
+			$writes = sprintf('%12.4f', ($arr[2] - $arro[2]) / $secs);
+			$sess = sprintf('%5d', $arr[3]);
 			
 			$load = $this->CPULoad();
 			if ($load !== false) {
 				$oslabel = 'WS-CPU%';
-				$osval = sprintf(" %2.1f  ",(float) $load);
-			}else {
+				$osval = sprintf(" %2.1f  ", (float)$load);
+			} else {
 				$oslabel = '';
 				$osval = '';
 			}
@@ -775,7 +775,7 @@ 
 	/*
 		Returns basic health check as HTML
 	*/
-	function HealthCheck($cli=false)
+	function HealthCheck($cli = false)
 	{
 		$saveE = $this->conn->fnExecute;
 		$this->conn->fnExecute = false;	
@@ -784,7 +784,7 @@ 
 		
 		$oldc = false;
 		$bgc = '';
-		foreach($this->settings as $name => $arr) {
+		foreach ($this->settings as $name => $arr) {
 			if ($arr === false) break;
 			
 			if (!is_string($name)) {
@@ -796,7 +796,7 @@ 
 			if (!is_array($arr)) break;
 			$category = $arr[0];
 			$how = $arr[1];
-			if (sizeof($arr)>2) $desc = $arr[2];
+			if (sizeof($arr) > 2) $desc = $arr[2];
 			else $desc = ' &nbsp; ';
 			
 			
@@ -804,8 +804,8 @@ 
 			
 			$val = $this->_DBParameter($how);
 			
-			if ($desc && strncmp($desc,"=",1) === 0) {
-				$fn = substr($desc,1);
+			if ($desc && strncmp($desc, "=", 1) === 0) {
+				$fn = substr($desc, 1);
 				$desc = $this->$fn($val);
 			}
 			
@@ -813,9 +813,9 @@ 
 				$m = $this->conn->ErrorMsg();
 				$val = "Error: $m"; 
 			} else {
-				if (is_numeric($val) && $val >= 256*1024) {
-					if ($val % (1024*1024) == 0) {
-						$val /= (1024*1024);
+				if (is_numeric($val) && $val >= 256 * 1024) {
+					if ($val % (1024 * 1024) == 0) {
+						$val /= (1024 * 1024);
 						$val .= 'M';
 					} else if ($val % 1024 == 0) {
 						$val /= 1024;
@@ -828,12 +828,12 @@ 
 				$oldc = $category;
 				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;
 			}
-			if (strlen($desc)==0) $desc = '&nbsp;';
-			if (strlen($val)==0) $val = '&nbsp;';
+			if (strlen($desc) == 0) $desc = '&nbsp;';
+			if (strlen($val) == 0) $val = '&nbsp;';
 			if ($cli) {
-				$html  .= str_replace('&nbsp;','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
+				$html .= str_replace('&nbsp;', '', sprintf($this->cliFormat, strip_tags($name), strip_tags($val), strip_tags($desc)));
 				
-			}else {
+			} else {
 				$html .= "<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";
 			}
 		}
@@ -844,14 +844,14 @@ 
 		return $html;	
 	}
 	
-	function Tables($orderby='1')
+	function Tables($orderby = '1')
 	{
 		if (!$this->tablesSQL) return false;
 		
 		$savelog = $this->conn->LogSQL(false);
 		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
 		$this->conn->LogSQL($savelog);
-		$html = rs2html($rs,false,false,false,false);
+		$html = rs2html($rs, false, false, false, false);
 		return $html;
 	}
 	
@@ -906,14 +906,14 @@ 
 		if (!isset($_REQUEST['sql'])) return;
 		
 		$sql = $this->undomq(trim($sql));
-		if (substr($sql,strlen($sql)-1) === ';') {
+		if (substr($sql, strlen($sql) - 1) === ';') {
 			$print = true;
 			$sqla = $this->SplitSQL($sql);
-		} else  {
+		} else {
 			$print = false;
 			$sqla = array($sql);
 		}
-		foreach($sqla as $sqls) {
+		foreach ($sqla as $sqls) {
 
 			if (!$sqls) continue;
 			
@@ -931,7 +931,7 @@ 
 					rs2html($rs);
 				}
 			} else {
-				$e1 = (integer) $this->conn->ErrorNo();
+				$e1 = (integer)$this->conn->ErrorNo();
 				$e2 = $this->conn->ErrorMsg();
 				if (($e1) || ($e2)) {
 					if (empty($e1)) $e1 = '-1'; // postgresql fix
@@ -945,7 +945,7 @@ 
 	
 	function SplitSQL($sql)
 	{
-		$arr = explode(';',$sql);
+		$arr = explode(';', $sql);
 		return $arr;
 	}
 	
@@ -953,9 +953,9 @@ 
 	{
 	if (get_magic_quotes_gpc()) {
 		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
+		$m = str_replace('\\\\', '\\', $m);
+		$m = str_replace('\"', '"', $m);
+		$m = str_replace('\\\'', '\'', $m);
 	}
 	return $m;
 }
@@ -991,17 +991,17 @@ 
         $args = func_get_args();
         $numArgs = func_num_args();
         
-        if ( $numArgs == 0) return false;
+        if ($numArgs == 0) return false;
         
         $mode = ADODB_OPT_LOW; 
-        $lastArg = $args[ $numArgs - 1];
-        if ( !is_string($lastArg)) {
+        $lastArg = $args[$numArgs - 1];
+        if (!is_string($lastArg)) {
             $mode = $lastArg;
-            unset( $args[ $numArgs - 1]);
+            unset($args[$numArgs - 1]);
         }
         
-        foreach( $args as $table) {
-            $this->optimizeTable( $table, $mode);
+        foreach ($args as $table) {
+            $this->optimizeTable($table, $mode);
         }
 	}
 
@@ -1017,9 +1017,9 @@ 
      * @author Markus Staab
      * @return Returns <code>true</code> on success and <code>false</code> on error
      */
-    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
+    function OptimizeTable($table, $mode = ADODB_OPT_LOW) 
     {
-        ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
+        ADOConnection::outp(sprintf("<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
         return false;
     }
     
@@ -1034,13 +1034,13 @@ 
     function optimizeDatabase() 
     {
         $conn = $this->conn;
-        if ( !$conn) return false;
+        if (!$conn) return false;
         
-        $tables = $conn->MetaTables( 'TABLES');
-        if ( !$tables ) return false;
+        $tables = $conn->MetaTables('TABLES');
+        if (!$tables) return false;
 
-        foreach( $tables as $table) {
-            if ( !$this->optimizeTable( $table)) {
+        foreach ($tables as $table) {
+            if (!$this->optimizeTable($table)) {
                 return false;
             }
         }

Braces +524 added lines, -174 removed lines

@@ -16,7 +16,10 @@ 
   
 */
 
-if (!defined(ADODB_DIR)) include_once(dirname(__FILE__).'/adodb.inc.php');
+if (!defined(ADODB_DIR))
+{
+	include_once(dirname(__FILE__).'/adodb.inc.php');
+}
 include_once(ADODB_DIR.'/tohtml.inc.php');
 
 define( 'ADODB_OPT_HIGH', 2);
@@ -26,11 +29,14 @@ 
 function adodb_getmem()
 {
 	if (function_exists('memory_get_usage'))
-		return (integer) ((memory_get_usage()+512)/1024);
+	{
+			return (integer) ((memory_get_usage()+512)/1024);
+	}
 	
 	$pid = getmypid();
 	
-	if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) {
+	if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0)
+	{
 		$output = array();
 	
 		exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output); 
@@ -39,10 +45,16 @@ 
 	
 	/* Hopefully UNIX */
 	exec("ps --pid $pid --no-headers -o%mem,size", $output);
-	if (sizeof($output) == 0) return 0;
+	if (sizeof($output) == 0)
+	{
+		return 0;
+	}
 	
 	$memarr = explode(' ',$output[0]);
-	if (sizeof($memarr)>=2) return (integer) $memarr[1];
+	if (sizeof($memarr)>=2)
+	{
+		return (integer) $memarr[1];
+	}
 	
 	return 0;
 }
@@ -71,7 +83,8 @@ 
 	$rs =& $conn->Execute($sql,$inputarr);
 	$t1 = microtime();
 
-	if (!empty($conn->_logsql)) {
+	if (!empty($conn->_logsql))
+	{
 		$conn->_logsql = false; // disable logsql error simulation
 		$dbT = $conn->databaseType;
 		
@@ -83,49 +96,78 @@ 
 		
 		$time = $a1 - $a0;
 	
-		if (!$rs) {
+		if (!$rs)
+		{
 			$errM = $conn->ErrorMsg();
 			$errN = $conn->ErrorNo();
 			$conn->lastInsID = 0;
 			$tracer = substr('ERROR: '.htmlspecialchars($errM),0,250);
-		} else {
+		}
+		else
+		{
 			$tracer = '';
 			$errM = '';
 			$errN = 0;
 			$dbg = $conn->debug;
 			$conn->debug = false;
-			if (!is_object($rs) || $rs->dataProvider == 'empty') 
-				$conn->_affected = $conn->affected_rows(true);
+			if (!is_object($rs) || $rs->dataProvider == 'empty')
+			{
+							$conn->_affected = $conn->affected_rows(true);
+			}
 			$conn->lastInsID = @$conn->Insert_ID();
 			$conn->debug = $dbg;
 		}
-		if (isset($_SERVER['HTTP_HOST'])) {
+		if (isset($_SERVER['HTTP_HOST']))
+		{
 			$tracer .= '<br>'.$_SERVER['HTTP_HOST'];
-			if (isset($_SERVER['PHP_SELF'])) $tracer .= $_SERVER['PHP_SELF'];
-		} else 
-			if (isset($_SERVER['PHP_SELF'])) $tracer .= '<br>'.$_SERVER['PHP_SELF'];
+			if (isset($_SERVER['PHP_SELF']))
+			{
+				$tracer .= $_SERVER['PHP_SELF'];
+			}
+		}
+		else 
+			if (isset($_SERVER['PHP_SELF']))
+			{
+				$tracer .= '<br>'.$_SERVER['PHP_SELF'];
+			}
 		//$tracer .= (string) adodb_backtrace(false);
 		
 		$tracer = (string) substr($tracer,0,500);
 		
-		if (is_array($inputarr)) {
-			if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr);
-			else {
+		if (is_array($inputarr))
+		{
+			if (is_array(reset($inputarr)))
+			{
+				$params = 'Array sizeof='.sizeof($inputarr);
+			}
+			else
+			{
 				// Quote string parameters so we can see them in the
 				// performance stats. This helps spot disabled indexes.
 				$xar_params = $inputarr;
-				foreach ($xar_params as $xar_param_key => $xar_param) {
+				foreach ($xar_params as $xar_param_key => $xar_param)
+				{
 					if (gettype($xar_param) == 'string')
-					$xar_params[$xar_param_key] = '"' . $xar_param . '"';
+					{
+										$xar_params[$xar_param_key] = '"' . $xar_param . '"';
+					}
 				}
 				$params = implode(', ', $xar_params);
-				if (strlen($params) >= 3000) $params = substr($params, 0, 3000);
+				if (strlen($params) >= 3000)
+				{
+					$params = substr($params, 0, 3000);
+				}
 			}
-		} else {
+		}
+		else
+		{
 			$params = '';
 		}
 		
-		if (is_array($sql)) $sql = $sql[0];
+		if (is_array($sql))
+		{
+			$sql = $sql[0];
+		}
 		$arr = array('b'=>strlen($sql).'.'.crc32($sql),
 					'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6));
 		//var_dump($arr);
@@ -133,12 +175,21 @@ 
 		$conn->debug = 0;
 		
 		$d = $conn->sysTimeStamp;
-		if (empty($d)) $d = date("'Y-m-d H:i:s'");
-		if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') {
+		if (empty($d))
+		{
+			$d = date("'Y-m-d H:i:s'");
+		}
+		if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po')
+		{
 			$isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)";
-		} else if ($dbT == 'odbc_mssql' || $dbT == 'informix') {
+		}
+		else if ($dbT == 'odbc_mssql' || $dbT == 'informix')
+		{
 			$timer = $arr['f'];
-			if ($dbT == 'informix') $sql2 = substr($sql2,0,230);
+			if ($dbT == 'informix')
+			{
+				$sql2 = substr($sql2,0,230);
+			}
 
 			$sql1 = $conn->qstr($arr['b']);
 			$sql2 = $conn->qstr($arr['c']);
@@ -146,24 +197,38 @@ 
 			$tracer = $conn->qstr($arr['e']);
 			
 			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)";
-			if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql);
+			if ($dbT == 'informix')
+			{
+				$isql = str_replace(chr(10),' ',$isql);
+			}
 			$arr = false;
-		} else {
+		}
+		else
+		{
 			$isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)";
 		}
 
 		$ok = $conn->Execute($isql,$arr);
 		$conn->debug = $saved;
 		
-		if ($ok) {
+		if ($ok)
+		{
 			$conn->_logsql = true; 
-		} else {
+		}
+		else
+		{
 			$err2 = $conn->ErrorMsg();
 			$conn->_logsql = true; // enable logsql error simulation
 			$perf =& NewPerfMonitor($conn);
-			if ($perf) {
-				if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr);
-			} else {
+			if ($perf)
+			{
+				if ($perf->CreateLogTable())
+				{
+					$ok = $conn->Execute($isql,$arr);
+				}
+			}
+			else
+			{
 				$ok = $conn->Execute("create table $perf_table (
 				created varchar(50),
 				sql0 varchar(250), 
@@ -172,7 +237,8 @@ 
 				tracer varchar(500),
 				timer decimal(16,6))");
 			}
-			if (!$ok) {
+			if (!$ok)
+			{
 				ADOConnection::outp( "<p><b>LOGSQL Insert Failed</b>: $isql<br>$err2</p>");
 				$conn->_logsql = false;
 			}
@@ -199,7 +265,8 @@ 
 2: description of the database parameter
 */
 
-class adodb_perf {
+class adodb_perf
+{
 	var $conn;
 	var $color = '#F0F0F0';
 	var $table = '<table border=1 bgcolor=white>';
@@ -218,8 +285,14 @@ 
     {
         static $_table;
 
-        if (!empty($newtable))  $_table = $newtable;
-		if (empty($_table)) $_table = 'adodb_logsql';
+        if (!empty($newtable))
+        {
+        	$_table = $newtable;
+        }
+		if (empty($_table))
+		{
+			$_table = 'adodb_logsql';
+		}
         return $_table;
     }
 
@@ -242,15 +315,35 @@ 
 */
 		// Algorithm is taken from
 		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/example__obtaining_raw_performance_data.asp
-		if (strncmp(PHP_OS,'WIN',3)==0) {
-			if (PHP_VERSION == '5.0.0') return false;
-			if (PHP_VERSION == '5.0.1') return false;
-			if (PHP_VERSION == '5.0.2') return false;
-			if (PHP_VERSION == '5.0.3') return false;
-			if (PHP_VERSION == '4.3.10') return false; # see http://bugs.php.net/bug.php?id=31737
+		if (strncmp(PHP_OS,'WIN',3)==0)
+		{
+			if (PHP_VERSION == '5.0.0')
+			{
+				return false;
+			}
+			if (PHP_VERSION == '5.0.1')
+			{
+				return false;
+			}
+			if (PHP_VERSION == '5.0.2')
+			{
+				return false;
+			}
+			if (PHP_VERSION == '5.0.3')
+			{
+				return false;
+			}
+			if (PHP_VERSION == '4.3.10')
+			{
+				return false;
+			}
+			# see http://bugs.php.net/bug.php?id=31737
 			
 			@$c = new COM("WinMgmts:{impersonationLevel=impersonate}!Win32_PerfRawData_PerfOS_Processor.Name='_Total'");
-			if (!$c) return false;
+			if (!$c)
+			{
+				return false;
+			}
 			
 			$info[0] = $c->PercentProcessorTime;
 			$info[1] = 0;
@@ -262,18 +355,30 @@ 
 		
 		// Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com)
 		$statfile = '/proc/stat';
-		if (!file_exists($statfile)) return false;
+		if (!file_exists($statfile))
+		{
+			return false;
+		}
 		
 		$fd = fopen($statfile,"r");
-		if (!$fd) return false;
+		if (!$fd)
+		{
+			return false;
+		}
 		
 		$statinfo = explode("\n",fgets($fd, 1024));
 		fclose($fd);
-		foreach($statinfo as $line) {
+		foreach($statinfo as $line)
+		{
 			$info = explode(" ",$line);
-			if($info[0]=="cpu") {
+			if($info[0]=="cpu")
+			{
 				array_shift($info);  // pop off "cpu"
-				if(!$info[0]) array_shift($info); // pop off blank space (if any)
+				if(!$info[0])
+				{
+					array_shift($info);
+				}
+				// pop off blank space (if any)
 				return $info;
 			}
 		}
@@ -318,9 +423,13 @@ 
 	function CPULoad()
 	{
 		$info = $this->_CPULoad();
-		if (!$info) return false;
+		if (!$info)
+		{
+			return false;
+		}
 			
-		if (empty($this->_lastLoad)) {
+		if (empty($this->_lastLoad))
+		{
 			sleep(1);
 			$this->_lastLoad = $info;
 			$info = $this->_CPULoad();
@@ -336,12 +445,21 @@ 
 		
 		//printf("Delta - User: %f  Nice: %f  System: %f  Idle: %f<br>",$d_user,$d_nice,$d_system,$d_idle);
 
-		if (strncmp(PHP_OS,'WIN',3)==0) {
-			if ($d_idle < 1) $d_idle = 1;
+		if (strncmp(PHP_OS,'WIN',3)==0)
+		{
+			if ($d_idle < 1)
+			{
+				$d_idle = 1;
+			}
 			return 100*(1-$d_user/$d_idle);
-		}else {
+		}
+		else
+		{
 			$total=$d_user+$d_nice+$d_system+$d_idle;
-			if ($total<1) $total=1;
+			if ($total<1)
+			{
+				$total=1;
+			}
 			return 100*($d_user+$d_nice+$d_system)/$total; 
 		}
 	}
@@ -355,7 +473,10 @@ 
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+		if ($this->conn->fetchMode !== false)
+		{
+			$savem = $this->conn->SetFetchMode(false);
+		}
 				
 		$sqlq = $this->conn->qstr($sql);
 		$arr = $this->conn->GetArray(
@@ -364,14 +485,19 @@ 
 	group by tracer
 	order by 1 desc");
 		$s = '';
-		if ($arr) {
+		if ($arr)
+		{
 			$s .= '<h3>Scripts Affected</h3>';
-			foreach($arr as $k) {
+			foreach($arr as $k)
+			{
 				$s .= sprintf("%4d",$k[0]).' &nbsp; '.strip_tags($k[1]).'<br>';
 			}
 		}
 		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		if (isset($savem))
+		{
+			$this->conn->SetFetchMode($savem);
+		}
 		$ADODB_CACHE_MODE = $save;
 		$this->conn->fnExecute = $saveE;
 		return $s;
@@ -383,24 +509,30 @@ 
 			actual sql.
 	*/
 	function Explain($sql,$partial=false)
-	{	
+	{
 		return false;
 	}
 	
 	function InvalidSQL($numsql = 10)
 	{
 	
-		if (isset($_GET['sql'])) return;
+		if (isset($_GET['sql']))
+		{
+			return;
+		}
 		$s = '<h3>Invalid SQL</h3>';
 		$saveE = $this->conn->fnExecute;
 		$this->conn->fnExecute = false;
         $perf_table = adodb_perf::table();
 		$rs =& $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql);
 		$this->conn->fnExecute = $saveE;
-		if ($rs) {
+		if ($rs)
+		{
 			$s .= rs2html($rs,false,false,false,false);
-		} else
-			return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
+		}
+		else {
+					return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
+		}
 		
 		return $s;
 	}
@@ -417,17 +549,24 @@ 
 			$saveE = $this->conn->fnExecute;
 			$this->conn->fnExecute = false;
 			
-			if (isset($_GET['exps']) && isset($_GET['sql'])) {
+			if (isset($_GET['exps']) && isset($_GET['sql']))
+			{
 				$partial = !empty($_GET['part']);
 				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
 			}
 			
-			if (isset($_GET['sql'])) return;
+			if (isset($_GET['sql']))
+			{
+				return;
+			}
 			$sql1 = $this->sql1;
 			
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+			if ($this->conn->fetchMode !== false)
+			{
+				$savem = $this->conn->SetFetchMode(false);
+			}
 			//$this->conn->debug=1;
 			$rs =& $this->conn->SelectLimit(
 			"select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
@@ -436,25 +575,34 @@ 
 				and (tracer is null or tracer not like 'ERROR:%')
 				group by sql1
 				order by 1 desc",$numsql);
-			if (isset($savem)) $this->conn->SetFetchMode($savem);
+			if (isset($savem))
+			{
+				$this->conn->SetFetchMode($savem);
+			}
 			$ADODB_FETCH_MODE = $save;
 			$this->conn->fnExecute = $saveE;
 			
-			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
+			if (!$rs)
+			{
+				return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
+			}
 			$s = "<h3>Suspicious SQL</h3>
 <font size=1>The following SQL have high average execution times</font><br>
 <table border=1 bgcolor=white><tr><td><b>Avg Time</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
 			$max = $this->maxLength;
-			while (!$rs->EOF) {
+			while (!$rs->EOF)
+			{
 				$sql = $rs->fields[1];
 				$raw = urlencode($sql);
-				if (strlen($raw)>$max-100) {
+				if (strlen($raw)>$max-100)
+				{
 					$sql2 = substr($sql,0,$max-500);
 					$raw = urlencode($sql2).'&part='.crc32($sql);
 				}
 				$prefix = "<a target=sql".rand()." href=\"?hidem=1&exps=1&sql=".$raw."&x#explain\">";
 				$suffix = "</a>";
-				if ($this->explain == false || strlen($prefix)>$max) {
+				if ($this->explain == false || strlen($prefix)>$max)
+				{
 					$suffix = ' ... <i>String too long for GET parameter: '.strlen($prefix).'</i>';
 					$prefix = '';
 				}
@@ -496,17 +644,24 @@ 
 			$saveE = $this->conn->fnExecute;
 			$this->conn->fnExecute = false;
 			
-			if (isset($_GET['expe']) && isset($_GET['sql'])) {
+			if (isset($_GET['expe']) && isset($_GET['sql']))
+			{
 				$partial = !empty($_GET['part']);
 				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
 			}
 			
-			if (isset($_GET['sql'])) return;
+			if (isset($_GET['sql']))
+			{
+				return;
+			}
 			
 			$sql1 = $this->sql1;
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+			if ($this->conn->fetchMode !== false)
+			{
+				$savem = $this->conn->SetFetchMode(false);
+			}
 			
 			$rs =& $this->conn->SelectLimit(
 			"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
@@ -516,24 +671,33 @@ 
 				group by sql1
 				having count(*)>1
 				order by 1 desc",$numsql);
-			if (isset($savem)) $this->conn->SetFetchMode($savem);
+			if (isset($savem))
+			{
+				$this->conn->SetFetchMode($savem);
+			}
 			$this->conn->fnExecute = $saveE;
 			$ADODB_FETCH_MODE = $save;
-			if (!$rs) return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
+			if (!$rs)
+			{
+				return "<p>$this->helpurl. ".$this->conn->ErrorMsg()."</p>";
+			}
 			$s = "<h3>Expensive SQL</h3>
 <font size=1>Tuning the following SQL could reduce the server load substantially</font><br>
 <table border=1 bgcolor=white><tr><td><b>Load</b><td><b>Count</b><td><b>SQL</b><td><b>Max</b><td><b>Min</b></tr>\n";
 			$max = $this->maxLength;
-			while (!$rs->EOF) {
+			while (!$rs->EOF)
+			{
 				$sql = $rs->fields[1];
 				$raw = urlencode($sql);
-				if (strlen($raw)>$max-100) {
+				if (strlen($raw)>$max-100)
+				{
 					$sql2 = substr($sql,0,$max-500);
 					$raw = urlencode($sql2).'&part='.crc32($sql);
 				}
 				$prefix = "<a target=sqle".rand()." href=\"?hidem=1&expe=1&sql=".$raw."&x#explain\">";
 				$suffix = "</a>";
-				if($this->explain == false || strlen($prefix>$max)) {
+				if($this->explain == false || strlen($prefix>$max))
+				{
 					$prefix = '';
 					$suffix = '';
 				}
@@ -549,7 +713,10 @@ 
 	*/
 	function DBParameter($param)
 	{
-		if (empty($this->settings[$param])) return false;
+		if (empty($this->settings[$param]))
+		{
+			return false;
+		}
 		$sql = $this->settings[$param][1];
 		return $this->_DBParameter($sql);
 	}
@@ -572,30 +739,53 @@ 
 	function _DBParameter($sql)
 	{
 		$savelog = $this->conn->LogSQL(false);
-		if (is_array($sql)) {
+		if (is_array($sql))
+		{
 		global $ADODB_FETCH_MODE;
 		
 			$sql1 = $sql[0];
 			$key = $sql[1];
-			if (sizeof($sql)>2) $pos = $sql[2];
-			else $pos = 1;
-			if (sizeof($sql)>3) $coef = $sql[3];
-			else $coef = false;
+			if (sizeof($sql)>2)
+			{
+				$pos = $sql[2];
+			}
+			else {
+				$pos = 1;
+			}
+			if (sizeof($sql)>3)
+			{
+				$coef = $sql[3];
+			}
+			else {
+				$coef = false;
+			}
 			$ret = false;
 			$save = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-			if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+			if ($this->conn->fetchMode !== false)
+			{
+				$savem = $this->conn->SetFetchMode(false);
+			}
 			
 			$rs = $this->conn->Execute($sql1);
 			
-			if (isset($savem)) $this->SetFetchMode($savem);
+			if (isset($savem))
+			{
+				$this->SetFetchMode($savem);
+			}
 			$ADODB_FETCH_MODE = $save;
-			if ($rs) {
-				while (!$rs->EOF) {
+			if ($rs)
+			{
+				while (!$rs->EOF)
+				{
 					$keyf = reset($rs->fields);
-					if (trim($keyf) == $key) {
+					if (trim($keyf) == $key)
+					{
 						$ret = $rs->fields[$pos];
-						if ($coef) $ret *= $coef;
+						if ($coef)
+						{
+							$ret *= $coef;
+						}
 						break;
 					}
 					$rs->MoveNext();
@@ -604,8 +794,11 @@ 
 			}
 			$this->conn->LogSQL($savelog);
 			return $ret;
-		} else {
-			if (strncmp($sql,'=',1) == 0) {
+		}
+		else
+		{
+			if (strncmp($sql,'=',1) == 0)
+			{
 				$fn = substr($sql,1);
 				return $this->$fn();
 			}
@@ -622,9 +815,13 @@ 
 	*/
 	function WarnCacheRatio($val)
 	{
-		if ($val < $this->warnRatio) 
-			 return '<font color=red><b>Cache ratio should be at least '.$this->warnRatio.'%</b></font>';
-		else return '';
+		if ($val < $this->warnRatio)
+		{
+					 return '<font color=red><b>Cache ratio should be at least '.$this->warnRatio.'%</b></font>';
+		}
+		else {
+			return '';
+		}
 	}
 	
 	/***********************************************************************************************/
@@ -639,54 +836,90 @@ 
 	$conn = $this->conn;
 	
 	$app = $conn->host;
-	if ($conn->host && $conn->database) $app .= ', db=';
+	if ($conn->host && $conn->database)
+	{
+		$app .= ', db=';
+	}
 	$app .= $conn->database;
 	
-	if ($app) $app .= ', ';
+	if ($app)
+	{
+		$app .= ', ';
+	}
 	$savelog = $this->conn->LogSQL(false);	
 	$info = $conn->ServerInfo();
-	if (isset($_GET['clearsql'])) {
+	if (isset($_GET['clearsql']))
+	{
 		$this->conn->Execute("delete from $perf_table");
 	}
 	$this->conn->LogSQL($savelog);
 	
 	// magic quotes
 	
-	if (isset($_GET['sql']) && get_magic_quotes_gpc()) {
+	if (isset($_GET['sql']) && get_magic_quotes_gpc())
+	{
 		$_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']);
 	}
 	
-	if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10;
-	else  $nsql = $_SESSION['ADODB_PERF_SQL'];
+	if (!isset($_SESSION['ADODB_PERF_SQL']))
+	{
+		$nsql = $_SESSION['ADODB_PERF_SQL'] = 10;
+	}
+	else {
+		$nsql = $_SESSION['ADODB_PERF_SQL'];
+	}
 	
 	$app .= $info['description'];
 	
 	
-	if (isset($_GET['do'])) $do = $_GET['do'];
-	else if (isset($_POST['do'])) $do = $_POST['do'];
-	 else if (isset($_GET['sql'])) $do = 'viewsql';
-	 else $do = 'stats';
+	if (isset($_GET['do']))
+	{
+		$do = $_GET['do'];
+	}
+	else if (isset($_POST['do']))
+	{
+		$do = $_POST['do'];
+	}
+	 else if (isset($_GET['sql']))
+	 {
+	 	$do = 'viewsql';
+	 }
+	 else {
+	 	$do = 'stats';
+	 }
 	 
-	if (isset($_GET['nsql'])) {
-		if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql'];
+	if (isset($_GET['nsql']))
+	{
+		if ($_GET['nsql'] > 0)
+		{
+			$nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql'];
+		}
 	}
 	echo "<title>ADOdb Performance Monitor on $app</title><body bgcolor=white>";
-	if ($do == 'viewsql') $form = "<td><form># SQL:<input type=hidden value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input type=submit value=Go></td></form>";
-	else $form = "<td>&nbsp;</td>";
+	if ($do == 'viewsql')
+	{
+		$form = "<td><form># SQL:<input type=hidden value=viewsql name=do> <input type=text size=4 name=nsql value=$nsql><input type=submit value=Go></td></form>";
+	}
+	else {
+		$form = "<td>&nbsp;</td>";
+	}
 	
 	$allowsql = !defined('ADODB_PERF_NO_RUN_SQL');
 	
 	if  (empty($_GET['hidem']))
-	echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
+	{
+		echo "<table border=1 width=100% bgcolor=lightyellow><tr><td colspan=2>
 	<b><a href=http://adodb.sourceforge.net/?perf=1>ADOdb</a> Performance Monitor</b> <font size=1>for $app</font></tr><tr><td>
 	<a href=?do=stats><b>Performance Stats</b></a> &nbsp; <a href=?do=viewsql><b>View SQL</b></a>
 	 &nbsp; <a href=?do=tables><b>View Tables</b></a> &nbsp; <a href=?do=poll><b>Poll Stats</b></a>",
 	 $allowsql ? ' &nbsp; <a href=?do=dosql><b>Run SQL</b></a>' : '',
 	 "$form",
 	 "</tr></table>";
+	}
 
 	 
-	 	switch ($do) {
+	 	switch ($do)
+	 	{
 		default:
 		case 'stats':
 			echo $this->HealthCheck();
@@ -703,13 +936,18 @@ 
 			break;
 		
 		case 'dosql':
-			if (!$allowsql) break;
+			if (!$allowsql)
+			{
+				break;
+			}
 			
 			$this->DoSQLForm();
 			break;
 		case 'viewsql':
 			if (empty($_GET['hidem']))
-				echo "&nbsp; <a href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
+			{
+							echo "&nbsp; <a href=\"?do=viewsql&clearsql=1\">Clear SQL Log</a><br>";
+			}
 			echo($this->SuspiciousSQL($nsql));
 			echo($this->ExpensiveSQL($nsql));
 			echo($this->InvalidSQL($nsql));
@@ -728,13 +966,17 @@ 
 	{
 		$this->conn->fnExecute = false;
 		//$this->conn->debug=1;
-		if ($secs <= 1) $secs = 1;
+		if ($secs <= 1)
+		{
+			$secs = 1;
+		}
 		echo "Accumulating statistics, every $secs seconds...\n";flush();
 		$arro =& $this->PollParameters();
 		$cnt = 0;
 		set_time_limit(0);
 		sleep($secs);
-		while (1) {
+		while (1)
+		{
 
 			$arr =& $this->PollParameters();
 			
@@ -744,19 +986,28 @@ 
 			$sess = sprintf('%5d',$arr[3]);
 			
 			$load = $this->CPULoad();
-			if ($load !== false) {
+			if ($load !== false)
+			{
 				$oslabel = 'WS-CPU%';
 				$osval = sprintf(" %2.1f  ",(float) $load);
-			}else {
+			}
+			else
+			{
 				$oslabel = '';
 				$osval = '';
 			}
-			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
+			if ($cnt % 10 == 0)
+			{
+				echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n";
+			}
 			$cnt += 1;
 			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
 			flush();
 			
-			if (connection_aborted()) return;
+			if (connection_aborted())
+			{
+				return;
+			}
 			
 			sleep($secs);
 			$arro = $arr;
@@ -779,66 +1030,113 @@ 
 	{
 		$saveE = $this->conn->fnExecute;
 		$this->conn->fnExecute = false;	
-		if ($cli) $html = '';
-		else $html = $this->table.'<tr><td colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$this->titles;
+		if ($cli)
+		{
+			$html = '';
+		}
+		else {
+			$html = $this->table.'<tr><td colspan=3><h3>'.$this->conn->databaseType.'</h3></td></tr>'.$this->titles;
+		}
 		
 		$oldc = false;
 		$bgc = '';
-		foreach($this->settings as $name => $arr) {
-			if ($arr === false) break;
+		foreach($this->settings as $name => $arr)
+		{
+			if ($arr === false)
+			{
+				break;
+			}
 			
-			if (!is_string($name)) {
-				if ($cli) $html .= " -- $arr -- \n";
-				else $html .= "<tr bgcolor=$this->color><td colspan=3><i>$arr</i> &nbsp;</td></tr>";
+			if (!is_string($name))
+			{
+				if ($cli)
+				{
+					$html .= " -- $arr -- \n";
+				}
+				else {
+					$html .= "<tr bgcolor=$this->color><td colspan=3><i>$arr</i> &nbsp;</td></tr>";
+				}
 				continue;
 			}
 			
-			if (!is_array($arr)) break;
+			if (!is_array($arr))
+			{
+				break;
+			}
 			$category = $arr[0];
 			$how = $arr[1];
-			if (sizeof($arr)>2) $desc = $arr[2];
-			else $desc = ' &nbsp; ';
+			if (sizeof($arr)>2)
+			{
+				$desc = $arr[2];
+			}
+			else {
+				$desc = ' &nbsp; ';
+			}
 			
 			
-			if ($category == 'HIDE') continue;
+			if ($category == 'HIDE')
+			{
+				continue;
+			}
 			
 			$val = $this->_DBParameter($how);
 			
-			if ($desc && strncmp($desc,"=",1) === 0) {
+			if ($desc && strncmp($desc,"=",1) === 0)
+			{
 				$fn = substr($desc,1);
 				$desc = $this->$fn($val);
 			}
 			
-			if ($val === false) {
+			if ($val === false)
+			{
 				$m = $this->conn->ErrorMsg();
 				$val = "Error: $m"; 
-			} else {
-				if (is_numeric($val) && $val >= 256*1024) {
-					if ($val % (1024*1024) == 0) {
+			}
+			else
+			{
+				if (is_numeric($val) && $val >= 256*1024)
+				{
+					if ($val % (1024*1024) == 0)
+					{
 						$val /= (1024*1024);
 						$val .= 'M';
-					} else if ($val % 1024 == 0) {
+					}
+					else if ($val % 1024 == 0)
+					{
 						$val /= 1024;
 						$val .= 'K';
 					}
 					//$val = htmlspecialchars($val);
 				}
 			}
-			if ($category != $oldc) {
+			if ($category != $oldc)
+			{
 				$oldc = $category;
 				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;
 			}
-			if (strlen($desc)==0) $desc = '&nbsp;';
-			if (strlen($val)==0) $val = '&nbsp;';
-			if ($cli) {
+			if (strlen($desc)==0)
+			{
+				$desc = '&nbsp;';
+			}
+			if (strlen($val)==0)
+			{
+				$val = '&nbsp;';
+			}
+			if ($cli)
+			{
 				$html  .= str_replace('&nbsp;','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
 				
-			}else {
+			}
+			else
+			{
 				$html .= "<tr$bgc><td>".$name.'</td><td>'.$val.'</td><td>'.$desc."</td></tr>\n";
 			}
 		}
 		
-		if (!$cli) $html .= "</table>\n";
+		if (!$cli)
+		{
+			$html .= "</table>\n";
+		}
 		$this->conn->fnExecute = $saveE;
 			
 		return $html;	
@@ -846,7 +1144,10 @@ 
 	
 	function Tables($orderby='1')
 	{
-		if (!$this->tablesSQL) return false;
+		if (!$this->tablesSQL)
+		{
+			return false;
+		}
 		
 		$savelog = $this->conn->LogSQL(false);
 		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
@@ -858,7 +1159,10 @@ 
 
 	function CreateLogTable()
 	{
-		if (!$this->createTableSQL) return false;
+		if (!$this->createTableSQL)
+		{
+			return false;
+		}
 		
 		$savelog = $this->conn->LogSQL(false);
 		$ok = $this->conn->Execute($this->createTableSQL);
@@ -873,15 +1177,25 @@ 
 		$PHP_SELF = $_SERVER['PHP_SELF'];
 		$sql = isset($_REQUEST['sql']) ? $_REQUEST['sql'] : '';
 
-		if (isset($_SESSION['phplens_sqlrows'])) $rows = $_SESSION['phplens_sqlrows'];
-		else $rows = 3;
+		if (isset($_SESSION['phplens_sqlrows']))
+		{
+			$rows = $_SESSION['phplens_sqlrows'];
+		}
+		else {
+			$rows = 3;
+		}
 		
-		if (isset($_REQUEST['SMALLER'])) {
+		if (isset($_REQUEST['SMALLER']))
+		{
 			$rows /= 2;
-			if ($rows < 3) $rows = 3;
+			if ($rows < 3)
+			{
+				$rows = 3;
+			}
 			$_SESSION['phplens_sqlrows'] = $rows;
 		}
-		if (isset($_REQUEST['BIGGER'])) {
+		if (isset($_REQUEST['BIGGER']))
+		{
 			$rows *= 2;
 			$_SESSION['phplens_sqlrows'] = $rows;
 		}
@@ -903,40 +1217,62 @@ 
 </form>
 
 <?php
-		if (!isset($_REQUEST['sql'])) return;
+		if (!isset($_REQUEST['sql']))
+		{
+			return;
+		}
 		
 		$sql = $this->undomq(trim($sql));
-		if (substr($sql,strlen($sql)-1) === ';') {
+		if (substr($sql,strlen($sql)-1) === ';')
+		{
 			$print = true;
 			$sqla = $this->SplitSQL($sql);
-		} else  {
+		}
+		else
+		{
 			$print = false;
 			$sqla = array($sql);
 		}
-		foreach($sqla as $sqls) {
+		foreach($sqla as $sqls)
+		{
 
-			if (!$sqls) continue;
+			if (!$sqls)
+			{
+				continue;
+			}
 			
-			if ($print) {
+			if ($print)
+			{
 				print "<p>".htmlspecialchars($sqls)."</p>";
 				flush();
 			}
 			$savelog = $this->conn->LogSQL(false);
 			$rs = $this->conn->Execute($sqls);
 			$this->conn->LogSQL($savelog);
-			if ($rs && is_object($rs) && !$rs->EOF) {
+			if ($rs && is_object($rs) && !$rs->EOF)
+			{
 				rs2html($rs);
-				while ($rs->NextRecordSet()) {
+				while ($rs->NextRecordSet())
+				{
 					print "<table width=98% bgcolor=#C0C0FF><tr><td>&nbsp;</td></tr></table>";
 					rs2html($rs);
 				}
-			} else {
+			}
+			else
+			{
 				$e1 = (integer) $this->conn->ErrorNo();
 				$e2 = $this->conn->ErrorMsg();
-				if (($e1) || ($e2)) {
-					if (empty($e1)) $e1 = '-1'; // postgresql fix
+				if (($e1) || ($e2))
+				{
+					if (empty($e1))
+					{
+						$e1 = '-1';
+					}
+					// postgresql fix
 					print ' &nbsp; '.$e1.': '.$e2;
-				} else {
+				}
+				else
+				{
 					print "<p>No Recordset returned<br></p>";
 				}
 			}
@@ -949,9 +1285,10 @@ 
 		return $arr;
 	}
 	
-	function undomq(&$m) 
+	function undomq(&$m)
+	{
+	if (get_magic_quotes_gpc())
 	{
-	if (get_magic_quotes_gpc()) {
 		// undo the damage
 		$m = str_replace('\\\\','\\',$m);
 		$m = str_replace('\"','"',$m);
@@ -991,16 +1328,21 @@ 
         $args = func_get_args();
         $numArgs = func_num_args();
         
-        if ( $numArgs == 0) return false;
+        if ( $numArgs == 0)
+        {
+        	return false;
+        }
         
         $mode = ADODB_OPT_LOW; 
         $lastArg = $args[ $numArgs - 1];
-        if ( !is_string($lastArg)) {
+        if ( !is_string($lastArg))
+        {
             $mode = $lastArg;
             unset( $args[ $numArgs - 1]);
         }
         
-        foreach( $args as $table) {
+        foreach( $args as $table)
+        {
             $this->optimizeTable( $table, $mode);
         }
 	}
@@ -1017,7 +1359,7 @@ 
      * @author Markus Staab
      * @return Returns <code>true</code> on success and <code>false</code> on error
      */
-    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
+    function OptimizeTable( $table, $mode = ADODB_OPT_LOW)
     {
         ADOConnection::outp( sprintf( "<p>%s: '%s' not implemented for driver '%s'</p>", __CLASS__, __FUNCTION__, $this->conn->databaseType));
         return false;
@@ -1031,16 +1373,24 @@ 
      * @author Markus Staab
      * @return Returns <code>true</code> on success and <code>false</code> on error
      */
-    function optimizeDatabase() 
+    function optimizeDatabase()
     {
         $conn = $this->conn;
-        if ( !$conn) return false;
+        if ( !$conn)
+        {
+        	return false;
+        }
         
         $tables = $conn->MetaTables( 'TABLES');
-        if ( !$tables ) return false;
+        if ( !$tables )
+        {
+        	return false;
+        }
 
-        foreach( $tables as $table) {
-            if ( !$this->optimizeTable( $table)) {
+        foreach( $tables as $table)
+        {
+            if ( !$this->optimizeTable( $table))
+            {
                 return false;
             }
         }

phpgwapi/inc/adodb/adodb-time.inc.php

Doc Comments +7 added lines

@@ -376,6 +376,10 @@ 
 
 if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
 
+/**
+ * @param integer $y1
+ * @param integer $m
+ */
 function adodb_date_test_date($y1,$m,$d=13)
 {
 	$t = adodb_mktime(0,0,0,$m,$d,$y1);
@@ -387,6 +391,9 @@ 
 	return true;
 }
 
+/**
+ * @param string $fmt
+ */
 function adodb_date_test_strftime($fmt)
 {
 	$s1 = strftime($fmt);

Indentation +15 added lines, -29 removed lines

@@ -72,16 +72,12 @@ 
 =============================================================================
 
 FUNCTION DESCRIPTIONS
-
-
-** FUNCTION adodb_getdate($date=false)
+ ** FUNCTION adodb_getdate($date=false)
 
 Returns an array containing date information, as getdate(), but supports
 dates greater than 1901 to 2038. The local date/time format is derived from a 
 heuristic the first time adodb_getdate is called. 
-	 
-	 
-** FUNCTION adodb_date($fmt, $timestamp = false)
+ ** FUNCTION adodb_date($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted local date. If $timestamp is not defined, the
 current timestamp is used. Unlike the function date(), it supports dates
@@ -131,37 +127,27 @@ 
 	W - ISO-8601 week number of year, weeks starting on Monday 
 
 </pre>
-
-
-** FUNCTION adodb_date2($fmt, $isoDateString = false)
+ ** FUNCTION adodb_date2($fmt, $isoDateString = false)
 Same as adodb_date, but 2nd parameter accepts iso date, eg.
 
   adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
-
-  
-** FUNCTION adodb_gmdate($fmt, $timestamp = false)
+ ** FUNCTION adodb_gmdate($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
 current timestamp is used. Unlike the function date(), it supports dates
 outside the 1901 to 2038 range.
-
-
-** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])
+ ** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])
 
 Converts a local date to a unix timestamp.  Unlike the function mktime(), it supports
 dates outside the 1901 to 2038 range. All parameters are optional.
-
-
-** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
+ ** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
 
 Converts a gmt date to a unix timestamp.  Unlike the function gmmktime(), it supports
 dates outside the 1901 to 2038 range. Differs from gmmktime() in that all parameters
 are currently compulsory.
-
-** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)
+ ** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)
 Convert a timestamp to a formatted GMT date.
-
-** FUNCTION adodb_strftime($fmt, $timestamp = false)
+ ** FUNCTION adodb_strftime($fmt, $timestamp = false)
 
 Convert a timestamp to a formatted local date. Internally converts $fmt into 
 adodb_date format, then echo result.
@@ -578,17 +564,17 @@ 
 		$greg_correction = 0;
 	
 	if($month > 2)
-	    $month -= 2;
+		$month -= 2;
 	else {
-	    $month += 10;
-	    $year--;
+		$month += 10;
+		$year--;
 	}
 	
 	$day =  floor((13 * $month - 1) / 5) +
-	        $day + ($year % 100) +
-	        floor(($year % 100) / 4) +
-	        floor(($year / 100) / 4) - 2 *
-	        floor($year / 100) + 77 + $greg_correction;
+			$day + ($year % 100) +
+			floor(($year % 100) / 4) +
+			floor(($year / 100) / 4) - 2 *
+			floor($year / 100) + 77 + $greg_correction;
 	
 	return $day - 7 * floor($day / 7);
 }

Switch Indentation +136 added lines, -136 removed lines

@@ -958,105 +958,105 @@ 
 	*/
 	for ($i=0; $i < $max; $i++) {
 		switch($fmt[$i]) {
-		case 'T': $dates .= date('T');break;
-		// YEAR
-		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
-		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
+			case 'T': $dates .= date('T');break;
+			// YEAR
+			case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
+			case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
 		
-			// 4.3.11 uses '04 Jun 2004'
-			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
-				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
+				// 4.3.11 uses '04 Jun 2004'
+				// 4.3.8 uses  ' 4 Jun 2004'
+				$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
+					. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
 			
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
+				if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
 			
-			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
+				if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
 			
-			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
+				if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
 			
-			$gmt = adodb_get_gmt_diff();
-			$dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
+				$gmt = adodb_get_gmt_diff();
+				$dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
 				
-		case 'Y': $dates .= $year; break;
-		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
-		// MONTH
-		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
-		case 'Q': $dates .= ($month+3)>>2; break;
-		case 'n': $dates .= $month; break;
-		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
-		case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
-		// DAY
-		case 't': $dates .= $arr['ndays']; break;
-		case 'z': $dates .= $arr['yday']; break;
-		case 'w': $dates .= adodb_dow($year,$month,$day); break;
-		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'j': $dates .= $day; break;
-		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
-		case 'S': 
-			$d10 = $day % 10;
-			if ($d10 == 1) $dates .= 'st';
-			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
-			else if ($d10 == 3) $dates .= 'rd';
-			else $dates .= 'th';
-			break;
+			case 'Y': $dates .= $year; break;
+			case 'y': $dates .= substr($year,strlen($year)-2,2); break;
+			// MONTH
+			case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
+			case 'Q': $dates .= ($month+3)>>2; break;
+			case 'n': $dates .= $month; break;
+			case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
+			case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
+			// DAY
+			case 't': $dates .= $arr['ndays']; break;
+			case 'z': $dates .= $arr['yday']; break;
+			case 'w': $dates .= adodb_dow($year,$month,$day); break;
+			case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+			case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+			case 'j': $dates .= $day; break;
+			case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
+			case 'S': 
+				$d10 = $day % 10;
+				if ($d10 == 1) $dates .= 'st';
+				else if ($d10 == 2 && $day != 12) $dates .= 'nd';
+				else if ($d10 == 3) $dates .= 'rd';
+				else $dates .= 'th';
+				break;
 			
-		// HOUR
-		case 'Z':
-			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
-		case 'O': 
-			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
-			$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
+			// HOUR
+			case 'Z':
+				$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
+			case 'O': 
+				$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
+				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
 			
-		case 'H': 
-			if ($hour < 10) $dates .= '0'.$hour; 
-			else $dates .= $hour; 
-			break;
-		case 'h': 
-			if ($hour > 12) $hh = $hour - 12; 
-			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour;
-			}
+			case 'H': 
+				if ($hour < 10) $dates .= '0'.$hour; 
+				else $dates .= $hour; 
+				break;
+			case 'h': 
+				if ($hour > 12) $hh = $hour - 12; 
+				else {
+					if ($hour == 0) $hh = '12'; 
+					else $hh = $hour;
+				}
 			
-			if ($hh < 10) $dates .= '0'.$hh;
-			else $dates .= $hh;
-			break;
+				if ($hh < 10) $dates .= '0'.$hh;
+				else $dates .= $hh;
+				break;
 			
-		case 'G': 
-			$dates .= $hour;
-			break;
+			case 'G': 
+				$dates .= $hour;
+				break;
 			
-		case 'g':
-			if ($hour > 12) $hh = $hour - 12; 
-			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour; 
-			}
-			$dates .= $hh;
-			break;
-		// MINUTES
-		case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
-		// SECONDS
-		case 'U': $dates .= $d; break;
-		case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
-		// AM/PM
-		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
-		case 'a':
-			if ($hour>=12) $dates .= 'pm';
-			else $dates .= 'am';
-			break;
-		case 'A':
-			if ($hour>=12) $dates .= 'PM';
-			else $dates .= 'AM';
-			break;
-		default:
-			$dates .= $fmt[$i]; break;
-		// ESCAPE
-		case "\\": 
-			$i++;
-			if ($i < $max) $dates .= $fmt[$i];
-			break;
+			case 'g':
+				if ($hour > 12) $hh = $hour - 12; 
+				else {
+					if ($hour == 0) $hh = '12'; 
+					else $hh = $hour; 
+				}
+				$dates .= $hh;
+				break;
+			// MINUTES
+			case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
+			// SECONDS
+			case 'U': $dates .= $d; break;
+			case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
+			// AM/PM
+			// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
+			case 'a':
+				if ($hour>=12) $dates .= 'pm';
+				else $dates .= 'am';
+				break;
+			case 'A':
+				if ($hour>=12) $dates .= 'PM';
+				else $dates .= 'AM';
+				break;
+			default:
+				$dates .= $fmt[$i]; break;
+			// ESCAPE
+			case "\\": 
+				$i++;
+				if ($i < $max) $dates .= $fmt[$i];
+				break;
 		}
 	}
 	return $dates;
@@ -1222,55 +1222,55 @@ 
 		
 			$inpct = false;
 			switch($ch) {
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-			case 'E':
-			case 'O':
-				/* ignore format modifiers */
-				$inpct = true; 
-				break;
+				case '0':
+				case '1':
+				case '2':
+				case '3':
+				case '4':
+				case '5':
+				case '6':
+				case '7':
+				case '8':
+				case '9':
+				case 'E':
+				case 'O':
+					/* ignore format modifiers */
+					$inpct = true; 
+					break;
 				
-			case 'a': $fmtdate .= 'D'; break;
-			case 'A': $fmtdate .= 'l'; break;
-			case 'h':
-			case 'b': $fmtdate .= 'M'; break;
-			case 'B': $fmtdate .= 'F'; break;
-			case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
-			case 'C': $fmtdate .= '\C?'; break; // century
-			case 'd': $fmtdate .= 'd'; break;
-			case 'D': $fmtdate .= 'm/d/y'; break;
-			case 'e': $fmtdate .= 'j'; break;
-			case 'g': $fmtdate .= '\g?'; break; //?
-			case 'G': $fmtdate .= '\G?'; break; //?
-			case 'H': $fmtdate .= 'H'; break;
-			case 'I': $fmtdate .= 'h'; break;
-			case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd
-			case 'm': $fmtdate .= 'm'; break;
-			case 'M': $fmtdate .= 'i'; break;
-			case 'n': $fmtdate .= "\n"; break;
-			case 'p': $fmtdate .= 'a'; break;
-			case 'r': $fmtdate .= 'h:i:s a'; break;
-			case 'R': $fmtdate .= 'H:i:s'; break;
-			case 'S': $fmtdate .= 's'; break;
-			case 't': $fmtdate .= "\t"; break;
-			case 'T': $fmtdate .= 'H:i:s'; break;
-			case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-basde
-			case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
-			case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
-			case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-basde
-			case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'y': $fmtdate .= 'y'; break;
-			case 'Y': $fmtdate .= 'Y'; break;
-			case 'Z': $fmtdate .= 'T'; break;
+				case 'a': $fmtdate .= 'D'; break;
+				case 'A': $fmtdate .= 'l'; break;
+				case 'h':
+				case 'b': $fmtdate .= 'M'; break;
+				case 'B': $fmtdate .= 'F'; break;
+				case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
+				case 'C': $fmtdate .= '\C?'; break; // century
+				case 'd': $fmtdate .= 'd'; break;
+				case 'D': $fmtdate .= 'm/d/y'; break;
+				case 'e': $fmtdate .= 'j'; break;
+				case 'g': $fmtdate .= '\g?'; break; //?
+				case 'G': $fmtdate .= '\G?'; break; //?
+				case 'H': $fmtdate .= 'H'; break;
+				case 'I': $fmtdate .= 'h'; break;
+				case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd
+				case 'm': $fmtdate .= 'm'; break;
+				case 'M': $fmtdate .= 'i'; break;
+				case 'n': $fmtdate .= "\n"; break;
+				case 'p': $fmtdate .= 'a'; break;
+				case 'r': $fmtdate .= 'h:i:s a'; break;
+				case 'R': $fmtdate .= 'H:i:s'; break;
+				case 'S': $fmtdate .= 's'; break;
+				case 't': $fmtdate .= "\t"; break;
+				case 'T': $fmtdate .= 'H:i:s'; break;
+				case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-basde
+				case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+				case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
+				case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
+				case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-basde
+				case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+				case 'y': $fmtdate .= 'y'; break;
+				case 'Y': $fmtdate .= 'Y'; break;
+				case 'Z': $fmtdate .= 'T'; break;
 			}
 		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
 			$fmtdate .= "\\".$ch;

Spacing +154 added lines, -155 removed lines

@@ -359,7 +359,7 @@ 
 /*
 	Version Number
 */
-define('ADODB_DATE_VERSION',0.21);
+define('ADODB_DATE_VERSION', 0.21);
 
 /*
 	This code was originally for windows. But apparently this problem happens 
@@ -374,12 +374,12 @@ 
 	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
 */
 
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS', 1);
 
-function adodb_date_test_date($y1,$m,$d=13)
+function adodb_date_test_date($y1, $m, $d = 13)
 {
-	$t = adodb_mktime(0,0,0,$m,$d,$y1);
-	$rez = adodb_date('Y-n-j H:i:s',$t);
+	$t = adodb_mktime(0, 0, 0, $m, $d, $y1);
+	$rez = adodb_date('Y-n-j H:i:s', $t);
 	if ("$y1-$m-$d 00:00:00" != $rez) {
 		print "<b>$y1 error, expected=$y1-$m-$d 00:00:00, adodb=$rez</b><br>";
 		return false;
@@ -410,55 +410,55 @@ 
 	$fail = false;
 	
 	// This flag disables calling of PHP native functions, so we can properly test the code
-	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
+	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES', 1);
 	
 	adodb_date_test_strftime('%Y %m %x %X');
 	adodb_date_test_strftime("%A %d %B %Y");
 	adodb_date_test_strftime("%H %M S");
 	
-	$t = adodb_mktime(0,0,0);
-	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'<br>';
+	$t = adodb_mktime(0, 0, 0);
+	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0, 0, 0).'<br>';
 	
-	$t = adodb_mktime(0,0,0,6,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
+	$t = adodb_mktime(0, 0, 0, 6, 1, 2102);
+	if (!(adodb_date('Y-m-d', $t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d', $t).'<br>';
 	
-	$t = adodb_mktime(0,0,0,2,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
+	$t = adodb_mktime(0, 0, 0, 2, 1, 2102);
+	if (!(adodb_date('Y-m-d', $t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d', $t).'<br>';
 	
 	
 	print "<p>Testing gregorian <=> julian conversion<p>";
-	$t = adodb_mktime(0,0,0,10,11,1492);
+	$t = adodb_mktime(0, 0, 0, 10, 11, 1492);
 	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
-	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing<br>';
+	if (!(adodb_date('D Y-m-d', $t) == 'Fri 1492-10-11')) print 'Error in Columbus landing<br>';
 	
-	$t = adodb_mktime(0,0,0,2,29,1500);
-	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years<br>';
+	$t = adodb_mktime(0, 0, 0, 2, 29, 1500);
+	if (!(adodb_date('Y-m-d', $t) == '1500-02-29')) print 'Error in julian leap years<br>';
 	
-	$t = adodb_mktime(0,0,0,2,29,1700);
-	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years<br>';
+	$t = adodb_mktime(0, 0, 0, 2, 29, 1700);
+	if (!(adodb_date('Y-m-d', $t) == '1700-03-01')) print 'Error in gregorian leap years<br>';
 	
-	print  adodb_mktime(0,0,0,10,4,1582).' ';
-	print adodb_mktime(0,0,0,10,15,1582);
-	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
-	if ($diff != 3600*24) print " <b>Error in gregorian correction = ".($diff/3600/24)." days </b><br>";
+	print  adodb_mktime(0, 0, 0, 10, 4, 1582).' ';
+	print adodb_mktime(0, 0, 0, 10, 15, 1582);
+	$diff = (adodb_mktime(0, 0, 0, 10, 15, 1582) - adodb_mktime(0, 0, 0, 10, 4, 1582));
+	if ($diff != 3600 * 24) print " <b>Error in gregorian correction = ".($diff / 3600 / 24)." days </b><br>";
 		
-	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : '<b>Error</b>')."<br>";
-	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : '<b>Error</b>')."<br>";
+	print " 15 Oct 1582, Fri=".(adodb_dow(1582, 10, 15) == 5 ? 'Fri' : '<b>Error</b>')."<br>";
+	print " 4 Oct 1582, Thu=".(adodb_dow(1582, 10, 4) == 4 ? 'Thu' : '<b>Error</b>')."<br>";
 	
 	print "<p>Testing overflow<p>";
 	
-	$t = adodb_mktime(0,0,0,3,33,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 <br>';
-	$t = adodb_mktime(0,0,0,4,33,1971);
-	if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day overflow 2 <br>';
-	$t = adodb_mktime(0,0,0,1,60,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day overflow 3 '.adodb_date('Y-m-d',$t).' <br>';
-	$t = adodb_mktime(0,0,0,12,32,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day overflow 4 '.adodb_date('Y-m-d',$t).' <br>';
-	$t = adodb_mktime(0,0,0,12,63,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
-	$t = adodb_mktime(0,0,0,13,3,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 <br>';
+	$t = adodb_mktime(0, 0, 0, 3, 33, 1965);
+	if (!(adodb_date('Y-m-d', $t) == '1965-04-02')) print 'Error in day overflow 1 <br>';
+	$t = adodb_mktime(0, 0, 0, 4, 33, 1971);
+	if (!(adodb_date('Y-m-d', $t) == '1971-05-03')) print 'Error in day overflow 2 <br>';
+	$t = adodb_mktime(0, 0, 0, 1, 60, 1965);
+	if (!(adodb_date('Y-m-d', $t) == '1965-03-01')) print 'Error in day overflow 3 '.adodb_date('Y-m-d', $t).' <br>';
+	$t = adodb_mktime(0, 0, 0, 12, 32, 1965);
+	if (!(adodb_date('Y-m-d', $t) == '1966-01-01')) print 'Error in day overflow 4 '.adodb_date('Y-m-d', $t).' <br>';
+	$t = adodb_mktime(0, 0, 0, 12, 63, 1965);
+	if (!(adodb_date('Y-m-d', $t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d', $t).' <br>';
+	$t = adodb_mktime(0, 0, 0, 13, 3, 1965);
+	if (!(adodb_date('Y-m-d', $t) == '1966-01-03')) print 'Error in mth overflow 1 <br>';
 	
 	print "Testing 2-digit => 4-digit year conversion<p>";
 	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
@@ -472,24 +472,24 @@ 
 	// Test string formating
 	print "<p>Testing date formating</p>";
 	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C822 r s t U w y Y z Z 2003';
-	$s1 = date($fmt,0);
-	$s2 = adodb_date($fmt,0);
+	$s1 = date($fmt, 0);
+	$s2 = adodb_date($fmt, 0);
 	if ($s1 != $s2) {
 		print " date() 0 failed<br>$s1<br>$s2<br>";
 	}
 	flush();
-	for ($i=100; --$i > 0; ) {
+	for ($i = 100; --$i > 0;) {
 
-		$ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);
-		$s1 = date($fmt,$ts);
-		$s2 = adodb_date($fmt,$ts);
+		$ts = 3600.0 * ((rand() % 60000) + (rand() % 60000)) + (rand() % 60000);
+		$s1 = date($fmt, $ts);
+		$s2 = adodb_date($fmt, $ts);
 		//print "$s1 <br>$s2 <p>";
-		$pos = strcmp($s1,$s2);
+		$pos = strcmp($s1, $s2);
 
 		if (($s1) != ($s2)) {
-			for ($j=0,$k=strlen($s1); $j < $k; $j++) {
+			for ($j = 0, $k = strlen($s1); $j < $k; $j++) {
 				if ($s1[$j] != $s2[$j]) {
-					print substr($s1,$j).' ';
+					print substr($s1, $j).' ';
 					break;
 				}
 			}
@@ -501,8 +501,8 @@ 
 		
 		$a1 = getdate($ts);
 		$a2 = adodb_getdate($ts);
-		$rez = array_diff($a1,$a2);
-		if (sizeof($rez)>0) {
+		$rez = array_diff($a1, $a2);
+		if (sizeof($rez) > 0) {
 			print "<b>Error getdate() $ts</b><br>";
 				print_r($a1);
 			print "<br>";
@@ -514,36 +514,36 @@ 
 	
 	// Test generation of dates outside 1901-2038
 	print "<p>Testing random dates between 100 and 4000</p>";
-	adodb_date_test_date(100,1);
-	for ($i=100; --$i >= 0;) {
-		$y1 = 100+rand(0,1970-100);
-		$m = rand(1,12);
-		adodb_date_test_date($y1,$m);
+	adodb_date_test_date(100, 1);
+	for ($i = 100; --$i >= 0;) {
+		$y1 = 100 + rand(0, 1970 - 100);
+		$m = rand(1, 12);
+		adodb_date_test_date($y1, $m);
 		
-		$y1 = 3000-rand(0,3000-1970);
-		adodb_date_test_date($y1,$m);
+		$y1 = 3000 - rand(0, 3000 - 1970);
+		adodb_date_test_date($y1, $m);
 	}
 	print '<p>';
-	$start = 1960+rand(0,10);
+	$start = 1960 + rand(0, 10);
 	$yrs = 12;
-	$i = 365.25*86400*($start-1970);
-	$offset = 36000+rand(10000,60000);
-	$max = 365*$yrs*86400;
+	$i = 365.25 * 86400 * ($start - 1970);
+	$offset = 36000 + rand(10000, 60000);
+	$max = 365 * $yrs * 86400;
 	$lastyear = 0;
 	
 	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
 	// and check if the roundtrip broke the original timestamp value.
-	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
+	print "Testing $start to ".($start + $yrs).", or $max seconds, offset=$offset: ";
 	$cnt = 0;
 	for ($max += $i; $i < $max; $i += $offset) {
-		$ret = adodb_date('m,d,Y,H,i,s',$i);
-		$arr = explode(',',$ret);
+		$ret = adodb_date('m,d,Y,H,i,s', $i);
+		$arr = explode(',', $ret);
 		if ($lastyear != $arr[2]) {
 			$lastyear = $arr[2];
 			print " $lastyear ";
 			flush();
 		}
-		$newi = adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);
+		$newi = adodb_mktime($arr[3], $arr[4], $arr[5], $arr[0], $arr[1], $arr[2]);
 		if ($i != $newi) {
 			print "Error at $i, adodb_mktime returned $newi ($ret)";
 			$fail = true;
@@ -577,14 +577,14 @@ 
 	} else
 		$greg_correction = 0;
 	
-	if($month > 2)
+	if ($month > 2)
 	    $month -= 2;
 	else {
 	    $month += 10;
 	    $year--;
 	}
 	
-	$day =  floor((13 * $month - 1) / 5) +
+	$day = floor((13 * $month - 1) / 5) +
 	        $day + ($year % 100) +
 	        floor(($year % 100) / 4) +
 	        floor(($year / 100) / 4) - 2 *
@@ -605,7 +605,7 @@ 
 	if ($year % 400 == 0) {
 		return true;
 	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
-	} else if ($year > 1582 && $year % 100 == 0 ) {
+	} else if ($year > 1582 && $year % 100 == 0) {
 		return false;
 	} 
 	
@@ -629,10 +629,10 @@ 
 {
 	if ($y < 100) {
 	
-		$yr = (integer) date("Y");
-		$century = (integer) ($yr /100);
+		$yr = (integer)date("Y");
+		$century = (integer)($yr / 100);
 		
-		if ($yr%100 > 50) {
+		if ($yr % 100 > 50) {
 			$c1 = $century + 1;
 			$c0 = $century;
 		} else {
@@ -642,8 +642,8 @@ 
 		$c1 *= 100;
 		// if 2-digit year is less than 30 years in future, set it to this century
 		// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-		if (($y + $c1) < $yr+30) $y = $y + $c1;
-		else $y = $y + $c0*100;
+		if (($y + $c1) < $yr + 30) $y = $y + $c1;
+		else $y = $y + $c0 * 100;
 	}
 	return $y;
 }
@@ -656,14 +656,14 @@ 
 static $TZ;
 	if (isset($TZ)) return $TZ;
 	
-	$TZ = mktime(0,0,0,1,2,1970) - gmmktime(0,0,0,1,2,1970);
+	$TZ = mktime(0, 0, 0, 1, 2, 1970) - gmmktime(0, 0, 0, 1, 2, 1970);
 	return $TZ;
 }
 
 /**
 	Returns an array with date info.
 */
-function adodb_getdate($d=false,$fast=false)
+function adodb_getdate($d = false, $fast = false)
 {
 	if ($d === false) return getdate();
 	if (!defined('ADODB_TEST_DATES')) {
@@ -700,20 +700,20 @@ 
 	$fast flag, which if set to true, will return fewer array values,
 	and is much faster as it does not calculate dow, etc.
 */
-function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
+function _adodb_getdate($origd = false, $fast = false, $is_gmt = false)
 {
 static $YRS;
 
-	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());
+	$d = $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());
 	
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
 	
-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
+	if ($d < -12219321600) $d -= 86400 * 10; // if 15 Oct 1582 or earlier, gregorian correction 
 	
-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	$_month_table_normal = array("", 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+	$_month_table_leaf = array("", 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 	
 	$d366 = $_day_power * 366;
 	$d365 = $_day_power * 365;
@@ -785,7 +785,7 @@ 
 		
 		$lastsecs = 0;
 		$lastyear = 1970;
-		foreach($YRS as $year => $secs) {
+		foreach ($YRS as $year => $secs) {
 			if ($d >= $secs) {
 				$a = $lastyear;
 				break;
@@ -816,7 +816,7 @@ 
 		
 		$d = $lastd;
 		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 13 ; --$a > 0;) {
+		for ($a = 13; --$a > 0;) {
 			$lastd = $d;
 			$d += $mtab[$a] * $_day_power;
 			if ($d >= 0) {
@@ -827,13 +827,13 @@ 
 		}
 		
 		$d = $lastd;
-		$day = $ndays + ceil(($d+1) / ($_day_power));
+		$day = $ndays + ceil(($d + 1) / ($_day_power));
 
-		$d += ($ndays - $day+1)* $_day_power;
-		$hour = floor($d/$_hour_power);
+		$d += ($ndays - $day + 1) * $_day_power;
+		$hour = floor($d / $_hour_power);
 	
 	} else {
-		for ($a = 1970 ;; $a++) {
+		for ($a = 1970; ; $a++) {
 			$lastd = $d;
 			
 			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
@@ -846,7 +846,7 @@ 
 		$secsInYear = $lastd;
 		$d = $lastd;
 		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 1 ; $a <= 12; $a++) {
+		for ($a = 1; $a <= 12; $a++) {
 			$lastd = $d;
 			$d -= $mtab[$a] * $_day_power;
 			if ($d < 0) {
@@ -856,13 +856,13 @@ 
 			}
 		}
 		$d = $lastd;
-		$day = ceil(($d+1) / $_day_power);
-		$d = $d - ($day-1) * $_day_power;
-		$hour = floor($d /$_hour_power);
+		$day = ceil(($d + 1) / $_day_power);
+		$d = $d - ($day - 1) * $_day_power;
+		$hour = floor($d / $_hour_power);
 	}
 	
 	$d -= $hour * $_hour_power;
-	$min = floor($d/$_min_power);
+	$min = floor($d / $_min_power);
 	$secs = $d - $min * $_min_power;
 	if ($fast) {
 		return array(
@@ -872,14 +872,14 @@ 
 		'mday' => $day,
 		'mon' => $month,
 		'year' => $year,
-		'yday' => floor($secsInYear/$_day_power),
+		'yday' => floor($secsInYear / $_day_power),
 		'leap' => $leaf,
 		'ndays' => $ndays
 		);
 	}
 	
 	
-	$dow = adodb_dow($year,$month,$day);
+	$dow = adodb_dow($year, $month, $day);
 
 	return array(
 		'seconds' => $secs,
@@ -889,55 +889,55 @@ 
 		'wday' => $dow,
 		'mon' => $month,
 		'year' => $year,
-		'yday' => floor($secsInYear/$_day_power),
-		'weekday' => gmdate('l',$_day_power*(3+$dow)),
-		'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
+		'yday' => floor($secsInYear / $_day_power),
+		'weekday' => gmdate('l', $_day_power * (3 + $dow)),
+		'month' => gmdate('F', mktime(0, 0, 0, $month, 2, 1971)),
 		0 => $origd
 	);
 }
 
-function adodb_gmdate($fmt,$d=false)
+function adodb_gmdate($fmt, $d = false)
 {
-	return adodb_date($fmt,$d,true);
+	return adodb_date($fmt, $d, true);
 }
 
 // accepts unix timestamp and iso date format in $d
-function adodb_date2($fmt, $d=false, $is_gmt=false)
+function adodb_date2($fmt, $d = false, $is_gmt = false)
 {
 	if ($d !== false) {
 		if (!preg_match( 
 			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
+			($d), $rr)) return adodb_date($fmt, false, $is_gmt);
 
-		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
+		if ($rr[1] <= 100 && $rr[2] <= 1) return adodb_date($fmt, false, $is_gmt);
 	
 		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+		if (!isset($rr[5])) $d = adodb_mktime(0, 0, 0, $rr[2], $rr[3], $rr[1]);
+		else $d = @adodb_mktime($rr[5], $rr[6], $rr[7], $rr[2], $rr[3], $rr[1]);
 	}
 	
-	return adodb_date($fmt,$d,$is_gmt);
+	return adodb_date($fmt, $d, $is_gmt);
 }
 
 
 /**
 	Return formatted date based on timestamp $d
 */
-function adodb_date($fmt,$d=false,$is_gmt=false)
+function adodb_date($fmt, $d = false, $is_gmt = false)
 {
 static $daylight;
 
-	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
+	if ($d === false) return ($is_gmt) ? @gmdate($fmt) : @date($fmt);
 	if (!defined('ADODB_TEST_DATES')) {
 		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
 			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
-				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
+				return ($is_gmt) ? @gmdate($fmt, $d) : @date($fmt, $d);
 
 		}
 	}
 	$_day_power = 86400;
 	
-	$arr = _adodb_getdate($d,true,$is_gmt);
+	$arr = _adodb_getdate($d, true, $is_gmt);
 	
 	if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
 	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
@@ -956,17 +956,17 @@ 
 		at this point, we have the following integer vars to manipulate:
 		$year, $month, $day, $hour, $min, $secs
 	*/
-	for ($i=0; $i < $max; $i++) {
-		switch($fmt[$i]) {
-		case 'T': $dates .= date('T');break;
+	for ($i = 0; $i < $max; $i++) {
+		switch ($fmt[$i]) {
+		case 'T': $dates .= date('T'); break;
 		// YEAR
 		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
 		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
 		
 			// 4.3.11 uses '04 Jun 2004'
 			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
-				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
+			$dates .= gmdate('D', $_day_power * (3 + adodb_dow($year, $month, $day))).', '		
+				. ($day < 10 ? '0'.$day : $day).' '.date('M', mktime(0, 0, 0, $month, 2, 1971)).' '.$year.' ';
 			
 			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
 			
@@ -975,24 +975,24 @@ 
 			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
 			
 			$gmt = adodb_get_gmt_diff();
-			$dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
+			$dates .= sprintf(' %s%04d', ($gmt < 0) ? '+' : '-', abs($gmt) / 36); break;
 				
 		case 'Y': $dates .= $year; break;
-		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
+		case 'y': $dates .= substr($year, strlen($year) - 2, 2); break;
 		// MONTH
-		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
-		case 'Q': $dates .= ($month+3)>>2; break;
+		case 'm': if ($month < 10) $dates .= '0'.$month; else $dates .= $month; break;
+		case 'Q': $dates .= ($month + 3) >> 2; break;
 		case 'n': $dates .= $month; break;
-		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
-		case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
+		case 'M': $dates .= date('M', mktime(0, 0, 0, $month, 2, 1971)); break;
+		case 'F': $dates .= date('F', mktime(0, 0, 0, $month, 2, 1971)); break;
 		// DAY
 		case 't': $dates .= $arr['ndays']; break;
 		case 'z': $dates .= $arr['yday']; break;
-		case 'w': $dates .= adodb_dow($year,$month,$day); break;
-		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+		case 'w': $dates .= adodb_dow($year, $month, $day); break;
+		case 'l': $dates .= gmdate('l', $_day_power * (3 + adodb_dow($year, $month, $day))); break;
+		case 'D': $dates .= gmdate('D', $_day_power * (3 + adodb_dow($year, $month, $day))); break;
 		case 'j': $dates .= $day; break;
-		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
+		case 'd': if ($day < 10) $dates .= '0'.$day; else $dates .= $day; break;
 		case 'S': 
 			$d10 = $day % 10;
 			if ($d10 == 1) $dates .= 'st';
@@ -1006,7 +1006,7 @@ 
 			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
 		case 'O': 
 			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
-			$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
+			$dates .= sprintf('%s%04d', ($gmt < 0) ? '+' : '-', abs($gmt) / 36); break;
 			
 		case 'H': 
 			if ($hour < 10) $dates .= '0'.$hour; 
@@ -1043,11 +1043,11 @@ 
 		// AM/PM
 		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
 		case 'a':
-			if ($hour>=12) $dates .= 'pm';
+			if ($hour >= 12) $dates .= 'pm';
 			else $dates .= 'am';
 			break;
 		case 'A':
-			if ($hour>=12) $dates .= 'PM';
+			if ($hour >= 12) $dates .= 'PM';
 			else $dates .= 'AM';
 			break;
 		default:
@@ -1066,9 +1066,9 @@ 
 	Returns a timestamp given a GMT/UTC time. 
 	Note that $is_dst is not implemented and is ignored.
 */
-function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
+function adodb_gmmktime($hr, $min, $sec, $mon = false, $day = false, $year = false, $is_dst = false)
 {
-	return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true);
+	return adodb_mktime($hr, $min, $sec, $mon, $day, $year, $is_dst, true);
 }
 
 /**
@@ -1077,12 +1077,12 @@ 
 	
 	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
 */
-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 
+function adodb_mktime($hr, $min, $sec, $mon = false, $day = false, $year = false, $is_dst = false, $is_gmt = false) 
 {
 	if (!defined('ADODB_TEST_DATES')) {
 
 		if ($mon === false) {
-			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
+			return $is_gmt ? @gmmktime($hr, $min, $sec) : @mktime($hr, $min, $sec);
 		}
 		
 		// for windows, we don't check 1970 because with timezone differences, 
@@ -1091,8 +1091,7 @@ 
 			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
 			) {
 				return $is_gmt ?
-					@gmmktime($hr,$min,$sec,$mon,$day,$year):
-					@mktime($hr,$min,$sec,$mon,$day,$year);
+					@gmmktime($hr, $min, $sec, $mon, $day, $year) : @mktime($hr, $min, $sec, $mon, $day, $year);
 			}
 	}
 	
@@ -1115,23 +1114,23 @@ 
 	if ($mon > 12) {
 		$y = floor($mon / 12);
 		$year += $y;
-		$mon -= $y*12;
+		$mon -= $y * 12;
 	} else if ($mon < 1) {
-		$y = ceil((1-$mon) / 12);
+		$y = ceil((1 - $mon) / 12);
 		$year -= $y;
-		$mon += $y*12;
+		$mon += $y * 12;
 	}
 	
 	$_day_power = 86400;
 	$_hour_power = 3600;
 	$_min_power = 60;
 	
-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	$_month_table_normal = array("", 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+	$_month_table_leaf = array("", 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 	
 	$_total_date = 0;
 	if ($year >= 1970) {
-		for ($a = 1970 ; $a <= $year; $a++) {
+		for ($a = 1970; $a <= $year; $a++) {
 			$leaf = _adodb_is_leap_year($a);
 			if ($leaf == true) {
 				$loop_table = $_month_table_leaf;
@@ -1143,16 +1142,16 @@ 
 			if ($a < $year) { 
 				$_total_date += $_add_date;
 			} else {
-				for($b=1;$b<$mon;$b++) {
+				for ($b = 1; $b < $mon; $b++) {
 					$_total_date += $loop_table[$b];
 				}
 			}
 		}
-		$_total_date +=$day-1;
+		$_total_date += $day - 1;
 		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
 	
 	} else {
-		for ($a = 1969 ; $a >= $year; $a--) {
+		for ($a = 1969; $a >= $year; $a--) {
 			$leaf = _adodb_is_leap_year($a);
 			if ($leaf == true) {
 				$loop_table = $_month_table_leaf;
@@ -1163,7 +1162,7 @@ 
 			}
 			if ($a > $year) { $_total_date += $_add_date;
 			} else {
-				for($b=12;$b>$mon;$b--) {
+				for ($b = 12; $b > $mon; $b--) {
 					$_total_date += $loop_table[$b];
 				}
 			}
@@ -1172,45 +1171,45 @@ 
 		
 		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
 		$_day_time = $_day_power - $_day_time;
-		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
-		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
+		$ret = -($_total_date * $_day_power + $_day_time - $gmt_different);
+		if ($ret < -12220185600) $ret += 10 * 86400; // if earlier than 5 Oct 1582 - gregorian correction
 		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
 	} 
 	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
 	return $ret;
 }
 
-function adodb_gmstrftime($fmt, $ts=false)
+function adodb_gmstrftime($fmt, $ts = false)
 {
-	return adodb_strftime($fmt,$ts,true);
+	return adodb_strftime($fmt, $ts, true);
 }
 
 // hack - convert to adodb_date
-function adodb_strftime($fmt, $ts=false,$is_gmt=false)
+function adodb_strftime($fmt, $ts = false, $is_gmt = false)
 {
 global $ADODB_DATE_LOCALE;
 
 	if (!defined('ADODB_TEST_DATES')) {
 		if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
 			if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0) // if windows, must be +ve integer
-				return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
+				return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);
 
 		}
 	}
 	
 	if (empty($ADODB_DATE_LOCALE)) {
-		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
-		$sep = substr($tstr,2,1);
-		$hasAM = strrpos($tstr,'M') !== false;
+		$tstr = strtoupper(gmstrftime('%c', 31366800)); // 30 Dec 1970, 1 am
+		$sep = substr($tstr, 2, 1);
+		$hasAM = strrpos($tstr, 'M') !== false;
 		
 		$ADODB_DATE_LOCALE = array();
-		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
-		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
+		$ADODB_DATE_LOCALE[] = strncmp($tstr, '30', 2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
+		$ADODB_DATE_LOCALE[] = ($hasAM) ? 'h:i:s a' : 'H:i:s';
 			
 	}
 	$inpct = false;
 	$fmtdate = '';
-	for ($i=0,$max = strlen($fmt); $i < $max; $i++) {
+	for ($i = 0, $max = strlen($fmt); $i < $max; $i++) {
 		$ch = $fmt[$i];
 		if ($ch == '%') {
 			if ($inpct) {
@@ -1221,7 +1220,7 @@ 
 		} else if ($inpct) {
 		
 			$inpct = false;
-			switch($ch) {
+			switch ($ch) {
 			case '0':
 			case '1':
 			case '2':
@@ -1263,16 +1262,16 @@ 
 			case 't': $fmtdate .= "\t"; break;
 			case 'T': $fmtdate .= 'H:i:s'; break;
 			case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-basde
-			case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+			case 'U': $fmtdate .= '?U'; $parseU = true; break; // wrong strftime=1-based, date=0-based
 			case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
 			case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
 			case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-basde
-			case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+			case 'W': $fmtdate .= '?W'; $parseU = true; break; // wrong strftime=1-based, date=0-based
 			case 'y': $fmtdate .= 'y'; break;
 			case 'Y': $fmtdate .= 'Y'; break;
 			case 'Z': $fmtdate .= 'T'; break;
 			}
-		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
+		} else if (('A' <= ($ch) && ($ch) <= 'Z') || ('a' <= ($ch) && ($ch) <= 'z'))
 			$fmtdate .= "\\".$ch;
 		else
 			$fmtdate .= $ch;

Braces +501 added lines, -160 removed lines

@@ -374,13 +374,17 @@ 
 	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
 */
 
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+if (!defined('ADODB_ALLOW_NEGATIVE_TS'))
+{
+	define('ADODB_NO_NEGATIVE_TS',1);
+}
 
 function adodb_date_test_date($y1,$m,$d=13)
 {
 	$t = adodb_mktime(0,0,0,$m,$d,$y1);
 	$rez = adodb_date('Y-n-j H:i:s',$t);
-	if ("$y1-$m-$d 00:00:00" != $rez) {
+	if ("$y1-$m-$d 00:00:00" != $rez)
+	{
 		print "<b>$y1 error, expected=$y1-$m-$d 00:00:00, adodb=$rez</b><br>";
 		return false;
 	}
@@ -392,7 +396,10 @@ 
 	$s1 = strftime($fmt);
 	$s2 = adodb_strftime($fmt);
 	
-	if ($s1 == $s2) return true;
+	if ($s1 == $s2)
+	{
+		return true;
+	}
 	
 	echo "error for $fmt,  strftime=$s1, $adodb=$s2<br>";
 	return false;
@@ -410,37 +417,61 @@ 
 	$fail = false;
 	
 	// This flag disables calling of PHP native functions, so we can properly test the code
-	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
+	if (!defined('ADODB_TEST_DATES'))
+	{
+		define('ADODB_TEST_DATES',1);
+	}
 	
 	adodb_date_test_strftime('%Y %m %x %X');
 	adodb_date_test_strftime("%A %d %B %Y");
 	adodb_date_test_strftime("%H %M S");
 	
 	$t = adodb_mktime(0,0,0);
-	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'<br>';
+	if (!(adodb_date('Y-m-d') == date('Y-m-d')))
+	{
+		print 'Error in '.adodb_mktime(0,0,0).'<br>';
+	}
 	
 	$t = adodb_mktime(0,0,0,6,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
+	if (!(adodb_date('Y-m-d',$t) == '2102-06-01'))
+	{
+		print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
+	}
 	
 	$t = adodb_mktime(0,0,0,2,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
+	if (!(adodb_date('Y-m-d',$t) == '2102-02-01'))
+	{
+		print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
+	}
 	
 	
 	print "<p>Testing gregorian <=> julian conversion<p>";
 	$t = adodb_mktime(0,0,0,10,11,1492);
 	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
-	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing<br>';
+	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11'))
+	{
+		print 'Error in Columbus landing<br>';
+	}
 	
 	$t = adodb_mktime(0,0,0,2,29,1500);
-	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years<br>';
+	if (!(adodb_date('Y-m-d',$t) == '1500-02-29'))
+	{
+		print 'Error in julian leap years<br>';
+	}
 	
 	$t = adodb_mktime(0,0,0,2,29,1700);
-	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years<br>';
+	if (!(adodb_date('Y-m-d',$t) == '1700-03-01'))
+	{
+		print 'Error in gregorian leap years<br>';
+	}
 	
 	print  adodb_mktime(0,0,0,10,4,1582).' ';
 	print adodb_mktime(0,0,0,10,15,1582);
 	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
-	if ($diff != 3600*24) print " <b>Error in gregorian correction = ".($diff/3600/24)." days </b><br>";
+	if ($diff != 3600*24)
+	{
+		print " <b>Error in gregorian correction = ".($diff/3600/24)." days </b><br>";
+	}
 		
 	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : '<b>Error</b>')."<br>";
 	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : '<b>Error</b>')."<br>";
@@ -448,37 +479,78 @@ 
 	print "<p>Testing overflow<p>";
 	
 	$t = adodb_mktime(0,0,0,3,33,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 <br>';
+	if (!(adodb_date('Y-m-d',$t) == '1965-04-02'))
+	{
+		print 'Error in day overflow 1 <br>';
+	}
 	$t = adodb_mktime(0,0,0,4,33,1971);
-	if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day overflow 2 <br>';
+	if (!(adodb_date('Y-m-d',$t) == '1971-05-03'))
+	{
+		print 'Error in day overflow 2 <br>';
+	}
 	$t = adodb_mktime(0,0,0,1,60,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day overflow 3 '.adodb_date('Y-m-d',$t).' <br>';
+	if (!(adodb_date('Y-m-d',$t) == '1965-03-01'))
+	{
+		print 'Error in day overflow 3 '.adodb_date('Y-m-d',$t).' <br>';
+	}
 	$t = adodb_mktime(0,0,0,12,32,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day overflow 4 '.adodb_date('Y-m-d',$t).' <br>';
+	if (!(adodb_date('Y-m-d',$t) == '1966-01-01'))
+	{
+		print 'Error in day overflow 4 '.adodb_date('Y-m-d',$t).' <br>';
+	}
 	$t = adodb_mktime(0,0,0,12,63,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
+	if (!(adodb_date('Y-m-d',$t) == '1966-02-01'))
+	{
+		print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
+	}
 	$t = adodb_mktime(0,0,0,13,3,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 <br>';
+	if (!(adodb_date('Y-m-d',$t) == '1966-01-03'))
+	{
+		print 'Error in mth overflow 1 <br>';
+	}
 	
 	print "Testing 2-digit => 4-digit year conversion<p>";
-	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
-	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";
-	if (adodb_year_digit_check(20) != 2020) print "Err 2-digit 2020<br>";
-	if (adodb_year_digit_check(30) != 2030) print "Err 2-digit 2030<br>";
-	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";
-	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";
-	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";
+	if (adodb_year_digit_check(00) != 2000)
+	{
+		print "Err 2-digit 2000<br>";
+	}
+	if (adodb_year_digit_check(10) != 2010)
+	{
+		print "Err 2-digit 2010<br>";
+	}
+	if (adodb_year_digit_check(20) != 2020)
+	{
+		print "Err 2-digit 2020<br>";
+	}
+	if (adodb_year_digit_check(30) != 2030)
+	{
+		print "Err 2-digit 2030<br>";
+	}
+	if (adodb_year_digit_check(40) != 1940)
+	{
+		print "Err 2-digit 1940<br>";
+	}
+	if (adodb_year_digit_check(50) != 1950)
+	{
+		print "Err 2-digit 1950<br>";
+	}
+	if (adodb_year_digit_check(90) != 1990)
+	{
+		print "Err 2-digit 1990<br>";
+	}
 	
 	// Test string formating
 	print "<p>Testing date formating</p>";
 	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C822 r s t U w y Y z Z 2003';
 	$s1 = date($fmt,0);
 	$s2 = adodb_date($fmt,0);
-	if ($s1 != $s2) {
+	if ($s1 != $s2)
+	{
 		print " date() 0 failed<br>$s1<br>$s2<br>";
 	}
 	flush();
-	for ($i=100; --$i > 0; ) {
+	for ($i=100; --$i > 0; )
+	{
 
 		$ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);
 		$s1 = date($fmt,$ts);
@@ -486,9 +558,12 @@ 
 		//print "$s1 <br>$s2 <p>";
 		$pos = strcmp($s1,$s2);
 
-		if (($s1) != ($s2)) {
-			for ($j=0,$k=strlen($s1); $j < $k; $j++) {
-				if ($s1[$j] != $s2[$j]) {
+		if (($s1) != ($s2))
+		{
+			for ($j=0,$k=strlen($s1); $j < $k; $j++)
+			{
+				if ($s1[$j] != $s2[$j])
+				{
 					print substr($s1,$j).' ';
 					break;
 				}
@@ -502,7 +577,8 @@ 
 		$a1 = getdate($ts);
 		$a2 = adodb_getdate($ts);
 		$rez = array_diff($a1,$a2);
-		if (sizeof($rez)>0) {
+		if (sizeof($rez)>0)
+		{
 			print "<b>Error getdate() $ts</b><br>";
 				print_r($a1);
 			print "<br>";
@@ -515,7 +591,8 @@ 
 	// Test generation of dates outside 1901-2038
 	print "<p>Testing random dates between 100 and 4000</p>";
 	adodb_date_test_date(100,1);
-	for ($i=100; --$i >= 0;) {
+	for ($i=100; --$i >= 0;)
+	{
 		$y1 = 100+rand(0,1970-100);
 		$m = rand(1,12);
 		adodb_date_test_date($y1,$m);
@@ -535,16 +612,19 @@ 
 	// and check if the roundtrip broke the original timestamp value.
 	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
 	$cnt = 0;
-	for ($max += $i; $i < $max; $i += $offset) {
+	for ($max += $i; $i < $max; $i += $offset)
+	{
 		$ret = adodb_date('m,d,Y,H,i,s',$i);
 		$arr = explode(',',$ret);
-		if ($lastyear != $arr[2]) {
+		if ($lastyear != $arr[2])
+		{
 			$lastyear = $arr[2];
 			print " $lastyear ";
 			flush();
 		}
 		$newi = adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);
-		if ($i != $newi) {
+		if ($i != $newi)
+		{
 			print "Error at $i, adodb_mktime returned $newi ($ret)";
 			$fail = true;
 			break;
@@ -552,9 +632,14 @@ 
 		$cnt += 1;
 	}
 	echo "Tested $cnt dates<br>";
-	if (!$fail) print "<p>Passed !</p>";
-	else print "<p><b>Failed</b> :-(</p>";
-}
+	if (!$fail)
+	{
+		print "<p>Passed !</p>";
+	}
+	else {
+		print "<p><b>Failed</b> :-(</p>";
+	}
+	}
 
 /**
 	Returns day of week, 0 = Sunday,... 6=Saturday. 
@@ -569,17 +654,27 @@ 
 
 Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 
 */
-	if ($year <= 1582) {
+	if ($year <= 1582)
+	{
 		if ($year < 1582 || 
-			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
-		 else
+			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15))))
+		{
+			$greg_correction = 3;
+		}
+		 else {
+		 			$greg_correction = 0;
+		 }
+	}
+	else {
 			$greg_correction = 0;
-	} else
-		$greg_correction = 0;
+	}
 	
 	if($month > 2)
-	    $month -= 2;
-	else {
+	{
+		    $month -= 2;
+	}
+	else
+	{
 	    $month += 10;
 	    $year--;
 	}
@@ -598,14 +693,20 @@ 
  Checks for leap year, returns true if it is. No 2-digit year check. Also 
  handles julian calendar correctly.
 */
-function _adodb_is_leap_year($year) 
+function _adodb_is_leap_year($year)
 {
-	if ($year % 4 != 0) return false;
+	if ($year % 4 != 0)
+	{
+		return false;
+	}
 	
-	if ($year % 400 == 0) {
+	if ($year % 400 == 0)
+	{
 		return true;
 	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
-	} else if ($year > 1582 && $year % 100 == 0 ) {
+	}
+	else if ($year > 1582 && $year % 100 == 0 )
+	{
 		return false;
 	} 
 	
@@ -616,7 +717,7 @@ 
 /**
  checks for leap year, returns true if it is. Has 2-digit year check
 */
-function adodb_is_leap_year($year) 
+function adodb_is_leap_year($year)
 {
 	return  _adodb_is_leap_year(adodb_year_digit_check($year));
 }
@@ -625,25 +726,34 @@ 
 	Fix 2-digit years. Works for any century.
  	Assumes that if 2-digit is more than 30 years in future, then previous century.
 */
-function adodb_year_digit_check($y) 
+function adodb_year_digit_check($y)
 {
-	if ($y < 100) {
+	if ($y < 100)
+	{
 	
 		$yr = (integer) date("Y");
 		$century = (integer) ($yr /100);
 		
-		if ($yr%100 > 50) {
+		if ($yr%100 > 50)
+		{
 			$c1 = $century + 1;
 			$c0 = $century;
-		} else {
+		}
+		else
+		{
 			$c1 = $century;
 			$c0 = $century - 1;
 		}
 		$c1 *= 100;
 		// if 2-digit year is less than 30 years in future, set it to this century
 		// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-		if (($y + $c1) < $yr+30) $y = $y + $c1;
-		else $y = $y + $c0*100;
+		if (($y + $c1) < $yr+30)
+		{
+			$y = $y + $c1;
+		}
+		else {
+			$y = $y + $c0*100;
+		}
 	}
 	return $y;
 }
@@ -651,10 +761,13 @@ 
 /**
  get local time zone offset from GMT
 */
-function adodb_get_gmt_diff() 
+function adodb_get_gmt_diff()
 {
 static $TZ;
-	if (isset($TZ)) return $TZ;
+	if (isset($TZ))
+	{
+		return $TZ;
+	}
 	
 	$TZ = mktime(0,0,0,1,2,1970) - gmmktime(0,0,0,1,2,1970);
 	return $TZ;
@@ -665,11 +778,20 @@ 
 */
 function adodb_getdate($d=false,$fast=false)
 {
-	if ($d === false) return getdate();
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
+	if ($d === false)
+	{
+		return getdate();
+	}
+	if (!defined('ADODB_TEST_DATES'))
+	{
+		if ((abs($d) <= 0x7FFFFFFF))
+		{
+// check if number in 32-bit signed range
+			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0)
+			{
+				// if windows, must be +ve integer
 				return @getdate($d);
+			}
 		}
 	}
 	return _adodb_getdate($d);
@@ -710,7 +832,11 @@ 
 	$_hour_power = 3600;
 	$_min_power = 60;
 	
-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
+	if ($d < -12219321600)
+	{
+		$d -= 86400*10;
+	}
+	// if 15 Oct 1582 or earlier, gregorian correction 
 	
 	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
@@ -718,9 +844,12 @@ 
 	$d366 = $_day_power * 366;
 	$d365 = $_day_power * 365;
 	
-	if ($d < 0) {
+	if ($d < 0)
+	{
 		
-		if (empty($YRS)) $YRS = array(
+		if (empty($YRS))
+		{
+			$YRS = array(
 			1970 => 0,
 			1960 => -315619200,
 			1950 => -631152000,
@@ -759,8 +888,12 @@ 
 			1620 => -11044944000,
 			1610 => -11360476800,
 			1600 => -11676096000);
+		}
 
-		if ($is_gmt) $origd = $d;
+		if ($is_gmt)
+		{
+			$origd = $d;
+		}
 		// The valid range of a 32bit signed timestamp is typically from 
 		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
 		//
@@ -785,8 +918,10 @@ 
 		
 		$lastsecs = 0;
 		$lastyear = 1970;
-		foreach($YRS as $year => $secs) {
-			if ($d >= $secs) {
+		foreach($YRS as $year => $secs)
+		{
+			if ($d >= $secs)
+			{
 				$a = $lastyear;
 				break;
 			}
@@ -795,17 +930,27 @@ 
 		}
 		
 		$d -= $lastsecs;
-		if (!isset($a)) $a = $lastyear;
+		if (!isset($a))
+		{
+			$a = $lastyear;
+		}
 		
 		//echo ' yr=',$a,' ', $d,'.';
 		
-		for (; --$a >= 0;) {
+		for (; --$a >= 0;)
+		{
 			$lastd = $d;
 			
-			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
-			else $d += $d365;
+			if ($leaf = _adodb_is_leap_year($a))
+			{
+				$d += $d366;
+			}
+			else {
+				$d += $d365;
+			}
 			
-			if ($d >= 0) {
+			if ($d >= 0)
+			{
 				$year = $a;
 				break;
 			}
@@ -816,10 +961,12 @@ 
 		
 		$d = $lastd;
 		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 13 ; --$a > 0;) {
+		for ($a = 13 ; --$a > 0;)
+		{
 			$lastd = $d;
 			$d += $mtab[$a] * $_day_power;
-			if ($d >= 0) {
+			if ($d >= 0)
+			{
 				$month = $a;
 				$ndays = $mtab[$a];
 				break;
@@ -832,13 +979,22 @@ 
 		$d += ($ndays - $day+1)* $_day_power;
 		$hour = floor($d/$_hour_power);
 	
-	} else {
-		for ($a = 1970 ;; $a++) {
+	}
+	else
+	{
+		for ($a = 1970 ;; $a++)
+		{
 			$lastd = $d;
 			
-			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
-			else $d -= $d365;
-			if ($d < 0) {
+			if ($leaf = _adodb_is_leap_year($a))
+			{
+				$d -= $d366;
+			}
+			else {
+				$d -= $d365;
+			}
+			if ($d < 0)
+			{
 				$year = $a;
 				break;
 			}
@@ -846,10 +1002,12 @@ 
 		$secsInYear = $lastd;
 		$d = $lastd;
 		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 1 ; $a <= 12; $a++) {
+		for ($a = 1 ; $a <= 12; $a++)
+		{
 			$lastd = $d;
 			$d -= $mtab[$a] * $_day_power;
-			if ($d < 0) {
+			if ($d < 0)
+			{
 				$month = $a;
 				$ndays = $mtab[$a];
 				break;
@@ -864,7 +1022,8 @@ 
 	$d -= $hour * $_hour_power;
 	$min = floor($d/$_min_power);
 	$secs = $d - $min * $_min_power;
-	if ($fast) {
+	if ($fast)
+	{
 		return array(
 		'seconds' => $secs,
 		'minutes' => $min,
@@ -904,16 +1063,28 @@ 
 // accepts unix timestamp and iso date format in $d
 function adodb_date2($fmt, $d=false, $is_gmt=false)
 {
-	if ($d !== false) {
+	if ($d !== false)
+	{
 		if (!preg_match( 
 			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
-			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
+			($d), $rr))
+		{
+			return adodb_date($fmt,false,$is_gmt);
+		}
 
-		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
+		if ($rr[1] <= 100 && $rr[2]<= 1)
+		{
+			return adodb_date($fmt,false,$is_gmt);
+		}
 	
 		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
-		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+		if (!isset($rr[5]))
+		{
+			$d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+		}
+		else {
+			$d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+		}
 	}
 	
 	return adodb_date($fmt,$d,$is_gmt);
@@ -927,11 +1098,20 @@ 
 {
 static $daylight;
 
-	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
+	if ($d === false)
+	{
+		return ($is_gmt)? @gmdate($fmt): @date($fmt);
+	}
+	if (!defined('ADODB_TEST_DATES'))
+	{
+		if ((abs($d) <= 0x7FFFFFFF))
+		{
+// check if number in 32-bit signed range
+			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0)
+			{
+				// if windows, must be +ve integer
 				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
+			}
 
 		}
 	}
@@ -939,8 +1119,14 @@ 
 	
 	$arr = _adodb_getdate($d,true,$is_gmt);
 	
-	if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
-	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
+	if (!isset($daylight))
+	{
+		$daylight = function_exists('adodb_daylight_sv');
+	}
+	if ($daylight)
+	{
+		adodb_daylight_sv($arr, $is_gmt);
+	}
 	
 	$year = $arr['year'];
 	$month = $arr['mon'];
@@ -956,8 +1142,10 @@ 
 		at this point, we have the following integer vars to manipulate:
 		$year, $month, $day, $hour, $min, $secs
 	*/
-	for ($i=0; $i < $max; $i++) {
-		switch($fmt[$i]) {
+	for ($i=0; $i < $max; $i++)
+	{
+		switch($fmt[$i])
+		{
 		case 'T': $dates .= date('T');break;
 		// YEAR
 		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
@@ -968,11 +1156,29 @@ 
 			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
 				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
 			
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
+			if ($hour < 10)
+			{
+				$dates .= '0'.$hour;
+			}
+			else {
+				$dates .= $hour;
+			}
 			
-			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
+			if ($min < 10)
+			{
+				$dates .= ':0'.$min;
+			}
+			else {
+				$dates .= ':'.$min;
+			}
 			
-			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
+			if ($secs < 10)
+			{
+				$dates .= ':0'.$secs;
+			}
+			else {
+				$dates .= ':'.$secs;
+			}
 			
 			$gmt = adodb_get_gmt_diff();
 			$dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
@@ -980,7 +1186,14 @@ 
 		case 'Y': $dates .= $year; break;
 		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
 		// MONTH
-		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
+		case 'm': if ($month<10)
+		{
+			$dates .= '0'.$month;
+		}
+		else {
+			$dates .= $month;
+		}
+		break;
 		case 'Q': $dates .= ($month+3)>>2; break;
 		case 'n': $dates .= $month; break;
 		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
@@ -992,13 +1205,31 @@ 
 		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
 		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
 		case 'j': $dates .= $day; break;
-		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
+		case 'd': if ($day<10)
+		{
+			$dates .= '0'.$day;
+		}
+		else {
+			$dates .= $day;
+		}
+		break;
 		case 'S': 
 			$d10 = $day % 10;
-			if ($d10 == 1) $dates .= 'st';
-			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
-			else if ($d10 == 3) $dates .= 'rd';
-			else $dates .= 'th';
+			if ($d10 == 1)
+			{
+				$dates .= 'st';
+			}
+			else if ($d10 == 2 && $day != 12)
+			{
+				$dates .= 'nd';
+			}
+			else if ($d10 == 3)
+			{
+				$dates .= 'rd';
+			}
+			else {
+				$dates .= 'th';
+			}
 			break;
 			
 		// HOUR
@@ -1009,18 +1240,37 @@ 
 			$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break;
 			
 		case 'H': 
-			if ($hour < 10) $dates .= '0'.$hour; 
-			else $dates .= $hour; 
+			if ($hour < 10)
+			{
+				$dates .= '0'.$hour;
+			}
+			else {
+				$dates .= $hour;
+			}
 			break;
 		case 'h': 
-			if ($hour > 12) $hh = $hour - 12; 
-			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour;
+			if ($hour > 12)
+			{
+				$hh = $hour - 12;
+			}
+			else
+			{
+				if ($hour == 0)
+				{
+					$hh = '12';
+				}
+				else {
+					$hh = $hour;
+				}
 			}
 			
-			if ($hh < 10) $dates .= '0'.$hh;
-			else $dates .= $hh;
+			if ($hh < 10)
+			{
+				$dates .= '0'.$hh;
+			}
+			else {
+				$dates .= $hh;
+			}
 			break;
 			
 		case 'G': 
@@ -1028,34 +1278,70 @@ 
 			break;
 			
 		case 'g':
-			if ($hour > 12) $hh = $hour - 12; 
-			else {
-				if ($hour == 0) $hh = '12'; 
-				else $hh = $hour; 
+			if ($hour > 12)
+			{
+				$hh = $hour - 12;
+			}
+			else
+			{
+				if ($hour == 0)
+				{
+					$hh = '12';
+				}
+				else {
+					$hh = $hour;
+				}
 			}
 			$dates .= $hh;
 			break;
 		// MINUTES
-		case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
+		case 'i': if ($min < 10)
+		{
+			$dates .= '0'.$min;
+		}
+		else {
+			$dates .= $min;
+		}
+		break;
 		// SECONDS
 		case 'U': $dates .= $d; break;
-		case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
+		case 's': if ($secs < 10)
+		{
+			$dates .= '0'.$secs;
+		}
+		else {
+			$dates .= $secs;
+		}
+		break;
 		// AM/PM
 		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
 		case 'a':
-			if ($hour>=12) $dates .= 'pm';
-			else $dates .= 'am';
+			if ($hour>=12)
+			{
+				$dates .= 'pm';
+			}
+			else {
+				$dates .= 'am';
+			}
 			break;
 		case 'A':
-			if ($hour>=12) $dates .= 'PM';
-			else $dates .= 'AM';
+			if ($hour>=12)
+			{
+				$dates .= 'PM';
+			}
+			else {
+				$dates .= 'AM';
+			}
 			break;
 		default:
 			$dates .= $fmt[$i]; break;
 		// ESCAPE
 		case "\\": 
 			$i++;
-			if ($i < $max) $dates .= $fmt[$i];
+			if ($i < $max)
+			{
+				$dates .= $fmt[$i];
+			}
 			break;
 		}
 	}
@@ -1077,11 +1363,13 @@ 
 	
 	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
 */
-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 
+function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false)
 {
-	if (!defined('ADODB_TEST_DATES')) {
+	if (!defined('ADODB_TEST_DATES'))
+	{
 
-		if ($mon === false) {
+		if ($mon === false)
+		{
 			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
 		}
 		
@@ -1112,11 +1400,14 @@ 
 	
 	$year = adodb_year_digit_check($year);
 
-	if ($mon > 12) {
+	if ($mon > 12)
+	{
 		$y = floor($mon / 12);
 		$year += $y;
 		$mon -= $y*12;
-	} else if ($mon < 1) {
+	}
+	else if ($mon < 1)
+	{
 		$y = ceil((1-$mon) / 12);
 		$year -= $y;
 		$mon += $y*12;
@@ -1130,20 +1421,29 @@ 
 	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
 	
 	$_total_date = 0;
-	if ($year >= 1970) {
-		for ($a = 1970 ; $a <= $year; $a++) {
+	if ($year >= 1970)
+	{
+		for ($a = 1970 ; $a <= $year; $a++)
+		{
 			$leaf = _adodb_is_leap_year($a);
-			if ($leaf == true) {
+			if ($leaf == true)
+			{
 				$loop_table = $_month_table_leaf;
 				$_add_date = 366;
-			} else {
+			}
+			else
+			{
 				$loop_table = $_month_table_normal;
 				$_add_date = 365;
 			}
-			if ($a < $year) { 
+			if ($a < $year)
+			{
 				$_total_date += $_add_date;
-			} else {
-				for($b=1;$b<$mon;$b++) {
+			}
+			else
+			{
+				for($b=1;$b<$mon;$b++)
+				{
 					$_total_date += $loop_table[$b];
 				}
 			}
@@ -1151,19 +1451,30 @@ 
 		$_total_date +=$day-1;
 		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
 	
-	} else {
-		for ($a = 1969 ; $a >= $year; $a--) {
+	}
+	else
+	{
+		for ($a = 1969 ; $a >= $year; $a--)
+		{
 			$leaf = _adodb_is_leap_year($a);
-			if ($leaf == true) {
+			if ($leaf == true)
+			{
 				$loop_table = $_month_table_leaf;
 				$_add_date = 366;
-			} else {
+			}
+			else
+			{
 				$loop_table = $_month_table_normal;
 				$_add_date = 365;
 			}
-			if ($a > $year) { $_total_date += $_add_date;
-			} else {
-				for($b=12;$b>$mon;$b--) {
+			if ($a > $year)
+			{
+$_total_date += $_add_date;
+			}
+			else
+			{
+				for($b=12;$b>$mon;$b--)
+				{
 					$_total_date += $loop_table[$b];
 				}
 			}
@@ -1173,8 +1484,16 @@ 
 		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
 		$_day_time = $_day_power - $_day_time;
 		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
-		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
-		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
+		if ($ret < -12220185600)
+		{
+			$ret += 10*86400;
+		}
+		// if earlier than 5 Oct 1582 - gregorian correction
+		else if ($ret < -12219321600)
+		{
+			$ret = -12219321600;
+		}
+		// if in limbo, reset to 15 Oct 1582.
 	} 
 	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
 	return $ret;
@@ -1190,15 +1509,22 @@ 
 {
 global $ADODB_DATE_LOCALE;
 
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0) // if windows, must be +ve integer
+	if (!defined('ADODB_TEST_DATES'))
+	{
+		if ((abs($ts) <= 0x7FFFFFFF))
+		{
+// check if number in 32-bit signed range
+			if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0)
+			{
+				// if windows, must be +ve integer
 				return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
+			}
 
 		}
 	}
 	
-	if (empty($ADODB_DATE_LOCALE)) {
+	if (empty($ADODB_DATE_LOCALE))
+	{
 		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
 		$sep = substr($tstr,2,1);
 		$hasAM = strrpos($tstr,'M') !== false;
@@ -1210,18 +1536,26 @@ 
 	}
 	$inpct = false;
 	$fmtdate = '';
-	for ($i=0,$max = strlen($fmt); $i < $max; $i++) {
+	for ($i=0,$max = strlen($fmt); $i < $max; $i++)
+	{
 		$ch = $fmt[$i];
-		if ($ch == '%') {
-			if ($inpct) {
+		if ($ch == '%')
+		{
+			if ($inpct)
+			{
 				$fmtdate .= '%';
 				$inpct = false;
-			} else
-				$inpct = true;
-		} else if ($inpct) {
+			}
+			else {
+							$inpct = true;
+			}
+		}
+		else if ($inpct)
+		{
 		
 			$inpct = false;
-			switch($ch) {
+			switch($ch)
+			{
 			case '0':
 			case '1':
 			case '2':
@@ -1272,13 +1606,20 @@ 
 			case 'Y': $fmtdate .= 'Y'; break;
 			case 'Z': $fmtdate .= 'T'; break;
 			}
-		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
-			$fmtdate .= "\\".$ch;
-		else
-			$fmtdate .= $ch;
+		}
+		else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
+		{
+					$fmtdate .= "\\".$ch;
+		}
+		else {
+					$fmtdate .= $ch;
+		}
 	}
 	//echo "fmt=",$fmtdate,"<br>";
-	if ($ts === false) $ts = time();
+	if ($ts === false)
+	{
+		$ts = time();
+	}
 	$ret = adodb_date($fmtdate, $ts, $is_gmt);
 	return $ret;
 }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -533,7 +533,7 @@ 
 	
 	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
 	// and check if the roundtrip broke the original timestamp value.
-	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
+	print "testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
 	$cnt = 0;
 	for ($max += $i; $i < $max; $i += $offset) {
 		$ret = adodb_date('m,d,Y,H,i,s',$i);
@@ -551,7 +551,7 @@ 
 		}
 		$cnt += 1;
 	}
-	echo "Tested $cnt dates<br>";
+	echo "tested $cnt dates<br>";
 	if (!$fail) print "<p>Passed !</p>";
 	else print "<p><b>Failed</b> :-(</p>";
 }

phpgwapi/inc/adodb/adodb-xmlschema.inc.php

Doc Comments +13 added lines, -28 removed lines

@@ -231,8 +231,7 @@ 
 	/**
 	* Iniitializes a new table object.
 	*
-	* @param string $prefix DB Object prefix
-	* @param array $attributes Array of table attributes.
+	* @param adoSchema $parent
 	*/
 	function dbTable( &$parent, $attributes = NULL ) {
 		$this->parent =& $parent;
@@ -346,7 +345,7 @@ 
 	* Adds an index to a table object
 	*
 	* @param array $attributes Index attributes
-	* @return object dbIndex object
+	* @return dbIndex dbIndex object
 	*/
 	function &addIndex( $attributes ) {
 		$name = strtoupper( $attributes['NAME'] );
@@ -446,7 +445,7 @@ 
 	* and appends them to the table object.
 	*
 	* @param string $opt Table option
-	* @return array Options
+	* @return string[] Options
 	*/
 	function addTableOpt( $opt ) {
 		$this->opts[] = $opt;
@@ -621,7 +620,7 @@ 
 	/**
 	* Initializes the new dbIndex object.
 	*
-	* @param object $parent Parent object
+	* @param dbTable $parent Parent object
 	* @param array $attributes Attributes
 	*
 	* @internal
@@ -710,7 +709,7 @@ 
 	* Adds options to the index
 	*
 	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
+	* @return string[] Option list
 	*/
 	function addIndexOpt( $opt ) {
 		$this->opts[] = $opt;
@@ -765,7 +764,7 @@ 
 	/**
 	* Initializes the new dbIndex object.
 	*
-	* @param object $parent Parent object
+	* @param dbTable $parent Parent object
 	* @param array $attributes Attributes
 	*
 	* @internal
@@ -833,8 +832,6 @@ 
 	/**
 	* Adds a field to the index
 	*
-	* @param string $name Field name
-	* @return string Field list
 	*/
 	function addField( $attributes ) {
 		if( isset( $attributes['NAME'] ) ) {
@@ -850,8 +847,6 @@ 
 	/**
 	* Adds options to the index
 	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
 	*/
 	function addData( $cdata ) {
 		if( !isset( $this->data[$this->row] ) ) {
@@ -966,7 +961,7 @@ 
 	/**
 	* Initializes the query set.
 	*
-	* @param object $parent Parent object
+	* @param adoSchema $parent Parent object
 	* @param array $attributes Attributes
 	*/
 	function dbQuerySet( &$parent, $attributes = NULL ) {
@@ -1080,8 +1075,6 @@ 
 	/** 
 	* Appends a line to a query that is being built line by line
 	*
-	* @param string $data Line of SQL data or NULL to initialize a new query
-	* @return string SQL query string.
 	*/
 	function buildQuery( $sql = NULL ) {
 		if( !isset( $this->query ) OR empty( $sql ) ) {
@@ -1394,9 +1387,6 @@ 
 	* the filesystem and generate the SQL necessary to create the database described. 
 	* @see ParseSchemaString()
 	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
 	*/
 	function ParseSchema( $filename, $returnSchema = FALSE ) {
 		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
@@ -1408,12 +1398,6 @@ 
 	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
 	* and generate the SQL necessary to create the database described by the schema.
 	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*
-	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
-	* @see ParseSchema(), ParseSchemaString()
 	*/
 	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
 		// Open the file
@@ -1502,9 +1486,6 @@ 
 	* the filesystem and generate the SQL necessary to remove the database described.
 	* @see RemoveSchemaString()
 	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
 	*/
 	function RemoveSchema( $filename, $returnSchema = FALSE ) {
 		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
@@ -1582,7 +1563,7 @@ 
 	* parsed XML schema) to the filesystem.
 	*
 	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
+	* @return false|null TRUE if save is successful, else FALSE. 
 	*/
 	function SaveSQL( $filename = './schema.sql' ) {
 		
@@ -1604,7 +1585,7 @@ 
 	/**
 	* Create an xml parser
 	*
-	* @return object PHP XML parser object
+	* @return resource PHP XML parser object
 	*
 	* @access private
 	*/
@@ -1748,6 +1729,10 @@ 
 		return $result;
 	}
 	
+	/**
+	 * @param string $schema
+	 * @param string $xsl
+	 */
 	function TransformSchema( $schema, $xsl, $schematype='string' )
 	{
 		// Fail if XSLT extension is not available

Indentation +567 added lines, -567 removed lines

@@ -92,45 +92,45 @@ 
 class dbObject {
 	
 	/**
-	* var object Parent
-	*/
+	 * var object Parent
+	 */
 	var $parent;
 	
 	/**
-	* var string current element
-	*/
+	 * var string current element
+	 */
 	var $currentElement;
 	
 	/**
-	* NOP
-	*/
+	 * NOP
+	 */
 	function dbObject( &$parent, $attributes = NULL ) {
 		$this->parent =& $parent;
 	}
 	
 	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process start elements
+	 *
+	 * @access private
+	 */
 	function _tag_open( &$parser, $tag, $attributes ) {
 		
 	}
 	
 	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process CDATA elements
+	 *
+	 * @access private
+	 */
 	function _tag_cdata( &$parser, $cdata ) {
 		
 	}
 	
 	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process end elements
+	 *
+	 * @access private
+	 */
 	function _tag_close( &$parser, $tag ) {
 		
 	}
@@ -140,39 +140,39 @@ 
 	}
 	
 	/**
-	* Destroys the object
-	*/
+	 * Destroys the object
+	 */
 	function destroy() {
 		unset( $this );
 	}
 	
 	/**
-	* Checks whether the specified RDBMS is supported by the current
-	* database object or its ranking ancestor.
-	*
-	* @param string $platform RDBMS platform name (from ADODB platform list).
-	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
-	*/
+	 * Checks whether the specified RDBMS is supported by the current
+	 * database object or its ranking ancestor.
+	 *
+	 * @param string $platform RDBMS platform name (from ADODB platform list).
+	 * @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
+	 */
 	function supportedPlatform( $platform = NULL ) {
 		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
 	}
 	
 	/**
-	* Returns the prefix set by the ranking ancestor of the database object.
-	*
-	* @param string $name Prefix string.
-	* @return string Prefix.
-	*/
+	 * Returns the prefix set by the ranking ancestor of the database object.
+	 *
+	 * @param string $name Prefix string.
+	 * @return string Prefix.
+	 */
 	function prefix( $name = '' ) {
 		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
 	}
 	
 	/**
-	* Extracts a field ID from the specified field.
-	*
-	* @param string $field Field.
-	* @return string Field ID.
-	*/
+	 * Extracts a field ID from the specified field.
+	 *
+	 * @param string $field Field.
+	 * @return string Field ID.
+	 */
 	function FieldID( $field ) {
 		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
 	}
@@ -192,59 +192,59 @@ 
 class dbTable extends dbObject {
 	
 	/**
-	* @var string Table name
-	*/
+	 * @var string Table name
+	 */
 	var $name;
 	
 	/**
-	* @var array Field specifier: Meta-information about each field
-	*/
+	 * @var array Field specifier: Meta-information about each field
+	 */
 	var $fields = array();
 	
 	/**
-	* @var array List of table indexes.
-	*/
+	 * @var array List of table indexes.
+	 */
 	var $indexes = array();
 	
 	/**
-	* @var array Table options: Table-level options
-	*/
+	 * @var array Table options: Table-level options
+	 */
 	var $opts = array();
 	
 	/**
-	* @var string Field index: Keeps track of which field is currently being processed
-	*/
+	 * @var string Field index: Keeps track of which field is currently being processed
+	 */
 	var $current_field;
 	
 	/**
-	* @var boolean Mark table for destruction
-	* @access private
-	*/
+	 * @var boolean Mark table for destruction
+	 * @access private
+	 */
 	var $drop_table;
 	
 	/**
-	* @var boolean Mark field for destruction (not yet implemented)
-	* @access private
-	*/
+	 * @var boolean Mark field for destruction (not yet implemented)
+	 * @access private
+	 */
 	var $drop_field = array();
 	
 	/**
-	* Iniitializes a new table object.
-	*
-	* @param string $prefix DB Object prefix
-	* @param array $attributes Array of table attributes.
-	*/
+	 * Iniitializes a new table object.
+	 *
+	 * @param string $prefix DB Object prefix
+	 * @param array $attributes Array of table attributes.
+	 */
 	function dbTable( &$parent, $attributes = NULL ) {
 		$this->parent =& $parent;
 		$this->name = $this->prefix($attributes['NAME']);
 	}
 	
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
-	*
-	* @access private
-	*/
+	 * XML Callback to process start elements. Elements currently 
+	 * processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	 *
+	 * @access private
+	 */
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
 		
@@ -298,10 +298,10 @@ 
 	}
 	
 	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process CDATA elements
+	 *
+	 * @access private
+	 */
 	function _tag_cdata( &$parser, $cdata ) {
 		switch( $this->currentElement ) {
 			// Table constraint
@@ -322,10 +322,10 @@ 
 	}
 	
 	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process end elements
+	 *
+	 * @access private
+	 */
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
 		
@@ -343,11 +343,11 @@ 
 	}
 	
 	/**
-	* Adds an index to a table object
-	*
-	* @param array $attributes Index attributes
-	* @return object dbIndex object
-	*/
+	 * Adds an index to a table object
+	 *
+	 * @param array $attributes Index attributes
+	 * @return object dbIndex object
+	 */
 	function &addIndex( $attributes ) {
 		$name = strtoupper( $attributes['NAME'] );
 		$this->indexes[$name] = new dbIndex( $this, $attributes );
@@ -355,11 +355,11 @@ 
 	}
 	
 	/**
-	* Adds data to a table object
-	*
-	* @param array $attributes Data attributes
-	* @return object dbData object
-	*/
+	 * Adds data to a table object
+	 *
+	 * @param array $attributes Data attributes
+	 * @return object dbData object
+	 */
 	function &addData( $attributes ) {
 		if( !isset( $this->data ) ) {
 			$this->data = new dbData( $this, $attributes );
@@ -368,34 +368,34 @@ 
 	}
 	
 	/**
-	* Adds a field to a table object
-	*
-	* $name is the name of the table to which the field should be added. 
-	* $type is an ADODB datadict field type. The following field types
-	* are supported as of ADODB 3.40:
-	* 	- C:  varchar
-	*	- X:  CLOB (character large object) or largest varchar size
-	*	   if CLOB is not supported
-	*	- C2: Multibyte varchar
-	*	- X2: Multibyte CLOB
-	*	- B:  BLOB (binary large object)
-	*	- D:  Date (some databases do not support this, and we return a datetime type)
-	*	- T:  Datetime or Timestamp
-	*	- L:  Integer field suitable for storing booleans (0 or 1)
-	*	- I:  Integer (mapped to I4)
-	*	- I1: 1-byte integer
-	*	- I2: 2-byte integer
-	*	- I4: 4-byte integer
-	*	- I8: 8-byte integer
-	*	- F:  Floating point number
-	*	- N:  Numeric or decimal number
-	*
-	* @param string $name Name of the table to which the field will be added.
-	* @param string $type	ADODB datadict field type.
-	* @param string $size	Field size
-	* @param array $opts	Field options array
-	* @return array Field specifier array
-	*/
+	 * Adds a field to a table object
+	 *
+	 * $name is the name of the table to which the field should be added. 
+	 * $type is an ADODB datadict field type. The following field types
+	 * are supported as of ADODB 3.40:
+	 * 	- C:  varchar
+	 *	- X:  CLOB (character large object) or largest varchar size
+	 *	   if CLOB is not supported
+	 *	- C2: Multibyte varchar
+	 *	- X2: Multibyte CLOB
+	 *	- B:  BLOB (binary large object)
+	 *	- D:  Date (some databases do not support this, and we return a datetime type)
+	 *	- T:  Datetime or Timestamp
+	 *	- L:  Integer field suitable for storing booleans (0 or 1)
+	 *	- I:  Integer (mapped to I4)
+	 *	- I1: 1-byte integer
+	 *	- I2: 2-byte integer
+	 *	- I4: 4-byte integer
+	 *	- I8: 8-byte integer
+	 *	- F:  Floating point number
+	 *	- N:  Numeric or decimal number
+	 *
+	 * @param string $name Name of the table to which the field will be added.
+	 * @param string $type	ADODB datadict field type.
+	 * @param string $size	Field size
+	 * @param array $opts	Field options array
+	 * @return array Field specifier array
+	 */
 	function addField( $name, $type, $size = NULL, $opts = NULL ) {
 		$field_id = $this->FieldID( $name );
 		
@@ -420,16 +420,16 @@ 
 	}
 	
 	/**
-	* Adds a field option to the current field specifier
-	*
-	* This method adds a field option allowed by the ADOdb datadict 
-	* and appends it to the given field.
-	*
-	* @param string $field	Field name
-	* @param string $opt ADOdb field option
-	* @param mixed $value Field option value
-	* @return array Field specifier array
-	*/
+	 * Adds a field option to the current field specifier
+	 *
+	 * This method adds a field option allowed by the ADOdb datadict 
+	 * and appends it to the given field.
+	 *
+	 * @param string $field	Field name
+	 * @param string $opt ADOdb field option
+	 * @param mixed $value Field option value
+	 * @return array Field specifier array
+	 */
 	function addFieldOpt( $field, $opt, $value = NULL ) {
 		if( !isset( $value ) ) {
 			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
@@ -440,14 +440,14 @@ 
 	}
 	
 	/**
-	* Adds an option to the table
-	*
-	* This method takes a comma-separated list of table-level options
-	* and appends them to the table object.
-	*
-	* @param string $opt Table option
-	* @return array Options
-	*/
+	 * Adds an option to the table
+	 *
+	 * This method takes a comma-separated list of table-level options
+	 * and appends them to the table object.
+	 *
+	 * @param string $opt Table option
+	 * @return array Options
+	 */
 	function addTableOpt( $opt ) {
 		$this->opts[] = $opt;
 		
@@ -455,11 +455,11 @@ 
 	}
 	
 	/**
-	* Generates the SQL that will create the table in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing table creation SQL
-	*/
+	 * Generates the SQL that will create the table in the database
+	 *
+	 * @param object $xmls adoSchema object
+	 * @return array Array containing table creation SQL
+	 */
 	function create( &$xmls ) {
 		$sql = array();
 		
@@ -567,8 +567,8 @@ 
 	}
 	
 	/**
-	* Marks a field or table for destruction
-	*/
+	 * Marks a field or table for destruction
+	 */
 	function drop() {
 		if( isset( $this->current_field ) ) {
 			// Drop the current field
@@ -598,34 +598,34 @@ 
 class dbIndex extends dbObject {
 	
 	/**
-	* @var string	Index name
-	*/
+	 * @var string	Index name
+	 */
 	var $name;
 	
 	/**
-	* @var array	Index options: Index-level options
-	*/
+	 * @var array	Index options: Index-level options
+	 */
 	var $opts = array();
 	
 	/**
-	* @var array	Indexed fields: Table columns included in this index
-	*/
+	 * @var array	Indexed fields: Table columns included in this index
+	 */
 	var $columns = array();
 	
 	/**
-	* @var boolean Mark index for destruction
-	* @access private
-	*/
+	 * @var boolean Mark index for destruction
+	 * @access private
+	 */
 	var $drop = FALSE;
 	
 	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
+	 * Initializes the new dbIndex object.
+	 *
+	 * @param object $parent Parent object
+	 * @param array $attributes Attributes
+	 *
+	 * @internal
+	 */
 	function dbIndex( &$parent, $attributes = NULL ) {
 		$this->parent =& $parent;
 		
@@ -633,13 +633,13 @@ 
 	}
 	
 	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
+	 * XML Callback to process start elements
+	 *
+	 * Processes XML opening tags. 
+	 * Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	 *
+	 * @access private
+	 */
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
 		
@@ -661,12 +661,12 @@ 
 	}
 	
 	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
+	 * XML Callback to process CDATA elements
+	 *
+	 * Processes XML cdata.
+	 *
+	 * @access private
+	 */
 	function _tag_cdata( &$parser, $cdata ) {
 		switch( $this->currentElement ) {
 			// Index field name
@@ -679,10 +679,10 @@ 
 	}
 	
 	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process end elements
+	 *
+	 * @access private
+	 */
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
 		
@@ -694,11 +694,11 @@ 
 	}
 	
 	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
+	 * Adds a field to the index
+	 *
+	 * @param string $name Field name
+	 * @return string Field list
+	 */
 	function addField( $name ) {
 		$this->columns[$this->FieldID( $name )] = $name;
 		
@@ -707,11 +707,11 @@ 
 	}
 	
 	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
+	 * Adds options to the index
+	 *
+	 * @param string $opt Comma-separated list of index options.
+	 * @return string Option list
+	 */
 	function addIndexOpt( $opt ) {
 		$this->opts[] = $opt;
 		
@@ -720,11 +720,11 @@ 
 	}
 	
 	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
+	 * Generates the SQL that will create the index in the database
+	 *
+	 * @param object $xmls adoSchema object
+	 * @return array Array containing index creation SQL
+	 */
 	function create( &$xmls ) {
 		if( $this->drop ) {
 			return NULL;
@@ -741,8 +741,8 @@ 
 	}
 	
 	/**
-	* Marks an index for destruction
-	*/
+	 * Marks an index for destruction
+	 */
 	function drop() {
 		$this->drop = TRUE;
 	}
@@ -763,25 +763,25 @@ 
 	var $row;
 	
 	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
+	 * Initializes the new dbIndex object.
+	 *
+	 * @param object $parent Parent object
+	 * @param array $attributes Attributes
+	 *
+	 * @internal
+	 */
 	function dbData( &$parent, $attributes = NULL ) {
 		$this->parent =& $parent;
 	}
 	
 	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
+	 * XML Callback to process start elements
+	 *
+	 * Processes XML opening tags. 
+	 * Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	 *
+	 * @access private
+	 */
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
 		
@@ -798,12 +798,12 @@ 
 	}
 	
 	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
+	 * XML Callback to process CDATA elements
+	 *
+	 * Processes XML cdata.
+	 *
+	 * @access private
+	 */
 	function _tag_cdata( &$parser, $cdata ) {
 		switch( $this->currentElement ) {
 			// Index field name
@@ -816,10 +816,10 @@ 
 	}
 	
 	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process end elements
+	 *
+	 * @access private
+	 */
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
 		
@@ -831,11 +831,11 @@ 
 	}
 	
 	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
+	 * Adds a field to the index
+	 *
+	 * @param string $name Field name
+	 * @return string Field list
+	 */
 	function addField( $attributes ) {
 		if( isset( $attributes['NAME'] ) ) {
 			$name = $attributes['NAME'];
@@ -848,11 +848,11 @@ 
 	}
 	
 	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
+	 * Adds options to the index
+	 *
+	 * @param string $opt Comma-separated list of index options.
+	 * @return string Option list
+	 */
 	function addData( $cdata ) {
 		if( !isset( $this->data[$this->row] ) ) {
 			$this->data[$this->row] = array();
@@ -866,11 +866,11 @@ 
 	}
 	
 	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
+	 * Generates the SQL that will create the index in the database
+	 *
+	 * @param object $xmls adoSchema object
+	 * @return array Array containing index creation SQL
+	 */
 	function create( &$xmls ) {
 		$table = $xmls->dict->TableName($this->parent->name);
 		$table_field_count = count($this->parent->fields);
@@ -944,31 +944,31 @@ 
 class dbQuerySet extends dbObject {
 	
 	/**
-	* @var array	List of SQL queries
-	*/
+	 * @var array	List of SQL queries
+	 */
 	var $queries = array();
 	
 	/**
-	* @var string	String used to build of a query line by line
-	*/
+	 * @var string	String used to build of a query line by line
+	 */
 	var $query;
 	
 	/**
-	* @var string	Query prefix key
-	*/
+	 * @var string	Query prefix key
+	 */
 	var $prefixKey = '';
 	
 	/**
-	* @var boolean	Auto prefix enable (TRUE)
-	*/
+	 * @var boolean	Auto prefix enable (TRUE)
+	 */
 	var $prefixMethod = 'AUTO';
 	
 	/**
-	* Initializes the query set.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*/
+	 * Initializes the query set.
+	 *
+	 * @param object $parent Parent object
+	 * @param array $attributes Attributes
+	 */
 	function dbQuerySet( &$parent, $attributes = NULL ) {
 		$this->parent =& $parent;
 			
@@ -994,11 +994,11 @@ 
 	}
 	
 	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
-	*
-	* @access private
-	*/
+	 * XML Callback to process start elements. Elements currently 
+	 * processed are: QUERY. 
+	 *
+	 * @access private
+	 */
 	function _tag_open( &$parser, $tag, $attributes ) {
 		$this->currentElement = strtoupper( $tag );
 		
@@ -1019,8 +1019,8 @@ 
 	}
 	
 	/**
-	* XML Callback to process CDATA elements
-	*/
+	 * XML Callback to process CDATA elements
+	 */
 	function _tag_cdata( &$parser, $cdata ) {
 		switch( $this->currentElement ) {
 			// Line of queryset SQL data
@@ -1033,10 +1033,10 @@ 
 	}
 	
 	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process end elements
+	 *
+	 * @access private
+	 */
 	function _tag_close( &$parser, $tag ) {
 		$this->currentElement = '';
 		
@@ -1056,10 +1056,10 @@ 
 	}
 	
 	/**
-	* Re-initializes the query.
-	*
-	* @return boolean TRUE
-	*/
+	 * Re-initializes the query.
+	 *
+	 * @return boolean TRUE
+	 */
 	function newQuery() {
 		$this->query = '';
 		
@@ -1067,10 +1067,10 @@ 
 	}
 	
 	/**
-	* Discards the existing query.
-	*
-	* @return boolean TRUE
-	*/
+	 * Discards the existing query.
+	 *
+	 * @return boolean TRUE
+	 */
 	function discardQuery() {
 		unset( $this->query );
 		
@@ -1078,11 +1078,11 @@ 
 	}
 	
 	/** 
-	* Appends a line to a query that is being built line by line
-	*
-	* @param string $data Line of SQL data or NULL to initialize a new query
-	* @return string SQL query string.
-	*/
+	 * Appends a line to a query that is being built line by line
+	 *
+	 * @param string $data Line of SQL data or NULL to initialize a new query
+	 * @return string SQL query string.
+	 */
 	function buildQuery( $sql = NULL ) {
 		if( !isset( $this->query ) OR empty( $sql ) ) {
 			return FALSE;
@@ -1094,10 +1094,10 @@ 
 	}
 	
 	/**
-	* Adds a completed query to the query list
-	*
-	* @return string	SQL of added query
-	*/
+	 * Adds a completed query to the query list
+	 *
+	 * @return string	SQL of added query
+	 */
 	function addQuery() {
 		if( !isset( $this->query ) ) {
 			return FALSE;
@@ -1111,11 +1111,11 @@ 
 	}
 	
 	/**
-	* Creates and returns the current query set
-	*
-	* @param object $xmls adoSchema object
-	* @return array Query set
-	*/
+	 * Creates and returns the current query set
+	 *
+	 * @param object $xmls adoSchema object
+	 * @return array Query set
+	 */
 	function create( &$xmls ) {
 		foreach( $this->queries as $id => $query ) {
 			switch( $this->prefixMethod ) {
@@ -1151,13 +1151,13 @@ 
 	}
 	
 	/**
-	* Rebuilds the query with the prefix attached to any objects
-	*
-	* @param string $regex Regex used to add prefix
-	* @param string $query SQL query string
-	* @param string $prefix Prefix to be appended to tables, indices, etc.
-	* @return string Prefixed SQL query string.
-	*/
+	 * Rebuilds the query with the prefix attached to any objects
+	 *
+	 * @param string $regex Regex used to add prefix
+	 * @param string $query SQL query string
+	 * @param string $prefix Prefix to be appended to tables, indices, etc.
+	 * @return string Prefixed SQL query string.
+	 */
 	function prefixQuery( $regex, $query, $prefix = NULL ) {
 		if( !isset( $prefix ) ) {
 			return $query;
@@ -1202,89 +1202,89 @@ 
 class adoSchema {
 	
 	/**
-	* @var array	Array containing SQL queries to generate all objects
-	* @access private
-	*/
+	 * @var array	Array containing SQL queries to generate all objects
+	 * @access private
+	 */
 	var $sqlArray;
 	
 	/**
-	* @var object	ADOdb connection object
-	* @access private
-	*/
+	 * @var object	ADOdb connection object
+	 * @access private
+	 */
 	var $db;
 	
 	/**
-	* @var object	ADOdb Data Dictionary
-	* @access private
-	*/
+	 * @var object	ADOdb Data Dictionary
+	 * @access private
+	 */
 	var $dict;
 	
 	/**
-	* @var string Current XML element
-	* @access private
-	*/
+	 * @var string Current XML element
+	 * @access private
+	 */
 	var $currentElement = '';
 	
 	/**
-	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
-	* @access private
-	*/
+	 * @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
+	 * @access private
+	 */
 	var $upgrade = '';
 	
 	/**
-	* @var string Optional object prefix
-	* @access private
-	*/
+	 * @var string Optional object prefix
+	 * @access private
+	 */
 	var $objectPrefix = '';
 	
 	/**
-	* @var long	Original Magic Quotes Runtime value
-	* @access private
-	*/
+	 * @var long	Original Magic Quotes Runtime value
+	 * @access private
+	 */
 	var $mgq;
 	
 	/**
-	* @var long	System debug
-	* @access private
-	*/
+	 * @var long	System debug
+	 * @access private
+	 */
 	var $debug;
 	
 	/**
-	* @var string Regular expression to find schema version
-	* @access private
-	*/
+	 * @var string Regular expression to find schema version
+	 * @access private
+	 */
 	var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
 	
 	/**
-	* @var string Current schema version
-	* @access private
-	*/
+	 * @var string Current schema version
+	 * @access private
+	 */
 	var $schemaVersion;
 	
 	/**
-	* @var int	Success of last Schema execution
-	*/
+	 * @var int	Success of last Schema execution
+	 */
 	var $success;
 	
 	/**
-	* @var bool	Execute SQL inline as it is generated
-	*/
+	 * @var bool	Execute SQL inline as it is generated
+	 */
 	var $executeInline;
 	
 	/**
-	* @var bool	Continue SQL execution if errors occur
-	*/
+	 * @var bool	Continue SQL execution if errors occur
+	 */
 	var $continueOnError;
 	
 	/**
-	* Creates an adoSchema object
-	*
-	* Creating an adoSchema object is the first step in processing an XML schema.
-	* The only parameter is an ADOdb database connection object, which must already
-	* have been created.
-	*
-	* @param object $db ADOdb database connection object.
-	*/
+	 * Creates an adoSchema object
+	 *
+	 * Creating an adoSchema object is the first step in processing an XML schema.
+	 * The only parameter is an ADOdb database connection object, which must already
+	 * have been created.
+	 *
+	 * @param object $db ADOdb database connection object.
+	 */
 	function adoSchema( &$db ) {
 		// Initialize the environment
 		$this->mgq = get_magic_quotes_runtime();
@@ -1301,21 +1301,21 @@ 
 	}
 	
 	/**
-	* Sets the method to be used for upgrading an existing database
-	*
-	* Use this method to specify how existing database objects should be upgraded.
-	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
-	* alter each database object directly, REPLACE attempts to rebuild each object
-	* from scratch, BEST attempts to determine the best upgrade method for each
-	* object, and NONE disables upgrading.
-	*
-	* This method is not yet used by AXMLS, but exists for backward compatibility.
-	* The ALTER method is automatically assumed when the adoSchema object is
-	* instantiated; other upgrade methods are not currently supported.
-	*
-	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
-	* @returns string Upgrade method used
-	*/
+	 * Sets the method to be used for upgrading an existing database
+	 *
+	 * Use this method to specify how existing database objects should be upgraded.
+	 * The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
+	 * alter each database object directly, REPLACE attempts to rebuild each object
+	 * from scratch, BEST attempts to determine the best upgrade method for each
+	 * object, and NONE disables upgrading.
+	 *
+	 * This method is not yet used by AXMLS, but exists for backward compatibility.
+	 * The ALTER method is automatically assumed when the adoSchema object is
+	 * instantiated; other upgrade methods are not currently supported.
+	 *
+	 * @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
+	 * @returns string Upgrade method used
+	 */
 	function SetUpgradeMethod( $method = '' ) {
 		if( !is_string( $method ) ) {
 			return FALSE;
@@ -1346,18 +1346,18 @@ 
 	}
 	
 	/**
-	* Enables/disables inline SQL execution.
-	*
-	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
-	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
-	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
-	* to apply the schema to the database.
-	*
-	* @param bool $mode execute
-	* @return bool current execution mode
-	*
-	* @see ParseSchema(), ExecuteSchema()
-	*/
+	 * Enables/disables inline SQL execution.
+	 *
+	 * Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
+	 * AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
+	 * is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
+	 * to apply the schema to the database.
+	 *
+	 * @param bool $mode execute
+	 * @return bool current execution mode
+	 *
+	 * @see ParseSchema(), ExecuteSchema()
+	 */
 	function ExecuteInline( $mode = NULL ) {
 		if( is_bool( $mode ) ) {
 			$this->executeInline = $mode;
@@ -1367,18 +1367,18 @@ 
 	}
 	
 	/**
-	* Enables/disables SQL continue on error.
-	*
-	* Call this method to enable or disable continuation of SQL execution if an error occurs.
-	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
-	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
-	* of the schema will continue.
-	*
-	* @param bool $mode execute
-	* @return bool current continueOnError mode
-	*
-	* @see addSQL(), ExecuteSchema()
-	*/
+	 * Enables/disables SQL continue on error.
+	 *
+	 * Call this method to enable or disable continuation of SQL execution if an error occurs.
+	 * If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
+	 * If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
+	 * of the schema will continue.
+	 *
+	 * @param bool $mode execute
+	 * @return bool current continueOnError mode
+	 *
+	 * @see addSQL(), ExecuteSchema()
+	 */
 	function ContinueOnError( $mode = NULL ) {
 		if( is_bool( $mode ) ) {
 			$this->continueOnError = $mode;
@@ -1388,33 +1388,33 @@ 
 	}
 	
 	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database described. 
-	* @see ParseSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
+	 * Loads an XML schema from a file and converts it to SQL.
+	 *
+	 * Call this method to load the specified schema (see the DTD for the proper format) from
+	 * the filesystem and generate the SQL necessary to create the database described. 
+	 * @see ParseSchemaString()
+	 *
+	 * @param string $file Name of XML schema file.
+	 * @param bool $returnSchema Return schema rather than parsing.
+	 * @return array Array of SQL queries, ready to execute
+	 */
 	function ParseSchema( $filename, $returnSchema = FALSE ) {
 		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
 	
 	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
-	* and generate the SQL necessary to create the database described by the schema.
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*
-	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
-	* @see ParseSchema(), ParseSchemaString()
-	*/
+	 * Loads an XML schema from a file and converts it to SQL.
+	 *
+	 * Call this method to load the specified schema from a file (see the DTD for the proper format) 
+	 * and generate the SQL necessary to create the database described by the schema.
+	 *
+	 * @param string $file Name of XML schema file.
+	 * @param bool $returnSchema Return schema rather than parsing.
+	 * @return array Array of SQL queries, ready to execute.
+	 *
+	 * @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
+	 * @see ParseSchema(), ParseSchemaString()
+	 */
 	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
 		// Open the file
 		if( !($fp = fopen( $filename, 'r' )) ) {
@@ -1453,16 +1453,16 @@ 
 	}
 	
 	/**
-	* Converts an XML schema string to SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
-	* @see ParseSchema()
-	*
-	* @param string $xmlstring XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
+	 * Converts an XML schema string to SQL.
+	 *
+	 * Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	 * and generate the SQL necessary to create the database described by the schema. 
+	 * @see ParseSchema()
+	 *
+	 * @param string $xmlstring XML schema string.
+	 * @param bool $returnSchema Return schema rather than parsing.
+	 * @return array Array of SQL queries, ready to execute.
+	 */
 	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
@@ -1496,31 +1496,31 @@ 
 	}
 	
 	/**
-	* Loads an XML schema from a file and converts it to uninstallation SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to remove the database described.
-	* @see RemoveSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
+	 * Loads an XML schema from a file and converts it to uninstallation SQL.
+	 *
+	 * Call this method to load the specified schema (see the DTD for the proper format) from
+	 * the filesystem and generate the SQL necessary to remove the database described.
+	 * @see RemoveSchemaString()
+	 *
+	 * @param string $file Name of XML schema file.
+	 * @param bool $returnSchema Return schema rather than parsing.
+	 * @return array Array of SQL queries, ready to execute
+	 */
 	function RemoveSchema( $filename, $returnSchema = FALSE ) {
 		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
 	
 	/**
-	* Converts an XML schema string to uninstallation SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
-	* @see RemoveSchema()
-	*
-	* @param string $schema XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
+	 * Converts an XML schema string to uninstallation SQL.
+	 *
+	 * Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	 * and generate the SQL necessary to uninstall the database described by the schema. 
+	 * @see RemoveSchema()
+	 *
+	 * @param string $schema XML schema string.
+	 * @param bool $returnSchema Return schema rather than parsing.
+	 * @return array Array of SQL queries, ready to execute.
+	 */
 	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
 		
 		// grab current version
@@ -1532,18 +1532,18 @@ 
 	}
 	
 	/**
-	* Applies the current XML schema to the database (post execution).
-	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
-	* and executing other SQL specified in the schema) after parsing.
-	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
-	*
-	* @param array $sqlArray Array of SQL statements that will be applied rather than
-	*		the current schema.
-	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
-	* @returns integer 0 if failure, 1 if errors, 2 if successful.
-	*/
+	 * Applies the current XML schema to the database (post execution).
+	 *
+	 * Call this method to apply the current schema (generally created by calling 
+	 * ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	 * and executing other SQL specified in the schema) after parsing.
+	 * @see ParseSchema(), ParseSchemaString(), ExecuteInline()
+	 *
+	 * @param array $sqlArray Array of SQL statements that will be applied rather than
+	 *		the current schema.
+	 * @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
+	 * @returns integer 0 if failure, 1 if errors, 2 if successful.
+	 */
 	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
 		if( !is_bool( $continueOnErr ) ) {
 			$continueOnErr = $this->ContinueOnError();
@@ -1563,27 +1563,27 @@ 
 	}
 	
 	/**
-	* Returns the current SQL array. 
-	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
-	*
-	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
-	* @return array Array of SQL statements or FALSE if an error occurs
-	*/
+	 * Returns the current SQL array. 
+	 *
+	 * Call this method to fetch the array of SQL queries resulting from 
+	 * ParseSchema() or ParseSchemaString(). 
+	 *
+	 * @param string $format Format: HTML, TEXT, or NONE (PHP array)
+	 * @return array Array of SQL statements or FALSE if an error occurs
+	 */
 	function PrintSQL( $format = 'NONE' ) {
 		return $this->getSQL( $format, $sqlArray );
 	}
 	
 	/**
-	* Saves the current SQL array to the local filesystem as a list of SQL queries.
-	*
-	* Call this method to save the array of SQL queries (generally resulting from a
-	* parsed XML schema) to the filesystem.
-	*
-	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
-	*/
+	 * Saves the current SQL array to the local filesystem as a list of SQL queries.
+	 *
+	 * Call this method to save the array of SQL queries (generally resulting from a
+	 * parsed XML schema) to the filesystem.
+	 *
+	 * @param string $filename Path and name where the file should be saved.
+	 * @return boolean TRUE if save is successful, else FALSE. 
+	 */
 	function SaveSQL( $filename = './schema.sql' ) {
 		
 		if( !isset( $sqlArray ) ) {
@@ -1602,12 +1602,12 @@ 
 	}
 	
 	/**
-	* Create an xml parser
-	*
-	* @return object PHP XML parser object
-	*
-	* @access private
-	*/
+	 * Create an xml parser
+	 *
+	 * @return object PHP XML parser object
+	 *
+	 * @access private
+	 */
 	function &create_parser() {
 		// Create the parser
 		$xmlParser = xml_parser_create();
@@ -1621,10 +1621,10 @@ 
 	}
 	
 	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process start elements
+	 *
+	 * @access private
+	 */
 	function _tag_open( &$parser, $tag, $attributes ) {
 		switch( strtoupper( $tag ) ) {
 			case 'TABLE':
@@ -1644,39 +1644,39 @@ 
 	}
 	
 	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
+	 * XML Callback to process CDATA elements
+	 *
+	 * @access private
+	 */
 	function _tag_cdata( &$parser, $cdata ) {
 	}
 	
 	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	* @internal
-	*/
+	 * XML Callback to process end elements
+	 *
+	 * @access private
+	 * @internal
+	 */
 	function _tag_close( &$parser, $tag ) {
 		
 	}
 	
 	/**
-	* Converts an XML schema string to the specified DTD version.
-	*
-	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaFile()
-	*
-	* @param string $schema String containing XML schema that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
+	 * Converts an XML schema string to the specified DTD version.
+	 *
+	 * Call this method to convert a string containing an XML schema to a different AXMLS
+	 * DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	 * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	 * parameter is specified, the schema will be converted to the current DTD version. 
+	 * If the newFile parameter is provided, the converted schema will be written to the specified
+	 * file.
+	 * @see ConvertSchemaFile()
+	 *
+	 * @param string $schema String containing XML schema that will be converted.
+	 * @param string $newVersion DTD version to convert to.
+	 * @param string $newFile File name of (converted) output file.
+	 * @return string Converted XML schema or FALSE if an error occurs.
+	 */
 	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
 		
 		// grab current version
@@ -1703,21 +1703,21 @@ 
 	}
 	
 	/**
-	* Converts an XML schema file to the specified DTD version.
-	*
-	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaString()
-	*
-	* @param string $filename Name of XML schema file that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
+	 * Converts an XML schema file to the specified DTD version.
+	 *
+	 * Call this method to convert the specified XML schema file to a different AXMLS
+	 * DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	 * AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	 * parameter is specified, the schema will be converted to the current DTD version. 
+	 * If the newFile parameter is provided, the converted schema will be written to the specified
+	 * file.
+	 * @see ConvertSchemaString()
+	 *
+	 * @param string $filename Name of XML schema file that will be converted.
+	 * @param string $newVersion DTD version to convert to.
+	 * @param string $newFile File name of (converted) output file.
+	 * @return string Converted XML schema or FALSE if an error occurs.
+	 */
 	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
 		
 		// grab current version
@@ -1798,15 +1798,15 @@ 
 	}
 	
 	/**
-	* Processes XSLT transformation errors
-	*
-	* @param object $parser XML parser object
-	* @param integer $errno Error number
-	* @param integer $level Error level
-	* @param array $fields Error information fields
-	*
-	* @access private
-	*/
+	 * Processes XSLT transformation errors
+	 *
+	 * @param object $parser XML parser object
+	 * @param integer $errno Error number
+	 * @param integer $level Error level
+	 * @param array $fields Error information fields
+	 *
+	 * @access private
+	 */
 	function xslt_error_handler( $parser, $errno, $level, $fields ) {
 		if( is_array( $fields ) ) {
 			$msg = array(
@@ -1851,14 +1851,14 @@ 
 	}
 	
 	/**
-	* Returns the AXMLS Schema Version of the requested XML schema file.
-	*
-	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
-	* @see SchemaStringVersion()
-	*
-	* @param string $filename AXMLS schema file
-	* @return string Schema version number or FALSE on error
-	*/
+	 * Returns the AXMLS Schema Version of the requested XML schema file.
+	 *
+	 * Call this method to obtain the AXMLS DTD version of the requested XML schema file.
+	 * @see SchemaStringVersion()
+	 *
+	 * @param string $filename AXMLS schema file
+	 * @return string Schema version number or FALSE on error
+	 */
 	function SchemaFileVersion( $filename ) {
 		// Open the file
 		if( !($fp = fopen( $filename, 'r' )) ) {
@@ -1877,14 +1877,14 @@ 
 	}
 	
 	/**
-	* Returns the AXMLS Schema Version of the provided XML schema string.
-	*
-	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
-	* @see SchemaFileVersion()
-	*
-	* @param string $xmlstring XML schema string
-	* @return string Schema version number or FALSE on error
-	*/
+	 * Returns the AXMLS Schema Version of the provided XML schema string.
+	 *
+	 * Call this method to obtain the AXMLS DTD version of the provided XML schema string.
+	 * @see SchemaFileVersion()
+	 *
+	 * @param string $xmlstring XML schema string
+	 * @return string Schema version number or FALSE on error
+	 */
 	function SchemaStringVersion( $xmlstring ) {
 		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
 			return FALSE;
@@ -1898,15 +1898,15 @@ 
 	}
 	
 	/**
-	* Extracts an XML schema from an existing database.
-	*
-	* Call this method to create an XML schema string from an existing database.
-	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
-	*
-	* @param boolean $data Include data in schema dump
-	* @return string Generated XML schema
-	*/
+	 * Extracts an XML schema from an existing database.
+	 *
+	 * Call this method to create an XML schema string from an existing database.
+	 * If the data parameter is set to TRUE, AXMLS will include the data from the database
+	 * in the schema. 
+	 *
+	 * @param boolean $data Include data in schema dump
+	 * @return string Generated XML schema
+	 */
 	function ExtractSchema( $data = FALSE ) {
 		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
 		
@@ -2005,15 +2005,15 @@ 
 	}
 	
 	/**
-	* Sets a prefix for database objects
-	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
-	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
-	*
-	* @param string $prefix Prefix that will be prepended.
-	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
-	* @return boolean TRUE if successful, else FALSE
-	*/
+	 * Sets a prefix for database objects
+	 *
+	 * Call this method to set a standard prefix that will be prepended to all database tables 
+	 * and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
+	 *
+	 * @param string $prefix Prefix that will be prepended.
+	 * @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
+	 * @return boolean TRUE if successful, else FALSE
+	 */
 	function SetPrefix( $prefix = '', $underscore = TRUE ) {
 		switch( TRUE ) {
 			// clear prefix
@@ -2040,13 +2040,13 @@ 
 	}
 	
 	/**
-	* Returns an object name with the current prefix prepended.
-	*
-	* @param string	$name Name
-	* @return string	Prefixed name
-	*
-	* @access private
-	*/
+	 * Returns an object name with the current prefix prepended.
+	 *
+	 * @param string	$name Name
+	 * @return string	Prefixed name
+	 *
+	 * @access private
+	 */
 	function prefix( $name = '' ) {
 		// if prefix is set
 		if( !empty( $this->objectPrefix ) ) {
@@ -2060,13 +2060,13 @@ 
 	}
 	
 	/**
-	* Checks if element references a specific platform
-	*
-	* @param string $platform Requested platform
-	* @returns boolean TRUE if platform check succeeds
-	*
-	* @access private
-	*/
+	 * Checks if element references a specific platform
+	 *
+	 * @param string $platform Requested platform
+	 * @returns boolean TRUE if platform check succeeds
+	 *
+	 * @access private
+	 */
 	function supportedPlatform( $platform = NULL ) {
 		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
 		
@@ -2080,22 +2080,22 @@ 
 	}
 	
 	/**
-	* Clears the array of generated SQL.
-	*
-	* @access private
-	*/
+	 * Clears the array of generated SQL.
+	 *
+	 * @access private
+	 */
 	function clearSQL() {
 		$this->sqlArray = array();
 	}
 	
 	/**
-	* Adds SQL into the SQL array.
-	*
-	* @param mixed $sql SQL to Add
-	* @return boolean TRUE if successful, else FALSE.
-	*
-	* @access private
-	*/	
+	 * Adds SQL into the SQL array.
+	 *
+	 * @param mixed $sql SQL to Add
+	 * @return boolean TRUE if successful, else FALSE.
+	 *
+	 * @access private
+	 */	
 	function addSQL( $sql = NULL ) {
 		if( is_array( $sql ) ) {
 			foreach( $sql as $line ) {
@@ -2131,13 +2131,13 @@ 
 	}
 	
 	/**
-	* Gets the SQL array in the specified format.
-	*
-	* @param string $format Format
-	* @return mixed SQL
-	*	
-	* @access private
-	*/
+	 * Gets the SQL array in the specified format.
+	 *
+	 * @param string $format Format
+	 * @return mixed SQL
+	 *	
+	 * @access private
+	 */
 	function getSQL( $format = NULL, $sqlArray = NULL ) {
 		if( !is_array( $sqlArray ) ) {
 			$sqlArray = $this->sqlArray;
@@ -2159,11 +2159,11 @@ 
 	}
 	
 	/**
-	* Destroys an adoSchema object.
-	*
-	* Call this method to clean up after an adoSchema object that is no longer in use.
-	* @deprecated adoSchema now cleans up automatically.
-	*/
+	 * Destroys an adoSchema object.
+	 *
+	 * Call this method to clean up after an adoSchema object that is no longer in use.
+	 * @deprecated adoSchema now cleans up automatically.
+	 */
 	function Destroy() {
 		set_magic_quotes_runtime( $this->mgq );
 		unset( $this );

Spacing +405 added lines, -405 removed lines

@@ -21,65 +21,65 @@ 
 /**
 * Debug on or off
 */
-if( !defined( 'XMLS_DEBUG' ) ) {
-	define( 'XMLS_DEBUG', FALSE );
+if (!defined('XMLS_DEBUG')) {
+	define('XMLS_DEBUG', FALSE);
 }
 
 /**
 * Default prefix key
 */
-if( !defined( 'XMLS_PREFIX' ) ) {
-	define( 'XMLS_PREFIX', '%%P' );
+if (!defined('XMLS_PREFIX')) {
+	define('XMLS_PREFIX', '%%P');
 }
 
 /**
 * Maximum length allowed for object prefix
 */
-if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
-	define( 'XMLS_PREFIX_MAXLEN', 10 );
+if (!defined('XMLS_PREFIX_MAXLEN')) {
+	define('XMLS_PREFIX_MAXLEN', 10);
 }
 
 /**
 * Execute SQL inline as it is generated
 */
-if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
-	define( 'XMLS_EXECUTE_INLINE', FALSE );
+if (!defined('XMLS_EXECUTE_INLINE')) {
+	define('XMLS_EXECUTE_INLINE', FALSE);
 }
 
 /**
 * Continue SQL Execution if an error occurs?
 */
-if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
-	define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
+if (!defined('XMLS_CONTINUE_ON_ERROR')) {
+	define('XMLS_CONTINUE_ON_ERROR', FALSE);
 }
 
 /**
 * Current Schema Version
 */
-if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_SCHEMA_VERSION', '0.2' );
+if (!defined('XMLS_SCHEMA_VERSION')) {
+	define('XMLS_SCHEMA_VERSION', '0.2');
 }
 
 /**
 * Default Schema Version.  Used for Schemas without an explicit version set.
 */
-if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
+if (!defined('XMLS_DEFAULT_SCHEMA_VERSION')) {
+	define('XMLS_DEFAULT_SCHEMA_VERSION', '0.1');
 }
 
 /**
 * Default Schema Version.  Used for Schemas without an explicit version set.
 */
-if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
-	define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
+if (!defined('XMLS_DEFAULT_UPGRADE_METHOD')) {
+	define('XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER');
 }
 
 /**
 * Include the main ADODB library
 */
-if( !defined( '_ADODB_LAYER' ) ) {
-	require( 'adodb.inc.php' );
-	require( 'adodb-datadict.inc.php' );
+if (!defined('_ADODB_LAYER')) {
+	require('adodb.inc.php');
+	require('adodb-datadict.inc.php');
 }
 
 /**
@@ -104,8 +104,8 @@ 
 	/**
 	* NOP
 	*/
-	function dbObject( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
+	function dbObject(&$parent, $attributes = NULL) {
+		$this->parent = & $parent;
 	}
 	
 	/**
@@ -113,7 +113,7 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open(&$parser, $tag, $attributes) {
 		
 	}
 	
@@ -122,7 +122,7 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
+	function _tag_cdata(&$parser, $cdata) {
 		
 	}
 	
@@ -131,7 +131,7 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close(&$parser, $tag) {
 		
 	}
 	
@@ -143,7 +143,7 @@ 
 	* Destroys the object
 	*/
 	function destroy() {
-		unset( $this );
+		unset($this);
 	}
 	
 	/**
@@ -153,8 +153,8 @@ 
 	* @param string $platform RDBMS platform name (from ADODB platform list).
 	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
 	*/
-	function supportedPlatform( $platform = NULL ) {
-		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
+	function supportedPlatform($platform = NULL) {
+		return is_object($this->parent) ? $this->parent->supportedPlatform($platform) : TRUE;
 	}
 	
 	/**
@@ -163,8 +163,8 @@ 
 	* @param string $name Prefix string.
 	* @return string Prefix.
 	*/
-	function prefix( $name = '' ) {
-		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
+	function prefix($name = '') {
+		return is_object($this->parent) ? $this->parent->prefix($name) : $name;
 	}
 	
 	/**
@@ -173,8 +173,8 @@ 
 	* @param string $field Field.
 	* @return string Field ID.
 	*/
-	function FieldID( $field ) {
-		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
+	function FieldID($field) {
+		return strtoupper(preg_replace('/^`(.+)`$/', '$1', $field));
 	}
 }
 
@@ -234,8 +234,8 @@ 
 	* @param string $prefix DB Object prefix
 	* @param array $attributes Array of table attributes.
 	*/
-	function dbTable( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
+	function dbTable(&$parent, $attributes = NULL) {
+		$this->parent = & $parent;
 		$this->name = $this->prefix($attributes['NAME']);
 	}
 	
@@ -245,18 +245,18 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
+	function _tag_open(&$parser, $tag, $attributes) {
+		$this->currentElement = strtoupper($tag);
 		
-		switch( $this->currentElement ) {
+		switch ($this->currentElement) {
 			case 'INDEX':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addIndex( $attributes ) );
+				if (!isset($attributes['PLATFORM']) OR $this->supportedPlatform($attributes['PLATFORM'])) {
+					xml_set_object($parser, $this->addIndex($attributes));
 				}
 				break;
 			case 'DATA':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addData( $attributes ) );
+				if (!isset($attributes['PLATFORM']) OR $this->supportedPlatform($attributes['PLATFORM'])) {
+					xml_set_object($parser, $this->addData($attributes));
 				}
 				break;
 			case 'DROP':
@@ -266,31 +266,31 @@ 
 				// Add a field
 				$fieldName = $attributes['NAME'];
 				$fieldType = $attributes['TYPE'];
-				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
-				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
+				$fieldSize = isset($attributes['SIZE']) ? $attributes['SIZE'] : NULL;
+				$fieldOpts = isset($attributes['OPTS']) ? $attributes['OPTS'] : NULL;
 				
-				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
+				$this->addField($fieldName, $fieldType, $fieldSize, $fieldOpts);
 				break;
 			case 'KEY':
 			case 'NOTNULL':
 			case 'AUTOINCREMENT':
 				// Add a field option
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				$this->addFieldOpt($this->current_field, $this->currentElement);
 				break;
 			case 'DEFAULT':
 				// Add a field option to the table object
 				
 				// Work around ADOdb datadict issue that misinterprets empty strings.
-				if( $attributes['VALUE'] == '' ) {
+				if ($attributes['VALUE'] == '') {
 					$attributes['VALUE'] = " '' ";
 				}
 				
-				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
+				$this->addFieldOpt($this->current_field, $this->currentElement, $attributes['VALUE']);
 				break;
 			case 'DEFDATE':
 			case 'DEFTIMESTAMP':
 				// Add a field option to the table object
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				$this->addFieldOpt($this->current_field, $this->currentElement);
 				break;
 			default:
 				// print_r( array( $tag, $attributes ) );
@@ -302,19 +302,19 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
+	function _tag_cdata(&$parser, $cdata) {
+		switch ($this->currentElement) {
 			// Table constraint
 			case 'CONSTRAINT':
-				if( isset( $this->current_field ) ) {
-					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
+				if (isset($this->current_field)) {
+					$this->addFieldOpt($this->current_field, $this->currentElement, $cdata);
 				} else {
-					$this->addTableOpt( $cdata );
+					$this->addTableOpt($cdata);
 				}
 				break;
 			// Table option
 			case 'OPT':
-				$this->addTableOpt( $cdata );
+				$this->addTableOpt($cdata);
 				break;
 			default:
 				
@@ -326,13 +326,13 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close(&$parser, $tag) {
 		$this->currentElement = '';
 		
-		switch( strtoupper( $tag ) ) {
+		switch (strtoupper($tag)) {
 			case 'TABLE':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
+				$this->parent->addSQL($this->create($this->parent));
+				xml_set_object($parser, $this->parent);
 				$this->destroy();
 				break;
 			case 'FIELD':
@@ -348,9 +348,9 @@ 
 	* @param array $attributes Index attributes
 	* @return object dbIndex object
 	*/
-	function &addIndex( $attributes ) {
-		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] = new dbIndex( $this, $attributes );
+	function &addIndex($attributes) {
+		$name = strtoupper($attributes['NAME']);
+		$this->indexes[$name] = new dbIndex($this, $attributes);
 		return $this->indexes[$name];
 	}
 	
@@ -360,9 +360,9 @@ 
 	* @param array $attributes Data attributes
 	* @return object dbData object
 	*/
-	function &addData( $attributes ) {
-		if( !isset( $this->data ) ) {
-			$this->data = new dbData( $this, $attributes );
+	function &addData($attributes) {
+		if (!isset($this->data)) {
+			$this->data = new dbData($this, $attributes);
 		}
 		return $this->data;
 	}
@@ -396,8 +396,8 @@ 
 	* @param array $opts	Field options array
 	* @return array Field specifier array
 	*/
-	function addField( $name, $type, $size = NULL, $opts = NULL ) {
-		$field_id = $this->FieldID( $name );
+	function addField($name, $type, $size = NULL, $opts = NULL) {
+		$field_id = $this->FieldID($name);
 		
 		// Set the field index so we know where we are
 		$this->current_field = $field_id;
@@ -409,12 +409,12 @@ 
 		$this->fields[$field_id]['TYPE'] = $type;
 		
 		// Set the field size (optional)
-		if( isset( $size ) ) {
+		if (isset($size)) {
 			$this->fields[$field_id]['SIZE'] = $size;
 		}
 		
 		// Set the field options
-		if( isset( $opts ) ) {
+		if (isset($opts)) {
 			$this->fields[$field_id]['OPTS'][] = $opts;
 		}
 	}
@@ -430,12 +430,12 @@ 
 	* @param mixed $value Field option value
 	* @return array Field specifier array
 	*/
-	function addFieldOpt( $field, $opt, $value = NULL ) {
-		if( !isset( $value ) ) {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
+	function addFieldOpt($field, $opt, $value = NULL) {
+		if (!isset($value)) {
+			$this->fields[$this->FieldID($field)]['OPTS'][] = $opt;
 		// Add the option and value
 		} else {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
+			$this->fields[$this->FieldID($field)]['OPTS'][] = array($opt => $value);
 		}
 	}
 	
@@ -448,7 +448,7 @@ 
 	* @param string $opt Table option
 	* @return array Options
 	*/
-	function addTableOpt( $opt ) {
+	function addTableOpt($opt) {
 		$this->opts[] = $opt;
 		
 		return $this->opts;
@@ -460,39 +460,39 @@ 
 	* @param object $xmls adoSchema object
 	* @return array Array containing table creation SQL
 	*/
-	function create( &$xmls ) {
+	function create(&$xmls) {
 		$sql = array();
 		
 		// drop any existing indexes
-		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
-			foreach( $legacy_indexes as $index => $index_details ) {
-				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
+		if (is_array($legacy_indexes = $xmls->dict->MetaIndexes($this->name))) {
+			foreach ($legacy_indexes as $index => $index_details) {
+				$sql[] = $xmls->dict->DropIndexSQL($index, $this->name);
 			}
 		}
 		
 		// remove fields to be dropped from table object
-		foreach( $this->drop_field as $field ) {
-			unset( $this->fields[$field] );
+		foreach ($this->drop_field as $field) {
+			unset($this->fields[$field]);
 		}
 		
 		// if table exists
-		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
+		if (is_array($legacy_fields = $xmls->dict->MetaColumns($this->name))) {
 			// drop table
-			if( $this->drop_table ) {
-				$sql[] = $xmls->dict->DropTableSQL( $this->name );
+			if ($this->drop_table) {
+				$sql[] = $xmls->dict->DropTableSQL($this->name);
 				
 				return $sql;
 			}
 			
 			// drop any existing fields not in schema
-			foreach( $legacy_fields as $field_id => $field ) {
-				if( !isset( $this->fields[$field_id] ) ) {
-					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
+			foreach ($legacy_fields as $field_id => $field) {
+				if (!isset($this->fields[$field_id])) {
+					$sql[] = $xmls->dict->DropColumnSQL($this->name, '`'.$field->name.'`');
 				}
 			}
 		// if table doesn't exist
 		} else {
-			if( $this->drop_table ) {
+			if ($this->drop_table) {
 				return $sql;
 			}
 			
@@ -502,9 +502,9 @@ 
 		// Loop through the field specifier array, building the associative array for the field options
 		$fldarray = array();
 		
-		foreach( $this->fields as $field_id => $finfo ) {
+		foreach ($this->fields as $field_id => $finfo) {
 			// Set an empty size if it isn't supplied
-			if( !isset( $finfo['SIZE'] ) ) {
+			if (!isset($finfo['SIZE'])) {
 				$finfo['SIZE'] = '';
 			}
 			
@@ -516,12 +516,12 @@ 
 			);
 			
 			// Loop through the options array and add the field options. 
-			if( isset( $finfo['OPTS'] ) ) {
-				foreach( $finfo['OPTS'] as $opt ) {
+			if (isset($finfo['OPTS'])) {
+				foreach ($finfo['OPTS'] as $opt) {
 					// Option has an argument.
-					if( is_array( $opt ) ) {
-						$key = key( $opt );
-						$value = $opt[key( $opt )];
+					if (is_array($opt)) {
+						$key = key($opt);
+						$value = $opt[key($opt)];
 						@$fldarray[$field_id][$key] .= $value;
 					// Option doesn't have arguments
 					} else {
@@ -531,23 +531,23 @@ 
 			}
 		}
 		
-		if( empty( $legacy_fields ) ) {
+		if (empty($legacy_fields)) {
 			// Create the new table
-			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-			logMsg( end( $sql ), 'Generated CreateTableSQL' );
+			$sql[] = $xmls->dict->CreateTableSQL($this->name, $fldarray, $this->opts);
+			logMsg(end($sql), 'Generated CreateTableSQL');
 		} else {
 			// Upgrade an existing table
-			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
-			switch( $xmls->upgrade ) {
+			logMsg("Upgrading {$this->name} using '{$xmls->upgrade}'");
+			switch ($xmls->upgrade) {
 				// Use ChangeTableSQL
 				case 'ALTER':
-					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
-					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
+					logMsg('Generated ChangeTableSQL (ALTERing table)');
+					$sql[] = $xmls->dict->ChangeTableSQL($this->name, $fldarray, $this->opts);
 					break;
 				case 'REPLACE':
-					logMsg( 'Doing upgrade REPLACE (testing)' );
-					$sql[] = $xmls->dict->DropTableSQL( $this->name );
-					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+					logMsg('Doing upgrade REPLACE (testing)');
+					$sql[] = $xmls->dict->DropTableSQL($this->name);
+					$sql[] = $xmls->dict->CreateTableSQL($this->name, $fldarray, $this->opts);
 					break;
 				// ignore table
 				default:
@@ -555,12 +555,12 @@ 
 			}
 		}
 		
-		foreach( $this->indexes as $index ) {
-			$sql[] = $index->create( $xmls );
+		foreach ($this->indexes as $index) {
+			$sql[] = $index->create($xmls);
 		}
 		
-		if( isset( $this->data ) ) {
-			$sql[] = $this->data->create( $xmls );
+		if (isset($this->data)) {
+			$sql[] = $this->data->create($xmls);
 		}
 		
 		return $sql;
@@ -570,14 +570,14 @@ 
 	* Marks a field or table for destruction
 	*/
 	function drop() {
-		if( isset( $this->current_field ) ) {
+		if (isset($this->current_field)) {
 			// Drop the current field
-			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
+			logMsg("Dropping field '{$this->current_field}' from table '{$this->name}'");
 			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
 			$this->drop_field[$this->current_field] = $this->current_field;
 		} else {
 			// Drop the current table
-			logMsg( "Dropping table '{$this->name}'" );
+			logMsg("Dropping table '{$this->name}'");
 			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
 			$this->drop_table = TRUE;
 		}
@@ -626,10 +626,10 @@ 
 	*
 	* @internal
 	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
+	function dbIndex(&$parent, $attributes = NULL) {
+		$this->parent = & $parent;
 		
-		$this->name = $this->prefix ($attributes['NAME']);
+		$this->name = $this->prefix($attributes['NAME']);
 	}
 	
 	/**
@@ -640,10 +640,10 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
+	function _tag_open(&$parser, $tag, $attributes) {
+		$this->currentElement = strtoupper($tag);
 		
-		switch( $this->currentElement ) {
+		switch ($this->currentElement) {
 			case 'DROP':
 				$this->drop();
 				break;
@@ -653,7 +653,7 @@ 
 			case 'FULLTEXT':
 			case 'HASH':
 				// Add index Option
-				$this->addIndexOpt( $this->currentElement );
+				$this->addIndexOpt($this->currentElement);
 				break;
 			default:
 				// print_r( array( $tag, $attributes ) );
@@ -667,11 +667,11 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
+	function _tag_cdata(&$parser, $cdata) {
+		switch ($this->currentElement) {
 			// Index field name
 			case 'COL':
-				$this->addField( $cdata );
+				$this->addField($cdata);
 				break;
 			default:
 				
@@ -683,12 +683,12 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close(&$parser, $tag) {
 		$this->currentElement = '';
 		
-		switch( strtoupper( $tag ) ) {
+		switch (strtoupper($tag)) {
 			case 'INDEX':
-				xml_set_object( $parser, $this->parent );
+				xml_set_object($parser, $this->parent);
 				break;
 		}
 	}
@@ -699,8 +699,8 @@ 
 	* @param string $name Field name
 	* @return string Field list
 	*/
-	function addField( $name ) {
-		$this->columns[$this->FieldID( $name )] = $name;
+	function addField($name) {
+		$this->columns[$this->FieldID($name)] = $name;
 		
 		// Return the field list
 		return $this->columns;
@@ -712,7 +712,7 @@ 
 	* @param string $opt Comma-separated list of index options.
 	* @return string Option list
 	*/
-	function addIndexOpt( $opt ) {
+	function addIndexOpt($opt) {
 		$this->opts[] = $opt;
 		
 		// Return the options list
@@ -725,19 +725,19 @@ 
 	* @param object $xmls adoSchema object
 	* @return array Array containing index creation SQL
 	*/
-	function create( &$xmls ) {
-		if( $this->drop ) {
+	function create(&$xmls) {
+		if ($this->drop) {
 			return NULL;
 		}
 		
 		// eliminate any columns that aren't in the table
-		foreach( $this->columns as $id => $col ) {
-			if( !isset( $this->parent->fields[$id] ) ) {
-				unset( $this->columns[$id] );
+		foreach ($this->columns as $id => $col) {
+			if (!isset($this->parent->fields[$id])) {
+				unset($this->columns[$id]);
 			}
 		}
 		
-		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
+		return $xmls->dict->CreateIndexSQL($this->name, $this->parent->name, $this->columns, $this->opts);
 	}
 	
 	/**
@@ -770,8 +770,8 @@ 
 	*
 	* @internal
 	*/
-	function dbData( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
+	function dbData(&$parent, $attributes = NULL) {
+		$this->parent = & $parent;
 	}
 	
 	/**
@@ -782,12 +782,12 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
+	function _tag_open(&$parser, $tag, $attributes) {
+		$this->currentElement = strtoupper($tag);
 		
-		switch( $this->currentElement ) {
+		switch ($this->currentElement) {
 			case 'ROW':
-				$this->row = count( $this->data );
+				$this->row = count($this->data);
 				$this->data[$this->row] = array();
 				break;
 			case 'F':
@@ -804,11 +804,11 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
+	function _tag_cdata(&$parser, $cdata) {
+		switch ($this->currentElement) {
 			// Index field name
 			case 'F':
-				$this->addData( $cdata );
+				$this->addData($cdata);
 				break;
 			default:
 				
@@ -820,12 +820,12 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close(&$parser, $tag) {
 		$this->currentElement = '';
 		
-		switch( strtoupper( $tag ) ) {
+		switch (strtoupper($tag)) {
 			case 'DATA':
-				xml_set_object( $parser, $this->parent );
+				xml_set_object($parser, $this->parent);
 				break;
 		}
 	}
@@ -836,15 +836,15 @@ 
 	* @param string $name Field name
 	* @return string Field list
 	*/
-	function addField( $attributes ) {
-		if( isset( $attributes['NAME'] ) ) {
+	function addField($attributes) {
+		if (isset($attributes['NAME'])) {
 			$name = $attributes['NAME'];
 		} else {
 			$name = count($this->data[$this->row]);
 		}
 		
 		// Set the field index so we know where we are
-		$this->current_field = $this->FieldID( $name );
+		$this->current_field = $this->FieldID($name);
 	}
 	
 	/**
@@ -853,12 +853,12 @@ 
 	* @param string $opt Comma-separated list of index options.
 	* @return string Option list
 	*/
-	function addData( $cdata ) {
-		if( !isset( $this->data[$this->row] ) ) {
+	function addData($cdata) {
+		if (!isset($this->data[$this->row])) {
 			$this->data[$this->row] = array();
 		}
 		
-		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
+		if (!isset($this->data[$this->row][$this->current_field])) {
 			$this->data[$this->row][$this->current_field] = '';
 		}
 		
@@ -871,20 +871,20 @@ 
 	* @param object $xmls adoSchema object
 	* @return array Array containing index creation SQL
 	*/
-	function create( &$xmls ) {
+	function create(&$xmls) {
 		$table = $xmls->dict->TableName($this->parent->name);
 		$table_field_count = count($this->parent->fields);
 		$sql = array();
 		
 		// eliminate any columns that aren't in the table
-		foreach( $this->data as $row ) {
+		foreach ($this->data as $row) {
 			$table_fields = $this->parent->fields;
 			$fields = array();
 			
-			foreach( $row as $field_id => $field_data ) {
-				if( !array_key_exists( $field_id, $table_fields ) ) {
-					if( is_numeric( $field_id ) ) {
-						$field_id = reset( array_keys( $table_fields ) );
+			foreach ($row as $field_id => $field_data) {
+				if (!array_key_exists($field_id, $table_fields)) {
+					if (is_numeric($field_id)) {
+						$field_id = reset(array_keys($table_fields));
 					} else {
 						continue;
 					}
@@ -892,12 +892,12 @@ 
 				
 				$name = $table_fields[$field_id]['NAME'];
 				
-				switch( $table_fields[$field_id]['TYPE'] ) {
+				switch ($table_fields[$field_id]['TYPE']) {
 					case 'C':
 					case 'C2':
 					case 'X':
 					case 'X2':
-						$fields[$name] = $xmls->db->qstr( $field_data );
+						$fields[$name] = $xmls->db->qstr($field_data);
 						break;
 					case 'I':
 					case 'I1':
@@ -914,21 +914,21 @@ 
 			}
 			
 			// check that at least 1 column is specified
-			if( empty( $fields ) ) {
+			if (empty($fields)) {
 				continue;
 			}
 			
 			// check that no required columns are missing
-			if( count( $fields ) < $table_field_count ) {
-				foreach( $table_fields as $field ) {
-					if (isset( $field['OPTS'] ))
-						if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
+			if (count($fields) < $table_field_count) {
+				foreach ($table_fields as $field) {
+					if (isset($field['OPTS']))
+						if ((in_array('NOTNULL', $field['OPTS']) || in_array('KEY', $field['OPTS'])) && !in_array('AUTOINCREMENT', $field['OPTS'])) {
 							continue(2);
 						}
 				}
 			}
 			
-			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
+			$sql[] = 'INSERT INTO '.$table.' ('.implode(',', array_keys($fields)).') VALUES ('.implode(',', $fields).')';
 		}
 		
 		return $sql;
@@ -969,18 +969,18 @@ 
 	* @param object $parent Parent object
 	* @param array $attributes Attributes
 	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
+	function dbQuerySet(&$parent, $attributes = NULL) {
+		$this->parent = & $parent;
 			
 		// Overrides the manual prefix key
-		if( isset( $attributes['KEY'] ) ) {
+		if (isset($attributes['KEY'])) {
 			$this->prefixKey = $attributes['KEY'];
 		}
 		
-		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
+		$prefixMethod = isset($attributes['PREFIXMETHOD']) ? strtoupper(trim($attributes['PREFIXMETHOD'])) : '';
 		
 		// Enables or disables automatic prefix prepending
-		switch( $prefixMethod ) {
+		switch ($prefixMethod) {
 			case 'AUTO':
 				$this->prefixMethod = 'AUTO';
 				break;
@@ -999,15 +999,15 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
+	function _tag_open(&$parser, $tag, $attributes) {
+		$this->currentElement = strtoupper($tag);
 		
-		switch( $this->currentElement ) {
+		switch ($this->currentElement) {
 			case 'QUERY':
 				// Create a new query in a SQL queryset.
 				// Ignore this query set if a platform is specified and it's different than the 
 				// current connection platform.
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				if (!isset($attributes['PLATFORM']) OR $this->supportedPlatform($attributes['PLATFORM'])) {
 					$this->newQuery();
 				} else {
 					$this->discardQuery();
@@ -1021,11 +1021,11 @@ 
 	/**
 	* XML Callback to process CDATA elements
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
+	function _tag_cdata(&$parser, $cdata) {
+		switch ($this->currentElement) {
 			// Line of queryset SQL data
 			case 'QUERY':
-				$this->buildQuery( $cdata );
+				$this->buildQuery($cdata);
 				break;
 			default:
 				
@@ -1037,17 +1037,17 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close(&$parser, $tag) {
 		$this->currentElement = '';
 		
-		switch( strtoupper( $tag ) ) {
+		switch (strtoupper($tag)) {
 			case 'QUERY':
 				// Add the finished query to the open query set.
 				$this->addQuery();
 				break;
 			case 'SQL':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
+				$this->parent->addSQL($this->create($this->parent));
+				xml_set_object($parser, $this->parent);
 				$this->destroy();
 				break;
 			default:
@@ -1072,7 +1072,7 @@ 
 	* @return boolean TRUE
 	*/
 	function discardQuery() {
-		unset( $this->query );
+		unset($this->query);
 		
 		return TRUE;
 	}
@@ -1083,8 +1083,8 @@ 
 	* @param string $data Line of SQL data or NULL to initialize a new query
 	* @return string SQL query string.
 	*/
-	function buildQuery( $sql = NULL ) {
-		if( !isset( $this->query ) OR empty( $sql ) ) {
+	function buildQuery($sql = NULL) {
+		if (!isset($this->query) OR empty($sql)) {
 			return FALSE;
 		}
 		
@@ -1099,13 +1099,13 @@ 
 	* @return string	SQL of added query
 	*/
 	function addQuery() {
-		if( !isset( $this->query ) ) {
+		if (!isset($this->query)) {
 			return FALSE;
 		}
 		
 		$this->queries[] = $return = trim($this->query);
 		
-		unset( $this->query );
+		unset($this->query);
 		
 		return $return;
 	}
@@ -1116,17 +1116,17 @@ 
 	* @param object $xmls adoSchema object
 	* @return array Query set
 	*/
-	function create( &$xmls ) {
-		foreach( $this->queries as $id => $query ) {
-			switch( $this->prefixMethod ) {
+	function create(&$xmls) {
+		foreach ($this->queries as $id => $query) {
+			switch ($this->prefixMethod) {
 				case 'AUTO':
 					// Enable auto prefix replacement
 					
 					// Process object prefix.
 					// Evaluate SQL statements to prepend prefix to objects
-					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					$query = $this->prefixQuery('/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix);
+					$query = $this->prefixQuery('/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix);
+					$query = $this->prefixQuery('/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix);
 					
 					// SELECT statements aren't working yet
 					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
@@ -1134,16 +1134,16 @@ 
 				case 'MANUAL':
 					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
 					// If prefixKey is not set, we use the default constant XMLS_PREFIX
-					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
+					if (isset($this->prefixKey) AND ($this->prefixKey !== '')) {
 						// Enable prefix override
-						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
+						$query = str_replace($this->prefixKey, $xmls->objectPrefix, $query);
 					} else {
 						// Use default replacement
-						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
+						$query = str_replace(XMLS_PREFIX, $xmls->objectPrefix, $query);
 					}
 			}
 			
-			$this->queries[$id] = trim( $query );
+			$this->queries[$id] = trim($query);
 		}
 		
 		// Return the query set array
@@ -1158,28 +1158,28 @@ 
 	* @param string $prefix Prefix to be appended to tables, indices, etc.
 	* @return string Prefixed SQL query string.
 	*/
-	function prefixQuery( $regex, $query, $prefix = NULL ) {
-		if( !isset( $prefix ) ) {
+	function prefixQuery($regex, $query, $prefix = NULL) {
+		if (!isset($prefix)) {
 			return $query;
 		}
 		
-		if( preg_match( $regex, $query, $match ) ) {
+		if (preg_match($regex, $query, $match)) {
 			$preamble = $match[1];
 			$postamble = $match[5];
-			$objectList = explode( ',', $match[3] );
+			$objectList = explode(',', $match[3]);
 			// $prefix = $prefix . '_';
 			
 			$prefixedList = '';
 			
-			foreach( $objectList as $object ) {
-				if( $prefixedList !== '' ) {
+			foreach ($objectList as $object) {
+				if ($prefixedList !== '') {
 					$prefixedList .= ', ';
 				}
 				
-				$prefixedList .= $prefix . trim( $object );
+				$prefixedList .= $prefix.trim($object);
 			}
 			
-			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
+			$query = $preamble.' '.$prefixedList.' '.$postamble;
 		}
 		
 		return $query;
@@ -1285,18 +1285,18 @@ 
 	*
 	* @param object $db ADOdb database connection object.
 	*/
-	function adoSchema( &$db ) {
+	function adoSchema(&$db) {
 		// Initialize the environment
 		$this->mgq = get_magic_quotes_runtime();
 		set_magic_quotes_runtime(0);
 		
-		$this->db =& $db;
+		$this->db = & $db;
 		$this->debug = $this->db->debug;
-		$this->dict = NewDataDictionary( $this->db );
+		$this->dict = NewDataDictionary($this->db);
 		$this->sqlArray = array();
 		$this->schemaVersion = XMLS_SCHEMA_VERSION;
-		$this->executeInline( XMLS_EXECUTE_INLINE );
-		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
+		$this->executeInline(XMLS_EXECUTE_INLINE);
+		$this->continueOnError(XMLS_CONTINUE_ON_ERROR);
 		$this->setUpgradeMethod();
 	}
 	
@@ -1316,15 +1316,15 @@ 
 	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
 	* @returns string Upgrade method used
 	*/
-	function SetUpgradeMethod( $method = '' ) {
-		if( !is_string( $method ) ) {
+	function SetUpgradeMethod($method = '') {
+		if (!is_string($method)) {
 			return FALSE;
 		}
 		
-		$method = strtoupper( $method );
+		$method = strtoupper($method);
 		
 		// Handle the upgrade methods
-		switch( $method ) {
+		switch ($method) {
 			case 'ALTER':
 				$this->upgrade = $method;
 				break;
@@ -1358,8 +1358,8 @@ 
 	*
 	* @see ParseSchema(), ExecuteSchema()
 	*/
-	function ExecuteInline( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
+	function ExecuteInline($mode = NULL) {
+		if (is_bool($mode)) {
 			$this->executeInline = $mode;
 		}
 		
@@ -1379,8 +1379,8 @@ 
 	*
 	* @see addSQL(), ExecuteSchema()
 	*/
-	function ContinueOnError( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
+	function ContinueOnError($mode = NULL) {
+		if (is_bool($mode)) {
 			$this->continueOnError = $mode;
 		}
 		
@@ -1398,8 +1398,8 @@ 
 	* @param bool $returnSchema Return schema rather than parsing.
 	* @return array Array of SQL queries, ready to execute
 	*/
-	function ParseSchema( $filename, $returnSchema = FALSE ) {
-		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	function ParseSchema($filename, $returnSchema = FALSE) {
+		return $this->ParseSchemaString($this->ConvertSchemaFile($filename), $returnSchema);
 	}
 	
 	/**
@@ -1415,19 +1415,19 @@ 
 	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
 	* @see ParseSchema(), ParseSchemaString()
 	*/
-	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
+	function ParseSchemaFile($filename, $returnSchema = FALSE) {
 		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
+		if (!($fp = fopen($filename, 'r'))) {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
 		
 		// do version detection here
-		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
+		if ($this->SchemaFileVersion($filename) != $this->schemaVersion) {
 			return FALSE;
 		}
 		
-		if ( $returnSchema )
+		if ($returnSchema)
 		{
 			return $xmlstring;
 		}
@@ -1437,17 +1437,17 @@ 
 		$xmlParser = $this->create_parser();
 		
 		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
-				die( sprintf(
+		while ($data = fread($fp, 4096)) {
+			if (!xml_parse($xmlParser, $data, feof($fp))) {
+				die(sprintf(
 					"XML error: %s at line %d",
-					xml_error_string( xml_get_error_code( $xmlParser) ),
-					xml_get_current_line_number( $xmlParser)
-				) );
+					xml_error_string(xml_get_error_code($xmlParser)),
+					xml_get_current_line_number($xmlParser)
+				));
 			}
 		}
 		
-		xml_parser_free( $xmlParser );
+		xml_parser_free($xmlParser);
 		
 		return $this->sqlArray;
 	}
@@ -1463,17 +1463,17 @@ 
 	* @param bool $returnSchema Return schema rather than parsing.
 	* @return array Array of SQL queries, ready to execute.
 	*/
-	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+	function ParseSchemaString($xmlstring, $returnSchema = FALSE) {
+		if (!is_string($xmlstring) OR empty($xmlstring)) {
 			return FALSE;
 		}
 		
 		// do version detection here
-		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
+		if ($this->SchemaStringVersion($xmlstring) != $this->schemaVersion) {
 			return FALSE;
 		}
 		
-		if ( $returnSchema )
+		if ($returnSchema)
 		{
 			return $xmlstring;
 		}
@@ -1482,15 +1482,15 @@ 
 		
 		$xmlParser = $this->create_parser();
 		
-		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
-			die( sprintf(
+		if (!xml_parse($xmlParser, $xmlstring, TRUE)) {
+			die(sprintf(
 				"XML error: %s at line %d",
-				xml_error_string( xml_get_error_code( $xmlParser) ),
-				xml_get_current_line_number( $xmlParser)
-			) );
+				xml_error_string(xml_get_error_code($xmlParser)),
+				xml_get_current_line_number($xmlParser)
+			));
 		}
 		
-		xml_parser_free( $xmlParser );
+		xml_parser_free($xmlParser);
 		
 		return $this->sqlArray;
 	}
@@ -1506,8 +1506,8 @@ 
 	* @param bool $returnSchema Return schema rather than parsing.
 	* @return array Array of SQL queries, ready to execute
 	*/
-	function RemoveSchema( $filename, $returnSchema = FALSE ) {
-		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	function RemoveSchema($filename, $returnSchema = FALSE) {
+		return $this->RemoveSchemaString($this->ConvertSchemaFile($filename), $returnSchema);
 	}
 	
 	/**
@@ -1521,14 +1521,14 @@ 
 	* @param bool $returnSchema Return schema rather than parsing.
 	* @return array Array of SQL queries, ready to execute.
 	*/
-	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
+	function RemoveSchemaString($schema, $returnSchema = FALSE) {
 		
 		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+		if (!($version = $this->SchemaStringVersion($schema))) {
 			return FALSE;
 		}
 		
-		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
+		return $this->ParseSchemaString($this->TransformSchema($schema, 'remove-'.$version), $returnSchema);
 	}
 	
 	/**
@@ -1544,19 +1544,19 @@ 
 	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
 	* @returns integer 0 if failure, 1 if errors, 2 if successful.
 	*/
-	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
-		if( !is_bool( $continueOnErr ) ) {
+	function ExecuteSchema($sqlArray = NULL, $continueOnErr = NULL) {
+		if (!is_bool($continueOnErr)) {
 			$continueOnErr = $this->ContinueOnError();
 		}
 		
-		if( !isset( $sqlArray ) ) {
+		if (!isset($sqlArray)) {
 			$sqlArray = $this->sqlArray;
 		}
 		
-		if( !is_array( $sqlArray ) ) {
+		if (!is_array($sqlArray)) {
 			$this->success = 0;
 		} else {
-			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
+			$this->success = $this->dict->ExecuteSQLArray($sqlArray, $continueOnErr);
 		}
 		
 		return $this->success;
@@ -1571,8 +1571,8 @@ 
 	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
 	* @return array Array of SQL statements or FALSE if an error occurs
 	*/
-	function PrintSQL( $format = 'NONE' ) {
-		return $this->getSQL( $format, $sqlArray );
+	function PrintSQL($format = 'NONE') {
+		return $this->getSQL($format, $sqlArray);
 	}
 	
 	/**
@@ -1584,21 +1584,21 @@ 
 	* @param string $filename Path and name where the file should be saved.
 	* @return boolean TRUE if save is successful, else FALSE. 
 	*/
-	function SaveSQL( $filename = './schema.sql' ) {
+	function SaveSQL($filename = './schema.sql') {
 		
-		if( !isset( $sqlArray ) ) {
+		if (!isset($sqlArray)) {
 			$sqlArray = $this->sqlArray;
 		}
-		if( !isset( $sqlArray ) ) {
+		if (!isset($sqlArray)) {
 			return FALSE;
 		}
 		
-		$fp = fopen( $filename, "w" );
+		$fp = fopen($filename, "w");
 		
-		foreach( $sqlArray as $key => $query ) {
-			fwrite( $fp, $query . ";\n" );
+		foreach ($sqlArray as $key => $query) {
+			fwrite($fp, $query.";\n");
 		}
-		fclose( $fp );
+		fclose($fp);
 	}
 	
 	/**
@@ -1611,11 +1611,11 @@ 
 	function &create_parser() {
 		// Create the parser
 		$xmlParser = xml_parser_create();
-		xml_set_object( $xmlParser, $this );
+		xml_set_object($xmlParser, $this);
 		
 		// Initialize the XML callback functions
-		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
-		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
+		xml_set_element_handler($xmlParser, '_tag_open', '_tag_close');
+		xml_set_character_data_handler($xmlParser, '_tag_cdata');
 		
 		return $xmlParser;
 	}
@@ -1625,16 +1625,16 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		switch( strtoupper( $tag ) ) {
+	function _tag_open(&$parser, $tag, $attributes) {
+		switch (strtoupper($tag)) {
 			case 'TABLE':
-				$this->obj = new dbTable( $this, $attributes );
-				xml_set_object( $parser, $this->obj );
+				$this->obj = new dbTable($this, $attributes);
+				xml_set_object($parser, $this->obj);
 				break;
 			case 'SQL':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->obj = new dbQuerySet( $this, $attributes );
-					xml_set_object( $parser, $this->obj );
+				if (!isset($attributes['PLATFORM']) OR $this->supportedPlatform($attributes['PLATFORM'])) {
+					$this->obj = new dbQuerySet($this, $attributes);
+					xml_set_object($parser, $this->obj);
 				}
 				break;
 			default:
@@ -1648,7 +1648,7 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
+	function _tag_cdata(&$parser, $cdata) {
 	}
 	
 	/**
@@ -1657,7 +1657,7 @@ 
 	* @access private
 	* @internal
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close(&$parser, $tag) {
 		
 	}
 	
@@ -1677,26 +1677,26 @@ 
 	* @param string $newFile File name of (converted) output file.
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
-	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
+	function ConvertSchemaString($schema, $newVersion = NULL, $newFile = NULL) {
 		
 		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+		if (!($version = $this->SchemaStringVersion($schema))) {
 			return FALSE;
 		}
 		
-		if( !isset ($newVersion) ) {
+		if (!isset ($newVersion)) {
 			$newVersion = $this->schemaVersion;
 		}
 		
-		if( $version == $newVersion ) {
+		if ($version == $newVersion) {
 			$result = $schema;
 		} else {
-			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
+			$result = $this->TransformSchema($schema, 'convert-'.$version.'-'.$newVersion);
 		}
 		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
+		if (is_string($result) AND is_string($newFile) AND ($fp = fopen($newFile, 'w'))) {
+			fwrite($fp, $result);
+			fclose($fp);
 		}
 		
 		return $result;
@@ -1718,81 +1718,81 @@ 
 	* @param string $newFile File name of (converted) output file.
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
-	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
+	function ConvertSchemaFile($filename, $newVersion = NULL, $newFile = NULL) {
 		
 		// grab current version
-		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
+		if (!($version = $this->SchemaFileVersion($filename))) {
 			return FALSE;
 		}
 		
-		if( !isset ($newVersion) ) {
+		if (!isset ($newVersion)) {
 			$newVersion = $this->schemaVersion;
 		}
 		
-		if( $version == $newVersion ) {
-			$result = file_get_contents( $filename );
+		if ($version == $newVersion) {
+			$result = file_get_contents($filename);
 			
 			// remove unicode BOM if present
-			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
-				$result = substr( $result, 3 );
+			if (substr($result, 0, 3) == sprintf('%c%c%c', 239, 187, 191)) {
+				$result = substr($result, 3);
 			}
 		} else {
-			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
+			$result = $this->TransformSchema($filename, 'convert-'.$version.'-'.$newVersion, 'file');
 		}
 		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
+		if (is_string($result) AND is_string($newFile) AND ($fp = fopen($newFile, 'w'))) {
+			fwrite($fp, $result);
+			fclose($fp);
 		}
 		
 		return $result;
 	}
 	
-	function TransformSchema( $schema, $xsl, $schematype='string' )
+	function TransformSchema($schema, $xsl, $schematype = 'string')
 	{
 		// Fail if XSLT extension is not available
-		if( ! function_exists( 'xslt_create' ) ) {
+		if (!function_exists('xslt_create')) {
 			return FALSE;
 		}
 		
-		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
+		$xsl_file = dirname(__FILE__).'/xsl/'.$xsl.'.xsl';
 		
 		// look for xsl
-		if( !is_readable( $xsl_file ) ) {
+		if (!is_readable($xsl_file)) {
 			return FALSE;
 		}
 		
-		switch( $schematype )
+		switch ($schematype)
 		{
 			case 'file':
-				if( !is_readable( $schema ) ) {
+				if (!is_readable($schema)) {
 					return FALSE;
 				}
 				
-				$schema = file_get_contents( $schema );
+				$schema = file_get_contents($schema);
 				break;
 			case 'string':
 			default:
-				if( !is_string( $schema ) ) {
+				if (!is_string($schema)) {
 					return FALSE;
 				}
 		}
 		
-		$arguments = array (
+		$arguments = array(
 			'/_xml' => $schema,
-			'/_xsl' => file_get_contents( $xsl_file )
+			'/_xsl' => file_get_contents($xsl_file)
 		);
 		
 		// create an XSLT processor
-		$xh = xslt_create ();
+		$xh = xslt_create();
 		
 		// set error handler
-		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
+		xslt_set_error_handler($xh, array(&$this, 'xslt_error_handler'));
 		
 		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
+		$result = xslt_process($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
 		
-		xslt_free ($xh);
+		xslt_free($xh);
 		
 		return $result;
 	}
@@ -1807,17 +1807,17 @@ 
 	*
 	* @access private
 	*/
-	function xslt_error_handler( $parser, $errno, $level, $fields ) {
-		if( is_array( $fields ) ) {
+	function xslt_error_handler($parser, $errno, $level, $fields) {
+		if (is_array($fields)) {
 			$msg = array(
-				'Message Type' => ucfirst( $fields['msgtype'] ),
+				'Message Type' => ucfirst($fields['msgtype']),
 				'Message Code' => $fields['code'],
 				'Message' => $fields['msg'],
 				'Error Number' => $errno,
 				'Level' => $level
 			);
 			
-			switch( $fields['URI'] ) {
+			switch ($fields['URI']) {
 				case 'arg:/_xml':
 					$msg['Input'] = 'XML';
 					break;
@@ -1834,20 +1834,20 @@ 
 				'Message Type' => 'Error',
 				'Error Number' => $errno,
 				'Level' => $level,
-				'Fields' => var_export( $fields, TRUE )
+				'Fields' => var_export($fields, TRUE)
 			);
 		}
 		
-		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
-					   . '<table>' . "\n";
+		$error_details = $msg['Message Type'].' in XSLT Transformation'."\n"
+					   . '<table>'."\n";
 		
-		foreach( $msg as $label => $details ) {
-			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
+		foreach ($msg as $label => $details) {
+			$error_details .= '<tr><td><b>'.$label.': </b></td><td>'.htmlentities($details).'</td></tr>'."\n";
 		}
 		
 		$error_details .= '</table>';
 		
-		trigger_error( $error_details, E_USER_ERROR );
+		trigger_error($error_details, E_USER_ERROR);
 	}
 	
 	/**
@@ -1859,17 +1859,17 @@ 
 	* @param string $filename AXMLS schema file
 	* @return string Schema version number or FALSE on error
 	*/
-	function SchemaFileVersion( $filename ) {
+	function SchemaFileVersion($filename) {
 		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
+		if (!($fp = fopen($filename, 'r'))) {
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
 		
 		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( preg_match( $this->versionRegex, $data, $matches ) ) {
-				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+		while ($data = fread($fp, 4096)) {
+			if (preg_match($this->versionRegex, $data, $matches)) {
+				return !empty($matches[2]) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 			}
 		}
 		
@@ -1885,13 +1885,13 @@ 
 	* @param string $xmlstring XML schema string
 	* @return string Schema version number or FALSE on error
 	*/
-	function SchemaStringVersion( $xmlstring ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+	function SchemaStringVersion($xmlstring) {
+		if (!is_string($xmlstring) OR empty($xmlstring)) {
 			return FALSE;
 		}
 		
-		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
-			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+		if (preg_match($this->versionRegex, $xmlstring, $matches)) {
+			return !empty($matches[2]) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 		}
 		
 		return FALSE;
@@ -1907,98 +1907,98 @@ 
 	* @param boolean $data Include data in schema dump
 	* @return string Generated XML schema
 	*/
-	function ExtractSchema( $data = FALSE ) {
-		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
+	function ExtractSchema($data = FALSE) {
+		$old_mode = $this->db->SetFetchMode(ADODB_FETCH_NUM);
 		
-		$schema = '<?xml version="1.0"?>' . "\n"
-				. '<schema version="' . $this->schemaVersion . '">' . "\n";
+		$schema = '<?xml version="1.0"?>'."\n"
+				. '<schema version="'.$this->schemaVersion.'">'."\n";
 		
-		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
-			foreach( $tables as $table ) {
-				$schema .= '	<table name="' . $table . '">' . "\n";
+		if (is_array($tables = $this->db->MetaTables('TABLES'))) {
+			foreach ($tables as $table) {
+				$schema .= '	<table name="'.$table.'">'."\n";
 				
 				// grab details from database
-				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
-				$fields = $this->db->MetaColumns( $table );
-				$indexes = $this->db->MetaIndexes( $table );
+				$rs = $this->db->Execute('SELECT * FROM '.$table.' WHERE 1=1');
+				$fields = $this->db->MetaColumns($table);
+				$indexes = $this->db->MetaIndexes($table);
 				
-				if( is_array( $fields ) ) {
-					foreach( $fields as $details ) {
+				if (is_array($fields)) {
+					foreach ($fields as $details) {
 						$extra = '';
 						$content = array();
 						
-						if( $details->max_length > 0 ) {
-							$extra .= ' size="' . $details->max_length . '"';
+						if ($details->max_length > 0) {
+							$extra .= ' size="'.$details->max_length.'"';
 						}
 						
-						if( $details->primary_key ) {
+						if ($details->primary_key) {
 							$content[] = '<KEY/>';
-						} elseif( $details->not_null ) {
+						} elseif ($details->not_null) {
 							$content[] = '<NOTNULL/>';
 						}
 						
-						if( $details->has_default ) {
-							$content[] = '<DEFAULT value="' . $details->default_value . '"/>';
+						if ($details->has_default) {
+							$content[] = '<DEFAULT value="'.$details->default_value.'"/>';
 						}
 						
-						if( $details->auto_increment ) {
+						if ($details->auto_increment) {
 							$content[] = '<AUTOINCREMENT/>';
 						}
 						
 						// this stops the creation of 'R' columns,
 						// AUTOINCREMENT is used to create auto columns
 						$details->primary_key = 0;
-						$type = $rs->MetaType( $details );
+						$type = $rs->MetaType($details);
 						
-						$schema .= '		<field name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
+						$schema .= '		<field name="'.$details->name.'" type="'.$type.'"'.$extra.'>';
 						
-						if( !empty( $content ) ) {
-							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
+						if (!empty($content)) {
+							$schema .= "\n			".implode("\n			", $content)."\n		";
 						}
 						
-						$schema .= '</field>' . "\n";
+						$schema .= '</field>'."\n";
 					}
 				}
 				
-				if( is_array( $indexes ) ) {
-					foreach( $indexes as $index => $details ) {
-						$schema .= '		<index name="' . $index . '">' . "\n";
+				if (is_array($indexes)) {
+					foreach ($indexes as $index => $details) {
+						$schema .= '		<index name="'.$index.'">'."\n";
 						
-						if( $details['unique'] ) {
-							$schema .= '			<UNIQUE/>' . "\n";
+						if ($details['unique']) {
+							$schema .= '			<UNIQUE/>'."\n";
 						}
 						
-						foreach( $details['columns'] as $column ) {
-							$schema .= '			<col>' . $column . '</col>' . "\n";
+						foreach ($details['columns'] as $column) {
+							$schema .= '			<col>'.$column.'</col>'."\n";
 						}
 						
-						$schema .= '		</index>' . "\n";
+						$schema .= '		</index>'."\n";
 					}
 				}
 				
-				if( $data ) {
-					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
+				if ($data) {
+					$rs = $this->db->Execute('SELECT * FROM '.$table);
 					
-					if( is_object( $rs ) ) {
-						$schema .= '		<data>' . "\n";
+					if (is_object($rs)) {
+						$schema .= '		<data>'."\n";
 						
-						while( $row = $rs->FetchRow() ) {
-							foreach( $row as $key => $val ) {
+						while ($row = $rs->FetchRow()) {
+							foreach ($row as $key => $val) {
 								$row[$key] = htmlentities($val);
 							}
 							
-							$schema .= '			<row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
+							$schema .= '			<row><f>'.implode('</f><f>', $row).'</f></row>'."\n";
 						}
 						
-						$schema .= '		</data>' . "\n";
+						$schema .= '		</data>'."\n";
 					}
 				}
 				
-				$schema .= '	</table>' . "\n";
+				$schema .= '	</table>'."\n";
 			}
 		}
 		
-		$this->db->SetFetchMode( $old_mode );
+		$this->db->SetFetchMode($old_mode);
 		
 		$schema .= '</schema>';
 		return $schema;
@@ -2014,27 +2014,27 @@ 
 	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
 	* @return boolean TRUE if successful, else FALSE
 	*/
-	function SetPrefix( $prefix = '', $underscore = TRUE ) {
-		switch( TRUE ) {
+	function SetPrefix($prefix = '', $underscore = TRUE) {
+		switch (TRUE) {
 			// clear prefix
-			case empty( $prefix ):
-				logMsg( 'Cleared prefix' );
+			case empty($prefix):
+				logMsg('Cleared prefix');
 				$this->objectPrefix = '';
 				return TRUE;
 			// prefix too long
-			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
+			case strlen($prefix) > XMLS_PREFIX_MAXLEN:
 			// prefix contains invalid characters
-			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
-				logMsg( 'Invalid prefix: ' . $prefix );
+			case !preg_match('/^[a-z][a-z0-9_]+$/i', $prefix):
+				logMsg('Invalid prefix: '.$prefix);
 				return FALSE;
 		}
 		
-		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
+		if ($underscore AND substr($prefix, -1) != '_') {
 			$prefix .= '_';
 		}
 		
 		// prefix valid
-		logMsg( 'Set prefix: ' . $prefix );
+		logMsg('Set prefix: '.$prefix);
 		$this->objectPrefix = $prefix;
 		return TRUE;
 	}
@@ -2047,12 +2047,12 @@ 
 	*
 	* @access private
 	*/
-	function prefix( $name = '' ) {
+	function prefix($name = '') {
 		// if prefix is set
-		if( !empty( $this->objectPrefix ) ) {
+		if (!empty($this->objectPrefix)) {
 			// Prepend the object prefix to the table name
 			// prepend after quote if used
-			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
+			return preg_replace('/^(`?)(.+)$/', '$1'.$this->objectPrefix.'$2', $name);
 		}
 		
 		// No prefix set. Use name provided.
@@ -2067,14 +2067,14 @@ 
 	*
 	* @access private
 	*/
-	function supportedPlatform( $platform = NULL ) {
-		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
+	function supportedPlatform($platform = NULL) {
+		$regex = '/^(\w*\|)*'.$this->db->databaseType.'(\|\w*)*$/';
 		
-		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
-			logMsg( "Platform $platform is supported" );
+		if (!isset($platform) OR preg_match($regex, $platform)) {
+			logMsg("Platform $platform is supported");
 			return TRUE;
 		} else {
-			logMsg( "Platform $platform is NOT supported" );
+			logMsg("Platform $platform is NOT supported");
 			return FALSE;
 		}
 	}
@@ -2096,28 +2096,28 @@ 
 	*
 	* @access private
 	*/	
-	function addSQL( $sql = NULL ) {
-		if( is_array( $sql ) ) {
-			foreach( $sql as $line ) {
-				$this->addSQL( $line );
+	function addSQL($sql = NULL) {
+		if (is_array($sql)) {
+			foreach ($sql as $line) {
+				$this->addSQL($line);
 			}
 			
 			return TRUE;
 		}
 		
-		if( is_string( $sql ) ) {
+		if (is_string($sql)) {
 			$this->sqlArray[] = $sql;
 			
 			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
-			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
+			if ($this->ExecuteInline() && ($this->success == 2 || $this->ContinueOnError())) {
 				$saved = $this->db->debug;
 				$this->db->debug = $this->debug;
-				$ok = $this->db->Execute( $sql );
+				$ok = $this->db->Execute($sql);
 				$this->db->debug = $saved;
 				
-				if( !$ok ) {
-					if( $this->debug ) {
-						ADOConnection::outp( $this->db->ErrorMsg() );
+				if (!$ok) {
+					if ($this->debug) {
+						ADOConnection::outp($this->db->ErrorMsg());
 					}
 					
 					$this->success = 1;
@@ -2138,21 +2138,21 @@ 
 	*	
 	* @access private
 	*/
-	function getSQL( $format = NULL, $sqlArray = NULL ) {
-		if( !is_array( $sqlArray ) ) {
+	function getSQL($format = NULL, $sqlArray = NULL) {
+		if (!is_array($sqlArray)) {
 			$sqlArray = $this->sqlArray;
 		}
 		
-		if( !is_array( $sqlArray ) ) {
+		if (!is_array($sqlArray)) {
 			return FALSE;
 		}
 		
-		switch( strtolower( $format ) ) {
+		switch (strtolower($format)) {
 			case 'string':
 			case 'text':
-				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
+				return !empty($sqlArray) ? implode(";\n\n", $sqlArray).';' : '';
 			case'html':
-				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
+				return !empty($sqlArray) ? nl2br(htmlentities(implode(";\n\n", $sqlArray).';')) : '';
 		}
 		
 		return $this->sqlArray;
@@ -2165,8 +2165,8 @@ 
 	* @deprecated adoSchema now cleans up automatically.
 	*/
 	function Destroy() {
-		set_magic_quotes_runtime( $this->mgq );
-		unset( $this );
+		set_magic_quotes_runtime($this->mgq);
+		unset($this);
 	}
 }
 
@@ -2175,19 +2175,19 @@ 
 *
 * @access private
 */
-function logMsg( $msg, $title = NULL, $force = FALSE ) {
-	if( XMLS_DEBUG or $force ) {
+function logMsg($msg, $title = NULL, $force = FALSE) {
+	if (XMLS_DEBUG or $force) {
 		echo '<pre>';
 		
-		if( isset( $title ) ) {
-			echo '<h3>' . htmlentities( $title ) . '</h3>';
+		if (isset($title)) {
+			echo '<h3>'.htmlentities($title).'</h3>';
 		}
 		
-		if( is_object( $this ) ) {
-			echo '[' . get_class( $this ) . '] ';
+		if (is_object($this)) {
+			echo '['.get_class($this).'] ';
 		}
 		
-		print_r( $msg );
+		print_r($msg);
 		
 		echo '</pre>';
 	}

Braces +501 added lines, -242 removed lines

@@ -21,63 +21,72 @@ 
 /**
 * Debug on or off
 */
-if( !defined( 'XMLS_DEBUG' ) ) {
+if( !defined( 'XMLS_DEBUG' ) )
+{
 	define( 'XMLS_DEBUG', FALSE );
 }
 
 /**
 * Default prefix key
 */
-if( !defined( 'XMLS_PREFIX' ) ) {
+if( !defined( 'XMLS_PREFIX' ) )
+{
 	define( 'XMLS_PREFIX', '%%P' );
 }
 
 /**
 * Maximum length allowed for object prefix
 */
-if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
+if( !defined( 'XMLS_PREFIX_MAXLEN' ) )
+{
 	define( 'XMLS_PREFIX_MAXLEN', 10 );
 }
 
 /**
 * Execute SQL inline as it is generated
 */
-if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
+if( !defined( 'XMLS_EXECUTE_INLINE' ) )
+{
 	define( 'XMLS_EXECUTE_INLINE', FALSE );
 }
 
 /**
 * Continue SQL Execution if an error occurs?
 */
-if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
+if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) )
+{
 	define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
 }
 
 /**
 * Current Schema Version
 */
-if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
+if( !defined( 'XMLS_SCHEMA_VERSION' ) )
+{
 	define( 'XMLS_SCHEMA_VERSION', '0.2' );
 }
 
 /**
 * Default Schema Version.  Used for Schemas without an explicit version set.
 */
-if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
+if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) )
+{
 	define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
 }
 
 /**
 * Default Schema Version.  Used for Schemas without an explicit version set.
 */
-if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
+if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) )
+{
 	define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
 }
 
 /**
 * Include the main ADODB library
 */
-if( !defined( '_ADODB_LAYER' ) ) {
+if( !defined( '_ADODB_LAYER' ) )
+{
 	require( 'adodb.inc.php' );
 	require( 'adodb-datadict.inc.php' );
 }
@@ -89,7 +98,8 @@ 
 * @package axmls
 * @access private
 */
-class dbObject {
+class dbObject
+{
 	
 	/**
 	* var object Parent
@@ -104,7 +114,8 @@ 
 	/**
 	* NOP
 	*/
-	function dbObject( &$parent, $attributes = NULL ) {
+	function dbObject( &$parent, $attributes = NULL )
+	{
 		$this->parent =& $parent;
 	}
 	
@@ -113,7 +124,8 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open( &$parser, $tag, $attributes )
+	{
 		
 	}
 	
@@ -122,7 +134,8 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
+	function _tag_cdata( &$parser, $cdata )
+	{
 		
 	}
 	
@@ -131,18 +144,21 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( &$parser, $tag )
+	{
 		
 	}
 	
-	function create() {
+	function create()
+	{
 		return array();
 	}
 	
 	/**
 	* Destroys the object
 	*/
-	function destroy() {
+	function destroy()
+	{
 		unset( $this );
 	}
 	
@@ -153,7 +169,8 @@ 
 	* @param string $platform RDBMS platform name (from ADODB platform list).
 	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
 	*/
-	function supportedPlatform( $platform = NULL ) {
+	function supportedPlatform( $platform = NULL )
+	{
 		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
 	}
 	
@@ -163,7 +180,8 @@ 
 	* @param string $name Prefix string.
 	* @return string Prefix.
 	*/
-	function prefix( $name = '' ) {
+	function prefix( $name = '' )
+	{
 		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
 	}
 	
@@ -173,7 +191,8 @@ 
 	* @param string $field Field.
 	* @return string Field ID.
 	*/
-	function FieldID( $field ) {
+	function FieldID( $field )
+	{
 		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
 	}
 }
@@ -189,7 +208,8 @@ 
 * @package axmls
 * @access private
 */
-class dbTable extends dbObject {
+class dbTable extends dbObject
+{
 	
 	/**
 	* @var string Table name
@@ -234,7 +254,8 @@ 
 	* @param string $prefix DB Object prefix
 	* @param array $attributes Array of table attributes.
 	*/
-	function dbTable( &$parent, $attributes = NULL ) {
+	function dbTable( &$parent, $attributes = NULL )
+	{
 		$this->parent =& $parent;
 		$this->name = $this->prefix($attributes['NAME']);
 	}
@@ -245,17 +266,21 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open( &$parser, $tag, $attributes )
+	{
 		$this->currentElement = strtoupper( $tag );
 		
-		switch( $this->currentElement ) {
+		switch( $this->currentElement )
+		{
 			case 'INDEX':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) )
+				{
 					xml_set_object( $parser, $this->addIndex( $attributes ) );
 				}
 				break;
 			case 'DATA':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) )
+				{
 					xml_set_object( $parser, $this->addData( $attributes ) );
 				}
 				break;
@@ -281,7 +306,8 @@ 
 				// Add a field option to the table object
 				
 				// Work around ADOdb datadict issue that misinterprets empty strings.
-				if( $attributes['VALUE'] == '' ) {
+				if( $attributes['VALUE'] == '' )
+				{
 					$attributes['VALUE'] = " '' ";
 				}
 				
@@ -302,13 +328,18 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
+	function _tag_cdata( &$parser, $cdata )
+	{
+		switch( $this->currentElement )
+		{
 			// Table constraint
 			case 'CONSTRAINT':
-				if( isset( $this->current_field ) ) {
+				if( isset( $this->current_field ) )
+				{
 					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
-				} else {
+				}
+				else
+				{
 					$this->addTableOpt( $cdata );
 				}
 				break;
@@ -326,10 +357,12 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( &$parser, $tag )
+	{
 		$this->currentElement = '';
 		
-		switch( strtoupper( $tag ) ) {
+		switch( strtoupper( $tag ) )
+		{
 			case 'TABLE':
 				$this->parent->addSQL( $this->create( $this->parent ) );
 				xml_set_object( $parser, $this->parent );
@@ -361,7 +394,8 @@ 
 	* @return object dbData object
 	*/
 	function &addData( $attributes ) {
-		if( !isset( $this->data ) ) {
+		if( !isset( $this->data ) )
+		{
 			$this->data = new dbData( $this, $attributes );
 		}
 		return $this->data;
@@ -396,7 +430,8 @@ 
 	* @param array $opts	Field options array
 	* @return array Field specifier array
 	*/
-	function addField( $name, $type, $size = NULL, $opts = NULL ) {
+	function addField( $name, $type, $size = NULL, $opts = NULL )
+	{
 		$field_id = $this->FieldID( $name );
 		
 		// Set the field index so we know where we are
@@ -409,12 +444,14 @@ 
 		$this->fields[$field_id]['TYPE'] = $type;
 		
 		// Set the field size (optional)
-		if( isset( $size ) ) {
+		if( isset( $size ) )
+		{
 			$this->fields[$field_id]['SIZE'] = $size;
 		}
 		
 		// Set the field options
-		if( isset( $opts ) ) {
+		if( isset( $opts ) )
+		{
 			$this->fields[$field_id]['OPTS'][] = $opts;
 		}
 	}
@@ -430,11 +467,15 @@ 
 	* @param mixed $value Field option value
 	* @return array Field specifier array
 	*/
-	function addFieldOpt( $field, $opt, $value = NULL ) {
-		if( !isset( $value ) ) {
+	function addFieldOpt( $field, $opt, $value = NULL )
+	{
+		if( !isset( $value ) )
+		{
 			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
 		// Add the option and value
-		} else {
+		}
+		else
+		{
 			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
 		}
 	}
@@ -448,7 +489,8 @@ 
 	* @param string $opt Table option
 	* @return array Options
 	*/
-	function addTableOpt( $opt ) {
+	function addTableOpt( $opt )
+	{
 		$this->opts[] = $opt;
 		
 		return $this->opts;
@@ -460,39 +502,50 @@ 
 	* @param object $xmls adoSchema object
 	* @return array Array containing table creation SQL
 	*/
-	function create( &$xmls ) {
+	function create( &$xmls )
+	{
 		$sql = array();
 		
 		// drop any existing indexes
-		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
-			foreach( $legacy_indexes as $index => $index_details ) {
+		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) )
+		{
+			foreach( $legacy_indexes as $index => $index_details )
+			{
 				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
 			}
 		}
 		
 		// remove fields to be dropped from table object
-		foreach( $this->drop_field as $field ) {
+		foreach( $this->drop_field as $field )
+		{
 			unset( $this->fields[$field] );
 		}
 		
 		// if table exists
-		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
+		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) )
+		{
 			// drop table
-			if( $this->drop_table ) {
+			if( $this->drop_table )
+			{
 				$sql[] = $xmls->dict->DropTableSQL( $this->name );
 				
 				return $sql;
 			}
 			
 			// drop any existing fields not in schema
-			foreach( $legacy_fields as $field_id => $field ) {
-				if( !isset( $this->fields[$field_id] ) ) {
+			foreach( $legacy_fields as $field_id => $field )
+			{
+				if( !isset( $this->fields[$field_id] ) )
+				{
 					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
 				}
 			}
 		// if table doesn't exist
-		} else {
-			if( $this->drop_table ) {
+		}
+		else
+		{
+			if( $this->drop_table )
+			{
 				return $sql;
 			}
 			
@@ -502,9 +555,11 @@ 
 		// Loop through the field specifier array, building the associative array for the field options
 		$fldarray = array();
 		
-		foreach( $this->fields as $field_id => $finfo ) {
+		foreach( $this->fields as $field_id => $finfo )
+		{
 			// Set an empty size if it isn't supplied
-			if( !isset( $finfo['SIZE'] ) ) {
+			if( !isset( $finfo['SIZE'] ) )
+			{
 				$finfo['SIZE'] = '';
 			}
 			
@@ -516,29 +571,38 @@ 
 			);
 			
 			// Loop through the options array and add the field options. 
-			if( isset( $finfo['OPTS'] ) ) {
-				foreach( $finfo['OPTS'] as $opt ) {
+			if( isset( $finfo['OPTS'] ) )
+			{
+				foreach( $finfo['OPTS'] as $opt )
+				{
 					// Option has an argument.
-					if( is_array( $opt ) ) {
+					if( is_array( $opt ) )
+					{
 						$key = key( $opt );
 						$value = $opt[key( $opt )];
 						@$fldarray[$field_id][$key] .= $value;
 					// Option doesn't have arguments
-					} else {
+					}
+					else
+					{
 						$fldarray[$field_id][$opt] = $opt;
 					}
 				}
 			}
 		}
 		
-		if( empty( $legacy_fields ) ) {
+		if( empty( $legacy_fields ) )
+		{
 			// Create the new table
 			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
 			logMsg( end( $sql ), 'Generated CreateTableSQL' );
-		} else {
+		}
+		else
+		{
 			// Upgrade an existing table
 			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
-			switch( $xmls->upgrade ) {
+			switch( $xmls->upgrade )
+			{
 				// Use ChangeTableSQL
 				case 'ALTER':
 					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
@@ -555,11 +619,13 @@ 
 			}
 		}
 		
-		foreach( $this->indexes as $index ) {
+		foreach( $this->indexes as $index )
+		{
 			$sql[] = $index->create( $xmls );
 		}
 		
-		if( isset( $this->data ) ) {
+		if( isset( $this->data ) )
+		{
 			$sql[] = $this->data->create( $xmls );
 		}
 		
@@ -569,13 +635,17 @@ 
 	/**
 	* Marks a field or table for destruction
 	*/
-	function drop() {
-		if( isset( $this->current_field ) ) {
+	function drop()
+	{
+		if( isset( $this->current_field ) )
+		{
 			// Drop the current field
 			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
 			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
 			$this->drop_field[$this->current_field] = $this->current_field;
-		} else {
+		}
+		else
+		{
 			// Drop the current table
 			logMsg( "Dropping table '{$this->name}'" );
 			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
@@ -595,7 +665,8 @@ 
 * @package axmls
 * @access private
 */
-class dbIndex extends dbObject {
+class dbIndex extends dbObject
+{
 	
 	/**
 	* @var string	Index name
@@ -626,7 +697,8 @@ 
 	*
 	* @internal
 	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
+	function dbIndex( &$parent, $attributes = NULL )
+	{
 		$this->parent =& $parent;
 		
 		$this->name = $this->prefix ($attributes['NAME']);
@@ -640,10 +712,12 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open( &$parser, $tag, $attributes )
+	{
 		$this->currentElement = strtoupper( $tag );
 		
-		switch( $this->currentElement ) {
+		switch( $this->currentElement )
+		{
 			case 'DROP':
 				$this->drop();
 				break;
@@ -667,8 +741,10 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
+	function _tag_cdata( &$parser, $cdata )
+	{
+		switch( $this->currentElement )
+		{
 			// Index field name
 			case 'COL':
 				$this->addField( $cdata );
@@ -683,10 +759,12 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( &$parser, $tag )
+	{
 		$this->currentElement = '';
 		
-		switch( strtoupper( $tag ) ) {
+		switch( strtoupper( $tag ) )
+		{
 			case 'INDEX':
 				xml_set_object( $parser, $this->parent );
 				break;
@@ -699,7 +777,8 @@ 
 	* @param string $name Field name
 	* @return string Field list
 	*/
-	function addField( $name ) {
+	function addField( $name )
+	{
 		$this->columns[$this->FieldID( $name )] = $name;
 		
 		// Return the field list
@@ -712,7 +791,8 @@ 
 	* @param string $opt Comma-separated list of index options.
 	* @return string Option list
 	*/
-	function addIndexOpt( $opt ) {
+	function addIndexOpt( $opt )
+	{
 		$this->opts[] = $opt;
 		
 		// Return the options list
@@ -725,14 +805,18 @@ 
 	* @param object $xmls adoSchema object
 	* @return array Array containing index creation SQL
 	*/
-	function create( &$xmls ) {
-		if( $this->drop ) {
+	function create( &$xmls )
+	{
+		if( $this->drop )
+		{
 			return NULL;
 		}
 		
 		// eliminate any columns that aren't in the table
-		foreach( $this->columns as $id => $col ) {
-			if( !isset( $this->parent->fields[$id] ) ) {
+		foreach( $this->columns as $id => $col )
+		{
+			if( !isset( $this->parent->fields[$id] ) )
+			{
 				unset( $this->columns[$id] );
 			}
 		}
@@ -743,7 +827,8 @@ 
 	/**
 	* Marks an index for destruction
 	*/
-	function drop() {
+	function drop()
+	{
 		$this->drop = TRUE;
 	}
 }
@@ -756,7 +841,8 @@ 
 * @package axmls
 * @access private
 */
-class dbData extends dbObject {
+class dbData extends dbObject
+{
 	
 	var $data = array();
 	
@@ -770,7 +856,8 @@ 
 	*
 	* @internal
 	*/
-	function dbData( &$parent, $attributes = NULL ) {
+	function dbData( &$parent, $attributes = NULL )
+	{
 		$this->parent =& $parent;
 	}
 	
@@ -782,10 +869,12 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open( &$parser, $tag, $attributes )
+	{
 		$this->currentElement = strtoupper( $tag );
 		
-		switch( $this->currentElement ) {
+		switch( $this->currentElement )
+		{
 			case 'ROW':
 				$this->row = count( $this->data );
 				$this->data[$this->row] = array();
@@ -804,8 +893,10 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
+	function _tag_cdata( &$parser, $cdata )
+	{
+		switch( $this->currentElement )
+		{
 			// Index field name
 			case 'F':
 				$this->addData( $cdata );
@@ -820,10 +911,12 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( &$parser, $tag )
+	{
 		$this->currentElement = '';
 		
-		switch( strtoupper( $tag ) ) {
+		switch( strtoupper( $tag ) )
+		{
 			case 'DATA':
 				xml_set_object( $parser, $this->parent );
 				break;
@@ -836,10 +929,14 @@ 
 	* @param string $name Field name
 	* @return string Field list
 	*/
-	function addField( $attributes ) {
-		if( isset( $attributes['NAME'] ) ) {
+	function addField( $attributes )
+	{
+		if( isset( $attributes['NAME'] ) )
+		{
 			$name = $attributes['NAME'];
-		} else {
+		}
+		else
+		{
 			$name = count($this->data[$this->row]);
 		}
 		
@@ -853,12 +950,15 @@ 
 	* @param string $opt Comma-separated list of index options.
 	* @return string Option list
 	*/
-	function addData( $cdata ) {
-		if( !isset( $this->data[$this->row] ) ) {
+	function addData( $cdata )
+	{
+		if( !isset( $this->data[$this->row] ) )
+		{
 			$this->data[$this->row] = array();
 		}
 		
-		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
+		if( !isset( $this->data[$this->row][$this->current_field] ) )
+		{
 			$this->data[$this->row][$this->current_field] = '';
 		}
 		
@@ -871,28 +971,36 @@ 
 	* @param object $xmls adoSchema object
 	* @return array Array containing index creation SQL
 	*/
-	function create( &$xmls ) {
+	function create( &$xmls )
+	{
 		$table = $xmls->dict->TableName($this->parent->name);
 		$table_field_count = count($this->parent->fields);
 		$sql = array();
 		
 		// eliminate any columns that aren't in the table
-		foreach( $this->data as $row ) {
+		foreach( $this->data as $row )
+		{
 			$table_fields = $this->parent->fields;
 			$fields = array();
 			
-			foreach( $row as $field_id => $field_data ) {
-				if( !array_key_exists( $field_id, $table_fields ) ) {
-					if( is_numeric( $field_id ) ) {
+			foreach( $row as $field_id => $field_data )
+			{
+				if( !array_key_exists( $field_id, $table_fields ) )
+				{
+					if( is_numeric( $field_id ) )
+					{
 						$field_id = reset( array_keys( $table_fields ) );
-					} else {
+					}
+					else
+					{
 						continue;
 					}
 				}
 				
 				$name = $table_fields[$field_id]['NAME'];
 				
-				switch( $table_fields[$field_id]['TYPE'] ) {
+				switch( $table_fields[$field_id]['TYPE'] )
+				{
 					case 'C':
 					case 'C2':
 					case 'X':
@@ -914,16 +1022,21 @@ 
 			}
 			
 			// check that at least 1 column is specified
-			if( empty( $fields ) ) {
+			if( empty( $fields ) )
+			{
 				continue;
 			}
 			
 			// check that no required columns are missing
-			if( count( $fields ) < $table_field_count ) {
-				foreach( $table_fields as $field ) {
+			if( count( $fields ) < $table_field_count )
+			{
+				foreach( $table_fields as $field )
+				{
 					if (isset( $field['OPTS'] ))
-						if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
+					{
+											if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
 							continue(2);
+					}
 						}
 				}
 			}
@@ -941,7 +1054,8 @@ 
 * @package axmls
 * @access private
 */
-class dbQuerySet extends dbObject {
+class dbQuerySet extends dbObject
+{
 	
 	/**
 	* @var array	List of SQL queries
@@ -969,18 +1083,21 @@ 
 	* @param object $parent Parent object
 	* @param array $attributes Attributes
 	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
+	function dbQuerySet( &$parent, $attributes = NULL )
+	{
 		$this->parent =& $parent;
 			
 		// Overrides the manual prefix key
-		if( isset( $attributes['KEY'] ) ) {
+		if( isset( $attributes['KEY'] ) )
+		{
 			$this->prefixKey = $attributes['KEY'];
 		}
 		
 		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
 		
 		// Enables or disables automatic prefix prepending
-		switch( $prefixMethod ) {
+		switch( $prefixMethod )
+		{
 			case 'AUTO':
 				$this->prefixMethod = 'AUTO';
 				break;
@@ -999,17 +1116,22 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
+	function _tag_open( &$parser, $tag, $attributes )
+	{
 		$this->currentElement = strtoupper( $tag );
 		
-		switch( $this->currentElement ) {
+		switch( $this->currentElement )
+		{
 			case 'QUERY':
 				// Create a new query in a SQL queryset.
 				// Ignore this query set if a platform is specified and it's different than the 
 				// current connection platform.
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) )
+				{
 					$this->newQuery();
-				} else {
+				}
+				else
+				{
 					$this->discardQuery();
 				}
 				break;
@@ -1021,8 +1143,10 @@ 
 	/**
 	* XML Callback to process CDATA elements
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
+	function _tag_cdata( &$parser, $cdata )
+	{
+		switch( $this->currentElement )
+		{
 			// Line of queryset SQL data
 			case 'QUERY':
 				$this->buildQuery( $cdata );
@@ -1037,10 +1161,12 @@ 
 	*
 	* @access private
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( &$parser, $tag )
+	{
 		$this->currentElement = '';
 		
-		switch( strtoupper( $tag ) ) {
+		switch( strtoupper( $tag ) )
+		{
 			case 'QUERY':
 				// Add the finished query to the open query set.
 				$this->addQuery();
@@ -1060,7 +1186,8 @@ 
 	*
 	* @return boolean TRUE
 	*/
-	function newQuery() {
+	function newQuery()
+	{
 		$this->query = '';
 		
 		return TRUE;
@@ -1071,7 +1198,8 @@ 
 	*
 	* @return boolean TRUE
 	*/
-	function discardQuery() {
+	function discardQuery()
+	{
 		unset( $this->query );
 		
 		return TRUE;
@@ -1083,8 +1211,10 @@ 
 	* @param string $data Line of SQL data or NULL to initialize a new query
 	* @return string SQL query string.
 	*/
-	function buildQuery( $sql = NULL ) {
-		if( !isset( $this->query ) OR empty( $sql ) ) {
+	function buildQuery( $sql = NULL )
+	{
+		if( !isset( $this->query ) OR empty( $sql ) )
+		{
 			return FALSE;
 		}
 		
@@ -1098,8 +1228,10 @@ 
 	*
 	* @return string	SQL of added query
 	*/
-	function addQuery() {
-		if( !isset( $this->query ) ) {
+	function addQuery()
+	{
+		if( !isset( $this->query ) )
+		{
 			return FALSE;
 		}
 		
@@ -1116,9 +1248,12 @@ 
 	* @param object $xmls adoSchema object
 	* @return array Query set
 	*/
-	function create( &$xmls ) {
-		foreach( $this->queries as $id => $query ) {
-			switch( $this->prefixMethod ) {
+	function create( &$xmls )
+	{
+		foreach( $this->queries as $id => $query )
+		{
+			switch( $this->prefixMethod )
+			{
 				case 'AUTO':
 					// Enable auto prefix replacement
 					
@@ -1134,10 +1269,13 @@ 
 				case 'MANUAL':
 					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
 					// If prefixKey is not set, we use the default constant XMLS_PREFIX
-					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
+					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) )
+					{
 						// Enable prefix override
 						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
-					} else {
+					}
+					else
+					{
 						// Use default replacement
 						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
 					}
@@ -1158,12 +1296,15 @@ 
 	* @param string $prefix Prefix to be appended to tables, indices, etc.
 	* @return string Prefixed SQL query string.
 	*/
-	function prefixQuery( $regex, $query, $prefix = NULL ) {
-		if( !isset( $prefix ) ) {
+	function prefixQuery( $regex, $query, $prefix = NULL )
+	{
+		if( !isset( $prefix ) )
+		{
 			return $query;
 		}
 		
-		if( preg_match( $regex, $query, $match ) ) {
+		if( preg_match( $regex, $query, $match ) )
+		{
 			$preamble = $match[1];
 			$postamble = $match[5];
 			$objectList = explode( ',', $match[3] );
@@ -1171,8 +1312,10 @@ 
 			
 			$prefixedList = '';
 			
-			foreach( $objectList as $object ) {
-				if( $prefixedList !== '' ) {
+			foreach( $objectList as $object )
+			{
+				if( $prefixedList !== '' )
+				{
 					$prefixedList .= ', ';
 				}
 				
@@ -1199,7 +1342,8 @@ 
 *
 * @package axmls
 */
-class adoSchema {
+class adoSchema
+{
 	
 	/**
 	* @var array	Array containing SQL queries to generate all objects
@@ -1285,7 +1429,8 @@ 
 	*
 	* @param object $db ADOdb database connection object.
 	*/
-	function adoSchema( &$db ) {
+	function adoSchema( &$db )
+	{
 		// Initialize the environment
 		$this->mgq = get_magic_quotes_runtime();
 		set_magic_quotes_runtime(0);
@@ -1316,15 +1461,18 @@ 
 	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
 	* @returns string Upgrade method used
 	*/
-	function SetUpgradeMethod( $method = '' ) {
-		if( !is_string( $method ) ) {
+	function SetUpgradeMethod( $method = '' )
+	{
+		if( !is_string( $method ) )
+		{
 			return FALSE;
 		}
 		
 		$method = strtoupper( $method );
 		
 		// Handle the upgrade methods
-		switch( $method ) {
+		switch( $method )
+		{
 			case 'ALTER':
 				$this->upgrade = $method;
 				break;
@@ -1358,8 +1506,10 @@ 
 	*
 	* @see ParseSchema(), ExecuteSchema()
 	*/
-	function ExecuteInline( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
+	function ExecuteInline( $mode = NULL )
+	{
+		if( is_bool( $mode ) )
+		{
 			$this->executeInline = $mode;
 		}
 		
@@ -1379,8 +1529,10 @@ 
 	*
 	* @see addSQL(), ExecuteSchema()
 	*/
-	function ContinueOnError( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
+	function ContinueOnError( $mode = NULL )
+	{
+		if( is_bool( $mode ) )
+		{
 			$this->continueOnError = $mode;
 		}
 		
@@ -1398,7 +1550,8 @@ 
 	* @param bool $returnSchema Return schema rather than parsing.
 	* @return array Array of SQL queries, ready to execute
 	*/
-	function ParseSchema( $filename, $returnSchema = FALSE ) {
+	function ParseSchema( $filename, $returnSchema = FALSE )
+	{
 		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
 	
@@ -1415,15 +1568,18 @@ 
 	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
 	* @see ParseSchema(), ParseSchemaString()
 	*/
-	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
+	function ParseSchemaFile( $filename, $returnSchema = FALSE )
+	{
 		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
+		if( !($fp = fopen( $filename, 'r' )) )
+		{
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
 		
 		// do version detection here
-		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
+		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion )
+		{
 			return FALSE;
 		}
 		
@@ -1437,8 +1593,10 @@ 
 		$xmlParser = $this->create_parser();
 		
 		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
+		while( $data = fread( $fp, 4096 ) )
+		{
+			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) )
+			{
 				die( sprintf(
 					"XML error: %s at line %d",
 					xml_error_string( xml_get_error_code( $xmlParser) ),
@@ -1463,13 +1621,16 @@ 
 	* @param bool $returnSchema Return schema rather than parsing.
 	* @return array Array of SQL queries, ready to execute.
 	*/
-	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+	function ParseSchemaString( $xmlstring, $returnSchema = FALSE )
+	{
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) )
+		{
 			return FALSE;
 		}
 		
 		// do version detection here
-		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
+		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion )
+		{
 			return FALSE;
 		}
 		
@@ -1482,7 +1643,8 @@ 
 		
 		$xmlParser = $this->create_parser();
 		
-		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
+		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) )
+		{
 			die( sprintf(
 				"XML error: %s at line %d",
 				xml_error_string( xml_get_error_code( $xmlParser) ),
@@ -1506,7 +1668,8 @@ 
 	* @param bool $returnSchema Return schema rather than parsing.
 	* @return array Array of SQL queries, ready to execute
 	*/
-	function RemoveSchema( $filename, $returnSchema = FALSE ) {
+	function RemoveSchema( $filename, $returnSchema = FALSE )
+	{
 		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
 	}
 	
@@ -1521,10 +1684,12 @@ 
 	* @param bool $returnSchema Return schema rather than parsing.
 	* @return array Array of SQL queries, ready to execute.
 	*/
-	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
+	function RemoveSchemaString( $schema, $returnSchema = FALSE )
+	{
 		
 		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) )
+		{
 			return FALSE;
 		}
 		
@@ -1544,18 +1709,24 @@ 
 	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
 	* @returns integer 0 if failure, 1 if errors, 2 if successful.
 	*/
-	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
-		if( !is_bool( $continueOnErr ) ) {
+	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL )
+	{
+		if( !is_bool( $continueOnErr ) )
+		{
 			$continueOnErr = $this->ContinueOnError();
 		}
 		
-		if( !isset( $sqlArray ) ) {
+		if( !isset( $sqlArray ) )
+		{
 			$sqlArray = $this->sqlArray;
 		}
 		
-		if( !is_array( $sqlArray ) ) {
+		if( !is_array( $sqlArray ) )
+		{
 			$this->success = 0;
-		} else {
+		}
+		else
+		{
 			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
 		}
 		
@@ -1571,7 +1742,8 @@ 
 	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
 	* @return array Array of SQL statements or FALSE if an error occurs
 	*/
-	function PrintSQL( $format = 'NONE' ) {
+	function PrintSQL( $format = 'NONE' )
+	{
 		return $this->getSQL( $format, $sqlArray );
 	}
 	
@@ -1584,18 +1756,22 @@ 
 	* @param string $filename Path and name where the file should be saved.
 	* @return boolean TRUE if save is successful, else FALSE. 
 	*/
-	function SaveSQL( $filename = './schema.sql' ) {
+	function SaveSQL( $filename = './schema.sql' )
+	{
 		
-		if( !isset( $sqlArray ) ) {
+		if( !isset( $sqlArray ) )
+		{
 			$sqlArray = $this->sqlArray;
 		}
-		if( !isset( $sqlArray ) ) {
+		if( !isset( $sqlArray ) )
+		{
 			return FALSE;
 		}
 		
 		$fp = fopen( $filename, "w" );
 		
-		foreach( $sqlArray as $key => $query ) {
+		foreach( $sqlArray as $key => $query )
+		{
 			fwrite( $fp, $query . ";\n" );
 		}
 		fclose( $fp );
@@ -1625,14 +1801,17 @@ 
 	*
 	* @access private
 	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		switch( strtoupper( $tag ) ) {
+	function _tag_open( &$parser, $tag, $attributes )
+	{
+		switch( strtoupper( $tag ) )
+		{
 			case 'TABLE':
 				$this->obj = new dbTable( $this, $attributes );
 				xml_set_object( $parser, $this->obj );
 				break;
 			case 'SQL':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) )
+				{
 					$this->obj = new dbQuerySet( $this, $attributes );
 					xml_set_object( $parser, $this->obj );
 				}
@@ -1648,7 +1827,8 @@ 
 	*
 	* @access private
 	*/
-	function _tag_cdata( &$parser, $cdata ) {
+	function _tag_cdata( &$parser, $cdata )
+	{
 	}
 	
 	/**
@@ -1657,7 +1837,8 @@ 
 	* @access private
 	* @internal
 	*/
-	function _tag_close( &$parser, $tag ) {
+	function _tag_close( &$parser, $tag )
+	{
 		
 	}
 	
@@ -1677,24 +1858,31 @@ 
 	* @param string $newFile File name of (converted) output file.
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
-	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
+	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL )
+	{
 		
 		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) )
+		{
 			return FALSE;
 		}
 		
-		if( !isset ($newVersion) ) {
+		if( !isset ($newVersion) )
+		{
 			$newVersion = $this->schemaVersion;
 		}
 		
-		if( $version == $newVersion ) {
+		if( $version == $newVersion )
+		{
 			$result = $schema;
-		} else {
+		}
+		else
+		{
 			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
 		}
 		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) )
+		{
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
@@ -1718,29 +1906,37 @@ 
 	* @param string $newFile File name of (converted) output file.
 	* @return string Converted XML schema or FALSE if an error occurs.
 	*/
-	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
+	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL )
+	{
 		
 		// grab current version
-		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
+		if( !( $version = $this->SchemaFileVersion( $filename ) ) )
+		{
 			return FALSE;
 		}
 		
-		if( !isset ($newVersion) ) {
+		if( !isset ($newVersion) )
+		{
 			$newVersion = $this->schemaVersion;
 		}
 		
-		if( $version == $newVersion ) {
+		if( $version == $newVersion )
+		{
 			$result = file_get_contents( $filename );
 			
 			// remove unicode BOM if present
-			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
+			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) )
+			{
 				$result = substr( $result, 3 );
 			}
-		} else {
+		}
+		else
+		{
 			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
 		}
 		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) )
+		{
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
@@ -1751,21 +1947,24 @@ 
 	function TransformSchema( $schema, $xsl, $schematype='string' )
 	{
 		// Fail if XSLT extension is not available
-		if( ! function_exists( 'xslt_create' ) ) {
+		if( ! function_exists( 'xslt_create' ) )
+		{
 			return FALSE;
 		}
 		
 		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
 		
 		// look for xsl
-		if( !is_readable( $xsl_file ) ) {
+		if( !is_readable( $xsl_file ) )
+		{
 			return FALSE;
 		}
 		
 		switch( $schematype )
 		{
 			case 'file':
-				if( !is_readable( $schema ) ) {
+				if( !is_readable( $schema ) )
+				{
 					return FALSE;
 				}
 				
@@ -1773,7 +1972,8 @@ 
 				break;
 			case 'string':
 			default:
-				if( !is_string( $schema ) ) {
+				if( !is_string( $schema ) )
+				{
 					return FALSE;
 				}
 		}
@@ -1807,8 +2007,10 @@ 
 	*
 	* @access private
 	*/
-	function xslt_error_handler( $parser, $errno, $level, $fields ) {
-		if( is_array( $fields ) ) {
+	function xslt_error_handler( $parser, $errno, $level, $fields )
+	{
+		if( is_array( $fields ) )
+		{
 			$msg = array(
 				'Message Type' => ucfirst( $fields['msgtype'] ),
 				'Message Code' => $fields['code'],
@@ -1817,7 +2019,8 @@ 
 				'Level' => $level
 			);
 			
-			switch( $fields['URI'] ) {
+			switch( $fields['URI'] )
+			{
 				case 'arg:/_xml':
 					$msg['Input'] = 'XML';
 					break;
@@ -1829,7 +2032,9 @@ 
 			}
 			
 			$msg['Line'] = $fields['line'];
-		} else {
+		}
+		else
+		{
 			$msg = array(
 				'Message Type' => 'Error',
 				'Error Number' => $errno,
@@ -1841,7 +2046,8 @@ 
 		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
 					   . '<table>' . "\n";
 		
-		foreach( $msg as $label => $details ) {
+		foreach( $msg as $label => $details )
+		{
 			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
 		}
 		
@@ -1859,16 +2065,20 @@ 
 	* @param string $filename AXMLS schema file
 	* @return string Schema version number or FALSE on error
 	*/
-	function SchemaFileVersion( $filename ) {
+	function SchemaFileVersion( $filename )
+	{
 		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
+		if( !($fp = fopen( $filename, 'r' )) )
+		{
 			// die( 'Unable to open file' );
 			return FALSE;
 		}
 		
 		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( preg_match( $this->versionRegex, $data, $matches ) ) {
+		while( $data = fread( $fp, 4096 ) )
+		{
+			if( preg_match( $this->versionRegex, $data, $matches ) )
+			{
 				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 			}
 		}
@@ -1885,12 +2095,15 @@ 
 	* @param string $xmlstring XML schema string
 	* @return string Schema version number or FALSE on error
 	*/
-	function SchemaStringVersion( $xmlstring ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+	function SchemaStringVersion( $xmlstring )
+	{
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) )
+		{
 			return FALSE;
 		}
 		
-		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
+		if( preg_match( $this->versionRegex, $xmlstring, $matches ) )
+		{
 			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
 		}
 		
@@ -1907,14 +2120,17 @@ 
 	* @param boolean $data Include data in schema dump
 	* @return string Generated XML schema
 	*/
-	function ExtractSchema( $data = FALSE ) {
+	function ExtractSchema( $data = FALSE )
+	{
 		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
 		
 		$schema = '<?xml version="1.0"?>' . "\n"
 				. '<schema version="' . $this->schemaVersion . '">' . "\n";
 		
-		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
-			foreach( $tables as $table ) {
+		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) )
+		{
+			foreach( $tables as $table )
+			{
 				$schema .= '	<table name="' . $table . '">' . "\n";
 				
 				// grab details from database
@@ -1922,26 +2138,34 @@ 
 				$fields = $this->db->MetaColumns( $table );
 				$indexes = $this->db->MetaIndexes( $table );
 				
-				if( is_array( $fields ) ) {
-					foreach( $fields as $details ) {
+				if( is_array( $fields ) )
+				{
+					foreach( $fields as $details )
+					{
 						$extra = '';
 						$content = array();
 						
-						if( $details->max_length > 0 ) {
+						if( $details->max_length > 0 )
+						{
 							$extra .= ' size="' . $details->max_length . '"';
 						}
 						
-						if( $details->primary_key ) {
+						if( $details->primary_key )
+						{
 							$content[] = '<KEY/>';
-						} elseif( $details->not_null ) {
+						}
+						elseif( $details->not_null )
+						{
 							$content[] = '<NOTNULL/>';
 						}
 						
-						if( $details->has_default ) {
+						if( $details->has_default )
+						{
 							$content[] = '<DEFAULT value="' . $details->default_value . '"/>';
 						}
 						
-						if( $details->auto_increment ) {
+						if( $details->auto_increment )
+						{
 							$content[] = '<AUTOINCREMENT/>';
 						}
 						
@@ -1952,7 +2176,8 @@ 
 						
 						$schema .= '		<field name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
 						
-						if( !empty( $content ) ) {
+						if( !empty( $content ) )
+						{
 							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
 						}
 						
@@ -1960,15 +2185,19 @@ 
 					}
 				}
 				
-				if( is_array( $indexes ) ) {
-					foreach( $indexes as $index => $details ) {
+				if( is_array( $indexes ) )
+				{
+					foreach( $indexes as $index => $details )
+					{
 						$schema .= '		<index name="' . $index . '">' . "\n";
 						
-						if( $details['unique'] ) {
+						if( $details['unique'] )
+						{
 							$schema .= '			<UNIQUE/>' . "\n";
 						}
 						
-						foreach( $details['columns'] as $column ) {
+						foreach( $details['columns'] as $column )
+						{
 							$schema .= '			<col>' . $column . '</col>' . "\n";
 						}
 						
@@ -1976,14 +2205,18 @@ 
 					}
 				}
 				
-				if( $data ) {
+				if( $data )
+				{
 					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
 					
-					if( is_object( $rs ) ) {
+					if( is_object( $rs ) )
+					{
 						$schema .= '		<data>' . "\n";
 						
-						while( $row = $rs->FetchRow() ) {
-							foreach( $row as $key => $val ) {
+						while( $row = $rs->FetchRow() )
+						{
+							foreach( $row as $key => $val )
+							{
 								$row[$key] = htmlentities($val);
 							}
 							
@@ -2014,8 +2247,10 @@ 
 	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
 	* @return boolean TRUE if successful, else FALSE
 	*/
-	function SetPrefix( $prefix = '', $underscore = TRUE ) {
-		switch( TRUE ) {
+	function SetPrefix( $prefix = '', $underscore = TRUE )
+	{
+		switch( TRUE )
+		{
 			// clear prefix
 			case empty( $prefix ):
 				logMsg( 'Cleared prefix' );
@@ -2029,7 +2264,8 @@ 
 				return FALSE;
 		}
 		
-		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
+		if( $underscore AND substr( $prefix, -1 ) != '_' )
+		{
 			$prefix .= '_';
 		}
 		
@@ -2047,9 +2283,11 @@ 
 	*
 	* @access private
 	*/
-	function prefix( $name = '' ) {
+	function prefix( $name = '' )
+	{
 		// if prefix is set
-		if( !empty( $this->objectPrefix ) ) {
+		if( !empty( $this->objectPrefix ) )
+		{
 			// Prepend the object prefix to the table name
 			// prepend after quote if used
 			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
@@ -2067,13 +2305,17 @@ 
 	*
 	* @access private
 	*/
-	function supportedPlatform( $platform = NULL ) {
+	function supportedPlatform( $platform = NULL )
+	{
 		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
 		
-		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
+		if( !isset( $platform ) OR preg_match( $regex, $platform ) )
+		{
 			logMsg( "Platform $platform is supported" );
 			return TRUE;
-		} else {
+		}
+		else
+		{
 			logMsg( "Platform $platform is NOT supported" );
 			return FALSE;
 		}
@@ -2084,7 +2326,8 @@ 
 	*
 	* @access private
 	*/
-	function clearSQL() {
+	function clearSQL()
+	{
 		$this->sqlArray = array();
 	}
 	
@@ -2096,27 +2339,34 @@ 
 	*
 	* @access private
 	*/	
-	function addSQL( $sql = NULL ) {
-		if( is_array( $sql ) ) {
-			foreach( $sql as $line ) {
+	function addSQL( $sql = NULL )
+	{
+		if( is_array( $sql ) )
+		{
+			foreach( $sql as $line )
+			{
 				$this->addSQL( $line );
 			}
 			
 			return TRUE;
 		}
 		
-		if( is_string( $sql ) ) {
+		if( is_string( $sql ) )
+		{
 			$this->sqlArray[] = $sql;
 			
 			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
-			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
+			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) )
+			{
 				$saved = $this->db->debug;
 				$this->db->debug = $this->debug;
 				$ok = $this->db->Execute( $sql );
 				$this->db->debug = $saved;
 				
-				if( !$ok ) {
-					if( $this->debug ) {
+				if( !$ok )
+				{
+					if( $this->debug )
+					{
 						ADOConnection::outp( $this->db->ErrorMsg() );
 					}
 					
@@ -2138,16 +2388,20 @@ 
 	*	
 	* @access private
 	*/
-	function getSQL( $format = NULL, $sqlArray = NULL ) {
-		if( !is_array( $sqlArray ) ) {
+	function getSQL( $format = NULL, $sqlArray = NULL )
+	{
+		if( !is_array( $sqlArray ) )
+		{
 			$sqlArray = $this->sqlArray;
 		}
 		
-		if( !is_array( $sqlArray ) ) {
+		if( !is_array( $sqlArray ) )
+		{
 			return FALSE;
 		}
 		
-		switch( strtolower( $format ) ) {
+		switch( strtolower( $format ) )
+		{
 			case 'string':
 			case 'text':
 				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
@@ -2164,7 +2418,8 @@ 
 	* Call this method to clean up after an adoSchema object that is no longer in use.
 	* @deprecated adoSchema now cleans up automatically.
 	*/
-	function Destroy() {
+	function Destroy()
+	{
 		set_magic_quotes_runtime( $this->mgq );
 		unset( $this );
 	}
@@ -2175,15 +2430,19 @@ 
 *
 * @access private
 */
-function logMsg( $msg, $title = NULL, $force = FALSE ) {
-	if( XMLS_DEBUG or $force ) {
+function logMsg( $msg, $title = NULL, $force = FALSE )
+{
+	if( XMLS_DEBUG or $force )
+	{
 		echo '<pre>';
 		
-		if( isset( $title ) ) {
+		if( isset( $title ) )
+		{
 			echo '<h3>' . htmlentities( $title ) . '</h3>';
 		}
 		
-		if( is_object( $this ) ) {
+		if( is_object( $this ) )
+		{
 			echo '[' . get_class( $this ) . '] ';
 		}
 		

Upper-Lower-Casing +15 added lines, -15 removed lines

@@ -250,12 +250,12 @@ 
 		
 		switch( $this->currentElement ) {
 			case 'INDEX':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				if( !isset( $attributes['PLATFORM'] ) or $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					xml_set_object( $parser, $this->addIndex( $attributes ) );
 				}
 				break;
 			case 'DATA':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				if( !isset( $attributes['PLATFORM'] ) or $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					xml_set_object( $parser, $this->addData( $attributes ) );
 				}
 				break;
@@ -537,7 +537,7 @@ 
 			logMsg( end( $sql ), 'Generated CreateTableSQL' );
 		} else {
 			// Upgrade an existing table
-			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
+			logMsg( "upgrading {$this->name} using '{$xmls->upgrade}'" );
 			switch( $xmls->upgrade ) {
 				// Use ChangeTableSQL
 				case 'ALTER':
@@ -1007,7 +1007,7 @@ 
 				// Create a new query in a SQL queryset.
 				// Ignore this query set if a platform is specified and it's different than the 
 				// current connection platform.
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				if( !isset( $attributes['PLATFORM'] ) or $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					$this->newQuery();
 				} else {
 					$this->discardQuery();
@@ -1084,7 +1084,7 @@ 
 	* @return string SQL query string.
 	*/
 	function buildQuery( $sql = NULL ) {
-		if( !isset( $this->query ) OR empty( $sql ) ) {
+		if( !isset( $this->query ) or empty( $sql ) ) {
 			return FALSE;
 		}
 		
@@ -1134,7 +1134,7 @@ 
 				case 'MANUAL':
 					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
 					// If prefixKey is not set, we use the default constant XMLS_PREFIX
-					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
+					if( isset( $this->prefixKey ) and( $this->prefixKey !== '' ) ) {
 						// Enable prefix override
 						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
 					} else {
@@ -1464,7 +1464,7 @@ 
 	* @return array Array of SQL queries, ready to execute.
 	*/
 	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+		if( !is_string( $xmlstring ) or empty( $xmlstring ) ) {
 			return FALSE;
 		}
 		
@@ -1632,7 +1632,7 @@ 
 				xml_set_object( $parser, $this->obj );
 				break;
 			case 'SQL':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				if( !isset( $attributes['PLATFORM'] ) or $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
 					$this->obj = new dbQuerySet( $this, $attributes );
 					xml_set_object( $parser, $this->obj );
 				}
@@ -1694,7 +1694,7 @@ 
 			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
 		}
 		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+		if( is_string( $result ) and is_string( $newFile ) and ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
@@ -1740,7 +1740,7 @@ 
 			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
 		}
 		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+		if( is_string( $result ) and is_string( $newFile ) and ( $fp = fopen( $newFile, 'w' ) ) ) {
 			fwrite( $fp, $result );
 			fclose( $fp );
 		}
@@ -1886,7 +1886,7 @@ 
 	* @return string Schema version number or FALSE on error
 	*/
 	function SchemaStringVersion( $xmlstring ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+		if( !is_string( $xmlstring ) or empty( $xmlstring ) ) {
 			return FALSE;
 		}
 		
@@ -2029,7 +2029,7 @@ 
 				return FALSE;
 		}
 		
-		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
+		if( $underscore and substr( $prefix, -1 ) != '_' ) {
 			$prefix .= '_';
 		}
 		
@@ -2070,11 +2070,11 @@ 
 	function supportedPlatform( $platform = NULL ) {
 		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
 		
-		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
-			logMsg( "Platform $platform is supported" );
+		if( !isset( $platform ) or preg_match( $regex, $platform ) ) {
+			logMsg( "platform $platform is supported" );
 			return TRUE;
 		} else {
-			logMsg( "Platform $platform is NOT supported" );
+			logMsg( "platform $platform is NOT supported" );
 			return FALSE;
 		}
 	}

phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php

Doc Comments +6 added lines

@@ -86,6 +86,9 @@ 
 		}
 	}
 
+ 	/**
+ 	 * @param string $meta
+ 	 */
  	function ActualType($meta)
 	{
 		switch($meta) {
@@ -261,6 +264,9 @@ 
 		return $aSql;
 	}
 
+	/**
+	 * @param string $tabname
+	 */
 	function DropTableSQL($tabname)
 	{
 		$sql = ADODB_DataDict::DropTableSQL($tabname);

Indentation +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
   the BSD license will take precedence.
 
   Set tabs to 4 for best viewing.
-
-*/
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();

Switch Indentation +18 added lines, -18 removed lines

@@ -89,29 +89,29 @@
  	function ActualType($meta)
 	{
 		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
+			case 'C': return 'VARCHAR';
+			case 'XL':
+			case 'X': return 'TEXT';
 
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'TEXT';
+			case 'C2': return 'VARCHAR';
+			case 'X2': return 'TEXT';
 
-		case 'B': return 'BYTEA';
+			case 'B': return 'BYTEA';
 
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
+			case 'D': return 'DATE';
+			case 'T': return 'TIMESTAMP';
 
-		case 'L': return 'BOOLEAN';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'INT2';
-		case 'I4': return 'INT4';
-		case 'I8': return 'INT8';
+			case 'L': return 'BOOLEAN';
+			case 'I': return 'INTEGER';
+			case 'I1': return 'SMALLINT';
+			case 'I2': return 'INT2';
+			case 'I4': return 'INT4';
+			case 'I8': return 'INT8';
 
-		case 'F': return 'FLOAT8';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
+			case 'F': return 'FLOAT8';
+			case 'N': return 'NUMERIC';
+			default:
+				return $meta;
 		}
 	}
 

Spacing +46 added lines, -46 removed lines

@@ -22,7 +22,7 @@ 
 	var $quote = '"';
 	var $renameTable = 'ALTER TABLE %s RENAME TO %s'; // at least since 7.1
 
-	function MetaType($t,$len=-1,$fieldobj=false)
+	function MetaType($t, $len = -1, $fieldobj = false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;
@@ -30,7 +30,7 @@ 
 			$len = $fieldobj->max_length;
 		}
 		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique &&
-			$fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
+			$fieldobj->has_default && substr($fieldobj->default_value, 0, 8) == 'nextval(';
 
 		switch (strtoupper($t)) {
 			case 'INTERVAL':
@@ -88,7 +88,7 @@ 
 
  	function ActualType($meta)
 	{
-		switch($meta) {
+		switch ($meta) {
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
@@ -126,24 +126,24 @@ 
 	 */
 	function AddColumnSQL($tabname, $flds)
 	{
-		$tabname = $this->TableName ($tabname);
+		$tabname = $this->TableName($tabname);
 		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
-			if (($not_null = preg_match('/NOT NULL/i',$v))) {
-				$v = preg_replace('/NOT NULL/i','',$v);
+		list($lines, $pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE '.$tabname.$this->addCol.' ';
+		foreach ($lines as $v) {
+			if (($not_null = preg_match('/NOT NULL/i', $v))) {
+				$v = preg_replace('/NOT NULL/i', '', $v);
 			}
-			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
-				list(,$colname,$default) = $matches;
-				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
+			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/', $v, $matches)) {
+				list(,$colname, $default) = $matches;
+				$sql[] = $alter.str_replace('DEFAULT '.$default, '', $v);
 				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
-				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
+				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT '.$default;
 			} else {
-				$sql[] = $alter . $v;
+				$sql[] = $alter.$v;
 			}
 			if ($not_null) {
-				list($colname) = explode(' ',$v);
+				list($colname) = explode(' ', $v);
 				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
 			}
 		}
@@ -161,13 +161,13 @@ 
 	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
 	 * @return array with SQL strings
 	 */
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	function AlterColumnSQL($tabname, $flds, $tableflds = '', $tableoptions = '')
 	{
 		if (!$tableflds) {
 			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
 			return array();
 		}
-		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+		return $this->_recreate_copy_table($tabname, False, $tableflds, $tableoptions);
 	}
 
 	/**
@@ -181,9 +181,9 @@ 
 	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
 	 * @return array with SQL strings
 	 */
-	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	function DropColumnSQL($tabname, $flds, $tableflds = '', $tableoptions = '')
 	{
-		$has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
+		$has_drop_column = 7.3 <= (float)@$this->serverInfo['version'];
 		if (!$has_drop_column && !$tableflds) {
 			if ($this->debug) ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
 		return array();
@@ -191,7 +191,7 @@ 
 		if ($has_drop_column) {
 			return ADODB_DataDict::DropColumnSQL($tabname, $flds);
 		}
-		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
+		return $this->_recreate_copy_table($tabname, $flds, $tableflds, $tableoptions);
 	}
 
 	/**
@@ -206,17 +206,17 @@ 
 	 * @param array/string $tableoptions options for the new table see CreateTableSQL, default ''
 	 * @return array with SQL strings
 	 */
-	function _recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
+	function _recreate_copy_table($tabname, $dropflds, $tableflds, $tableoptions = '')
 	{
-		if ($dropflds && !is_array($dropflds)) $dropflds = explode(',',$dropflds);
+		if ($dropflds && !is_array($dropflds)) $dropflds = explode(',', $dropflds);
 		$copyflds = array();
-		foreach(($meta=$this->MetaColumns($tabname)) as $fld) {
-			if (!$dropflds || !in_array($fld->name,$dropflds)) {
+		foreach (($meta = $this->MetaColumns($tabname)) as $fld) {
+			if (!$dropflds || !in_array($fld->name, $dropflds)) {
 				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
-				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) &&
-					in_array($fld->type,array('varchar','char','text','bytea'))) {
+				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i', $tableflds, $matches) &&
+					in_array($fld->type, array('varchar', 'char', 'text', 'bytea'))) {
 					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
-				} elseif (preg_match('/'.$fld->name.' ([\w]+)/i',$tableflds,$matches) &&
+				} elseif (preg_match('/'.$fld->name.' ([\w]+)/i', $tableflds, $matches) &&
 					strtoupper($fld->type) != ($type = $this->ActualType($matches[1]))) {
 					if ($type == 'BYTEA' && $fld->type == 'text') {
 						$copyflds[] = "DECODE($fld->name, 'escape')";
@@ -230,30 +230,30 @@ 
 				}
 				// identify the sequence name and the fld its on
 				if ($fld->primary_key && $fld->has_default &&
-					preg_match("/nextval\('([^']+)'::(text|regclass)\)/",$fld->default_value,$matches)) {
+					preg_match("/nextval\('([^']+)'::(text|regclass)\)/", $fld->default_value, $matches)) {
 					$seq_name = $matches[1];
 					$seq_fld = $fld->name;
 				}
 			}
 		}
-		$copyflds = implode(', ',$copyflds);
+		$copyflds = implode(', ', $copyflds);
 
 		$tempname = $tabname.'_tmp';
-		$aSql[] = 'BEGIN';		// we use a transaction, to make sure not to loose the content of the table
+		$aSql[] = 'BEGIN'; // we use a transaction, to make sure not to loose the content of the table
 		$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
-		$aSql = array_merge($aSql,$this->DropTableSQL($tabname));
-		$aSql = array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
+		$aSql = array_merge($aSql, $this->DropTableSQL($tabname));
+		$aSql = array_merge($aSql, $this->CreateTableSQL($tabname, $tableflds, $tableoptions));
 		$aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM $tempname";
 		if ($seq_name && $seq_fld) {	// if we have a sequence we need to set it again
-			$seq_name = $tabname.'_'.$seq_fld.'_seq';	// has to be the name of the new implicit sequence
+			$seq_name = $tabname.'_'.$seq_fld.'_seq'; // has to be the name of the new implicit sequence
 			$aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname";
 		}
 		$aSql[] = "DROP TABLE $tempname";
 		// recreate the indexes, if they not contain one of the droped columns
-		foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
+		foreach ($this->MetaIndexes($tabname) as $idx_name => $idx_data)
 		{
-			if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) {
-				$aSql = array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
+			if (substr($idx_name, -5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds, $idx_data['columns'])))) {
+				$aSql = array_merge($aSql, $this->CreateIndexSQL($idx_name, $tabname, $idx_data['columns'],
 					$idx_data['unique'] ? array('UNIQUE') : False));
 			}
 		}
@@ -272,7 +272,7 @@ 
 	}
 
 	// return string must begin with space
-	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	function _CreateSuffix($fname, &$ftype, $fnotnull, $fdefault, $fautoinc, $fconstraint, $funsigned)
 	{
 		if ($fautoinc) {
 			$ftype = 'SERIAL';
@@ -338,29 +338,29 @@ 
 	{
 		$sql = array();
 
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
-			if ( isset($idxoptions['DROP']) )
+		if (isset($idxoptions['REPLACE']) || isset($idxoptions['DROP'])) {
+			$sql[] = sprintf($this->dropIndex, $idxname, $tabname);
+			if (isset($idxoptions['DROP']))
 				return $sql;
 		}
 
-		if ( empty ($flds) ) {
+		if (empty ($flds)) {
 			return $sql;
 		}
 
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
+		$s = 'CREATE'.$unique.' INDEX '.$idxname.' ON '.$tabname.' ';
 
 		if (isset($idxoptions['HASH']))
 			$s .= 'USING HASH ';
 
-		if ( isset($idxoptions[$this->upperName]) )
+		if (isset($idxoptions[$this->upperName]))
 			$s .= $idxoptions[$this->upperName];
 
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s .= '(' . $flds . ')';
+		if (is_array($flds))
+			$flds = implode(', ', $flds);
+		$s .= '('.$flds.')';
 		$sql[] = $s;
 
 		return $sql;

Braces +110 added lines, -42 removed lines

@@ -11,9 +11,13 @@ 
 */
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
-class ADODB2_postgres extends ADODB_DataDict {
+class ADODB2_postgres extends ADODB_DataDict
+{
 
 	var $databaseType = 'postgres';
 	var $seqField = false;
@@ -24,7 +28,8 @@ 
 
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
-		if (is_object($t)) {
+		if (is_object($t))
+		{
 			$fieldobj = $t;
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
@@ -32,14 +37,18 @@ 
 		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique &&
 			$fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
 
-		switch (strtoupper($t)) {
+		switch (strtoupper($t))
+		{
 			case 'INTERVAL':
 			case 'CHAR':
 			case 'CHARACTER':
 			case 'VARCHAR':
 			case 'NAME':
 	   		case 'BPCHAR':
-				if ($len <= $this->blobSize) return 'C';
+				if ($len <= $this->blobSize)
+				{
+					return 'C';
+				}
 
 			case 'TEXT':
 				return 'X';
@@ -87,8 +96,9 @@ 
 	}
 
  	function ActualType($meta)
-	{
-		switch($meta) {
+ 	{
+		switch($meta)
+		{
 		case 'C': return 'VARCHAR';
 		case 'XL':
 		case 'X': return 'TEXT';
@@ -130,19 +140,25 @@ 
 		$sql = array();
 		list($lines,$pkey) = $this->_GenFields($flds);
 		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
-			if (($not_null = preg_match('/NOT NULL/i',$v))) {
+		foreach($lines as $v)
+		{
+			if (($not_null = preg_match('/NOT NULL/i',$v)))
+			{
 				$v = preg_replace('/NOT NULL/i','',$v);
 			}
-			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
+			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches))
+			{
 				list(,$colname,$default) = $matches;
 				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
 				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
 				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-			} else {
+			}
+			else
+			{
 				$sql[] = $alter . $v;
 			}
-			if ($not_null) {
+			if ($not_null)
+			{
 				list($colname) = explode(' ',$v);
 				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
 			}
@@ -163,8 +179,12 @@ 
 	 */
 	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
-		if (!$tableflds) {
-			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+		if (!$tableflds)
+		{
+			if ($this->debug)
+			{
+				ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+			}
 			return array();
 		}
 		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
@@ -184,11 +204,16 @@ 
 	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
 		$has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
-		if (!$has_drop_column && !$tableflds) {
-			if ($this->debug) ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
+		if (!$has_drop_column && !$tableflds)
+		{
+			if ($this->debug)
+			{
+				ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
+			}
 		return array();
 	}
-		if ($has_drop_column) {
+		if ($has_drop_column)
+		{
 			return ADODB_DataDict::DropColumnSQL($tabname, $flds);
 		}
 		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
@@ -208,29 +233,45 @@ 
 	 */
 	function _recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
 	{
-		if ($dropflds && !is_array($dropflds)) $dropflds = explode(',',$dropflds);
+		if ($dropflds && !is_array($dropflds))
+		{
+			$dropflds = explode(',',$dropflds);
+		}
 		$copyflds = array();
-		foreach(($meta=$this->MetaColumns($tabname)) as $fld) {
-			if (!$dropflds || !in_array($fld->name,$dropflds)) {
+		foreach(($meta=$this->MetaColumns($tabname)) as $fld)
+		{
+			if (!$dropflds || !in_array($fld->name,$dropflds))
+			{
 				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
 				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) &&
-					in_array($fld->type,array('varchar','char','text','bytea'))) {
+					in_array($fld->type,array('varchar','char','text','bytea')))
+				{
 					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
-				} elseif (preg_match('/'.$fld->name.' ([\w]+)/i',$tableflds,$matches) &&
-					strtoupper($fld->type) != ($type = $this->ActualType($matches[1]))) {
-					if ($type == 'BYTEA' && $fld->type == 'text') {
+				}
+				elseif (preg_match('/'.$fld->name.' ([\w]+)/i',$tableflds,$matches) &&
+					strtoupper($fld->type) != ($type = $this->ActualType($matches[1])))
+				{
+					if ($type == 'BYTEA' && $fld->type == 'text')
+					{
 						$copyflds[] = "DECODE($fld->name, 'escape')";
-					} elseif ($fld->type == 'bytea' && $type == 'TEXT') {
+					}
+					elseif ($fld->type == 'bytea' && $type == 'TEXT')
+					{
 						$copyflds[] = "ENCODE($fld->name, 'escape')";
-					} else {
+					}
+					else
+					{
 						$copyflds[] = "CAST($fld->name AS $type)";
 					}
-				} else {
+				}
+				else
+				{
 					$copyflds[] = $fld->name;
 				}
 				// identify the sequence name and the fld its on
 				if ($fld->primary_key && $fld->has_default &&
-					preg_match("/nextval\('([^']+)'::(text|regclass)\)/",$fld->default_value,$matches)) {
+					preg_match("/nextval\('([^']+)'::(text|regclass)\)/",$fld->default_value,$matches))
+				{
 					$seq_name = $matches[1];
 					$seq_fld = $fld->name;
 				}
@@ -244,7 +285,9 @@ 
 		$aSql = array_merge($aSql,$this->DropTableSQL($tabname));
 		$aSql = array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
 		$aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM $tempname";
-		if ($seq_name && $seq_fld) {	// if we have a sequence we need to set it again
+		if ($seq_name && $seq_fld)
+		{
+// if we have a sequence we need to set it again
 			$seq_name = $tabname.'_'.$seq_fld.'_seq';	// has to be the name of the new implicit sequence
 			$aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname";
 		}
@@ -252,7 +295,8 @@ 
 		// recreate the indexes, if they not contain one of the droped columns
 		foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
 		{
-			if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) {
+			if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns']))))
+			{
 				$aSql = array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
 					$idx_data['unique'] ? array('UNIQUE') : False));
 			}
@@ -266,7 +310,10 @@ 
 		$sql = ADODB_DataDict::DropTableSQL($tabname);
 
 		$drop_seq = $this->_DropAutoIncrement($tabname);
-		if ($drop_seq) $sql[] = $drop_seq;
+		if ($drop_seq)
+		{
+			$sql[] = $drop_seq;
+		}
 
 		return $sql;
 	}
@@ -274,14 +321,24 @@ 
 	// return string must begin with space
 	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
-		if ($fautoinc) {
+		if ($fautoinc)
+		{
 			$ftype = 'SERIAL';
 			return '';
 		}
 		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		if (strlen($fdefault))
+		{
+			$suffix .= " DEFAULT $fdefault";
+		}
+		if ($fnotnull)
+		{
+			$suffix .= ' NOT NULL';
+		}
+		if ($fconstraint)
+		{
+			$suffix .= ' '.$fconstraint;
+		}
 		return $suffix;
 	}
 
@@ -295,7 +352,8 @@ 
 		$seq = $this->connection->GetOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'");
 
 		// check if a tables depends on the sequenz and it therefor cant and dont need to be droped separatly
-		if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.oid=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND refclassid = (SELECT oid FROM pg_class WHERE relname = 'pg_class')")) {
+		if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.oid=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND refclassid = (SELECT oid FROM pg_class WHERE relname = 'pg_class')"))
+		{
 			return False;
 		}
 		return "DROP SEQUENCE ".$seq;
@@ -338,13 +396,17 @@ 
 	{
 		$sql = array();
 
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) )
+		{
 			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
 			if ( isset($idxoptions['DROP']) )
-				return $sql;
+			{
+							return $sql;
+			}
 		}
 
-		if ( empty ($flds) ) {
+		if ( empty ($flds) )
+		{
 			return $sql;
 		}
 
@@ -353,13 +415,19 @@ 
 		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
 
 		if (isset($idxoptions['HASH']))
-			$s .= 'USING HASH ';
+		{
+					$s .= 'USING HASH ';
+		}
 
 		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
+		{
+					$s .= $idxoptions[$this->upperName];
+		}
 
 		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
+		{
+					$flds = implode(', ',$flds);
+		}
 		$s .= '(' . $flds . ')';
 		$sql[] = $s;
 

phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php

Doc Comments +5 added lines

@@ -379,6 +379,11 @@
 	 }
 	
 	//OPN STUFF start
+
+	/**
+	 * @param ADOFieldObject $fld
+	 * @param boolean $dialect3
+	 */
 	function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3)
 	{
 		$fscale = abs($fscale);

Indentation +67 added lines, -67 removed lines

@@ -189,55 +189,55 @@ 
 	
 	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        $false = false;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
-        $table = strtoupper($table);
-        $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '".$table."'";
-        if (!$primary) {
-        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
-        } else {
-        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
-        }
-        // get index details
-        $rs = $this->Execute($sql);
-        if (!is_object($rs)) {
-	        // restore fetchmode
-	        if (isset($savem)) {
-	            $this->SetFetchMode($savem);
-	        }
-	        $ADODB_FETCH_MODE = $save;
-            return $false;
-        }
+		// save old fetch mode
+		global $ADODB_FETCH_MODE;
+		$false = false;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			   $savem = $this->SetFetchMode(FALSE);
+		}
+		$table = strtoupper($table);
+		$sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '".$table."'";
+		if (!$primary) {
+			$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
+		} else {
+			$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
+		}
+		// get index details
+		$rs = $this->Execute($sql);
+		if (!is_object($rs)) {
+			// restore fetchmode
+			if (isset($savem)) {
+				$this->SetFetchMode($savem);
+			}
+			$ADODB_FETCH_MODE = $save;
+			return $false;
+		}
         
-        $indexes = array ();
+		$indexes = array ();
 		while ($row = $rs->FetchRow()) {
 			$index = $row[0];
-             if (!isset($indexes[$index])) {
-             		if (is_null($row[3])) {$row[3] = 0;}
-                     $indexes[$index] = array(
-                             'unique' => ($row[3] == 1),
-                             'columns' => array()
-                     );
-             }
+			 if (!isset($indexes[$index])) {
+			 		if (is_null($row[3])) {$row[3] = 0;}
+					 $indexes[$index] = array(
+							 'unique' => ($row[3] == 1),
+							 'columns' => array()
+					 );
+			 }
 			$sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE RDB\$INDEX_NAME = '".$name."' ORDER BY RDB\$FIELD_POSITION ASC";
 			$rs1 = $this->Execute($sql);
-            while ($row1 = $rs1->FetchRow()) {
-             	$indexes[$index]['columns'][$row1[2]] = $row1[1];
-        	}
+			while ($row1 = $rs1->FetchRow()) {
+			 	$indexes[$index]['columns'][$row1[2]] = $row1[1];
+			}
+		}
+		// restore fetchmode
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
 		}
-        // restore fetchmode
-        if (isset($savem)) {
-            $this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
+		$ADODB_FETCH_MODE = $save;
         
-        return $indexes;
+		return $indexes;
 	}
 
 	
@@ -388,24 +388,24 @@ 
 			case 7: 
 			case 8:
 				if ($dialect3) {
-				    switch($fsubtype){
-				    	case 0: 
-				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
-				    		break;
-				    	case 1: 
-				    		$fld->type = 'numeric';
+					switch($fsubtype){
+						case 0: 
+							$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
+							break;
+						case 1: 
+							$fld->type = 'numeric';
 							$fld->max_length = $fprecision;
 							$fld->scale = $fscale;
-				    		break;
-				    	case 2:
-				    		$fld->type = 'decimal';
+							break;
+						case 2:
+							$fld->type = 'decimal';
 							$fld->max_length = $fprecision;
 							$fld->scale = $fscale;
-				    		break;
-				    } // switch
+							break;
+					} // switch
 				} else {
 					if ($fscale !=0) {
-					    $fld->type = 'decimal';
+						$fld->type = 'decimal';
 						$fld->scale = $fscale;
 						$fld->max_length = ($ftype == 7 ? 4 : 9);
 					} else {
@@ -415,23 +415,23 @@ 
 				break;
 			case 16: 
 				if ($dialect3) {
-				    switch($fsubtype){
-				    	case 0: 
-				    		$fld->type = 'decimal';
+					switch($fsubtype){
+						case 0: 
+							$fld->type = 'decimal';
 							$fld->max_length = 18;
 							$fld->scale = 0;
-				    		break;
-				    	case 1: 
-				    		$fld->type = 'numeric';
+							break;
+						case 1: 
+							$fld->type = 'numeric';
 							$fld->max_length = $fprecision;
 							$fld->scale = $fscale;
-				    		break;
-				    	case 2:
-				    		$fld->type = 'decimal';
+							break;
+						case 2:
+							$fld->type = 'decimal';
 							$fld->max_length = $fprecision;
 							$fld->scale = $fscale;
-				    		break;
-				    } // switch
+							break;
+					} // switch
 				}
 				break;
 			case 10:
@@ -442,7 +442,7 @@ 
 				break;
 			case 27:
 				if ($fscale !=0) {
-				    $fld->type = 'decimal';
+					$fld->type = 'decimal';
 					$fld->max_length = 15;
 					$fld->scale = 5;
 				} else {
@@ -451,7 +451,7 @@ 
 				break;
 			case 35:
 				if ($dialect3) {
-				    $fld->type = 'timestamp';
+					$fld->type = 'timestamp';
 				} else {
 					$fld->type = 'date';
 				}

Switch Indentation +97 added lines, -97 removed lines

@@ -122,11 +122,11 @@ 
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Interbase 5.5 or earlier'; break;
-		case '2': $s = 'Interbase 5.6'; break;
-		default:
-		case '3': $s = 'Interbase 6.0'; break;
+			case '': 
+			case '1': $s = 'Interbase 5.5 or earlier'; break;
+			case '2': $s = 'Interbase 5.6'; break;
+			default:
+			case '3': $s = 'Interbase 6.0'; break;
 		}
 		$arr['version'] = ADOConnection::_findvers($s);
 		$arr['description'] = $s;
@@ -330,15 +330,15 @@ 
 					$ret = call_user_func_array($fn,$fnarr);
 				} else {
 					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($sql,$iarr[0]); break;
-					case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+						case 1: $ret = $fn($sql,$iarr[0]); break;
+						case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
+						case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
+						case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+						case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+						case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+						case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
+						default: ADOConnection::outp( "Too many parameters to ibase query $sql");
+						case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
 			} else $ret = $fn($sql); 
@@ -352,15 +352,15 @@ 
 					$ret = call_user_func_array($fn,$fnarr);
 				} else {
 					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
-					case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+						case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
+						case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
+						case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
+						case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+						case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+						case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+						case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
+						default: ADOConnection::outp( "Too many parameters to ibase query $sql");
+						case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
 			} else $ret = $fn($conn,$sql); 
@@ -509,15 +509,15 @@ 
 				$d = substr($rs->fields[2],strlen('default '));
 				switch ($fld->type)
 				{
-				case 'smallint':
-				case 'integer': $fld->default_value = (int) $d; break;
-				case 'char': 
-				case 'blob':
-				case 'text':
-				case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
-				case 'double':
-				case 'float': $fld->default_value = (float) $d; break;
-				default: $fld->default_value = $d; break;
+					case 'smallint':
+					case 'integer': $fld->default_value = (int) $d; break;
+					case 'char': 
+					case 'blob':
+					case 'text':
+					case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
+					case 'double':
+					case 'float': $fld->default_value = (float) $d; break;
+					default: $fld->default_value = $d; break;
 				}
 		//	case 35:$tt = 'TIMESTAMP'; break;
 			}
@@ -651,42 +651,42 @@ 
 			if ($s) $s .= '||';
 			$ch = $fmt[$i];
 			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "extract(year from $col)";
-				break;
-			case 'M':
-			case 'm':
-				$s .= "extract(month from $col)";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "cast(((extract(month from $col)+2) / 3) as integer)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "(extract(day from $col))";
-				break;
-			case 'H':
-			case 'h':
-			  $s .= "(extract(hour from $col))";
-			  break;                        
-			case 'I':
-			case 'i':
-			  $s .= "(extract(minute from $col))";
-			  break;                
-			case 'S':
-			case 's':
-			  $s .= "CAST((extract(second from $col)) AS INTEGER)";
-			  break;        
+				case 'Y':
+				case 'y':
+					$s .= "extract(year from $col)";
+					break;
+				case 'M':
+				case 'm':
+					$s .= "extract(month from $col)";
+					break;
+				case 'Q':
+				case 'q':
+					$s .= "cast(((extract(month from $col)+2) / 3) as integer)";
+					break;
+				case 'D':
+				case 'd':
+					$s .= "(extract(day from $col))";
+					break;
+				case 'H':
+				case 'h':
+			  	$s .= "(extract(hour from $col))";
+			  	break;                        
+				case 'I':
+				case 'i':
+			  	$s .= "(extract(minute from $col))";
+			  	break;                
+				case 'S':
+				case 's':
+			  	$s .= "CAST((extract(second from $col)) AS INTEGER)";
+			  	break;        
 
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
+				default:
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt,$i,1);
+					}
+					$s .= $this->qstr($ch);
+					break;
 			}
 		}
 		return $s;
@@ -722,18 +722,18 @@ 
 			 $fld = new ADOFieldObject;
 			 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
 			 switch (ADODB_ASSOC_CASE) {
-			 case 2: // the default
-			 	$fld->name = ($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = ($ibf['name']);
-				 break;
-			 case 0: 
-				 $fld->name = strtoupper($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
-				 break;
-			 case 1: 
-			 	$fld->name = strtolower($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
-				 break;
+			 	case 2: // the default
+			 		$fld->name = ($ibf['alias']);
+				 	if (empty($fld->name)) $fld->name = ($ibf['name']);
+				 	break;
+			 	case 0: 
+				 	$fld->name = strtoupper($ibf['alias']);
+				 	if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
+				 	break;
+			 	case 1: 
+			 		$fld->name = strtolower($ibf['alias']);
+				 	if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
+				 	break;
 			 }
 			 
 			 $fld->type = $ibf['type'];
@@ -833,27 +833,27 @@ 
 			$len = $fieldobj->max_length;
 		}
 		switch (strtoupper($t)) {
-		case 'CHAR':
-			return 'C';
+			case 'CHAR':
+				return 'C';
 			
-		case 'TEXT':
-		case 'VARCHAR':
-		case 'VARYING':
-		if ($len <= $this->blobSize) return 'C';
-			return 'X';
-		case 'BLOB':
-			return 'B';
+			case 'TEXT':
+			case 'VARCHAR':
+			case 'VARYING':
+			if ($len <= $this->blobSize) return 'C';
+				return 'X';
+			case 'BLOB':
+				return 'B';
 			   
-		case 'TIMESTAMP':
-		case 'DATE': return 'D';
-		case 'TIME': return 'T';
-				//case 'T': return 'T';
+			case 'TIMESTAMP':
+			case 'DATE': return 'D';
+			case 'TIME': return 'T';
+					//case 'T': return 'T';
 
-				//case 'L': return 'L';
-		case 'INT': 
-		case 'SHORT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
+					//case 'L': return 'L';
+			case 'INT': 
+			case 'SHORT':
+			case 'INTEGER': return 'I';
+			default: return 'N';
 		}
 	}
 

Spacing +107 added lines, -107 removed lines

@@ -35,7 +35,7 @@ 
 	var $ibase_timestampfmt = "%Y-%m-%d %H:%M:%S";
 	var $ibase_timefmt = "%H:%M:%S";
 	var $fmtTimeStamp = "'Y-m-d, H:i:s'";
-	var $concat_operator='||';
+	var $concat_operator = '||';
 	var $_transactionID;
 	var $metaTablesSQL = "select rdb\$relation_name from rdb\$relations where rdb\$relation_name not like 'RDB\$%'";
 	//OPN STUFF start
@@ -61,17 +61,17 @@ 
 	
 	
 	   // returns true or false
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false)
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $persist = false)
 	{  
 		if (!function_exists('ibase_pconnect')) return null;
 		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
-		$fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
+		$fn = ($persist) ? 'ibase_pconnect' : 'ibase_connect';
 		if ($this->role)
-			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
-					$this->charSet,$this->buffers,$this->dialect,$this->role);
+			$this->_connectionID = $fn($argHostname, $argUsername, $argPassword,
+					$this->charSet, $this->buffers, $this->dialect, $this->role);
 		else	
-			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
-					$this->charSet,$this->buffers,$this->dialect);
+			$this->_connectionID = $fn($argHostname, $argUsername, $argPassword,
+					$this->charSet, $this->buffers, $this->dialect);
 		
 		if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
 			$this->replaceQuote = "''";
@@ -83,10 +83,10 @@ 
 		
 		// PHP5 change.
 		if (function_exists('ibase_timefmt')) {
-			ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
-			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
-			else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
-			ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
+			ibase_timefmt($this->ibase_datefmt, IBASE_DATE);
+			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt, IBASE_TIMESTAMP);
+			else ibase_timefmt($this->ibase_timestampfmt, IBASE_TIMESTAMP);
+			ibase_timefmt($this->ibase_timefmt, IBASE_TIME);
 			
 		} else {
 			ini_set("ibase.timestampformat", $this->ibase_timestampfmt);
@@ -98,11 +98,11 @@ 
 	   // returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,true);
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
 	}	
 	
 	
-	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
+	function MetaPrimaryKeys($table, $owner_notused = false, $internalKey = false)
 	{	
 		if ($internalKey) return array('RDB$DB_KEY');
 		
@@ -113,15 +113,15 @@ 
 	WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\'
 	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
 
-		$a = $this->GetCol($sql,false,true);
-		if ($a && sizeof($a)>0) return $a;
+		$a = $this->GetCol($sql, false, true);
+		if ($a && sizeof($a) > 0) return $a;
 		return false;	  
 	}
 	
 	function ServerInfo()
 	{
 		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
+		switch ($arr['dialect']) {
 		case '': 
 		case '1': $s = 'Interbase 5.5 or earlier'; break;
 		case '2': $s = 'Interbase 5.6'; break;
@@ -138,11 +138,11 @@ 
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
 		$this->autoCommit = false;
-	 	$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
+	 	$this->_transactionID = $this->_connectionID; //ibase_trans($this->ibasetrans, $this->_connectionID);
 		return $this->_transactionID;
 	}
 	
-	function CommitTrans($ok=true) 
+	function CommitTrans($ok = true) 
 	{ 
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transOff) return true;
@@ -159,17 +159,17 @@ 
 	
 	// there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently.
 	// it appears that ibase extension cannot support multiple concurrent queryid's
-	function &_Execute($sql,$inputarr=false) 
+	function &_Execute($sql, $inputarr = false) 
 	{
 	global $ADODB_COUNTRECS;
 	
 		if ($this->_logsql) {
 			$savecrecs = $ADODB_COUNTRECS;
 			$ADODB_COUNTRECS = true; // force countrecs
-			$ret =& ADOConnection::_Execute($sql,$inputarr);
+			$ret = & ADOConnection::_Execute($sql, $inputarr);
 			$ADODB_COUNTRECS = $savecrecs;
 		} else {
-			$ret =& ADOConnection::_Execute($sql,$inputarr);
+			$ret = & ADOConnection::_Execute($sql, $inputarr);
 		}
 		return $ret;
 	}
@@ -187,7 +187,7 @@ 
 		return $ret;
 	}
 	
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+	function &MetaIndexes($table, $primary = FALSE, $owner = false)
 	{
         // save old fetch mode
         global $ADODB_FETCH_MODE;
@@ -215,11 +215,11 @@ 
             return $false;
         }
         
-        $indexes = array ();
+        $indexes = array();
 		while ($row = $rs->FetchRow()) {
 			$index = $row[0];
              if (!isset($indexes[$index])) {
-             		if (is_null($row[3])) {$row[3] = 0;}
+             		if (is_null($row[3])) {$row[3] = 0; }
                      $indexes[$index] = array(
                              'unique' => ($row[3] == 1),
                              'columns' => array()
@@ -242,7 +242,7 @@ 
 
 	
 	// See http://community.borland.com/article/0,1410,25844,00.html
-	function RowLock($tables,$where,$col)
+	function RowLock($tables, $where, $col)
 	{
 		if ($this->autoCommit) $this->BeginTrans();
 		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
@@ -250,11 +250,11 @@ 
 	}
 	
 	
-	function CreateSequence($seqname,$startID=1)
+	function CreateSequence($seqname, $startID = 1)
 	{
-		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
+		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))"));
 		if (!$ok) return false;
-		return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
+		return $this->Execute("SET GENERATOR $seqname TO ".($startID - 1).';');
 	}
 	
 	function DropSequence($seqname)
@@ -263,16 +263,16 @@ 
 		$this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'");
 	}
 	
-	function GenID($seqname='adodbseq',$startID=1)
+	function GenID($seqname = 'adodbseq', $startID = 1)
 	{
 		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
 		$rs = @$this->Execute($getnext);
 		if (!$rs) {
-			$this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-			$this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
+			$this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))"));
+			$this->Execute("SET GENERATOR $seqname TO ".($startID - 1).';');
 			$rs = $this->Execute($getnext);
 		}
-		if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields);
+		if ($rs && !$rs->EOF) $this->genID = (integer)reset($rs->fields);
 		else $this->genID = 0; // false
 		
 		if ($rs) $rs->Close();
@@ -292,7 +292,7 @@ 
 
 	function ErrorNo() 
 	{
-		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
+		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg, $arr)) return (integer)$arr[1];
 		else return 0;
 	}
 
@@ -303,14 +303,14 @@ 
 
 	function Prepare($sql)
 	{
-		$stmt = ibase_prepare($this->_connectionID,$sql);
+		$stmt = ibase_prepare($this->_connectionID, $sql);
 		if (!$stmt) return false;
-		return array($sql,$stmt);
+		return array($sql, $stmt);
 	}
 
 	   // returns query ID if successful, otherwise false
 	   // there have been reports of problems with nested queries - the code is probably not re-entrant?
-	function _query($sql,$iarr=false)
+	function _query($sql, $iarr = false)
 	{ 
 
 		if (!$this->autoCommit && $this->_transactionID) {
@@ -324,21 +324,21 @@ 
 			$fn = 'ibase_execute';
 			$sql = $sql[1];
 			if (is_array($iarr)) {
-				if  (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-					if ( !isset($iarr[0]) ) $iarr[0] = ''; // PHP5 compat hack
-					$fnarr =& array_merge( array($sql) , $iarr);
-					$ret = call_user_func_array($fn,$fnarr);
+				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
+					if (!isset($iarr[0])) $iarr[0] = ''; // PHP5 compat hack
+					$fnarr = & array_merge(array($sql), $iarr);
+					$ret = call_user_func_array($fn, $fnarr);
 				} else {
-					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($sql,$iarr[0]); break;
-					case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+					switch (sizeof($iarr)) {
+					case 1: $ret = $fn($sql, $iarr[0]); break;
+					case 2: $ret = $fn($sql, $iarr[0], $iarr[1]); break;
+					case 3: $ret = $fn($sql, $iarr[0], $iarr[1], $iarr[2]); break;
+					case 4: $ret = $fn($sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3]); break;
+					case 5: $ret = $fn($sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3], $iarr[4]); break;
+					case 6: $ret = $fn($sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3], $iarr[4], $iarr[5]); break;
+					case 7: $ret = $fn($sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3], $iarr[4], $iarr[5], $iarr[6]); break;
+					default: ADOConnection::outp("Too many parameters to ibase query $sql");
+					case 8: $ret = $fn($sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3], $iarr[4], $iarr[5], $iarr[6], $iarr[7]); break;
 					}
 				}
 			} else $ret = $fn($sql); 
@@ -348,22 +348,22 @@ 
 			if (is_array($iarr)) {	
 				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
 					if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack
-					$fnarr =& array_merge( array($conn,$sql) , $iarr);
-					$ret = call_user_func_array($fn,$fnarr);
+					$fnarr = & array_merge(array($conn, $sql), $iarr);
+					$ret = call_user_func_array($fn, $fnarr);
 				} else {
-					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
-					case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+					switch (sizeof($iarr)) {
+					case 1: $ret = $fn($conn, $sql, $iarr[0]); break;
+					case 2: $ret = $fn($conn, $sql, $iarr[0], $iarr[1]); break;
+					case 3: $ret = $fn($conn, $sql, $iarr[0], $iarr[1], $iarr[2]); break;
+					case 4: $ret = $fn($conn, $sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3]); break;
+					case 5: $ret = $fn($conn, $sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3], $iarr[4]); break;
+					case 6: $ret = $fn($conn, $sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3], $iarr[4], $iarr[5]); break;
+					case 7: $ret = $fn($conn, $sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3], $iarr[4], $iarr[5], $iarr[6]); break;
+					default: ADOConnection::outp("Too many parameters to ibase query $sql");
+					case 8: $ret = $fn($conn, $sql, $iarr[0], $iarr[1], $iarr[2], $iarr[3], $iarr[4], $iarr[5], $iarr[6], $iarr[7]); break;
 					}
 				}
-			} else $ret = $fn($conn,$sql); 
+			} else $ret = $fn($conn, $sql); 
 		}
 		if ($docommit && $ret === true) ibase_commit($this->_connectionID);
 
@@ -384,11 +384,11 @@ 
 		$fscale = abs($fscale);
 		$fld->max_length = $flen;
 		$fld->scale = null;
-		switch($ftype){
+		switch ($ftype) {
 			case 7: 
 			case 8:
 				if ($dialect3) {
-				    switch($fsubtype){
+				    switch ($fsubtype) {
 				    	case 0: 
 				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
 				    		break;
@@ -404,7 +404,7 @@ 
 				    		break;
 				    } // switch
 				} else {
-					if ($fscale !=0) {
+					if ($fscale != 0) {
 					    $fld->type = 'decimal';
 						$fld->scale = $fscale;
 						$fld->max_length = ($ftype == 7 ? 4 : 9);
@@ -415,7 +415,7 @@ 
 				break;
 			case 16: 
 				if ($dialect3) {
-				    switch($fsubtype){
+				    switch ($fsubtype) {
 				    	case 0: 
 				    		$fld->type = 'decimal';
 							$fld->max_length = 18;
@@ -441,7 +441,7 @@ 
 				$fld->type = 'char';
 				break;
 			case 27:
-				if ($fscale !=0) {
+				if ($fscale != 0) {
 				    $fld->type = 'decimal';
 					$fld->max_length = 15;
 					$fld->scale = 5;
@@ -483,7 +483,7 @@ 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 	
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL, strtoupper($table)));
 	
 		$ADODB_FETCH_MODE = $save;
 		$false = false;
@@ -493,7 +493,7 @@ 
 		
 		$retarr = array();
 		//OPN STUFF start
-		$dialect3 = ($this->dialect==3 ? true : false);
+		$dialect3 = ($this->dialect == 3 ? true : false);
 		//OPN STUFF end
 		while (!$rs->EOF) { //print_r($rs->fields);
 			$fld = new ADOFieldObject();
@@ -506,17 +506,17 @@ 
 			if (isset($rs->fields[2])) {
 				
 				$fld->has_default = true;
-				$d = substr($rs->fields[2],strlen('default '));
+				$d = substr($rs->fields[2], strlen('default '));
 				switch ($fld->type)
 				{
 				case 'smallint':
-				case 'integer': $fld->default_value = (int) $d; break;
+				case 'integer': $fld->default_value = (int)$d; break;
 				case 'char': 
 				case 'blob':
 				case 'text':
-				case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
+				case 'varchar': $fld->default_value = (string)substr($d, 1, strlen($d) - 2); break;
 				case 'double':
-				case 'float': $fld->default_value = (float) $d; break;
+				case 'float': $fld->default_value = (float)$d; break;
 				default: $fld->default_value = $d; break;
 				}
 		//	case 35:$tt = 'TIMESTAMP'; break;
@@ -533,15 +533,15 @@ 
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		if ( empty($retarr)) return $false;
+		if (empty($retarr)) return $false;
 		else return $retarr;	
 	}
 	
-	function BlobEncode( $blob ) 
+	function BlobEncode($blob) 
 	{
-		$blobid = ibase_blob_create( $this->_connectionID);
-		ibase_blob_add( $blobid, $blob );
-		return ibase_blob_close( $blobid );
+		$blobid = ibase_blob_create($this->_connectionID);
+		ibase_blob_add($blobid, $blob);
+		return ibase_blob_close($blobid);
 	}
 	
 	// since we auto-decode all blob's since 2.42, 
@@ -556,27 +556,27 @@ 
 	
 	// old blobdecode function
 	// still used to auto-decode all blob's
-	function _BlobDecode( $blob ) 
+	function _BlobDecode($blob) 
 	{
-		$blobid = ibase_blob_open( $blob );
-		$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet <kevinboillet@yahoo.fr>
-		while($string = ibase_blob_get($blobid, 8192)){ 
+		$blobid = ibase_blob_open($blob);
+		$realblob = ibase_blob_get($blobid, $this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet <kevinboillet@yahoo.fr>
+		while ($string = ibase_blob_get($blobid, 8192)) { 
 			$realblob .= $string; 
 		}
-		ibase_blob_close( $blobid );
+		ibase_blob_close($blobid);
 
-		return( $realblob );
+		return($realblob);
 	} 
 	
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
+	function UpdateBlobFile($table, $column, $path, $where, $blobtype = 'BLOB') 
 	{ 
-		$fd = fopen($path,'rb'); 
+		$fd = fopen($path, 'rb'); 
 		if ($fd === false) return false; 
 		$blob_id = ibase_blob_create($this->_connectionID); 
 		
 		/* fill with data */ 
 		
-		while ($val = fread($fd,32768)){ 
+		while ($val = fread($fd, 32768)) { 
 			ibase_blob_add($blob_id, $val); 
 		} 
 		
@@ -584,7 +584,7 @@ 
 		$blob_id_str = ibase_blob_close($blob_id); 
 		
 		fclose($fd); 
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where", array($blob_id_str)) != false; 
 	} 
 	
 	/*
@@ -596,7 +596,7 @@ 
 		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
+	function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB') 
 	{ 
 	$blob_id = ibase_blob_create($this->_connectionID); 
 	
@@ -625,32 +625,32 @@ 
 	
 	$blob_id_str = ibase_blob_close($blob_id); 
 	
-	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
+	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where", array($blob_id_str)) != false; 
 	
 	} 
 	
 	
-	function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	function OldUpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
 	{
 		$blob_id = ibase_blob_create($this->_connectionID);
 		ibase_blob_add($blob_id, $val);
 		$blob_id_str = ibase_blob_close($blob_id);
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where", array($blob_id_str)) != false;
 	}
 	
 	// Format date column in sql string given an input format that understands Y M D
 	// Only since Interbase 6.0 - uses EXTRACT
 	// problem - does not zero-fill the day and month yet
-	function SQLDate($fmt, $col=false)
+	function SQLDate($fmt, $col = false)
 	{	
 		if (!$col) $col = $this->sysDate;
 		$s = '';
 		
 		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			if ($s) $s .= '||';
 			$ch = $fmt[$i];
-			switch($ch) {
+			switch ($ch) {
 			case 'Y':
 			case 'y':
 				$s .= "extract(year from $col)";
@@ -683,7 +683,7 @@ 
 			default:
 				if ($ch == '\\') {
 					$i++;
-					$ch = substr($fmt,$i,1);
+					$ch = substr($fmt, $i, 1);
 				}
 				$s .= $this->qstr($ch);
 				break;
@@ -701,10 +701,10 @@ 
 {
 
 	var $databaseType = "ibase";
-	var $bind=false;
+	var $bind = false;
 	var $_cacheType;
 	
-	function ADORecordset_ibase($id,$mode=false)
+	function ADORecordset_ibase($id, $mode = false)
 	{
 	global $ADODB_FETCH_MODE;
 	
@@ -720,7 +720,7 @@ 
 	function &FetchField($fieldOffset = -1)
 	{
 			 $fld = new ADOFieldObject;
-			 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
+			 $ibf = ibase_field_info($this->_queryID, $fieldOffset);
 			 switch (ADODB_ASSOC_CASE) {
 			 case 2: // the default
 			 	$fld->name = ($ibf['alias']);
@@ -752,7 +752,7 @@ 
 		$this->_numOfFields = @ibase_num_fields($this->_queryID);
 
 		// cache types for blob decode check
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+		for ($i = 0, $max = $this->_numOfFields; $i < $max; $i++) { 
 			$f1 = $this->FetchField($i); 
 			$this->_cacheType[] = $f1->type;
 		}				
@@ -777,8 +777,8 @@ 
 		//$ADODB_ANSI_PADDING_OFF=1;
 		$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
 		
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-			if ($this->_cacheType[$i]=="BLOB") {
+		for ($i = 0, $max = $this->_numOfFields; $i < $max; $i++) { 
+			if ($this->_cacheType[$i] == "BLOB") {
 				if (isset($f[$i])) { 
 					$f[$i] = $this->connection->_BlobDecode($f[$i]); 
 				} else { 
@@ -798,7 +798,7 @@ 
 		if ($this->fetchMode == ADODB_FETCH_ASSOC) {
 			$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
 		} else if ($this->fetchMode == ADODB_FETCH_BOTH) {
-			$this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
+			$this->fields = & array_merge($this->fields, $this->GetRowAssoc(ADODB_ASSOC_CASE));
 		}
 		return true;
 	}
@@ -806,10 +806,10 @@ 
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+		if ($this->fetchMode&ADODB_FETCH_ASSOC) return $this->fields[$colname];
 		if (!$this->bind) {
 			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
+			for ($i = 0; $i < $this->_numOfFields; $i++) {
 				$o = $this->FetchField($i);
 				$this->bind[strtoupper($o->name)] = $i;
 			}
@@ -825,7 +825,7 @@ 
 			return @ibase_free_result($this->_queryID);
 	}
 
-	function MetaType($t,$len=-1,$fieldobj=false)
+	function MetaType($t, $len = -1, $fieldobj = false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;

Braces +355 added lines, -138 removed lines

@@ -24,9 +24,13 @@ 
 */
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
-class ADODB_ibase extends ADOConnection {
+class ADODB_ibase extends ADOConnection
+{
 	var $databaseType = "ibase";
 	var $dataProvider = "ibase";
 	var $replaceQuote = "''"; // string to use to replace quotes
@@ -54,41 +58,64 @@ 
 	var $blobEncodeType = 'C';
 	var $role = false;
 	
-	function ADODB_ibase() 
+	function ADODB_ibase()
 	{
-		 if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT;
+		 if (defined('IBASE_DEFAULT'))
+		 {
+		 	$this->ibasetrans = IBASE_DEFAULT;
+		 }
   	}
 	
 	
 	   // returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false)
-	{  
-		if (!function_exists('ibase_pconnect')) return null;
-		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
+	{
+		if (!function_exists('ibase_pconnect'))
+		{
+			return null;
+		}
+		if ($argDatabasename)
+		{
+			$argHostname .= ':'.$argDatabasename;
+		}
 		$fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
 		if ($this->role)
-			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
+		{
+					$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
 					$this->charSet,$this->buffers,$this->dialect,$this->role);
-		else	
-			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
+		}
+		else {
+					$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
 					$this->charSet,$this->buffers,$this->dialect);
+		}
 		
-		if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
+		if ($this->dialect != 1)
+		{
+// http://www.ibphoenix.com/ibp_60_del_id_ds.html
 			$this->replaceQuote = "''";
 		}
-		if ($this->_connectionID === false) {
+		if ($this->_connectionID === false)
+		{
 			$this->_handleerror();
 			return false;
 		}
 		
 		// PHP5 change.
-		if (function_exists('ibase_timefmt')) {
+		if (function_exists('ibase_timefmt'))
+		{
 			ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
-			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
-			else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
+			if ($this->dialect == 1)
+			{
+				ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
+			}
+			else {
+				ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
+			}
 			ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
 			
-		} else {
+		}
+		else
+		{
 			ini_set("ibase.timestampformat", $this->ibase_timestampfmt);
 			ini_set("ibase.dateformat", $this->ibase_datefmt);
 			ini_set("ibase.timeformat", $this->ibase_timefmt);
@@ -103,8 +130,11 @@ 
 	
 	
 	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
-	{	
-		if ($internalKey) return array('RDB$DB_KEY');
+	{
+		if ($internalKey)
+		{
+			return array('RDB$DB_KEY');
+		}
 		
 		$table = strtoupper($table);
 		
@@ -114,14 +144,18 @@ 
 	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
 
 		$a = $this->GetCol($sql,false,true);
-		if ($a && sizeof($a)>0) return $a;
+		if ($a && sizeof($a)>0)
+		{
+			return $a;
+		}
 		return false;	  
 	}
 	
 	function ServerInfo()
 	{
 		$arr['dialect'] = $this->dialect;
-		switch($arr['dialect']) {
+		switch($arr['dialect'])
+		{
 		case '': 
 		case '1': $s = 'Interbase 5.5 or earlier'; break;
 		case '2': $s = 'Interbase 5.6'; break;
@@ -134,22 +168,35 @@ 
 	}
 
 	function BeginTrans()
-	{	 
-		if ($this->transOff) return true;
+	{
+		if ($this->transOff)
+		{
+			return true;
+		}
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 	 	$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
 		return $this->_transactionID;
 	}
 	
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
+	function CommitTrans($ok=true)
+	{
+		if (!$ok)
+		{
+			return $this->RollbackTrans();
+		}
+		if ($this->transOff)
+		{
+			return true;
+		}
+		if ($this->transCnt)
+		{
+			$this->transCnt -= 1;
+		}
 		$ret = false;
 		$this->autoCommit = true;
-		if ($this->_transactionID) {
+		if ($this->_transactionID)
+		{
 			   		//print ' commit ';
 			$ret = ibase_commit($this->_transactionID);
 		}
@@ -163,12 +210,15 @@ 
 	{
 	global $ADODB_COUNTRECS;
 	
-		if ($this->_logsql) {
+		if ($this->_logsql)
+		{
 			$savecrecs = $ADODB_COUNTRECS;
 			$ADODB_COUNTRECS = true; // force countrecs
 			$ret =& ADOConnection::_Execute($sql,$inputarr);
 			$ADODB_COUNTRECS = $savecrecs;
-		} else {
+		}
+		else
+		{
 			$ret =& ADOConnection::_Execute($sql,$inputarr);
 		}
 		return $ret;
@@ -176,12 +226,20 @@ 
 	
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
+		if ($this->transOff)
+		{
+			return true;
+		}
+		if ($this->transCnt)
+		{
+			$this->transCnt -= 1;
+		}
 		$ret = false;
 		$this->autoCommit = true;
-		if ($this->_transactionID) 
-				  $ret = ibase_rollback($this->_transactionID);
+		if ($this->_transactionID)
+		{
+						  $ret = ibase_rollback($this->_transactionID);
+		}
 		$this->_transactionID = false;   
 		
 		return $ret;
@@ -194,21 +252,27 @@ 
         $false = false;
         $save = $ADODB_FETCH_MODE;
         $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
+        if ($this->fetchMode !== FALSE)
+        {
                $savem = $this->SetFetchMode(FALSE);
         }
         $table = strtoupper($table);
         $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '".$table."'";
-        if (!$primary) {
+        if (!$primary)
+        {
         	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
-        } else {
+        }
+        else
+        {
         	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
         }
         // get index details
         $rs = $this->Execute($sql);
-        if (!is_object($rs)) {
+        if (!is_object($rs))
+        {
 	        // restore fetchmode
-	        if (isset($savem)) {
+	        if (isset($savem))
+	        {
 	            $this->SetFetchMode($savem);
 	        }
 	        $ADODB_FETCH_MODE = $save;
@@ -216,10 +280,14 @@ 
         }
         
         $indexes = array ();
-		while ($row = $rs->FetchRow()) {
+		while ($row = $rs->FetchRow())
+		{
 			$index = $row[0];
-             if (!isset($indexes[$index])) {
-             		if (is_null($row[3])) {$row[3] = 0;}
+             if (!isset($indexes[$index]))
+             {
+             		if (is_null($row[3]))
+             		{
+$row[3] = 0;}
                      $indexes[$index] = array(
                              'unique' => ($row[3] == 1),
                              'columns' => array()
@@ -227,12 +295,14 @@ 
              }
 			$sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE RDB\$INDEX_NAME = '".$name."' ORDER BY RDB\$FIELD_POSITION ASC";
 			$rs1 = $this->Execute($sql);
-            while ($row1 = $rs1->FetchRow()) {
+            while ($row1 = $rs1->FetchRow())
+            {
              	$indexes[$index]['columns'][$row1[2]] = $row1[1];
         	}
 		}
         // restore fetchmode
-        if (isset($savem)) {
+        if (isset($savem))
+        {
             $this->SetFetchMode($savem);
         }
         $ADODB_FETCH_MODE = $save;
@@ -244,7 +314,10 @@ 
 	// See http://community.borland.com/article/0,1410,25844,00.html
 	function RowLock($tables,$where,$col)
 	{
-		if ($this->autoCommit) $this->BeginTrans();
+		if ($this->autoCommit)
+		{
+			$this->BeginTrans();
+		}
 		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
 		return 1;
 	}
@@ -253,7 +326,10 @@ 
 	function CreateSequence($seqname,$startID=1)
 	{
 		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
-		if (!$ok) return false;
+		if (!$ok)
+		{
+			return false;
+		}
 		return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
 	}
 	
@@ -267,20 +343,30 @@ 
 	{
 		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
 		$rs = @$this->Execute($getnext);
-		if (!$rs) {
+		if (!$rs)
+		{
 			$this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
 			$this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
 			$rs = $this->Execute($getnext);
 		}
-		if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields);
-		else $this->genID = 0; // false
+		if ($rs && !$rs->EOF)
+		{
+			$this->genID = (integer) reset($rs->fields);
+		}
+		else {
+			$this->genID = 0;
+		}
+		// false
 		
-		if ($rs) $rs->Close();
+		if ($rs)
+		{
+			$rs->Close();
+		}
 		
 		return $this->genID;
 	}
 
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		   return false;
 	}
@@ -290,13 +376,18 @@ 
 		$this->_errorMsg = ibase_errmsg();
 	}
 
-	function ErrorNo() 
+	function ErrorNo()
 	{
-		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
-		else return 0;
+		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr))
+		{
+			return (integer) $arr[1];
+		}
+		else {
+			return 0;
+		}
 	}
 
-	function ErrorMsg() 
+	function ErrorMsg()
 	{
 			return $this->_errorMsg;
 	}
@@ -304,32 +395,49 @@ 
 	function Prepare($sql)
 	{
 		$stmt = ibase_prepare($this->_connectionID,$sql);
-		if (!$stmt) return false;
+		if (!$stmt)
+		{
+			return false;
+		}
 		return array($sql,$stmt);
 	}
 
 	   // returns query ID if successful, otherwise false
 	   // there have been reports of problems with nested queries - the code is probably not re-entrant?
 	function _query($sql,$iarr=false)
-	{ 
+	{
 
-		if (!$this->autoCommit && $this->_transactionID) {
+		if (!$this->autoCommit && $this->_transactionID)
+		{
 			$conn = $this->_transactionID;
 			$docommit = false;
-		} else {
+		}
+		else
+		{
 			$conn = $this->_connectionID;
 			$docommit = true;
 		}
-		if (is_array($sql)) {
+		if (is_array($sql))
+		{
 			$fn = 'ibase_execute';
 			$sql = $sql[1];
-			if (is_array($iarr)) {
-				if  (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-					if ( !isset($iarr[0]) ) $iarr[0] = ''; // PHP5 compat hack
+			if (is_array($iarr))
+			{
+				if  (ADODB_PHPVER >= 0x4050)
+				{
+// actually 4.0.4
+					if ( !isset($iarr[0]) )
+					{
+						$iarr[0] = '';
+					}
+					// PHP5 compat hack
 					$fnarr =& array_merge( array($sql) , $iarr);
 					$ret = call_user_func_array($fn,$fnarr);
-				} else {
-					switch(sizeof($iarr)) {
+				}
+				else
+				{
+					switch(sizeof($iarr))
+					{
 					case 1: $ret = $fn($sql,$iarr[0]); break;
 					case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
 					case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
@@ -341,17 +449,32 @@ 
 					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
-			} else $ret = $fn($sql); 
-		} else {
+			}
+			else {
+				$ret = $fn($sql);
+			}
+		}
+		else
+		{
 			$fn = 'ibase_query';
 		
-			if (is_array($iarr)) {	
-				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
-					if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack
+			if (is_array($iarr))
+			{
+				if (ADODB_PHPVER >= 0x4050)
+				{
+// actually 4.0.4
+					if (sizeof($iarr) == 0)
+					{
+						$iarr[0] = '';
+					}
+					// PHP5 compat hack
 					$fnarr =& array_merge( array($conn,$sql) , $iarr);
 					$ret = call_user_func_array($fn,$fnarr);
-				} else {
-					switch(sizeof($iarr)) {
+				}
+				else
+				{
+					switch(sizeof($iarr))
+					{
 					case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
 					case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
 					case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
@@ -363,9 +486,15 @@ 
 					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
-			} else $ret = $fn($conn,$sql); 
+			}
+			else {
+				$ret = $fn($conn,$sql);
+			}
+		}
+		if ($docommit && $ret === true)
+		{
+			ibase_commit($this->_connectionID);
 		}
-		if ($docommit && $ret === true) ibase_commit($this->_connectionID);
 
 		$this->_handleerror();
 		return $ret;
@@ -373,8 +502,11 @@ 
 
 	 // returns true or false
 	 function _close()
-	 {	   
-		if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
+	 {
+		if (!$this->autoCommit)
+		{
+			@ibase_rollback($this->_connectionID);
+		}
 		return @ibase_close($this->_connectionID);
 	 }
 	
@@ -384,11 +516,14 @@ 
 		$fscale = abs($fscale);
 		$fld->max_length = $flen;
 		$fld->scale = null;
-		switch($ftype){
+		switch($ftype)
+		{
 			case 7: 
 			case 8:
-				if ($dialect3) {
-				    switch($fsubtype){
+				if ($dialect3)
+				{
+				    switch($fsubtype)
+				    {
 				    	case 0: 
 				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
 				    		break;
@@ -403,19 +538,26 @@ 
 							$fld->scale = $fscale;
 				    		break;
 				    } // switch
-				} else {
-					if ($fscale !=0) {
+				}
+				else
+				{
+					if ($fscale !=0)
+					{
 					    $fld->type = 'decimal';
 						$fld->scale = $fscale;
 						$fld->max_length = ($ftype == 7 ? 4 : 9);
-					} else {
+					}
+					else
+					{
 						$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
 					}
 				}
 				break;
 			case 16: 
-				if ($dialect3) {
-				    switch($fsubtype){
+				if ($dialect3)
+				{
+				    switch($fsubtype)
+				    {
 				    	case 0: 
 				    		$fld->type = 'decimal';
 							$fld->max_length = 18;
@@ -441,18 +583,24 @@ 
 				$fld->type = 'char';
 				break;
 			case 27:
-				if ($fscale !=0) {
+				if ($fscale !=0)
+				{
 				    $fld->type = 'decimal';
 					$fld->max_length = 15;
 					$fld->scale = 5;
-				} else {
+				}
+				else
+				{
 					$fld->type = 'double';
 				}
 				break;
 			case 35:
-				if ($dialect3) {
+				if ($dialect3)
+				{
 				    $fld->type = 'timestamp';
-				} else {
+				}
+				else
+				{
 					$fld->type = 'date';
 				}
 				break;
@@ -487,7 +635,8 @@ 
 	
 		$ADODB_FETCH_MODE = $save;
 		$false = false;
-		if ($rs === false) {
+		if ($rs === false)
+		{
 			return $false;
 		}
 		
@@ -495,15 +644,19 @@ 
 		//OPN STUFF start
 		$dialect3 = ($this->dialect==3 ? true : false);
 		//OPN STUFF end
-		while (!$rs->EOF) { //print_r($rs->fields);
+		while (!$rs->EOF)
+		{
+//print_r($rs->fields);
 			$fld = new ADOFieldObject();
 			$fld->name = trim($rs->fields[0]);
 			//OPN STUFF start
 			$this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3);
-			if (isset($rs->fields[1]) && $rs->fields[1]) {
+			if (isset($rs->fields[1]) && $rs->fields[1])
+			{
 				$fld->not_null = true;
 			}				
-			if (isset($rs->fields[2])) {
+			if (isset($rs->fields[2]))
+			{
 				
 				$fld->has_default = true;
 				$d = substr($rs->fields[2],strlen('default '));
@@ -521,23 +674,36 @@ 
 				}
 		//	case 35:$tt = 'TIMESTAMP'; break;
 			}
-			if ((isset($rs->fields[5])) && ($fld->type == 'blob')) {
+			if ((isset($rs->fields[5])) && ($fld->type == 'blob'))
+			{
 				$fld->sub_type = $rs->fields[5];
-			} else {
+			}
+			else
+			{
 				$fld->sub_type = null;
 			}
 			//OPN STUFF end
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM)
+			{
+				$retarr[] = $fld;
+			}
+			else {
+				$retarr[strtoupper($fld->name)] = $fld;
+			}
 			
 			$rs->MoveNext();
 		}
 		$rs->Close();
-		if ( empty($retarr)) return $false;
-		else return $retarr;	
+		if ( empty($retarr))
+		{
+			return $false;
+		}
+		else {
+			return $retarr;
+		}
 	}
 	
-	function BlobEncode( $blob ) 
+	function BlobEncode( $blob )
 	{
 		$blobid = ibase_blob_create( $this->_connectionID);
 		ibase_blob_add( $blobid, $blob );
@@ -556,11 +722,12 @@ 
 	
 	// old blobdecode function
 	// still used to auto-decode all blob's
-	function _BlobDecode( $blob ) 
+	function _BlobDecode( $blob )
 	{
 		$blobid = ibase_blob_open( $blob );
 		$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet <kevinboillet@yahoo.fr>
-		while($string = ibase_blob_get($blobid, 8192)){ 
+		while($string = ibase_blob_get($blobid, 8192))
+		{
 			$realblob .= $string; 
 		}
 		ibase_blob_close( $blobid );
@@ -568,15 +735,19 @@ 
 		return( $realblob );
 	} 
 	
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
-	{ 
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+	{
 		$fd = fopen($path,'rb'); 
-		if ($fd === false) return false; 
+		if ($fd === false)
+		{
+			return false;
+		}
 		$blob_id = ibase_blob_create($this->_connectionID); 
 		
 		/* fill with data */ 
 		
-		while ($val = fread($fd,32768)){ 
+		while ($val = fread($fd,32768))
+		{
 			ibase_blob_add($blob_id, $val); 
 		} 
 		
@@ -596,8 +767,8 @@ 
 		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
 		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
 	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
-	{ 
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
 	$blob_id = ibase_blob_create($this->_connectionID); 
 	
 	// ibase_blob_add($blob_id, $val); 
@@ -610,13 +781,15 @@ 
 	$tail_size = $len % $chunk_size; 
 	$n_chunks = ($len - $tail_size) / $chunk_size; 
 	
-	for ($n = 0; $n < $n_chunks; $n++) { 
+	for ($n = 0; $n < $n_chunks; $n++)
+	{
 		$start = $n * $chunk_size; 
 		$data = substr($val, $start, $chunk_size); 
 		ibase_blob_add($blob_id, $data); 
 	} 
 	
-	if ($tail_size) {
+	if ($tail_size)
+	{
 		$start = $n_chunks * $chunk_size; 
 		$data = substr($val, $start, $tail_size); 
 		ibase_blob_add($blob_id, $data); 
@@ -642,15 +815,23 @@ 
 	// Only since Interbase 6.0 - uses EXTRACT
 	// problem - does not zero-fill the day and month yet
 	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysDate;
+	{
+		if (!$col)
+		{
+			$col = $this->sysDate;
+		}
 		$s = '';
 		
 		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '||';
+		for ($i=0; $i < $len; $i++)
+		{
+			if ($s)
+			{
+				$s .= '||';
+			}
 			$ch = $fmt[$i];
-			switch($ch) {
+			switch($ch)
+			{
 			case 'Y':
 			case 'y':
 				$s .= "extract(year from $col)";
@@ -681,7 +862,8 @@ 
 			  break;        
 
 			default:
-				if ($ch == '\\') {
+				if ($ch == '\\')
+				{
 					$i++;
 					$ch = substr($fmt,$i,1);
 				}
@@ -721,18 +903,28 @@ 
 	{
 			 $fld = new ADOFieldObject;
 			 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
-			 switch (ADODB_ASSOC_CASE) {
+			 switch (ADODB_ASSOC_CASE)
+			 {
 			 case 2: // the default
 			 	$fld->name = ($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = ($ibf['name']);
+				 if (empty($fld->name))
+				 {
+				 	$fld->name = ($ibf['name']);
+				 }
 				 break;
 			 case 0: 
 				 $fld->name = strtoupper($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
+				 if (empty($fld->name))
+				 {
+				 	$fld->name = strtoupper($ibf['name']);
+				 }
 				 break;
 			 case 1: 
 			 	$fld->name = strtolower($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
+				 if (empty($fld->name))
+				 {
+				 	$fld->name = strtolower($ibf['name']);
+				 }
 				 break;
 			 }
 			 
@@ -752,7 +944,8 @@ 
 		$this->_numOfFields = @ibase_num_fields($this->_queryID);
 
 		// cache types for blob decode check
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++)
+		{
 			$f1 = $this->FetchField($i); 
 			$this->_cacheType[] = $f1->type;
 		}				
@@ -763,10 +956,11 @@ 
 		return false;
 	}
 	
-	function _fetch() 
+	function _fetch()
 	{
 		$f = @ibase_fetch_row($this->_queryID); 
-		if ($f === false) {
+		if ($f === false)
+		{
 			$this->fields = false;
 			return false;
 		}
@@ -777,17 +971,27 @@ 
 		//$ADODB_ANSI_PADDING_OFF=1;
 		$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
 		
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
-			if ($this->_cacheType[$i]=="BLOB") {
-				if (isset($f[$i])) { 
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++)
+		{
+			if ($this->_cacheType[$i]=="BLOB")
+			{
+				if (isset($f[$i]))
+				{
 					$f[$i] = $this->connection->_BlobDecode($f[$i]); 
-				} else { 
+				}
+				else
+				{
 					$f[$i] = null; 
 				} 
-			} else { 
-				if (!isset($f[$i])) { 
+			}
+			else
+			{
+				if (!isset($f[$i]))
+				{
 					$f[$i] = null; 
-				} else if ($rtrim && is_string($f[$i])) {
+				}
+				else if ($rtrim && is_string($f[$i]))
+				{
 					$f[$i] = rtrim($f[$i]);
 				}
 			} 
@@ -795,9 +999,12 @@ 
 		// OPN stuff end 
 		
 		$this->fields = $f;
-		if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+		if ($this->fetchMode == ADODB_FETCH_ASSOC)
+		{
 			$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
-		} else if ($this->fetchMode == ADODB_FETCH_BOTH) {
+		}
+		else if ($this->fetchMode == ADODB_FETCH_BOTH)
+		{
 			$this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
 		}
 		return true;
@@ -806,10 +1013,15 @@ 
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
-		if (!$this->bind) {
+		if ($this->fetchMode & ADODB_FETCH_ASSOC)
+		{
+			return $this->fields[$colname];
+		}
+		if (!$this->bind)
+		{
 			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
+			for ($i=0; $i < $this->_numOfFields; $i++)
+			{
 				$o = $this->FetchField($i);
 				$this->bind[strtoupper($o->name)] = $i;
 			}
@@ -820,26 +1032,31 @@ 
 	}
 	
 
-	function _close() 
+	function _close()
 	{
 			return @ibase_free_result($this->_queryID);
 	}
 
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
-		if (is_object($t)) {
+		if (is_object($t))
+		{
 			$fieldobj = $t;
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		switch (strtoupper($t)) {
+		switch (strtoupper($t))
+		{
 		case 'CHAR':
 			return 'C';
 			
 		case 'TEXT':
 		case 'VARCHAR':
 		case 'VARYING':
-		if ($len <= $this->blobSize) return 'C';
+		if ($len <= $this->blobSize)
+		{
+			return 'C';
+		}
 			return 'X';
 		case 'BLOB':
 			return 'B';

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -245,7 +245,7 @@ 
 	function RowLock($tables,$where,$col)
 	{
 		if ($this->autoCommit) $this->BeginTrans();
-		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
+		$this->Execute("update $table SET $col=$col WHERE $where "); // is this correct - jlim?
 		return 1;
 	}
 	
@@ -584,7 +584,7 @@ 
 		$blob_id_str = ibase_blob_close($blob_id); 
 		
 		fclose($fd); 
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
+		return $this->Execute("update $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
 	} 
 	
 	/*
@@ -625,7 +625,7 @@ 
 	
 	$blob_id_str = ibase_blob_close($blob_id); 
 	
-	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
+	return $this->Execute("update $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
 	
 	} 
 	
@@ -635,7 +635,7 @@ 
 		$blob_id = ibase_blob_create($this->_connectionID);
 		ibase_blob_add($blob_id, $val);
 		$blob_id_str = ibase_blob_close($blob_id);
-		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
+		return $this->Execute("update $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
 	}
 	
 	// Format date column in sql string given an input format that understands Y M D

phpgwapi/inc/adodb/drivers/adodb-mssql.inc.php

Doc Comments +8 added lines

@@ -524,6 +524,9 @@ 
 		return array($sql,$this->qstr($sql2),$max);
 	}
 	
+	/**
+	 * @param string $sql
+	 */
 	function PrepareSP($sql)
 	{
 		if (!$this->_has_mssql_init) {
@@ -577,6 +580,11 @@ 
 		
 		See mssql_bind documentation at php.net.
 	*/
+
+	/**
+	 * @param integer $var
+	 * @param string $name
+	 */
 	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
 	{
 		if (!$this->_has_mssql_init) {

Indentation +36 added lines, -36 removed lines

@@ -327,29 +327,29 @@ 
 
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-        	$savem = $this->SetFetchMode(FALSE);
-        }
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			$savem = $this->SetFetchMode(FALSE);
+		}
         
-        $rs = $this->Execute($sql);
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
+		$rs = $this->Execute($sql);
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
 
-        if (!is_object($rs)) {
-        	return FALSE;
-        }
+		if (!is_object($rs)) {
+			return FALSE;
+		}
 
 		$indexes = array();
 		while ($row = $rs->FetchRow()) {
 			if (!$primary && $row[5]) continue;
 			
-            $indexes[$row[0]]['unique'] = $row[6];
-            $indexes[$row[0]]['columns'][] = $row[1];
-    	}
-        return $indexes;
+			$indexes[$row[0]]['unique'] = $row[6];
+			$indexes[$row[0]]['columns'][] = $row[1];
+		}
+		return $indexes;
 	}
 	
 	function MetaForeignKeys($table, $owner=false, $upper=false)
@@ -536,28 +536,28 @@ 
 	}
 	
 	// returns concatenated string
-    // MSSQL requires integers to be cast as strings
-    // automatically cast every datatype to VARCHAR(255)
-    // @author David Rogers (introspectshun)
-    function Concat()
-    {
-            $s = "";
-            $arr = func_get_args();
-
-            // Split single record on commas, if possible
-            if (sizeof($arr) == 1) {
-                foreach ($arr as $arg) {
-                    $args = explode(',', $arg);
-                }
-                $arr = $args;
-            }
-
-            array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
-            $s = implode('+',$arr);
-            if (sizeof($arr) > 0) return "$s";
+	// MSSQL requires integers to be cast as strings
+	// automatically cast every datatype to VARCHAR(255)
+	// @author David Rogers (introspectshun)
+	function Concat()
+	{
+			$s = "";
+			$arr = func_get_args();
+
+			// Split single record on commas, if possible
+			if (sizeof($arr) == 1) {
+				foreach ($arr as $arg) {
+					$args = explode(',', $arg);
+				}
+				$arr = $args;
+			}
+
+			array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
+			$s = implode('+',$arr);
+			if (sizeof($arr) > 0) return "$s";
             
 			return '';
-    }
+	}
 	
 	/* 
 	Usage:

Switch Indentation +54 added lines, -54 removed lines

@@ -219,50 +219,50 @@ 
 			if ($s) $s .= '+';
 			$ch = $fmt[$i];
 			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "datename(yyyy,$col)";
-				break;
-			case 'M':
-				$s .= "convert(char(3),$col,0)";
-				break;
-			case 'm':
-				$s .= "replace(str(month($col),2),' ','0')";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "datename(quarter,$col)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "replace(str(day($col),2),' ','0')";
-				break;
-			case 'h':
-				$s .= "substring(convert(char(14),$col,0),13,2)";
-				break;
+				case 'Y':
+				case 'y':
+					$s .= "datename(yyyy,$col)";
+					break;
+				case 'M':
+					$s .= "convert(char(3),$col,0)";
+					break;
+				case 'm':
+					$s .= "replace(str(month($col),2),' ','0')";
+					break;
+				case 'Q':
+				case 'q':
+					$s .= "datename(quarter,$col)";
+					break;
+				case 'D':
+				case 'd':
+					$s .= "replace(str(day($col),2),' ','0')";
+					break;
+				case 'h':
+					$s .= "substring(convert(char(14),$col,0),13,2)";
+					break;
 			
-			case 'H':
-				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
-				break;
+				case 'H':
+					$s .= "replace(str(datepart(hh,$col),2),' ','0')";
+					break;
 				
-			case 'i':
-				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
-				break;
-			case 's':
-				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
-				break;
-			case 'a':
-			case 'A':
-				$s .= "substring(convert(char(19),$col,0),18,2)";
-				break;
+				case 'i':
+					$s .= "replace(str(datepart(mi,$col),2),' ','0')";
+					break;
+				case 's':
+					$s .= "replace(str(datepart(ss,$col),2),' ','0')";
+					break;
+				case 'a':
+				case 'A':
+					$s .= "substring(convert(char(19),$col,0),18,2)";
+					break;
 				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
+				default:
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt,$i,1);
+					}
+					$s .= $this->qstr($ch);
+					break;
 			}
 		}
 		return $s;
@@ -588,11 +588,11 @@ 
 			
 		if ($type === false) 
 			switch(gettype($var)) {
-			default:
-			case 'string': $type = SQLCHAR; break;
-			case 'double': $type = SQLFLT8; break;
-			case 'integer': $type = SQLINT4; break;
-			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
+				default:
+				case 'string': $type = SQLCHAR; break;
+				case 'double': $type = SQLFLT8; break;
+				case 'integer': $type = SQLINT4; break;
+				case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
 			}
 		
 		if  ($this->debug) {
@@ -978,14 +978,14 @@ 
 		if ($themth <= 0) return false;
 		
 		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
+			case 'P':
+				if ($rr[4]<12) $rr[4] += 12;
+				break;
+			case 'A':
+				if ($rr[4]==12) $rr[4] = 0;
+				break;
+			default:
+				break;
 		}
 		// h-m-s-MM-DD-YY
 		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);

Spacing +96 added lines, -96 removed lines

@@ -39,15 +39,15 @@ 
 // has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
 if (ADODB_PHPVER >= 0x4300) {
 // docs say 4.2.0, but testing shows only since 4.3.0 does it work!
-	ini_set('mssql.datetimeconvert',0); 
+	ini_set('mssql.datetimeconvert', 0); 
 } else {
-global $ADODB_mssql_mths;		// array, months must be upper-case
+global $ADODB_mssql_mths; // array, months must be upper-case
 
 
 	$ADODB_mssql_date_order = 'mdy'; 
 	$ADODB_mssql_mths = array(
-		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
-		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+		'JAN'=>1, 'FEB'=>2, 'MAR'=>3, 'APR'=>4, 'MAY'=>5, 'JUN'=>6,
+		'JUL'=>7, 'AUG'=>8, 'SEP'=>9, 'OCT'=>10, 'NOV'=>11, 'DEC'=>12);
 }
 
 //---------------------------------------------------------------------------
@@ -59,7 +59,7 @@ 
 global $ADODB_mssql_date_order;
 	$adate = $conn->GetOne('select getdate()');
 	if ($adate) {
-		$anum = (int) $adate;
+		$anum = (int)$adate;
 		if ($anum > 0) {
 			if ($anum > 31) {
 				//ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
@@ -81,13 +81,13 @@ 
 	var $length = 'len';
 	var $hasAffectedRows = true;
 	var $metaDatabasesSQL = "select name from sysdatabases where name <> 'master'";
-	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
+	var $metaTablesSQL = "select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
 	var $metaColumnsSQL = # xtype==61 is datetime
 "select c.name,t.name,c.length,
 	(case when c.xusertype=61 then 0 else c.xprec end),
 	(case when c.xusertype=61 then 0 else c.xscale end) 
 	from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
-	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
+	var $hasTop = 'top'; // support mssql SELECT TOP 10 * FROM TABLE
 	var $hasGenID = true;
 	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
 	var $sysTimeStamp = 'GetDate()';
@@ -105,7 +105,7 @@ 
 	
 	function ADODB_mssql() 
 	{		
-		$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
+		$this->_has_mssql_init = (strnatcmp(PHP_VERSION, '4.1.0') >= 0);
 	}
 
 	function ServerInfo()
@@ -121,7 +121,7 @@ 
 			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
 		
 		
-		$this->Parameter($stmt,$val,'attribute_id');
+		$this->Parameter($stmt, $val, 'attribute_id');
 		$row = $this->GetRow($stmt);
 		
 		//$row = $this->GetRow("execute sp_server_info 2");
@@ -136,7 +136,7 @@ 
 		return $arr;
 	}
 	
-	function IfNull( $field, $ifNull ) 
+	function IfNull($field, $ifNull) 
 	{
 		return " ISNULL($field, $ifNull) "; // if MS SQL Server
 	}
@@ -158,7 +158,7 @@ 
 
 	var $_dropSeqSQL = "drop table %s";
 	
-	function CreateSequence($seq='adodbseq',$start=1)
+	function CreateSequence($seq = 'adodbseq', $start = 1)
 	{
 		$start -= 1;
 		$this->Execute("create table $seq (id float(53))");
@@ -171,7 +171,7 @@ 
 		return true;
 	}
 
-	function GenID($seq='adodbseq',$start=1)
+	function GenID($seq = 'adodbseq', $start = 1)
 	{
 		//$this->debug=1;
 		$this->Execute('BEGIN TRANSACTION adodbseq');
@@ -195,30 +195,30 @@ 
 	}
 	
 
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	function &SelectLimit($sql, $nrows = -1, $offset = -1, $inputarr = false, $secs2cache = 0)
 	{
 		if ($nrows > 0 && $offset <= 0) {
 			$sql = preg_replace(
-				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
-			$rs =& $this->Execute($sql,$inputarr);
+				'/(^\s*select\s+(distinctrow|distinct)?)/i', '\\1 '.$this->hasTop." $nrows ", $sql);
+			$rs = & $this->Execute($sql, $inputarr);
 		} else
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			$rs = & ADOConnection::SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
 	
 		return $rs;
 	}
 	
 	
 	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
+	function SQLDate($fmt, $col = false)
 	{	
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = '';
 		
 		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			if ($s) $s .= '+';
 			$ch = $fmt[$i];
-			switch($ch) {
+			switch ($ch) {
 			case 'Y':
 			case 'y':
 				$s .= "datename(yyyy,$col)";
@@ -259,7 +259,7 @@ 
 			default:
 				if ($ch == '\\') {
 					$i++;
-					$ch = substr($fmt,$i,1);
+					$ch = substr($fmt, $i, 1);
 				}
 				$s .= $this->qstr($ch);
 				break;
@@ -277,7 +277,7 @@ 
 	   	return true;
 	}
 		
-	function CommitTrans($ok=true) 
+	function CommitTrans($ok = true) 
 	{ 
 		if ($this->transOff) return true; 
 		if (!$ok) return $this->RollbackTrans();
@@ -305,14 +305,14 @@ 
 		
 		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
 	*/
-	function RowLock($tables,$where,$flds='top 1 null as ignore') 
+	function RowLock($tables, $where, $flds = 'top 1 null as ignore') 
 	{
 		if (!$this->transCnt) $this->BeginTrans();
 		return $this->GetOne("select $flds from $tables with (ROWLOCK,HOLDLOCK) where $where");
 	}
 	
 	
-	function &MetaIndexes($table,$primary=false)
+	function &MetaIndexes($table, $primary = false)
 	{
 		$table = $this->qstr($table);
 
@@ -352,7 +352,7 @@ 
         return $indexes;
 	}
 	
-	function MetaForeignKeys($table, $owner=false, $upper=false)
+	function MetaForeignKeys($table, $owner = false, $upper = false)
 	{
 	global $ADODB_FETCH_MODE;
 	
@@ -369,12 +369,12 @@ 
 where upper(object_name(fkeyid)) = $table
 order by constraint_name, referenced_table_name, keyno";
 		
-		$constraints =& $this->GetArray($sql);
+		$constraints = & $this->GetArray($sql);
 		
 		$ADODB_FETCH_MODE = $save;
 		
 		$arr = false;
-		foreach($constraints as $constr) {
+		foreach ($constraints as $constr) {
 			//print_r($constr);
 			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
 		}
@@ -382,8 +382,8 @@ 
 		
 		$arr2 = false;
 		
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
+		foreach ($arr as $k => $v) {
+			foreach ($v as $a => $b) {
 				if ($upper) $a = strtoupper($a);
 				$arr2[$a] = $b;
 			}
@@ -394,14 +394,14 @@ 
 	//From: Fernando Moreira <FMoreira@imediata.pt>
 	function MetaDatabases() 
 	{ 
-		if(@mssql_select_db("master")) { 
-				 $qry=$this->metaDatabasesSQL; 
-				 if($rs=@mssql_query($qry)){ 
-						 $tmpAr=$ar=array(); 
-						 while($tmpAr=@mssql_fetch_row($rs)) 
-								 $ar[]=$tmpAr[0]; 
+		if (@mssql_select_db("master")) { 
+				 $qry = $this->metaDatabasesSQL; 
+				 if ($rs = @mssql_query($qry)) { 
+						 $tmpAr = $ar = array(); 
+						 while ($tmpAr = @mssql_fetch_row($rs)) 
+								 $ar[] = $tmpAr[0]; 
 						@mssql_select_db($this->databaseName); 
-						 if(sizeof($ar)) 
+						 if (sizeof($ar)) 
 								 return($ar); 
 						 else 
 								 return(false); 
@@ -420,7 +420,7 @@ 
 	global $ADODB_FETCH_MODE;
 	
 		$schema = '';
-		$this->_findschema($table,$schema);
+		$this->_findschema($table, $schema);
 		if (!$schema) $schema = $this->database;
 		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
 
@@ -434,20 +434,20 @@ 
 		$a = $this->GetCol($sql);
 		$ADODB_FETCH_MODE = $savem;
 		
-		if ($a && sizeof($a)>0) return $a;
+		if ($a && sizeof($a) > 0) return $a;
 		$false = false;
 		return $false;	  
 	}
 
 	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	function &MetaTables($ttype = false, $showSchema = false, $mask = false) 
 	{
 		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(($mask));
 			$this->metaTablesSQL .= " AND name like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+		$ret = & ADOConnection::MetaTables($ttype, $showSchema);
 		
 		if ($mask) {
 			$this->metaTablesSQL = $save;
@@ -466,7 +466,7 @@ 
 	
 	function ErrorMsg() 
 	{
-		if (empty($this->_errorMsg)){
+		if (empty($this->_errorMsg)) {
 			$this->_errorMsg = mssql_get_last_message();
 		}
 		return $this->_errorMsg;
@@ -478,7 +478,7 @@ 
 		if (empty($this->_errorMsg)) {
 			$this->_errorMsg = mssql_get_last_message();
 		}
-		$id = @mssql_query("select @@ERROR",$this->_connectionID);
+		$id = @mssql_query("select @@ERROR", $this->_connectionID);
 		if (!$id) return false;
 		$arr = mssql_fetch_array($id);
 		@mssql_free_result($id);
@@ -490,7 +490,7 @@ 
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('mssql_pconnect')) return null;
-		$this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword);
+		$this->_connectionID = mssql_connect($argHostname, $argUsername, $argPassword);
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
 		return true;	
@@ -501,7 +501,7 @@ 
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!function_exists('mssql_pconnect')) return null;
-		$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
+		$this->_connectionID = mssql_pconnect($argHostname, $argUsername, $argPassword);
 		if ($this->_connectionID === false) return false;
 		
 		// persistent connections can forget to rollback on crash, so we do it here.
@@ -515,24 +515,24 @@ 
 	
 	function Prepare($sql)
 	{
-		$sqlarr = explode('?',$sql);
+		$sqlarr = explode('?', $sql);
 		if (sizeof($sqlarr) <= 1) return $sql;
 		$sql2 = $sqlarr[0];
 		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
-			$sql2 .=  '@P'.($i-1) . $sqlarr[$i];
+			$sql2 .= '@P'.($i - 1).$sqlarr[$i];
 		} 
-		return array($sql,$this->qstr($sql2),$max);
+		return array($sql, $this->qstr($sql2), $max);
 	}
 	
 	function PrepareSP($sql)
 	{
 		if (!$this->_has_mssql_init) {
-			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
+			ADOConnection::outp("PrepareSP: mssql_init only available since PHP 4.1.0");
 			return $sql;
 		}
-		$stmt = mssql_init($sql,$this->_connectionID);
+		$stmt = mssql_init($sql, $this->_connectionID);
 		if (!$stmt)  return $sql;
-		return array($sql,$stmt);
+		return array($sql, $stmt);
 	}
 	
 	// returns concatenated string
@@ -553,7 +553,7 @@ 
             }
 
             array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
-            $s = implode('+',$arr);
+            $s = implode('+', $arr);
             if (sizeof($arr) > 0) return "$s";
             
 			return '';
@@ -577,17 +577,17 @@ 
 		
 		See mssql_bind documentation at php.net.
 	*/
-	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
+	function Parameter(&$stmt, &$var, $name, $isOutput = false, $maxLen = 4000, $type = false)
 	{
 		if (!$this->_has_mssql_init) {
-			ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0");
+			ADOConnection::outp("Parameter: mssql_bind only available since PHP 4.1.0");
 			return $sql;
 		}
 
 		$isNull = is_null($var); // php 4.0.4 and above...
 			
 		if ($type === false) 
-			switch(gettype($var)) {
+			switch (gettype($var)) {
 			default:
 			case 'string': $type = SQLCHAR; break;
 			case 'double': $type = SQLFLT8; break;
@@ -595,10 +595,10 @@ 
 			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
 			}
 		
-		if  ($this->debug) {
+		if ($this->debug) {
 			$prefix = ($isOutput) ? 'Out' : 'In';
 			$ztype = (empty($type)) ? 'false' : $type;
-			ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
+			ADOConnection::outp("{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
 		}
 		/*
 			See http://phplens.com/lens/lensforum/msgs.php?id=7231
@@ -625,11 +625,11 @@ 
 		; Valid range 0 - 2147483647. Default = 4096. 
 		mssql.textsize = 0 ; zero to pass through 
 	*/
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
 	{
 	
 		if (strtoupper($blobtype) == 'CLOB') {
-			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
+			$sql = "UPDATE $table SET $column='".$val."' WHERE $where";
 			return $this->Execute($sql) != false;
 		}
 		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
@@ -637,7 +637,7 @@ 
 	}
 	
 	// returns query ID if successful, otherwise false
-	function _query($sql,$inputarr)
+	function _query($sql, $inputarr)
 	{
 		$this->_errorMsg = false;
 		if (is_array($inputarr)) {
@@ -649,7 +649,7 @@ 
 			$params = '';
 			$decl = '';
 			$i = 0;
-			foreach($inputarr as $v) {
+			foreach ($inputarr as $v) {
 				if ($decl) {
 					$decl .= ', ';
 					$params .= ', ';
@@ -658,14 +658,14 @@ 
 					$len = strlen($v);
 					if ($len == 0) $len = 1;
 					
-					if ($len > 4000 ) {
+					if ($len > 4000) {
 						// NVARCHAR is max 4000 chars. Let's use NTEXT
 						$decl .= "@P$i NTEXT";
 					} else {
 						$decl .= "@P$i NVARCHAR($len)";
 					}
 
-					$params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
+					$params .= "@P$i=N".(strncmp($v, "'", 1) == 0 ? $v : $this->qstr($v));
 				} else if (is_integer($v)) {
 					$decl .= "@P$i INT";
 					$params .= "@P$i=".$v;
@@ -674,7 +674,7 @@ 
 					$params .= "@P$i=".$v;
 				} else if (is_bool($v)) {
 					$decl .= "@P$i INT"; # Used INT just in case BIT in not supported on the user's MSSQL version. It will cast appropriately.
-					$params .= "@P$i=".(($v)?'1':'0'); # True == 1 in MSSQL BIT fields and acceptable for storing logical true in an int field
+					$params .= "@P$i=".(($v) ? '1' : '0'); # True == 1 in MSSQL BIT fields and acceptable for storing logical true in an int field
 				} else {
 					$decl .= "@P$i CHAR"; # Used char because a type is required even when the value is to be NULL.
 					$params .= "@P$i=NULL";
@@ -690,7 +690,7 @@ 
 			$rez = mssql_execute($sql[1]);
 			
 		} else {
-			$rez = mssql_query($sql,$this->_connectionID);
+			$rez = mssql_query($sql, $this->_connectionID);
 		}
 		return $rez;
 	}
@@ -727,7 +727,7 @@ 
 	var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083
 	// _mths works only in non-localised system
 	
-	function ADORecordset_mssql($id,$mode=false)
+	function ADORecordset_mssql($id, $mode = false)
 	{
 		// freedts check...
 		$this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
@@ -737,14 +737,14 @@ 
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->fetchMode = $mode;
-		return $this->ADORecordSet($id,$mode);
+		return $this->ADORecordSet($id, $mode);
 	}
 	
 	
 	function _initrs()
 	{
 	GLOBAL $ADODB_COUNTRECS;	
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
+		$this->_numOfRows = ($ADODB_COUNTRECS) ? @mssql_num_rows($this->_queryID) : -1;
 		$this->_numOfFields = @mssql_num_fields($this->_queryID);
 	}
 	
@@ -767,7 +767,7 @@ 
 		if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
 		if (!$this->bind) {
 			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
+			for ($i = 0; $i < $this->_numOfFields; $i++) {
 				$o = $this->FetchField($i);
 				$this->bind[strtoupper($o->name)] = $i;
 			}
@@ -806,8 +806,8 @@ 
 		
 		$this->_currentRow++;
 		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
+		if ($this->fetchMode&ADODB_FETCH_ASSOC) {
+			if ($this->fetchMode&ADODB_FETCH_NUM) {
 				//ADODB_FETCH_BOTH mode
 				$this->fields = @mssql_fetch_array($this->_queryID);
 			}
@@ -818,7 +818,7 @@ 
 					$flds = @mssql_fetch_array($this->_queryID);
 					if (is_array($flds)) {
 						$fassoc = array();
-						foreach($flds as $k => $v) {
+						foreach ($flds as $k => $v) {
 							if (is_numeric($k)) continue;
 							$fassoc[$k] = $v;
 						}
@@ -830,11 +830,11 @@ 
 			
 			if (is_array($this->fields)) {
 				if (ADODB_ASSOC_CASE == 0) {
-					foreach($this->fields as $k=>$v) {
+					foreach ($this->fields as $k=>$v) {
 						$this->fields[strtolower($k)] = $v;
 					}
 				} else if (ADODB_ASSOC_CASE == 1) {
-					foreach($this->fields as $k=>$v) {
+					foreach ($this->fields as $k=>$v) {
 						$this->fields[strtoupper($k)] = $v;
 					}
 				}
@@ -851,10 +851,10 @@ 
 	
 	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
 	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields = false) 
 	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
+		if ($this->fetchMode&ADODB_FETCH_ASSOC) {
+			if ($this->fetchMode&ADODB_FETCH_NUM) {
 				//ADODB_FETCH_BOTH mode
 				$this->fields = @mssql_fetch_array($this->_queryID);
 			} else {
@@ -864,7 +864,7 @@ 
 					$this->fields = @mssql_fetch_array($this->_queryID);
 					if (@is_array($$this->fields)) {
 						$fassoc = array();
-						foreach($$this->fields as $k => $v) {
+						foreach ($$this->fields as $k => $v) {
 							if (is_integer($k)) continue;
 							$fassoc[$k] = $v;
 						}
@@ -875,11 +875,11 @@ 
 			
 			if (!$this->fields) {
 			} else if (ADODB_ASSOC_CASE == 0) {
-				foreach($this->fields as $k=>$v) {
+				foreach ($this->fields as $k=>$v) {
 					$this->fields[strtolower($k)] = $v;
 				}
 			} else if (ADODB_ASSOC_CASE == 1) {
-				foreach($this->fields as $k=>$v) {
+				foreach ($this->fields as $k=>$v) {
 					$this->fields[strtoupper($k)] = $v;
 				}
 			}
@@ -913,65 +913,65 @@ 
 
 
 class ADORecordSet_array_mssql extends ADORecordSet_array {
-	function ADORecordSet_array_mssql($id=-1,$mode=false) 
+	function ADORecordSet_array_mssql($id = -1, $mode = false) 
 	{
-		$this->ADORecordSet_array($id,$mode);
+		$this->ADORecordSet_array($id, $mode);
 	}
 	
 		// mssql uses a default date like Dec 30 2000 12:00AM
 	function UnixDate($v)
 	{
 	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
+		if (is_numeric(substr($v, 0, 1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
 		
-	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+	global $ADODB_mssql_mths, $ADODB_mssql_date_order;
 	
 		//Dec 30 2000 12:00AM 
 		if ($ADODB_mssql_date_order == 'dmy') {
-			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+			if (!preg_match("|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|", $v, $rr)) {
 				return parent::UnixDate($v);
 			}
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
 			
 			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
+			$themth = substr(strtoupper($rr[2]), 0, 3);
 		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+			if (!preg_match("|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|", $v, $rr)) {
 				return parent::UnixDate($v);
 			}
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
 			
 			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
+			$themth = substr(strtoupper($rr[1]), 0, 3);
 		}
 		$themth = $ADODB_mssql_mths[$themth];
 		if ($themth <= 0) return false;
 		// h-m-s-MM-DD-YY
-		return  mktime(0,0,0,$themth,$theday,$rr[3]);
+		return  mktime(0, 0, 0, $themth, $theday, $rr[3]);
 	}
 	
 	function UnixTimeStamp($v)
 	{
 	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
+		if (is_numeric(substr($v, 0, 1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
 		
-	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+	global $ADODB_mssql_mths, $ADODB_mssql_date_order;
 	
 		//Dec 30 2000 12:00AM
 		 if ($ADODB_mssql_date_order == 'dmy') {
-			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+			 if (!preg_match("|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
 		
 			$theday = $rr[1];
-			$themth =  substr(strtoupper($rr[2]),0,3);
+			$themth = substr(strtoupper($rr[2]), 0, 3);
 		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+			if (!preg_match("|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
 			,$v, $rr)) return parent::UnixTimeStamp($v);
 			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
 		
 			$theday = $rr[2];
-			$themth = substr(strtoupper($rr[1]),0,3);
+			$themth = substr(strtoupper($rr[1]), 0, 3);
 		}
 		
 		$themth = $ADODB_mssql_mths[$themth];
@@ -979,16 +979,16 @@ 
 		
 		switch (strtoupper($rr[6])) {
 		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
+			if ($rr[4] < 12) $rr[4] += 12;
 			break;
 		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
+			if ($rr[4] == 12) $rr[4] = 0;
 			break;
 		default:
 			break;
 		}
 		// h-m-s-MM-DD-YY
-		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
+		return  mktime($rr[4], $rr[5], 0, $themth, $theday, $rr[3]);
 	}
 }
 

Braces +479 added lines, -184 removed lines

@@ -15,7 +15,10 @@ 
 */
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
 //----------------------------------------------------------------
 // MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
@@ -37,10 +40,13 @@ 
 
 
 // has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
-if (ADODB_PHPVER >= 0x4300) {
+if (ADODB_PHPVER >= 0x4300)
+{
 // docs say 4.2.0, but testing shows only since 4.3.0 does it work!
 	ini_set('mssql.datetimeconvert',0); 
-} else {
+}
+else
+{
 global $ADODB_mssql_mths;		// array, months must be upper-case
 
 
@@ -58,19 +64,27 @@ 
 {
 global $ADODB_mssql_date_order;
 	$adate = $conn->GetOne('select getdate()');
-	if ($adate) {
+	if ($adate)
+	{
 		$anum = (int) $adate;
-		if ($anum > 0) {
-			if ($anum > 31) {
+		if ($anum > 0)
+		{
+			if ($anum > 31)
+			{
 				//ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
-			} else
-				$ADODB_mssql_date_order = 'dmy';
-		} else
-			$ADODB_mssql_date_order = 'mdy';
+			}
+			else {
+							$ADODB_mssql_date_order = 'dmy';
+			}
+		}
+		else {
+					$ADODB_mssql_date_order = 'mdy';
+		}
 	}
 }
 
-class ADODB_mssql extends ADOConnection {
+class ADODB_mssql extends ADOConnection
+{
 	var $databaseType = "mssql";	
 	var $dataProvider = "mssql";
 	var $replaceQuote = "''"; // string to use to replace quotes
@@ -103,8 +117,8 @@ 
 	var $uniqueOrderBy = true;
 	var $_bindInputArray = true;
 	
-	function ADODB_mssql() 
-	{		
+	function ADODB_mssql()
+	{
 		$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
 	}
 
@@ -114,11 +128,14 @@ 
 	
 		$stmt = $this->PrepareSP('sp_server_info');
 		$val = 2;
-		if ($this->fetchMode === false) {
+		if ($this->fetchMode === false)
+		{
 			$savem = $ADODB_FETCH_MODE;
 			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		} else 
-			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
+		}
+		else {
+					$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
+		}
 		
 		
 		$this->Parameter($stmt,$val,'attribute_id');
@@ -126,17 +143,20 @@ 
 		
 		//$row = $this->GetRow("execute sp_server_info 2");
 		
-		if ($this->fetchMode === false) {
+		if ($this->fetchMode === false)
+		{
 			$ADODB_FETCH_MODE = $savem;
-		} else
-			$this->SetFetchMode($savem);
+		}
+		else {
+					$this->SetFetchMode($savem);
+		}
 		
 		$arr['description'] = $row[2];
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
 	
-	function IfNull( $field, $ifNull ) 
+	function IfNull( $field, $ifNull )
 	{
 		return " ISNULL($field, $ifNull) "; // if MS SQL Server
 	}
@@ -163,7 +183,8 @@ 
 		$start -= 1;
 		$this->Execute("create table $seq (id float(53))");
 		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-		if (!$ok) {
+		if (!$ok)
+		{
 				$this->Execute('ROLLBACK TRANSACTION adodbseq');
 				return false;
 		}
@@ -176,10 +197,12 @@ 
 		//$this->debug=1;
 		$this->Execute('BEGIN TRANSACTION adodbseq');
 		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
-		if (!$ok) {
+		if (!$ok)
+		{
 			$this->Execute("create table $seq (id float(53))");
 			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
-			if (!$ok) {
+			if (!$ok)
+			{
 				$this->Execute('ROLLBACK TRANSACTION adodbseq');
 				return false;
 			}
@@ -197,12 +220,15 @@ 
 
 	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
-		if ($nrows > 0 && $offset <= 0) {
+		if ($nrows > 0 && $offset <= 0)
+		{
 			$sql = preg_replace(
 				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
 			$rs =& $this->Execute($sql,$inputarr);
-		} else
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		}
+		else {
+					$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		}
 	
 		return $rs;
 	}
@@ -210,15 +236,23 @@ 
 	
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
+	{
+		if (!$col)
+		{
+			$col = $this->sysTimeStamp;
+		}
 		$s = '';
 		
 		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
-			if ($s) $s .= '+';
+		for ($i=0; $i < $len; $i++)
+		{
+			if ($s)
+			{
+				$s .= '+';
+			}
 			$ch = $fmt[$i];
-			switch($ch) {
+			switch($ch)
+			{
 			case 'Y':
 			case 'y':
 				$s .= "datename(yyyy,$col)";
@@ -257,7 +291,8 @@ 
 				break;
 				
 			default:
-				if ($ch == '\\') {
+				if ($ch == '\\')
+				{
 					$i++;
 					$ch = substr($fmt,$i,1);
 				}
@@ -271,24 +306,42 @@ 
 	
 	function BeginTrans()
 	{
-		if ($this->transOff) return true; 
+		if ($this->transOff)
+		{
+			return true;
+		}
 		$this->transCnt += 1;
 	   	$this->Execute('BEGIN TRAN');
 	   	return true;
 	}
 		
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff)
+		{
+			return true;
+		}
+		if (!$ok)
+		{
+			return $this->RollbackTrans();
+		}
+		if ($this->transCnt)
+		{
+			$this->transCnt -= 1;
+		}
 		$this->Execute('COMMIT TRAN');
 		return true;
 	}
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
+		if ($this->transOff)
+		{
+			return true;
+		}
+		if ($this->transCnt)
+		{
+			$this->transCnt -= 1;
+		}
 		$this->Execute('ROLLBACK TRAN');
 		return true;
 	}
@@ -305,9 +358,12 @@ 
 		
 		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
 	*/
-	function RowLock($tables,$where,$flds='top 1 null as ignore') 
+	function RowLock($tables,$where,$flds='top 1 null as ignore')
 	{
-		if (!$this->transCnt) $this->BeginTrans();
+		if (!$this->transCnt)
+		{
+			$this->BeginTrans();
+		}
 		return $this->GetOne("select $flds from $tables with (ROWLOCK,HOLDLOCK) where $where");
 	}
 	
@@ -328,23 +384,30 @@ 
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
         $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
+        if ($this->fetchMode !== FALSE)
+        {
         	$savem = $this->SetFetchMode(FALSE);
         }
         
         $rs = $this->Execute($sql);
-        if (isset($savem)) {
+        if (isset($savem))
+        {
         	$this->SetFetchMode($savem);
         }
         $ADODB_FETCH_MODE = $save;
 
-        if (!is_object($rs)) {
+        if (!is_object($rs))
+        {
         	return FALSE;
         }
 
 		$indexes = array();
-		while ($row = $rs->FetchRow()) {
-			if (!$primary && $row[5]) continue;
+		while ($row = $rs->FetchRow())
+		{
+			if (!$primary && $row[5])
+			{
+				continue;
+			}
 			
             $indexes[$row[0]]['unique'] = $row[6];
             $indexes[$row[0]]['columns'][] = $row[1];
@@ -374,17 +437,26 @@ 
 		$ADODB_FETCH_MODE = $save;
 		
 		$arr = false;
-		foreach($constraints as $constr) {
+		foreach($constraints as $constr)
+		{
 			//print_r($constr);
 			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
 		}
-		if (!$arr) return false;
+		if (!$arr)
+		{
+			return false;
+		}
 		
 		$arr2 = false;
 		
-		foreach($arr as $k => $v) {
-			foreach($v as $a => $b) {
-				if ($upper) $a = strtoupper($a);
+		foreach($arr as $k => $v)
+		{
+			foreach($v as $a => $b)
+			{
+				if ($upper)
+				{
+					$a = strtoupper($a);
+				}
 				$arr2[$a] = $b;
 			}
 		}
@@ -392,20 +464,29 @@ 
 	}
 
 	//From: Fernando Moreira <FMoreira@imediata.pt>
-	function MetaDatabases() 
-	{ 
-		if(@mssql_select_db("master")) { 
+	function MetaDatabases()
+	{
+		if(@mssql_select_db("master"))
+		{
 				 $qry=$this->metaDatabasesSQL; 
-				 if($rs=@mssql_query($qry)){ 
+				 if($rs=@mssql_query($qry))
+				 {
 						 $tmpAr=$ar=array(); 
-						 while($tmpAr=@mssql_fetch_row($rs)) 
-								 $ar[]=$tmpAr[0]; 
+						 while($tmpAr=@mssql_fetch_row($rs))
+						 {
+						 								 $ar[]=$tmpAr[0];
+						 }
 						@mssql_select_db($this->databaseName); 
-						 if(sizeof($ar)) 
-								 return($ar); 
-						 else 
-								 return(false); 
-				 } else { 
+						 if(sizeof($ar))
+						 {
+						 								 return($ar);
+						 }
+						 else {
+						 								 return(false);
+						 }
+				 }
+				 else
+				 {
 						 @mssql_select_db($this->databaseName); 
 						 return(false); 
 				 } 
@@ -421,8 +502,14 @@ 
 	
 		$schema = '';
 		$this->_findschema($table,$schema);
-		if (!$schema) $schema = $this->database;
-		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+		if (!$schema)
+		{
+			$schema = $this->database;
+		}
+		if ($schema)
+		{
+			$schema = "and k.table_catalog like '$schema%'";
+		}
 
 		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
 		information_schema.table_constraints tc 
@@ -434,7 +521,10 @@ 
 		$a = $this->GetCol($sql);
 		$ADODB_FETCH_MODE = $savem;
 		
-		if ($a && sizeof($a)>0) return $a;
+		if ($a && sizeof($a)>0)
+		{
+			return $a;
+		}
 		$false = false;
 		return $false;	  
 	}
@@ -442,57 +532,84 @@ 
 	
 	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
 	{
-		if ($mask) {
+		if ($mask)
+		{
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(($mask));
 			$this->metaTablesSQL .= " AND name like $mask";
 		}
 		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
 		
-		if ($mask) {
+		if ($mask)
+		{
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
 	}
  
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		$this->databaseName = $dbName;
-		if ($this->_connectionID) {
+		if ($this->_connectionID)
+		{
 			return @mssql_select_db($dbName);		
 		}
-		else return false;	
+		else {
+			return false;
+		}
 	}
 	
-	function ErrorMsg() 
+	function ErrorMsg()
 	{
-		if (empty($this->_errorMsg)){
+		if (empty($this->_errorMsg))
+		{
 			$this->_errorMsg = mssql_get_last_message();
 		}
 		return $this->_errorMsg;
 	}
 	
-	function ErrorNo() 
+	function ErrorNo()
 	{
-		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
-		if (empty($this->_errorMsg)) {
+		if ($this->_logsql && $this->_errorCode !== false)
+		{
+			return $this->_errorCode;
+		}
+		if (empty($this->_errorMsg))
+		{
 			$this->_errorMsg = mssql_get_last_message();
 		}
 		$id = @mssql_query("select @@ERROR",$this->_connectionID);
-		if (!$id) return false;
+		if (!$id)
+		{
+			return false;
+		}
 		$arr = mssql_fetch_array($id);
 		@mssql_free_result($id);
-		if (is_array($arr)) return $arr[0];
-	   else return -1;
+		if (is_array($arr))
+		{
+			return $arr[0];
+		}
+	   else {
+	   	return -1;
+	   }
 	}
 	
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
-		if (!function_exists('mssql_pconnect')) return null;
+		if (!function_exists('mssql_pconnect'))
+		{
+			return null;
+		}
 		$this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		if ($this->_connectionID === false)
+		{
+			return false;
+		}
+		if ($argDatabasename)
+		{
+			return $this->SelectDB($argDatabasename);
+		}
 		return true;	
 	}
 	
@@ -500,25 +617,42 @@ 
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
-		if (!function_exists('mssql_pconnect')) return null;
+		if (!function_exists('mssql_pconnect'))
+		{
+			return null;
+		}
 		$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
-		if ($this->_connectionID === false) return false;
+		if ($this->_connectionID === false)
+		{
+			return false;
+		}
 		
 		// persistent connections can forget to rollback on crash, so we do it here.
-		if ($this->autoRollback) {
+		if ($this->autoRollback)
+		{
 			$cnt = $this->GetOne('select @@TRANCOUNT');
-			while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); 
+			while (--$cnt >= 0)
+			{
+				$this->Execute('ROLLBACK TRAN');
+			}
+		}
+		if ($argDatabasename)
+		{
+			return $this->SelectDB($argDatabasename);
 		}
-		if ($argDatabasename) return $this->SelectDB($argDatabasename);
 		return true;	
 	}
 	
 	function Prepare($sql)
 	{
 		$sqlarr = explode('?',$sql);
-		if (sizeof($sqlarr) <= 1) return $sql;
+		if (sizeof($sqlarr) <= 1)
+		{
+			return $sql;
+		}
 		$sql2 = $sqlarr[0];
-		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
+		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++)
+		{
 			$sql2 .=  '@P'.($i-1) . $sqlarr[$i];
 		} 
 		return array($sql,$this->qstr($sql2),$max);
@@ -526,12 +660,16 @@ 
 	
 	function PrepareSP($sql)
 	{
-		if (!$this->_has_mssql_init) {
+		if (!$this->_has_mssql_init)
+		{
 			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
 			return $sql;
 		}
 		$stmt = mssql_init($sql,$this->_connectionID);
-		if (!$stmt)  return $sql;
+		if (!$stmt)
+		{
+			return $sql;
+		}
 		return array($sql,$stmt);
 	}
 	
@@ -545,8 +683,10 @@ 
             $arr = func_get_args();
 
             // Split single record on commas, if possible
-            if (sizeof($arr) == 1) {
-                foreach ($arr as $arg) {
+            if (sizeof($arr) == 1)
+            {
+                foreach ($arr as $arg)
+                {
                     $args = explode(',', $arg);
                 }
                 $arr = $args;
@@ -554,7 +694,10 @@ 
 
             array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
             $s = implode('+',$arr);
-            if (sizeof($arr) > 0) return "$s";
+            if (sizeof($arr) > 0)
+            {
+            	return "$s";
+            }
             
 			return '';
     }
@@ -579,23 +722,28 @@ 
 	*/
 	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
 	{
-		if (!$this->_has_mssql_init) {
+		if (!$this->_has_mssql_init)
+		{
 			ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0");
 			return $sql;
 		}
 
 		$isNull = is_null($var); // php 4.0.4 and above...
 			
-		if ($type === false) 
-			switch(gettype($var)) {
+		if ($type === false)
+		{
+					switch(gettype($var)) {
 			default:
-			case 'string': $type = SQLCHAR; break;
+			case 'string': $type = SQLCHAR;
+		}
+		break;
 			case 'double': $type = SQLFLT8; break;
 			case 'integer': $type = SQLINT4; break;
 			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
 			}
 		
-		if  ($this->debug) {
+		if  ($this->debug)
+		{
 			$prefix = ($isOutput) ? 'Out' : 'In';
 			$ztype = (empty($type)) ? 'false' : $type;
 			ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
@@ -609,7 +757,10 @@ 
 			see how it works. - type: one of this new supported PHP constants. 
 				SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 
 		*/
-		if ($name !== 'RETVAL') $name = '@'.$name;
+		if ($name !== 'RETVAL')
+		{
+			$name = '@'.$name;
+		}
 		return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen);
 	}
 	
@@ -628,7 +779,8 @@ 
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 	
-		if (strtoupper($blobtype) == 'CLOB') {
+		if (strtoupper($blobtype) == 'CLOB')
+		{
 			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
 			return $this->Execute($sql) != false;
 		}
@@ -640,56 +792,84 @@ 
 	function _query($sql,$inputarr)
 	{
 		$this->_errorMsg = false;
-		if (is_array($inputarr)) {
+		if (is_array($inputarr))
+		{
 			
 			# bind input params with sp_executesql: 
 			# see http://www.quest-pipelines.com/newsletter-v3/0402_F.htm
 			# works only with sql server 7 and newer
-			if (!is_array($sql)) $sql = $this->Prepare($sql);
+			if (!is_array($sql))
+			{
+				$sql = $this->Prepare($sql);
+			}
 			$params = '';
 			$decl = '';
 			$i = 0;
-			foreach($inputarr as $v) {
-				if ($decl) {
+			foreach($inputarr as $v)
+			{
+				if ($decl)
+				{
 					$decl .= ', ';
 					$params .= ', ';
 				}	
-				if (is_string($v)) {
+				if (is_string($v))
+				{
 					$len = strlen($v);
-					if ($len == 0) $len = 1;
+					if ($len == 0)
+					{
+						$len = 1;
+					}
 					
-					if ($len > 4000 ) {
+					if ($len > 4000 )
+					{
 						// NVARCHAR is max 4000 chars. Let's use NTEXT
 						$decl .= "@P$i NTEXT";
-					} else {
+					}
+					else
+					{
 						$decl .= "@P$i NVARCHAR($len)";
 					}
 
 					$params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
-				} else if (is_integer($v)) {
+				}
+				else if (is_integer($v))
+				{
 					$decl .= "@P$i INT";
 					$params .= "@P$i=".$v;
-				} else if (is_float($v)) {
+				}
+				else if (is_float($v))
+				{
 					$decl .= "@P$i FLOAT";
 					$params .= "@P$i=".$v;
-				} else if (is_bool($v)) {
+				}
+				else if (is_bool($v))
+				{
 					$decl .= "@P$i INT"; # Used INT just in case BIT in not supported on the user's MSSQL version. It will cast appropriately.
 					$params .= "@P$i=".(($v)?'1':'0'); # True == 1 in MSSQL BIT fields and acceptable for storing logical true in an int field
-				} else {
+				}
+				else
+				{
 					$decl .= "@P$i CHAR"; # Used char because a type is required even when the value is to be NULL.
 					$params .= "@P$i=NULL";
 					}
 				$i += 1;
 			}
 			$decl = $this->qstr($decl);
-			if ($this->debug) ADOConnection::outp("<font size=-1>sp_executesql N{$sql[1]},N$decl,$params</font>");
+			if ($this->debug)
+			{
+				ADOConnection::outp("<font size=-1>sp_executesql N{$sql[1]},N$decl,$params</font>");
+			}
 			$rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params");
 			
-		} else if (is_array($sql)) {
+		}
+		else if (is_array($sql))
+		{
 			# PrepareSP()
 			$rez = mssql_execute($sql[1]);
 			
-		} else {
+		}
+		else
+		{
 			$rez = mssql_query($sql,$this->_connectionID);
 		}
 		return $rez;
@@ -697,8 +877,11 @@ 
 	
 	// returns true or false
 	function _close()
-	{ 
-		if ($this->transCnt) $this->RollbackTrans();
+	{
+		if ($this->transCnt)
+		{
+			$this->RollbackTrans();
+		}
 		$rez = @mssql_close($this->_connectionID);
 		$this->_connectionID = false;
 		return $rez;
@@ -720,7 +903,8 @@ 
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordset_mssql extends ADORecordSet {	
+class ADORecordset_mssql extends ADORecordSet
+{
 
 	var $databaseType = "mssql";
 	var $canSeek = true;
@@ -732,7 +916,8 @@ 
 		// freedts check...
 		$this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
 
-		if ($mode === false) { 
+		if ($mode === false)
+		{
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -753,7 +938,10 @@ 
 	// get next resultset - requires PHP 4.0.5 or later
 	function NextRecordSet()
 	{
-		if (!mssql_next_result($this->_queryID)) return false;
+		if (!mssql_next_result($this->_queryID))
+		{
+			return false;
+		}
 		$this->_inited = false;
 		$this->bind = false;
 		$this->_currentRow = -1;
@@ -764,10 +952,15 @@ 
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
-		if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
-		if (!$this->bind) {
+		if ($this->fetchMode != ADODB_FETCH_NUM)
+		{
+			return $this->fields[$colname];
+		}
+		if (!$this->bind)
+		{
 			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
+			for ($i=0; $i < $this->_numOfFields; $i++)
+			{
 				$o = $this->FetchField($i);
 				$this->bind[strtoupper($o->name)] = $i;
 			}
@@ -783,66 +976,100 @@ 
 
 	function &FetchField($fieldOffset = -1) 
 	{
-		if ($fieldOffset != -1) {
+		if ($fieldOffset != -1)
+		{
 			$f = @mssql_fetch_field($this->_queryID, $fieldOffset);
 		}
-		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+		else if ($fieldOffset == -1)
+		{
+/*	The $fieldOffset argument is not provided thus its -1 	*/
 			$f = @mssql_fetch_field($this->_queryID);
 		}
 		$false = false;
-		if (empty($f)) return $false;
+		if (empty($f))
+		{
+			return $false;
+		}
 		return $f;
 	}
 	
-	function _seek($row) 
+	function _seek($row)
 	{
 		return @mssql_data_seek($this->_queryID, $row);
 	}
 
 	// speedup
-	function MoveNext() 
+	function MoveNext()
 	{
-		if ($this->EOF) return false;
+		if ($this->EOF)
+		{
+			return false;
+		}
 		
 		$this->_currentRow++;
 		
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
+		if ($this->fetchMode & ADODB_FETCH_ASSOC)
+		{
+			if ($this->fetchMode & ADODB_FETCH_NUM)
+			{
 				//ADODB_FETCH_BOTH mode
 				$this->fields = @mssql_fetch_array($this->_queryID);
 			}
-			else {
-				if ($this->hasFetchAssoc) {// only for PHP 4.2.0 or later
+			else
+			{
+				if ($this->hasFetchAssoc)
+				{
+// only for PHP 4.2.0 or later
 					 $this->fields = @mssql_fetch_assoc($this->_queryID);
-				} else {
+				}
+				else
+				{
 					$flds = @mssql_fetch_array($this->_queryID);
-					if (is_array($flds)) {
+					if (is_array($flds))
+					{
 						$fassoc = array();
-						foreach($flds as $k => $v) {
-							if (is_numeric($k)) continue;
+						foreach($flds as $k => $v)
+						{
+							if (is_numeric($k))
+							{
+								continue;
+							}
 							$fassoc[$k] = $v;
 						}
 						$this->fields = $fassoc;
-					} else
-						$this->fields = false;
+					}
+					else {
+											$this->fields = false;
+					}
 				}
 			}
 			
-			if (is_array($this->fields)) {
-				if (ADODB_ASSOC_CASE == 0) {
-					foreach($this->fields as $k=>$v) {
+			if (is_array($this->fields))
+			{
+				if (ADODB_ASSOC_CASE == 0)
+				{
+					foreach($this->fields as $k=>$v)
+					{
 						$this->fields[strtolower($k)] = $v;
 					}
-				} else if (ADODB_ASSOC_CASE == 1) {
-					foreach($this->fields as $k=>$v) {
+				}
+				else if (ADODB_ASSOC_CASE == 1)
+				{
+					foreach($this->fields as $k=>$v)
+					{
 						$this->fields[strtoupper($k)] = $v;
 					}
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$this->fields = @mssql_fetch_row($this->_queryID);
 		}
-		if ($this->fields) return true;
+		if ($this->fields)
+		{
+			return true;
+		}
 		$this->EOF = true;
 		
 		return false;
@@ -851,21 +1078,34 @@ 
 	
 	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
 	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
-	function _fetch($ignore_fields=false) 
+	function _fetch($ignore_fields=false)
 	{
-		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-			if ($this->fetchMode & ADODB_FETCH_NUM) {
+		if ($this->fetchMode & ADODB_FETCH_ASSOC)
+		{
+			if ($this->fetchMode & ADODB_FETCH_NUM)
+			{
 				//ADODB_FETCH_BOTH mode
 				$this->fields = @mssql_fetch_array($this->_queryID);
-			} else {
-				if ($this->hasFetchAssoc) // only for PHP 4.2.0 or later
+			}
+			else
+			{
+				if ($this->hasFetchAssoc)
+				{
+					// only for PHP 4.2.0 or later
 					$this->fields = @mssql_fetch_assoc($this->_queryID);
-				else {
+				}
+				else
+				{
 					$this->fields = @mssql_fetch_array($this->_queryID);
-					if (@is_array($$this->fields)) {
+					if (@is_array($$this->fields))
+					{
 						$fassoc = array();
-						foreach($$this->fields as $k => $v) {
-							if (is_integer($k)) continue;
+						foreach($$this->fields as $k => $v)
+						{
+							if (is_integer($k))
+							{
+								continue;
+							}
 							$fassoc[$k] = $v;
 						}
 						$this->fields = $fassoc;
@@ -873,17 +1113,26 @@ 
 				}
 			}
 			
-			if (!$this->fields) {
-			} else if (ADODB_ASSOC_CASE == 0) {
-				foreach($this->fields as $k=>$v) {
+			if (!$this->fields)
+			{
+			}
+			else if (ADODB_ASSOC_CASE == 0)
+			{
+				foreach($this->fields as $k=>$v)
+				{
 					$this->fields[strtolower($k)] = $v;
 				}
-			} else if (ADODB_ASSOC_CASE == 1) {
-				foreach($this->fields as $k=>$v) {
+			}
+			else if (ADODB_ASSOC_CASE == 1)
+			{
+				foreach($this->fields as $k=>$v)
+				{
 					$this->fields[strtoupper($k)] = $v;
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$this->fields = @mssql_fetch_row($this->_queryID);
 		}
 		return $this->fields;
@@ -892,7 +1141,7 @@ 
 	/*	close() only needs to be called if you are worried about using too much memory while your script
 		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
 
-	function _close() 
+	function _close()
 	{
 		$rez = mssql_free_result($this->_queryID);	
 		$this->_queryID = false;
@@ -912,8 +1161,9 @@ 
 }
 
 
-class ADORecordSet_array_mssql extends ADORecordSet_array {
-	function ADORecordSet_array_mssql($id=-1,$mode=false) 
+class ADORecordSet_array_mssql extends ADORecordSet_array
+{
+	function ADORecordSet_array_mssql($id=-1,$mode=false)
 	{
 		$this->ADORecordSet_array($id,$mode);
 	}
@@ -922,30 +1172,47 @@ 
 	function UnixDate($v)
 	{
 	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
+		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200)
+		{
+			return parent::UnixDate($v);
+		}
 		
 	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
 	
 		//Dec 30 2000 12:00AM 
-		if ($ADODB_mssql_date_order == 'dmy') {
-			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+		if ($ADODB_mssql_date_order == 'dmy')
+		{
+			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr))
+			{
 				return parent::UnixDate($v);
 			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR)
+			{
+				return 0;
+			}
 			
 			$theday = $rr[1];
 			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
-			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+		}
+		else
+		{
+			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr))
+			{
 				return parent::UnixDate($v);
 			}
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR)
+			{
+				return 0;
+			}
 			
 			$theday = $rr[2];
 			$themth = substr(strtoupper($rr[1]),0,3);
 		}
 		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
+		if ($themth <= 0)
+		{
+			return false;
+		}
 		// h-m-s-MM-DD-YY
 		return  mktime(0,0,0,$themth,$theday,$rr[3]);
 	}
@@ -953,36 +1220,64 @@ 
 	function UnixTimeStamp($v)
 	{
 	
-		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
+		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200)
+		{
+			return parent::UnixTimeStamp($v);
+		}
 		
 	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
 	
 		//Dec 30 2000 12:00AM
-		 if ($ADODB_mssql_date_order == 'dmy') {
+		 if ($ADODB_mssql_date_order == 'dmy')
+		 {
 			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			,$v, $rr))
+			 {
+			 	return parent::UnixTimeStamp($v);
+			 }
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR)
+			{
+				return 0;
+			}
 		
 			$theday = $rr[1];
 			$themth =  substr(strtoupper($rr[2]),0,3);
-		} else {
+		}
+		else
+		{
 			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
-			,$v, $rr)) return parent::UnixTimeStamp($v);
-			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			,$v, $rr))
+			{
+				return parent::UnixTimeStamp($v);
+			}
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR)
+			{
+				return 0;
+			}
 		
 			$theday = $rr[2];
 			$themth = substr(strtoupper($rr[1]),0,3);
 		}
 		
 		$themth = $ADODB_mssql_mths[$themth];
-		if ($themth <= 0) return false;
+		if ($themth <= 0)
+		{
+			return false;
+		}
 		
-		switch (strtoupper($rr[6])) {
+		switch (strtoupper($rr[6]))
+		{
 		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
+			if ($rr[4]<12)
+			{
+				$rr[4] += 12;
+			}
 			break;
 		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
+			if ($rr[4]==12)
+			{
+				$rr[4] = 0;
+			}
 			break;
 		default:
 			break;

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -629,10 +629,10 @@ 
 	{
 	
 		if (strtoupper($blobtype) == 'CLOB') {
-			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
+			$sql = "update $table SET $column='" . $val . "' WHERE $where";
 			return $this->Execute($sql) != false;
 		}
-		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
+		$sql = "update $table SET $column=0x".bin2hex($val)." WHERE $where";
 		return $this->Execute($sql) != false;
 	}
 	
@@ -743,7 +743,7 @@ 
 	
 	function _initrs()
 	{
-	GLOBAL $ADODB_COUNTRECS;	
+	global $ADODB_COUNTRECS;	
 		$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
 		$this->_numOfFields = @mssql_num_fields($this->_queryID);
 	}

phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php

Doc Comments +4 added lines, -1 removed lines

@@ -40,6 +40,9 @@ 
 
 # define the LOB descriptor type for the given type
 # returns false if no LOB descriptor
+/**
+ * @param boolean $type
+ */
 function oci_lob_desc($type) {
 	switch ($type) {
 		case OCI_B_BFILE: $result = OCI_D_FILE; break;
@@ -1152,7 +1155,7 @@ 
 	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
 	 *				This undoes the stupidity of magic quotes for GPC.
 	 *
-	 * @return  quoted string to be sent back to database
+	 * @return  string string to be sent back to database
 	 */
 	function qstr($s,$magic_quotes=false)
 	{	

Indentation +75 added lines, -75 removed lines

@@ -120,8 +120,8 @@ 
 			$fld->scale = $rs->fields[3];
 			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
 				$fld->type ='INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
+		 		$fld->max_length = $rs->fields[4];
+			}	
 		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
 			$fld->binary = (strpos($fld->type,'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];
@@ -184,7 +184,7 @@ 
 		if (!function_exists('OCIPLogon')) return null;
 		
 		
-        $this->_errorMsg = false;
+		$this->_errorMsg = false;
 		$this->_errorCode = false;
 		
 		if($argHostname) { // added by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
@@ -311,15 +311,15 @@ 
 	// Mark Newnham 
 	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
+		// save old fetch mode
+		global $ADODB_FETCH_MODE;
 
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
+		if ($this->fetchMode !== FALSE) {
+			   $savem = $this->SetFetchMode(FALSE);
+		}
 
 		// get index details
 		$table = strtoupper($table);
@@ -334,45 +334,45 @@ 
 
 		if ($primary==TRUE && $primary_key=='') {
 			 if (isset($savem)) 
-                $this->SetFetchMode($savem);
+				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 			return $false; //There is no primary key
 		}
 
-        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
+		$rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
 
 		
-        if (!is_object($rs)) {
+		if (!is_object($rs)) {
 			if (isset($savem)) 
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
+			return $false;
+		}
 
 		$indexes = array ();
-        // parse index data into array
+		// parse index data into array
 
-        while ($row = $rs->FetchRow()) {
+		while ($row = $rs->FetchRow()) {
 			if ($primary && $row[0] != $primary_key) continue;
-            if (!isset($indexes[$row[0]])) {
+			if (!isset($indexes[$row[0]])) {
 				$indexes[$row[0]] = array(
 				   'unique' => ($row[1] == 'UNIQUE'),
 				   'columns' => array()
 				);
-            }
-            $indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
-        }
+			}
+			$indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
+		}
 
-        // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index ) {
-            ksort ($indexes[$index]['columns']);
-        }
+		// sort columns by order in the index
+		foreach ( array_keys ($indexes) as $index ) {
+			ksort ($indexes[$index]['columns']);
+		}
 
 		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
+			$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
-        return $indexes;
+		return $indexes;
 	}
 	
 	function BeginTrans()
@@ -630,24 +630,24 @@ 
 	}
 	
 	/**
-	* Usage:
-	* Store BLOBs and CLOBs
-	*
-	* Example: to store $var in a blob
-	*
-	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
-	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
-	*	
-	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
-	*
-	*  to get length of LOB:
-	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
-	*
-	* If you are using CURSOR_SHARING = force, it appears this will case a segfault
-	* under oracle 8.1.7.0. Run:
-	*	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
-	* before UpdateBlob() then...
-	*/
+	 * Usage:
+	 * Store BLOBs and CLOBs
+	 *
+	 * Example: to store $var in a blob
+	 *
+	 *	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
+	 *	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
+	 *	
+	 *	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
+	 *
+	 *  to get length of LOB:
+	 *  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
+	 *
+	 * If you are using CURSOR_SHARING = force, it appears this will case a segfault
+	 * under oracle 8.1.7.0. Run:
+	 *	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+	 * before UpdateBlob() then...
+	 */
 
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
@@ -681,8 +681,8 @@ 
 	}
 	
 	/**
-	* Usage:  store file pointed to by $var in a blob
-	*/
+	 * Usage:  store file pointed to by $var in a blob
+	 */
 	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		switch(strtoupper($blobtype)) {
@@ -710,12 +710,12 @@ 
 	}
 
 		/**
-	 * Execute SQL 
-	 *
-	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
-	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
-	 * @return 		RecordSet or false
-	 */
+		 * Execute SQL 
+		 *
+		 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
+		 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
+		 * @return 		RecordSet or false
+		 */
 	function &Execute($sql,$inputarr=false) 
 	{
 		if ($this->fnExecute) {
@@ -843,9 +843,9 @@ 
 		
 		if (!is_array($stmt)) return false;
         
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
-            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
-        }
+		if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
+			return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
+		}
         
 		if ($name == false) {
 			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
@@ -855,13 +855,13 @@ 
 			if ($this->debug) {
 				ADOConnection::outp("<b>Bind</b>: name = $name");
 			}
-            //we have to create a new Descriptor here
+			//we have to create a new Descriptor here
 			$numlob = count($this->_refLOBs);
-        	$this->_refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
+			$this->_refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
 			$this->_refLOBs[$numlob]['TYPE'] = $isOutput;
 			
 			$tmp = &$this->_refLOBs[$numlob]['LOB'];
-	        $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
+			$rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
 			if ($this->debug) {
 				ADOConnection::outp("<b>Bind</b>: descriptor has been allocated, var (".$name.") binded");
 			}
@@ -987,7 +987,7 @@ 
 			}
 		}
 		
-        $this->_errorMsg = false;
+		$this->_errorMsg = false;
 		$this->_errorCode = false;
 		if (OCIExecute($stmt,$this->_commit)) {
 //OCIInternalDebug(1);			
@@ -1002,41 +1002,41 @@ 
 						//$_GLOBALS[$this -> _refLOBs[$key]['VAR']] = $tmp;
 						$this -> _refLOBs[$key]['VAR'] = $tmp;
 					} else {
-                        $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
+						$this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
 						$this -> _refLOBs[$key]['LOB']->free();
 						unset($this -> _refLOBs[$key]);
-                        if ($this->debug) {
+						if ($this->debug) {
 							ADOConnection::outp("<b>IN LOB</b>: LOB has been saved. <br>");
 						}
-                    }					
+					}					
 				}
 			}
 		
-            switch (@OCIStatementType($stmt)) {
-                case "SELECT":
+			switch (@OCIStatementType($stmt)) {
+				case "SELECT":
 					return $stmt;
 				
 				case 'DECLARE':
-                case "BEGIN":
-                    if (is_array($sql) && !empty($sql[4])) {
+				case "BEGIN":
+					if (is_array($sql) && !empty($sql[4])) {
 						$cursor = $sql[4];
 						if (is_resource($cursor)) {
 							$ok = OCIExecute($cursor);	
-	                        return $cursor;
+							return $cursor;
 						}
 						return $stmt;
-                    } else {
+					} else {
 						if (is_resource($stmt)) {
 							OCIFreeStatement($stmt);
 							return true;
 						}
-                        return $stmt;
-                    }
-                    break;
-                default :
+						return $stmt;
+					}
+					break;
+				default :
 					// ociclose -- no because it could be used in a LOB?
-                    return true;
-            }
+					return true;
+			}
 		}
 		return false;
 	}

Switch Indentation +89 added lines, -89 removed lines

@@ -454,64 +454,64 @@ 
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
 			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
+				case 'Y':
+				case 'y':
+					$s .= 'YYYY';
+					break;
+				case 'Q':
+				case 'q':
+					$s .= 'Q';
+					break;
 				
-			case 'M':
-				$s .= 'Mon';
-				break;
+				case 'M':
+					$s .= 'Mon';
+					break;
 				
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
+				case 'm':
+					$s .= 'MM';
+					break;
+				case 'D':
+				case 'd':
+					$s .= 'DD';
+					break;
 			
-			case 'H':
-				$s.= 'HH24';
-				break;
+				case 'H':
+					$s.= 'HH24';
+					break;
 				
-			case 'h':
-				$s .= 'HH';
-				break;
+				case 'h':
+					$s .= 'HH';
+					break;
 				
-			case 'i':
-				$s .= 'MI';
-				break;
+				case 'i':
+					$s .= 'MI';
+					break;
 			
-			case 's':
-				$s .= 'SS';
-				break;
+				case 's':
+					$s .= 'SS';
+					break;
 			
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
+				case 'a':
+				case 'A':
+					$s .= 'AM';
+					break;
 				
-			case 'w':
-				$s .= 'D';
-				break;
+				case 'w':
+					$s .= 'D';
+					break;
 				
-			case 'l':
-				$s .= 'DAY';
-				break;
+				case 'l':
+					$s .= 'DAY';
+					break;
 				
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
+				default:
+				// handle escape characters...
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt,$i,1);
+					}
+					if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+					else $s .= '"'.$ch.'"';
 				
 			}
 		}
@@ -655,9 +655,9 @@ 
 		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
 		
 		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
+			default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
+			case 'BLOB': $type = OCI_B_BLOB; break;
+			case 'CLOB': $type = OCI_B_CLOB; break;
 		}
 		
 		if ($this->databaseType == 'oci8po') 
@@ -686,9 +686,9 @@ 
 	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
+			default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
+			case 'BLOB': $type = OCI_B_BLOB; break;
+			case 'CLOB': $type = OCI_B_CLOB; break;
 		}
 		
 		if ($this->databaseType == 'oci8po') 
@@ -1196,12 +1196,12 @@ 
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default:
-		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_NUM: 
+			default:
+			$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		}
 		
 		$this->adodbFetchMode = $mode;
@@ -1415,37 +1415,37 @@ 
 		switch (strtoupper($t)) {
 	 	case 'VARCHAR':
 	 	case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-		case 'NCHAR':
-		case 'NVARCHAR':
-		case 'NVARCHAR2':
-				 if (isset($this) && $len <= $this->blobSize) return 'C';
+			case 'CHAR':
+			case 'VARBINARY':
+			case 'BINARY':
+			case 'NCHAR':
+			case 'NVARCHAR':
+			case 'NVARCHAR2':
+				 	if (isset($this) && $len <= $this->blobSize) return 'C';
 		
-		case 'NCLOB':
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
+			case 'NCLOB':
+			case 'LONG':
+			case 'LONG VARCHAR':
+			case 'CLOB':
+			return 'X';
 		
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-			return 'B';
+			case 'LONG RAW':
+			case 'LONG VARBINARY':
+			case 'BLOB':
+				return 'B';
 		
-		case 'DATE': 
-			return  ($this->connection->datetime) ? 'T' : 'D';
+			case 'DATE': 
+				return  ($this->connection->datetime) ? 'T' : 'D';
 		
 		
-		case 'TIMESTAMP': return 'T';
+			case 'TIMESTAMP': return 'T';
 		
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': 
-			return 'I';
+			case 'INT': 
+			case 'SMALLINT':
+			case 'INTEGER': 
+				return 'I';
 			
-		default: return 'N';
+			default: return 'N';
 		}
 	}
 }
@@ -1459,11 +1459,11 @@ 
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_NUM: 
+			default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->_queryID = $queryID;

Spacing +144 added lines, -144 removed lines

@@ -56,7 +56,7 @@ 
 	var $databaseType = 'oci8';
 	var $dataProvider = 'oci8';
 	var $replaceQuote = "''"; // string to use to replace quotes
-	var $concat_operator='||';
+	var $concat_operator = '||';
 	var $sysDate = "TRUNC(SYSDATE)";
 	var $sysTimeStamp = 'SYSDATE';
 	var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
@@ -77,12 +77,12 @@ 
 	var $_bind = false;
 	var $_hasOCIFetchStatement = false;
 	var $_getarray = false; // currently not working
-	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
+	var $leftOuter = ''; // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
 	var $session_sharing_force_blob = false; // alter session on updateblob if set to true 
 	var $firstrows = true; // enable first rows optimization on SelectLimit()
 	var $selectOffsetAlg1 = 100; // when to use 1st algorithm of selectlimit.
-	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
- 	var $useDBDateFormatForTextInput=false;
+	var $NLS_DATE_FORMAT = 'YYYY-MM-DD'; // To include time, use 'RRRR-MM-DD HH24:MI:SS'
+ 	var $useDBDateFormatForTextInput = false;
 	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
 	var $_refLOBs = array();
 	
@@ -104,7 +104,7 @@ 
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
 		
-		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL, strtoupper($table)));
 		
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
@@ -119,11 +119,11 @@ 
 	   		$fld->max_length = $rs->fields[2];
 			$fld->scale = $rs->fields[3];
 			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
-				$fld->type ='INT';
+				$fld->type = 'INT';
 	     		$fld->max_length = $rs->fields[4];
 	    	}	
-		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
-			$fld->binary = (strpos($fld->type,'BLOB') !== false);
+		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT', 3) === 0);
+			$fld->binary = (strpos($fld->type, 'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];
 			
 			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
@@ -139,7 +139,7 @@ 
 	
 	function Time()
 	{
-		$rs =& $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
+		$rs = & $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
 		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
 		
 		return false;
@@ -179,7 +179,7 @@ 
   There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
 	
 */
-	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode = 0)
 	{
 		if (!function_exists('OCIPLogon')) return null;
 		
@@ -187,45 +187,45 @@ 
         $this->_errorMsg = false;
 		$this->_errorCode = false;
 		
-		if($argHostname) { // added by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
+		if ($argHostname) { // added by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
 			if (empty($argDatabasename)) $argDatabasename = $argHostname;
 			else {
-				if(strpos($argHostname,":")) {
-					$argHostinfo=explode(":",$argHostname);
-				   	$argHostname=$argHostinfo[0];
-					$argHostport=$argHostinfo[1];
+				if (strpos($argHostname, ":")) {
+					$argHostinfo = explode(":", $argHostname);
+				   	$argHostname = $argHostinfo[0];
+					$argHostport = $argHostinfo[1];
 			 	} else {
-					$argHostport="1521";
+					$argHostport = "1521";
 	   			}
 				
 				if ($this->connectSID) {
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+					$argDatabasename = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
 				} else
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+					$argDatabasename = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
 			}
 		}
 				
  		//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
-		if ($mode==1) {
+		if ($mode == 1) {
 			$this->_connectionID = ($this->charSet) ? 
-				OCIPLogon($argUsername,$argPassword, $argDatabasename)
+				OCIPLogon($argUsername, $argPassword, $argDatabasename)
 				:
-				OCIPLogon($argUsername,$argPassword, $argDatabasename, $this->charSet)
+				OCIPLogon($argUsername, $argPassword, $argDatabasename, $this->charSet)
 				;
 			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
-		} else if ($mode==2) {
+		} else if ($mode == 2) {
 			$this->_connectionID = ($this->charSet) ? 
-				OCINLogon($argUsername,$argPassword, $argDatabasename)
+				OCINLogon($argUsername, $argPassword, $argDatabasename)
 				:
-				OCINLogon($argUsername,$argPassword, $argDatabasename, $this->charSet);
+				OCINLogon($argUsername, $argPassword, $argDatabasename, $this->charSet);
 				
 		} else {
 			$this->_connectionID = ($this->charSet) ? 
-				OCILogon($argUsername,$argPassword, $argDatabasename)
+				OCILogon($argUsername, $argPassword, $argDatabasename)
 				:
-				OCILogon($argUsername,$argPassword, $argDatabasename,$this->charSet);
+				OCILogon($argUsername, $argPassword, $argDatabasename, $this->charSet);
 		}
 		if (!$this->_connectionID) return false;
 		if ($this->_initdate) {
@@ -249,13 +249,13 @@ 
 		// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 1);
 	}
 	
 	// returns true or false
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
-		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 2);
 	}
 	
 	function _affectedrows()
@@ -264,7 +264,7 @@ 
 		return 0;
 	}
 	
-	function IfNull( $field, $ifNull ) 
+	function IfNull($field, $ifNull) 
 	{
 		return " NVL($field, $ifNull) "; // if Oracle
 	}
@@ -275,7 +275,7 @@ 
 		if (empty($d) && $d !== 0) return 'null';
 		
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
+		return "TO_DATE(".adodb_date($this->fmtDate, $d).",'".$this->NLS_DATE_FORMAT."')";
 	}
 
 	
@@ -284,23 +284,23 @@ 
 	{
 		if (empty($ts) && $ts !== 0) return 'null';
 		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
+		return 'TO_DATE('.adodb_date($this->fmtTimeStamp, $ts).",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
 	
-	function RowLock($tables,$where,$flds='1 as ignore') 
+	function RowLock($tables, $where, $flds = '1 as ignore') 
 	{
 		if ($this->autoCommit) $this->BeginTrans();
 		return $this->GetOne("select $flds from $tables where $where for update");
 	}
 	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	function &MetaTables($ttype = false, $showSchema = false, $mask = false) 
 	{
 		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtoupper($mask));
 			$this->metaTablesSQL .= " AND table_name like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+		$ret = & ADOConnection::MetaTables($ttype, $showSchema);
 		
 		if ($mask) {
 			$this->metaTablesSQL = $save;
@@ -309,7 +309,7 @@ 
 	}
 	
 	// Mark Newnham 
-	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+	function &MetaIndexes($table, $primary = FALSE, $owner = false)
 	{
         // save old fetch mode
         global $ADODB_FETCH_MODE;
@@ -328,18 +328,18 @@ 
 		$primary_key = '';
 
 		$false = false;
-		$rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
+		$rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'", $table));
 		if ($row = $rs->FetchRow())
 		   $primary_key = $row[1]; //constraint_name
 
-		if ($primary==TRUE && $primary_key=='') {
+		if ($primary == TRUE && $primary_key == '') {
 			 if (isset($savem)) 
                 $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 			return $false; //There is no primary key
 		}
 
-        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
+        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME", $table));
 
 		
         if (!is_object($rs)) {
@@ -349,7 +349,7 @@ 
             return $false;
         }
 
-		$indexes = array ();
+		$indexes = array();
         // parse index data into array
 
         while ($row = $rs->FetchRow()) {
@@ -364,8 +364,8 @@ 
         }
 
         // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index ) {
-            ksort ($indexes[$index]['columns']);
+        foreach (array_keys($indexes) as $index) {
+            ksort($indexes[$index]['columns']);
         }
 
 		if (isset($savem)) { 
@@ -384,7 +384,7 @@ 
 		return true;
 	}
 	
-	function CommitTrans($ok=true) 
+	function CommitTrans($ok = true) 
 	{ 
 		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
@@ -445,15 +445,15 @@ 
 	}
 	
 	// Format date column in sql string given an input format that understands Y M D
-	function SQLDate($fmt, $col=false)
+	function SQLDate($fmt, $col = false)
 	{	
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'TO_CHAR('.$col.",'";
 		
 		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			$ch = $fmt[$i];
-			switch($ch) {
+			switch ($ch) {
 			case 'Y':
 			case 'y':
 				$s .= 'YYYY';
@@ -476,7 +476,7 @@ 
 				break;
 			
 			case 'H':
-				$s.= 'HH24';
+				$s .= 'HH24';
 				break;
 				
 			case 'h':
@@ -508,14 +508,14 @@ 
 			// handle escape characters...
 				if ($ch == '\\') {
 					$i++;
-					$ch = substr($fmt,$i,1);
+					$ch = substr($fmt, $i, 1);
 				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+				if (strpos('-/.:;, ', $ch) !== false) $s .= $ch;
 				else $s .= '"'.$ch.'"';
 				
 			}
 		}
-		return $s. "')";
+		return $s."')";
 	}
 	
 	
@@ -534,14 +534,14 @@ 
 	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
 	 out this function then, and the slower SelectLimit() in the base class will be used.
 	*/
-	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	function &SelectLimit($sql, $nrows = -1, $offset = -1, $inputarr = false, $secs2cache = 0)
 	{
 		// seems that oracle only supports 1 hint comment in 8i
 		if ($this->firstrows) {
-			if (strpos($sql,'/*+') !== false)
-				$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
+			if (strpos($sql, '/*+') !== false)
+				$sql = str_replace('/*+ ', '/*+FIRST_ROWS ', $sql);
 			else
-				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
+				$sql = preg_replace('/^[ \t\n]*select/i', 'SELECT /*+FIRST_ROWS*/', $sql);
 		}
 		
 		if ($offset < $this->selectOffsetAlg1) {
@@ -558,7 +558,7 @@ 
 			}
 			// note that $nrows = 0 still has to work ==> no rows returned
 
-			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			$rs = & ADOConnection::SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
 			return $rs;
 			
 		} else {
@@ -568,25 +568,25 @@ 
 			$q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
 			 
 			$false = false;
-			if (! $stmt_arr = $this->Prepare($q_fields)) {
+			if (!$stmt_arr = $this->Prepare($q_fields)) {
 				return $false;
 			}
 			$stmt = $stmt_arr[1];
 			 
 			 if (is_array($inputarr)) {
-			 	foreach($inputarr as $k => $v) {
+			 	foreach ($inputarr as $k => $v) {
 					if (is_array($v)) {
 						if (sizeof($v) == 2) // suggested by g.giunta@libero.
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
+							OCIBindByName($stmt, ":$k", $inputarr[$k][0], $v[1]);
 						else
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+							OCIBindByName($stmt, ":$k", $inputarr[$k][0], $v[1], $v[2]);
 					} else {
 						$len = -1;
 						if ($v === ' ') $len = 1;
 						if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
 							$bindarr[$k] = $v;
 						} else { 				// dynamic sql, so rebind every time
-							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+							OCIBindByName($stmt, ":$k", $inputarr[$k], $len);
 						}
 					}
 				}
@@ -598,7 +598,7 @@ 
 			 }
 			 
 			 $ncols = OCINumCols($stmt);
-			 for ( $i = 1; $i <= $ncols; $i++ ) {
+			 for ($i = 1; $i <= $ncols; $i++) {
 				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
 			 }
 			 $result = false;
@@ -622,8 +622,8 @@ 
 				$inputarr['adodb_nrows'] = $nrows;
 				$inputarr['adodb_offset'] = $offset;
 				
-			if ($secs2cache>0) $rs =& $this->CacheExecute($secs2cache, $sql,$inputarr);
-			else $rs =& $this->Execute($sql,$inputarr);
+			if ($secs2cache > 0) $rs = & $this->CacheExecute($secs2cache, $sql, $inputarr);
+			else $rs = & $this->Execute($sql, $inputarr);
 			return $rs;
 		}
 	
@@ -649,12 +649,12 @@ 
 	* before UpdateBlob() then...
 	*/
 
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
 	{
 		
 		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
 		
-		switch(strtoupper($blobtype)) {
+		switch (strtoupper($blobtype)) {
 		default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
@@ -666,11 +666,11 @@ 
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
 		
 		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
+		$arr['blob'] = array($desc, -1, $type);
 		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
 		$commit = $this->autoCommit;
 		if ($commit) $this->BeginTrans();
-		$rs = $this->Execute($sql,$arr);
+		$rs = $this->Execute($sql, $arr);
 		if ($rez = !empty($rs)) $desc->save($val);
 		$desc->free();
 		if ($commit) $this->CommitTrans();
@@ -683,10 +683,10 @@ 
 	/**
 	* Usage:  store file pointed to by $var in a blob
 	*/
-	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
+	function UpdateBlobFile($table, $column, $val, $where, $blobtype = 'BLOB')
 	{
-		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
+		switch (strtoupper($blobtype)) {
+		default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
 		}
@@ -697,10 +697,10 @@ 
 			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
 		
 		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
-		$arr['blob'] = array($desc,-1,$type);
+		$arr['blob'] = array($desc, -1, $type);
 		
 		$this->BeginTrans();
-		$rs = ADODB_oci8::Execute($sql,$arr);
+		$rs = ADODB_oci8::Execute($sql, $arr);
 		if ($rez = !empty($rs)) $desc->savefile($val);
 		$desc->free();
 		$this->CommitTrans();
@@ -716,11 +716,11 @@ 
 	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
 	 * @return 		RecordSet or false
 	 */
-	function &Execute($sql,$inputarr=false) 
+	function &Execute($sql, $inputarr = false) 
 	{
 		if ($this->fnExecute) {
 			$fn = $this->fnExecute;
-			$ret =& $fn($this,$sql,$inputarr);
+			$ret = & $fn($this, $sql, $inputarr);
 			if (isset($ret)) return $ret;
 		}
 		if ($inputarr) {
@@ -735,16 +735,16 @@ 
 				else
 					$stmt = $sql;
 					
-				foreach($inputarr as $arr) {
-					$ret =& $this->_Execute($stmt,$arr);
+				foreach ($inputarr as $arr) {
+					$ret = & $this->_Execute($stmt, $arr);
 					if (!$ret) return $ret;
 				}
 			} else {
-				$ret =& $this->_Execute($sql,$inputarr);
+				$ret = & $this->_Execute($sql, $inputarr);
 			}
 			
 		} else {
-			$ret =& $this->_Execute($sql,false);
+			$ret = & $this->_Execute($sql, false);
 		}
 
 		return $ret;
@@ -755,11 +755,11 @@ 
 		
 		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
 	*/
-	function Prepare($sql,$cursor=false)
+	function Prepare($sql, $cursor = false)
 	{
 	static $BINDNUM = 0;
 	
-		$stmt = OCIParse($this->_connectionID,$sql);
+		$stmt = OCIParse($this->_connectionID, $sql);
 
 		if (!$stmt) return false;
 
@@ -767,9 +767,9 @@ 
 		
 		$sttype = @OCIStatementType($stmt);
 		if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
-			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
+			return array($sql, $stmt, 0, $BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
 		}
-		return array($sql,$stmt,0,$BINDNUM);
+		return array($sql, $stmt, 0, $BINDNUM);
 	}
 	
 	/*
@@ -786,23 +786,23 @@ 
 				array('VAR1' => 'Mr Bean'));
 			
 	*/
-	function &ExecuteCursor($sql,$cursorName='rs',$params=false)
+	function &ExecuteCursor($sql, $cursorName = 'rs', $params = false)
 	{
 		if (is_array($sql)) $stmt = $sql;
-		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
+		else $stmt = ADODB_oci8::Prepare($sql, true); # true to allocate OCINewCursor
 	
 		if (is_array($stmt) && sizeof($stmt) >= 5) {
 			$hasref = true;
 			$this->Parameter($stmt, $ignoreCur, $cursorName, false, -1, OCI_B_CURSOR);
 			if ($params) {
-				foreach($params as $k => $v) {
-					$this->Parameter($stmt,$params[$k], $k);
+				foreach ($params as $k => $v) {
+					$this->Parameter($stmt, $params[$k], $k);
 				}
 			}
 		} else
 			$hasref = false;
 			
-		$rs =& $this->Execute($stmt);
+		$rs = & $this->Execute($stmt);
 		if ($rs->databaseType == 'array') OCIFreeCursor($stmt[4]);
 		else if ($hasref) $rs->_refcursor = $stmt[4];
 		return $rs;
@@ -838,18 +838,18 @@ 
 		Note that the order of parameters differs from OCIBindByName,
 		because we default the names to :0, :1, :2
 	*/
-	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
+	function Bind(&$stmt, &$var, $size = 4000, $type = false, $name = false, $isOutput = false)
 	{
 		
 		if (!is_array($stmt)) return false;
         
         if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
-            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
+            return OCIBindByName($stmt[1], ":".$name, $stmt[4], $size, $type);
         }
         
 		if ($name == false) {
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
+			if ($type !== false) $rez = OCIBindByName($stmt[1], ":".$stmt[2], $var, $size, $type);
+			else $rez = OCIBindByName($stmt[1], ":".$stmt[2], $var, $size); // +1 byte for null terminator
 			$stmt[2] += 1;
 		} else if (oci_lob_desc($type)) {
 			if ($this->debug) {
@@ -882,14 +882,14 @@ 
 			if ($this->debug) 
 				ADOConnection::outp("<b>Bind</b>: name = $name");
 			
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
+			if ($type !== false) $rez = OCIBindByName($stmt[1], ":".$name, $var, $size, $type);
+			else $rez = OCIBindByName($stmt[1], ":".$name, $var, $size); // +1 byte for null terminator
 		}
 		
 		return $rez;
 	}
 	
-	function Param($name,$type=false)
+	function Param($name, $type = false)
 	{
 		return ':'.$name;
 	}
@@ -910,14 +910,14 @@ 
 		
 		See OCIBindByName documentation at php.net.
 	*/
-	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
+	function Parameter(&$stmt, &$var, $name, $isOutput = false, $maxLen = 4000, $type = false)
 	{
-			if  ($this->debug) {
+			if ($this->debug) {
 				$prefix = ($isOutput) ? 'Out' : 'In';
 				$ztype = (empty($type)) ? 'false' : $type;
-				ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
+				ADOConnection::outp("{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
 			}
-			return $this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
+			return $this->Bind($stmt, $var, $maxLen, $type, $name, $isOutput);
 	}
 	
 	/*
@@ -935,7 +935,7 @@ 
 		  $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
 		  $db->execute($stmt);
 	*/ 
-	function _query($sql,$inputarr)
+	function _query($sql, $inputarr)
 	{
 		if (is_array($sql)) { // is prepared sql
 			$stmt = $sql[1];
@@ -950,38 +950,38 @@ 
 				} else {
 				// one statement to bind them all
 					$bindarr = array();
-					foreach($inputarr as $k => $v) {
+					foreach ($inputarr as $k => $v) {
 						$bindarr[$k] = $v;
-						OCIBindByName($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 4000);
+						OCIBindByName($stmt, ":$k", $bindarr[$k], is_string($v) && strlen($v) > 4000 ? -1 : 4000);
 					}
 					$this->_bind[$bindpos] = &$bindarr;
 				}
 			}
 		} else {
-			$stmt=OCIParse($this->_connectionID,$sql);
+			$stmt = OCIParse($this->_connectionID, $sql);
 		}
 			
 		$this->_stmt = $stmt;
 		if (!$stmt) return false;
 	
-		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
+		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt, ADODB_PREFETCH_ROWS);
 			
 		if (is_array($inputarr)) {
-			foreach($inputarr as $k => $v) {
+			foreach ($inputarr as $k => $v) {
 				if (is_array($v)) {
 					if (sizeof($v) == 2) // suggested by g.giunta@libero.
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
+						OCIBindByName($stmt, ":$k", $inputarr[$k][0], $v[1]);
 					else
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+						OCIBindByName($stmt, ":$k", $inputarr[$k][0], $v[1], $v[2]);
 					
-					if ($this->debug==99) echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'<br>';
+					if ($this->debug == 99) echo "name=:$k", ' var='.$inputarr[$k][0], ' len='.$v[1], ' type='.$v[2], '<br>';
 				} else {
 					$len = -1;
 					if ($v === ' ') $len = 1;
 					if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
 						$bindarr[$k] = $v;
 					} else { 				// dynamic sql, so rebind every time
-						OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+						OCIBindByName($stmt, ":$k", $inputarr[$k], $len);
 					}
 				}
 			}
@@ -989,7 +989,7 @@ 
 		
         $this->_errorMsg = false;
 		$this->_errorCode = false;
-		if (OCIExecute($stmt,$this->_commit)) {
+		if (OCIExecute($stmt, $this->_commit)) {
 //OCIInternalDebug(1);			
 			if (count($this -> _refLOBs) > 0) {
 		
@@ -1059,7 +1059,7 @@ 
 		$this->_connectionID = false;
 	}
 	
-	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
+	function MetaPrimaryKeys($table, $owner = false, $internalKey = false)
 	{
 		if ($internalKey) return array('ROWID');
 		
@@ -1083,9 +1083,9 @@ 
 
  		$rs = $this->Execute($sql);
 		if ($rs && !$rs->EOF) {
-			$arr =& $rs->GetArray();
+			$arr = & $rs->GetArray();
 			$a = array();
-			foreach($arr as $v) {
+			foreach ($arr as $v) {
 				$a[] = reset($v);
 			}
 			return $a;
@@ -1094,7 +1094,7 @@ 
 	}
 	
 	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
-	function MetaForeignKeys($table, $owner=false)
+	function MetaForeignKeys($table, $owner = false)
 	{
 	global $ADODB_FETCH_MODE;
 	
@@ -1114,9 +1114,9 @@ 
 	from {$tabp}constraints
 	where constraint_type = 'R' and table_name = $table $owner";
 		
-		$constraints =& $this->GetArray($sql);
+		$constraints = & $this->GetArray($sql);
 		$arr = false;
-		foreach($constraints as $constr) {
+		foreach ($constraints as $constr) {
 			$cons = $this->qstr($constr[0]);
 			$rowner = $this->qstr($constr[1]);
 			$rcons = $this->qstr($constr[2]);
@@ -1124,7 +1124,7 @@ 
 			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
 			
 			if ($cols && $tabcol) 
-				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
+				for ($i = 0, $max = sizeof($cols); $i < $max; $i++) {
 					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
 				}
 		}
@@ -1154,23 +1154,23 @@ 
 	 *
 	 * @return  quoted string to be sent back to database
 	 */
-	function qstr($s,$magic_quotes=false)
+	function qstr($s, $magic_quotes = false)
 	{	
-	$nofixquotes=false;
+	$nofixquotes = false;
 	
-		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
+		if ($this->noNullStrings && strlen($s) == 0)$s = ' ';
 		if (!$magic_quotes) {	
-			if ($this->replaceQuote[0] == '\\'){
-				$s = str_replace('\\','\\\\',$s);
+			if ($this->replaceQuote[0] == '\\') {
+				$s = str_replace('\\', '\\\\', $s);
 			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
+			return  "'".str_replace("'", $this->replaceQuote, $s)."'";
 		}
 		
 		// undo magic quotes for "
-		$s = str_replace('\\"','"',$s);
+		$s = str_replace('\\"', '"', $s);
 		
-		$s = str_replace('\\\\','\\',$s);
-		return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+		$s = str_replace('\\\\', '\\', $s);
+		return "'".str_replace("\\'", $this->replaceQuote, $s)."'";
 		
 	}
 	
@@ -1183,12 +1183,12 @@ 
 class ADORecordset_oci8 extends ADORecordSet {
 
 	var $databaseType = 'oci8';
-	var $bind=false;
+	var $bind = false;
 	var $_fieldobjs;
 	
 	//var $_arr = false;
 		
-	function ADORecordset_oci8($queryID,$mode=false)
+	function ADORecordset_oci8($queryID, $mode = false)
 	{
 		if ($mode === false) { 
 			global $ADODB_FETCH_MODE;
@@ -1196,12 +1196,12 @@ 
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC + OCI_RETURN_NULLS + OCI_RETURN_LOBS; break;
 		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM + OCI_ASSOC + OCI_RETURN_NULLS + OCI_RETURN_LOBS; break;
 		case ADODB_FETCH_NUM: 
 		default:
-		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		$this->fetchMode = OCI_NUM + OCI_RETURN_NULLS + OCI_RETURN_LOBS; break;
 		}
 		
 		$this->adodbFetchMode = $mode;
@@ -1243,10 +1243,10 @@ 
 	{
 		$this->_numOfRows = -1;
 		$this->_numOfFields = OCInumcols($this->_queryID);
-		if ($this->_numOfFields>0) {
+		if ($this->_numOfFields > 0) {
 			$this->_fieldobjs = array();
 			$max = $this->_numOfFields;
-			for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
+			for ($i = 0; $i < $max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
 		}
 	}
 
@@ -1259,7 +1259,7 @@ 
 	{
 		$fld = new ADOFieldObject;
 		$fieldOffset += 1;
-		$fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
+		$fld->name = OCIcolumnname($this->_queryID, $fieldOffset);
 		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
 		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
 	 	if ($fld->type == 'NUMBER') {
@@ -1297,7 +1297,7 @@ 
 	
 	function MoveNext()
 	{
-		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+		if (@OCIfetchinto($this->_queryID, $this->fields, $this->fetchMode)) {
 			$this->_currentRow += 1;
 			return true;
 		}
@@ -1343,16 +1343,16 @@ 
 	} */
 	
 	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
-	function &GetArrayLimit($nrows,$offset=-1) 
+	function &GetArrayLimit($nrows, $offset = -1) 
 	{
 		if ($offset <= 0) {
-			$arr =& $this->GetArray($nrows);
+			$arr = & $this->GetArray($nrows);
 			return $arr;
 		}
-		for ($i=1; $i < $offset; $i++) 
+		for ($i = 1; $i < $offset; $i++) 
 			if (!@OCIFetch($this->_queryID)) return array();
 			
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return array();
+		if (!@OCIfetchinto($this->_queryID, $this->fields, $this->fetchMode)) return array();
 		$results = array();
 		$cnt = 0;
 		while (!$this->EOF && $nrows != $cnt) {
@@ -1369,7 +1369,7 @@ 
 	{
 		if (!$this->bind) {
 			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
+			for ($i = 0; $i < $this->_numOfFields; $i++) {
 				$o = $this->FetchField($i);
 				$this->bind[strtoupper($o->name)] = $i;
 			}
@@ -1387,7 +1387,7 @@ 
 
 	function _fetch() 
 	{
-		return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
+		return @OCIfetchinto($this->_queryID, $this->fields, $this->fetchMode);
 	}
 
 	/*		close() only needs to be called if you are worried about using too much memory while your script
@@ -1405,7 +1405,7 @@ 
 		
 	}
 
-	function MetaType($t,$len=-1)
+	function MetaType($t, $len = -1)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;
@@ -1451,7 +1451,7 @@ 
 }
 
 class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
-	function ADORecordSet_ext_oci8($queryID,$mode=false) 
+	function ADORecordSet_ext_oci8($queryID, $mode = false) 
 	{
 		if ($mode === false) { 
 			global $ADODB_FETCH_MODE;
@@ -1459,11 +1459,11 @@ 
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC + OCI_RETURN_NULLS + OCI_RETURN_LOBS; break;
 		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM + OCI_ASSOC + OCI_RETURN_NULLS + OCI_RETURN_LOBS; break;
 		case ADODB_FETCH_NUM: 
-		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		default: $this->fetchMode = OCI_NUM + OCI_RETURN_NULLS + OCI_RETURN_LOBS; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->_queryID = $queryID;

Braces +658 added lines, -248 removed lines

@@ -15,7 +15,10 @@ 
 */
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
 /*
 NLS_Date_Format
@@ -40,8 +43,10 @@ 
 
 # define the LOB descriptor type for the given type
 # returns false if no LOB descriptor
-function oci_lob_desc($type) {
-	switch ($type) {
+function oci_lob_desc($type)
+{
+	switch ($type)
+	{
 		case OCI_B_BFILE: $result = OCI_D_FILE; break;
 		case OCI_B_CFILEE: $result = OCI_D_FILE; break;
 		case OCI_B_CLOB: $result = OCI_D_LOB; break;
@@ -52,7 +57,8 @@ 
 	return $result;
 }
 
-class ADODB_oci8 extends ADOConnection {
+class ADODB_oci8 extends ADOConnection
+{
 	var $databaseType = 'oci8';
 	var $dataProvider = 'oci8';
 	var $replaceQuote = "''"; // string to use to replace quotes
@@ -88,10 +94,13 @@ 
 	
 	// var $ansiOuter = true; // if oracle9
     
-	function ADODB_oci8() 
+	function ADODB_oci8()
 	{
 		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
-		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
+		if (defined('ADODB_EXTENSION'))
+		{
+			$this->rsPrefix .= 'ext_';
+		}
 	}
 	
 	/*  Function &MetaColumns($table) added by smondino@users.sourceforge.net*/
@@ -102,23 +111,33 @@ 
 		$false = false;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		if ($this->fetchMode !== false)
+		{
+			$savem = $this->SetFetchMode(false);
+		}
 		
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
 		
-		if (isset($savem)) $this->SetFetchMode($savem);
+		if (isset($savem))
+		{
+			$this->SetFetchMode($savem);
+		}
 		$ADODB_FETCH_MODE = $save;
-		if (!$rs) {
+		if (!$rs)
+		{
 			return $false;
 		}
 		$retarr = array();
-		while (!$rs->EOF) { //print_r($rs->fields);
+		while (!$rs->EOF)
+		{
+//print_r($rs->fields);
 			$fld = new ADOFieldObject();
 	   		$fld->name = $rs->fields[0];
 	   		$fld->type = $rs->fields[1];
 	   		$fld->max_length = $rs->fields[2];
 			$fld->scale = $rs->fields[3];
-			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
+			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0)
+			{
 				$fld->type ='INT';
 	     		$fld->max_length = $rs->fields[4];
 	    	}	
@@ -126,21 +145,32 @@ 
 			$fld->binary = (strpos($fld->type,'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];
 			
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
-			else $retarr[strtoupper($fld->name)] = $fld;
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM)
+			{
+				$retarr[] = $fld;
+			}
+			else {
+				$retarr[strtoupper($fld->name)] = $fld;
+			}
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
-			return  $false;
-		else 
-			return $retarr;
+		{
+					return  $false;
+		}
+		else {
+					return $retarr;
+		}
 	}
 	
 	function Time()
 	{
 		$rs =& $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
-		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
+		if ($rs && !$rs->EOF)
+		{
+			return $this->UnixTimeStamp(reset($rs->fields));
+		}
 		
 		return false;
 	}
@@ -181,54 +211,81 @@ 
 */
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
 	{
-		if (!function_exists('OCIPLogon')) return null;
+		if (!function_exists('OCIPLogon'))
+		{
+			return null;
+		}
 		
 		
         $this->_errorMsg = false;
 		$this->_errorCode = false;
 		
-		if($argHostname) { // added by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
-			if (empty($argDatabasename)) $argDatabasename = $argHostname;
-			else {
-				if(strpos($argHostname,":")) {
+		if($argHostname)
+		{
+// added by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
+			if (empty($argDatabasename))
+			{
+				$argDatabasename = $argHostname;
+			}
+			else
+			{
+				if(strpos($argHostname,":"))
+				{
 					$argHostinfo=explode(":",$argHostname);
 				   	$argHostname=$argHostinfo[0];
 					$argHostport=$argHostinfo[1];
-			 	} else {
+			 	}
+			 	else
+			 	{
 					$argHostport="1521";
 	   			}
 				
-				if ($this->connectSID) {
+				if ($this->connectSID)
+				{
 					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-				} else
-					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+				}
+				else {
+									$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
+				}
 			}
 		}
 				
  		//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
-		if ($mode==1) {
+		if ($mode==1)
+		{
 			$this->_connectionID = ($this->charSet) ? 
 				OCIPLogon($argUsername,$argPassword, $argDatabasename)
 				:
 				OCIPLogon($argUsername,$argPassword, $argDatabasename, $this->charSet)
 				;
-			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
-		} else if ($mode==2) {
+			if ($this->_connectionID && $this->autoRollback)
+			{
+				OCIrollback($this->_connectionID);
+			}
+		}
+		else if ($mode==2)
+		{
 			$this->_connectionID = ($this->charSet) ? 
 				OCINLogon($argUsername,$argPassword, $argDatabasename)
 				:
 				OCINLogon($argUsername,$argPassword, $argDatabasename, $this->charSet);
 				
-		} else {
+		}
+		else
+		{
 			$this->_connectionID = ($this->charSet) ? 
 				OCILogon($argUsername,$argPassword, $argDatabasename)
 				:
 				OCILogon($argUsername,$argPassword, $argDatabasename,$this->charSet);
 		}
-		if (!$this->_connectionID) return false;
-		if ($this->_initdate) {
+		if (!$this->_connectionID)
+		{
+			return false;
+		}
+		if ($this->_initdate)
+		{
 			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
 		}
 		
@@ -260,11 +317,14 @@ 
 	
 	function _affectedrows()
 	{
-		if (is_resource($this->_stmt)) return @OCIRowCount($this->_stmt);
+		if (is_resource($this->_stmt))
+		{
+			return @OCIRowCount($this->_stmt);
+		}
 		return 0;
 	}
 	
-	function IfNull( $field, $ifNull ) 
+	function IfNull( $field, $ifNull )
 	{
 		return " NVL($field, $ifNull) "; // if Oracle
 	}
@@ -272,9 +332,15 @@ 
 	// format and return date string in database date format
 	function DBDate($d)
 	{
-		if (empty($d) && $d !== 0) return 'null';
+		if (empty($d) && $d !== 0)
+		{
+			return 'null';
+		}
 		
-		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+		if (is_string($d))
+		{
+			$d = ADORecordSet::UnixDate($d);
+		}
 		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
 	}
 
@@ -282,27 +348,38 @@ 
 	// format and return date string in database timestamp format
 	function DBTimeStamp($ts)
 	{
-		if (empty($ts) && $ts !== 0) return 'null';
-		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
+		if (empty($ts) && $ts !== 0)
+		{
+			return 'null';
+		}
+		if (is_string($ts))
+		{
+			$ts = ADORecordSet::UnixTimeStamp($ts);
+		}
 		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
 	
-	function RowLock($tables,$where,$flds='1 as ignore') 
+	function RowLock($tables,$where,$flds='1 as ignore')
 	{
-		if ($this->autoCommit) $this->BeginTrans();
+		if ($this->autoCommit)
+		{
+			$this->BeginTrans();
+		}
 		return $this->GetOne("select $flds from $tables where $where for update");
 	}
 	
 	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
 	{
-		if ($mask) {
+		if ($mask)
+		{
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtoupper($mask));
 			$this->metaTablesSQL .= " AND table_name like $mask";
 		}
 		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
 		
-		if ($mask) {
+		if ($mask)
+		{
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
@@ -317,7 +394,8 @@ 
         $save = $ADODB_FETCH_MODE;
         $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 
-        if ($this->fetchMode !== FALSE) {
+        if ($this->fetchMode !== FALSE)
+        {
                $savem = $this->SetFetchMode(FALSE);
         }
 
@@ -330,11 +408,17 @@ 
 		$false = false;
 		$rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
 		if ($row = $rs->FetchRow())
-		   $primary_key = $row[1]; //constraint_name
+		{
+				   $primary_key = $row[1];
+		}
+		//constraint_name
 
-		if ($primary==TRUE && $primary_key=='') {
-			 if (isset($savem)) 
-                $this->SetFetchMode($savem);
+		if ($primary==TRUE && $primary_key=='')
+		{
+			 if (isset($savem))
+			 {
+			                 $this->SetFetchMode($savem);
+			 }
 			$ADODB_FETCH_MODE = $save;
 			return $false; //There is no primary key
 		}
@@ -342,9 +426,12 @@ 
         $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
 
 		
-        if (!is_object($rs)) {
-			if (isset($savem)) 
-				$this->SetFetchMode($savem);
+        if (!is_object($rs))
+        {
+			if (isset($savem))
+			{
+							$this->SetFetchMode($savem);
+			}
 			$ADODB_FETCH_MODE = $save;
             return $false;
         }
@@ -352,9 +439,14 @@ 
 		$indexes = array ();
         // parse index data into array
 
-        while ($row = $rs->FetchRow()) {
-			if ($primary && $row[0] != $primary_key) continue;
-            if (!isset($indexes[$row[0]])) {
+        while ($row = $rs->FetchRow())
+        {
+			if ($primary && $row[0] != $primary_key)
+			{
+				continue;
+			}
+            if (!isset($indexes[$row[0]]))
+            {
 				$indexes[$row[0]] = array(
 				   'unique' => ($row[1] == 'UNIQUE'),
 				   'columns' => array()
@@ -364,11 +456,13 @@ 
         }
 
         // sort columns by order in the index
-        foreach ( array_keys ($indexes) as $index ) {
+        foreach ( array_keys ($indexes) as $index )
+        {
             ksort ($indexes[$index]['columns']);
         }
 
-		if (isset($savem)) { 
+		if (isset($savem))
+		{
             $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
@@ -376,20 +470,32 @@ 
 	}
 	
 	function BeginTrans()
-	{	
-		if ($this->transOff) return true;
+	{
+		if ($this->transOff)
+		{
+			return true;
+		}
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 		$this->_commit = OCI_DEFAULT;
 		return true;
 	}
 	
-	function CommitTrans($ok=true) 
-	{ 
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff)
+		{
+			return true;
+		}
+		if (!$ok)
+		{
+			return $this->RollbackTrans();
+		}
 		
-		if ($this->transCnt) $this->transCnt -= 1;
+		if ($this->transCnt)
+		{
+			$this->transCnt -= 1;
+		}
 		$ret = OCIcommit($this->_connectionID);
 		$this->_commit = OCI_COMMIT_ON_SUCCESS;
 		$this->autoCommit = true;
@@ -398,8 +504,14 @@ 
 	
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true;
-		if ($this->transCnt) $this->transCnt -= 1;
+		if ($this->transOff)
+		{
+			return true;
+		}
+		if ($this->transCnt)
+		{
+			$this->transCnt -= 1;
+		}
 		$ret = OCIrollback($this->_connectionID);
 		$this->_commit = OCI_COMMIT_ON_SUCCESS;
 		$this->autoCommit = true;
@@ -407,35 +519,61 @@ 
 	}
 	
 	
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		return false;
 	}
 
-	function ErrorMsg() 
+	function ErrorMsg()
 	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
+		if ($this->_errorMsg !== false)
+		{
+			return $this->_errorMsg;
+		}
 
-		if (is_resource($this->_stmt)) $arr = @OCIerror($this->_stmt);
-		if (empty($arr)) {
+		if (is_resource($this->_stmt))
+		{
+			$arr = @OCIerror($this->_stmt);
+		}
+		if (empty($arr))
+		{
 			$arr = @OCIerror($this->_connectionID);
-			if ($arr === false) $arr = @OCIError();
-			if ($arr === false) return '';
+			if ($arr === false)
+			{
+				$arr = @OCIError();
+			}
+			if ($arr === false)
+			{
+				return '';
+			}
 		}
 		$this->_errorMsg = $arr['message'];
 		$this->_errorCode = $arr['code'];
 		return $this->_errorMsg;
 	}
 
-	function ErrorNo() 
+	function ErrorNo()
 	{
-		if ($this->_errorCode !== false) return $this->_errorCode;
+		if ($this->_errorCode !== false)
+		{
+			return $this->_errorCode;
+		}
 		
-		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
-		if (empty($arr)) {
+		if (is_resource($this->_stmt))
+		{
+			$arr = @OCIError($this->_stmt);
+		}
+		if (empty($arr))
+		{
 			$arr = @OCIError($this->_connectionID);
-			if ($arr == false) $arr = @OCIError();
-			if ($arr == false) return '';
+			if ($arr == false)
+			{
+				$arr = @OCIError();
+			}
+			if ($arr == false)
+			{
+				return '';
+			}
 		}
 		
 		$this->_errorMsg = $arr['message'];
@@ -446,14 +584,19 @@ 
 	
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
-		if (!$col) $col = $this->sysTimeStamp;
+	{
+		if (!$col)
+		{
+			$col = $this->sysTimeStamp;
+		}
 		$s = 'TO_CHAR('.$col.",'";
 		
 		$len = strlen($fmt);
-		for ($i=0; $i < $len; $i++) {
+		for ($i=0; $i < $len; $i++)
+		{
 			$ch = $fmt[$i];
-			switch($ch) {
+			switch($ch)
+			{
 			case 'Y':
 			case 'y':
 				$s .= 'YYYY';
@@ -506,12 +649,18 @@ 
 				
 			default:
 			// handle escape characters...
-				if ($ch == '\\') {
+				if ($ch == '\\')
+				{
 					$i++;
 					$ch = substr($fmt,$i,1);
 				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
+				if (strpos('-/.:;, ',$ch) !== false)
+				{
+					$s .= $ch;
+				}
+				else {
+					$s .= '"'.$ch.'"';
+				}
 				
 			}
 		}
@@ -537,20 +686,32 @@ 
 	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		// seems that oracle only supports 1 hint comment in 8i
-		if ($this->firstrows) {
+		if ($this->firstrows)
+		{
 			if (strpos($sql,'/*+') !== false)
-				$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
-			else
-				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
+			{
+							$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
+			}
+			else {
+							$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
+			}
 		}
 		
-		if ($offset < $this->selectOffsetAlg1) {
-			if ($nrows > 0) {	
-				if ($offset > 0) $nrows += $offset;
+		if ($offset < $this->selectOffsetAlg1)
+		{
+			if ($nrows > 0)
+			{
+				if ($offset > 0)
+				{
+					$nrows += $offset;
+				}
 				//$inputarr['adodb_rownum'] = $nrows;
-				if ($this->databaseType == 'oci8po') {
+				if ($this->databaseType == 'oci8po')
+				{
 					$sql = "select * from (".$sql.") where rownum <= ?";
-				} else {
+				}
+				else
+				{
 					$sql = "select * from (".$sql.") where rownum <= :adodb_offset";
 				} 
 				$inputarr['adodb_offset'] = $nrows;
@@ -561,44 +722,66 @@ 
 			$rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
 			return $rs;
 			
-		} else {
+		}
+		else
+		{
 			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
 			
 			 // Let Oracle return the name of the columns
 			$q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
 			 
 			$false = false;
-			if (! $stmt_arr = $this->Prepare($q_fields)) {
+			if (! $stmt_arr = $this->Prepare($q_fields))
+			{
 				return $false;
 			}
 			$stmt = $stmt_arr[1];
 			 
-			 if (is_array($inputarr)) {
-			 	foreach($inputarr as $k => $v) {
-					if (is_array($v)) {
-						if (sizeof($v) == 2) // suggested by g.giunta@libero.
+			 if (is_array($inputarr))
+			 {
+			 	foreach($inputarr as $k => $v)
+			 	{
+					if (is_array($v))
+					{
+						if (sizeof($v) == 2)
+						{
+							// suggested by g.giunta@libero.
 							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-						else
-							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
-					} else {
+						}
+						else {
+													OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+						}
+					}
+					else
+					{
 						$len = -1;
-						if ($v === ' ') $len = 1;
-						if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
+						if ($v === ' ')
+						{
+							$len = 1;
+						}
+						if (isset($bindarr))
+						{
+// is prepared sql, so no need to ocibindbyname again
 							$bindarr[$k] = $v;
-						} else { 				// dynamic sql, so rebind every time
+						}
+						else
+						{
+// dynamic sql, so rebind every time
 							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
 						}
 					}
 				}
 			}
 			
-			 if (!OCIExecute($stmt, OCI_DEFAULT)) {
+			 if (!OCIExecute($stmt, OCI_DEFAULT))
+			 {
 				 OCIFreeStatement($stmt); 
 				 return $false;
 			 }
 			 
 			 $ncols = OCINumCols($stmt);
-			 for ( $i = 1; $i <= $ncols; $i++ ) {
+			 for ( $i = 1; $i <= $ncols; $i++ )
+			 {
 				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
 			 }
 			 $result = false;
@@ -608,12 +791,15 @@ 
 			 $nrows += $offset;
 			 $offset += 1; // in Oracle rownum starts at 1
 			
-			if ($this->databaseType == 'oci8po') {
+			if ($this->databaseType == 'oci8po')
+			{
 					 $sql = "SELECT $fields FROM".
 					  "(SELECT rownum as adodb_rownum, $fields FROM".
 					  " ($sql) WHERE rownum <= ?".
 					  ") WHERE adodb_rownum >= ?";
-				} else {
+				}
+				else
+				{
 					 $sql = "SELECT $fields FROM".
 					  "(SELECT rownum as adodb_rownum, $fields FROM".
 					  " ($sql) WHERE rownum <= :adodb_nrows".
@@ -622,8 +808,13 @@ 
 				$inputarr['adodb_nrows'] = $nrows;
 				$inputarr['adodb_offset'] = $offset;
 				
-			if ($secs2cache>0) $rs =& $this->CacheExecute($secs2cache, $sql,$inputarr);
-			else $rs =& $this->Execute($sql,$inputarr);
+			if ($secs2cache>0)
+			{
+				$rs =& $this->CacheExecute($secs2cache, $sql,$inputarr);
+			}
+			else {
+				$rs =& $this->Execute($sql,$inputarr);
+			}
 			return $rs;
 		}
 	
@@ -654,29 +845,51 @@ 
 		
 		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
 		
-		switch(strtoupper($blobtype)) {
+		switch(strtoupper($blobtype))
+		{
 		default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
 		}
 		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+		if ($this->databaseType == 'oci8po')
+		{
+					$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
+		}
+		else {
+					$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+		}
 		
 		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+		if ($this->session_sharing_force_blob)
+		{
+			$this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+		}
 		$commit = $this->autoCommit;
-		if ($commit) $this->BeginTrans();
+		if ($commit)
+		{
+			$this->BeginTrans();
+		}
 		$rs = $this->Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->save($val);
+		if ($rez = !empty($rs))
+		{
+			$desc->save($val);
+		}
 		$desc->free();
-		if ($commit) $this->CommitTrans();
-		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
+		if ($commit)
+		{
+			$this->CommitTrans();
+		}
+		if ($this->session_sharing_force_blob)
+		{
+			$this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
+		}
 		
-		if ($rez) $rs->Close();
+		if ($rez)
+		{
+			$rs->Close();
+		}
 		return $rez;
 	}
 	
@@ -685,27 +898,37 @@ 
 	*/
 	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
 	{
-		switch(strtoupper($blobtype)) {
+		switch(strtoupper($blobtype))
+		{
 		default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
 		case 'BLOB': $type = OCI_B_BLOB; break;
 		case 'CLOB': $type = OCI_B_CLOB; break;
 		}
 		
-		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
-		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+		if ($this->databaseType == 'oci8po')
+		{
+					$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
+		}
+		else {
+					$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+		}
 		
 		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);
 		
 		$this->BeginTrans();
 		$rs = ADODB_oci8::Execute($sql,$arr);
-		if ($rez = !empty($rs)) $desc->savefile($val);
+		if ($rez = !empty($rs))
+		{
+			$desc->savefile($val);
+		}
 		$desc->free();
 		$this->CommitTrans();
 		
-		if ($rez) $rs->Close();
+		if ($rez)
+		{
+			$rs->Close();
+		}
 		return $rez;
 	}
 
@@ -718,32 +941,49 @@ 
 	 */
 	function &Execute($sql,$inputarr=false) 
 	{
-		if ($this->fnExecute) {
+		if ($this->fnExecute)
+		{
 			$fn = $this->fnExecute;
 			$ret =& $fn($this,$sql,$inputarr);
-			if (isset($ret)) return $ret;
+			if (isset($ret))
+			{
+				return $ret;
+			}
 		}
-		if ($inputarr) {
+		if ($inputarr)
+		{
 			#if (!is_array($inputarr)) $inputarr = array($inputarr);
 			
 			$element0 = reset($inputarr);
 			
 			# is_object check because oci8 descriptors can be passed in
-			if (is_array($element0) && !is_object(reset($element0))) {
+			if (is_array($element0) && !is_object(reset($element0)))
+			{
 				if (is_string($sql))
-					$stmt = $this->Prepare($sql);
-				else
-					$stmt = $sql;
+				{
+									$stmt = $this->Prepare($sql);
+				}
+				else {
+									$stmt = $sql;
+				}
 					
-				foreach($inputarr as $arr) {
+				foreach($inputarr as $arr)
+				{
 					$ret =& $this->_Execute($stmt,$arr);
-					if (!$ret) return $ret;
+					if (!$ret)
+					{
+						return $ret;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				$ret =& $this->_Execute($sql,$inputarr);
 			}
 			
-		} else {
+		}
+		else
+		{
 			$ret =& $this->_Execute($sql,false);
 		}
 
@@ -761,12 +1001,16 @@ 
 	
 		$stmt = OCIParse($this->_connectionID,$sql);
 
-		if (!$stmt) return false;
+		if (!$stmt)
+		{
+			return false;
+		}
 
 		$BINDNUM += 1;
 		
 		$sttype = @OCIStatementType($stmt);
-		if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
+		if ($sttype == 'BEGIN' || $sttype == 'DECLARE')
+		{
 			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
 		}
 		return array($sql,$stmt,0,$BINDNUM);
@@ -788,23 +1032,40 @@ 
 	*/
 	function &ExecuteCursor($sql,$cursorName='rs',$params=false)
 	{
-		if (is_array($sql)) $stmt = $sql;
-		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
+		if (is_array($sql))
+		{
+			$stmt = $sql;
+		}
+		else {
+			$stmt = ADODB_oci8::Prepare($sql,true);
+		}
+		# true to allocate OCINewCursor
 	
-		if (is_array($stmt) && sizeof($stmt) >= 5) {
+		if (is_array($stmt) && sizeof($stmt) >= 5)
+		{
 			$hasref = true;
 			$this->Parameter($stmt, $ignoreCur, $cursorName, false, -1, OCI_B_CURSOR);
-			if ($params) {
-				foreach($params as $k => $v) {
+			if ($params)
+			{
+				foreach($params as $k => $v)
+				{
 					$this->Parameter($stmt,$params[$k], $k);
 				}
 			}
-		} else
-			$hasref = false;
+		}
+		else {
+					$hasref = false;
+		}
 			
 		$rs =& $this->Execute($stmt);
-		if ($rs->databaseType == 'array') OCIFreeCursor($stmt[4]);
-		else if ($hasref) $rs->_refcursor = $stmt[4];
+		if ($rs->databaseType == 'array')
+		{
+			OCIFreeCursor($stmt[4]);
+		}
+		else if ($hasref)
+		{
+			$rs->_refcursor = $stmt[4];
+		}
 		return $rs;
 	}
 	
@@ -841,18 +1102,32 @@ 
 	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
 	{
 		
-		if (!is_array($stmt)) return false;
+		if (!is_array($stmt))
+		{
+			return false;
+		}
         
-        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
+        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5)
+        {
             return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
         }
         
-		if ($name == false) {
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
+		if ($name == false)
+		{
+			if ($type !== false)
+			{
+				$rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
+			}
+			else {
+				$rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size);
+			}
+			// +1 byte for null terminator
 			$stmt[2] += 1;
-		} else if (oci_lob_desc($type)) {
-			if ($this->debug) {
+		}
+		else if (oci_lob_desc($type))
+		{
+			if ($this->debug)
+			{
 				ADOConnection::outp("<b>Bind</b>: name = $name");
 			}
             //we have to create a new Descriptor here
@@ -862,28 +1137,43 @@ 
 			
 			$tmp = &$this->_refLOBs[$numlob]['LOB'];
 	        $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
-			if ($this->debug) {
+			if ($this->debug)
+			{
 				ADOConnection::outp("<b>Bind</b>: descriptor has been allocated, var (".$name.") binded");
 			}
 			
 			// if type is input then write data to lob now
-			if ($isOutput == false) {
+			if ($isOutput == false)
+			{
 				$var = $this->BlobEncode($var);
 				$tmp->WriteTemporary($var);
 				$this->_refLOBs[$numlob]['VAR'] = &$var;
-				if ($this->debug) {
+				if ($this->debug)
+				{
 					ADOConnection::outp("<b>Bind</b>: LOB has been written to temp");
 				}
-			} else {
+			}
+			else
+			{
 				$this->_refLOBs[$numlob]['VAR'] = &$var;
 			}
 			$rez = $tmp;
-		} else {
-			if ($this->debug) 
-				ADOConnection::outp("<b>Bind</b>: name = $name");
+		}
+		else
+		{
+			if ($this->debug)
+			{
+							ADOConnection::outp("<b>Bind</b>: name = $name");
+			}
 			
-			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
-			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
+			if ($type !== false)
+			{
+				$rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
+			}
+			else {
+				$rez = OCIBindByName($stmt[1],":".$name,$var,$size);
+			}
+			// +1 byte for null terminator
 		}
 		
 		return $rez;
@@ -912,7 +1202,8 @@ 
 	*/
 	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
 	{
-			if  ($this->debug) {
+			if  ($this->debug)
+			{
 				$prefix = ($isOutput) ? 'Out' : 'In';
 				$ztype = (empty($type)) ? 'false' : $type;
 				ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
@@ -937,50 +1228,85 @@ 
 	*/ 
 	function _query($sql,$inputarr)
 	{
-		if (is_array($sql)) { // is prepared sql
+		if (is_array($sql))
+		{
+// is prepared sql
 			$stmt = $sql[1];
 			
 			// we try to bind to permanent array, so that OCIBindByName is persistent
 			// and carried out once only - note that max array element size is 4000 chars
-			if (is_array($inputarr)) {
+			if (is_array($inputarr))
+			{
 				$bindpos = $sql[3];
-				if (isset($this->_bind[$bindpos])) {
+				if (isset($this->_bind[$bindpos]))
+				{
 				// all tied up already
 					$bindarr = &$this->_bind[$bindpos];
-				} else {
+				}
+				else
+				{
 				// one statement to bind them all
 					$bindarr = array();
-					foreach($inputarr as $k => $v) {
+					foreach($inputarr as $k => $v)
+					{
 						$bindarr[$k] = $v;
 						OCIBindByName($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 4000);
 					}
 					$this->_bind[$bindpos] = &$bindarr;
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$stmt=OCIParse($this->_connectionID,$sql);
 		}
 			
 		$this->_stmt = $stmt;
-		if (!$stmt) return false;
+		if (!$stmt)
+		{
+			return false;
+		}
 	
-		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
+		if (defined('ADODB_PREFETCH_ROWS'))
+		{
+			@OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
+		}
 			
-		if (is_array($inputarr)) {
-			foreach($inputarr as $k => $v) {
-				if (is_array($v)) {
-					if (sizeof($v) == 2) // suggested by g.giunta@libero.
+		if (is_array($inputarr))
+		{
+			foreach($inputarr as $k => $v)
+			{
+				if (is_array($v))
+				{
+					if (sizeof($v) == 2)
+					{
+						// suggested by g.giunta@libero.
 						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
-					else
-						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+					}
+					else {
+											OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+					}
 					
-					if ($this->debug==99) echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'<br>';
-				} else {
+					if ($this->debug==99)
+					{
+						echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'<br>';
+					}
+				}
+				else
+				{
 					$len = -1;
-					if ($v === ' ') $len = 1;
-					if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
+					if ($v === ' ')
+					{
+						$len = 1;
+					}
+					if (isset($bindarr))
+					{
+// is prepared sql, so no need to ocibindbyname again
 						$bindarr[$k] = $v;
-					} else { 				// dynamic sql, so rebind every time
+					}
+					else
+					{
+// dynamic sql, so rebind every time
 						OCIBindByName($stmt,":$k",$inputarr[$k],$len);
 					}
 				}
@@ -989,44 +1315,58 @@ 
 		
         $this->_errorMsg = false;
 		$this->_errorCode = false;
-		if (OCIExecute($stmt,$this->_commit)) {
+		if (OCIExecute($stmt,$this->_commit))
+		{
 //OCIInternalDebug(1);			
-			if (count($this -> _refLOBs) > 0) {
+			if (count($this -> _refLOBs) > 0)
+			{
 		
-				foreach ($this -> _refLOBs as $key => $value) {
-					if ($this -> _refLOBs[$key]['TYPE'] == true) {
+				foreach ($this -> _refLOBs as $key => $value)
+				{
+					if ($this -> _refLOBs[$key]['TYPE'] == true)
+					{
 						$tmp = $this -> _refLOBs[$key]['LOB'] -> load();
-						if ($this -> debug) {
+						if ($this -> debug)
+						{
 							ADOConnection::outp("<b>OUT LOB</b>: LOB has been loaded. <br>");
 						}
 						//$_GLOBALS[$this -> _refLOBs[$key]['VAR']] = $tmp;
 						$this -> _refLOBs[$key]['VAR'] = $tmp;
-					} else {
+					}
+					else
+					{
                         $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
 						$this -> _refLOBs[$key]['LOB']->free();
 						unset($this -> _refLOBs[$key]);
-                        if ($this->debug) {
+                        if ($this->debug)
+                        {
 							ADOConnection::outp("<b>IN LOB</b>: LOB has been saved. <br>");
 						}
                     }					
 				}
 			}
 		
-            switch (@OCIStatementType($stmt)) {
+            switch (@OCIStatementType($stmt))
+            {
                 case "SELECT":
 					return $stmt;
 				
 				case 'DECLARE':
                 case "BEGIN":
-                    if (is_array($sql) && !empty($sql[4])) {
+                    if (is_array($sql) && !empty($sql[4]))
+                    {
 						$cursor = $sql[4];
-						if (is_resource($cursor)) {
+						if (is_resource($cursor))
+						{
 							$ok = OCIExecute($cursor);	
 	                        return $cursor;
 						}
 						return $stmt;
-                    } else {
-						if (is_resource($stmt)) {
+                    }
+                    else
+                    {
+						if (is_resource($stmt))
+						{
 							OCIFreeStatement($stmt);
 							return true;
 						}
@@ -1044,11 +1384,19 @@ 
 	// returns true or false
 	function _close()
 	{
-		if (!$this->_connectionID) return;
+		if (!$this->_connectionID)
+		{
+			return;
+		}
 		
-		if (!$this->autoCommit) OCIRollback($this->_connectionID);
-		if (count($this->_refLOBs) > 0) {
-			foreach ($this ->_refLOBs as $key => $value) {
+		if (!$this->autoCommit)
+		{
+			OCIRollback($this->_connectionID);
+		}
+		if (count($this->_refLOBs) > 0)
+		{
+			foreach ($this ->_refLOBs as $key => $value)
+			{
 				$this->_refLOBs[$key]['LOB']->free();
 				unset($this->_refLOBs[$key]);
 			}
@@ -1061,14 +1409,20 @@ 
 	
 	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
 	{
-		if ($internalKey) return array('ROWID');
+		if ($internalKey)
+		{
+			return array('ROWID');
+		}
 		
 	// tested with oracle 8.1.7
 		$table = strtoupper($table);
-		if ($owner) {
+		if ($owner)
+		{
 			$owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER = UPPER('$owner')))";
 			$ptab = 'ALL_';
-		} else {
+		}
+		else
+		{
 			$owner_clause = '';
 			$ptab = 'USER_';
 		}
@@ -1082,15 +1436,19 @@ 
 	AND (a.constraint_name = b.constraint_name)";
 
  		$rs = $this->Execute($sql);
-		if ($rs && !$rs->EOF) {
+		if ($rs && !$rs->EOF)
+		{
 			$arr =& $rs->GetArray();
 			$a = array();
-			foreach($arr as $v) {
+			foreach($arr as $v)
+			{
 				$a[] = reset($v);
 			}
 			return $a;
 		}
-		else return false;
+		else {
+			return false;
+		}
 	}
 	
 	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
@@ -1101,11 +1459,14 @@ 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		$table = $this->qstr(strtoupper($table));
-		if (!$owner) {
+		if (!$owner)
+		{
 			$owner = $this->user;
 			$tabp = 'user_';
-		} else
-			$tabp = 'all_';
+		}
+		else {
+					$tabp = 'all_';
+		}
 			
 		$owner = ' and owner='.$this->qstr(strtoupper($owner));
 		
@@ -1116,15 +1477,20 @@ 
 		
 		$constraints =& $this->GetArray($sql);
 		$arr = false;
-		foreach($constraints as $constr) {
+		foreach($constraints as $constr)
+		{
 			$cons = $this->qstr($constr[0]);
 			$rowner = $this->qstr($constr[1]);
 			$rcons = $this->qstr($constr[2]);
 			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
 			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
 			
-			if ($cols && $tabcol) 
-				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
+			if ($cols && $tabcol)
+			{
+							for ($i=0, $max=sizeof($cols);
+			}
+			$i < $max; $i++)
+				{
 					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
 				}
 		}
@@ -1155,12 +1521,17 @@ 
 	 * @return  quoted string to be sent back to database
 	 */
 	function qstr($s,$magic_quotes=false)
-	{	
+	{
 	$nofixquotes=false;
 	
-		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
-		if (!$magic_quotes) {	
-			if ($this->replaceQuote[0] == '\\'){
+		if ($this->noNullStrings && strlen($s)==0)
+		{
+			$s = ' ';
+		}
+		if (!$magic_quotes)
+		{
+			if ($this->replaceQuote[0] == '\\')
+			{
 				$s = str_replace('\\','\\\\',$s);
 			}
 			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
@@ -1180,7 +1551,8 @@ 
 		 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordset_oci8 extends ADORecordSet {
+class ADORecordset_oci8 extends ADORecordSet
+{
 
 	var $databaseType = 'oci8';
 	var $bind=false;
@@ -1190,7 +1562,8 @@ 
 		
 	function ADORecordset_oci8($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false)
+		{
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -1211,10 +1584,14 @@ 
 
 	function Init()
 	{
-		if ($this->_inited) return;
+		if ($this->_inited)
+		{
+			return;
+		}
 		
 		$this->_inited = true;
-		if ($this->_queryID) {
+		if ($this->_queryID)
+		{
 			
 			$this->_currentRow = 0;
 			@$this->_initrs();
@@ -1227,11 +1604,14 @@ 
 			if ($err && $this->connection->debug) ADOConnection::outp($err);
 			*/
 			
-			if (!is_array($this->fields)) {
+			if (!is_array($this->fields))
+			{
 				$this->_numOfRows = 0;
 				$this->fields = array();
 			}
-		} else {
+		}
+		else
+		{
 			$this->fields = array();
 			$this->_numOfRows = 0;
 			$this->_numOfFields = 0;
@@ -1243,10 +1623,14 @@ 
 	{
 		$this->_numOfRows = -1;
 		$this->_numOfFields = OCInumcols($this->_queryID);
-		if ($this->_numOfFields>0) {
+		if ($this->_numOfFields>0)
+		{
 			$this->_fieldobjs = array();
 			$max = $this->_numOfFields;
-			for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
+			for ($i=0;$i<$max; $i++)
+			{
+				$this->_fieldobjs[] = $this->_FetchField($i);
+			}
 		}
 	}
 
@@ -1262,10 +1646,14 @@ 
 		$fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
 		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
 		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
-	 	if ($fld->type == 'NUMBER') {
+	 	if ($fld->type == 'NUMBER')
+	 	{
 	 		$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
 			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
-			if ($p != 0 && $sc == 0) $fld->type = 'INT';
+			if ($p != 0 && $sc == 0)
+			{
+				$fld->type = 'INT';
+			}
 			//echo " $this->name ($p.$sc) ";
 	 	}
 		return $fld;
@@ -1297,11 +1685,13 @@ 
 	
 	function MoveNext()
 	{
-		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
+		{
 			$this->_currentRow += 1;
 			return true;
 		}
-		if (!$this->EOF) {
+		if (!$this->EOF)
+		{
 			$this->_currentRow += 1;
 			$this->EOF = true;
 		}
@@ -1345,17 +1735,24 @@ 
 	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
 	function &GetArrayLimit($nrows,$offset=-1) 
 	{
-		if ($offset <= 0) {
+		if ($offset <= 0)
+		{
 			$arr =& $this->GetArray($nrows);
 			return $arr;
 		}
-		for ($i=1; $i < $offset; $i++) 
-			if (!@OCIFetch($this->_queryID)) return array();
+		for ($i=1; $i < $offset; $i++)
+		{
+					if (!@OCIFetch($this->_queryID)) return array();
+		}
 			
-		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return array();
+		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
+		{
+			return array();
+		}
 		$results = array();
 		$cnt = 0;
-		while (!$this->EOF && $nrows != $cnt) {
+		while (!$this->EOF && $nrows != $cnt)
+		{
 			$results[$cnt++] = $this->fields;
 			$this->MoveNext();
 		}
@@ -1367,9 +1764,11 @@ 
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
-		if (!$this->bind) {
+		if (!$this->bind)
+		{
 			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
+			for ($i=0; $i < $this->_numOfFields; $i++)
+			{
 				$o = $this->FetchField($i);
 				$this->bind[strtoupper($o->name)] = $i;
 			}
@@ -1385,7 +1784,7 @@ 
 		return false;
 	}
 
-	function _fetch() 
+	function _fetch()
 	{
 		return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
 	}
@@ -1393,10 +1792,14 @@ 
 	/*		close() only needs to be called if you are worried about using too much memory while your script
 			is running. All associated result memory for the specified result identifier will automatically be freed.		*/
 
-	function _close() 
+	function _close()
 	{
-		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
-		if (!empty($this->_refcursor)) {
+		if ($this->connection->_stmt === $this->_queryID)
+		{
+			$this->connection->_stmt = false;
+		}
+		if (!empty($this->_refcursor))
+		{
 			OCIFreeCursor($this->_refcursor);
 			$this->_refcursor = false;
 		}
@@ -1407,12 +1810,14 @@ 
 
 	function MetaType($t,$len=-1)
 	{
-		if (is_object($t)) {
+		if (is_object($t))
+		{
 			$fieldobj = $t;
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		switch (strtoupper($t)) {
+		switch (strtoupper($t))
+		{
 	 	case 'VARCHAR':
 	 	case 'VARCHAR2':
 		case 'CHAR':
@@ -1421,7 +1826,10 @@ 
 		case 'NCHAR':
 		case 'NVARCHAR':
 		case 'NVARCHAR2':
-				 if (isset($this) && $len <= $this->blobSize) return 'C';
+				 if (isset($this) && $len <= $this->blobSize)
+				 {
+				 	return 'C';
+				 }
 		
 		case 'NCLOB':
 		case 'LONG':
@@ -1450,10 +1858,12 @@ 
 	}
 }
 
-class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
-	function ADORecordSet_ext_oci8($queryID,$mode=false) 
+class ADORecordSet_ext_oci8 extends ADORecordSet_oci8
+{
+	function ADORecordSet_ext_oci8($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false)
+		{
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -609,12 +609,12 @@ 
 			 $offset += 1; // in Oracle rownum starts at 1
 			
 			if ($this->databaseType == 'oci8po') {
-					 $sql = "SELECT $fields FROM".
+					 $sql = "select $fields FROM".
 					  "(SELECT rownum as adodb_rownum, $fields FROM".
 					  " ($sql) WHERE rownum <= ?".
 					  ") WHERE adodb_rownum >= ?";
 				} else {
-					 $sql = "SELECT $fields FROM".
+					 $sql = "select $fields FROM".
 					  "(SELECT rownum as adodb_rownum, $fields FROM".
 					  " ($sql) WHERE rownum <= :adodb_nrows".
 					  ") WHERE adodb_rownum >= :adodb_offset";
@@ -661,9 +661,9 @@ 
 		}
 		
 		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
+			$sql = "update $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
 		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+			$sql = "update $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
 		
 		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);
@@ -692,9 +692,9 @@ 
 		}
 		
 		if ($this->databaseType == 'oci8po') 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
+			$sql = "update $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
 		else 
-			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+			$sql = "update $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
 		
 		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
 		$arr['blob'] = array($desc,-1,$type);

phpgwapi/inc/adodb/drivers/adodb-oracle.inc.php

Doc Comments +4 added lines

@@ -155,6 +155,10 @@
 
 
 		// returns query ID if successful, otherwise false
+
+		/**
+		 * @param string $sql
+		 */
 		function _query($sql,$inputarr=false)
 		{
             // <G. Giunta 2003/03/03/> Reset error messages before executing

Indentation +16 added lines, -16 removed lines

@@ -95,9 +95,9 @@ 
 	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
 	function ErrorMsg()
  	{
-        if ($this->_errorMsg !== false) return $this->_errorMsg;
+		if ($this->_errorMsg !== false) return $this->_errorMsg;
 
-        if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
+		if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
  		if (empty($this->_errorMsg)) $this->_errorMsg = @ora_error($this->_connectionID);
 		return $this->_errorMsg;
 	}
@@ -109,7 +109,7 @@ 
 
 		if (is_resource($this->_curs)) $this->_errorCode = @ora_errorcode($this->_curs);
 		if (empty($this->_errorCode)) $this->_errorCode = @ora_errorcode($this->_connectionID);
-        return $this->_errorCode;
+		return $this->_errorCode;
 	}
 
 
@@ -119,12 +119,12 @@ 
 		{
 			if (!function_exists('ora_plogon')) return null;
 
-            // <G. Giunta 2003/03/03/> Reset error messages before connecting
-            $this->_errorMsg = false;
-		    $this->_errorCode = false;
+			// <G. Giunta 2003/03/03/> Reset error messages before connecting
+			$this->_errorMsg = false;
+			$this->_errorCode = false;
 
-            // G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
-            // the oracle home to the host name of remote DB?
+			// G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
+			// the oracle home to the host name of remote DB?
 //			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
 
 			if($argHostname) { // code copied from version submitted for oci8 by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
@@ -177,9 +177,9 @@ 
 		// returns query ID if successful, otherwise false
 		function _query($sql,$inputarr=false)
 		{
-            // <G. Giunta 2003/03/03/> Reset error messages before executing
-            $this->_errorMsg = false;
-		    $this->_errorCode = false;
+			// <G. Giunta 2003/03/03/> Reset error messages before executing
+			$this->_errorMsg = false;
+			$this->_errorCode = false;
 
 			$curs = ora_open($this->_connectionID);
 
@@ -187,11 +187,11 @@ 
 			$this->_curs = $curs;
 			if (!ora_parse($curs,$sql)) return false;
 			if (ora_exec($curs)) return $curs;
-            // <G. Giunta 2004/03/03> before we close the cursor, we have to store the error message
-            // that we can obtain ONLY from the cursor (and not from the connection)
-            $this->_errorCode = @ora_errorcode($curs);
-            $this->_errorMsg = @ora_error($curs);
-            // </G. Giunta 2004/03/03>
+			// <G. Giunta 2004/03/03> before we close the cursor, we have to store the error message
+			// that we can obtain ONLY from the cursor (and not from the connection)
+			$this->_errorCode = @ora_errorcode($curs);
+			$this->_errorMsg = @ora_error($curs);
+			// </G. Giunta 2004/03/03>
 		 	@ora_close($curs);
 			return false;
 		}

Switch Indentation +24 added lines, -24 removed lines

@@ -310,30 +310,30 @@
 		}
 
 		switch (strtoupper($t)) {
-		case 'VARCHAR':
-		case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-				if ($len <= $this->blobSize) return 'C';
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-				return 'B';
-
-		case 'DATE': return 'D';
-
-		//case 'T': return 'T';
-
-		case 'BIT': return 'L';
-		case 'INT':
-		case 'SMALLINT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
+			case 'VARCHAR':
+			case 'VARCHAR2':
+			case 'CHAR':
+			case 'VARBINARY':
+			case 'BINARY':
+					if ($len <= $this->blobSize) return 'C';
+			case 'LONG':
+			case 'LONG VARCHAR':
+			case 'CLOB':
+			return 'X';
+			case 'LONG RAW':
+			case 'LONG VARBINARY':
+			case 'BLOB':
+					return 'B';
+
+			case 'DATE': return 'D';
+
+			//case 'T': return 'T';
+
+			case 'BIT': return 'L';
+			case 'INT':
+			case 'SMALLINT':
+			case 'INTEGER': return 'I';
+			default: return 'N';
 		}
 	}
 }

Spacing +27 added lines, -27 removed lines

@@ -20,7 +20,7 @@ 
 class ADODB_oracle extends ADOConnection {
 	var $databaseType = "oracle";
 	var $replaceQuote = "''"; // string to use to replace quotes
-	var $concat_operator='||';
+	var $concat_operator = '||';
 	var $_curs;
 	var $_initdate = true; // init date to YYYY-MM-DD
 	var $metaTablesSQL = 'select table_name from cat';
@@ -34,7 +34,7 @@ 
 	{
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
 		if (is_object($d)) $ds = $d->format($this->fmtDate);
-		else $ds = adodb_date($this->fmtDate,$d);
+		else $ds = adodb_date($this->fmtDate, $d);
 		return 'TO_DATE('.$ds.",'YYYY-MM-DD')";
 	}
 
@@ -44,7 +44,7 @@ 
 
 		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
 		if (is_object($ts)) $ds = $ts->format($this->fmtDate);
-		else $ds = adodb_date($this->fmtTimeStamp,$ts);
+		else $ds = adodb_date($this->fmtTimeStamp, $ts);
 		return 'TO_DATE('.$ds.",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
 
@@ -52,17 +52,17 @@ 
 	function BindDate($d)
 	{
 		$d = ADOConnection::DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
+		if (strncmp($d, "'", 1)) return $d;
 
-		return substr($d,1,strlen($d)-2);
+		return substr($d, 1, strlen($d) - 2);
 	}
 
 	function BindTimeStamp($d)
 	{
 		$d = ADOConnection::DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
+		if (strncmp($d, "'", 1)) return $d;
 
-		return substr($d,1,strlen($d)-2);
+		return substr($d, 1, strlen($d) - 2);
 	}
 
 
@@ -75,7 +75,7 @@ 
 	}
 
 
-	function CommitTrans($ok=true)
+	function CommitTrans($ok = true)
 	{
 		   if (!$ok) return $this->RollbackTrans();
 		   $ret = ora_commit($this->_connectionID);
@@ -115,7 +115,7 @@ 
 
 
 		// returns true or false
-		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
+		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode = 0)
 		{
 			if (!function_exists('ora_plogon')) return null;
 
@@ -127,23 +127,23 @@ 
             // the oracle home to the host name of remote DB?
 //			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
 
-			if($argHostname) { // code copied from version submitted for oci8 by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
+			if ($argHostname) { // code copied from version submitted for oci8 by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
 				if (empty($argDatabasename)) $argDatabasename = $argHostname;
 				else {
-					if(strpos($argHostname,":")) {
-						$argHostinfo=explode(":",$argHostname);
-						$argHostname=$argHostinfo[0];
-						$argHostport=$argHostinfo[1];
+					if (strpos($argHostname, ":")) {
+						$argHostinfo = explode(":", $argHostname);
+						$argHostname = $argHostinfo[0];
+						$argHostport = $argHostinfo[1];
 					} else {
-						$argHostport="1521";
+						$argHostport = "1521";
 					}
 
 
 					if ($this->connectSID) {
-						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+						$argDatabasename = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 						.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
 					} else
-						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+						$argDatabasename = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 						.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
 				}
 
@@ -153,9 +153,9 @@ 
 
 		//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
 			if ($mode == 1)
-				$this->_connectionID = ora_plogon($argUsername,$argPassword);
+				$this->_connectionID = ora_plogon($argUsername, $argPassword);
 			else
-				$this->_connectionID = ora_logon($argUsername,$argPassword);
+				$this->_connectionID = ora_logon($argUsername, $argPassword);
 			if ($this->_connectionID === false) return false;
 			if ($this->autoCommit) ora_commiton($this->_connectionID);
 			if ($this->_initdate) {
@@ -175,7 +175,7 @@ 
 
 
 		// returns query ID if successful, otherwise false
-		function _query($sql,$inputarr=false)
+		function _query($sql, $inputarr = false)
 		{
             // <G. Giunta 2003/03/03/> Reset error messages before executing
             $this->_errorMsg = false;
@@ -185,7 +185,7 @@ 
 
 		 	if ($curs === false) return false;
 			$this->_curs = $curs;
-			if (!ora_parse($curs,$sql)) return false;
+			if (!ora_parse($curs, $sql)) return false;
 			if (ora_exec($curs)) return $curs;
             // <G. Giunta 2004/03/03> before we close the cursor, we have to store the error message
             // that we can obtain ONLY from the cursor (and not from the connection)
@@ -217,7 +217,7 @@ 
 	var $databaseType = "oracle";
 	var $bind = false;
 
-	function __construct($queryID,$mode=false)
+	function __construct($queryID, $mode = false)
 	{
 
 		if ($mode === false) {
@@ -264,7 +264,7 @@ 
 	{
 		if (!$this->bind) {
 			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
+			for ($i = 0; $i < $this->_numOfFields; $i++) {
 				$o = $this->FetchField($i);
 				$this->bind[strtoupper($o->name)] = $i;
 			}
@@ -285,12 +285,12 @@ 
 		   return false;
    }
 
-   function _fetch($ignore_fields=false) {
+   function _fetch($ignore_fields = false) {
 // should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
-		if ($this->fetchMode & ADODB_FETCH_ASSOC)
-			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
+		if ($this->fetchMode&ADODB_FETCH_ASSOC)
+			return @ora_fetch_into($this->_queryID, $this->fields, ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
    		else
-			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS);
+			return @ora_fetch_into($this->_queryID, $this->fields, ORA_FETCHINTO_NULLS);
    }
 
    /*		close() only needs to be called if you are worried about using too much memory while your script

Braces +156 added lines, -53 removed lines

@@ -15,9 +15,13 @@ 
 */
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
-class ADODB_oracle extends ADOConnection {
+class ADODB_oracle extends ADOConnection
+{
 	var $databaseType = "oracle";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $concat_operator='||';
@@ -32,9 +36,17 @@ 
 	// format and return date string in database date format
 	function DBDate($d, $isfld = false)
 	{
-		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		if (is_object($d)) $ds = $d->format($this->fmtDate);
-		else $ds = adodb_date($this->fmtDate,$d);
+		if (is_string($d))
+		{
+			$d = ADORecordSet::UnixDate($d);
+		}
+		if (is_object($d))
+		{
+			$ds = $d->format($this->fmtDate);
+		}
+		else {
+			$ds = adodb_date($this->fmtDate,$d);
+		}
 		return 'TO_DATE('.$ds.",'YYYY-MM-DD')";
 	}
 
@@ -42,9 +54,17 @@ 
 	function DBTimeStamp($ts, $isfld = false)
 	{
 
-		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
-		if (is_object($ts)) $ds = $ts->format($this->fmtDate);
-		else $ds = adodb_date($this->fmtTimeStamp,$ts);
+		if (is_string($ts))
+		{
+			$ts = ADORecordSet::UnixTimeStamp($ts);
+		}
+		if (is_object($ts))
+		{
+			$ds = $ts->format($this->fmtDate);
+		}
+		else {
+			$ds = adodb_date($this->fmtTimeStamp,$ts);
+		}
 		return 'TO_DATE('.$ds.",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
 
@@ -52,7 +72,10 @@ 
 	function BindDate($d)
 	{
 		$d = ADOConnection::DBDate($d);
-		if (strncmp($d,"'",1)) return $d;
+		if (strncmp($d,"'",1))
+		{
+			return $d;
+		}
 
 		return substr($d,1,strlen($d)-2);
 	}
@@ -60,7 +83,10 @@ 
 	function BindTimeStamp($d)
 	{
 		$d = ADOConnection::DBTimeStamp($d);
-		if (strncmp($d,"'",1)) return $d;
+		if (strncmp($d,"'",1))
+		{
+			return $d;
+		}
 
 		return substr($d,1,strlen($d)-2);
 	}
@@ -77,7 +103,10 @@ 
 
 	function CommitTrans($ok=true)
 	{
-		   if (!$ok) return $this->RollbackTrans();
+		   if (!$ok)
+		   {
+		   	return $this->RollbackTrans();
+		   }
 		   $ret = ora_commit($this->_connectionID);
 		   ora_commiton($this->_connectionID);
 		   return $ret;
@@ -94,21 +123,39 @@ 
 
 	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
 	function ErrorMsg()
- 	{
-        if ($this->_errorMsg !== false) return $this->_errorMsg;
-
-        if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
- 		if (empty($this->_errorMsg)) $this->_errorMsg = @ora_error($this->_connectionID);
+	{
+        if ($this->_errorMsg !== false)
+        {
+        	return $this->_errorMsg;
+        }
+
+        if (is_resource($this->_curs))
+        {
+        	$this->_errorMsg = @ora_error($this->_curs);
+        }
+ 		if (empty($this->_errorMsg))
+ 		{
+ 			$this->_errorMsg = @ora_error($this->_connectionID);
+ 		}
 		return $this->_errorMsg;
 	}
 
 
 	function ErrorNo()
 	{
-		if ($this->_errorCode !== false) return $this->_errorCode;
+		if ($this->_errorCode !== false)
+		{
+			return $this->_errorCode;
+		}
 
-		if (is_resource($this->_curs)) $this->_errorCode = @ora_errorcode($this->_curs);
-		if (empty($this->_errorCode)) $this->_errorCode = @ora_errorcode($this->_connectionID);
+		if (is_resource($this->_curs))
+		{
+			$this->_errorCode = @ora_errorcode($this->_curs);
+		}
+		if (empty($this->_errorCode))
+		{
+			$this->_errorCode = @ora_errorcode($this->_connectionID);
+		}
         return $this->_errorCode;
 	}
 
@@ -117,7 +164,10 @@ 
 		// returns true or false
 		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
 		{
-			if (!function_exists('ora_plogon')) return null;
+			if (!function_exists('ora_plogon'))
+			{
+				return null;
+			}
 
             // <G. Giunta 2003/03/03/> Reset error messages before connecting
             $this->_errorMsg = false;
@@ -127,40 +177,68 @@ 
             // the oracle home to the host name of remote DB?
 //			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
 
-			if($argHostname) { // code copied from version submitted for oci8 by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
-				if (empty($argDatabasename)) $argDatabasename = $argHostname;
-				else {
-					if(strpos($argHostname,":")) {
+			if($argHostname)
+			{
+// code copied from version submitted for oci8 by Jorma Tuomainen <jorma.tuomainen@ppoy.fi>
+				if (empty($argDatabasename))
+				{
+					$argDatabasename = $argHostname;
+				}
+				else
+				{
+					if(strpos($argHostname,":"))
+					{
 						$argHostinfo=explode(":",$argHostname);
 						$argHostname=$argHostinfo[0];
 						$argHostport=$argHostinfo[1];
-					} else {
+					}
+					else
+					{
 						$argHostport="1521";
 					}
 
 
-					if ($this->connectSID) {
+					if ($this->connectSID)
+					{
 						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 						.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
-					} else
-						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+					}
+					else {
+											$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
 						.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
+					}
 				}
 
 			}
 
-			if ($argDatabasename) $argUsername .= "@$argDatabasename";
+			if ($argDatabasename)
+			{
+				$argUsername .= "@$argDatabasename";
+			}
 
 		//if ($argHostname) print "<p>Connect: 1st argument should be left blank for $this->databaseType</p>";
 			if ($mode == 1)
-				$this->_connectionID = ora_plogon($argUsername,$argPassword);
-			else
-				$this->_connectionID = ora_logon($argUsername,$argPassword);
-			if ($this->_connectionID === false) return false;
-			if ($this->autoCommit) ora_commiton($this->_connectionID);
-			if ($this->_initdate) {
+			{
+							$this->_connectionID = ora_plogon($argUsername,$argPassword);
+			}
+			else {
+							$this->_connectionID = ora_logon($argUsername,$argPassword);
+			}
+			if ($this->_connectionID === false)
+			{
+				return false;
+			}
+			if ($this->autoCommit)
+			{
+				ora_commiton($this->_connectionID);
+			}
+			if ($this->_initdate)
+			{
 				$rs = $this->_query("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
-				if ($rs) ora_close($rs);
+				if ($rs)
+				{
+					ora_close($rs);
+				}
 			}
 
 			return true;
@@ -183,10 +261,19 @@ 
 
 			$curs = ora_open($this->_connectionID);
 
-		 	if ($curs === false) return false;
+		 	if ($curs === false)
+		 	{
+		 		return false;
+		 	}
 			$this->_curs = $curs;
-			if (!ora_parse($curs,$sql)) return false;
-			if (ora_exec($curs)) return $curs;
+			if (!ora_parse($curs,$sql))
+			{
+				return false;
+			}
+			if (ora_exec($curs))
+			{
+				return $curs;
+			}
             // <G. Giunta 2004/03/03> before we close the cursor, we have to store the error message
             // that we can obtain ONLY from the cursor (and not from the connection)
             $this->_errorCode = @ora_errorcode($curs);
@@ -212,7 +299,8 @@ 
 		 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordset_oracle extends ADORecordSet {
+class ADORecordset_oracle extends ADORecordSet
+{
 
 	var $databaseType = "oracle";
 	var $bind = false;
@@ -220,7 +308,8 @@ 
 	function __construct($queryID,$mode=false)
 	{
 
-		if ($mode === false) {
+		if ($mode === false)
+		{
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -230,11 +319,14 @@ 
 
 		$this->_inited = true;
 		$this->fields = array();
-		if ($queryID) {
+		if ($queryID)
+		{
 			$this->_currentRow = 0;
 			$this->EOF = !$this->_fetch();
 			@$this->_initrs();
-		} else {
+		}
+		else
+		{
 			$this->_numOfRows = 0;
 			$this->_numOfFields = 0;
 			$this->EOF = true;
@@ -262,9 +354,11 @@ 
 	/* Use associative array to get fields array */
 	function Fields($colname)
 	{
-		if (!$this->bind) {
+		if (!$this->bind)
+		{
 			$this->bind = array();
-			for ($i=0; $i < $this->_numOfFields; $i++) {
+			for ($i=0; $i < $this->_numOfFields; $i++)
+			{
 				$o = $this->FetchField($i);
 				$this->bind[strtoupper($o->name)] = $i;
 			}
@@ -285,37 +379,46 @@ 
 		   return false;
    }
 
-   function _fetch($ignore_fields=false) {
+   function _fetch($ignore_fields=false)
+   {
 // should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
 		if ($this->fetchMode & ADODB_FETCH_ASSOC)
-			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
-   		else
-			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS);
+		{
+					return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
+		}
+   		else {
+   					return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS);
+   		}
    }
 
    /*		close() only needs to be called if you are worried about using too much memory while your script
 		   is running. All associated result memory for the specified result identifier will automatically be freed.		*/
 
    function _close()
-{
+   {
 		   return @ora_close($this->_queryID);
    }
 
 	function MetaType($t, $len = -1, $fieldobj = false)
 	{
-		if (is_object($t)) {
+		if (is_object($t))
+		{
 			$fieldobj = $t;
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
 
-		switch (strtoupper($t)) {
+		switch (strtoupper($t))
+		{
 		case 'VARCHAR':
 		case 'VARCHAR2':
 		case 'CHAR':
 		case 'VARBINARY':
 		case 'BINARY':
-				if ($len <= $this->blobSize) return 'C';
+				if ($len <= $this->blobSize)
+				{
+					return 'C';
+				}
 		case 'LONG':
 		case 'LONG VARCHAR':
 		case 'CLOB':