Whitespace and coding guidelines

1 files changed, 374 insertions, 299 deletions

diff --git a/adodb-active-recordx.inc.php b/adodb-active-recordx.inc.php
index b6d6d54f..27cb4681 100644
--- a/adodb-active-recordx.inc.php
+++ b/adodb-active-recordx.inc.php
@@ -66,10 +66,13 @@ function ADODB_SetDatabaseAdapter(&$db)
 
 		foreach($_ADODB_ACTIVE_DBS as $k => $d) {
 			if (PHP_VERSION >= 5) {
-				if ($d->db === $db) return $k;
+				if ($d->db === $db) {
+					return $k;
+				}
 			} else {
-				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database)
+				if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) {
 					return $k;
+				}
 			}
 		}
 
@@ -101,7 +104,9 @@ class ADODB_Active_Record {
 	static function UseDefaultValues($bool=null)
 	{
 	global $ADODB_ACTIVE_DEFVALS;
-		if (isset($bool)) $ADODB_ACTIVE_DEFVALS = $bool;
+		if (isset($bool)) {
+			$ADODB_ACTIVE_DEFVALS = $bool;
+		}
 		return $ADODB_ACTIVE_DEFVALS;
 	}
 
@@ -137,15 +142,13 @@ class ADODB_Active_Record {
 			$pkeyarr = false;
 		}
 
-		if($table)
-		{
+		if($table) {
 			// table argument exists. It is expected to be
 			// already plural form.
 			$this->_pTable = $table;
 			$this->_sTable = $this->_singularize($this->_pTable);
 		}
-		else
-		{
+		else {
 			// We will use current classname as table name.
 			// We need to pluralize it for the real table name.
 			$this->_sTable = strtolower(get_class($this));
@@ -161,7 +164,12 @@ class ADODB_Active_Record {
 			$this->_dbat = sizeof($_ADODB_ACTIVE_DBS)-1;
 
 
-		if ($this->_dbat < 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor');
+		if ($this->_dbat < 0) {
+			$this->Error(
+				"No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",
+				'ADODB_Active_Record::__constructor'
+			);
+		}
 
 		$this->_tableat = $this->_table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future
 
@@ -169,8 +177,7 @@ class ADODB_Active_Record {
 		// but there was no way to ask it to do that.
 		$forceUpdate = (isset($options['refresh']) && true === $options['refresh']);
 		$this->UpdateActiveTable($pkeyarr, $forceUpdate);
-		if(isset($options['new']) && true === $options['new'])
-		{
+		if(isset($options['new']) && true === $options['new']) {
 			$table =& $this->TableInfo();
 			unset($table->_hasMany);
 			unset($table->_belongsTo);
@@ -181,8 +188,8 @@ class ADODB_Active_Record {
 
 	function __wakeup()
 	{
-  		$class = get_class($this);
-  		new $class;
+		$class = get_class($this);
+		new $class;
 	}
 
 	// CFR: Constants found in Rails
@@ -215,32 +222,32 @@ class ADODB_Active_Record {
 
 	function _pluralize($table)
 	{
-		if (!ADODB_Active_Record::$_changeNames) return $table;
-
+		if (!ADODB_Active_Record::$_changeNames) {
+			return $table;
+		}
 		$ut = strtoupper($table);
-		if(isset(self::$WeIsI[$ut]))
-		{
+		if(isset(self::$WeIsI[$ut])) {
 			return $table;
 		}
-		if(isset(self::$IrregularP[$ut]))
-		{
+		if(isset(self::$IrregularP[$ut])) {
 			return self::$IrregularP[$ut];
 		}
 		$len = strlen($table);
 		$lastc = $ut[$len-1];
 		$lastc2 = substr($ut,$len-2);
 		switch ($lastc) {
-		case 'S':
-			return $table.'es';
-		case 'Y':
-			return substr($table,0,$len-1).'ies';
-		case 'X':
-			return $table.'es';
-		case 'H':
-			if ($lastc2 == 'CH' || $lastc2 == 'SH')
+			case 'S':
 				return $table.'es';
-		default:
-			return $table.'s';
+			case 'Y':
+				return substr($table,0,$len-1).'ies';
+			case 'X':
+				return $table.'es';
+			case 'H':
+				if ($lastc2 == 'CH' || $lastc2 == 'SH') {
+					return $table.'es';
+				}
+			default:
+				return $table.'s';
 		}
 	}
 
@@ -249,32 +256,33 @@ class ADODB_Active_Record {
 	function _singularize($table)
 	{
 
-		if (!ADODB_Active_Record::$_changeNames) return $table;
-
+		if (!ADODB_Active_Record::$_changeNames) {
+		return $table;
+	}
 		$ut = strtoupper($table);
-		if(isset(self::$WeIsI[$ut]))
-		{
+		if(isset(self::$WeIsI[$ut])) {
 			return $table;
 		}
-		if(isset(self::$IrregularS[$ut]))
-		{
+		if(isset(self::$IrregularS[$ut])) {
 			return self::$IrregularS[$ut];
 		}
 		$len = strlen($table);
-		if($ut[$len-1] != 'S')
+		if($ut[$len-1] != 'S') {
 			return $table; // I know...forget oxen
-		if($ut[$len-2] != 'E')
+		}
+		if($ut[$len-2] != 'E') {
 			return substr($table, 0, $len-1);
-		switch($ut[$len-3])
-		{
+		}
+		switch($ut[$len-3]) {
 			case 'S':
 			case 'X':
 				return substr($table, 0, $len-2);
 			case 'I':
 				return substr($table, 0, $len-3) . 'y';
 			case 'H';
-				if($ut[$len-4] == 'C' || $ut[$len-4] == 'S')
+				if($ut[$len-4] == 'C' || $ut[$len-4] == 'S') {
 					return substr($table, 0, $len-2);
+				}
 			default:
 				return substr($table, 0, $len-1); // ?
 		}
@@ -296,8 +304,7 @@ class ADODB_Active_Record {
 		$ar->foreignKey = ($foreignKey) ? $foreignKey : strtolower(get_class($this)) . self::$_foreignSuffix;
 
 		$table =& $this->TableInfo();
-		if(!isset($table->_hasMany[$foreignRef]))
-		{
+		if(!isset($table->_hasMany[$foreignRef])) {
 			$table->_hasMany[$foreignRef] = $ar;
 			$table->updateColsCount();
 		}
@@ -322,8 +329,7 @@ class ADODB_Active_Record {
 		$ar->foreignKey = ($foreignKey) ? $foreignKey : $ar->foreignName . self::$_foreignSuffix;
 
 		$table =& $this->TableInfo();
-		if(!isset($table->_belongsTo[$foreignRef]))
-		{
+		if(!isset($table->_belongsTo[$foreignRef])) {
 			$table->_belongsTo[$foreignRef] = $ar;
 			$table->updateColsCount();
 		}
@@ -345,27 +351,35 @@ class ADODB_Active_Record {
 	function LoadRelations($name, $whereOrderBy, $offset=-1, $limit=-1)
 	{
 		$extras = array();
-		if($offset >= 0) $extras['offset'] = $offset;
-		if($limit >= 0) $extras['limit'] = $limit;
+		if($offset >= 0) {
+			$extras['offset'] = $offset;
+		}
+		if($limit >= 0) {
+			$extras['limit'] = $limit;
+		}
 		$table =& $this->TableInfo();
 
-		if (strlen($whereOrderBy))
-			if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy))
-				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy))
+		if (strlen($whereOrderBy)) {
+			if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy)) {
+				if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy)) {
 					$whereOrderBy = 'AND '.$whereOrderBy;
+				}
+			}
+		}
 
-		if(!empty($table->_belongsTo[$name]))
-		{
+		if(!empty($table->_belongsTo[$name])) {
 			$obj = $table->_belongsTo[$name];
 			$columnName = $obj->foreignKey;
-			if(empty($this->$columnName))
+			if(empty($this->$columnName)) {
 				$this->$name = null;
-			else
-			{
-				if(($k = reset($obj->TableInfo()->keys)))
+			}
+			else {
+				if(($k = reset($obj->TableInfo()->keys))) {
 					$belongsToId = $k;
-				else
+				}
+				else {
 					$belongsToId = 'id';
+				}
 
 				$arrayOfOne =
 					$obj->Find(
@@ -374,13 +388,14 @@ class ADODB_Active_Record {
 			}
 			return $this->$name;
 		}
-		if(!empty($table->_hasMany[$name]))
-		{
+		if(!empty($table->_hasMany[$name])) {
 			$obj = $table->_hasMany[$name];
-			if(($k = reset($table->keys)))
+			if(($k = reset($table->keys))) {
 				$hasManyId   = $k;
-			else
+			}
+			else {
 				$hasManyId   = 'id';
+			}
 
 			$this->$name =
 				$obj->Find(
@@ -405,10 +420,12 @@ class ADODB_Active_Record {
 
 			$tobj = $tables[$tableat];
 			foreach($tobj->flds as $name => $fld) {
-			if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value))
-				$this->$name = $fld->default_value;
-			else
-				$this->$name = null;
+				if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) {
+					$this->$name = $fld->default_value;
+				}
+				else {
+					$this->$name = null;
+				}
 			}
 			return;
 		}
@@ -426,7 +443,7 @@ class ADODB_Active_Record {
 				$activedb->tables[$table] = $acttab;
 
 				//if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname");
-			  	return;
+					return;
 			} else if ($db->debug) {
 				ADOConnection::outp("Refreshing cached active record file: $fname");
 			}
@@ -436,11 +453,15 @@ class ADODB_Active_Record {
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false);
+		if ($db->fetchMode !== false) {
+			$savem = $db->SetFetchMode(false);
+		}
 
 		$cols = $db->MetaColumns($table);
 
-		if (isset($savem)) $db->SetFetchMode($savem);
+		if (isset($savem)) {
+			$db->SetFetchMode($savem);
+		}
 		$ADODB_FETCH_MODE = $save;
 
 		if (!$cols) {
@@ -452,10 +473,13 @@ class ADODB_Active_Record {
 			if (isset($fld->primary_key)) {
 				$pkeys = array();
 				foreach($cols as $name => $fld) {
-					if (!empty($fld->primary_key)) $pkeys[] = $name;
+					if (!empty($fld->primary_key)) {
+						$pkeys[] = $name;
+					}
 				}
-			} else
+			} else {
 				$pkeys = $this->GetPrimaryKeys($db, $table);
+			}
 		}
 		if (empty($pkeys)) {
 			$this->Error("No primary key found for table $table",'UpdateActiveTable');
@@ -469,10 +493,12 @@ class ADODB_Active_Record {
 		case 0:
 			foreach($cols as $name => $fldobj) {
 				$name = strtolower($name);
-                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
-                    $this->$name = $fldobj->default_value;
-                else
+				if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
+					$this->$name = $fldobj->default_value;
+				}
+				else {
 					$this->$name = null;
+				}
 				$attr[$name] = $fldobj;
 			}
 			foreach($pkeys as $k => $name) {
@@ -484,10 +510,12 @@ class ADODB_Active_Record {
 			foreach($cols as $name => $fldobj) {
 				$name = strtoupper($name);
 
-                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
-                    $this->$name = $fldobj->default_value;
-                else
+				if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
+					$this->$name = $fldobj->default_value;
+				}
+				else {
 					$this->$name = null;
+				}
 				$attr[$name] = $fldobj;
 			}
 
@@ -499,10 +527,12 @@ class ADODB_Active_Record {
 			foreach($cols as $name => $fldobj) {
 				$name = ($fldobj->name);
 
-                if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value))
-                    $this->$name = $fldobj->default_value;
-                else
+				if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) {
+					$this->$name = $fldobj->default_value;
+				}
+				else {
 					$this->$name = null;
+				}
 				$attr[$name] = $fldobj;
 			}
 			foreach($pkeys as $k => $name) {
@@ -518,14 +548,18 @@ class ADODB_Active_Record {
 		if ($ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR) {
 			$activetab->_created = time();
 			$s = serialize($activetab);
-			if (!function_exists('adodb_write_file')) include(ADODB_DIR.'/adodb-csvlib.inc.php');
+			if (!function_exists('adodb_write_file')) {
+				include(ADODB_DIR.'/adodb-csvlib.inc.php');
+			}
 			adodb_write_file($fname,$s);
 		}
 		if (isset($activedb->tables[$table])) {
 			$oldtab = $activedb->tables[$table];
 
-			if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo;
-			if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany;
+			if ($oldtab) {
+				$activetab->_belongsTo = $oldtab->_belongsTo;
+				$activetab->_hasMany = $oldtab->_hasMany;
+			}
 		}
 		$activedb->tables[$table] = $activetab;
 	}
@@ -543,17 +577,26 @@ class ADODB_Active_Record {
 		$fn = get_class($this).'::'.$fn;
 		$this->_lasterr = $fn.': '.$err;
 
-		if ($this->_dbat < 0) $db = false;
+		if ($this->_dbat < 0) {
+			$db = false;
+		}
 		else {
 			$activedb = $_ADODB_ACTIVE_DBS[$this->_dbat];
 			$db = $activedb->db;
 		}
 
 		if (function_exists('adodb_throw')) {
-			if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
-			else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
-		} else
-			if (!$db || $db->debug) ADOConnection::outp($this->_lasterr);
+			if (!$db) {
+				adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false);
+			}
+			else {
+				adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db);
+			}
+		} else {
+			if (!$db || $db->debug) {
+				ADOConnection::outp($this->_lasterr);
+			}
+		}
 
 	}
 
@@ -561,18 +604,26 @@ class ADODB_Active_Record {
 	function ErrorMsg()
 	{
 		if (!function_exists('adodb_throw')) {
-			if ($this->_dbat < 0) $db = false;
-			else $db = $this->DB();
+			if ($this->_dbat < 0) {
+				$db = false;
+			}
+			else {
+				$db = $this->DB();
+			}
 
 			// last error could be database error too
-			if ($db && $db->ErrorMsg()) return $db->ErrorMsg();
+			if ($db && $db->ErrorMsg()) {
+				return $db->ErrorMsg();
+			}
 		}
 		return $this->_lasterr;
 	}
 
 	function ErrorNo()
 	{
-		if ($this->_dbat < 0) return -9999; // no database connection...
+		if ($this->_dbat < 0) {
+			return -9999; // no database connection...
+		}
 		$db = $this->DB();
 
 		return (int) $db->ErrorNo();
@@ -609,7 +660,10 @@ class ADODB_Active_Record {
 	// So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook
 	function Reload()
 	{
-		$db =& $this->DB(); if (!$db) return false;
+		$db =& $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$table =& $this->TableInfo();
 		$where = $this->GenWhere($db, $table);
 		return($this->Load($where));
@@ -634,67 +688,74 @@ class ADODB_Active_Record {
 		$sizeofFlds = sizeof($table->flds);
 		$sizeofRow  = sizeof($row);
 		if ($ACTIVE_RECORD_SAFETY && $table->_colsCount != $sizeofRow && $sizeofFlds != $sizeofRow) {
-            # <AP>
-            $bad_size = TRUE;
-	if($sizeofRow == 2 * $table->_colsCount || $sizeofRow == 2 * $sizeofFlds) {
-                // Only keep string keys
-                $keys = array_filter(array_keys($row), 'is_string');
-                if (sizeof($keys) == sizeof($table->flds))
-                    $bad_size = FALSE;
-            }
-            if ($bad_size) {
-			$this->Error("Table structure of $this->_table has changed","Load");
-			return false;
+			# <AP>
+			$bad_size = TRUE;
+			if($sizeofRow == 2 * $table->_colsCount || $sizeofRow == 2 * $sizeofFlds) {
+				// Only keep string keys
+				$keys = array_filter(array_keys($row), 'is_string');
+				if (sizeof($keys) == sizeof($table->flds)) {
+					$bad_size = FALSE;
+				}
+			}
+			if ($bad_size) {
+				$this->Error("Table structure of $this->_table has changed","Load");
+				return false;
+			}
+			# </AP>
 		}
-            # </AP>
+		else {
+			$keys = array_keys($row);
 		}
-        else
-		$keys = array_keys($row);
-        # <AP>
-        reset($keys);
-        $this->_original = array();
-		foreach($table->flds as $name=>$fld)
-		{
-            $value = $row[current($keys)];
+
+		# <AP>
+		reset($keys);
+		$this->_original = array();
+		foreach($table->flds as $name=>$fld) {
+			$value = $row[current($keys)];
 			$this->$name = $value;
-            $this->_original[] = $value;
-            if(!next($keys)) break;
+			$this->_original[] = $value;
+			if(!next($keys)) {
+				break;
+			}
 		}
 		$table =& $this->TableInfo();
-		foreach($table->_belongsTo as $foreignTable)
-		{
+		foreach($table->_belongsTo as $foreignTable) {
 			$ft = $foreignTable->TableInfo();
 			$propertyName = $ft->name;
-			foreach($ft->flds as $name=>$fld)
-			{
+			foreach($ft->flds as $name=>$fld) {
 				$value = $row[current($keys)];
 				$foreignTable->$name = $value;
 				$foreignTable->_original[] = $value;
-				if(!next($keys)) break;
+				if(!next($keys)) {
+					break;
+				}
 			}
 		}
-		foreach($table->_hasMany as $foreignTable)
-		{
+		foreach($table->_hasMany as $foreignTable) {
 			$ft = $foreignTable->TableInfo();
-			foreach($ft->flds as $name=>$fld)
-			{
+			foreach($ft->flds as $name=>$fld) {
 				$value = $row[current($keys)];
 				$foreignTable->$name = $value;
 				$foreignTable->_original[] = $value;
-				if(!next($keys)) break;
+				if(!next($keys)) {
+					break;
+				}
 			}
 		}
-        # </AP>
+		# </AP>
+
 		return true;
 	}
 
 	// get last inserted id for INSERT
 	function LastInsertID(&$db,$fieldname)
 	{
-		if ($db->hasInsertID)
+		if ($db->hasInsertID) {
 			$val = $db->Insert_ID($this->_table,$fieldname);
-		else
+		}
+		else {
 			$val = false;
+		}
 
 		if (is_null($val) || $val === false) {
 			// this might not work reliably in multi-user environment
@@ -709,14 +770,17 @@ class ADODB_Active_Record {
 		switch($t) {
 		case 'D':
 		case 'T':
-			if (empty($val)) return 'null';
-
+			if (empty($val)) {
+				return 'null';
+			}
 		case 'C':
 		case 'X':
-			if (is_null($val)) return 'null';
-
+			if (is_null($val)) {
+				return 'null';
+			}
 			if (strlen($val)>0 &&
-				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) {
+				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")
+			) {
 				return $db->qstr($val);
 				break;
 			}
@@ -746,26 +810,28 @@ class ADODB_Active_Record {
 
 	function Load($where=null,$bindarr=false)
 	{
-		$db = $this->DB(); if (!$db) return false;
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$this->_where = $where;
 
 		$save = $db->SetFetchMode(ADODB_FETCH_NUM);
 		$qry = "select * from ".$this->_table;
 		$table =& $this->TableInfo();
 
-		if(($k = reset($table->keys)))
+		if(($k = reset($table->keys))) {
 			$hasManyId   = $k;
-		else
+		}
+		else {
 			$hasManyId   = 'id';
+		}
 
-		foreach($table->_belongsTo as $foreignTable)
-		{
-			if(($k = reset($foreignTable->TableInfo()->keys)))
-			{
+		foreach($table->_belongsTo as $foreignTable) {
+			if(($k = reset($foreignTable->TableInfo()->keys))) {
 				$belongsToId = $k;
 			}
-			else
-			{
+			else {
 				$belongsToId = 'id';
 			}
 			$qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '.
@@ -778,96 +844,88 @@ class ADODB_Active_Record {
 				$this->_table.'.'.$hasManyId.'='.
 				$foreignTable->_table.'.'.$foreignTable->foreignKey;
 		}
-		if($where)
+		if($where) {
 			$qry .= ' WHERE '.$where;
+		}
 
 		// Simple case: no relations. Load row and return.
-		if((count($table->_hasMany) + count($table->_belongsTo)) < 1)
-		{
+		if((count($table->_hasMany) + count($table->_belongsTo)) < 1) {
 			$row = $db->GetRow($qry,$bindarr);
-			if(!$row)
+			if(!$row) {
 				return false;
+			}
 			$db->SetFetchMode($save);
 			return $this->Set($row);
 		}
 
 		// More complex case when relations have to be collated
 		$rows = $db->GetAll($qry,$bindarr);
-		if(!$rows)
+		if(!$rows) {
 			return false;
+		}
 		$db->SetFetchMode($save);
-		if(count($rows) < 1)
+		if(count($rows) < 1) {
 			return false;
+		}
 		$class = get_class($this);
 		$isFirstRow = true;
 
-		if(($k = reset($this->TableInfo()->keys)))
+		if(($k = reset($this->TableInfo()->keys))) {
 			$myId   = $k;
-		else
+		}
+		else {
 			$myId   = 'id';
+		}
 		$index = 0; $found = false;
 		/** @todo Improve by storing once and for all in table metadata */
 		/** @todo Also re-use info for hasManyId */
-		foreach($this->TableInfo()->flds as $fld)
-		{
-			if($fld->name == $myId)
-			{
+		foreach($this->TableInfo()->flds as $fld) {
+			if($fld->name == $myId) {
 				$found = true;
 				break;
 			}
 			$index++;
 		}
-		if(!$found)
+		if(!$found) {
 			$this->outp_throw("Unable to locate key $myId for $class in Load()",'Load');
+		}
 
-		foreach($rows as $row)
-		{
+		foreach($rows as $row) {
 			$rowId = intval($row[$index]);
-			if($rowId > 0)
-			{
-				if($isFirstRow)
-				{
+			if($rowId > 0) {
+				if($isFirstRow) {
 					$isFirstRow = false;
-					if(!$this->Set($row))
+					if(!$this->Set($row)) {
 						return false;
+					}
 				}
 				$obj = new $class($table,false,$db);
 				$obj->Set($row);
 				// TODO Copy/paste code below: bad!
-				if(count($table->_hasMany) > 0)
-				{
-					foreach($table->_hasMany as $foreignTable)
-					{
+				if(count($table->_hasMany) > 0) {
+					foreach($table->_hasMany as $foreignTable) {
 						$foreignName = $foreignTable->foreignName;
-						if(!empty($obj->$foreignName))
-						{
-							if(!is_array($this->$foreignName))
-							{
+						if(!empty($obj->$foreignName)) {
+							if(!is_array($this->$foreignName)) {
 								$foreignObj = $this->$foreignName;
 								$this->$foreignName = array(clone($foreignObj));
 							}
-							else
-							{
+							else {
 								$foreignObj = $obj->$foreignName;
 								array_push($this->$foreignName, clone($foreignObj));
 							}
 						}
 					}
 				}
-				if(count($table->_belongsTo) > 0)
-				{
-					foreach($table->_belongsTo as $foreignTable)
-					{
+				if(count($table->_belongsTo) > 0) {
+					foreach($table->_belongsTo as $foreignTable) {
 						$foreignName = $foreignTable->foreignName;
-						if(!empty($obj->$foreignName))
-						{
-							if(!is_array($this->$foreignName))
-							{
+						if(!empty($obj->$foreignName)) {
+							if(!is_array($this->$foreignName)) {
 								$foreignObj = $this->$foreignName;
 								$this->$foreignName = array(clone($foreignObj));
 							}
-							else
-							{
+							else {
 								$foreignObj = $obj->$foreignName;
 								array_push($this->$foreignName, clone($foreignObj));
 							}
@@ -882,8 +940,12 @@ class ADODB_Active_Record {
 	// false on error
 	function Save()
 	{
-		if ($this->_saved) $ok = $this->Update();
-		else $ok = $this->Insert();
+		if ($this->_saved) {
+			$ok = $this->Update();
+		}
+		else {
+			$ok = $this->Insert();
+		}
 
 		return $ok;
 	}
@@ -898,7 +960,10 @@ class ADODB_Active_Record {
 	// false on error
 	function Insert()
 	{
-		$db = $this->DB(); if (!$db) return false;
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$cnt = 0;
 		$table = $this->TableInfo();
 
@@ -948,7 +1013,10 @@ class ADODB_Active_Record {
 
 	function Delete()
 	{
-		$db = $this->DB(); if (!$db) return false;
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$table = $this->TableInfo();
 
 		$where = $this->GenWhere($db,$table);
@@ -961,7 +1029,10 @@ class ADODB_Active_Record {
 	// returns an array of active record objects
 	function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array())
 	{
-		$db = $this->DB(); if (!$db || empty($this->_table)) return false;
+		$db = $this->DB();
+		if (!$db || empty($this->_table)) {
+			return false;
+		}
 		$table =& $this->TableInfo();
 		$arr = $db->GetActiveRecordsClass(get_class($this),$this, $whereOrderBy,$bindarr,$pkeysArr,$extra,
 			array('foreignName'=>$this->foreignName, 'belongsTo'=>$table->_belongsTo, 'hasMany'=>$table->_hasMany));
@@ -974,7 +1045,10 @@ class ADODB_Active_Record {
 	// Shockingly because I want to preserve PHP4 compatibility.
 	function packageFind($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array())
 	{
-		$db = $this->DB(); if (!$db || empty($this->_table)) return false;
+		$db = $this->DB();
+		if (!$db || empty($this->_table)) {
+			return false;
+		}
 		$table =& $this->TableInfo();
 		$arr = $db->GetActiveRecordsClass(get_class($this),$this, $whereOrderBy,$bindarr,$pkeysArr,$extra,
 			array('foreignName'=>$this->foreignName, 'belongsTo'=>$table->_belongsTo, 'hasMany'=>$table->_hasMany));
@@ -986,7 +1060,10 @@ class ADODB_Active_Record {
 	{
 	global $ADODB_ASSOC_CASE;
 
-		$db = $this->DB(); if (!$db) return false;
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$table = $this->TableInfo();
 
 		$pkey = $table->keys;
@@ -996,7 +1073,9 @@ class ADODB_Active_Record {
 			/*
 			if (is_null($val)) {
 				if (isset($fld->not_null) && $fld->not_null) {
-					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
+					if (isset($fld->default_value) && strlen($fld->default_value)) {
+						continue;
+					}
 					else {
 						$this->Error("Cannot update null into $name","Replace");
 						return false;
@@ -1004,22 +1083,30 @@ class ADODB_Active_Record {
 				}
 			}*/
 			if (is_null($val) && !empty($fld->auto_increment)) {
-            	continue;
-            }
+				continue;
+			}
 			$t = $db->MetaType($fld->type);
 			$arr[$name] = $this->doquote($db,$val,$t);
 			$valarr[] = $val;
 		}
 
-		if (!is_array($pkey)) $pkey = array($pkey);
+		if (!is_array($pkey)) {
+			$pkey = array($pkey);
+		}
 
 
-		if ($ADODB_ASSOC_CASE == 0)
-			foreach($pkey as $k => $v)
-				$pkey[$k] = strtolower($v);
-		elseif ($ADODB_ASSOC_CASE == 1)
-			foreach($pkey as $k => $v)
-				$pkey[$k] = strtoupper($v);
+		switch ($ADODB_ASSOC_CASE == 0) {
+			case ADODB_ASSOC_CASE_LOWER:
+				foreach($pkey as $k => $v) {
+					$pkey[$k] = strtolower($v);
+				}
+				break;
+			case ADODB_ASSOC_CASE_UPPER:
+				foreach($pkey as $k => $v) {
+					$pkey[$k] = strtoupper($v);
+				}
+				break;
+		}
 
 		$ok = $db->Replace($this->_table,$arr,$pkey);
 		if ($ok) {
@@ -1046,7 +1133,10 @@ class ADODB_Active_Record {
 	// returns 0 on error, 1 on update, -1 if no change in data (no update)
 	function Update()
 	{
-		$db = $this->DB(); if (!$db) return false;
+		$db = $this->DB();
+		if (!$db) {
+			return false;
+		}
 		$table = $this->TableInfo();
 
 		$where = $this->GenWhere($db, $table);
@@ -1071,7 +1161,9 @@ class ADODB_Active_Record {
 
 			if (is_null($val)) {
 				if (isset($fld->not_null) && $fld->not_null) {
-					if (isset($fld->default_value) && strlen($fld->default_value)) continue;
+					if (isset($fld->default_value) && strlen($fld->default_value)) {
+						continue;
+					}
 					else {
 						$this->Error("Cannot set field $name to NULL","Update");
 						return false;
@@ -1088,7 +1180,9 @@ class ADODB_Active_Record {
 		}
 
 
-		if (!$cnt) return -1;
+		if (!$cnt) {
+			return -1;
+		}
 		$sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where;
 		$ok = $db->Execute($sql,$valarr);
 		if ($ok) {
@@ -1101,7 +1195,9 @@ class ADODB_Active_Record {
 	function GetAttributeNames()
 	{
 		$table = $this->TableInfo();
-		if (!$table) return false;
+		if (!$table) {
+			return false;
+		}
 		return array_keys($table->flds);
 	}
 
@@ -1112,43 +1208,41 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 {
 	global $_ADODB_ACTIVE_DBS;
 
-		if (empty($extra['loading'])) $extra['loading'] = ADODB_LAZY_AR;
-
+		if (empty($extra['loading'])) {
+			$extra['loading'] = ADODB_LAZY_AR;
+		}
 		$save = $db->SetFetchMode(ADODB_FETCH_NUM);
 		$table = &$tableObj->_table;
 		$tableInfo =& $tableObj->TableInfo();
-		if(($k = reset($tableInfo->keys)))
-			$myId   = $k;
-		else
-			$myId   = 'id';
+		if(($k = reset($tableInfo->keys))) {
+			$myId = $k;
+		}
+		else {
+			$myId = 'id';
+		}
 		$index = 0; $found = false;
 		/** @todo Improve by storing once and for all in table metadata */
 		/** @todo Also re-use info for hasManyId */
 		foreach($tableInfo->flds as $fld)
 		{
-			if($fld->name == $myId)
-			{
+			if($fld->name == $myId) {
 				$found = true;
 				break;
 			}
 			$index++;
 		}
-		if(!$found)
+		if(!$found) {
 			$db->outp_throw("Unable to locate key $myId for $class in GetActiveRecordsClass()",'GetActiveRecordsClass');
+		}
 
 		$qry = "select * from ".$table;
-		if(ADODB_JOIN_AR == $extra['loading'])
-		{
-			if(!empty($relations['belongsTo']))
-			{
-				foreach($relations['belongsTo'] as $foreignTable)
-				{
-					if(($k = reset($foreignTable->TableInfo()->keys)))
-					{
+		if(ADODB_JOIN_AR == $extra['loading']) {
+			if(!empty($relations['belongsTo'])) {
+				foreach($relations['belongsTo'] as $foreignTable) {
+					if(($k = reset($foreignTable->TableInfo()->keys))) {
 						$belongsToId = $k;
 					}
-					else
-					{
+					else {
 						$belongsToId = 'id';
 					}
 
@@ -1157,27 +1251,28 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 						$foreignTable->_table.'.'.$belongsToId;
 				}
 			}
-			if(!empty($relations['hasMany']))
-			{
-				if(empty($relations['foreignName']))
+			if(!empty($relations['hasMany'])) {
+				if(empty($relations['foreignName'])) {
 					$db->outp_throw("Missing foreignName is relation specification in GetActiveRecordsClass()",'GetActiveRecordsClass');
-				if(($k = reset($tableInfo->keys)))
+				}
+				if(($k = reset($tableInfo->keys))) {
 					$hasManyId   = $k;
-				else
+				}
+				else {
 					$hasManyId   = 'id';
+				}
 
-				foreach($relations['hasMany'] as $foreignTable)
-				{
+				foreach($relations['hasMany'] as $foreignTable) {
 					$qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '.
 						$table.'.'.$hasManyId.'='.
 						$foreignTable->_table.'.'.$foreignTable->foreignKey;
 				}
 			}
 		}
-		if (!empty($whereOrderBy))
+		if (!empty($whereOrderBy)) {
 			$qry .= ' WHERE '.$whereOrderBy;
-		if(isset($extra['limit']))
-		{
+		}
+		if(isset($extra['limit'])) {
 			$rows = false;
 			if(isset($extra['offset'])) {
 				$rs = $db->SelectLimit($qry, $extra['limit'], $extra['offset']);
@@ -1237,59 +1332,55 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 			// Note: to-many relationships mess around with the 'limit' parameter
 			$rowId = intval($row[$index]);
 
-			if(ADODB_WORK_AR == $extra['loading'])
-			{
+			if(ADODB_WORK_AR == $extra['loading']) {
 				$arrRef[$rowId] = $obj;
 				$arr[] = &$arrRef[$rowId];
-				if(!isset($indices))
+				if(!isset($indices)) {
 					$indices = $rowId;
-				else
+				}
+				else {
 					$indices .= ','.$rowId;
-				if(!empty($relations['belongsTo']))
-				{
-					foreach($relations['belongsTo'] as $foreignTable)
-					{
+				}
+				if(!empty($relations['belongsTo'])) {
+					foreach($relations['belongsTo'] as $foreignTable) {
 						$foreignTableRef = $foreignTable->foreignKey;
 						// First array: list of foreign ids we are looking for
-						if(empty($bTos[$foreignTableRef]))
+						if(empty($bTos[$foreignTableRef])) {
 							$bTos[$foreignTableRef] = array();
+						}
 						// Second array: list of ids found
-						if(empty($obj->$foreignTableRef))
+						if(empty($obj->$foreignTableRef)) {
 							continue;
-						if(empty($bTos[$foreignTableRef][$obj->$foreignTableRef]))
+						}
+						if(empty($bTos[$foreignTableRef][$obj->$foreignTableRef])) {
 							$bTos[$foreignTableRef][$obj->$foreignTableRef] = array();
+						}
 						$bTos[$foreignTableRef][$obj->$foreignTableRef][] = $obj;
 					}
 				}
 				continue;
 			}
 
-			if($rowId>0)
-			{
-				if(ADODB_JOIN_AR == $extra['loading'])
-				{
+			if($rowId>0) {
+				if(ADODB_JOIN_AR == $extra['loading']) {
 					$isNewObj = !isset($uniqArr['_'.$row[0]]);
-					if($isNewObj)
+					if($isNewObj) {
 						$uniqArr['_'.$row[0]] = $obj;
+					}
 
 					// TODO Copy/paste code below: bad!
-					if(!empty($relations['hasMany']))
-					{
-						foreach($relations['hasMany'] as $foreignTable)
-						{
+					if(!empty($relations['hasMany'])) {
+						foreach($relations['hasMany'] as $foreignTable) {
 							$foreignName = $foreignTable->foreignName;
-							if(!empty($obj->$foreignName))
-							{
+							if(!empty($obj->$foreignName)) {
 								$masterObj = &$uniqArr['_'.$row[0]];
 								// Assumption: this property exists in every object since they are instances of the same class
-								if(!is_array($masterObj->$foreignName))
-								{
+								if(!is_array($masterObj->$foreignName)) {
 									// Pluck!
 									$foreignObj = $masterObj->$foreignName;
 									$masterObj->$foreignName = array(clone($foreignObj));
 								}
-								else
-								{
+								else {
 									// Pluck pluck!
 									$foreignObj = $obj->$foreignName;
 									array_push($masterObj->$foreignName, clone($foreignObj));
@@ -1297,23 +1388,18 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 							}
 						}
 					}
-					if(!empty($relations['belongsTo']))
-					{
-						foreach($relations['belongsTo'] as $foreignTable)
-						{
+					if(!empty($relations['belongsTo'])) {
+						foreach($relations['belongsTo'] as $foreignTable) {
 							$foreignName = $foreignTable->foreignName;
-							if(!empty($obj->$foreignName))
-							{
+							if(!empty($obj->$foreignName)) {
 								$masterObj = &$uniqArr['_'.$row[0]];
 								// Assumption: this property exists in every object since they are instances of the same class
-								if(!is_array($masterObj->$foreignName))
-								{
+								if(!is_array($masterObj->$foreignName)) {
 									// Pluck!
 									$foreignObj = $masterObj->$foreignName;
 									$masterObj->$foreignName = array(clone($foreignObj));
 								}
-								else
-								{
+								else {
 									// Pluck pluck!
 									$foreignObj = $obj->$foreignName;
 									array_push($masterObj->$foreignName, clone($foreignObj));
@@ -1321,34 +1407,28 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 							}
 						}
 					}
-					if(!$isNewObj)
+					if(!$isNewObj) {
 						unset($obj); // We do not need this object itself anymore and do not want it re-added to the main array
+					}
 				}
-				else if(ADODB_LAZY_AR == $extra['loading'])
-				{
+				else if(ADODB_LAZY_AR == $extra['loading']) {
 					// Lazy loading: we need to give AdoDb a hint that we have not really loaded
 					// anything, all the while keeping enough information on what we wish to load.
 					// Let's do this by keeping the relevant info in our relationship arrays
 					// but get rid of the actual properties.
 					// We will then use PHP's __get to load these properties on-demand.
-					if(!empty($relations['hasMany']))
-					{
-						foreach($relations['hasMany'] as $foreignTable)
-						{
+					if(!empty($relations['hasMany'])) {
+						foreach($relations['hasMany'] as $foreignTable) {
 							$foreignName = $foreignTable->foreignName;
-							if(!empty($obj->$foreignName))
-							{
+							if(!empty($obj->$foreignName)) {
 								unset($obj->$foreignName);
 							}
 						}
 					}
-					if(!empty($relations['belongsTo']))
-					{
-						foreach($relations['belongsTo'] as $foreignTable)
-						{
+					if(!empty($relations['belongsTo'])) {
+						foreach($relations['belongsTo'] as $foreignTable) {
 							$foreignName = $foreignTable->foreignName;
-							if(!empty($obj->$foreignName))
-							{
+							if(!empty($obj->$foreignName)) {
 								unset($obj->$foreignName);
 							}
 						}
@@ -1356,47 +1436,42 @@ function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bind
 				}
 			}
 
-			if(isset($obj))
+			if(isset($obj)) {
 				$arr[] = $obj;
+			}
 		}
 
-		if(ADODB_WORK_AR == $extra['loading'])
-		{
+		if(ADODB_WORK_AR == $extra['loading']) {
 			// The best of both worlds?
 			// Here, the number of queries is constant: 1 + n*relationship.
 			// The second query will allow us to perform a good join
 			// while preserving LIMIT etc.
-			if(!empty($relations['hasMany']))
-			{
-				foreach($relations['hasMany'] as $foreignTable)
-				{
+			if(!empty($relations['hasMany'])) {
+				foreach($relations['hasMany'] as $foreignTable) {
 					$foreignName = $foreignTable->foreignName;
 					$className = ucfirst($foreignTable->_singularize($foreignName));
 					$obj = new $className();
 					$dbClassRef = $foreignTable->foreignKey;
 					$objs = $obj->packageFind($dbClassRef.' IN ('.$indices.')');
-					foreach($objs as $obj)
-					{
-						if(!is_array($arrRef[$obj->$dbClassRef]->$foreignName))
+					foreach($objs as $obj) {
+						if(!is_array($arrRef[$obj->$dbClassRef]->$foreignName)) {
 							$arrRef[$obj->$dbClassRef]->$foreignName = array();
+						}
 						array_push($arrRef[$obj->$dbClassRef]->$foreignName, $obj);
 					}
 				}
 
 			}
-			if(!empty($relations['belongsTo']))
-			{
-				foreach($relations['belongsTo'] as $foreignTable)
-				{
+			if(!empty($relations['belongsTo'])) {
+				foreach($relations['belongsTo'] as $foreignTable) {
 					$foreignTableRef = $foreignTable->foreignKey;
-					if(empty($bTos[$foreignTableRef]))
+					if(empty($bTos[$foreignTableRef])) {
 						continue;
-					if(($k = reset($foreignTable->TableInfo()->keys)))
-					{
+					}
+					if(($k = reset($foreignTable->TableInfo()->keys))) {
 						$belongsToId = $k;
 					}
-					else
-					{
+					else {
 						$belongsToId = 'id';
 					}
 					$origObjsArr = $bTos[$foreignTableRef];