Whitespace

5 files changed, 81 insertions, 76 deletions

diff --git a/drivers/adodb-access.inc.php b/drivers/adodb-access.inc.php
index 9bb832c1..d1017df4 100644
--- a/drivers/adodb-access.inc.php
+++ b/drivers/adodb-access.inc.php
@@ -17,8 +17,9 @@ if (!defined('_ADODB_ODBC_LAYER')) {
 
 	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
- if (!defined('_ADODB_ACCESS')) {
- 	define('_ADODB_ACCESS',1);
+
+if (!defined('_ADODB_ACCESS')) {
+	define('_ADODB_ACCESS',1);
 
 class  ADODB_access extends ADODB_odbc {
 	var $databaseType = 'access';
@@ -84,5 +85,7 @@ class  ADORecordSet_access extends ADORecordSet_odbc {
 	{
 		return parent::__construct($id,$mode);
 	}
-}// class
+
+} // class
+
 }
diff --git a/drivers/adodb-ado_mssql.inc.php b/drivers/adodb-ado_mssql.inc.php
index d81fcec8..b378b672 100644
--- a/drivers/adodb-ado_mssql.inc.php
+++ b/drivers/adodb-ado_mssql.inc.php
@@ -43,12 +43,12 @@ class  ADODB_ado_mssql extends ADODB_ado {
 
 	function _insertid()
 	{
-	        return $this->GetOne('select SCOPE_IDENTITY()');
+			return $this->GetOne('select SCOPE_IDENTITY()');
 	}
 
 	function _affectedrows()
 	{
-	        return $this->GetOne('select @@rowcount');
+			return $this->GetOne('select @@rowcount');
 	}
 
 	function SetTransactionMode( $transaction_mode )
@@ -70,32 +70,32 @@ class  ADODB_ado_mssql extends ADODB_ado {
 
 	function MetaColumns($table, $normalize=true)
 	{
-        $table = strtoupper($table);
-        $arr= array();
-        $dbc = $this->_connectionID;
+		$table = strtoupper($table);
+		$arr= array();
+		$dbc = $this->_connectionID;
 
-        $osoptions = array();
-        $osoptions[0] = null;
-        $osoptions[1] = null;
-        $osoptions[2] = $table;
-        $osoptions[3] = null;
+		$osoptions = array();
+		$osoptions[0] = null;
+		$osoptions[1] = null;
+		$osoptions[2] = $table;
+		$osoptions[3] = null;
 
-        $adors=@$dbc->OpenSchema(4, $osoptions);//tables
+		$adors=@$dbc->OpenSchema(4, $osoptions);//tables
 
-        if ($adors){
-                while (!$adors->EOF){
-                        $fld = new ADOFieldObject();
-                        $c = $adors->Fields(3);
-                        $fld->name = $c->Value;
-                        $fld->type = 'CHAR'; // cannot discover type in ADO!
-                        $fld->max_length = -1;
-                        $arr[strtoupper($fld->name)]=$fld;
+		if ($adors){
+			while (!$adors->EOF){
+				$fld = new ADOFieldObject();
+				$c = $adors->Fields(3);
+				$fld->name = $c->Value;
+				$fld->type = 'CHAR'; // cannot discover type in ADO!
+				$fld->max_length = -1;
+				$arr[strtoupper($fld->name)]=$fld;
 
-                        $adors->MoveNext();
-                }
-                $adors->Close();
-        }
-        $false = false;
+				$adors->MoveNext();
+			}
+			$adors->Close();
+		}
+		$false = false;
 		return empty($arr) ? $false : $arr;
 	}
 
@@ -137,14 +137,14 @@ class  ADODB_ado_mssql extends ADODB_ado {
 		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
 	}
 
-	} // end class
+} // end class
 
-	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {
+class ADORecordSet_ado_mssql extends ADORecordSet_ado {
 
 	var $databaseType = 'ado_mssql';
 
 	function __construct($id,$mode=false)
 	{
-	        return parent::__construct($id,$mode);
+		return parent::__construct($id,$mode);
 	}
 }
diff --git a/drivers/adodb-csv.inc.php b/drivers/adodb-csv.inc.php
index 44ff510a..36ec1f1c 100644
--- a/drivers/adodb-csv.inc.php
+++ b/drivers/adodb-csv.inc.php
@@ -44,12 +44,12 @@ class ADODB_csv extends ADOConnection {
 
 	function _insertid()
 	{
-			return $this->_insertid;
+		return $this->_insertid;
 	}
 
 	function _affectedrows()
 	{
-			return $this->_affectedrows;
+		return $this->_affectedrows;
 	}
 
   	function MetaDatabases()
@@ -176,7 +176,7 @@ class ADODB_csv extends ADOConnection {
 	/*	Returns: the last error message from previous database operation	*/
 	function ErrorMsg()
 	{
-			return $this->_errorMsg;
+		return $this->_errorMsg;
 	}
 
 	/*	Returns: the last error number from previous database operation	*/
diff --git a/drivers/adodb-proxy.inc.php b/drivers/adodb-proxy.inc.php
index dd354aec..ca5708bf 100644
--- a/drivers/adodb-proxy.inc.php
+++ b/drivers/adodb-proxy.inc.php
@@ -15,19 +15,21 @@
 if (!defined('ADODB_DIR')) die();
 
 if (! defined("_ADODB_PROXY_LAYER")) {
-	 define("_ADODB_PROXY_LAYER", 1 );
-	 include(ADODB_DIR."/drivers/adodb-csv.inc.php");
+	define("_ADODB_PROXY_LAYER", 1 );
+	include(ADODB_DIR."/drivers/adodb-csv.inc.php");
 
-	class ADODB_proxy extends ADODB_csv {
-		var $databaseType = 'proxy';
-		var $databaseProvider = 'csv';
-	}
-	class ADORecordset_proxy extends ADORecordset_csv {
+class ADODB_proxy extends ADODB_csv {
+	var $databaseType = 'proxy';
+	var $databaseProvider = 'csv';
+}
+
+class ADORecordset_proxy extends ADORecordset_csv {
 	var $databaseType = "proxy";
 
-		function __construct($id,$mode=false)
-		{
-			parent::__construct($id,$mode);
-		}
-	};
+	function __construct($id,$mode=false)
+	{
+		parent::__construct($id,$mode);
+	}
+}
+
 } // define
diff --git a/drivers/adodb-sapdb.inc.php b/drivers/adodb-sapdb.inc.php
index ed4a3088..fb3be603 100644
--- a/drivers/adodb-sapdb.inc.php
+++ b/drivers/adodb-sapdb.inc.php
@@ -55,7 +55,7 @@ class ADODB_SAPDB extends ADODB_odbc {
 		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos");
 	}
 
- 	function MetaIndexes ($table, $primary = FALSE, $owner = false)
+	function MetaIndexes ($table, $primary = FALSE, $owner = false)
 	{
 		$table = $this->Quote(strtoupper($table));
 
@@ -65,43 +65,43 @@ class ADODB_SAPDB extends ADODB_odbc {
 
 		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()) {
-            $indexes[$row[0]]['unique'] = $row[1] == 'UNIQUE';
-            $indexes[$row[0]]['columns'][] = $row[2];
-    	}
+			$indexes[$row[0]]['unique'] = $row[1] == 'UNIQUE';
+			$indexes[$row[0]]['columns'][] = $row[2];
+		}
 		if ($primary) {
 			$indexes['SYSPRIMARYKEYINDEX'] = array(
 					'unique' => True,	// by definition
 					'columns' => $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos"),
 				);
 		}
-        return $indexes;
+		return $indexes;
 	}
 
 	function MetaColumns ($table, $normalize = true)
 	{
 		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);
+		}
 		$table = $this->Quote(strtoupper($table));
 
 		$retarr = array();
@@ -134,10 +134,10 @@ class ADODB_SAPDB extends ADODB_odbc {
 			}
 			$retarr[$fld->name] = $fld;
 		}
-        if (isset($savem)) {
-        	$this->SetFetchMode($savem);
-        }
-        $ADODB_FETCH_MODE = $save;
+		if (isset($savem)) {
+			$this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
 
 		return $retarr;
 	}
@@ -158,13 +158,13 @@ class ADODB_SAPDB extends ADODB_odbc {
 	/*
 		SelectLimit implementation problems:
 
-	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
-	 	which is not ideal...
+		The following will return random 10 rows as order by performed after "WHERE rowno<10"
+		which is not ideal...
 
-	  		select * from table where rowno < 10 order by 1
+			select * from table where rowno < 10 order by 1
 
-	  	This means that we have to use the adoconnection base class SelectLimit when
-	  	there is an "order by".
+		This means that we have to use the adoconnection base class SelectLimit when
+		there is an "order by".
 
 		See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
 	 */
@@ -172,7 +172,7 @@ class ADODB_SAPDB extends ADODB_odbc {
 };
 
 
-class  ADORecordSet_sapdb extends ADORecordSet_odbc {
+class ADORecordSet_sapdb extends ADORecordSet_odbc {
 
 	var $databaseType = "sapdb";