EGroupware / egroupware

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

@@ -75,9 +75,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;
 	}
@@ -89,7 +89,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;
 	}
 
 	
@@ -99,12 +99,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>
@@ -157,9 +157,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);
 		 
@@ -167,11 +167,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 +21 added lines, -21 removed lines

@@ -290,30 +290,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 '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 'DATE': return 'D';
 		
-		//case 'T': return 'T';
+			//case 'T': return 'T';
 		
-		case 'BIT': return 'L';
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
+			case 'BIT': return 'L';
+			case 'INT': 
+			case 'SMALLINT':
+			case 'INTEGER': return 'I';
+			default: return 'N';
 		}
 	}
 }

Spacing +24 added lines, -24 removed lines

@@ -18,7 +18,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';	
@@ -35,7 +35,7 @@ 
 	function DBDate($d)
 	{
 		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-		return 'TO_DATE('.adodb_date($this->fmtDate,$d).",'YYYY-MM-DD')";
+		return 'TO_DATE('.adodb_date($this->fmtDate, $d).",'YYYY-MM-DD')";
 	}
 	
 	// format and return date string in database timestamp format
@@ -43,7 +43,7 @@ 
 	{
 
 		if (is_string($ts)) $d = 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')";
 	}
 
 	
@@ -55,7 +55,7 @@ 
 	}
 
 	
-	function CommitTrans($ok=true) 
+	function CommitTrans($ok = true) 
 	{ 
 		   if (!$ok) return $this->RollbackTrans();
 		   $ret = ora_commit($this->_connectionID);
@@ -95,7 +95,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;
 				
@@ -107,23 +107,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)))";
 				}
 
@@ -133,9 +133,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) {
@@ -155,7 +155,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;
@@ -165,7 +165,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)
@@ -197,7 +197,7 @@ 
 	var $databaseType = "oracle";
 	var $bind = false;
 
-	function ADORecordset_oracle($queryID,$mode=false)
+	function ADORecordset_oracle($queryID, $mode = false)
 	{
 		
 		if ($mode === false) { 
@@ -244,7 +244,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;
 			}
@@ -265,12 +265,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
@@ -281,7 +281,7 @@ 
 		   return @ora_close($this->_queryID);
    }
 
-	function MetaType($t,$len=-1)
+	function MetaType($t, $len = -1)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;

Braces +141 added lines, -54 removed lines

@@ -13,9 +13,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='||';
@@ -27,14 +31,17 @@ 
 	var $sysTimeStamp = 'SYSDATE';
 	var $connectSID = true;
 	
-	function ADODB_oracle() 
+	function ADODB_oracle()
 	{
 	}
 
 	// format and return date string in database date format
 	function DBDate($d)
 	{
-		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+		if (is_string($d))
+		{
+			$d = ADORecordSet::UnixDate($d);
+		}
 		return 'TO_DATE('.adodb_date($this->fmtDate,$d).",'YYYY-MM-DD')";
 	}
 	
@@ -42,22 +49,28 @@ 
 	function DBTimeStamp($ts)
 	{
 
-		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
+		if (is_string($ts))
+		{
+			$d = ADORecordSet::UnixTimeStamp($ts);
+		}
 		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
 
 	
 	function BeginTrans()
-	{	  
+	{
 		 $this->autoCommit = false;
 		 ora_commitoff($this->_connectionID);
 		 return true;
 	}
 
 	
-	function CommitTrans($ok=true) 
-	{ 
-		   if (!$ok) return $this->RollbackTrans();
+	function CommitTrans($ok=true)
+	{
+		   if (!$ok)
+		   {
+		   	return $this->RollbackTrans();
+		   }
 		   $ret = ora_commit($this->_connectionID);
 		   ora_commiton($this->_connectionID);
 		   return $ret;
@@ -73,22 +86,40 @@ 
 
 
 	/* 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);
+	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);
+ 		}
 		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->_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;
 	}
 
@@ -97,7 +128,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;
@@ -107,40 +141,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;
@@ -163,10 +225,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);
@@ -192,7 +263,8 @@ 
 		 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordset_oracle extends ADORecordSet {
+class ADORecordset_oracle extends ADORecordSet
+{
 
 	var $databaseType = "oracle";
 	var $bind = false;
@@ -200,7 +272,8 @@ 
 	function ADORecordset_oracle($queryID,$mode=false)
 	{
 		
-		if ($mode === false) { 
+		if ($mode === false)
+		{
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -210,11 +283,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;
@@ -242,9 +318,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;
 			}
@@ -265,37 +343,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() 
-{
+   function _close()
+   {
 		   return @ora_close($this->_queryID);
    }
 
 	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':
 		case 'VARBINARY':
 		case 'BINARY':
-				if ($len <= $this->blobSize) return 'C';
+				if ($len <= $this->blobSize)
+				{
+					return 'C';
+				}
 		case 'LONG':
 		case 'LONG VARCHAR':
 		case 'CLOB':

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

Doc Comments +3 added lines

@@ -373,6 +373,9 @@
 	var $_stmt;
 	var $_connectionID;
 	
+	/**
+	 * @param ADODB_pdo $connection
+	 */
 	function ADOPDOStatement($stmt,$connection)
 	{
 		$this->_stmt = $stmt;

Switch Indentation +16 added lines, -16 removed lines

@@ -51,9 +51,9 @@ 
 function adodb_pdo_type($t)
 {
 	switch($t) {
-	case 2: return 'VARCHAR';
-	case 3: return 'BLOB';
-	default: return 'NUMERIC';
+		case 2: return 'VARCHAR';
+		case 3: return 'BLOB';
+		default: return 'NUMERIC';
 	}
 }
 	 
@@ -155,10 +155,10 @@ 
 		
 		if ($this->_connectionID) {
 			switch(ADODB_ASSOC_CASE){
-			case 0: $m = PDO_CASE_LOWER; break;
-			case 1: $m = PDO_CASE_UPPER; break;
-			default:
-			case 2: $m = PDO_CASE_NATURAL; break;
+				case 0: $m = PDO_CASE_LOWER; break;
+				case 1: $m = PDO_CASE_UPPER; break;
+				default:
+				case 2: $m = PDO_CASE_NATURAL; break;
 			}
 			
 			//$this->_connectionID->setAttribute(PDO_ATTR_ERRMODE,PDO_ERRMODE_SILENT );
@@ -167,11 +167,11 @@ 
 			$class = 'ADODB_pdo_'.$this->dsnType;
 			//$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,true);
 			switch($this->dsnType) {
-			case 'oci':
-			case 'mysql':
-			case 'pgsql':
-				include_once(ADODB_DIR.'/drivers/adodb-pdo_'.$this->dsnType.'.inc.php');
-				break;
+				case 'oci':
+				case 'mysql':
+				case 'pgsql':
+					include_once(ADODB_DIR.'/drivers/adodb-pdo_'.$this->dsnType.'.inc.php');
+					break;
 			}
 			if (class_exists($class))
 				$this->_driver = new $class();
@@ -440,11 +440,11 @@ 
 		}
 		$this->adodbFetchMode = $mode;
 		switch($mode) {
-		case ADODB_FETCH_NUM: $mode = PDO_FETCH_NUM; break;
-		case ADODB_FETCH_ASSOC:  $mode = PDO_FETCH_ASSOC; break;
+			case ADODB_FETCH_NUM: $mode = PDO_FETCH_NUM; break;
+			case ADODB_FETCH_ASSOC:  $mode = PDO_FETCH_ASSOC; break;
 		
-		case ADODB_FETCH_BOTH: 
-		default: $mode = PDO_FETCH_BOTH; break;
+			case ADODB_FETCH_BOTH: 
+			default: $mode = PDO_FETCH_BOTH; break;
 		}
 		$this->fetchMode = $mode;
 		

Spacing +36 added lines, -36 removed lines

@@ -50,7 +50,7 @@ 
 	
 function adodb_pdo_type($t)
 {
-	switch($t) {
+	switch ($t) {
 	case 2: return 'VARCHAR';
 	case 3: return 'BLOB';
 	default: return 'NUMERIC';
@@ -77,9 +77,9 @@ 
 		return ADOConnection::ServerInfo();
 	}
 	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	function &SelectLimit($sql, $nrows = -1, $offset = -1, $inputarr = false, $secs2cache = 0)
 	{
-		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		$ret = ADOConnection::SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
 		return $ret;
 	}
 	
@@ -138,10 +138,10 @@ 
 	}
 	
 	// returns true or false
-	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persist=false)
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persist = false)
 	{
-		$at = strpos($argDSN,':');
-		$this->dsnType = substr($argDSN,0,$at);
+		$at = strpos($argDSN, ':');
+		$this->dsnType = substr($argDSN, 0, $at);
 
 		try {
 			$this->_connectionID = new PDO($argDSN, $argUsername, $argPassword);
@@ -154,7 +154,7 @@ 
 		}
 		
 		if ($this->_connectionID) {
-			switch(ADODB_ASSOC_CASE){
+			switch (ADODB_ASSOC_CASE) {
 			case 0: $m = PDO_CASE_LOWER; break;
 			case 1: $m = PDO_CASE_UPPER; break;
 			default:
@@ -162,11 +162,11 @@ 
 			}
 			
 			//$this->_connectionID->setAttribute(PDO_ATTR_ERRMODE,PDO_ERRMODE_SILENT );
-			$this->_connectionID->setAttribute(PDO_ATTR_CASE,$m);
+			$this->_connectionID->setAttribute(PDO_ATTR_CASE, $m);
 			
 			$class = 'ADODB_pdo_'.$this->dsnType;
 			//$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,true);
-			switch($this->dsnType) {
+			switch ($this->dsnType) {
 			case 'oci':
 			case 'mysql':
 			case 'pgsql':
@@ -195,11 +195,11 @@ 
 	/*------------------------------------------------------------------------------*/
 	
 	
-	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	function &SelectLimit($sql, $nrows = -1, $offset = -1, $inputarr = false, $secs2cache = 0) 
 	{	
 		$save = $this->_driver->fetchMode;
 		$this->_driver->fetchMode = $this->fetchMode;
-		$ret = $this->_driver->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		$ret = $this->_driver->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
 		$this->_driver->fetchMode = $save;
 		return $ret;
 	}
@@ -210,20 +210,20 @@ 
 		return $this->_driver->ServerInfo();
 	}
 	
-	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	function MetaTables($ttype = false, $showSchema = false, $mask = false)
 	{
-		return $this->_driver->MetaTables($ttype,$showSchema,$mask);
+		return $this->_driver->MetaTables($ttype, $showSchema, $mask);
 	}
 	
-	function MetaColumns($table,$normalize=true)
+	function MetaColumns($table, $normalize = true)
 	{
-		return $this->_driver->MetaColumns($table,$normalize);
+		return $this->_driver->MetaColumns($table, $normalize);
 	}
 	
-	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
+	function InParameter(&$stmt, &$var, $name, $maxLen = 4000, $type = false)
 	{
 		$obj = $stmt[1];
-		if ($type) $obj->bindParam($name,$var,$type,$maxLen);
+		if ($type) $obj->bindParam($name, $var, $type, $maxLen);
 		else $obj->bindParam($name, $var);
 	}
 	
@@ -237,7 +237,7 @@ 
 		
 		
 		if ($arr) {
-		 	if (sizeof($arr)<2) return '';
+		 	if (sizeof($arr) < 2) return '';
 			if ((integer)$arr[1]) return $arr[2];
 			else return '';
 		} else return '-1';
@@ -265,11 +265,11 @@ 
 		if ($this->transOff) return true; 
 		$this->transCnt += 1;
 		$this->_autocommit = false;
-		$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,false);
+		$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT, false);
 		return $this->_connectionID->beginTransaction();
 	}
 	
-	function CommitTrans($ok=true) 
+	function CommitTrans($ok = true) 
 	{ 
 		if (!$this->hasTransactions) return false;
 		if ($this->transOff) return true; 
@@ -278,7 +278,7 @@ 
 		$this->_autocommit = true;
 		
 		$ret = $this->_connectionID->commit();
-		$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,true);
+		$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT, true);
 		return $ret;
 	}
 	
@@ -290,14 +290,14 @@ 
 		$this->_autocommit = true;
 		
 		$ret = $this->_connectionID->rollback();
-		$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,true);
+		$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT, true);
 		return $ret;
 	}
 	
 	function Prepare($sql)
 	{
 		$this->_stmt = $this->_connectionID->prepare($sql);
-		if ($this->_stmt) return array($sql,$this->_stmt);
+		if ($this->_stmt) return array($sql, $this->_stmt);
 		
 		return false;
 	}
@@ -306,12 +306,12 @@ 
 	{
 		$stmt = $this->_connectionID->prepare($sql);
 		if (!$stmt) return false;
-		$obj = new ADOPDOStatement($stmt,$this);
+		$obj = new ADOPDOStatement($stmt, $this);
 		return $obj;
 	}
 
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql, $inputarr = false) 
 	{
 		if (is_array($sql)) {
 			$stmt = $sql[1];
@@ -373,24 +373,24 @@ 
 	var $_stmt;
 	var $_connectionID;
 	
-	function ADOPDOStatement($stmt,$connection)
+	function ADOPDOStatement($stmt, $connection)
 	{
 		$this->_stmt = $stmt;
 		$this->_connectionID = $connection;
 	}
 	
-	function Execute($inputArr=false)
+	function Execute($inputArr = false)
 	{
 		$savestmt = $this->_connectionID->_stmt;
-		$rs = $this->_connectionID->Execute(array(false,$this->_stmt),$inputArr);
+		$rs = $this->_connectionID->Execute(array(false, $this->_stmt), $inputArr);
 		$this->_connectionID->_stmt = $savestmt;
 		return $rs;
 	}
 	
-	function InParameter(&$var,$name,$maxLen=4000,$type=false)
+	function InParameter(&$var, $name, $maxLen = 4000, $type = false)
 	{
 
-		if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
+		if ($type) $this->_stmt->bindParam($name, $var, $type, $maxLen);
 		else $this->_stmt->bindParam($name, $var);
 	}
 	
@@ -405,7 +405,7 @@ 
 		else $arr = $this->_connectionID->errorInfo();
 
 		if (is_array($arr)) {
-			if ((integer) $arr[0] && isset($arr[2])) return $arr[2];
+			if ((integer)$arr[0] && isset($arr[2])) return $arr[2];
 			else return '';
 		} else return '-1';
 	}
@@ -432,14 +432,14 @@ 
 	var $databaseType = "pdo";		
 	var $dataProvider = "pdo";
 	
-	function ADORecordSet_pdo($id,$mode=false)
+	function ADORecordSet_pdo($id, $mode = false)
 	{
 		if ($mode === false) {  
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->adodbFetchMode = $mode;
-		switch($mode) {
+		switch ($mode) {
 		case ADODB_FETCH_NUM: $mode = PDO_FETCH_NUM; break;
 		case ADODB_FETCH_ASSOC:  $mode = PDO_FETCH_ASSOC; break;
 		
@@ -484,9 +484,9 @@ 
 	// returns the field object
 	function &FetchField($fieldOffset = -1) 
 	{
-		$off=$fieldOffset+1; // offsets begin at 1
+		$off = $fieldOffset + 1; // offsets begin at 1
 		
-		$o= new ADOFieldObject();
+		$o = new ADOFieldObject();
 		$arr = @$this->_queryID->getColumnMeta($fieldOffset);
 		if (!$arr) {
 			$o->name = 'bad getColumnMeta()';
@@ -532,7 +532,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;
 			}

Braces +253 added lines, -85 removed lines

@@ -15,7 +15,10 @@ 
 		LOB handling for CLOB/BLOB differs significantly
 */
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
 
 /*
@@ -50,7 +53,8 @@ 
 	
 function adodb_pdo_type($t)
 {
-	switch($t) {
+	switch($t)
+	{
 	case 2: return 'VARCHAR';
 	case 3: return 'BLOB';
 	default: return 'NUMERIC';
@@ -64,7 +68,8 @@ 
 
 
 
-class ADODB_pdo_base extends ADODB_pdo {
+class ADODB_pdo_base extends ADODB_pdo
+{
 
 	function _init($parentDriver)
 	{
@@ -95,7 +100,8 @@ 
 }
 
 
-class ADODB_pdo extends ADOConnection {
+class ADODB_pdo extends ADOConnection
+{
 	var $databaseType = "pdo";	
 	var $dataProvider = "pdo";
 	var $fmtDate = "'Y-m-d'";
@@ -145,7 +151,8 @@ 
 
 		try {
 			$this->_connectionID = new PDO($argDSN, $argUsername, $argPassword);
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			$this->_connectionID = false;
 			$this->_errorno = -1;
 			//var_dump($e);
@@ -153,8 +160,10 @@ 
 			return false;
 		}
 		
-		if ($this->_connectionID) {
-			switch(ADODB_ASSOC_CASE){
+		if ($this->_connectionID)
+		{
+			switch(ADODB_ASSOC_CASE)
+			{
 			case 0: $m = PDO_CASE_LOWER; break;
 			case 1: $m = PDO_CASE_UPPER; break;
 			default:
@@ -166,7 +175,8 @@ 
 			
 			$class = 'ADODB_pdo_'.$this->dsnType;
 			//$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,true);
-			switch($this->dsnType) {
+			switch($this->dsnType)
+			{
 			case 'oci':
 			case 'mysql':
 			case 'pgsql':
@@ -174,9 +184,12 @@ 
 				break;
 			}
 			if (class_exists($class))
-				$this->_driver = new $class();
-			else
-				$this->_driver = new ADODB_pdo_base();
+			{
+							$this->_driver = new $class();
+			}
+			else {
+							$this->_driver = new ADODB_pdo_base();
+			}
 			
 			$this->_driver->_connectionID = $this->_connectionID;
 			$this->_UpdatePDO();
@@ -223,58 +236,122 @@ 
 	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
 	{
 		$obj = $stmt[1];
-		if ($type) $obj->bindParam($name,$var,$type,$maxLen);
-		else $obj->bindParam($name, $var);
+		if ($type)
+		{
+			$obj->bindParam($name,$var,$type,$maxLen);
+		}
+		else {
+			$obj->bindParam($name, $var);
+		}
 	}
 	
 	
 	function ErrorMsg()
 	{
-		if ($this->_errormsg !== false) return $this->_errormsg;
-		if (!empty($this->_stmt)) $arr = $this->_stmt->errorInfo();
-		else if (!empty($this->_connectionID)) $arr = $this->_connectionID->errorInfo();
-		else return 'No Connection Established';
+		if ($this->_errormsg !== false)
+		{
+			return $this->_errormsg;
+		}
+		if (!empty($this->_stmt))
+		{
+			$arr = $this->_stmt->errorInfo();
+		}
+		else if (!empty($this->_connectionID))
+		{
+			$arr = $this->_connectionID->errorInfo();
+		}
+		else {
+			return 'No Connection Established';
+		}
 		
 		
-		if ($arr) {
-		 	if (sizeof($arr)<2) return '';
-			if ((integer)$arr[1]) return $arr[2];
-			else return '';
-		} else return '-1';
+		if ($arr)
+		{
+		 	if (sizeof($arr)<2)
+		 	{
+		 		return '';
+		 	}
+			if ((integer)$arr[1])
+			{
+				return $arr[2];
+			}
+			else {
+				return '';
+			}
+		}
+		else {
+			return '-1';
+		}
 	}
 	
 
 	function ErrorNo()
 	{
-		if ($this->_errorno !== false) return $this->_errorno;
-		if (!empty($this->_stmt)) $err = $this->_stmt->errorCode();
-		else if (!empty($this->_connectionID)) {
+		if ($this->_errorno !== false)
+		{
+			return $this->_errorno;
+		}
+		if (!empty($this->_stmt))
+		{
+			$err = $this->_stmt->errorCode();
+		}
+		else if (!empty($this->_connectionID))
+		{
 			$arr = $this->_connectionID->errorInfo();
-			if (isset($arr[0])) $err = $arr[0];
-			else $err = -1;
-		} else
-			return 0;
+			if (isset($arr[0]))
+			{
+				$err = $arr[0];
+			}
+			else {
+				$err = -1;
+			}
+		}
+		else {
+					return 0;
+		}
 			
-		if ($err == '00000') return 0; // allows empty check
+		if ($err == '00000')
+		{
+			return 0;
+		}
+		// allows empty check
 		return $err;
 	}
 
 	function BeginTrans()
-	{	
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
+	{
+		if (!$this->hasTransactions)
+		{
+			return false;
+		}
+		if ($this->transOff)
+		{
+			return true;
+		}
 		$this->transCnt += 1;
 		$this->_autocommit = false;
 		$this->_connectionID->setAttribute(PDO_ATTR_AUTOCOMMIT,false);
 		return $this->_connectionID->beginTransaction();
 	}
 	
-	function CommitTrans($ok=true) 
-	{ 
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		if (!$ok) return $this->RollbackTrans();
-		if ($this->transCnt) $this->transCnt -= 1;
+	function CommitTrans($ok=true)
+	{
+		if (!$this->hasTransactions)
+		{
+			return false;
+		}
+		if ($this->transOff)
+		{
+			return true;
+		}
+		if (!$ok)
+		{
+			return $this->RollbackTrans();
+		}
+		if ($this->transCnt)
+		{
+			$this->transCnt -= 1;
+		}
 		$this->_autocommit = true;
 		
 		$ret = $this->_connectionID->commit();
@@ -284,9 +361,18 @@ 
 	
 	function RollbackTrans()
 	{
-		if (!$this->hasTransactions) return false;
-		if ($this->transOff) return true; 
-		if ($this->transCnt) $this->transCnt -= 1;
+		if (!$this->hasTransactions)
+		{
+			return false;
+		}
+		if ($this->transOff)
+		{
+			return true;
+		}
+		if ($this->transCnt)
+		{
+			$this->transCnt -= 1;
+		}
 		$this->_autocommit = true;
 		
 		$ret = $this->_connectionID->rollback();
@@ -297,7 +383,10 @@ 
 	function Prepare($sql)
 	{
 		$this->_stmt = $this->_connectionID->prepare($sql);
-		if ($this->_stmt) return array($sql,$this->_stmt);
+		if ($this->_stmt)
+		{
+			return array($sql,$this->_stmt);
+		}
 		
 		return false;
 	}
@@ -305,43 +394,60 @@ 
 	function PrepareStmt($sql)
 	{
 		$stmt = $this->_connectionID->prepare($sql);
-		if (!$stmt) return false;
+		if (!$stmt)
+		{
+			return false;
+		}
 		$obj = new ADOPDOStatement($stmt,$this);
 		return $obj;
 	}
 
 	/* returns queryID or false */
-	function _query($sql,$inputarr=false) 
+	function _query($sql,$inputarr=false)
 	{
-		if (is_array($sql)) {
+		if (is_array($sql))
+		{
 			$stmt = $sql[1];
-		} else {
+		}
+		else
+		{
 			$stmt = $this->_connectionID->prepare($sql);
 		}
 		
-		if ($stmt) {
-			if ($inputarr) $ok = $stmt->execute($inputarr);
-			else $ok = $stmt->execute();
+		if ($stmt)
+		{
+			if ($inputarr)
+			{
+				$ok = $stmt->execute($inputarr);
+			}
+			else {
+				$ok = $stmt->execute();
+			}
 		} 
 		
 		
 		$this->_errormsg = false;
 		$this->_errorno = false;
 			
-		if ($ok) {
+		if ($ok)
+		{
 			$this->_stmt = $stmt;
 			return $stmt;
 		}
 		
-		if ($stmt) {
+		if ($stmt)
+		{
 			
 			$arr = $stmt->errorinfo();
-			if ((integer)$arr[1]) {
+			if ((integer)$arr[1])
+			{
 				$this->_errormsg = $arr[2];
 				$this->_errorno = $arr[1];
 			}
 
-		} else {
+		}
+		else
+		{
 			$this->_errormsg = false;
 			$this->_errorno = false;
 		}
@@ -366,7 +472,8 @@ 
 	}
 }
 
-class ADOPDOStatement {
+class ADOPDOStatement
+{
 
 	var $databaseType = "pdo";		
 	var $dataProvider = "pdo";
@@ -390,8 +497,13 @@ 
 	function InParameter(&$var,$name,$maxLen=4000,$type=false)
 	{
 
-		if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
-		else $this->_stmt->bindParam($name, $var);
+		if ($type)
+		{
+			$this->_stmt->bindParam($name,$var,$type,$maxLen);
+		}
+		else {
+			$this->_stmt->bindParam($name, $var);
+		}
 	}
 	
 	function Affected_Rows()
@@ -401,13 +513,27 @@ 
 	
 	function ErrorMsg()
 	{
-		if ($this->_stmt) $arr = $this->_stmt->errorInfo();
-		else $arr = $this->_connectionID->errorInfo();
+		if ($this->_stmt)
+		{
+			$arr = $this->_stmt->errorInfo();
+		}
+		else {
+			$arr = $this->_connectionID->errorInfo();
+		}
 
-		if (is_array($arr)) {
-			if ((integer) $arr[0] && isset($arr[2])) return $arr[2];
-			else return '';
-		} else return '-1';
+		if (is_array($arr))
+		{
+			if ((integer) $arr[0] && isset($arr[2]))
+			{
+				return $arr[2];
+			}
+			else {
+				return '';
+			}
+		}
+		else {
+			return '-1';
+		}
 	}
 	
 	function NumCols()
@@ -417,8 +543,13 @@ 
 	
 	function ErrorNo()
 	{
-		if ($this->_stmt) return $this->_stmt->errorCode();
-		else return $this->_connectionID->errorInfo();
+		if ($this->_stmt)
+		{
+			return $this->_stmt->errorCode();
+		}
+		else {
+			return $this->_connectionID->errorInfo();
+		}
 	}
 }
 
@@ -426,7 +557,8 @@ 
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_pdo extends ADORecordSet {	
+class ADORecordSet_pdo extends ADORecordSet
+{
 	
 	var $bind = false;
 	var $databaseType = "pdo";		
@@ -434,12 +566,14 @@ 
 	
 	function ADORecordSet_pdo($id,$mode=false)
 	{
-		if ($mode === false) {  
+		if ($mode === false)
+		{
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
 		$this->adodbFetchMode = $mode;
-		switch($mode) {
+		switch($mode)
+		{
 		case ADODB_FETCH_NUM: $mode = PDO_FETCH_NUM; break;
 		case ADODB_FETCH_ASSOC:  $mode = PDO_FETCH_ASSOC; break;
 		
@@ -455,19 +589,30 @@ 
 	
 	function Init()
 	{
-		if ($this->_inited) return;
+		if ($this->_inited)
+		{
+			return;
+		}
 		$this->_inited = true;
-		if ($this->_queryID) @$this->_initrs();
-		else {
+		if ($this->_queryID)
+		{
+			@$this->_initrs();
+		}
+		else
+		{
 			$this->_numOfRows = 0;
 			$this->_numOfFields = 0;
 		}
-		if ($this->_numOfRows != 0 && $this->_currentRow == -1) {
+		if ($this->_numOfRows != 0 && $this->_currentRow == -1)
+		{
 			$this->_currentRow = 0;
-			if ($this->EOF = ($this->_fetch() === false)) {
+			if ($this->EOF = ($this->_fetch() === false))
+			{
 				$this->_numOfRows = 0; // _numOfRows could be -1
 			}
-		} else {
+		}
+		else
+		{
 			$this->EOF = true;
 		}
 	}
@@ -477,7 +622,10 @@ 
 	global $ADODB_COUNTRECS;
 	
 		$this->_numOfRows = ($ADODB_COUNTRECS) ? @$this->_queryID->rowCount() : -1;
-		if (!$this->_numOfRows) $this->_numOfRows = -1;
+		if (!$this->_numOfRows)
+		{
+			$this->_numOfRows = -1;
+		}
 		$this->_numOfFields = $this->_queryID->columnCount();
 	}
 
@@ -488,7 +636,8 @@ 
 		
 		$o= new ADOFieldObject();
 		$arr = @$this->_queryID->getColumnMeta($fieldOffset);
-		if (!$arr) {
+		if (!$arr)
+		{
 			$o->name = 'bad getColumnMeta()';
 			$o->max_length = -1;
 			$o->type = 'VARCHAR';
@@ -498,13 +647,24 @@ 
 		}
 		//adodb_pr($arr);
 		$o->name = $arr['name'];
-		if (isset($arr['native_type'])) $o->type = $arr['native_type'];
-		else $o->type = adodb_pdo_type($arr['pdo_type']);
+		if (isset($arr['native_type']))
+		{
+			$o->type = $arr['native_type'];
+		}
+		else {
+			$o->type = adodb_pdo_type($arr['pdo_type']);
+		}
 		$o->max_length = $arr['len'];
 		$o->precision = $arr['precision'];
 		
-		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
-		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+		if (ADODB_ASSOC_CASE == 0)
+		{
+			$o->name = strtolower($o->name);
+		}
+		else if (ADODB_ASSOC_CASE == 1)
+		{
+			$o->name = strtoupper($o->name);
+		}
 		return $o;
 	}
 	
@@ -515,24 +675,32 @@ 
 	
 	function _fetch()
 	{
-		if (!$this->_queryID) return false;
+		if (!$this->_queryID)
+		{
+			return false;
+		}
 		
 		$this->fields = $this->_queryID->fetch($this->fetchMode);
 		return !empty($this->fields);
 	}
 	
-	function _close() 
+	function _close()
 	{
 		$this->_queryID = false;
 	}
 	
 	function Fields($colname)
 	{
-		if ($this->adodbFetchMode != ADODB_FETCH_NUM) return @$this->fields[$colname];
+		if ($this->adodbFetchMode != ADODB_FETCH_NUM)
+		{
+			return @$this->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;
 			}

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

Doc Comments +8 added lines

@@ -702,6 +702,10 @@ 
 
 
 	// returns queryID or false
+
+	/**
+	 * @param boolean $inputarr
+	 */
 	function _query($sql,$inputarr)
 	{
 
@@ -782,6 +786,10 @@ 
 
 
 	/*	Returns: the last error message from previous database operation	*/
+
+	/**
+	 * @return boolean|string
+	 */
 	function ErrorMsg()
 	{
 		if ($this->_errorMsg !== false) return $this->_errorMsg;

Indentation +44 added lines, -44 removed lines

@@ -61,7 +61,7 @@ 
 	var $_resultid = false;
   	var $concat_operator='||';
 	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
-    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
+	var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
 	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles')
 	union
@@ -226,7 +226,7 @@ 
 	{
 		$info = $this->ServerInfo();
 		if ($info['version'] >= 7.3) {
-	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
+			$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 			  and schemaname  not in ( 'pg_catalog','information_schema')
 	union
         select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
@@ -443,7 +443,7 @@ 
 	{
 
 		if ($blobtype == 'CLOB') {
-    		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
+			return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
 		}
 		// do not use bind params which uses qstr(), as blobencode() already quotes data
 		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
@@ -573,8 +573,8 @@ 
 	}
 
 	  function &MetaIndexes ($table, $primary = FALSE)
-      {
-         global $ADODB_FETCH_MODE;
+	  {
+		 global $ADODB_FETCH_MODE;
 
 				// table-name must NOT be quoted, otherwise we will not find any index
 				$table = str_replace($this->nameQuote, '', $table);
@@ -591,50 +591,50 @@ 
 	,pg_namespace n
 WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\' AND i.indisprimary=false';
 				} else {
-	                $sql = '
+					$sql = '
 SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
 FROM pg_catalog.pg_class c
 JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
 JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
 WHERE c2.relname=\'%s\' or c2.relname=lower(\'%s\')';
-    			}
-
-                if ($primary == FALSE) {
-                	$sql .= ' AND i.indisprimary=false;';
-                }
-
-                $save = $ADODB_FETCH_MODE;
-                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-                if ($this->fetchMode !== FALSE) {
-                        $savem = $this->SetFetchMode(FALSE);
-                }
-
-                $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
-                if (isset($savem)) {
-                        $this->SetFetchMode($savem);
-                }
-                $ADODB_FETCH_MODE = $save;
-
-                if (!is_object($rs)) {
-                	$false = false;
+				}
+
+				if ($primary == FALSE) {
+					$sql .= ' AND i.indisprimary=false;';
+				}
+
+				$save = $ADODB_FETCH_MODE;
+				$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+				if ($this->fetchMode !== FALSE) {
+						$savem = $this->SetFetchMode(FALSE);
+				}
+
+				$rs = $this->Execute(sprintf($sql,$table,$table,$schema));
+				if (isset($savem)) {
+						$this->SetFetchMode($savem);
+				}
+				$ADODB_FETCH_MODE = $save;
+
+				if (!is_object($rs)) {
+					$false = false;
 					return $false;
-                }
-
-                $col_names = $this->MetaColumnNames($table,true);
-                $indexes = array();
-                while ($row = $rs->FetchRow()) {
-                        $columns = array();
-                        foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col - 1];
-                        }
-
-                        $indexes[$row[0]] = array(
-                                'unique' => ($row[1] == 't'),
-                                'columns' => $columns
-                        );
-                }
-                return $indexes;
-        }
+				}
+
+				$col_names = $this->MetaColumnNames($table,true);
+				$indexes = array();
+				while ($row = $rs->FetchRow()) {
+						$columns = array();
+						foreach (explode(' ', $row[2]) as $col) {
+								$columns[] = $col_names[$col - 1];
+						}
+
+						$indexes[$row[0]] = array(
+								'unique' => ($row[1] == 't'),
+								'columns' => $columns
+						);
+				}
+				return $indexes;
+		}
 
 	// returns true or false
 	//
@@ -967,7 +967,7 @@ 
 	{
 
 		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
+			return false;
 
 		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
 

Switch Indentation +63 added lines, -63 removed lines

@@ -287,64 +287,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 'M':
-				$s .= 'Mon';
-				break;
-
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
-
-			case 'H':
-				$s.= 'HH24';
-				break;
-
-			case 'h':
-				$s .= 'HH';
-				break;
-
-			case 'i':
-				$s .= 'MI';
-				break;
-
-			case 's':
-				$s .= 'SS';
-				break;
-
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
-
-			case 'w':
-				$s .= 'D';
-				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.'"';
+				case 'Y':
+				case 'y':
+					$s .= 'YYYY';
+					break;
+				case 'Q':
+				case 'q':
+					$s .= 'Q';
+					break;
+
+				case 'M':
+					$s .= 'Mon';
+					break;
+
+				case 'm':
+					$s .= 'MM';
+					break;
+				case 'D':
+				case 'd':
+					$s .= 'DD';
+					break;
+
+				case 'H':
+					$s.= 'HH24';
+					break;
+
+				case 'h':
+					$s .= 'HH';
+					break;
+
+				case 'i':
+					$s .= 'MI';
+					break;
+
+				case 's':
+					$s .= 'SS';
+					break;
+
+				case 'a':
+				case 'A':
+					$s .= 'AM';
+					break;
+
+				case 'w':
+					$s .= 'D';
+					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.'"';
 
 			}
 		}
@@ -859,12 +859,12 @@ 
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
+			case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
+			case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
 
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = PGSQL_BOTH; break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:
+			default: $this->fetchMode = PGSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);

Spacing +105 added lines, -105 removed lines

@@ -49,17 +49,17 @@ 
 {
 	$len = strlen($s);
 	if ($len == 0) return "''";
-	if (strncmp($s,"'",1) === 0 && substr(s,$len-1) == "'") return $s; // already quoted
+	if (strncmp($s, "'", 1) === 0 && substr(s, $len - 1) == "'") return $s; // already quoted
 
 	return "'".addslashes($s)."'";
 }
 
-class ADODB_postgres64 extends ADOConnection{
+class ADODB_postgres64 extends ADOConnection {
 	var $databaseType = 'postgres64';
 	var $dataProvider = 'postgres';
 	var $hasInsertID = true;
 	var $_resultid = false;
-  	var $concat_operator='||';
+  	var $concat_operator = '||';
 	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
     var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
@@ -89,11 +89,11 @@ 
 	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
 
 	var $hasAffectedRows = true;
-	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+	var $hasLimit = false; // set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
 	// below suggested by Freek Dijkstra
-	var $true = 'TRUE';		// string that represents TRUE for a database
-	var $false = 'FALSE';		// string that represents FALSE for a database
-	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
+	var $true = 'TRUE'; // string that represents TRUE for a database
+	var $false = 'FALSE'; // string that represents FALSE for a database
+	var $fmtDate = "'Y-m-d'"; // used by DBDate() as the default date format used by the database
 	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
 	var $hasMoveFirst = true;
 	var $hasGenID = true;
@@ -101,7 +101,7 @@ 
 	var $_genSeqSQL = "CREATE SEQUENCE %s START %s";
 	var $_dropSeqSQL = "DROP SEQUENCE %s";
 	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
-	var $random = 'random()';		/// random function
+	var $random = 'random()'; /// random function
 	var $autoRollback = true; // apparently pgsql does not autorollback properly before php 4.3.4
 							// http://bugs.php.net/bug.php?id=25404
 
@@ -131,17 +131,17 @@ 
 		return $arr;
 	}
 
-	function IfNull( $field, $ifNull )
+	function IfNull($field, $ifNull)
 	{
 		return " coalesce($field, $ifNull) ";
 	}
 
 	// get the last id - never tested
-	function pg_insert_id($tablename,$fieldname)
+	function pg_insert_id($tablename, $fieldname)
 	{
-		$result=pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
+		$result = pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
 		if ($result) {
-			$arr = @pg_fetch_row($result,0);
+			$arr = @pg_fetch_row($result, 0);
 			pg_freeresult($result);
 			if (isset($arr[0])) return $arr[0];
 		}
@@ -152,7 +152,7 @@ 
 Using a OID as a unique identifier is not generally wise.
 Unless you are very careful, you might end up with a tuple having
 a different OID if a database must be reloaded. */
-	function _insertid($table,$column,$try_oid=false)
+	function _insertid($table, $column, $try_oid = false)
 	{
 		if ($try_oid)
 		{
@@ -166,13 +166,13 @@ 
 		if ($oid === false && $table && $column)	// table might not use oid's, default for 8.1+
 		{
 			// try the standard sequence name first, due to table renames etc. this might not be the correct one
-			if (!($ret = $this->GetOne($sql='SELECT currval('.$this->qstr($table.'_'.$column.'_seq').')'))) {
+			if (!($ret = $this->GetOne($sql = 'SELECT currval('.$this->qstr($table.'_'.$column.'_seq').')'))) {
 				// now we read the sequence name from the database itself, that is a lot slower!
 				$cols = $this->MetaColumns($table);
 				$fld = $cols[strtoupper($column)];
 				if ($fld->primary_key && $fld->has_default &&
-					preg_match("/nextval\('([^']+)'::(text|regclass)\)/",$fld->default_value,$matches)) {
-					$ret = $this->GetOne($sql='SELECT currval('.$this->qstr($matches[1]).')');
+					preg_match("/nextval\('([^']+)'::(text|regclass)\)/", $fld->default_value, $matches)) {
+					$ret = $this->GetOne($sql = 'SELECT currval('.$this->qstr($matches[1]).')');
 				}
 			}
 			return $ret;
@@ -198,14 +198,14 @@ 
 		return @pg_Exec($this->_connectionID, "begin");
 	}
 
-	function RowLock($tables,$where,$flds='1 as ignore')
+	function RowLock($tables, $where, $flds = '1 as ignore')
 	{
 		if (!$this->transCnt) $this->BeginTrans();
 		return $this->GetOne("select $flds from $tables where $where for update");
 	}
 
 	// returns true/false.
-	function CommitTrans($ok=true)
+	function CommitTrans($ok = true)
 	{
 		if ($this->transOff) return true;
 		if (!$ok) return $this->RollbackTrans();
@@ -222,7 +222,7 @@ 
 		return @pg_Exec($this->_connectionID, "rollback");
 	}
 
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false)
+	function &MetaTables($ttype = false, $showSchema = false, $mask = false)
 	{
 		$info = $this->ServerInfo();
 		if ($info['version'] >= 7.3) {
@@ -234,7 +234,7 @@ 
 		if ($mask) {
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtolower($mask));
-			if ($info['version']>=7.3)
+			if ($info['version'] >= 7.3)
 				$this->metaTablesSQL = "
 select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
  union
@@ -245,7 +245,7 @@ 
  union
 select viewname,'V' from pg_views where viewname like $mask";
 		}
-		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+		$ret = & ADOConnection::MetaTables($ttype, $showSchema);
 
 		if ($mask) {
 			$this->metaTablesSQL = $save;
@@ -254,39 +254,39 @@ 
 	}
 
 	// if magic quotes disabled, use pg_escape_string()
-	function qstr($s,$magic_quotes=false)
+	function qstr($s, $magic_quotes = false)
 	{
 		if (is_bool($s)) return $s ? 'true' : 'false';
 
 		if (!$magic_quotes) {
 			if (ADODB_PHPVER >= 0x5200) {
-				return  "'".pg_escape_string($this->_connectionID,$s)."'";
+				return  "'".pg_escape_string($this->_connectionID, $s)."'";
 			}
 			if (ADODB_PHPVER >= 0x4200) {
 				return  "'".pg_escape_string($s)."'";
 			}
-			if ($this->replaceQuote[0] == '\\'){
-				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
+			if ($this->replaceQuote[0] == '\\') {
+				$s = adodb_str_replace(array('\\', "\0"), array('\\\\', "\\\\000"), $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);
 		return "'$s'";
 	}
 
 
 	// 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';
@@ -309,7 +309,7 @@ 
 				break;
 
 			case 'H':
-				$s.= 'HH24';
+				$s .= 'HH24';
 				break;
 
 			case 'h':
@@ -341,14 +341,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."')";
 	}
 
 
@@ -361,12 +361,12 @@ 
 	* contributed by Mattia Rossi mattia@technologist.com
 	* modified for safe mode by juraj chlebec
 	*/
-	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+	function UpdateBlobFile($table, $column, $path, $where, $blobtype = 'BLOB')
 	{
-		pg_exec ($this->_connectionID, "begin");
+		pg_exec($this->_connectionID, "begin");
 
-		$fd = fopen($path,'r');
-		$contents = fread($fd,filesize($path));
+		$fd = fopen($path, 'r');
+		$contents = fread($fd, filesize($path));
 		fclose($fd);
 
 		$oid = pg_lo_create($this->_connectionID);
@@ -376,7 +376,7 @@ 
 
 		// $oid = pg_lo_import ($path);
 		pg_exec($this->_connectionID, "commit");
-		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype);
+		$rs = ADOConnection::UpdateBlob($table, $column, $oid, $where, $blobtype);
 		$rez = !empty($rs);
 		return $rez;
 	}
@@ -386,7 +386,7 @@ 
 	*/
 	function GuessOID($oid)
 	{
-		if (strlen($oid)>16) return false;
+		if (strlen($oid) > 16) return false;
 		return is_numeric($oid);
 	}
 
@@ -402,20 +402,20 @@ 
 	* Since adodb 4.54, this returns the blob, instead of sending it to stdout. Also
 	* added maxsize parameter, which defaults to $db->maxblobsize if not defined.
 	*/
-	function BlobDecode($blob,$maxsize=false,$hastrans=true)
+	function BlobDecode($blob, $maxsize = false, $hastrans = true)
 	{
 		if (!$this->GuessOID($blob)) return $blob;
 
-		if ($hastrans) @pg_exec($this->_connectionID,"begin");
-		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
+		if ($hastrans) @pg_exec($this->_connectionID, "begin");
+		$fd = @pg_lo_open($this->_connectionID, $blob, "r");
 		if ($fd === false) {
-			if ($hastrans) @pg_exec($this->_connectionID,"commit");
+			if ($hastrans) @pg_exec($this->_connectionID, "commit");
 			return $blob;
 		}
 		if (!$maxsize) $maxsize = $this->maxblobsize;
-		$realblob = @pg_loread($fd,$maxsize);
+		$realblob = @pg_loread($fd, $maxsize);
 		@pg_loclose($fd);
-		if ($hastrans) @pg_exec($this->_connectionID,"commit");
+		if ($hastrans) @pg_exec($this->_connectionID, "commit");
 		return $realblob;
 	}
 
@@ -431,25 +431,25 @@ 
 		if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
 
 		/*92=backslash, 0=null, 39=single-quote*/
-		$badch = array(chr(92),chr(0),chr(39)); # \  null  '
-		$fixch = array('\\\\134','\\\\000','\\\\047');
-		return adodb_str_replace($badch,$fixch,$blob);
+		$badch = array(chr(92), chr(0), chr(39)); # \  null  '
+		$fixch = array('\\\\134', '\\\\000', '\\\\047');
+		return adodb_str_replace($badch, $fixch, $blob);
 
 		// note that there is a pg_escape_bytea function only for php 4.2.0 or later
 	}
 
 	// assumes bytea for blob, and varchar for clob
-	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
 	{
 
 		if ($blobtype == 'CLOB') {
-    		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
+    		return $this->Execute("UPDATE $table SET $column=".$this->qstr($val)." WHERE $where");
 		}
 		// do not use bind params which uses qstr(), as blobencode() already quotes data
 		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
 	}
 
-	function OffsetDate($dayFraction,$date=false)
+	function OffsetDate($dayFraction, $date = false)
 	{
 		if (!$date) $date = $this->sysDate;
 		return "($date+interval'$dayFraction days')";
@@ -458,14 +458,14 @@ 
 
 	// for schema support, pass in the $table param "$schema.$tabname".
 	// converts field names to lowercase, $upper is ignored
-	function &MetaColumns($table,$normalize=true)
+	function &MetaColumns($table, $normalize = true)
 	{
 	global $ADODB_FETCH_MODE;
 		//if tablenames are quoted, remove the quotes as the tablenames here are used for comparsion of content of fields in postgres system tables
-		if (!empty($this->nameQuote) && !(strpos($table,$this->nameQuote)===false)) $table = str_replace($this->nameQuote,'',$table);
+		if (!empty($this->nameQuote) && !(strpos($table, $this->nameQuote) === false)) $table = str_replace($this->nameQuote, '', $table);
 		$schema = false;
 		$false = false;
-		$this->_findschema($table,$schema);
+		$this->_findschema($table, $schema);
 
 		if ($normalize) $table = strtolower($table);
 
@@ -473,8 +473,8 @@ 
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
 
-		if ($schema) $rs =& $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-		else $rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+		if ($schema) $rs = & $this->Execute(sprintf($this->metaColumnsSQL1, $table, $table, $schema));
+		else $rs = & $this->Execute(sprintf($this->metaColumnsSQL, $table, $table));
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 
@@ -489,9 +489,9 @@ 
 
 			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 
-			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
+			$rskey = $this->Execute(sprintf($this->metaKeySQL, ($table)));
 			// fetch all result in once for performance.
-			$keys =& $rskey->GetArray();
+			$keys = & $rskey->GetArray();
 			if (isset($savem)) $this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 
@@ -511,7 +511,7 @@ 
 				while (!$rsdef->EOF) {
 					$num = $rsdef->fields['num'];
 					$s = $rsdef->fields['def'];
-					if (strpos($s,'::')===false && substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
+					if (strpos($s, '::') === false && substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
 						$s = substr($s, 1);
 						$s = substr($s, 0, strlen($s) - 1);
 					}
@@ -520,7 +520,7 @@ 
 					$rsdef->MoveNext();
 				}
 			} else {
-				ADOConnection::outp( "==> SQL => " . $sql);
+				ADOConnection::outp("==> SQL => ".$sql);
 			}
 			unset($rsdef);
 		}
@@ -531,10 +531,10 @@ 
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
-			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
+			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3] - 4;
 			if ($fld->max_length <= 0) $fld->max_length = -1;
 			if ($fld->type == 'numeric') {
-				$fld->scale = $fld->max_length & 0xFFFF;
+				$fld->scale = $fld->max_length&0xFFFF;
 				$fld->max_length >>= 16;
 			}
 			// dannym
@@ -551,7 +551,7 @@ 
 
 			// Freek
 			if (is_array($keys)) {
-				foreach($keys as $key) {
+				foreach ($keys as $key) {
 					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't')
 						$fld->primary_key = true;
 					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't')
@@ -572,7 +572,7 @@ 
 
 	}
 
-	  function &MetaIndexes ($table, $primary = FALSE)
+	  function &MetaIndexes($table, $primary = FALSE)
       {
          global $ADODB_FETCH_MODE;
 
@@ -580,7 +580,7 @@ 
 				$table = str_replace($this->nameQuote, '', $table);
 
 				$schema = false;
-				$this->_findschema($table,$schema);
+				$this->_findschema($table, $schema);
 
 				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
 					$sql = '
@@ -609,7 +609,7 @@ 
                         $savem = $this->SetFetchMode(FALSE);
                 }
 
-                $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
+                $rs = $this->Execute(sprintf($sql, $table, $table, $schema));
                 if (isset($savem)) {
                         $this->SetFetchMode($savem);
                 }
@@ -620,7 +620,7 @@ 
 					return $false;
                 }
 
-                $col_names = $this->MetaColumnNames($table,true);
+                $col_names = $this->MetaColumnNames($table, true);
                 $indexes = array();
                 while ($row = $rs->FetchRow()) {
                         $columns = array();
@@ -641,7 +641,7 @@ 
 	// examples:
 	// 	$db->Connect("host=host1 user=user1 password=secret port=4341");
 	// 	$db->Connect('host1','user1','secret');
-	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
+	function _connect($str, $user = '', $pwd = '', $db = '', $ctype = 0)
 	{
 
 		if (!function_exists('pg_pconnect')) return null;
@@ -653,7 +653,7 @@ 
 			$pwd = adodb_addslashes($pwd);
 			if (strlen($db) == 0) $db = 'template1';
 			$db = adodb_addslashes($db);
-		   	if ($str)  {
+		   	if ($str) {
 			 	$host = explode(":", $str);
 				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
 				else $str = 'host=localhost';
@@ -676,7 +676,7 @@ 
 				if (empty($ncnt)) $ncnt = 1;
 				else $ncnt += 1;
 
-				$str .= str_repeat(' ',$ncnt);
+				$str .= str_repeat(' ', $ncnt);
 			}
 			$this->_connectionID = pg_connect($str);
 		}
@@ -687,7 +687,7 @@ 
 
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
 	{
-	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
+	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName, -1);
 	}
 
 	// returns true or false
@@ -695,14 +695,14 @@ 
 	// examples:
 	// 	$db->PConnect("host=host1 user=user1 password=secret port=4341");
 	// 	$db->PConnect('host1','user1','secret');
-	function _pconnect($str,$user='',$pwd='',$db='')
+	function _pconnect($str, $user = '', $pwd = '', $db = '')
 	{
-		return $this->_connect($str,$user,$pwd,$db,1);
+		return $this->_connect($str, $user, $pwd, $db, 1);
 	}
 
 
 	// returns queryID or false
-	function _query($sql,$inputarr)
+	function _query($sql, $inputarr)
 	{
 
 		if ($inputarr) {
@@ -722,10 +722,10 @@ 
 			$plan = 'P'.md5($sql);
 
 			$execp = '';
-			foreach($inputarr as $v) {
+			foreach ($inputarr as $v) {
 				if ($execp) $execp .= ',';
 				if (is_string($v)) {
-					if (strncmp($v,"'",1) !== 0) $execp .= $this->qstr($v);
+					if (strncmp($v, "'", 1) !== 0) $execp .= $this->qstr($v);
 				} else {
 					$execp .= $v;
 				}
@@ -734,11 +734,11 @@ 
 			if ($execp) $exsql = "EXECUTE $plan ($execp)";
 			else $exsql = "EXECUTE $plan";
 
-			$rez = @pg_exec($this->_connectionID,$exsql);
+			$rez = @pg_exec($this->_connectionID, $exsql);
 			if (!$rez) {
 			# Perhaps plan does not exist? Prepare/compile plan.
 				$params = '';
-				foreach($inputarr as $v) {
+				foreach ($inputarr as $v) {
 					if ($params) $params .= ',';
 					if (is_string($v)) {
 						$params .= 'VARCHAR';
@@ -748,25 +748,25 @@ 
 						$params .= "REAL";
 					}
 				}
-				$sqlarr = explode('?',$sql);
+				$sqlarr = explode('?', $sql);
 				//print_r($sqlarr);
 				$sql = '';
 				$i = 1;
-				foreach($sqlarr as $v) {
+				foreach ($sqlarr as $v) {
 					$sql .= $v.' $'.$i;
 					$i++;
 				}
-				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);
+				$s = "PREPARE $plan ($params) AS ".substr($sql, 0, strlen($sql) - 2);
 				//adodb_pr($s);
-				pg_exec($this->_connectionID,$s);
+				pg_exec($this->_connectionID, $s);
 				echo $this->ErrorMsg();
 			}
 
-			$rez = pg_exec($this->_connectionID,$exsql);
+			$rez = pg_exec($this->_connectionID, $exsql);
 		} else {
 			$this->_errorMsg = false;
 			//adodb_backtrace();
-			$rez = pg_exec($this->_connectionID,$sql);
+			$rez = pg_exec($this->_connectionID, $sql);
 		}
 		// check if no data returned, then no need to create real recordset
 		if ($rez && pg_numfields($rez) <= 0) {
@@ -829,7 +829,7 @@ 
 	*/
 	function CharMax()
 	{
-		return 1000000000;  // should be 1 Gb?
+		return 1000000000; // should be 1 Gb?
 	}
 
 	/*
@@ -847,11 +847,11 @@ 
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_postgres64 extends ADORecordSet{
+class ADORecordSet_postgres64 extends ADORecordSet {
 	var $_blobArr;
 	var $databaseType = "postgres64";
 	var $canSeek = true;
-	function ADORecordSet_postgres64($queryID,$mode=false)
+	function ADORecordSet_postgres64($queryID, $mode = false)
 	{
 		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
@@ -870,10 +870,10 @@ 
 		$this->ADORecordSet($queryID);
 	}
 
-	function &GetRowAssoc($upper=true)
+	function &GetRowAssoc($upper = true)
 	{
 		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
-		$row =& ADORecordSet::GetRowAssoc($upper);
+		$row = & ADORecordSet::GetRowAssoc($upper);
 		return $row;
 	}
 
@@ -881,15 +881,15 @@ 
 	{
 	global $ADODB_COUNTRECS;
 		$qid = $this->_queryID;
-		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($qid):-1;
+		$this->_numOfRows = ($ADODB_COUNTRECS) ? @pg_numrows($qid) : -1;
 		$this->_numOfFields = @pg_numfields($qid);
 
 		// cache types for blob decode check
 		// apparently pg_fieldtype actually performs an sql query on the database to get the type.
 		if (empty($this->connection->noBlobs))
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
-			if (pg_fieldtype($qid,$i) == 'bytea') {
-				$this->_blobArr[$i] = pg_fieldname($qid,$i);
+		for ($i = 0, $max = $this->_numOfFields; $i < $max; $i++) {
+			if (pg_fieldtype($qid, $i) == 'bytea') {
+				$this->_blobArr[$i] = pg_fieldname($qid, $i);
 			}
 		}
 	}
@@ -901,7 +901,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;
 			}
@@ -913,16 +913,16 @@ 
 	{
 		// offsets begin at 0
 
-		$o= new ADOFieldObject();
-		$o->name = @pg_fieldname($this->_queryID,$off);
-		$o->type = @pg_fieldtype($this->_queryID,$off);
-		$o->max_length = @pg_fieldsize($this->_queryID,$off);
+		$o = new ADOFieldObject();
+		$o->name = @pg_fieldname($this->_queryID, $off);
+		$o->type = @pg_fieldtype($this->_queryID, $off);
+		$o->max_length = @pg_fieldsize($this->_queryID, $off);
 		return $o;
 	}
 
 	function _seek($row)
 	{
-		return @pg_fetch_row($this->_queryID,$row);
+		return @pg_fetch_row($this->_queryID, $row);
 	}
 
 	function _decode($blob)
@@ -934,12 +934,12 @@ 
 	function _fixblobs()
 	{
 		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
+			foreach ($this->_blobArr as $k => $v) {
 				$this->fields[$k] = ADORecordSet_postgres64::_decode($this->fields[$k]);
 			}
 		}
 		if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
+			foreach ($this->_blobArr as $k => $v) {
 				$this->fields[$v] = ADORecordSet_postgres64::_decode($this->fields[$v]);
 			}
 		}
@@ -951,7 +951,7 @@ 
 		if (!$this->EOF) {
 			$this->_currentRow++;
 			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
-				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+				$this->fields = @pg_fetch_array($this->_queryID, $this->_currentRow, $this->fetchMode);
 				if (is_array($this->fields) && $this->fields) {
 					if (isset($this->_blobArr)) $this->_fixblobs();
 					return true;
@@ -969,7 +969,7 @@ 
 		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
         	return false;
 
-		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+		$this->fields = @pg_fetch_array($this->_queryID, $this->_currentRow, $this->fetchMode);
 
 		if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
 
@@ -981,7 +981,7 @@ 
 		return @pg_freeresult($this->_queryID);
 	}
 
-	function MetaType($t,$len=-1,$fieldobj=false)
+	function MetaType($t, $len = -1, $fieldobj = false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;

Braces +449 added lines, -151 removed lines

@@ -43,18 +43,29 @@ 
 */
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
 function adodb_addslashes($s)
 {
 	$len = strlen($s);
-	if ($len == 0) return "''";
-	if (strncmp($s,"'",1) === 0 && substr(s,$len-1) == "'") return $s; // already quoted
+	if ($len == 0)
+	{
+		return "''";
+	}
+	if (strncmp($s,"'",1) === 0 && substr(s,$len-1) == "'")
+	{
+		return $s;
+	}
+	// already quoted
 
 	return "'".addslashes($s)."'";
 }
 
-class ADODB_postgres64 extends ADOConnection{
+class ADODB_postgres64 extends ADOConnection
+{
 	var $databaseType = 'postgres64';
 	var $dataProvider = 'postgres';
 	var $hasInsertID = true;
@@ -123,7 +134,10 @@ 
 
 	function ServerInfo()
 	{
-		if (isset($this->version)) return $this->version;
+		if (isset($this->version))
+		{
+			return $this->version;
+		}
 
 		$arr['description'] = $this->GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
@@ -140,10 +154,14 @@ 
 	function pg_insert_id($tablename,$fieldname)
 	{
 		$result=pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
-		if ($result) {
+		if ($result)
+		{
 			$arr = @pg_fetch_row($result,0);
 			pg_freeresult($result);
-			if (isset($arr[0])) return $arr[0];
+			if (isset($arr[0]))
+			{
+				return $arr[0];
+			}
 		}
 		return false;
 	}
@@ -156,22 +174,29 @@ 
 	{
 		if ($try_oid)
 		{
-			if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
+			if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result')
+			{
+				return false;
+			}
 			$oid = pg_getlastoid($this->_resultid);
 		}
 		else
 		{
 			$oid = false;
 		}
-		if ($oid === false && $table && $column)	// table might not use oid's, default for 8.1+
+		if ($oid === false && $table && $column)
+		{
+			// table might not use oid's, default for 8.1+
 		{
 			// try the standard sequence name first, due to table renames etc. this might not be the correct one
 			if (!($ret = $this->GetOne($sql='SELECT currval('.$this->qstr($table.'_'.$column.'_seq').')'))) {
 				// now we read the sequence name from the database itself, that is a lot slower!
 				$cols = $this->MetaColumns($table);
+		}
 				$fld = $cols[strtoupper($column)];
 				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))
+				{
 					$ret = $this->GetOne($sql='SELECT currval('.$this->qstr($matches[1]).')');
 				}
 			}
@@ -185,7 +210,10 @@ 
 // Warning: This compilation does not support pg_cmdtuples() in d:/inetpub/wwwroot/php/adodb/adodb-postgres.inc.php on line 44
    function _affectedrows()
    {
-   		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
+   		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result')
+   		{
+   			return false;
+   		}
 	   	return pg_cmdtuples($this->_resultid);
    }
 
@@ -193,22 +221,34 @@ 
 		// returns true/false
 	function BeginTrans()
 	{
-		if ($this->transOff) return true;
+		if ($this->transOff)
+		{
+			return true;
+		}
 		$this->transCnt += 1;
 		return @pg_Exec($this->_connectionID, "begin");
 	}
 
 	function RowLock($tables,$where,$flds='1 as ignore')
 	{
-		if (!$this->transCnt) $this->BeginTrans();
+		if (!$this->transCnt)
+		{
+			$this->BeginTrans();
+		}
 		return $this->GetOne("select $flds from $tables where $where for update");
 	}
 
 	// returns true/false.
 	function CommitTrans($ok=true)
 	{
-		if ($this->transOff) return true;
-		if (!$ok) return $this->RollbackTrans();
+		if ($this->transOff)
+		{
+			return true;
+		}
+		if (!$ok)
+		{
+			return $this->RollbackTrans();
+		}
 
 		$this->transCnt -= 1;
 		return @pg_Exec($this->_connectionID, "commit");
@@ -217,7 +257,10 @@ 
 	// returns true/false
 	function RollbackTrans()
 	{
-		if ($this->transOff) return true;
+		if ($this->transOff)
+		{
+			return true;
+		}
 		$this->transCnt -= 1;
 		return @pg_Exec($this->_connectionID, "rollback");
 	}
@@ -225,29 +268,35 @@ 
 	function &MetaTables($ttype=false,$showSchema=false,$mask=false)
 	{
 		$info = $this->ServerInfo();
-		if ($info['version'] >= 7.3) {
+		if ($info['version'] >= 7.3)
+		{
 	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 			  and schemaname  not in ( 'pg_catalog','information_schema')
 	union
         select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
 		}
-		if ($mask) {
+		if ($mask)
+		{
 			$save = $this->metaTablesSQL;
 			$mask = $this->qstr(strtolower($mask));
 			if ($info['version']>=7.3)
-				$this->metaTablesSQL = "
+			{
+							$this->metaTablesSQL = "
 select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
  union
 select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
-			else
-				$this->metaTablesSQL = "
+			}
+			else {
+							$this->metaTablesSQL = "
 select tablename,'T' from pg_tables where tablename like $mask
  union
 select viewname,'V' from pg_views where viewname like $mask";
+			}
 		}
 		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
 
-		if ($mask) {
+		if ($mask)
+		{
 			$this->metaTablesSQL = $save;
 		}
 		return $ret;
@@ -256,16 +305,23 @@ 
 	// if magic quotes disabled, use pg_escape_string()
 	function qstr($s,$magic_quotes=false)
 	{
-		if (is_bool($s)) return $s ? 'true' : 'false';
+		if (is_bool($s))
+		{
+			return $s ? 'true' : 'false';
+		}
 
-		if (!$magic_quotes) {
-			if (ADODB_PHPVER >= 0x5200) {
+		if (!$magic_quotes)
+		{
+			if (ADODB_PHPVER >= 0x5200)
+			{
 				return  "'".pg_escape_string($this->_connectionID,$s)."'";
 			}
-			if (ADODB_PHPVER >= 0x4200) {
+			if (ADODB_PHPVER >= 0x4200)
+			{
 				return  "'".pg_escape_string($s)."'";
 			}
-			if ($this->replaceQuote[0] == '\\'){
+			if ($this->replaceQuote[0] == '\\')
+			{
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
 			}
 			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
@@ -280,13 +336,18 @@ 
 	// 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';
@@ -339,12 +400,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.'"';
+				}
 
 			}
 		}
@@ -386,7 +453,10 @@ 
 	*/
 	function GuessOID($oid)
 	{
-		if (strlen($oid)>16) return false;
+		if (strlen($oid)>16)
+		{
+			return false;
+		}
 		return is_numeric($oid);
 	}
 
@@ -404,18 +474,34 @@ 
 	*/
 	function BlobDecode($blob,$maxsize=false,$hastrans=true)
 	{
-		if (!$this->GuessOID($blob)) return $blob;
+		if (!$this->GuessOID($blob))
+		{
+			return $blob;
+		}
 
-		if ($hastrans) @pg_exec($this->_connectionID,"begin");
+		if ($hastrans)
+		{
+			@pg_exec($this->_connectionID,"begin");
+		}
 		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
-		if ($fd === false) {
-			if ($hastrans) @pg_exec($this->_connectionID,"commit");
+		if ($fd === false)
+		{
+			if ($hastrans)
+			{
+				@pg_exec($this->_connectionID,"commit");
+			}
 			return $blob;
 		}
-		if (!$maxsize) $maxsize = $this->maxblobsize;
+		if (!$maxsize)
+		{
+			$maxsize = $this->maxblobsize;
+		}
 		$realblob = @pg_loread($fd,$maxsize);
 		@pg_loclose($fd);
-		if ($hastrans) @pg_exec($this->_connectionID,"commit");
+		if ($hastrans)
+		{
+			@pg_exec($this->_connectionID,"commit");
+		}
 		return $realblob;
 	}
 
@@ -428,7 +514,10 @@ 
 	*/
 	function BlobEncode($blob)
 	{
-		if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
+		if (ADODB_PHPVER >= 0x4200)
+		{
+			return pg_escape_bytea($blob);
+		}
 
 		/*92=backslash, 0=null, 39=single-quote*/
 		$badch = array(chr(92),chr(0),chr(39)); # \  null  '
@@ -442,7 +531,8 @@ 
 	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
 	{
 
-		if ($blobtype == 'CLOB') {
+		if ($blobtype == 'CLOB')
+		{
     		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
 		}
 		// do not use bind params which uses qstr(), as blobencode() already quotes data
@@ -451,7 +541,10 @@ 
 
 	function OffsetDate($dayFraction,$date=false)
 	{
-		if (!$date) $date = $this->sysDate;
+		if (!$date)
+		{
+			$date = $this->sysDate;
+		}
 		return "($date+interval'$dayFraction days')";
 	}
 
@@ -462,26 +555,45 @@ 
 	{
 	global $ADODB_FETCH_MODE;
 		//if tablenames are quoted, remove the quotes as the tablenames here are used for comparsion of content of fields in postgres system tables
-		if (!empty($this->nameQuote) && !(strpos($table,$this->nameQuote)===false)) $table = str_replace($this->nameQuote,'',$table);
+		if (!empty($this->nameQuote) && !(strpos($table,$this->nameQuote)===false))
+		{
+			$table = str_replace($this->nameQuote,'',$table);
+		}
 		$schema = false;
 		$false = false;
 		$this->_findschema($table,$schema);
 
-		if ($normalize) $table = strtolower($table);
+		if ($normalize)
+		{
+			$table = strtolower($table);
+		}
 
 		$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);
+		}
 
-		if ($schema) $rs =& $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
-		else $rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
-		if (isset($savem)) $this->SetFetchMode($savem);
+		if ($schema)
+		{
+			$rs =& $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
+		}
+		else {
+			$rs =& $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+		}
+		if (isset($savem))
+		{
+			$this->SetFetchMode($savem);
+		}
 		$ADODB_FETCH_MODE = $save;
 
-		if ($rs === false) {
+		if ($rs === false)
+		{
 			return $false;
 		}
-		if (!empty($this->metaKeySQL)) {
+		if (!empty($this->metaKeySQL))
+		{
 			// If we want the primary keys, we have to issue a separate query
 			// Of course, a modified version of the metaColumnsSQL query using a
 			// LEFT JOIN would have been much more elegant, but postgres does
@@ -492,7 +604,10 @@ 
 			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
 			// fetch all result in once for performance.
 			$keys =& $rskey->GetArray();
-			if (isset($savem)) $this->SetFetchMode($savem);
+			if (isset($savem))
+			{
+				$this->SetFetchMode($savem);
+			}
 			$ADODB_FETCH_MODE = $save;
 
 			$rskey->Close();
@@ -500,18 +615,26 @@ 
 		}
 
 		$rsdefa = array();
-		if (!empty($this->metaDefaultsSQL)) {
+		if (!empty($this->metaDefaultsSQL))
+		{
 			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
 			$sql = sprintf($this->metaDefaultsSQL, ($table));
 			$rsdef = $this->Execute($sql);
-			if (isset($savem)) $this->SetFetchMode($savem);
+			if (isset($savem))
+			{
+				$this->SetFetchMode($savem);
+			}
 			$ADODB_FETCH_MODE = $save;
 
-			if ($rsdef) {
-				while (!$rsdef->EOF) {
+			if ($rsdef)
+			{
+				while (!$rsdef->EOF)
+				{
 					$num = $rsdef->fields['num'];
 					$s = $rsdef->fields['def'];
-					if (strpos($s,'::')===false && substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
+					if (strpos($s,'::')===false && substr($s, 0, 1) == "'")
+					{
+/* quoted strings hack... for now... fixme */
 						$s = substr($s, 1);
 						$s = substr($s, 0, strlen($s) - 1);
 					}
@@ -519,56 +642,83 @@ 
 					$rsdefa[$num] = $s;
 					$rsdef->MoveNext();
 				}
-			} else {
+			}
+			else
+			{
 				ADOConnection::outp( "==> SQL => " . $sql);
 			}
 			unset($rsdef);
 		}
 
 		$retarr = array();
-		while (!$rs->EOF) {
+		while (!$rs->EOF)
+		{
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
-			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
-			if ($fld->max_length <= 0) $fld->max_length = -1;
-			if ($fld->type == 'numeric') {
+			if ($fld->max_length <= 0)
+			{
+				$fld->max_length = $rs->fields[3]-4;
+			}
+			if ($fld->max_length <= 0)
+			{
+				$fld->max_length = -1;
+			}
+			if ($fld->type == 'numeric')
+			{
 				$fld->scale = $fld->max_length & 0xFFFF;
 				$fld->max_length >>= 16;
 			}
 			// dannym
 			// 5 hasdefault; 6 num-of-column
 			$fld->has_default = ($rs->fields[5] == 't');
-			if ($fld->has_default) {
+			if ($fld->has_default)
+			{
 				$fld->default_value = $rsdefa[$rs->fields[6]];
 			}
 
 			//Freek
-			if ($rs->fields[4] == 't') {
+			if ($rs->fields[4] == 't')
+			{
 				$fld->not_null = true;
 			}
 
 			// Freek
-			if (is_array($keys)) {
-				foreach($keys as $key) {
+			if (is_array($keys))
+			{
+				foreach($keys as $key)
+				{
 					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't')
-						$fld->primary_key = true;
+					{
+											$fld->primary_key = true;
+					}
 					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't')
-						$fld->unique = true; // What name is more compatible?
+					{
+											$fld->unique = true;
+					}
+					// What name is more compatible?
 				}
 			}
 
-			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
-			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM)
+			{
+				$retarr[] = $fld;
+			}
+			else {
+				$retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
+			}
 
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		if (empty($retarr))
-			return  $false;
-		else
-			return $retarr;
+		{
+					return  $false;
+		}
+		else {
+					return $retarr;
+		}
 
 	}
 
@@ -582,7 +732,9 @@ 
 				$schema = false;
 				$this->_findschema($table,$schema);
 
-				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
+				if ($schema)
+				{
+// requires pgsql 7.3+ - pg_namespace used.
 					$sql = '
 SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
 FROM pg_catalog.pg_class c
@@ -590,7 +742,9 @@ 
 JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
 	,pg_namespace n
 WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\' AND i.indisprimary=false';
-				} else {
+				}
+				else
+				{
 	                $sql = '
 SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
 FROM pg_catalog.pg_class c
@@ -599,32 +753,38 @@ 
 WHERE c2.relname=\'%s\' or c2.relname=lower(\'%s\')';
     			}
 
-                if ($primary == FALSE) {
+                if ($primary == FALSE)
+                {
                 	$sql .= ' AND i.indisprimary=false;';
                 }
 
                 $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(sprintf($sql,$table,$table,$schema));
-                if (isset($savem)) {
+                if (isset($savem))
+                {
                         $this->SetFetchMode($savem);
                 }
                 $ADODB_FETCH_MODE = $save;
 
-                if (!is_object($rs)) {
+                if (!is_object($rs))
+                {
                 	$false = false;
 					return $false;
                 }
 
                 $col_names = $this->MetaColumnNames($table,true);
                 $indexes = array();
-                while ($row = $rs->FetchRow()) {
+                while ($row = $rs->FetchRow())
+                {
                         $columns = array();
-                        foreach (explode(' ', $row[2]) as $col) {
+                        foreach (explode(' ', $row[2]) as $col)
+                        {
                                 $columns[] = $col_names[$col - 1];
                         }
 
@@ -644,43 +804,85 @@ 
 	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
 	{
 
-		if (!function_exists('pg_pconnect')) return null;
+		if (!function_exists('pg_pconnect'))
+		{
+			return null;
+		}
 
 		$this->_errorMsg = false;
 
-		if ($user || $pwd || $db) {
+		if ($user || $pwd || $db)
+		{
 			$user = adodb_addslashes($user);
 			$pwd = adodb_addslashes($pwd);
-			if (strlen($db) == 0) $db = 'template1';
+			if (strlen($db) == 0)
+			{
+				$db = 'template1';
+			}
 			$db = adodb_addslashes($db);
-		   	if ($str)  {
+		   	if ($str)
+		   	{
 			 	$host = explode(":", $str);
-				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
-				else $str = 'host=localhost';
-				if (isset($host[1])) $str .= " port=$host[1]";
-				else if (!empty($this->port)) $str .= " port=".$this->port;
+				if ($host[0])
+				{
+					$str = "host=".adodb_addslashes($host[0]);
+				}
+				else {
+					$str = 'host=localhost';
+				}
+				if (isset($host[1]))
+				{
+					$str .= " port=$host[1]";
+				}
+				else if (!empty($this->port))
+				{
+					$str .= " port=".$this->port;
+				}
 			}
-		   		if ($user) $str .= " user=".$user;
-		   		if ($pwd)  $str .= " password=".$pwd;
-				if ($db)   $str .= " dbname=".$db;
+		   		if ($user)
+		   		{
+		   			$str .= " user=".$user;
+		   		}
+		   		if ($pwd)
+		   		{
+		   			$str .= " password=".$pwd;
+		   		}
+				if ($db)
+				{
+					$str .= " dbname=".$db;
+				}
 		}
 
 		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
 
-		if ($ctype === 1) { // persistent
+		if ($ctype === 1)
+		{
+// persistent
 			$this->_connectionID = pg_pconnect($str);
-		} else {
-			if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
+		}
+		else
+		{
+			if ($ctype === -1)
+			{
+// nconnect, we trick pgsql ext by changing the connection str
 			static $ncnt;
 
-				if (empty($ncnt)) $ncnt = 1;
-				else $ncnt += 1;
+				if (empty($ncnt))
+				{
+					$ncnt = 1;
+				}
+				else {
+					$ncnt += 1;
+				}
 
 				$str .= str_repeat(' ',$ncnt);
 			}
 			$this->_connectionID = pg_connect($str);
 		}
-		if ($this->_connectionID === false) return false;
+		if ($this->_connectionID === false)
+		{
+			return false;
+		}
 		$this->Execute("set datestyle='ISO'");
 		return true;
 	}
@@ -705,7 +907,8 @@ 
 	function _query($sql,$inputarr)
 	{
 
-		if ($inputarr) {
+		if ($inputarr)
+		{
 		/*
 			It appears that PREPARE/EXECUTE is slower for many queries.
 
@@ -722,29 +925,54 @@ 
 			$plan = 'P'.md5($sql);
 
 			$execp = '';
-			foreach($inputarr as $v) {
-				if ($execp) $execp .= ',';
-				if (is_string($v)) {
-					if (strncmp($v,"'",1) !== 0) $execp .= $this->qstr($v);
-				} else {
+			foreach($inputarr as $v)
+			{
+				if ($execp)
+				{
+					$execp .= ',';
+				}
+				if (is_string($v))
+				{
+					if (strncmp($v,"'",1) !== 0)
+					{
+						$execp .= $this->qstr($v);
+					}
+				}
+				else
+				{
 					$execp .= $v;
 				}
 			}
 
-			if ($execp) $exsql = "EXECUTE $plan ($execp)";
-			else $exsql = "EXECUTE $plan";
+			if ($execp)
+			{
+				$exsql = "EXECUTE $plan ($execp)";
+			}
+			else {
+				$exsql = "EXECUTE $plan";
+			}
 
 			$rez = @pg_exec($this->_connectionID,$exsql);
-			if (!$rez) {
+			if (!$rez)
+			{
 			# Perhaps plan does not exist? Prepare/compile plan.
 				$params = '';
-				foreach($inputarr as $v) {
-					if ($params) $params .= ',';
-					if (is_string($v)) {
+				foreach($inputarr as $v)
+				{
+					if ($params)
+					{
+						$params .= ',';
+					}
+					if (is_string($v))
+					{
 						$params .= 'VARCHAR';
-					} else if (is_integer($v)) {
+					}
+					else if (is_integer($v))
+					{
 						$params .= 'INTEGER';
-					} else {
+					}
+					else
+					{
 						$params .= "REAL";
 					}
 				}
@@ -752,7 +980,8 @@ 
 				//print_r($sqlarr);
 				$sql = '';
 				$i = 1;
-				foreach($sqlarr as $v) {
+				foreach($sqlarr as $v)
+				{
 					$sql .= $v.' $'.$i;
 					$i++;
 				}
@@ -763,14 +992,18 @@ 
 			}
 
 			$rez = pg_exec($this->_connectionID,$exsql);
-		} else {
+		}
+		else
+		{
 			$this->_errorMsg = false;
 			//adodb_backtrace();
 			$rez = pg_exec($this->_connectionID,$sql);
 		}
 		// check if no data returned, then no need to create real recordset
-		if ($rez && pg_numfields($rez) <= 0) {
-			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
+		if ($rez && pg_numfields($rez) <= 0)
+		{
+			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result')
+			{
 				pg_freeresult($this->_resultid);
 			}
 			$this->_resultid = $rez;
@@ -784,19 +1017,38 @@ 
 	/*	Returns: the last error message from previous database operation	*/
 	function ErrorMsg()
 	{
-		if ($this->_errorMsg !== false) return $this->_errorMsg;
-		if (ADODB_PHPVER >= 0x4300) {
-			if (!empty($this->_resultid)) {
+		if ($this->_errorMsg !== false)
+		{
+			return $this->_errorMsg;
+		}
+		if (ADODB_PHPVER >= 0x4300)
+		{
+			if (!empty($this->_resultid))
+			{
 				$this->_errorMsg = @pg_result_error($this->_resultid);
-				if ($this->_errorMsg) return $this->_errorMsg;
+				if ($this->_errorMsg)
+				{
+					return $this->_errorMsg;
+				}
 			}
 
-			if (!empty($this->_connectionID)) {
+			if (!empty($this->_connectionID))
+			{
 				$this->_errorMsg = @pg_last_error($this->_connectionID);
-			} else $this->_errorMsg = @pg_last_error();
-		} else {
-			if (empty($this->_connectionID)) $this->_errorMsg = @pg_errormessage();
-			else $this->_errorMsg = @pg_errormessage($this->_connectionID);
+			}
+			else {
+				$this->_errorMsg = @pg_last_error();
+			}
+		}
+		else
+		{
+			if (empty($this->_connectionID))
+			{
+				$this->_errorMsg = @pg_errormessage();
+			}
+			else {
+				$this->_errorMsg = @pg_errormessage($this->_connectionID);
+			}
 		}
 		return $this->_errorMsg;
 	}
@@ -804,7 +1056,8 @@ 
 	function ErrorNo()
 	{
 		$e = $this->ErrorMsg();
-		if (strlen($e)) {
+		if (strlen($e))
+		{
 			return ADOConnection::MetaError($e);
 		 }
 		 return 0;
@@ -813,8 +1066,12 @@ 
 	// returns true or false
 	function _close()
 	{
-		if ($this->transCnt) $this->RollbackTrans();
-		if ($this->_resultid) {
+		if ($this->transCnt)
+		{
+			$this->RollbackTrans();
+		}
+		if ($this->_resultid)
+		{
 			@pg_freeresult($this->_resultid);
 			$this->_resultid = false;
 		}
@@ -847,13 +1104,15 @@ 
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
-class ADORecordSet_postgres64 extends ADORecordSet{
+class ADORecordSet_postgres64 extends ADORecordSet
+{
 	var $_blobArr;
 	var $databaseType = "postgres64";
 	var $canSeek = true;
 	function ADORecordSet_postgres64($queryID,$mode=false)
 	{
-		if ($mode === false) {
+		if ($mode === false)
+		{
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -872,7 +1131,10 @@ 
 
 	function &GetRowAssoc($upper=true)
 	{
-		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
+		if ($this->fetchMode == PGSQL_ASSOC && !$upper)
+		{
+			return $this->fields;
+		}
 		$row =& ADORecordSet::GetRowAssoc($upper);
 		return $row;
 	}
@@ -887,8 +1149,13 @@ 
 		// cache types for blob decode check
 		// apparently pg_fieldtype actually performs an sql query on the database to get the type.
 		if (empty($this->connection->noBlobs))
-		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {
-			if (pg_fieldtype($qid,$i) == 'bytea') {
+		{
+				for ($i=0, $max = $this->_numOfFields;
+		}
+		$i < $max; $i++)
+		{
+			if (pg_fieldtype($qid,$i) == 'bytea')
+			{
 				$this->_blobArr[$i] = pg_fieldname($qid,$i);
 			}
 		}
@@ -897,11 +1164,16 @@ 
 		/* Use associative array to get fields array */
 	function Fields($colname)
 	{
-		if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
+		if ($this->fetchMode != PGSQL_NUM)
+		{
+			return @$this->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;
 			}
@@ -927,19 +1199,26 @@ 
 
 	function _decode($blob)
 	{
-		if ($blob === NULL) return NULL;
+		if ($blob === NULL)
+		{
+			return NULL;
+		}
 		return pg_unescape_bytea($blob);
 	}
 
 	function _fixblobs()
 	{
-		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
+		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH)
+		{
+			foreach($this->_blobArr as $k => $v)
+			{
 				$this->fields[$k] = ADORecordSet_postgres64::_decode($this->fields[$k]);
 			}
 		}
-		if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == PGSQL_BOTH) {
-			foreach($this->_blobArr as $k => $v) {
+		if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == PGSQL_BOTH)
+		{
+			foreach($this->_blobArr as $k => $v)
+			{
 				$this->fields[$v] = ADORecordSet_postgres64::_decode($this->fields[$v]);
 			}
 		}
@@ -948,12 +1227,18 @@ 
 	// 10% speedup to move MoveNext to child class
 	function MoveNext()
 	{
-		if (!$this->EOF) {
+		if (!$this->EOF)
+		{
 			$this->_currentRow++;
-			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
+			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow)
+			{
 				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
-				if (is_array($this->fields) && $this->fields) {
-					if (isset($this->_blobArr)) $this->_fixblobs();
+				if (is_array($this->fields) && $this->fields)
+				{
+					if (isset($this->_blobArr))
+					{
+						$this->_fixblobs();
+					}
 					return true;
 				}
 			}
@@ -967,11 +1252,16 @@ 
 	{
 
 		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
-        	return false;
+		{
+		        	return false;
+		}
 
 		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
 
-		if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
+		if ($this->fields && isset($this->_blobArr))
+		{
+			$this->_fixblobs();
+		}
 
 		return (is_array($this->fields));
 	}
@@ -983,12 +1273,14 @@ 
 
 	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 'MONEY': // stupid, postgres expects money to be a string
 				case 'INTERVAL':
 				case 'CHAR':
@@ -998,7 +1290,10 @@ 
 		   		case 'BPCHAR':
 				case '_VARCHAR':
 				case 'INET':
-					if ($len <= $this->blobSize) return 'C';
+					if ($len <= $this->blobSize)
+					{
+						return 'C';
+					}
 
 				case 'TEXT':
 					return 'X';
@@ -1030,7 +1325,10 @@ 
 				case 'INT4':
 				case 'INT2':
 					if (isset($fieldobj) &&
-				empty($fieldobj->primary_key) && empty($fieldobj->unique)) return 'I';
+				empty($fieldobj->primary_key) && empty($fieldobj->unique))
+					{
+						return 'I';
+					}
 
 				case 'OID':
 				case 'SERIAL':

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

@@ -178,7 +178,7 @@ 
 			return $ret;
 		}
 		// to really return the id, we need the table and column-name, else we can only return the oid != id
-		return empty($table) || empty($column) ? $oid : $this->GetOne("SELECT $column FROM $table WHERE oid=".(int)$oid);
+		return empty($table) || empty($column) ? $oid : $this->GetOne("select $column FROM $table WHERE oid=".(int)$oid);
 	}
 
 // I get this error with PHP before 4.0.6 - jlim
@@ -443,10 +443,10 @@ 
 	{
 
 		if ($blobtype == 'CLOB') {
-    		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
+    		return $this->Execute("update $table SET $column=" . $this->qstr($val) . " WHERE $where");
 		}
 		// do not use bind params which uses qstr(), as blobencode() already quotes data
-		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
+		return $this->Execute("update $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
 	}
 
 	function OffsetDate($dayFraction,$date=false)
@@ -552,9 +552,9 @@ 
 			// Freek
 			if (is_array($keys)) {
 				foreach($keys as $key) {
-					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't')
+					if ($fld->name == $key['column_name'] and $key['primary_key'] == 't')
 						$fld->primary_key = true;
-					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't')
+					if ($fld->name == $key['column_name'] and $key['unique_key'] == 't')
 						$fld->unique = true; // What name is more compatible?
 				}
 			}
@@ -731,8 +731,8 @@ 
 				}
 			}
 
-			if ($execp) $exsql = "EXECUTE $plan ($execp)";
-			else $exsql = "EXECUTE $plan";
+			if ($execp) $exsql = "execute $plan ($execp)";
+			else $exsql = "execute $plan";
 
 			$rez = @pg_exec($this->_connectionID,$exsql);
 			if (!$rez) {
@@ -756,7 +756,7 @@ 
 					$sql .= $v.' $'.$i;
 					$i++;
 				}
-				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);
+				$s = "prepare $plan ($params) AS ".substr($sql,0,strlen($sql)-2);
 				//adodb_pr($s);
 				pg_exec($this->_connectionID,$s);
 				echo $this->ErrorMsg();

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

Doc Comments +9 added lines

@@ -65,11 +65,17 @@ 
   	   return $this->GetOne('select @@identity');
 	 }
 
+  /**
+   * @param string $blobVarName
+   */
   function create_blobvar($blobVarName) {
    $this->Execute("create variable $blobVarName long binary");
    return;
   }
 
+  /**
+   * @param string $blobVarName
+   */
   function drop_blobvar($blobVarName) {
    $this->Execute("drop variable $blobVarName");
    return;
@@ -105,6 +111,9 @@ 
    return;
   }
 
+  /**
+   * @param string $blobVarName
+   */
   function load_blobvar_from_var($blobVarName, &$varName) {
    $chunk_size = 1000;
 

Spacing +19 added lines, -19 removed lines

@@ -48,9 +48,9 @@ 
  include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
 
-if (!defined('ADODB_SYBASE_SQLANYWHERE')){
+if (!defined('ADODB_SYBASE_SQLANYWHERE')) {
 
- define('ADODB_SYBASE_SQLANYWHERE',1);
+ define('ADODB_SYBASE_SQLANYWHERE', 1);
 
  class ADODB_sqlanywhere extends ADODB_odbc {
   	var $databaseType = "sqlanywhere";	
@@ -78,30 +78,30 @@ 
   function load_blobvar_from_file($blobVarName, $filename) {
    $chunk_size = 1000;
 
-   $fd = fopen ($filename, "rb");
+   $fd = fopen($filename, "rb");
 
    $integer_chunks = (integer)filesize($filename) / $chunk_size;
    $modulus = filesize($filename) % $chunk_size;
-   if ($modulus != 0){
+   if ($modulus != 0) {
 	$integer_chunks += 1;
    }
 
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-	$contents = fread ($fd, $chunk_size);
+   for ($loop = 1; $loop <= $integer_chunks; $loop++) {
+	$contents = fread($fd, $chunk_size);
 	$contents = bin2hex($contents);
 
 	$hexstring = '';
 
-	for($loop2=0;$loop2<strlen($contents);$loop2+=2){
-	 $hexstring .= '\x' . substr($contents,$loop2,2);
+	for ($loop2 = 0; $loop2 < strlen($contents); $loop2 += 2) {
+	 $hexstring .= '\x'.substr($contents, $loop2, 2);
 	 }
 
 	$hexstring = $this->qstr($hexstring);
 
-	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
+	$this->Execute("set $blobVarName = $blobVarName || ".$hexstring);
    }
 
-   fclose ($fd);
+   fclose($fd);
    return;
   }
 
@@ -110,23 +110,23 @@ 
 
    $integer_chunks = (integer)strlen($varName) / $chunk_size;
    $modulus = strlen($varName) % $chunk_size;
-   if ($modulus != 0){
+   if ($modulus != 0) {
 	$integer_chunks += 1;
    }
 
-   for($loop=1;$loop<=$integer_chunks;$loop++){
-	$contents = substr ($varName, (($loop - 1) * $chunk_size), $chunk_size);
+   for ($loop = 1; $loop <= $integer_chunks; $loop++) {
+	$contents = substr($varName, (($loop - 1) * $chunk_size), $chunk_size);
 	$contents = bin2hex($contents);
 
 	$hexstring = '';
 
-	for($loop2=0;$loop2<strlen($contents);$loop2+=2){
-	 $hexstring .= '\x' . substr($contents,$loop2,2);
+	for ($loop2 = 0; $loop2 < strlen($contents); $loop2 += 2) {
+	 $hexstring .= '\x'.substr($contents, $loop2, 2);
 	 }
 
 	$hexstring = $this->qstr($hexstring);
 
-	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
+	$this->Execute("set $blobVarName = $blobVarName || ".$hexstring);
    }
 
    return;
@@ -141,7 +141,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')
   {
    $blobVarName = 'hold_blob';
    $this->create_blobvar($blobVarName);
@@ -156,9 +156,9 @@ 
 
   var $databaseType = "sqlanywhere";		
 
- function ADORecordSet_sqlanywhere($id,$mode=false)
+ function ADORecordSet_sqlanywhere($id, $mode = false)
  {
-  $this->ADORecordSet_odbc($id,$mode);
+  $this->ADORecordSet_odbc($id, $mode);
  }
 
 

Braces +34 added lines, -16 removed lines

@@ -42,17 +42,23 @@ 
 */
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
-if (!defined('_ADODB_ODBC_LAYER')) {
+if (!defined('_ADODB_ODBC_LAYER'))
+{
  include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
 
-if (!defined('ADODB_SYBASE_SQLANYWHERE')){
+if (!defined('ADODB_SYBASE_SQLANYWHERE'))
+{
 
  define('ADODB_SYBASE_SQLANYWHERE',1);
 
- class ADODB_sqlanywhere extends ADODB_odbc {
+ class ADODB_sqlanywhere extends ADODB_odbc
+ {
   	var $databaseType = "sqlanywhere";	
 	var $hasInsertID = true;
 	
@@ -61,38 +67,45 @@ 
 		$this->ADODB_odbc();
 	}
 
-	 function _insertid() {
+	 function _insertid()
+	 {
   	   return $this->GetOne('select @@identity');
 	 }
 
-  function create_blobvar($blobVarName) {
+  function create_blobvar($blobVarName)
+  {
    $this->Execute("create variable $blobVarName long binary");
    return;
   }
 
-  function drop_blobvar($blobVarName) {
+  function drop_blobvar($blobVarName)
+  {
    $this->Execute("drop variable $blobVarName");
    return;
   }
 
-  function load_blobvar_from_file($blobVarName, $filename) {
+  function load_blobvar_from_file($blobVarName, $filename)
+  {
    $chunk_size = 1000;
 
    $fd = fopen ($filename, "rb");
 
    $integer_chunks = (integer)filesize($filename) / $chunk_size;
    $modulus = filesize($filename) % $chunk_size;
-   if ($modulus != 0){
+   if ($modulus != 0)
+   {
 	$integer_chunks += 1;
    }
 
-   for($loop=1;$loop<=$integer_chunks;$loop++){
+   for($loop=1;$loop<=$integer_chunks;$loop++)
+   {
 	$contents = fread ($fd, $chunk_size);
 	$contents = bin2hex($contents);
 
 	$hexstring = '';
 
-	for($loop2=0;$loop2<strlen($contents);$loop2+=2){
+	for($loop2=0;$loop2<strlen($contents);$loop2+=2)
+	{
 	 $hexstring .= '\x' . substr($contents,$loop2,2);
 	 }
 
@@ -105,22 +118,26 @@ 
    return;
   }
 
-  function load_blobvar_from_var($blobVarName, &$varName) {
+  function load_blobvar_from_var($blobVarName, &$varName)
+  {
    $chunk_size = 1000;
 
    $integer_chunks = (integer)strlen($varName) / $chunk_size;
    $modulus = strlen($varName) % $chunk_size;
-   if ($modulus != 0){
+   if ($modulus != 0)
+   {
 	$integer_chunks += 1;
    }
 
-   for($loop=1;$loop<=$integer_chunks;$loop++){
+   for($loop=1;$loop<=$integer_chunks;$loop++)
+   {
 	$contents = substr ($varName, (($loop - 1) * $chunk_size), $chunk_size);
 	$contents = bin2hex($contents);
 
 	$hexstring = '';
 
-	for($loop2=0;$loop2<strlen($contents);$loop2+=2){
+	for($loop2=0;$loop2<strlen($contents);$loop2+=2)
+	{
 	 $hexstring .= '\x' . substr($contents,$loop2,2);
 	 }
 
@@ -152,7 +169,8 @@ 
   }
  }; //class
 
- class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {	
+ class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc
+ {
 
   var $databaseType = "sqlanywhere";		
 

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

@@ -146,7 +146,7 @@
    $blobVarName = 'hold_blob';
    $this->create_blobvar($blobVarName);
    $this->load_blobvar_from_var($blobVarName, $val);
-   $this->Execute("UPDATE $table SET $column=$blobVarName WHERE $where");
+   $this->Execute("update $table SET $column=$blobVarName WHERE $where");
    $this->drop_blobvar($blobVarName);
    return true;
   }

phpgwapi/inc/adodb/pear/Auth/Container/ADOdb.php

Doc Comments +2 added lines, -1 removed lines

@@ -131,7 +131,7 @@ 
      * the database. If that's not the case, a new connection is opened.
      *
      * @access private
-     * @return mixed True or a DB error object.
+     * @return boolean True or a DB error object.
      */
     function _prepare()
     {
@@ -153,6 +153,7 @@ 
      *
      * @access public
      * @param  string Query string
+     * @param string $query
      * @return mixed  a DB_result object or DB_OK on success, a DB
      *                or PEAR error on failure
      */

Indentation +353 added lines, -353 removed lines

@@ -40,365 +40,365 @@
 class Auth_Container_ADOdb extends Auth_Container
 {
 
-    /**
-     * Additional options for the storage container
-     * @var array
-     */
-    var $options = array();
-
-    /**
-     * DB object
-     * @var object
-     */
-    var $db = null;
-    var $dsn = '';
+	/**
+	 * Additional options for the storage container
+	 * @var array
+	 */
+	var $options = array();
+
+	/**
+	 * DB object
+	 * @var object
+	 */
+	var $db = null;
+	var $dsn = '';
 	
-    /**
-     * User that is currently selected from the DB.
-     * @var string
-     */
-    var $activeUser = '';
-
-    // {{{ Constructor
-
-    /**
-     * Constructor of the container class
-     *
-     * Initate connection to the database via PEAR::ADOdb
-     *
-     * @param  string Connection data or DB object
-     * @return object Returns an error object if something went wrong
-     */
-    function Auth_Container_ADOdb($dsn)
-    {
-        $this->_setDefaults();
+	/**
+	 * User that is currently selected from the DB.
+	 * @var string
+	 */
+	var $activeUser = '';
+
+	// {{{ Constructor
+
+	/**
+	 * Constructor of the container class
+	 *
+	 * Initate connection to the database via PEAR::ADOdb
+	 *
+	 * @param  string Connection data or DB object
+	 * @return object Returns an error object if something went wrong
+	 */
+	function Auth_Container_ADOdb($dsn)
+	{
+		$this->_setDefaults();
 		
-        if (is_array($dsn)) {
-            $this->_parseOptions($dsn);
-
-            if (empty($this->options['dsn'])) {
-                PEAR::raiseError('No connection parameters specified!');
-            }
-        } else {
-        	// Extract db_type from dsn string.
-            $this->options['dsn'] = $dsn;
-        }
-    }
-
-    // }}}
-    // {{{ _connect()
-
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @access private
-     * @param  string DSN string
-     * @return mixed  Object on error, otherwise bool
-     */
-     function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-        	if(!$this->db) {
-	        	$this->db = &ADONewConnection($dsn);
-	    		if( $err = ADODB_Pear_error() ) {
-	   	    		return PEAR::raiseError($err);
-	    		}
-        	}
+		if (is_array($dsn)) {
+			$this->_parseOptions($dsn);
+
+			if (empty($this->options['dsn'])) {
+				PEAR::raiseError('No connection parameters specified!');
+			}
+		} else {
+			// Extract db_type from dsn string.
+			$this->options['dsn'] = $dsn;
+		}
+	}
+
+	// }}}
+	// {{{ _connect()
+
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @access private
+	 * @param  string DSN string
+	 * @return mixed  Object on error, otherwise bool
+	 */
+	 function _connect($dsn)
+	{
+		if (is_string($dsn) || is_array($dsn)) {
+			if(!$this->db) {
+				$this->db = &ADONewConnection($dsn);
+				if( $err = ADODB_Pear_error() ) {
+	   				return PEAR::raiseError($err);
+				}
+			}
         	
-        } else {
-            return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
-                                    41,
-                                    PEAR_ERROR_RETURN,
-                                    null,
-                                    null
-                                    );
-        }
+		} else {
+			return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
+									41,
+									PEAR_ERROR_RETURN,
+									null,
+									null
+									);
+		}
         
-        if(!$this->db) {
-        	return PEAR::raiseError(ADODB_Pear_error());
-        } else {
-        	return true;
-        }
-    }
-
-    // }}}
-    // {{{ _prepare()
-
-    /**
-     * Prepare database connection
-     *
-     * This function checks if we have already opened a connection to
-     * the database. If that's not the case, a new connection is opened.
-     *
-     * @access private
-     * @return mixed True or a DB error object.
-     */
-    function _prepare()
-    {
-    	if(!$this->db) {
-    		$res = $this->_connect($this->options['dsn']);  		
-    	}
-        return true;
-    }
-
-    // }}}
-    // {{{ query()
-
-    /**
-     * Prepare query to the database
-     *
-     * This function checks if we have already opened a connection to
-     * the database. If that's not the case, a new connection is opened.
-     * After that the query is passed to the database.
-     *
-     * @access public
-     * @param  string Query string
-     * @return mixed  a DB_result object or DB_OK on success, a DB
-     *                or PEAR error on failure
-     */
-    function query($query)
-    {
-        $err = $this->_prepare();
-        if ($err !== true) {
-            return $err;
-        }
-        return $this->db->query($query);
-    }
-
-    // }}}
-    // {{{ _setDefaults()
-
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    function _setDefaults()
-    {
-    	$this->options['db_type']	= 'mysql';
-        $this->options['table']       = 'auth';
-        $this->options['usernamecol'] = 'username';
-        $this->options['passwordcol'] = 'password';
-        $this->options['dsn']         = '';
-        $this->options['db_fields']   = '';
-        $this->options['cryptType']   = 'md5';
-    }
-
-    // }}}
-    // {{{ _parseOptions()
-
-    /**
-     * Parse options passed to the container class
-     *
-     * @access private
-     * @param  array
-     */
-    function _parseOptions($array)
-    {
-        foreach ($array as $key => $value) {
-            if (isset($this->options[$key])) {
-                $this->options[$key] = $value;
-            }
-        }
-
-        /* Include additional fields if they exist */
-        if(!empty($this->options['db_fields'])){
-            if(is_array($this->options['db_fields'])){
-                $this->options['db_fields'] = join($this->options['db_fields'], ', ');
-            }
-            $this->options['db_fields'] = ', '.$this->options['db_fields'];
-        }
-    }
-
-    // }}}
-    // {{{ fetchData()
-
-    /**
-     * Get user information from database
-     *
-     * This function uses the given username to fetch
-     * the corresponding login data from the database
-     * table. If an account that matches the passed username
-     * and password is found, the function returns true.
-     * Otherwise it returns false.
-     *
-     * @param   string Username
-     * @param   string Password
-     * @return  mixed  Error object or boolean
-     */
-    function fetchData($username, $password)
-    {
-        // Prepare for a database query
-        $err = $this->_prepare();
-        if ($err !== true) {
-            return PEAR::raiseError($err->getMessage(), $err->getCode());
-        }
-
-        // Find if db_fields contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
-            $sql_from = "*";
-        }
-        else{
-            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
-        }
+		if(!$this->db) {
+			return PEAR::raiseError(ADODB_Pear_error());
+		} else {
+			return true;
+		}
+	}
+
+	// }}}
+	// {{{ _prepare()
+
+	/**
+	 * Prepare database connection
+	 *
+	 * This function checks if we have already opened a connection to
+	 * the database. If that's not the case, a new connection is opened.
+	 *
+	 * @access private
+	 * @return mixed True or a DB error object.
+	 */
+	function _prepare()
+	{
+		if(!$this->db) {
+			$res = $this->_connect($this->options['dsn']);  		
+		}
+		return true;
+	}
+
+	// }}}
+	// {{{ query()
+
+	/**
+	 * Prepare query to the database
+	 *
+	 * This function checks if we have already opened a connection to
+	 * the database. If that's not the case, a new connection is opened.
+	 * After that the query is passed to the database.
+	 *
+	 * @access public
+	 * @param  string Query string
+	 * @return mixed  a DB_result object or DB_OK on success, a DB
+	 *                or PEAR error on failure
+	 */
+	function query($query)
+	{
+		$err = $this->_prepare();
+		if ($err !== true) {
+			return $err;
+		}
+		return $this->db->query($query);
+	}
+
+	// }}}
+	// {{{ _setDefaults()
+
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	function _setDefaults()
+	{
+		$this->options['db_type']	= 'mysql';
+		$this->options['table']       = 'auth';
+		$this->options['usernamecol'] = 'username';
+		$this->options['passwordcol'] = 'password';
+		$this->options['dsn']         = '';
+		$this->options['db_fields']   = '';
+		$this->options['cryptType']   = 'md5';
+	}
+
+	// }}}
+	// {{{ _parseOptions()
+
+	/**
+	 * Parse options passed to the container class
+	 *
+	 * @access private
+	 * @param  array
+	 */
+	function _parseOptions($array)
+	{
+		foreach ($array as $key => $value) {
+			if (isset($this->options[$key])) {
+				$this->options[$key] = $value;
+			}
+		}
+
+		/* Include additional fields if they exist */
+		if(!empty($this->options['db_fields'])){
+			if(is_array($this->options['db_fields'])){
+				$this->options['db_fields'] = join($this->options['db_fields'], ', ');
+			}
+			$this->options['db_fields'] = ', '.$this->options['db_fields'];
+		}
+	}
+
+	// }}}
+	// {{{ fetchData()
+
+	/**
+	 * Get user information from database
+	 *
+	 * This function uses the given username to fetch
+	 * the corresponding login data from the database
+	 * table. If an account that matches the passed username
+	 * and password is found, the function returns true.
+	 * Otherwise it returns false.
+	 *
+	 * @param   string Username
+	 * @param   string Password
+	 * @return  mixed  Error object or boolean
+	 */
+	function fetchData($username, $password)
+	{
+		// Prepare for a database query
+		$err = $this->_prepare();
+		if ($err !== true) {
+			return PEAR::raiseError($err->getMessage(), $err->getCode());
+		}
+
+		// Find if db_fields contains a *, i so assume all col are selected
+		if(strstr($this->options['db_fields'], '*')){
+			$sql_from = "*";
+		}
+		else{
+			$sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+		}
         
-        $query = "SELECT ".$sql_from.
-                " FROM ".$this->options['table'].
-                " WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
+		$query = "SELECT ".$sql_from.
+				" FROM ".$this->options['table'].
+				" WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
         
-        $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-        $rset = $this->db->Execute( $query );
-        $res = $rset->fetchRow();
-
-        if (DB::isError($res)) {
-            return PEAR::raiseError($res->getMessage(), $res->getCode());
-        }
-        if (!is_array($res)) {
-            $this->activeUser = '';
-            return false;
-        }
-        if ($this->verifyPassword(trim($password, "\r\n"),
-                                  trim($res[$this->options['passwordcol']], "\r\n"),
-                                  $this->options['cryptType'])) {
-            // Store additional field values in the session
-            foreach ($res as $key => $value) {
-                if ($key == $this->options['passwordcol'] ||
-                    $key == $this->options['usernamecol']) {
-                    continue;
-                }
-                // Use reference to the auth object if exists
-                // This is because the auth session variable can change so a static call to setAuthData does not make sence
-                if(is_object($this->_auth_obj)){
-                    $this->_auth_obj->setAuthData($key, $value);
-                } else {
-                    Auth::setAuthData($key, $value);
-                }
-            }
-
-            return true;
-        }
-
-        $this->activeUser = $res[$this->options['usernamecol']];
-        return false;
-    }
-
-    // }}}
-    // {{{ listUsers()
-
-    function listUsers()
-    {
-        $err = $this->_prepare();
-        if ($err !== true) {
-            return PEAR::raiseError($err->getMessage(), $err->getCode());
-        }
-
-        $retVal = array();
-
-        // Find if db_fileds contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
-            $sql_from = "*";
-        }
-        else{
-            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
-        }
-
-        $query = sprintf("SELECT %s FROM %s",
-                         $sql_from,
-                         $this->options['table']
-                         );
-        $res = $this->db->getAll($query, null, DB_FETCHMODE_ASSOC);
-
-        if (DB::isError($res)) {
-            return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-            foreach ($res as $user) {
-                $user['username'] = $user[$this->options['usernamecol']];
-                $retVal[] = $user;
-            }
-        }
-        return $retVal;
-    }
-
-    // }}}
-    // {{{ addUser()
-
-    /**
-     * Add user to the storage container
-     *
-     * @access public
-     * @param  string Username
-     * @param  string Password
-     * @param  mixed  Additional information that are stored in the DB
-     *
-     * @return mixed True on success, otherwise error object
-     */
-    function addUser($username, $password, $additional = "")
-    {
-        if (function_exists($this->options['cryptType'])) {
-            $cryptFunction = $this->options['cryptType'];
-        } else {
-            $cryptFunction = 'md5';
-        }
-
-        $additional_key   = '';
-        $additional_value = '';
-
-        if (is_array($additional)) {
-            foreach ($additional as $key => $value) {
-                $additional_key .= ', ' . $key;
-                $additional_value .= ", '" . $value . "'";
-            }
-        }
-
-        $query = sprintf("INSERT INTO %s (%s, %s%s) VALUES ('%s', '%s'%s)",
-                         $this->options['table'],
-                         $this->options['usernamecol'],
-                         $this->options['passwordcol'],
-                         $additional_key,
-                         $username,
-                         $cryptFunction($password),
-                         $additional_value
-                         );
-
-        $res = $this->query($query);
-
-        if (DB::isError($res)) {
-           return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-          return true;
-        }
-    }
-
-    // }}}
-    // {{{ removeUser()
-
-    /**
-     * Remove user from the storage container
-     *
-     * @access public
-     * @param  string Username
-     *
-     * @return mixed True on success, otherwise error object
-     */
-    function removeUser($username)
-    {
-        $query = sprintf("DELETE FROM %s WHERE %s = '%s'",
-                         $this->options['table'],
-                         $this->options['usernamecol'],
-                         $username
-                         );
-
-        $res = $this->query($query);
-
-        if (DB::isError($res)) {
-           return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-          return true;
-        }
-    }
-
-    // }}}
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		$rset = $this->db->Execute( $query );
+		$res = $rset->fetchRow();
+
+		if (DB::isError($res)) {
+			return PEAR::raiseError($res->getMessage(), $res->getCode());
+		}
+		if (!is_array($res)) {
+			$this->activeUser = '';
+			return false;
+		}
+		if ($this->verifyPassword(trim($password, "\r\n"),
+								  trim($res[$this->options['passwordcol']], "\r\n"),
+								  $this->options['cryptType'])) {
+			// Store additional field values in the session
+			foreach ($res as $key => $value) {
+				if ($key == $this->options['passwordcol'] ||
+					$key == $this->options['usernamecol']) {
+					continue;
+				}
+				// Use reference to the auth object if exists
+				// This is because the auth session variable can change so a static call to setAuthData does not make sence
+				if(is_object($this->_auth_obj)){
+					$this->_auth_obj->setAuthData($key, $value);
+				} else {
+					Auth::setAuthData($key, $value);
+				}
+			}
+
+			return true;
+		}
+
+		$this->activeUser = $res[$this->options['usernamecol']];
+		return false;
+	}
+
+	// }}}
+	// {{{ listUsers()
+
+	function listUsers()
+	{
+		$err = $this->_prepare();
+		if ($err !== true) {
+			return PEAR::raiseError($err->getMessage(), $err->getCode());
+		}
+
+		$retVal = array();
+
+		// Find if db_fileds contains a *, i so assume all col are selected
+		if(strstr($this->options['db_fields'], '*')){
+			$sql_from = "*";
+		}
+		else{
+			$sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+		}
+
+		$query = sprintf("SELECT %s FROM %s",
+						 $sql_from,
+						 $this->options['table']
+						 );
+		$res = $this->db->getAll($query, null, DB_FETCHMODE_ASSOC);
+
+		if (DB::isError($res)) {
+			return PEAR::raiseError($res->getMessage(), $res->getCode());
+		} else {
+			foreach ($res as $user) {
+				$user['username'] = $user[$this->options['usernamecol']];
+				$retVal[] = $user;
+			}
+		}
+		return $retVal;
+	}
+
+	// }}}
+	// {{{ addUser()
+
+	/**
+	 * Add user to the storage container
+	 *
+	 * @access public
+	 * @param  string Username
+	 * @param  string Password
+	 * @param  mixed  Additional information that are stored in the DB
+	 *
+	 * @return mixed True on success, otherwise error object
+	 */
+	function addUser($username, $password, $additional = "")
+	{
+		if (function_exists($this->options['cryptType'])) {
+			$cryptFunction = $this->options['cryptType'];
+		} else {
+			$cryptFunction = 'md5';
+		}
+
+		$additional_key   = '';
+		$additional_value = '';
+
+		if (is_array($additional)) {
+			foreach ($additional as $key => $value) {
+				$additional_key .= ', ' . $key;
+				$additional_value .= ", '" . $value . "'";
+			}
+		}
+
+		$query = sprintf("INSERT INTO %s (%s, %s%s) VALUES ('%s', '%s'%s)",
+						 $this->options['table'],
+						 $this->options['usernamecol'],
+						 $this->options['passwordcol'],
+						 $additional_key,
+						 $username,
+						 $cryptFunction($password),
+						 $additional_value
+						 );
+
+		$res = $this->query($query);
+
+		if (DB::isError($res)) {
+		   return PEAR::raiseError($res->getMessage(), $res->getCode());
+		} else {
+		  return true;
+		}
+	}
+
+	// }}}
+	// {{{ removeUser()
+
+	/**
+	 * Remove user from the storage container
+	 *
+	 * @access public
+	 * @param  string Username
+	 *
+	 * @return mixed True on success, otherwise error object
+	 */
+	function removeUser($username)
+	{
+		$query = sprintf("DELETE FROM %s WHERE %s = '%s'",
+						 $this->options['table'],
+						 $this->options['usernamecol'],
+						 $username
+						 );
+
+		$res = $this->query($query);
+
+		if (DB::isError($res)) {
+		   return PEAR::raiseError($res->getMessage(), $res->getCode());
+		} else {
+		  return true;
+		}
+	}
+
+	// }}}
 }
 
 function showDbg( $string ) {

Spacing +22 added lines, -22 removed lines

@@ -98,15 +98,15 @@ 
      function _connect($dsn)
     {
         if (is_string($dsn) || is_array($dsn)) {
-        	if(!$this->db) {
+        	if (!$this->db) {
 	        	$this->db = &ADONewConnection($dsn);
-	    		if( $err = ADODB_Pear_error() ) {
+	    		if ($err = ADODB_Pear_error()) {
 	   	    		return PEAR::raiseError($err);
 	    		}
         	}
         	
         } else {
-            return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
+            return PEAR::raiseError('The given dsn was not valid in file '.__FILE__.' at line '.__LINE__,
                                     41,
                                     PEAR_ERROR_RETURN,
                                     null,
@@ -114,7 +114,7 @@ 
                                     );
         }
         
-        if(!$this->db) {
+        if (!$this->db) {
         	return PEAR::raiseError(ADODB_Pear_error());
         } else {
         	return true;
@@ -135,7 +135,7 @@ 
      */
     function _prepare()
     {
-    	if(!$this->db) {
+    	if (!$this->db) {
     		$res = $this->_connect($this->options['dsn']);  		
     	}
         return true;
@@ -176,7 +176,7 @@ 
      */
     function _setDefaults()
     {
-    	$this->options['db_type']	= 'mysql';
+    	$this->options['db_type'] = 'mysql';
         $this->options['table']       = 'auth';
         $this->options['usernamecol'] = 'username';
         $this->options['passwordcol'] = 'password';
@@ -203,8 +203,8 @@ 
         }
 
         /* Include additional fields if they exist */
-        if(!empty($this->options['db_fields'])){
-            if(is_array($this->options['db_fields'])){
+        if (!empty($this->options['db_fields'])) {
+            if (is_array($this->options['db_fields'])) {
                 $this->options['db_fields'] = join($this->options['db_fields'], ', ');
             }
             $this->options['db_fields'] = ', '.$this->options['db_fields'];
@@ -236,19 +236,19 @@ 
         }
 
         // Find if db_fields contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
+        if (strstr($this->options['db_fields'], '*')) {
             $sql_from = "*";
         }
-        else{
-            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+        else {
+            $sql_from = $this->options['usernamecol'].", ".$this->options['passwordcol'].$this->options['db_fields'];
         }
         
         $query = "SELECT ".$sql_from.
                 " FROM ".$this->options['table'].
-                " WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
+                " WHERE ".$this->options['usernamecol']." = ".$this->db->Quote($username);
         
         $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-        $rset = $this->db->Execute( $query );
+        $rset = $this->db->Execute($query);
         $res = $rset->fetchRow();
 
         if (DB::isError($res)) {
@@ -269,7 +269,7 @@ 
                 }
                 // Use reference to the auth object if exists
                 // This is because the auth session variable can change so a static call to setAuthData does not make sence
-                if(is_object($this->_auth_obj)){
+                if (is_object($this->_auth_obj)) {
                     $this->_auth_obj->setAuthData($key, $value);
                 } else {
                     Auth::setAuthData($key, $value);
@@ -296,11 +296,11 @@ 
         $retVal = array();
 
         // Find if db_fileds contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
+        if (strstr($this->options['db_fields'], '*')) {
             $sql_from = "*";
         }
-        else{
-            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+        else {
+            $sql_from = $this->options['usernamecol'].", ".$this->options['passwordcol'].$this->options['db_fields'];
         }
 
         $query = sprintf("SELECT %s FROM %s",
@@ -346,8 +346,8 @@ 
 
         if (is_array($additional)) {
             foreach ($additional as $key => $value) {
-                $additional_key .= ', ' . $key;
-                $additional_value .= ", '" . $value . "'";
+                $additional_key .= ', '.$key;
+                $additional_value .= ", '".$value."'";
             }
         }
 
@@ -401,13 +401,13 @@ 
     // }}}
 }
 
-function showDbg( $string ) {
+function showDbg($string) {
 	print "
 -- $string</P>";
 }
-function dump( $var, $str, $vardump = false ) {
+function dump($var, $str, $vardump = false) {
 	print "<H4>$str</H4><pre>";
-	( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var ));
+	(!$vardump) ? (print_r($var)) : (var_dump($var));
 	print "</pre>";
 }
 ?>

Braces +91 added lines, -42 removed lines

@@ -73,13 +73,17 @@ 
     {
         $this->_setDefaults();
 		
-        if (is_array($dsn)) {
+        if (is_array($dsn))
+        {
             $this->_parseOptions($dsn);
 
-            if (empty($this->options['dsn'])) {
+            if (empty($this->options['dsn']))
+            {
                 PEAR::raiseError('No connection parameters specified!');
             }
-        } else {
+        }
+        else
+        {
         	// Extract db_type from dsn string.
             $this->options['dsn'] = $dsn;
         }
@@ -96,16 +100,21 @@ 
      * @return mixed  Object on error, otherwise bool
      */
      function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-        	if(!$this->db) {
+     {
+        if (is_string($dsn) || is_array($dsn))
+        {
+        	if(!$this->db)
+        	{
 	        	$this->db = &ADONewConnection($dsn);
-	    		if( $err = ADODB_Pear_error() ) {
+	    		if( $err = ADODB_Pear_error() )
+	    		{
 	   	    		return PEAR::raiseError($err);
 	    		}
         	}
         	
-        } else {
+        }
+        else
+        {
             return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
                                     41,
                                     PEAR_ERROR_RETURN,
@@ -114,9 +123,12 @@ 
                                     );
         }
         
-        if(!$this->db) {
+        if(!$this->db)
+        {
         	return PEAR::raiseError(ADODB_Pear_error());
-        } else {
+        }
+        else
+        {
         	return true;
         }
     }
@@ -135,7 +147,8 @@ 
      */
     function _prepare()
     {
-    	if(!$this->db) {
+    	if(!$this->db)
+    	{
     		$res = $this->_connect($this->options['dsn']);  		
     	}
         return true;
@@ -159,7 +172,8 @@ 
     function query($query)
     {
         $err = $this->_prepare();
-        if ($err !== true) {
+        if ($err !== true)
+        {
             return $err;
         }
         return $this->db->query($query);
@@ -196,15 +210,19 @@ 
      */
     function _parseOptions($array)
     {
-        foreach ($array as $key => $value) {
-            if (isset($this->options[$key])) {
+        foreach ($array as $key => $value)
+        {
+            if (isset($this->options[$key]))
+            {
                 $this->options[$key] = $value;
             }
         }
 
         /* Include additional fields if they exist */
-        if(!empty($this->options['db_fields'])){
-            if(is_array($this->options['db_fields'])){
+        if(!empty($this->options['db_fields']))
+        {
+            if(is_array($this->options['db_fields']))
+            {
                 $this->options['db_fields'] = join($this->options['db_fields'], ', ');
             }
             $this->options['db_fields'] = ', '.$this->options['db_fields'];
@@ -231,15 +249,18 @@ 
     {
         // Prepare for a database query
         $err = $this->_prepare();
-        if ($err !== true) {
+        if ($err !== true)
+        {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
         }
 
         // Find if db_fields contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
+        if(strstr($this->options['db_fields'], '*'))
+        {
             $sql_from = "*";
         }
-        else{
+        else
+        {
             $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
         }
         
@@ -251,27 +272,35 @@ 
         $rset = $this->db->Execute( $query );
         $res = $rset->fetchRow();
 
-        if (DB::isError($res)) {
+        if (DB::isError($res))
+        {
             return PEAR::raiseError($res->getMessage(), $res->getCode());
         }
-        if (!is_array($res)) {
+        if (!is_array($res))
+        {
             $this->activeUser = '';
             return false;
         }
         if ($this->verifyPassword(trim($password, "\r\n"),
                                   trim($res[$this->options['passwordcol']], "\r\n"),
-                                  $this->options['cryptType'])) {
+                                  $this->options['cryptType']))
+        {
             // Store additional field values in the session
-            foreach ($res as $key => $value) {
+            foreach ($res as $key => $value)
+            {
                 if ($key == $this->options['passwordcol'] ||
-                    $key == $this->options['usernamecol']) {
+                    $key == $this->options['usernamecol'])
+                {
                     continue;
                 }
                 // Use reference to the auth object if exists
                 // This is because the auth session variable can change so a static call to setAuthData does not make sence
-                if(is_object($this->_auth_obj)){
+                if(is_object($this->_auth_obj))
+                {
                     $this->_auth_obj->setAuthData($key, $value);
-                } else {
+                }
+                else
+                {
                     Auth::setAuthData($key, $value);
                 }
             }
@@ -289,17 +318,20 @@ 
     function listUsers()
     {
         $err = $this->_prepare();
-        if ($err !== true) {
+        if ($err !== true)
+        {
             return PEAR::raiseError($err->getMessage(), $err->getCode());
         }
 
         $retVal = array();
 
         // Find if db_fileds contains a *, i so assume all col are selected
-        if(strstr($this->options['db_fields'], '*')){
+        if(strstr($this->options['db_fields'], '*'))
+        {
             $sql_from = "*";
         }
-        else{
+        else
+        {
             $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
         }
 
@@ -309,10 +341,14 @@ 
                          );
         $res = $this->db->getAll($query, null, DB_FETCHMODE_ASSOC);
 
-        if (DB::isError($res)) {
+        if (DB::isError($res))
+        {
             return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
-            foreach ($res as $user) {
+        }
+        else
+        {
+            foreach ($res as $user)
+            {
                 $user['username'] = $user[$this->options['usernamecol']];
                 $retVal[] = $user;
             }
@@ -335,17 +371,22 @@ 
      */
     function addUser($username, $password, $additional = "")
     {
-        if (function_exists($this->options['cryptType'])) {
+        if (function_exists($this->options['cryptType']))
+        {
             $cryptFunction = $this->options['cryptType'];
-        } else {
+        }
+        else
+        {
             $cryptFunction = 'md5';
         }
 
         $additional_key   = '';
         $additional_value = '';
 
-        if (is_array($additional)) {
-            foreach ($additional as $key => $value) {
+        if (is_array($additional))
+        {
+            foreach ($additional as $key => $value)
+            {
                 $additional_key .= ', ' . $key;
                 $additional_value .= ", '" . $value . "'";
             }
@@ -363,9 +404,12 @@ 
 
         $res = $this->query($query);
 
-        if (DB::isError($res)) {
+        if (DB::isError($res))
+        {
            return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
+        }
+        else
+        {
           return true;
         }
     }
@@ -391,9 +435,12 @@ 
 
         $res = $this->query($query);
 
-        if (DB::isError($res)) {
+        if (DB::isError($res))
+        {
            return PEAR::raiseError($res->getMessage(), $res->getCode());
-        } else {
+        }
+        else
+        {
           return true;
         }
     }
@@ -401,11 +448,13 @@ 
     // }}}
 }
 
-function showDbg( $string ) {
+function showDbg( $string )
+{
 	print "
 -- $string</P>";
 }
-function dump( $var, $str, $vardump = false ) {
+function dump( $var, $str, $vardump = false )
+{
 	print "<H4>$str</H4><pre>";
 	( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var ));
 	print "</pre>";

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

Doc Comments +4 added lines

@@ -320,6 +320,10 @@
 	/*
 		Generate html for suspicious/expensive sql
 	*/
+
+	/**
+	 * @param string $type
+	 */
 	function tohtml(&$rs,$type)
 	{
 		$o1 = $rs->FetchField(0);

Spacing +37 added lines, -37 removed lines

@@ -15,7 +15,7 @@ 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
-class perf_oci8 extends ADODB_perf{
+class perf_oci8 extends ADODB_perf {
 	
 	var $tablesSQL = "select segment_name as \"tablename\", sum(bytes)/1024 as \"size_in_k\",tablespace_name as \"tablespace\",count(*) \"extents\" from sys.user_extents 
 	   group by segment_name,tablespace_name";
@@ -40,7 +40,7 @@ 
 			      phy.name = 'physical reads'",
 			'=WarnCacheRatio'),
 		
-		'sql cache hit ratio' => array( 'RATIOH',
+		'sql cache hit ratio' => array('RATIOH',
 			'select round(100*(sum(pins)-sum(reloads))/sum(pins),2)  from v$librarycache',
 			'increase <i>shared_pool_size</i> if too ratio low'),
 			
@@ -68,37 +68,37 @@ 
 		"select value from v\$sysstat where name='physical writes'"),
 	
 	'Data Cache',
-		'data cache buffers' => array( 'DATAC',
+		'data cache buffers' => array('DATAC',
 		"select a.value/b.value  from v\$parameter a, v\$parameter b 
 			where a.name = 'db_cache_size' and b.name= 'db_block_size'",
 			'Number of cache buffers. Tune <i>db_cache_size</i> if the <i>data cache hit ratio</i> is too low.'),
 		'data cache blocksize' => array('DATAC',
 			"select value from v\$parameter where name='db_block_size'",
-			'' ),			
+			''),			
 	'Memory Pools',
 		'data cache size' => array('DATAC',
 			"select value from v\$parameter where name = 'db_cache_size'",
-			'db_cache_size' ),
+			'db_cache_size'),
 		'shared pool size' => array('DATAC',
 			"select value from v\$parameter where name = 'shared_pool_size'",
-			'shared_pool_size, which holds shared sql, stored procedures, dict cache and similar shared structs' ),
+			'shared_pool_size, which holds shared sql, stored procedures, dict cache and similar shared structs'),
 		'java pool size' => array('DATAJ',
 			"select value from v\$parameter where name = 'java_pool_size'",
-			'java_pool_size' ),
+			'java_pool_size'),
 		'large pool buffer size' => array('CACHE',
 			"select value from v\$parameter where name='large_pool_size'",
-			'this pool is for large mem allocations (not because it is larger than shared pool), for MTS sessions, parallel queries, io buffers (large_pool_size) ' ),
+			'this pool is for large mem allocations (not because it is larger than shared pool), for MTS sessions, parallel queries, io buffers (large_pool_size) '),
 
 		'pga buffer size' => array('CACHE',			
 			"select value from v\$parameter where name='pga_aggregate_target'",
-			'program global area is private memory for sorting, and hash and bitmap merges - since oracle 9i (pga_aggregate_target)' ),
+			'program global area is private memory for sorting, and hash and bitmap merges - since oracle 9i (pga_aggregate_target)'),
 
 		
 		'Connections',
 		'current connections' => array('SESS',
 			'select count(*) from sys.v_$session where username is not null',
 			''),
-		'max connections' => array( 'SESS',
+		'max connections' => array('SESS',
 			"select value from v\$parameter where name='sessions'",
 			''),
 
@@ -123,10 +123,10 @@ 
 		'Percentage of large_pool actually in use - too low is bad, too high is worse'),
 		'sort buffer size' => array('CACHE',
 			"select value from v\$parameter where name='sort_area_size'",
-			'max in-mem sort_area_size (per query), uses memory in pga' ),
+			'max in-mem sort_area_size (per query), uses memory in pga'),
 
 		'pga usage at peak' => array('RATIOU',
-		'=PGA','Mb utilization at peak transactions (requires Oracle 9i+)'),
+		'=PGA', 'Mb utilization at peak transactions (requires Oracle 9i+)'),
 	'Transactions',
 		'rollback segments' => array('ROLLBACK',
 			"select count(*) from sys.v_\$rollstat",
@@ -167,7 +167,7 @@ 
 		$savelog = $conn->LogSQL(false);	
 		$this->version = $conn->ServerInfo();
 		$conn->LogSQL($savelog);	
-		$this->conn =& $conn;
+		$this->conn = & $conn;
 	}
 	
 	function WarnPageCost($val)
@@ -208,10 +208,10 @@ 
 		return reset($rs->fields);
 	}
 	
-	function Explain($sql,$partial=false) 
+	function Explain($sql, $partial = false) 
 	{
 		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
+		$rs = & $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
 		if (!$rs) {
 			echo "<p><b>Missing PLAN_TABLE</b></p>
 <pre>
@@ -252,7 +252,7 @@ 
 			$sqlq = $this->conn->qstr($sql.'%');
 			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
 			if ($arr) {
-				foreach($arr as $row) {
+				foreach ($arr as $row) {
 					$sql = reset($row);
 					if (crc32($sql) == $partial) break;
 				}
@@ -264,7 +264,7 @@ 
 		$this->conn->BeginTrans();
 		$id = "ADODB ".microtime();
 
-		$rs =& $this->conn->Execute("EXPLAIN PLAN SET STATEMENT_ID='$id' FOR $sql");
+		$rs = & $this->conn->Execute("EXPLAIN PLAN SET STATEMENT_ID='$id' FOR $sql");
 		$m = $this->conn->ErrorMsg();
 		if ($m) {
 			$this->conn->RollbackTrans();
@@ -272,7 +272,7 @@ 
 			$s .= "<p>$m</p>";
 			return $s;
 		}
-		$rs =& $this->conn->Execute("
+		$rs = & $this->conn->Execute("
 		select 
   '<pre>'||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'</pre>'  as Operation, 
   object_name,COST,CARDINALITY,bytes
@@ -280,10 +280,10 @@ 
 START WITH id = 0  and STATEMENT_ID='$id'  
 CONNECT BY prior id=parent_id and statement_id='$id'");
 		
-		$s .= rs2html($rs,false,false,false,false);
+		$s .= rs2html($rs, false, false, false, false);
 		$this->conn->RollbackTrans();
 		$this->conn->LogSQL($savelog);
-		$s .= $this->Tracer($sql,$partial);
+		$s .= $this->Tracer($sql, $partial);
 		return $s;
 	}
 	
@@ -292,7 +292,7 @@ 
 	{
 		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
 		
-		 $rs =& $this->conn->Execute("
+		 $rs = & $this->conn->Execute("
 select  a.size_for_estimate as cache_mb_estimate,
 	case when a.size_factor=1 then 
    		'&lt;&lt;= current'
@@ -312,7 +312,7 @@ 
 			$s .= "<p>Cache that is 50% of current size is still too big</p>";
 		} else {
 			$s .= "Ideal size of Data Cache is when \"best_when_0\" changes from a positive number and becomes zero.";
-			$s .= rs2html($rs,false,false,false,false);
+			$s .= rs2html($rs, false, false, false, false);
 		}
 		return $s;
 	}
@@ -320,7 +320,7 @@ 
 	/*
 		Generate html for suspicious/expensive sql
 	*/
-	function tohtml(&$rs,$type)
+	function tohtml(&$rs, $type)
 	{
 		$o1 = $rs->FetchField(0);
 		$o2 = $rs->FetchField(1);
@@ -332,33 +332,33 @@ 
 		while (!$rs->EOF) {
 			if ($check != $rs->fields[0].'::'.$rs->fields[1]) {
 				if ($check) {
-					$carr = explode('::',$check);
+					$carr = explode('::', $check);
 					$prefix = "<a href=\"?$type=1&sql=".rawurlencode($sql).'&x#explain">';
 					$suffix = '</a>';
-					if (strlen($prefix)>2000) {
+					if (strlen($prefix) > 2000) {
 						$prefix = '';
 						$suffix = '';
 					}
 					
-					$s .=  "\n<tr><td align=right>".$carr[0].'</td><td align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
+					$s .= "\n<tr><td align=right>".$carr[0].'</td><td align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
 				}
 				$sql = $rs->fields[2];
 				$check = $rs->fields[0].'::'.$rs->fields[1];			
 			} else
 				$sql .= $rs->fields[2];
-			if (substr($sql,strlen($sql)-1) == "\0") $sql = substr($sql,0,strlen($sql)-1);
+			if (substr($sql, strlen($sql) - 1) == "\0") $sql = substr($sql, 0, strlen($sql) - 1);
 			$rs->MoveNext();
 		}
 		$rs->Close();
 		
-		$carr = explode('::',$check);
+		$carr = explode('::', $check);
 		$prefix = "<a target=".rand()." href=\"?&hidem=1&$type=1&sql=".rawurlencode($sql).'&x#explain">';
 		$suffix = '</a>';
-		if (strlen($prefix)>2000) {
+		if (strlen($prefix) > 2000) {
 			$prefix = '';
 			$suffix = '';
 		}
-		$s .=  "\n<tr><td align=right>".$carr[0].'</td><td align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
+		$s .= "\n<tr><td align=right>".$carr[0].'</td><td align=right>'.$carr[1].'</td><td>'.$prefix.$sql.$suffix.'</td></tr>';
 					
 		return $s."</table>\n\n";
 	}
@@ -366,7 +366,7 @@ 
 	// code thanks to Ixora. 
 	// http://www.ixora.com.au/scripts/query_opt.htm
 	// requires oracle 8.1.7 or later
-	function SuspiciousSQL($numsql=10)
+	function SuspiciousSQL($numsql = 10)
 	{
 		$sql = "
 select
@@ -406,7 +406,7 @@ 
   		global $ADODB_CACHE_MODE;
   		if (isset($_GET['expsixora']) && 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 $this->_SuspiciousSQL($numsql);
@@ -420,14 +420,14 @@ 
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
 		
 		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->SelectLimit($sql);
+		$rs = & $this->conn->SelectLimit($sql);
 		$this->conn->LogSQL($savelog);
 		
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
 		$ADODB_CACHE_MODE = $save;
 		if ($rs) {
 			$s .= "\n<h3>Ixora Suspicious SQL</h3>";
-			$s .= $this->tohtml($rs,'expsixora');
+			$s .= $this->tohtml($rs, 'expsixora');
 		}
 		
 		return $s;
@@ -476,7 +476,7 @@ 
 		global $ADODB_CACHE_MODE;
   		if (isset($_GET['expeixora']) && 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'])) {
 			 $var = $this->_ExpensiveSQL($numsql);
@@ -491,7 +491,7 @@ 
 		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
 		
 		$savelog = $this->conn->LogSQL(false);
-		$rs =& $this->conn->Execute($sql);
+		$rs = & $this->conn->Execute($sql);
 		$this->conn->LogSQL($savelog);
 		
 		if (isset($savem)) $this->conn->SetFetchMode($savem);
@@ -499,7 +499,7 @@ 
 		
 		if ($rs) {
 			$s .= "\n<h3>Ixora Expensive SQL</h3>";
-			$s .= $this->tohtml($rs,'expeixora');
+			$s .= $this->tohtml($rs, 'expeixora');
 		}
 	
 		return $s;

Braces +112 added lines, -39 removed lines

@@ -13,9 +13,13 @@ 
 */
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
-class perf_oci8 extends ADODB_perf{
+class perf_oci8 extends ADODB_perf
+{
 	
 	var $tablesSQL = "select segment_name as \"tablename\", sum(bytes)/1024 as \"size_in_k\",tablespace_name as \"tablespace\",count(*) \"extents\" from sys.user_extents 
 	   group by segment_name,tablespace_name";
@@ -172,16 +176,26 @@ 
 	
 	function WarnPageCost($val)
 	{
-		if ($val == 100) $s = '<font color=red><b>Too High</b>. </font>';
-		else $s = '';
+		if ($val == 100)
+		{
+			$s = '<font color=red><b>Too High</b>. </font>';
+		}
+		else {
+			$s = '';
+		}
 		
 		return $s.'Recommended is 20-50 for TP, and 50 for data warehouses. Default is 100. See <a href=http://www.dba-oracle.com/oracle_tips_cost_adj.htm>optimizer_index_cost_adj</a>. ';
 	}
 	
 	function WarnIndexCost($val)
 	{
-		if ($val == 0) $s = '<font color=red><b>Too Low</b>. </font>';
-		else $s = '';
+		if ($val == 0)
+		{
+			$s = '<font color=red><b>Too Low</b>. </font>';
+		}
+		else {
+			$s = '';
+		}
 		
 		return $s.'Percentage of indexed data blocks expected in the cache.
 			Recommended is 20 (fast disk array) to 50 (slower hard disks). Default is 0.
@@ -190,7 +204,10 @@ 
 	
 	function PGA()
 	{
-		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
+		if ($this->version['version'] < 9)
+		{
+			return 'Oracle 9i or later required';
+		}
 		
 		$rs = $this->conn->Execute("select a.mb,a.targ as pga_size_pct,a.pct from 
 	   (select round(pga_target_for_estimate/1024.0/1024.0,0) Mb,
@@ -201,18 +218,25 @@ 
 	   	   from v\$pga_target_advice) b on 
 	  a.r = b.r+1 where 
   		b.pct < 100");
-		if (!$rs) return "Only in 9i or later";
+		if (!$rs)
+		{
+			return "Only in 9i or later";
+		}
 		$rs->Close();
-		if ($rs->EOF) return "PGA could be too big";
+		if ($rs->EOF)
+		{
+			return "PGA could be too big";
+		}
 		
 		return reset($rs->fields);
 	}
 	
-	function Explain($sql,$partial=false) 
+	function Explain($sql,$partial=false)
 	{
 		$savelog = $this->conn->LogSQL(false);
 		$rs =& $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
-		if (!$rs) {
+		if (!$rs)
+		{
 			echo "<p><b>Missing PLAN_TABLE</b></p>
 <pre>
 CREATE TABLE PLAN_TABLE (
@@ -248,13 +272,19 @@ 
 		$rs->Close();
 	//	$this->conn->debug=1;
 	
-		if ($partial) {
+		if ($partial)
+		{
 			$sqlq = $this->conn->qstr($sql.'%');
 			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
-			if ($arr) {
-				foreach($arr as $row) {
+			if ($arr)
+			{
+				foreach($arr as $row)
+				{
 					$sql = reset($row);
-					if (crc32($sql) == $partial) break;
+					if (crc32($sql) == $partial)
+					{
+						break;
+					}
 				}
 			}
 		}
@@ -266,7 +296,8 @@ 
 
 		$rs =& $this->conn->Execute("EXPLAIN PLAN SET STATEMENT_ID='$id' FOR $sql");
 		$m = $this->conn->ErrorMsg();
-		if ($m) {
+		if ($m)
+		{
 			$this->conn->RollbackTrans();
 			$this->conn->LogSQL($savelog);
 			$s .= "<p>$m</p>";
@@ -290,7 +321,10 @@ 
 	
 	function CheckMemory()
 	{
-		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
+		if ($this->version['version'] < 9)
+		{
+			return 'Oracle 9i or later required';
+		}
 		
 		 $rs =& $this->conn->Execute("
 select  a.size_for_estimate as cache_mb_estimate,
@@ -302,15 +336,21 @@ 
    a.estd_physical_read_factor-b.estd_physical_read_factor as best_when_0
    from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum  r from v\$db_cache_advice) a , 
    (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r from v\$db_cache_advice) b where a.r = b.r-1");
-		if (!$rs) return false;
+		if (!$rs)
+		{
+			return false;
+		}
 		
 		/*
 		The v$db_cache_advice utility show the marginal changes in physical data block reads for different sizes of db_cache_size
 		*/
 		$s = "<h3>Data Cache Estimate</h3>";
-		if ($rs->EOF) {
+		if ($rs->EOF)
+		{
 			$s .= "<p>Cache that is 50% of current size is still too big</p>";
-		} else {
+		}
+		else
+		{
 			$s .= "Ideal size of Data Cache is when \"best_when_0\" changes from a positive number and becomes zero.";
 			$s .= rs2html($rs,false,false,false,false);
 		}
@@ -325,17 +365,24 @@ 
 		$o1 = $rs->FetchField(0);
 		$o2 = $rs->FetchField(1);
 		$o3 = $rs->FetchField(2);
-		if ($rs->EOF) return '<p>None found</p>';
+		if ($rs->EOF)
+		{
+			return '<p>None found</p>';
+		}
 		$check = '';
 		$sql = '';
 		$s = "\n\n<table border=1 bgcolor=white><tr><td><b>".$o1->name.'</b></td><td><b>'.$o2->name.'</b></td><td><b>'.$o3->name.'</b></td></tr>';
-		while (!$rs->EOF) {
-			if ($check != $rs->fields[0].'::'.$rs->fields[1]) {
-				if ($check) {
+		while (!$rs->EOF)
+		{
+			if ($check != $rs->fields[0].'::'.$rs->fields[1])
+			{
+				if ($check)
+				{
 					$carr = explode('::',$check);
 					$prefix = "<a href=\"?$type=1&sql=".rawurlencode($sql).'&x#explain">';
 					$suffix = '</a>';
-					if (strlen($prefix)>2000) {
+					if (strlen($prefix)>2000)
+					{
 						$prefix = '';
 						$suffix = '';
 					}
@@ -344,9 +391,14 @@ 
 				}
 				$sql = $rs->fields[2];
 				$check = $rs->fields[0].'::'.$rs->fields[1];			
-			} else
-				$sql .= $rs->fields[2];
-			if (substr($sql,strlen($sql)-1) == "\0") $sql = substr($sql,0,strlen($sql)-1);
+			}
+			else {
+							$sql .= $rs->fields[2];
+			}
+			if (substr($sql,strlen($sql)-1) == "\0")
+			{
+				$sql = substr($sql,0,strlen($sql)-1);
+			}
 			$rs->MoveNext();
 		}
 		$rs->Close();
@@ -354,7 +406,8 @@ 
 		$carr = explode('::',$check);
 		$prefix = "<a target=".rand()." href=\"?&hidem=1&$type=1&sql=".rawurlencode($sql).'&x#explain">';
 		$suffix = '</a>';
-		if (strlen($prefix)>2000) {
+		if (strlen($prefix)>2000)
+		{
 			$prefix = '';
 			$suffix = '';
 		}
@@ -404,12 +457,16 @@ 
   1 desc, s.address, p.piece";
 
   		global $ADODB_CACHE_MODE;
-  		if (isset($_GET['expsixora']) && isset($_GET['sql'])) {
+  		if (isset($_GET['expsixora']) && isset($_GET['sql']))
+  		{
 				$partial = empty($_GET['part']);
 				echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
 		}
 
-		if (isset($_GET['sql'])) return $this->_SuspiciousSQL($numsql);
+		if (isset($_GET['sql']))
+		{
+			return $this->_SuspiciousSQL($numsql);
+		}
 		
 		$s = '';
 		$s .= $this->_SuspiciousSQL($numsql);
@@ -417,15 +474,22 @@ 
 		
 		$save = $ADODB_CACHE_MODE;
 		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+		if ($this->conn->fetchMode !== false)
+		{
+			$savem = $this->conn->SetFetchMode(false);
+		}
 		
 		$savelog = $this->conn->LogSQL(false);
 		$rs =& $this->conn->SelectLimit($sql);
 		$this->conn->LogSQL($savelog);
 		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		if (isset($savem))
+		{
+			$this->conn->SetFetchMode($savem);
+		}
 		$ADODB_CACHE_MODE = $save;
-		if ($rs) {
+		if ($rs)
+		{
 			$s .= "\n<h3>Ixora Suspicious SQL</h3>";
 			$s .= $this->tohtml($rs,'expsixora');
 		}
@@ -474,11 +538,13 @@ 
   1 desc, s.address, p.piece
 ";
 		global $ADODB_CACHE_MODE;
-  		if (isset($_GET['expeixora']) && isset($_GET['sql'])) {
+  		if (isset($_GET['expeixora']) && isset($_GET['sql']))
+  		{
 			$partial = empty($_GET['part']);	
 			echo "<a name=explain></a>".$this->Explain($_GET['sql'],$partial)."\n";
 		}
-		if (isset($_GET['sql'])) {
+		if (isset($_GET['sql']))
+		{
 			 $var = $this->_ExpensiveSQL($numsql);
 			 return $var;
 		}
@@ -488,16 +554,23 @@ 
 		$s .= '<p>';
 		$save = $ADODB_CACHE_MODE;
 		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
-		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+		if ($this->conn->fetchMode !== false)
+		{
+			$savem = $this->conn->SetFetchMode(false);
+		}
 		
 		$savelog = $this->conn->LogSQL(false);
 		$rs =& $this->conn->Execute($sql);
 		$this->conn->LogSQL($savelog);
 		
-		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		if (isset($savem))
+		{
+			$this->conn->SetFetchMode($savem);
+		}
 		$ADODB_CACHE_MODE = $save;
 		
-		if ($rs) {
+		if ($rs)
+		{
 			$s .= "\n<h3>Ixora Expensive SQL</h3>";
 			$s .= $this->tohtml($rs,'expeixora');
 		}

phpgwapi/inc/adodb/session/adodb-session.php

Doc Comments +26 added lines

@@ -124,6 +124,10 @@ 
 	*/
 	/*!
 	*/
+
+	/**
+	 * @return string
+	 */
 	function driver($driver = null) {
 		static $_driver = 'mysql';
 		static $set = false;
@@ -302,6 +306,10 @@ 
 
 	/*!
 	*/
+
+	/**
+	 * @return string
+	 */
 	function table($table = null) {
 		static $_table = 'sessions';
 		static $set = false;
@@ -359,6 +367,10 @@ 
 
 	/*!
 	*/
+
+	/**
+	 * @return string
+	 */
 	function clob($clob = null) {
 		static $_clob = false;
 		static $set = false;
@@ -405,6 +417,10 @@ 
 
 	/*!
 	*/
+
+	/**
+	 * @return string
+	 */
 	function encryptionKey($encryption_key = null) {
 		static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
 
@@ -427,6 +443,12 @@ 
 
 	/*!
 	*/
+
+	/**
+	 * @param string $crc
+	 *
+	 * @return string
+	 */
 	function _crc($crc = null) {
 		static $_crc = false;
 
@@ -498,6 +520,10 @@ 
 
 		If $conn already exists, reuse that connection
 	*/
+
+	/**
+	 * @param boolean $persist
+	 */
 	function open($save_path, $session_name, $persist = null) {
 		$conn =& ADODB_Session::_conn();
 

Indentation +6 added lines, -6 removed lines

@@ -93,15 +93,15 @@
 */
 function adodb_session_create_table($schemaFile=null,$conn = null)
 {
-    // set default values
-    if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema.xml';
-    if ($conn===null) $conn =& ADODB_Session::_conn();
+	// set default values
+	if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema.xml';
+	if ($conn===null) $conn =& ADODB_Session::_conn();
 
 	if (!$conn) return 0;
 
-    $schema = new adoSchema($conn);
-    $schema->ParseSchema($schemaFile);
-    return $schema->ExecuteSchema();
+	$schema = new adoSchema($conn);
+	$schema->ParseSchema($schemaFile);
+	return $schema->ExecuteSchema();
 }
 
 /*!

Switch Indentation +4 added lines, -4 removed lines

@@ -533,10 +533,10 @@
 
 		if ($persist) {
 			switch($persist) {
-			default:
-			case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
-			case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
-			case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
+				default:
+				case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
+				case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
+				case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
 			}
 		} else {
 			$ok = $conn->Connect($host, $user, $password, $database);

Spacing +63 added lines, -63 removed lines

@@ -26,7 +26,7 @@ 
 */
 
 if (!defined('_ADODB_LAYER')) {
-	require_once realpath(dirname(__FILE__) . '/../adodb.inc.php');
+	require_once realpath(dirname(__FILE__).'/../adodb.inc.php');
 }
 
 if (defined('ADODB_SESSION')) return 1;
@@ -43,14 +43,14 @@ 
 	3. After urldecode, run the serialized string through this function:
 
 */
-function adodb_unserialize( $serialized_string ) 
+function adodb_unserialize($serialized_string) 
 {
 	$variables = array( );
-	$a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
-	for( $i = 0; $i < count( $a ); $i = $i+2 ) {
-		$variables[$a[$i]] = unserialize( $a[$i+1] );
+	$a = preg_split("/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY|PREG_SPLIT_DELIM_CAPTURE);
+	for ($i = 0; $i < count($a); $i = $i + 2) {
+		$variables[$a[$i]] = unserialize($a[$i + 1]);
 	}
-	return( $variables );
+	return($variables);
 }
 
 /*
@@ -59,7 +59,7 @@ 
 */
 function adodb_session_regenerate_id() 
 {
-	$conn =& ADODB_Session::_conn();
+	$conn = & ADODB_Session::_conn();
 	if (!$conn) return false;
 
 	$old_id = session_id();
@@ -72,7 +72,7 @@ 
 		//@session_start();
 	}
 	$new_id = session_id();
-	$ok =& $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
+	$ok = & $conn->Execute('UPDATE '.ADODB_Session::table().' SET sesskey='.$conn->qstr($new_id).' WHERE sesskey='.$conn->qstr($old_id));
 	
 	/* it is possible that the update statement fails due to a collision */
 	if (!$ok) {
@@ -91,11 +91,11 @@ 
     @return 0 if failure, 1 if errors, 2 if successful.
 	@author Markus Staab http://www.public-4u.de
 */
-function adodb_session_create_table($schemaFile=null,$conn = null)
+function adodb_session_create_table($schemaFile = null, $conn = null)
 {
     // set default values
-    if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema.xml';
-    if ($conn===null) $conn =& ADODB_Session::_conn();
+    if ($schemaFile === null) $schemaFile = ADODB_SESSION.'/session_schema.xml';
+    if ($conn === null) $conn = & ADODB_Session::_conn();
 
 	if (!$conn) return 0;
 
@@ -237,7 +237,7 @@ 
 		static $set = false;
 
 		if (!is_null($lifetime)) {
-			$_lifetime = (int) $lifetime;
+			$_lifetime = (int)$lifetime;
 			$set = true;
 		} elseif (!$set) {
 			// backwards compatibility
@@ -264,7 +264,7 @@ 
 		static $set = false;
 
 		if (!is_null($debug)) {
-			$_debug = (bool) $debug;
+			$_debug = (bool)$debug;
 
 			$conn = ADODB_Session::_conn();
 			if ($conn) {
@@ -326,7 +326,7 @@ 
 		static $set = false;
 
 		if (!is_null($optimize)) {
-			$_optimize = (bool) $optimize;
+			$_optimize = (bool)$optimize;
 			$set = true;
 		} elseif (!$set) {
 			// backwards compatibility
@@ -345,7 +345,7 @@ 
 		static $set = false;
 
 		if (!is_null($sync_seconds)) {
-			$_sync_seconds = (int) $sync_seconds;
+			$_sync_seconds = (int)$sync_seconds;
 			$set = true;
 		} elseif (!$set) {
 			// backwards compatibility
@@ -421,7 +421,7 @@ 
 
 	/*!
 	*/
-	function &_conn($conn=null) {
+	function &_conn($conn = null) {
 		return $GLOBALS['ADODB_SESS_CONN'];
 	}
 
@@ -463,8 +463,8 @@ 
 	/*!
 	*/
 	function _dumprs($rs) {
-		$conn	=& ADODB_Session::_conn();
-		$debug	= ADODB_Session::debug();
+		$conn = & ADODB_Session::_conn();
+		$debug = ADODB_Session::debug();
 
 		if (!$conn) {
 			return;
@@ -499,17 +499,17 @@ 
 		If $conn already exists, reuse that connection
 	*/
 	function open($save_path, $session_name, $persist = null) {
-		$conn =& ADODB_Session::_conn();
+		$conn = & ADODB_Session::_conn();
 
 		if ($conn) {
 			return true;
 		}
 
-		$database	= ADODB_Session::database();
-		$debug		= ADODB_Session::debug();
-		$driver		= ADODB_Session::driver();
+		$database = ADODB_Session::database();
+		$debug = ADODB_Session::debug();
+		$driver = ADODB_Session::driver();
 		$host		= ADODB_Session::host();
-		$password	= ADODB_Session::password();
+		$password = ADODB_Session::password();
 		$user		= ADODB_Session::user();
 
 		if (!is_null($persist)) {
@@ -524,7 +524,7 @@ 
 #		assert('$host');
 
 		// cannot use =& below - do not know why...
-		$conn =& ADONewConnection($driver);
+		$conn = & ADONewConnection($driver);
 
 		if ($debug) {
 			$conn->debug = true;
@@ -532,7 +532,7 @@ 
 		}
 
 		if ($persist) {
-			switch($persist) {
+			switch ($persist) {
 			default:
 			case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
 			case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
@@ -542,7 +542,7 @@ 
 			$ok = $conn->Connect($host, $user, $password, $database);
 		}
 
-		if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
+		if ($ok) $GLOBALS['ADODB_SESS_CONN'] = & $conn;
 		else
 			ADOConnection::outp('<p>Session: connection failed</p>', false);
 		
@@ -565,10 +565,10 @@ 
 		Slurp in the session variables and return the serialized string
 	*/
 	function read($key) {
-		$conn	=& ADODB_Session::_conn();
+		$conn	= & ADODB_Session::_conn();
 		$data	= ADODB_Session::dataFieldName();
-		$filter	= ADODB_Session::filter();
-		$table	= ADODB_Session::table();
+		$filter = ADODB_Session::filter();
+		$table = ADODB_Session::table();
 
 		if (!$conn) {
 			return '';
@@ -579,7 +579,7 @@ 
 		$qkey = $conn->quote($key);
 		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
 	
-		$sql = "SELECT $data FROM $table WHERE $binary sesskey = $qkey AND expiry >= " . time();
+		$sql = "SELECT $data FROM $table WHERE $binary sesskey = $qkey AND expiry >= ".time();
 		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if 
 		  developer has commited elsewhere... :(
 		 */
@@ -587,7 +587,7 @@ 
 		#	$rs =& $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
 		#else
 		
-			$rs =& $conn->Execute($sql);
+			$rs = & $conn->Execute($sql);
 		//ADODB_Session::_dumprs($rs);
 		if ($rs) {
 			if ($rs->EOF) {
@@ -605,7 +605,7 @@ 
 
 			$rs->Close();
 
-			ADODB_Session::_crc(strlen($v) . crc32($v));
+			ADODB_Session::_crc(strlen($v).crc32($v));
 			return $v;
 		}
 
@@ -619,15 +619,15 @@ 
 	*/
 	function write($key, $val) {
 		$clob			= ADODB_Session::clob();
-		$conn			=& ADODB_Session::_conn();
-		$crc			= ADODB_Session::_crc();
+		$conn			= & ADODB_Session::_conn();
+		$crc = ADODB_Session::_crc();
 		$data			= ADODB_Session::dataFieldName();
-		$debug			= ADODB_Session::debug();
+		$debug = ADODB_Session::debug();
 		$driver			= ADODB_Session::driver();
-		$expire_notify	= ADODB_Session::expireNotify();
+		$expire_notify = ADODB_Session::expireNotify();
 		$filter			= ADODB_Session::filter();
-		$lifetime		= ADODB_Session::lifetime();
-		$table			= ADODB_Session::table();
+		$lifetime = ADODB_Session::lifetime();
+		$table = ADODB_Session::table();
 	
 		if (!$conn) {
 			return false;
@@ -642,12 +642,12 @@ 
 
 		// crc32 optimization since adodb 2.1
 		// now we only update expiry date, thx to sebastian thom in adodb 2.32
-		if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
+		if ($crc !== false && $crc == (strlen($val).crc32($val))) {
 			if ($debug) {
 				echo '<p>Session: Only updating date - crc32 not changed</p>';
 			}
 			$sql = "UPDATE $table SET expiry = ".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= ".$conn->Param('2');
-			$rs =& $conn->Execute($sql,array($expiry,$key,time()));
+			$rs = & $conn->Execute($sql, array($expiry, $key, time()));
 			ADODB_Session::_dumprs($rs);
 			if ($rs) {
 				$rs->Close();
@@ -692,7 +692,7 @@ 
 			}
 			
 			// do we insert or update? => as for sesskey
-			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
+			$rs = & $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
 			ADODB_Session::_dumprs($rs);
 			if ($rs && reset($rs->fields) > 0) {
 				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value WHERE  sesskey = $qkey";
@@ -704,12 +704,12 @@ 
 			}
 
 			$err = '';
-			$rs1 =& $conn->Execute($sql);
+			$rs1 = & $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs1);
 			if (!$rs1) {
 				$err = $conn->ErrorMsg()."\n";
 			}
-			$rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
+			$rs2 = & $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
 			ADODB_Session::_dumprs($rs2);
 			if (!$rs2) {
 				$err .= $conn->ErrorMsg()."\n";
@@ -724,14 +724,14 @@ 
 		}
 
 		if (!$rs) {
-			ADOConnection::outp('<p>Session Replace: ' . $conn->ErrorMsg() . '</p>', false);
+			ADOConnection::outp('<p>Session Replace: '.$conn->ErrorMsg().'</p>', false);
 			return false;
-		}  else {
+		} else {
 			// bug in access driver (could be odbc?) means that info is not committed
 			// properly unless select statement executed in Win2000
 			if ($conn->databaseType == 'access') {
 				$sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
-				$rs =& $conn->Execute($sql);
+				$rs = & $conn->Execute($sql);
 				ADODB_Session::_dumprs($rs);
 				if ($rs) {
 					$rs->Close();
@@ -747,9 +747,9 @@ 
 	/*!
 	*/
 	function destroy($key) {
-		$conn			=& ADODB_Session::_conn();
-		$table			= ADODB_Session::table();
-		$expire_notify	= ADODB_Session::expireNotify();
+		$conn = & ADODB_Session::_conn();
+		$table = ADODB_Session::table();
+		$expire_notify = ADODB_Session::expireNotify();
 
 		if (!$conn) {
 			return false;
@@ -765,7 +765,7 @@ 
 			$fn = next($expire_notify);
 			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
 			$sql = "SELECT expireref, sesskey FROM $table WHERE $binary sesskey = $qkey";
-			$rs =& $conn->Execute($sql);
+			$rs = & $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs);
 			$conn->SetFetchMode($savem);
 			if (!$rs) {
@@ -782,7 +782,7 @@ 
 		}
 
 		$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
-		$rs =& $conn->Execute($sql);
+		$rs = & $conn->Execute($sql);
 		ADODB_Session::_dumprs($rs);
 		if ($rs) {
 			$rs->Close();
@@ -794,12 +794,12 @@ 
 	/*!
 	*/
 	function gc($maxlifetime) {
-		$conn			=& ADODB_Session::_conn();
-		$debug			= ADODB_Session::debug();
-		$expire_notify	= ADODB_Session::expireNotify();
-		$optimize		= ADODB_Session::optimize();
-		$sync_seconds	= ADODB_Session::syncSeconds();
-		$table			= ADODB_Session::table();
+		$conn = & ADODB_Session::_conn();
+		$debug = ADODB_Session::debug();
+		$expire_notify = ADODB_Session::expireNotify();
+		$optimize = ADODB_Session::optimize();
+		$sync_seconds = ADODB_Session::syncSeconds();
+		$table = ADODB_Session::table();
 
 		if (!$conn) {
 			return false;
@@ -816,7 +816,7 @@ 
 			$fn = next($expire_notify);
 			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
 			$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time";
-			$rs =& $conn->Execute($sql);
+			$rs = & $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs);
 			$conn->SetFetchMode($savem);
 			if ($rs) {
@@ -835,7 +835,7 @@ 
 			}
 		} else {
 			$sql = "DELETE FROM $table WHERE expiry < $time";
-			$rs =& $conn->Execute($sql);
+			$rs = & $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs);
 			if ($rs) {
 				$rs->Close();
@@ -869,7 +869,7 @@ 
 			}
 			$sql .= " FROM $table";
 
-			$rs =& $conn->SelectLimit($sql, 1);
+			$rs = & $conn->SelectLimit($sql, 1);
 			if ($rs && !$rs->EOF) {
 				$dbts = reset($rs->fields);
 				$rs->Close();
@@ -877,9 +877,9 @@ 
 				$t = time();
 
 				if (abs($dbt - $t) >= $sync_seconds) {
-					$msg = __FILE__ .
-						": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: " .
-						" database=$dbt ($dbts), webserver=$t (diff=". (abs($dbt - $t) / 60) . ' minutes)';
+					$msg = __FILE__.
+						": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: ".
+						" database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt - $t) / 60).' minutes)';
 					error_log($msg);
 					if ($debug) {
 						ADOConnection::outp("<p>$msg</p>");

Braces +334 added lines, -152 removed lines

@@ -25,11 +25,15 @@ 
 
 */
 
-if (!defined('_ADODB_LAYER')) {
+if (!defined('_ADODB_LAYER'))
+{
 	require_once realpath(dirname(__FILE__) . '/../adodb.inc.php');
 }
 
-if (defined('ADODB_SESSION')) return 1;
+if (defined('ADODB_SESSION'))
+{
+	return 1;
+}
 
 define('ADODB_SESSION', dirname(__FILE__));
 
@@ -43,11 +47,12 @@ 
 	3. After urldecode, run the serialized string through this function:
 
 */
-function adodb_unserialize( $serialized_string ) 
+function adodb_unserialize( $serialized_string )
 {
 	$variables = array( );
 	$a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
-	for( $i = 0; $i < count( $a ); $i = $i+2 ) {
+	for( $i = 0; $i < count( $a ); $i = $i+2 )
+	{
 		$variables[$a[$i]] = unserialize( $a[$i+1] );
 	}
 	return( $variables );
@@ -57,15 +62,21 @@ 
 	Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
 	Since adodb 4.61.
 */
-function adodb_session_regenerate_id() 
+function adodb_session_regenerate_id()
 {
 	$conn =& ADODB_Session::_conn();
-	if (!$conn) return false;
+	if (!$conn)
+	{
+		return false;
+	}
 
 	$old_id = session_id();
-	if (function_exists('session_regenerate_id')) {
+	if (function_exists('session_regenerate_id'))
+	{
 		session_regenerate_id();
-	} else {
+	}
+	else
+	{
 		session_id(md5(uniqid(rand(), true)));
 		$ck = session_get_cookie_params();
 		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
@@ -75,9 +86,13 @@ 
 	$ok =& $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
 	
 	/* it is possible that the update statement fails due to a collision */
-	if (!$ok) {
+	if (!$ok)
+	{
 		session_id($old_id);
-		if (empty($ck)) $ck = session_get_cookie_params();
+		if (empty($ck))
+		{
+			$ck = session_get_cookie_params();
+		}
 		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
 		return false;
 	}
@@ -94,10 +109,19 @@ 
 function adodb_session_create_table($schemaFile=null,$conn = null)
 {
     // set default values
-    if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema.xml';
-    if ($conn===null) $conn =& ADODB_Session::_conn();
-
-	if (!$conn) return 0;
+    if ($schemaFile===null)
+    {
+    	$schemaFile = ADODB_SESSION . '/session_schema.xml';
+    }
+    if ($conn===null)
+    {
+    	$conn =& ADODB_Session::_conn();
+    }
+
+	if (!$conn)
+	{
+		return 0;
+	}
 
     $schema = new adoSchema($conn);
     $schema->ParseSchema($schemaFile);
@@ -107,7 +131,8 @@ 
 /*!
 	\static
 */
-class ADODB_Session {
+class ADODB_Session
+{
 	/////////////////////
 	// getter/setter methods
 	/////////////////////
@@ -124,16 +149,21 @@ 
 	*/
 	/*!
 	*/
-	function driver($driver = null) {
+	function driver($driver = null)
+	{
 		static $_driver = 'mysql';
 		static $set = false;
 
-		if (!is_null($driver)) {
+		if (!is_null($driver))
+		{
 			$_driver = trim($driver);
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_DRIVER'])) {
+			if (isset($GLOBALS['ADODB_SESSION_DRIVER']))
+			{
 				return $GLOBALS['ADODB_SESSION_DRIVER'];
 			}
 		}
@@ -143,16 +173,21 @@ 
 
 	/*!
 	*/
-	function host($host = null) {
+	function host($host = null)
+	{
 		static $_host = 'localhost';
 		static $set = false;
 
-		if (!is_null($host)) {
+		if (!is_null($host))
+		{
 			$_host = trim($host);
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_CONNECT'])) {
+			if (isset($GLOBALS['ADODB_SESSION_CONNECT']))
+			{
 				return $GLOBALS['ADODB_SESSION_CONNECT'];
 			}
 		}
@@ -162,16 +197,21 @@ 
 
 	/*!
 	*/
-	function user($user = null) {
+	function user($user = null)
+	{
 		static $_user = 'root';
 		static $set = false;
 
-		if (!is_null($user)) {
+		if (!is_null($user))
+		{
 			$_user = trim($user);
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_USER'])) {
+			if (isset($GLOBALS['ADODB_SESSION_USER']))
+			{
 				return $GLOBALS['ADODB_SESSION_USER'];
 			}
 		}
@@ -181,16 +221,21 @@ 
 
 	/*!
 	*/
-	function password($password = null) {
+	function password($password = null)
+	{
 		static $_password = '';
 		static $set = false;
 
-		if (!is_null($password)) {
+		if (!is_null($password))
+		{
 			$_password = $password;
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_PWD'])) {
+			if (isset($GLOBALS['ADODB_SESSION_PWD']))
+			{
 				return $GLOBALS['ADODB_SESSION_PWD'];
 			}
 		}
@@ -200,16 +245,21 @@ 
 
 	/*!
 	*/
-	function database($database = null) {
+	function database($database = null)
+	{
 		static $_database = 'xphplens_2';
 		static $set = false;
 
-		if (!is_null($database)) {
+		if (!is_null($database))
+		{
 			$_database = trim($database);
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_DB'])) {
+			if (isset($GLOBALS['ADODB_SESSION_DB']))
+			{
 				return $GLOBALS['ADODB_SESSION_DB'];
 			}
 		}
@@ -219,11 +269,12 @@ 
 
 	/*!
 	*/
-	function persist($persist = null) 
+	function persist($persist = null)
 	{
 		static $_persist = true;
 
-		if (!is_null($persist)) {
+		if (!is_null($persist))
+		{
 			$_persist = trim($persist);
 		}
 
@@ -232,22 +283,29 @@ 
 
 	/*!
 	*/
-	function lifetime($lifetime = null) {
+	function lifetime($lifetime = null)
+	{
 		static $_lifetime;
 		static $set = false;
 
-		if (!is_null($lifetime)) {
+		if (!is_null($lifetime))
+		{
 			$_lifetime = (int) $lifetime;
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESS_LIFE'])) {
+			if (isset($GLOBALS['ADODB_SESS_LIFE']))
+			{
 				return $GLOBALS['ADODB_SESS_LIFE'];
 			}
 		}
-		if (!$_lifetime) {
+		if (!$_lifetime)
+		{
 			$_lifetime = ini_get('session.gc_maxlifetime');
-			if ($_lifetime <= 1) {
+			if ($_lifetime <= 1)
+			{
 				// bug in PHP 4.0.3 pl 1  -- how about other versions?
 				//print "<h3>Session Error: PHP.INI setting <i>session.gc_maxlifetime</i>not set: $lifetime</h3>";
 				$_lifetime = 1440;
@@ -259,21 +317,27 @@ 
 
 	/*!
 	*/
-	function debug($debug = null) {
+	function debug($debug = null)
+	{
 		static $_debug = false;
 		static $set = false;
 
-		if (!is_null($debug)) {
+		if (!is_null($debug))
+		{
 			$_debug = (bool) $debug;
 
 			$conn = ADODB_Session::_conn();
-			if ($conn) {
+			if ($conn)
+			{
 				$conn->debug = $_debug;
 			}
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESS_DEBUG'])) {
+			if (isset($GLOBALS['ADODB_SESS_DEBUG']))
+			{
 				return $GLOBALS['ADODB_SESS_DEBUG'];
 			}
 		}
@@ -283,16 +347,21 @@ 
 
 	/*!
 	*/
-	function expireNotify($expire_notify = null) {
+	function expireNotify($expire_notify = null)
+	{
 		static $_expire_notify;
 		static $set = false;
 
-		if (!is_null($expire_notify)) {
+		if (!is_null($expire_notify))
+		{
 			$_expire_notify = $expire_notify;
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'])) {
+			if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY']))
+			{
 				return $GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'];
 			}
 		}
@@ -302,16 +371,21 @@ 
 
 	/*!
 	*/
-	function table($table = null) {
+	function table($table = null)
+	{
 		static $_table = 'sessions';
 		static $set = false;
 
-		if (!is_null($table)) {
+		if (!is_null($table))
+		{
 			$_table = trim($table);
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_TBL'])) {
+			if (isset($GLOBALS['ADODB_SESSION_TBL']))
+			{
 				return $GLOBALS['ADODB_SESSION_TBL'];
 			}
 		}
@@ -321,16 +395,21 @@ 
 
 	/*!
 	*/
-	function optimize($optimize = null) {
+	function optimize($optimize = null)
+	{
 		static $_optimize = false;
 		static $set = false;
 
-		if (!is_null($optimize)) {
+		if (!is_null($optimize))
+		{
 			$_optimize = (bool) $optimize;
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (defined('ADODB_SESSION_OPTIMIZE')) {
+			if (defined('ADODB_SESSION_OPTIMIZE'))
+			{
 				return true;
 			}
 		}
@@ -340,16 +419,21 @@ 
 
 	/*!
 	*/
-	function syncSeconds($sync_seconds = null) {
+	function syncSeconds($sync_seconds = null)
+	{
 		static $_sync_seconds = 60;
 		static $set = false;
 
-		if (!is_null($sync_seconds)) {
+		if (!is_null($sync_seconds))
+		{
 			$_sync_seconds = (int) $sync_seconds;
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (defined('ADODB_SESSION_SYNCH_SECS')) {
+			if (defined('ADODB_SESSION_SYNCH_SECS'))
+			{
 				return ADODB_SESSION_SYNCH_SECS;
 			}
 		}
@@ -359,16 +443,21 @@ 
 
 	/*!
 	*/
-	function clob($clob = null) {
+	function clob($clob = null)
+	{
 		static $_clob = false;
 		static $set = false;
 
-		if (!is_null($clob)) {
+		if (!is_null($clob))
+		{
 			$_clob = strtolower(trim($clob));
 			$set = true;
-		} elseif (!$set) {
+		}
+		elseif (!$set)
+		{
 			// backwards compatibility
-			if (isset($GLOBALS['ADODB_SESSION_USE_LOBS'])) {
+			if (isset($GLOBALS['ADODB_SESSION_USE_LOBS']))
+			{
 				return $GLOBALS['ADODB_SESSION_USE_LOBS'];
 			}
 		}
@@ -378,10 +467,12 @@ 
 
 	/*!
 	*/
-	function dataFieldName($data_field_name = null) {
+	function dataFieldName($data_field_name = null)
+	{
 		static $_data_field_name = 'data';
 
-		if (!is_null($data_field_name)) {
+		if (!is_null($data_field_name))
+		{
 			$_data_field_name = trim($data_field_name);
 		}
 
@@ -390,11 +481,14 @@ 
 
 	/*!
 	*/
-	function filter($filter = null) {
+	function filter($filter = null)
+	{
 		static $_filter = array();
 
-		if (!is_null($filter)) {
-			if (!is_array($filter)) {
+		if (!is_null($filter))
+		{
+			if (!is_array($filter))
+			{
 				$filter = array($filter);
 			}
 			$_filter = $filter;
@@ -405,10 +499,12 @@ 
 
 	/*!
 	*/
-	function encryptionKey($encryption_key = null) {
+	function encryptionKey($encryption_key = null)
+	{
 		static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
 
-		if (!is_null($encryption_key)) {
+		if (!is_null($encryption_key))
+		{
 			$_encryption_key = $encryption_key;
 		}
 
@@ -427,10 +523,12 @@ 
 
 	/*!
 	*/
-	function _crc($crc = null) {
+	function _crc($crc = null)
+	{
 		static $_crc = false;
 
-		if (!is_null($crc)) {
+		if (!is_null($crc))
+		{
 			$_crc = $crc;
 		}
 
@@ -439,7 +537,8 @@ 
 
 	/*!
 	*/
-	function _init() {
+	function _init()
+	{
 		session_module_name('user');
 		session_set_save_handler(
 			array('ADODB_Session', 'open'),
@@ -454,7 +553,8 @@ 
 
 	/*!
 	*/
-	function _sessionKey() {
+	function _sessionKey()
+	{
 		// use this function to create the encryption key for crypted sessions
 		// crypt the used key, ADODB_Session::encryptionKey() as key and session_id() as salt
 		return crypt(ADODB_Session::encryptionKey(), session_id());
@@ -462,26 +562,31 @@ 
 
 	/*!
 	*/
-	function _dumprs($rs) {
+	function _dumprs($rs)
+	{
 		$conn	=& ADODB_Session::_conn();
 		$debug	= ADODB_Session::debug();
 
-		if (!$conn) {
+		if (!$conn)
+		{
 			return;
 		}
 
-		if (!$debug) {
+		if (!$debug)
+		{
 			return;
 		}
 
-		if (!$rs) {
+		if (!$rs)
+		{
 			echo "<br />\$rs is null or false<br />\n";
 			return;
 		}
 
 		//echo "<br />\nAffected_Rows=",$conn->Affected_Rows(),"<br />\n";
 
-		if (!is_object($rs)) {
+		if (!is_object($rs))
+		{
 			return;
 		}
 
@@ -498,10 +603,12 @@ 
 
 		If $conn already exists, reuse that connection
 	*/
-	function open($save_path, $session_name, $persist = null) {
+	function open($save_path, $session_name, $persist = null)
+	{
 		$conn =& ADODB_Session::_conn();
 
-		if ($conn) {
+		if ($conn)
+		{
 			return true;
 		}
 
@@ -512,9 +619,12 @@ 
 		$password	= ADODB_Session::password();
 		$user		= ADODB_Session::user();
 
-		if (!is_null($persist)) {
+		if (!is_null($persist))
+		{
 			ADODB_Session::persist($persist);
-		} else {
+		}
+		else
+		{
 			$persist = ADODB_Session::persist();
 		}
 
@@ -526,25 +636,34 @@ 
 		// cannot use =& below - do not know why...
 		$conn =& ADONewConnection($driver);
 
-		if ($debug) {
+		if ($debug)
+		{
 			$conn->debug = true;
 //			ADOConnection::outp( " driver=$driver user=$user pwd=$password db=$database ");
 		}
 
-		if ($persist) {
-			switch($persist) {
+		if ($persist)
+		{
+			switch($persist)
+			{
 			default:
 			case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
 			case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
 			case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
 			}
-		} else {
+		}
+		else
+		{
 			$ok = $conn->Connect($host, $user, $password, $database);
 		}
 
-		if ($ok) $GLOBALS['ADODB_SESS_CONN'] =& $conn;
-		else
-			ADOConnection::outp('<p>Session: connection failed</p>', false);
+		if ($ok)
+		{
+			$GLOBALS['ADODB_SESS_CONN'] =& $conn;
+		}
+		else {
+					ADOConnection::outp('<p>Session: connection failed</p>', false);
+		}
 		
 
 		return $ok;
@@ -553,7 +672,8 @@ 
 	/*!
 		Close the connection
 	*/
-	function close() {
+	function close()
+	{
 /*
 		$conn =& ADODB_Session::_conn();
 		if ($conn) $conn->Close();
@@ -564,13 +684,15 @@ 
 	/*
 		Slurp in the session variables and return the serialized string
 	*/
-	function read($key) {
+	function read($key)
+	{
 		$conn	=& ADODB_Session::_conn();
 		$data	= ADODB_Session::dataFieldName();
 		$filter	= ADODB_Session::filter();
 		$table	= ADODB_Session::table();
 
-		if (!$conn) {
+		if (!$conn)
+		{
 			return '';
 		}
 
@@ -589,14 +711,20 @@ 
 		
 			$rs =& $conn->Execute($sql);
 		//ADODB_Session::_dumprs($rs);
-		if ($rs) {
-			if ($rs->EOF) {
+		if ($rs)
+		{
+			if ($rs->EOF)
+			{
 				$v = '';
-			} else {
+			}
+			else
+			{
 				$v = reset($rs->fields);
 				$filter = array_reverse($filter);
-				foreach ($filter as $f) {
-					if (is_object($f)) {
+				foreach ($filter as $f)
+				{
+					if (is_object($f))
+					{
 						$v = $f->read($v, ADODB_Session::_sessionKey());
 					}
 				}
@@ -617,7 +745,8 @@ 
 
 		If the data has not been modified since the last read(), we do not write.
 	*/
-	function write($key, $val) {
+	function write($key, $val)
+	{
 		$clob			= ADODB_Session::clob();
 		$conn			=& ADODB_Session::_conn();
 		$crc			= ADODB_Session::_crc();
@@ -629,7 +758,8 @@ 
 		$lifetime		= ADODB_Session::lifetime();
 		$table			= ADODB_Session::table();
 	
-		if (!$conn) {
+		if (!$conn)
+		{
 			return false;
 		}
 		$qkey = $conn->qstr($key);
@@ -642,41 +772,53 @@ 
 
 		// crc32 optimization since adodb 2.1
 		// now we only update expiry date, thx to sebastian thom in adodb 2.32
-		if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
-			if ($debug) {
+		if ($crc !== false && $crc == (strlen($val) . crc32($val)))
+		{
+			if ($debug)
+			{
 				echo '<p>Session: Only updating date - crc32 not changed</p>';
 			}
 			$sql = "UPDATE $table SET expiry = ".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= ".$conn->Param('2');
 			$rs =& $conn->Execute($sql,array($expiry,$key,time()));
 			ADODB_Session::_dumprs($rs);
-			if ($rs) {
+			if ($rs)
+			{
 				$rs->Close();
 			}
 			return true;
 		}
 		$val = rawurlencode($val);
-		foreach ($filter as $f) {
-			if (is_object($f)) {
+		foreach ($filter as $f)
+		{
+			if (is_object($f))
+			{
 				$val = $f->write($val, ADODB_Session::_sessionKey());
 			}
 		}
 
 		$arr = array('sesskey' => $key, 'expiry' => $expiry, $data => $val, 'expireref' => '');
-		if ($expire_notify) {
+		if ($expire_notify)
+		{
 			$var = reset($expire_notify);
 			global $$var;
-			if (isset($$var)) {
+			if (isset($$var))
+			{
 				$arr['expireref'] = $$var;
 			}
 		}
 
-		if (!$clob) {	// no lobs, simply use replace()
+		if (!$clob)
+		{
+// no lobs, simply use replace()
 			$arr[$data] = $conn->qstr($val);
 			$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
 			ADODB_Session::_dumprs($rs);
-		} else {
+		}
+		else
+		{
 			// what value shall we insert/update for lob row?
-			switch ($driver) {
+			switch ($driver)
+			{
 				// empty_clob or empty_lob for oracle dbs
 				case 'oracle':
 				case 'oci8':
@@ -694,46 +836,59 @@ 
 			// do we insert or update? => as for sesskey
 			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
 			ADODB_Session::_dumprs($rs);
-			if ($rs && reset($rs->fields) > 0) {
+			if ($rs && reset($rs->fields) > 0)
+			{
 				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value WHERE  sesskey = $qkey";
-			} else {
+			}
+			else
+			{
 				$sql = "INSERT INTO $table (expiry, $data, sesskey) VALUES ($expiry, $lob_value, $qkey)";
 			}
-			if ($rs) {
+			if ($rs)
+			{
 				$rs->Close();
 			}
 
 			$err = '';
 			$rs1 =& $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs1);
-			if (!$rs1) {
+			if (!$rs1)
+			{
 				$err = $conn->ErrorMsg()."\n";
 			}
 			$rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
 			ADODB_Session::_dumprs($rs2);
-			if (!$rs2) {
+			if (!$rs2)
+			{
 				$err .= $conn->ErrorMsg()."\n";
 			}
 			$rs = ($rs && $rs2) ? true : false;
-			if ($rs1) {
+			if ($rs1)
+			{
 				$rs1->Close();
 			}
-			if (is_object($rs2)) {
+			if (is_object($rs2))
+			{
 				$rs2->Close();
 			}
 		}
 
-		if (!$rs) {
+		if (!$rs)
+		{
 			ADOConnection::outp('<p>Session Replace: ' . $conn->ErrorMsg() . '</p>', false);
 			return false;
-		}  else {
+		}
+		else
+		{
 			// bug in access driver (could be odbc?) means that info is not committed
 			// properly unless select statement executed in Win2000
-			if ($conn->databaseType == 'access') {
+			if ($conn->databaseType == 'access')
+			{
 				$sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
 				$rs =& $conn->Execute($sql);
 				ADODB_Session::_dumprs($rs);
-				if ($rs) {
+				if ($rs)
+				{
 					$rs->Close();
 				}
 			}
@@ -746,12 +901,14 @@ 
 
 	/*!
 	*/
-	function destroy($key) {
+	function destroy($key)
+	{
 		$conn			=& ADODB_Session::_conn();
 		$table			= ADODB_Session::table();
 		$expire_notify	= ADODB_Session::expireNotify();
 
-		if (!$conn) {
+		if (!$conn)
+		{
 			return false;
 		}
 
@@ -760,7 +917,8 @@ 
 		$qkey = $conn->quote($key);
 		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
 
-		if ($expire_notify) {
+		if ($expire_notify)
+		{
 			reset($expire_notify);
 			$fn = next($expire_notify);
 			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
@@ -768,10 +926,12 @@ 
 			$rs =& $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs);
 			$conn->SetFetchMode($savem);
-			if (!$rs) {
+			if (!$rs)
+			{
 				return false;
 			}
-			if (!$rs->EOF) {
+			if (!$rs->EOF)
+			{
 				$ref = $rs->fields[0];
 				$key = $rs->fields[1];
 				//assert('$ref');
@@ -784,7 +944,8 @@ 
 		$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
 		$rs =& $conn->Execute($sql);
 		ADODB_Session::_dumprs($rs);
-		if ($rs) {
+		if ($rs)
+		{
 			$rs->Close();
 		}
 
@@ -793,7 +954,8 @@ 
 
 	/*!
 	*/
-	function gc($maxlifetime) {
+	function gc($maxlifetime)
+	{
 		$conn			=& ADODB_Session::_conn();
 		$debug			= ADODB_Session::debug();
 		$expire_notify	= ADODB_Session::expireNotify();
@@ -801,7 +963,8 @@ 
 		$sync_seconds	= ADODB_Session::syncSeconds();
 		$table			= ADODB_Session::table();
 
-		if (!$conn) {
+		if (!$conn)
+		{
 			return false;
 		}
 
@@ -811,7 +974,8 @@ 
 
 		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
 
-		if ($expire_notify) {
+		if ($expire_notify)
+		{
 			reset($expire_notify);
 			$fn = next($expire_notify);
 			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
@@ -819,10 +983,12 @@ 
 			$rs =& $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs);
 			$conn->SetFetchMode($savem);
-			if ($rs) {
+			if ($rs)
+			{
 				$conn->BeginTrans();
 				$keys = array();
-				while (!$rs->EOF) {
+				while (!$rs->EOF)
+				{
 					$ref = $rs->fields[0];
 					$key = $rs->fields[1];
 					$fn($ref, $key);
@@ -833,55 +999,70 @@ 
 				
 				$conn->CommitTrans();
 			}
-		} else {
+		}
+		else
+		{
 			$sql = "DELETE FROM $table WHERE expiry < $time";
 			$rs =& $conn->Execute($sql);
 			ADODB_Session::_dumprs($rs);
-			if ($rs) {
+			if ($rs)
+			{
 				$rs->Close();
 			}
-			if ($debug) {
+			if ($debug)
+			{
 				ADOConnection::outp("<p><b>Garbage Collection</b>: $sql</p>");
 			}
 		}
 
 		// suggested by Cameron, "GaM3R" <gamr@outworld.cx>
-		if ($optimize) {
+		if ($optimize)
+		{
 			$driver = ADODB_Session::driver();
 
-			if (preg_match('/mysql/i', $driver)) {
+			if (preg_match('/mysql/i', $driver))
+			{
 				$sql = "OPTIMIZE TABLE $table";
 			}
-			if (preg_match('/postgres/i', $driver)) {
+			if (preg_match('/postgres/i', $driver))
+			{
 				$sql = "VACUUM $table";
 			}
-			if (!empty($sql)) {
+			if (!empty($sql))
+			{
 				$conn->Execute($sql);
 			}
 		}
 
-		if ($sync_seconds) {
+		if ($sync_seconds)
+		{
 			$sql = 'SELECT ';
-			if ($conn->dataProvider === 'oci8') {
+			if ($conn->dataProvider === 'oci8')
+			{
 				$sql .= "TO_CHAR({$conn->sysTimeStamp}, 'RRRR-MM-DD HH24:MI:SS')";
-			} else {
+			}
+			else
+			{
 				$sql .= $conn->sysTimeStamp;
 			}
 			$sql .= " FROM $table";
 
 			$rs =& $conn->SelectLimit($sql, 1);
-			if ($rs && !$rs->EOF) {
+			if ($rs && !$rs->EOF)
+			{
 				$dbts = reset($rs->fields);
 				$rs->Close();
 				$dbt = $conn->UnixTimeStamp($dbts);
 				$t = time();
 
-				if (abs($dbt - $t) >= $sync_seconds) {
+				if (abs($dbt - $t) >= $sync_seconds)
+				{
 					$msg = __FILE__ .
 						": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: " .
 						" database=$dbt ($dbts), webserver=$t (diff=". (abs($dbt - $t) / 60) . ' minutes)';
 					error_log($msg);
-					if ($debug) {
+					if ($debug)
+					{
 						ADOConnection::outp("<p>$msg</p>");
 					}
 				}
@@ -896,13 +1077,14 @@ 
 
 
 // for backwards compatability only
-function adodb_sess_open($save_path, $session_name, $persist = true) {
+function adodb_sess_open($save_path, $session_name, $persist = true)
+{
 	return ADODB_Session::open($save_path, $session_name, $persist);
 }
 
 // for backwards compatability only
 function adodb_sess_gc($t)
-{	
+{
 	return ADODB_Session::gc($t);
 }
 

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

@@ -579,7 +579,7 @@ 
 		$qkey = $conn->quote($key);
 		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
 	
-		$sql = "SELECT $data FROM $table WHERE $binary sesskey = $qkey AND expiry >= " . time();
+		$sql = "select $data FROM $table WHERE $binary sesskey = $qkey AND expiry >= " . time();
 		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if 
 		  developer has commited elsewhere... :(
 		 */
@@ -646,7 +646,7 @@ 
 			if ($debug) {
 				echo '<p>Session: Only updating date - crc32 not changed</p>';
 			}
-			$sql = "UPDATE $table SET expiry = ".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= ".$conn->Param('2');
+			$sql = "update $table SET expiry = ".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= ".$conn->Param('2');
 			$rs =& $conn->Execute($sql,array($expiry,$key,time()));
 			ADODB_Session::_dumprs($rs);
 			if ($rs) {
@@ -695,7 +695,7 @@ 
 			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
 			ADODB_Session::_dumprs($rs);
 			if ($rs && reset($rs->fields) > 0) {
-				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value WHERE  sesskey = $qkey";
+				$sql = "update $table SET expiry = $expiry, $data = $lob_value WHERE  sesskey = $qkey";
 			} else {
 				$sql = "INSERT INTO $table (expiry, $data, sesskey) VALUES ($expiry, $lob_value, $qkey)";
 			}
@@ -853,7 +853,7 @@ 
 				$sql = "OPTIMIZE TABLE $table";
 			}
 			if (preg_match('/postgres/i', $driver)) {
-				$sql = "VACUUM $table";
+				$sql = "vacuum $table";
 			}
 			if (!empty($sql)) {
 				$conn->Execute($sql);

phpgwapi/inc/adodb/session/old/crypt.inc.php

Doc Comments +4 added lines

@@ -1,6 +1,10 @@
 <?php
 //	 Session Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
 class MD5Crypt{
+
+		/**
+		 * @param string $txt
+		 */
 		function keyED($txt,$encrypt_key)
 		{
 				$encrypt_key = md5($encrypt_key);

Spacing +24 added lines, -24 removed lines

@@ -1,43 +1,43 @@ 
 <?php
 //	 Session Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
-class MD5Crypt{
-		function keyED($txt,$encrypt_key)
+class MD5Crypt {
+		function keyED($txt, $encrypt_key)
 		{
 				$encrypt_key = md5($encrypt_key);
-				$ctr=0;
+				$ctr = 0;
 				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++){
-						if ($ctr==strlen($encrypt_key)) $ctr=0;
-						$tmp.= substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1);
+				for ($i = 0; $i < strlen($txt); $i++) {
+						if ($ctr == strlen($encrypt_key)) $ctr = 0;
+						$tmp .= substr($txt, $i, 1)^substr($encrypt_key, $ctr, 1);
 						$ctr++;
 				}
 				return $tmp;
 		}
 
-		function Encrypt($txt,$key)
+		function Encrypt($txt, $key)
 		{
-				srand((double)microtime()*1000000);
-				$encrypt_key = md5(rand(0,32000));
-				$ctr=0;
+				srand((double)microtime() * 1000000);
+				$encrypt_key = md5(rand(0, 32000));
+				$ctr = 0;
 				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++)
+				for ($i = 0; $i < strlen($txt); $i++)
 				{
-				if ($ctr==strlen($encrypt_key)) $ctr=0;
-				$tmp.= substr($encrypt_key,$ctr,1) .
-				(substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
+				if ($ctr == strlen($encrypt_key)) $ctr = 0;
+				$tmp .= substr($encrypt_key, $ctr, 1).
+				(substr($txt, $i, 1)^substr($encrypt_key, $ctr, 1));
 				$ctr++;
 				}
-				return base64_encode($this->keyED($tmp,$key));
+				return base64_encode($this->keyED($tmp, $key));
 		}
 
-		function Decrypt($txt,$key)
+		function Decrypt($txt, $key)
 		{
-				$txt = $this->keyED(base64_decode($txt),$key);
+				$txt = $this->keyED(base64_decode($txt), $key);
 				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++){
-						$md5 = substr($txt,$i,1);
+				for ($i = 0; $i < strlen($txt); $i++) {
+						$md5 = substr($txt, $i, 1);
 						$i++;
-						$tmp.= (substr($txt,$i,1) ^ $md5);
+						$tmp .= (substr($txt, $i, 1)^$md5);
 				}
 				return $tmp;
 		}
@@ -45,14 +45,14 @@ 
 		function RandPass()
 		{
 				$randomPassword = "";
-				srand((double)microtime()*1000000);
-				for($i=0;$i<8;$i++)
+				srand((double)microtime() * 1000000);
+				for ($i = 0; $i < 8; $i++)
 				{
-						$randnumber = rand(48,120);
+						$randnumber = rand(48, 120);
 
 						while (($randnumber >= 58 && $randnumber <= 64) || ($randnumber >= 91 && $randnumber <= 96))
 						{
-								$randnumber = rand(48,120);
+								$randnumber = rand(48, 120);
 						}
 
 						$randomPassword .= chr($randnumber);

Braces +14 added lines, -5 removed lines

@@ -1,13 +1,18 @@ 
 <?php
 //	 Session Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
-class MD5Crypt{
+class MD5Crypt
+{
 		function keyED($txt,$encrypt_key)
 		{
 				$encrypt_key = md5($encrypt_key);
 				$ctr=0;
 				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++){
-						if ($ctr==strlen($encrypt_key)) $ctr=0;
+				for ($i=0;$i<strlen($txt);$i++)
+				{
+						if ($ctr==strlen($encrypt_key))
+						{
+							$ctr=0;
+						}
 						$tmp.= substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1);
 						$ctr++;
 				}
@@ -22,7 +27,10 @@ 
 				$tmp = "";
 				for ($i=0;$i<strlen($txt);$i++)
 				{
-				if ($ctr==strlen($encrypt_key)) $ctr=0;
+				if ($ctr==strlen($encrypt_key))
+				{
+					$ctr=0;
+				}
 				$tmp.= substr($encrypt_key,$ctr,1) .
 				(substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
 				$ctr++;
@@ -34,7 +42,8 @@ 
 		{
 				$txt = $this->keyED(base64_decode($txt),$key);
 				$tmp = "";
-				for ($i=0;$i<strlen($txt);$i++){
+				for ($i=0;$i<strlen($txt);$i++)
+				{
 						$md5 = substr($txt,$i,1);
 						$i++;
 						$tmp.= (substr($txt,$i,1) ^ $md5);

phpgwapi/inc/adodb/toexport.inc.php

Doc Comments +4 added lines

@@ -60,6 +60,10 @@
 	if ($fp) fclose($fp);
 }
 
+/**
+ * @param string $sep
+ * @param string $sepreplace
+ */
 function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote = '"',$escquote = '"',$replaceNewLine = ' ')
 {
 	if (!$rs) return '';

Spacing +28 added lines, -28 removed lines

@@ -22,45 +22,45 @@ 
  */
  
 // returns a recordset as a csv string
-function rs2csv(&$rs,$addtitles=true)
+function rs2csv(&$rs, $addtitles = true)
 {
-	return _adodb_export($rs,',',',',false,$addtitles);
+	return _adodb_export($rs, ',', ',', false, $addtitles);
 }
 
 // writes recordset to csv file 
-function rs2csvfile(&$rs,$fp,$addtitles=true)
+function rs2csvfile(&$rs, $fp, $addtitles = true)
 {
-	_adodb_export($rs,',',',',$fp,$addtitles);
+	_adodb_export($rs, ',', ',', $fp, $addtitles);
 }
 
 // write recordset as csv string to stdout
-function rs2csvout(&$rs,$addtitles=true)
+function rs2csvout(&$rs, $addtitles = true)
 {
-	$fp = fopen('php://stdout','wb');
-	_adodb_export($rs,',',',',true,$addtitles);
+	$fp = fopen('php://stdout', 'wb');
+	_adodb_export($rs, ',', ',', true, $addtitles);
 	fclose($fp);
 }
 
-function rs2tab(&$rs,$addtitles=true)
+function rs2tab(&$rs, $addtitles = true)
 {
-	return _adodb_export($rs,"\t",',',false,$addtitles);
+	return _adodb_export($rs, "\t", ',', false, $addtitles);
 }
 
 // to file pointer
-function rs2tabfile(&$rs,$fp,$addtitles=true)
+function rs2tabfile(&$rs, $fp, $addtitles = true)
 {
-	_adodb_export($rs,"\t",',',$fp,$addtitles);
+	_adodb_export($rs, "\t", ',', $fp, $addtitles);
 }
 
 // to stdout
-function rs2tabout(&$rs,$addtitles=true)
+function rs2tabout(&$rs, $addtitles = true)
 {
-	$fp = fopen('php://stdout','wb');
-	_adodb_export($rs,"\t",' ',true,$addtitles);
+	$fp = fopen('php://stdout', 'wb');
+	_adodb_export($rs, "\t", ' ', true, $addtitles);
 	if ($fp) fclose($fp);
 }
 
-function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote = '"',$escquote = '"',$replaceNewLine = ' ')
+function _adodb_export(&$rs, $sep, $sepreplace, $fp = false, $addtitles = true, $quote = '"', $escquote = '"', $replaceNewLine = ' ')
 {
 	if (!$rs) return '';
 	//----------
@@ -73,11 +73,11 @@ 
 	if ($addtitles) {
 		$fieldTypes = $rs->FieldTypesArray();
 		reset($fieldTypes);
-		while(list(,$o) = each($fieldTypes)) {
+		while (list(,$o) = each($fieldTypes)) {
 			
 			$v = $o->name;
-			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
-			$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+			if ($escquote) $v = str_replace($quote, $escquotequote, $v);
+			$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n", $replaceNewLine, str_replace($sep, $sepreplace, $v))));
 			$elements[] = $v;
 			
 		}
@@ -93,22 +93,22 @@ 
 		$i = 0;
 		
 		if ($hasNumIndex) {
-			for ($j=0; $j < $max; $j++) {
+			for ($j = 0; $j < $max; $j++) {
 				$v = $rs->fields[$j];
 				if (!is_object($v)) $v = trim($v);
 				else $v = 'Object';
-				if ($escquote) $v = str_replace($quote,$escquotequote,$v);
-				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+				if ($escquote) $v = str_replace($quote, $escquotequote, $v);
+				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n", $replaceNewLine, str_replace($sep, $sepreplace, $v))));
 				
-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+				if (strpos($v, $sep) !== false || strpos($v, $quote) !== false) $elements[] = "$quote$v$quote";
 				else $elements[] = $v;
 			}
 		} else { // ASSOCIATIVE ARRAY
-			foreach($rs->fields as $v) {
-				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));
-				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+			foreach ($rs->fields as $v) {
+				if ($escquote) $v = str_replace($quote, $escquotequote, trim($v));
+				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n", $replaceNewLine, str_replace($sep, $sepreplace, $v))));
 				
-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+				if (strpos($v, $sep) !== false || strpos($v, $quote) !== false) $elements[] = "$quote$v$quote";
 				else $elements[] = $v;
 			}
 		}
@@ -117,14 +117,14 @@ 
 		$line += 1;
 		if ($fp && ($line % $BUFLINES) == 0) {
 			if ($fp === true) echo $s;
-			else fwrite($fp,$s);
+			else fwrite($fp, $s);
 			$s = '';
 		}
 	}
 	
 	if ($fp) {
 		if ($fp === true) echo $s;
-		else fwrite($fp,$s);
+		else fwrite($fp, $s);
 		$s = '';
 	}
 	

Braces +76 added lines, -25 removed lines

@@ -57,12 +57,18 @@ 
 {
 	$fp = fopen('php://stdout','wb');
 	_adodb_export($rs,"\t",' ',true,$addtitles);
-	if ($fp) fclose($fp);
-}
+	if ($fp)
+	{
+		fclose($fp);
+	}
+	}
 
 function _adodb_export(&$rs,$sep,$sepreplace,$fp=false,$addtitles=true,$quote = '"',$escquote = '"',$replaceNewLine = ' ')
 {
-	if (!$rs) return '';
+	if (!$rs)
+	{
+		return '';
+	}
 	//----------
 	// CONSTANTS
 	$NEWLINE = "\r\n";
@@ -70,13 +76,18 @@ 
 	$escquotequote = $escquote.$quote;
 	$s = '';
 	
-	if ($addtitles) {
+	if ($addtitles)
+	{
 		$fieldTypes = $rs->FieldTypesArray();
 		reset($fieldTypes);
-		while(list(,$o) = each($fieldTypes)) {
+		while(list(,$o) = each($fieldTypes))
+		{
 			
 			$v = $o->name;
-			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
+			if ($escquote)
+			{
+				$v = str_replace($quote,$escquotequote,$v);
+			}
 			$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
 			$elements[] = $v;
 			
@@ -88,43 +99,83 @@ 
 	$line = 0;
 	$max = $rs->FieldCount();
 	
-	while (!$rs->EOF) {
+	while (!$rs->EOF)
+	{
 		$elements = array();
 		$i = 0;
 		
-		if ($hasNumIndex) {
-			for ($j=0; $j < $max; $j++) {
+		if ($hasNumIndex)
+		{
+			for ($j=0; $j < $max; $j++)
+			{
 				$v = $rs->fields[$j];
-				if (!is_object($v)) $v = trim($v);
-				else $v = 'Object';
-				if ($escquote) $v = str_replace($quote,$escquotequote,$v);
+				if (!is_object($v))
+				{
+					$v = trim($v);
+				}
+				else {
+					$v = 'Object';
+				}
+				if ($escquote)
+				{
+					$v = str_replace($quote,$escquotequote,$v);
+				}
 				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
 				
-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
-				else $elements[] = $v;
+				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false)
+				{
+					$elements[] = "$quote$v$quote";
+				}
+				else {
+					$elements[] = $v;
+				}
 			}
-		} else { // ASSOCIATIVE ARRAY
-			foreach($rs->fields as $v) {
-				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));
+		}
+		else
+		{
+// ASSOCIATIVE ARRAY
+			foreach($rs->fields as $v)
+			{
+				if ($escquote)
+				{
+					$v = str_replace($quote,$escquotequote,trim($v));
+				}
 				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
 				
-				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
-				else $elements[] = $v;
+				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false)
+				{
+					$elements[] = "$quote$v$quote";
+				}
+				else {
+					$elements[] = $v;
+				}
 			}
 		}
 		$s .= implode($sep, $elements).$NEWLINE;
 		$rs->MoveNext();
 		$line += 1;
-		if ($fp && ($line % $BUFLINES) == 0) {
-			if ($fp === true) echo $s;
-			else fwrite($fp,$s);
+		if ($fp && ($line % $BUFLINES) == 0)
+		{
+			if ($fp === true)
+			{
+				echo $s;
+			}
+			else {
+				fwrite($fp,$s);
+			}
 			$s = '';
 		}
 	}
 	
-	if ($fp) {
-		if ($fp === true) echo $s;
-		else fwrite($fp,$s);
+	if ($fp)
+	{
+		if ($fp === true)
+		{
+			echo $s;
+		}
+		else {
+			fwrite($fp,$s);
+		}
 		$s = '';
 	}