EGroupware / egroupware

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 = '';
 	}
 	

phpgwapi/inc/class.accounts.inc.php

Doc Comments +4 added lines, -5 removed lines

@@ -360,7 +360,7 @@ 
 	 * All key of the returned array use the 'account_' prefix.
 	 * For backward compatibility some values are additionaly availible without the prefix, using them is depricated!
 	 *
-	 * @param int|string $id numeric account_id or string with account_lid (use of default value of 0 is depricated!!!)
+	 * @param integer $id numeric account_id or string with account_lid (use of default value of 0 is depricated!!!)
 	 * @param boolean $set_depricated_names =false set _additionaly_ the depricated keys without 'account_' prefix
 	 * @return array/boolean array with account data (keys: account_id, account_lid, ...) or false if account not found
 	 */
@@ -400,7 +400,7 @@ 
 	 * - 'account_firstname','account_lastname','account_email','account_fullname','account_phone'
 	 *
 	 * @param int|string $id
-	 * @return string|boolean json or false if not found
+	 * @return string json or false if not found
 	 */
 	function json($id)
 	{
@@ -791,7 +791,7 @@ 
 	 * Not all existing accounts are visible because off account_selection preference: 'none' or 'groupmembers'
 	 *
 	 * @param int|string $account_id nummeric account_id or account_lid
-	 * @return boolean true = account is visible, false = account not visible, null = account does not exist
+	 * @return null|boolean true = account is visible, false = account not visible, null = account does not exist
 	 */
 	function visible($account_id)
 	{
@@ -986,7 +986,6 @@ 
 	 *
 	 * @param string $account_lid
 	 * @param string $passwd
-	 * @param array $GLOBALS['auto_create_acct'] values for 'firstname', 'lastname', 'email' and 'primary_group'
 	 * @return int|boolean account_id or false on error
 	 */
 	function auto_add($account_lid, $passwd)
@@ -1106,7 +1105,7 @@ 
 	 *
 	 * We use now an instance-wide read-cache storing account-data and members(hips).
 	 *
-	 * @param int|array $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
+	 * @param integer $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
 	 */
 	static function cache_invalidate($account_ids=0)
 	{

Indentation +7 added lines, -7 removed lines

@@ -225,13 +225,13 @@
 	 * @param int $accountId
 	 * @deprecated
 	 */
-    function setAccountId($accountId)
-    {
-        if($accountId && is_numeric($accountId))
-        {
-            $this->account_id = (int)$accountId;
-        }
-    }
+	function setAccountId($accountId)
+	{
+		if($accountId && is_numeric($accountId))
+		{
+			$this->account_id = (int)$accountId;
+		}
+	}
 
 	/**
 	 * Searches / lists accounts: users and/or groups

Spacing +99 added lines, -100 removed lines

@@ -88,8 +88,8 @@ 
 	 *
 	 * @var array
 	 */
-	var $depricated_names = array('firstname','lastname','fullname','email','type',
-		'status','expires','lastlogin','lastloginfrom','lastpasswd_change');
+	var $depricated_names = array('firstname', 'lastname', 'fullname', 'email', 'type',
+		'status', 'expires', 'lastlogin', 'lastloginfrom', 'lastpasswd_change');
 
 	/**
 	 * List of all config vars accounts depend on and therefore should be passed in when calling contructor with array syntax
@@ -97,11 +97,11 @@ 
 	 * @var array
 	 */
 	static public $config_vars = array(
-		'account_repository', 'auth_type',	// auth_type if fallback if account_repository is not set
-		'install_id',	// instance-specific caching
-		'auto_create_expire', 'default_group_lid',	// auto-creation of accounts
-		'ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter',	// ldap backend
-		'ads_domain', 'ads_host', 'ads_admin_user', 'ads_admin_passwd', 'ads_connection', 'ads_context',	// ads backend
+		'account_repository', 'auth_type', // auth_type if fallback if account_repository is not set
+		'install_id', // instance-specific caching
+		'auto_create_expire', 'default_group_lid', // auto-creation of accounts
+		'ldap_host', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_group_context', 'ldap_search_filter', // ldap backend
+		'ads_domain', 'ads_host', 'ads_admin_user', 'ads_admin_passwd', 'ads_connection', 'ads_context', // ads backend
 	);
 
 	/**
@@ -166,23 +166,23 @@ 
 	 *
 	 * @param string|array $backend =null string with backend 'sql'|'ldap', or whole config array, default read from global egw_info
 	 */
-	public function __construct($backend=null)
+	public function __construct($backend = null)
 	{
 		if (is_numeric($backend))	// depricated use with account_id
 		{
-			if ((int)$backend) $this->account_id = (int) $backend;
+			if ((int)$backend) $this->account_id = (int)$backend;
 			$backend = null;
 		}
 		if (is_array($backend))
 		{
 			$this->config = $backend;
 			$backend = null;
-			self::$_instance = $this;	// also set instance returned by singleton
-			self::$cache = array();		// and empty our internal (session) cache
+			self::$_instance = $this; // also set instance returned by singleton
+			self::$cache = array(); // and empty our internal (session) cache
 		}
 		else
 		{
-			$this->config =& $GLOBALS['egw_info']['server'];
+			$this->config = & $GLOBALS['egw_info']['server'];
 
 			if (!isset(self::$_instance)) self::$_instance = $this;
 		}
@@ -212,9 +212,9 @@ 
 	 * @param int $account_id =0 depricated param to instanciate for the given account_id
 	 * @deprecated use __construct
 	 */
-	function accounts($account_id=0)
+	function accounts($account_id = 0)
 	{
-		$this->account_id = (int) $account_id;
+		$this->account_id = (int)$account_id;
 
 		$this->__construct();
 	}
@@ -227,7 +227,7 @@ 
 	 */
     function setAccountId($accountId)
     {
-        if($accountId && is_numeric($accountId))
+        if ($accountId && is_numeric($accountId))
         {
             $this->account_id = (int)$accountId;
         }
@@ -258,7 +258,7 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__.'('.array2string($param).') '.function_backtrace());
-		if (!isset($param['active'])) $param['active'] = true;	// default is true = only return active accounts
+		if (!isset($param['active'])) $param['active'] = true; // default is true = only return active accounts
 
 		self::setup_cache();
 		$account_search = &self::$cache['account_search'];
@@ -270,8 +270,8 @@ 
 		}
 		// no backend understands $param['app'], only sql understands type owngroups or groupmemember[+memberships]
 		// --> do an full search first and then filter and limit that search
-		elseif($param['app'] || $this->config['account_repository'] != 'sql' &&
-			in_array($param['type'], array('owngroups','groupmembers','groupmembers+memberships')))
+		elseif ($param['app'] || $this->config['account_repository'] != 'sql' &&
+			in_array($param['type'], array('owngroups', 'groupmembers', 'groupmembers+memberships')))
 		{
 			$app = $param['app'];
 			unset($param['app']);
@@ -283,15 +283,15 @@ 
 
 			if ($param['type'] == 'owngroups')
 			{
-				$members = $this->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+				$members = $this->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 				$param['type'] = 'groups';
 			}
-			elseif(in_array($param['type'],array('groupmembers','groupmembers+memberships')))
+			elseif (in_array($param['type'], array('groupmembers', 'groupmembers+memberships')))
 			{
 				$members = array();
-				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
+				foreach ((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp)
 				{
-					$members = array_unique(array_merge($members, (array)$this->members($grp,true,$param['active'])));
+					$members = array_unique(array_merge($members, (array)$this->members($grp, true, $param['active'])));
 					if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
 				}
 				$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
@@ -304,20 +304,20 @@ 
 			if ($app)
 			{
 				// we want the result merged, whatever it takes, as we only care for the ids
-				$valid = $this->split_accounts($app,!in_array($param['type'],array('accounts','groups')) ? 'merge' : $param['type'],$param['active']);
+				$valid = $this->split_accounts($app, !in_array($param['type'], array('accounts', 'groups')) ? 'merge' : $param['type'], $param['active']);
 			}
 			if (isset($members))
 			{
 				//error_log(__METHOD__.'() members='.array2string($members));
 				if (!$members) $members = array();
-				$valid = !$app ? $members : array_intersect($valid,$members);	// use the intersection
+				$valid = !$app ? $members : array_intersect($valid, $members); // use the intersection
 			}
 			//error_log(__METHOD__."() limiting result to app='$app' and/or group=$group valid-ids=".array2string($valid));
 			$n = 0;
 			$account_search[$serial]['data'] = array();
 			foreach ($full_search as $id => $data)
 			{
-				if (!in_array($id,$valid))
+				if (!in_array($id, $valid))
 				{
 					$this->total--;
 					continue;
@@ -337,7 +337,7 @@ 
 			$account_search[$serial]['data'] = $this->backend->search($param);
 			if ($param['type'] !== 'accounts')
 			{
-				foreach($account_search[$serial]['data'] as &$account)
+				foreach ($account_search[$serial]['data'] as &$account)
 				{
 					// add default description for Admins and Default group
 					if ($account['account_type'] === 'g' && empty($account['account_description']))
@@ -368,7 +368,7 @@ 
 		{
 			$options['filter'] = (array)$options['filter'];
 		}
-		switch($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
+		switch ($GLOBALS['egw_info']['user']['preferences']['common']['account_display'])
 		{
 			case 'firstname':
 			case 'firstall':
@@ -384,7 +384,7 @@ 
 		}
 		$only_own = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] === 'groupmembers' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
-		switch($options['account_type'])
+		switch ($options['account_type'])
 		{
 			case 'accounts':
 				$type = $only_own ? 'groupmembers' : 'accounts';
@@ -403,7 +403,7 @@ 
 				break;
 		}
 		$accounts = array();
-		foreach(self::getInstance()->search(array(
+		foreach (self::getInstance()->search(array(
 			'type' => $options['filter']['group'] < 0 ? $options['filter']['group'] : $type,
 			'query' => $pattern,
 			'query_type' => 'all',
@@ -411,7 +411,7 @@ 
 		)) as $account)
 		{
 			$accounts[$account['account_id']] = common::display_fullname($account['account_lid'],
-				$account['account_firstname'],$account['account_lastname'],$account['account_id']);
+				$account['account_firstname'], $account['account_lastname'], $account['account_id']);
 		}
 		return $accounts;
 	}
@@ -427,7 +427,7 @@ 
 	 * @param boolean $set_depricated_names =false set _additionaly_ the depricated keys without 'account_' prefix
 	 * @return array/boolean array with account data (keys: account_id, account_lid, ...) or false if account not found
 	 */
-	function read($id=0,$set_depricated_names=false)
+	function read($id = 0, $set_depricated_names = false)
 	{
 		if (!$id)	// deprecated use!!!
 		{
@@ -449,9 +449,9 @@ 
 
 		if ($set_depricated_names && $data)
 		{
-			foreach($this->depricated_names as $name)
+			foreach ($this->depricated_names as $name)
 			{
-				$data[$name] =& $data['account_'.$name];
+				$data[$name] = & $data['account_'.$name];
 			}
 		}
 		return $data;
@@ -468,8 +468,8 @@ 
 	function json($id)
 	{
 		static $keys = array(
-			'account_id','account_lid','person_id','account_status',
-			'account_firstname','account_lastname','account_email','account_fullname','account_phone',
+			'account_id', 'account_lid', 'person_id', 'account_status',
+			'account_firstname', 'account_lastname', 'account_email', 'account_fullname', 'account_phone',
 		);
 		if (($account = $this->read($id)))
 		{
@@ -478,9 +478,9 @@ 
 		// for current user, add the apps available to him
 		if ($id == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			foreach((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
+			foreach ((array)$GLOBALS['egw_info']['user']['apps'] as $app => $data)
 			{
-				unset($data['table_defs']);	// no need for that on the client
+				unset($data['table_defs']); // no need for that on the client
 				$account['apps'][$app] = $data;
 			}
 		}
@@ -494,7 +494,7 @@ 
 	 */
 	protected static function add_default_group_description(array &$data)
 	{
-		switch($data['account_lid'])
+		switch ($data['account_lid'])
 		{
 			case 'Default':
 				$data['account_description'] = lang('EGroupware all users group, do NOT delete');
@@ -517,15 +517,15 @@ 
 	 * @param boolean $check_depricated_names =false check _additionaly_ the depricated keys without 'account_' prefix
 	 * @return int|boolean the account_id or false on error
 	 */
-	function save(&$data,$check_depricated_names=false)
+	function save(&$data, $check_depricated_names = false)
 	{
 		if ($check_depricated_names)
 		{
-			foreach($this->depricated_names as $name)
+			foreach ($this->depricated_names as $name)
 			{
 				if (isset($data[$name]) && !isset($data['account_'.$name]))
 				{
-					$data['account_'.$name] =& $data[$name];
+					$data['account_'.$name] = & $data[$name];
 				}
 			}
 		}
@@ -538,7 +538,7 @@ 
 		{
 			// if we are not on a pure LDAP system, we have to write the account-date via the contacts class now
 			if (($this->config['account_repository'] == 'sql' || $this->config['contact_repository'] == 'sql-ldap') &&
-				(!($old = $this->read($data['account_id'])) ||	// only for new account or changed contact-data
+				(!($old = $this->read($data['account_id'])) || // only for new account or changed contact-data
 				$old['account_firstname'] != $data['account_firstname'] ||
 				$old['account_lastname'] != $data['account_lastname'] ||
 				$old['account_email'] != $data['account_email']))
@@ -553,14 +553,14 @@ 
 					'id'         => $data['person_id'],
 					'owner'      => 0,
 				);
-				$GLOBALS['egw']->contacts->save($contact,true);		// true = ignore addressbook acl
+				$GLOBALS['egw']->contacts->save($contact, true); // true = ignore addressbook acl
 			}
 			// save primary group if necessary
-			if ($data['account_primary_group'] && (!($memberships = $this->memberships($id,true)) ||
-				!in_array($data['account_primary_group'],$memberships)))
+			if ($data['account_primary_group'] && (!($memberships = $this->memberships($id, true)) ||
+				!in_array($data['account_primary_group'], $memberships)))
 			{
 				$memberships[] = $data['account_primary_group'];
-				$this->set_memberships($memberships, $id);	// invalidates cache for account_id and primary group
+				$this->set_memberships($memberships, $id); // invalidates cache for account_id and primary group
 			}
 		}
 		// as some backends set (group-)members in save, we need to invalidate their members too!
@@ -616,9 +616,9 @@ 
 	 * @param array $data =null array with account data, not specifying the account is depricated!!!
 	 * @return boolean true=expired (no more login possible), false otherwise
 	 */
-	function is_expired($data=null)
+	function is_expired($data = null)
 	{
-		if (is_null($data)) $data = $this->data;	// depricated use
+		if (is_null($data)) $data = $this->data; // depricated use
 
 		$expires = isset($data['account_expires']) ? $data['account_expires'] : $data['expires'];
 
@@ -652,10 +652,10 @@ 
 	 * @param string $account_type =null u = user or g = group, or default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($name,$which='account_lid',$account_type=null)
+	function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		// Don't bother searching for empty or non-scalar account_lid
-		if(empty($name) || !is_scalar($name))
+		if (empty($name) || !is_scalar($name))
 		{
 			return False;
 		}
@@ -663,12 +663,12 @@ 
 		self::setup_cache();
 		$name_list = &self::$cache['name_list'];
 
-		if(@isset($name_list[$which][$name]) && $name_list[$which][$name])
+		if (@isset($name_list[$which][$name]) && $name_list[$which][$name])
 		{
 			return $name_list[$which][$name];
 		}
 
-		return $name_list[$which][$name] = $this->backend->name2id($name,$which,$account_type);
+		return $name_list[$which][$name] = $this->backend->name2id($name, $which, $account_type);
 	}
 
 	/**
@@ -680,7 +680,7 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string|boolean converted value or false on error ($account_id not found)
 	 */
-	static function id2name($account_id, $which='account_lid')
+	static function id2name($account_id, $which = 'account_lid')
 	{
 		if (!is_numeric($account_id) && !($account_id = self::getInstance()->name2id($account_id)))
 		{
@@ -753,13 +753,13 @@ 
 				$account_lid != $GLOBALS['egw_info']['user']['account_lid'] ||
 			// only allow group-members for account-selection is groupmembers
 			$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
-				!array_intersect((array)$this->memberships($account_id,true),
-					(array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true))))
+				!array_intersect((array)$this->memberships($account_id, true),
+					(array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true))))
 		{
 			//error_log(__METHOD__."($account_id='$account_lid') returning FALSE");
-			return false;	// user is not allowed to see given account
+			return false; // user is not allowed to see given account
 		}
-		return true;	// user allowed to see given account
+		return true; // user allowed to see given account
 	}
 
 	/**
@@ -769,11 +769,11 @@ 
 	 * @param boolean $just_id =false return just account_id's or account_id => account_lid pairs
 	 * @return array with account_id's ($just_id) or account_id => account_lid pairs (!$just_id)
 	 */
-	function memberships($account_id, $just_id=false)
+	function memberships($account_id, $just_id = false)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
-			$account_id = $this->name2id($account_id,'account_lid','u');
+			$account_id = $this->name2id($account_id, 'account_lid', 'u');
 		}
 		if ($account_id && ($data = self::cache_read($account_id)))
 		{
@@ -789,7 +789,7 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id uidnumber
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		//echo "<p>accounts::set_memberships(".print_r($groups,true).",$account_id)</p>\n";
 		if (!is_int($account_id) && !is_numeric($account_id))
@@ -818,7 +818,7 @@ 
 	 * @param boolean $active =false true: return only active (not expired or deactived) members, false: return all accounts
 	 * @return array with account_id ($just_id) or account_id => account_lid pairs (!$just_id)
 	 */
-	function members($account_id, $just_id=false, $active=true)
+	function members($account_id, $just_id = false, $active = true)
 	{
 		if (!is_int($account_id) && !is_numeric($account_id))
 		{
@@ -839,7 +839,7 @@ 
 	 * @param array $members array with uidnumber or uid's
 	 * @param int $gid gidnumber of group to set
 	 */
-	function set_members($members,$gid)
+	function set_members($members, $gid)
 	{
 		//echo "<p>accounts::set_members(".print_r($members,true).",$gid)</p>\n";
 		if (($old_members = $this->members($gid, true, false)) != $members)
@@ -864,7 +864,7 @@ 
 	 * @param boolean $active =false true: return only active (not expired or deactived) members, false: return all accounts
 	 * @return array/boolean see $use, false on error (wront $use)
 	 */
-	function split_accounts($app_users,$use='both',$active=true)
+	function split_accounts($app_users, $use = 'both', $active = true)
 	{
 		if (!is_array($app_users))
 		{
@@ -875,21 +875,21 @@ 
 			{
 				return $cache;
 			}
-			$app_users = $GLOBALS['egw']->acl->get_ids_for_location('run',1,$app_users);
+			$app_users = $GLOBALS['egw']->acl->get_ids_for_location('run', 1, $app_users);
 		}
 		$accounts = array(
 			'accounts' => array(),
 			'groups' => array(),
 		);
-		foreach($app_users as $id)
+		foreach ($app_users as $id)
 		{
 			$type = $this->get_type($id);
-			if($type == 'g')
+			if ($type == 'g')
 			{
 				$accounts['groups'][$id] = $id;
 				if ($use != 'groups')
 				{
-					foreach((array)$this->members($id, true, $active) as $id)
+					foreach ((array)$this->members($id, true, $active) as $id)
 					{
 						$accounts['accounts'][$id] = $id;
 					}
@@ -911,7 +911,7 @@ 
 		}
 		//echo "<p>accounts::split_accounts(".print_r($app_users,True).",'$use') = <pre>".print_r($accounts,True)."</pre>\n";
 
-		switch($use)
+		switch ($use)
 		{
 			case 'both':
 				return $accounts;
@@ -920,7 +920,7 @@ 
 			case 'accounts':
 				return $accounts['accounts'];
 			case 'merge':
-				return array_merge($accounts['accounts'],$accounts['groups']);
+				return array_merge($accounts['accounts'], $accounts['groups']);
 		}
 		return False;
 	}
@@ -938,21 +938,20 @@ 
 	function auto_add($account_lid, $passwd)
 	{
 		$expires = !isset($this->config['auto_create_expire']) ||
-			$this->config['auto_create_expire'] == 'never' ? -1 :
-			time() + $this->config['auto_create_expire'] + 2;
+			$this->config['auto_create_expire'] == 'never' ? -1 : time() + $this->config['auto_create_expire'] + 2;
 
 		$memberships = array();
 		$default_group_id = null;
 		// check if we have a comma or semicolon delimited list of groups --> add first as primary and rest as memberships
-		foreach(preg_split('/[,;] */',$this->config['default_group_lid']) as $group_lid)
+		foreach (preg_split('/[,;] */', $this->config['default_group_lid']) as $group_lid)
 		{
-			if (($group_id = $this->name2id($group_lid,'account_lid','g')))
+			if (($group_id = $this->name2id($group_lid, 'account_lid', 'g')))
 			{
 				if (!$default_group_id) $default_group_id = $group_id;
 				$memberships[] = $group_id;
 			}
 		}
-		if (!$default_group_id && ($default_group_id = $this->name2id('Default','account_lid','g')))
+		if (!$default_group_id && ($default_group_id = $this->name2id('Default', 'account_lid', 'g')))
 		{
 			$memberships[] = $default_group_id;
 		}
@@ -989,25 +988,25 @@ 
 		// set memberships if given
 		if ($memberships)
 		{
-			$this->set_memberships($memberships,$data['account_id']);
+			$this->set_memberships($memberships, $data['account_id']);
 		}
 		// set the appropriate value for the can change password flag (assume users can, if the admin requires users to change their password)
 		$data['changepassword'] = (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'];
-		if(!$data['changepassword'])
+		if (!$data['changepassword'])
 		{
-			$GLOBALS['egw']->acl->add_repository('preferences','nopasswordchange',$data['account_id'],1);
+			$GLOBALS['egw']->acl->add_repository('preferences', 'nopasswordchange', $data['account_id'], 1);
 		}
 		else
 		{
-			$GLOBALS['egw']->acl->delete_repository('preferences','nopasswordchange',$data['account_id']);
+			$GLOBALS['egw']->acl->delete_repository('preferences', 'nopasswordchange', $data['account_id']);
 		}
 		// call hook to notify interested apps about the new account
 		$GLOBALS['hook_values'] = $data;
-		$GLOBALS['egw']->hooks->process($data+array(
+		$GLOBALS['egw']->hooks->process($data + array(
 			'location' => 'addaccount',
 			// at login-time only the hooks from the following apps will be called
-			'order' => array('felamimail','fudforum'),
-		),False,True);  // called for every app now, not only enabled ones
+			'order' => array('felamimail', 'fudforum'),
+		), False, True); // called for every app now, not only enabled ones
 		unset($data['changepassword']);
 
 		return $data['account_id'];
@@ -1054,14 +1053,14 @@ 
 	 *
 	 * @param int|array $account_ids user- or group-id(s) for which cache should be invalidated, default 0 = only search/name2id cache
 	 */
-	static function cache_invalidate($account_ids=0)
+	static function cache_invalidate($account_ids = 0)
 	{
 		//error_log(__METHOD__.'('.array2string($account_ids).')');
 
 		// instance-wide cache
 		if ($account_ids)
 		{
-			foreach((array)$account_ids as $account_id)
+			foreach ((array)$account_ids as $account_id)
 			{
 				$instance = self::getInstance();
 
@@ -1073,11 +1072,11 @@ 
 
 		// session-cache
 		if (self::$cache) self::$cache = array();
-		egw_cache::unsetSession('accounts_cache','phpgwapi');
+		egw_cache::unsetSession('accounts_cache', 'phpgwapi');
 
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
-			egw::invalidate_session_cache();	// invalidates whole egw-enviroment if stored in the session
+			egw::invalidate_session_cache(); // invalidates whole egw-enviroment if stored in the session
 		}
 	}
 
@@ -1101,11 +1100,11 @@ 
 	 * @return array
 	 * @throws egw_exception_wrong_parameter if no integer was passed as $account_id
 	 */
-	static function cache_read($account_id, $need_active=false)
+	static function cache_read($account_id, $need_active = false)
 	{
 		if (!is_numeric($account_id)) throw new egw_exception_wrong_parameter('Not an integer!');
 
-		$account =& self::$request_cache[$account_id];
+		$account = & self::$request_cache[$account_id];
 
 		if (!isset($account))	// not in request cache --> try instance cache
 		{
@@ -1136,7 +1135,7 @@ 
 		{
 			$instance = self::getInstance();
 			$account['members-active'] = array();
-			foreach((array)$account['members'] as $id => $lid)
+			foreach ((array)$account['members'] as $id => $lid)
 			{
 				if ($instance->is_active($id)) $account['members-active'][$id] = $lid;
 			}
@@ -1162,11 +1161,11 @@ 
 	 */
 	private static function setup_cache()
 	{
-		if (is_array(self::$cache)) return;	// cache is already setup
+		if (is_array(self::$cache)) return; // cache is already setup
 
 		if (self::$use_session_cache && is_object($GLOBALS['egw']->session))
 		{
-			self::$cache =& egw_cache::getSession('accounts_cache','phpgwapi');
+			self::$cache = & egw_cache::getSession('accounts_cache', 'phpgwapi');
 			//echo "<p>restoring cache from session, ".count(call_user_func_array('array_merge',(array)self::$cache))." items</p>\n";
 		}
 		//error_log(__METHOD__."() use_session_cache=".array2string(self::$use_session_cache).", is_array(self::\$cache)=".array2string(is_array(self::$cache)));
@@ -1200,7 +1199,7 @@ 
 	 */
 	function read_repository()
 	{
-		return $this->data = $this->account_id ? $this->read($this->account_id,true) : array();
+		return $this->data = $this->account_id ? $this->read($this->account_id, true) : array();
 	}
 
 	/**
@@ -1210,7 +1209,7 @@ 
 	 */
 	function save_repository()
 	{
-		$this->save($this->data,true);
+		$this->save($this->data, true);
 	}
 
 	/**
@@ -1218,7 +1217,7 @@ 
 	 *
 	 * @deprecated use search
 	 */
-	function get_list($_type='both',$start = null,$sort = '', $order = '', $query = '', $offset = null,$query_type='')
+	function get_list($_type = 'both', $start = null, $sort = '', $order = '', $query = '', $offset = null, $query_type = '')
 	{
 		if (is_array($_type))	// XML-RPC
 		{
@@ -1231,7 +1230,7 @@ 
 			'sort'       => $sort,
 			'query'      => $query,
 			'offset'     => $offset,
-			'query_type' => $query_type ,
+			'query_type' => $query_type,
 		)));
 	}
 
@@ -1243,9 +1242,9 @@ 
 	 * @param booelan $default_prefs =true has no meaning any more, as we use "real" default prefs since 1.0
 	 * @return int new nummeric account-id
 	 */
-	function create($account_info,$default_prefs=True)
+	function create($account_info, $default_prefs = True)
 	{
-		unset($default_prefs);	// not used, but required by function signature
+		unset($default_prefs); // not used, but required by function signature
 		return $this->save($account_info);
 	}
 
@@ -1278,7 +1277,7 @@ 
 			return $memberships;
 		}
 		$old = array();
-		foreach($memberships as $id => $lid)
+		foreach ($memberships as $id => $lid)
 		{
 			$old[] = array('account_id' => $id, 'account_name' => $lid);
 		}
@@ -1301,7 +1300,7 @@ 
 			return $members;
 		}
 		$old = array();
-		foreach($members as $uid => $lid)
+		foreach ($members as $uid => $lid)
 		{
 			$old[] = array('account_id' => $uid, 'account_name' => $lid);
 		}
@@ -1335,7 +1334,7 @@ 
 	 * @param string &$lname on return: last name
 	 * @return boolean true if $accountid was found, false otherwise
 	 */
-	function get_account_name($accountid,&$lid,&$fname,&$lname)
+	function get_account_name($accountid, &$lid, &$fname, &$lname)
 	{
 		if (!($data = $this->read($accountid))) return false;
 

Braces +125 added lines, -31 removed lines

@@ -168,9 +168,12 @@ 
 	 */
 	public function __construct($backend=null)
 	{
-		if (is_numeric($backend))	// depricated use with account_id
+		if (is_numeric($backend))
+		{
+			// depricated use with account_id
 		{
 			if ((int)$backend) $this->account_id = (int) $backend;
+		}
 			$backend = null;
 		}
 		if (is_array($backend))
@@ -184,7 +187,10 @@ 
 		{
 			$this->config =& $GLOBALS['egw_info']['server'];
 
-			if (!isset(self::$_instance)) self::$_instance = $this;
+			if (!isset(self::$_instance))
+			{
+				self::$_instance = $this;
+			}
 		}
 		if (is_null($backend))
 		{
@@ -258,7 +264,11 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__.'('.array2string($param).') '.function_backtrace());
-		if (!isset($param['active'])) $param['active'] = true;	// default is true = only return active accounts
+		if (!isset($param['active']))
+		{
+			$param['active'] = true;
+		}
+		// default is true = only return active accounts
 
 		self::setup_cache();
 		$account_search = &self::$cache['account_search'];
@@ -292,7 +302,10 @@ 
 				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
 				{
 					$members = array_unique(array_merge($members, (array)$this->members($grp,true,$param['active'])));
-					if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
+					if ($param['type'] == 'groupmembers+memberships')
+					{
+						$members[] = $grp;
+					}
 				}
 				$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
 			}
@@ -309,7 +322,10 @@ 
 			if (isset($members))
 			{
 				//error_log(__METHOD__.'() members='.array2string($members));
-				if (!$members) $members = array();
+				if (!$members)
+				{
+					$members = array();
+				}
 				$valid = !$app ? $members : array_intersect($valid,$members);	// use the intersection
 			}
 			//error_log(__METHOD__."() limiting result to app='$app' and/or group=$group valid-ids=".array2string($valid));
@@ -429,15 +445,21 @@ 
 	 */
 	function read($id=0,$set_depricated_names=false)
 	{
-		if (!$id)	// deprecated use!!!
+		if (!$id)
+		{
+			// deprecated use!!!
 		{
 			return $this->data ? $this->data : $this->read_repository();
 		}
+		}
 		if (!is_int($id) && !is_numeric($id))
 		{
 			$id = $this->name2id($id);
 		}
-		if (!$id) return false;
+		if (!$id)
+		{
+			return false;
+		}
 
 		$data = self::cache_read($id);
 
@@ -543,7 +565,10 @@ 
 				$old['account_lastname'] != $data['account_lastname'] ||
 				$old['account_email'] != $data['account_email']))
 			{
-				if (!$data['person_id']) $data['person_id'] = $old['person_id'];
+				if (!$data['person_id'])
+				{
+					$data['person_id'] = $old['person_id'];
+				}
 
 				$contact = array(
 					'n_given'    => $data['account_firstname'],
@@ -583,7 +608,10 @@ 
 		{
 			$id = $this->name2id($id);
 		}
-		if (!$id) return false;
+		if (!$id)
+		{
+			return false;
+		}
 
 		if ($this->get_type($id) == 'u')
 		{
@@ -618,7 +646,11 @@ 
 	 */
 	function is_expired($data=null)
 	{
-		if (is_null($data)) $data = $this->data;	// depricated use
+		if (is_null($data))
+		{
+			$data = $this->data;
+		}
+		// depricated use
 
 		$expires = isset($data['account_expires']) ? $data['account_expires'] : $data['expires'];
 
@@ -635,7 +667,10 @@ 
 	 */
 	function is_active($data)
 	{
-		if (!is_array($data)) $data = $this->read($data);
+		if (!is_array($data))
+		{
+			$data = $this->read($data);
+		}
 
 		return $data && !(self::is_expired($data) || $data['account_status'] != 'A');
 	}
@@ -687,7 +722,10 @@ 
 			return false;
 		}
 		try {
-			if (!($data = self::cache_read($account_id))) return false;
+			if (!($data = self::cache_read($account_id)))
+			{
+				return false;
+			}
 		}
 		catch (Exception $e) {
 			unset($e);
@@ -738,14 +776,23 @@ 
 	 */
 	function visible($account_id)
 	{
-		if (!is_numeric($account_id))	// account_lid given
+		if (!is_numeric($account_id))
+		{
+			// account_lid given
 		{
 			$account_lid = $account_id;
-			if (!($account_id = $this->name2id($account_lid))) return null;
+		}
+			if (!($account_id = $this->name2id($account_lid)))
+			{
+				return null;
+			}
 		}
 		else
 		{
-			if (!($account_lid = $this->id2name($account_id))) return null;
+			if (!($account_lid = $this->id2name($account_id)))
+			{
+				return null;
+			}
 		}
 		if (!isset($GLOBALS['egw_info']['user']['apps']['admin']) &&
 			// do NOT allow other user, if account-selection is none
@@ -800,7 +847,10 @@ 
 		{
 			$this->backend->set_memberships($groups, $account_id);
 
-			if (!$old_memberships) $old_memberships = array();
+			if (!$old_memberships)
+			{
+				$old_memberships = array();
+			}
 			self::cache_invalidate(array_unique(array_merge(
 				array($account_id),
 				array_diff($old_memberships, $groups),
@@ -948,7 +998,10 @@ 
 		{
 			if (($group_id = $this->name2id($group_lid,'account_lid','g')))
 			{
-				if (!$default_group_id) $default_group_id = $group_id;
+				if (!$default_group_id)
+				{
+					$default_group_id = $group_id;
+				}
 				$memberships[] = $group_id;
 			}
 		}
@@ -1033,7 +1086,10 @@ 
 	function change_account_lid_allowed()
 	{
 		$change_account_lid = constant(get_class($this->backend).'::CHANGE_ACCOUNT_LID');
-		if (!isset($change_account_lid)) $change_account_lid = true;
+		if (!isset($change_account_lid))
+		{
+			$change_account_lid = true;
+		}
 		return $change_account_lid;
 	}
 
@@ -1072,12 +1128,19 @@ 
 		}
 
 		// session-cache
-		if (self::$cache) self::$cache = array();
+		if (self::$cache)
+		{
+			self::$cache = array();
+		}
 		egw_cache::unsetSession('accounts_cache','phpgwapi');
 
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
 		{
-			egw::invalidate_session_cache();	// invalidates whole egw-enviroment if stored in the session
+			// egw object in setup is limited
+		{
+			egw::invalidate_session_cache();
+		}
+		// invalidates whole egw-enviroment if stored in the session
 		}
 	}
 
@@ -1103,27 +1166,39 @@ 
 	 */
 	static function cache_read($account_id, $need_active=false)
 	{
-		if (!is_numeric($account_id)) throw new egw_exception_wrong_parameter('Not an integer!');
+		if (!is_numeric($account_id))
+		{
+			throw new egw_exception_wrong_parameter('Not an integer!');
+		}
 
 		$account =& self::$request_cache[$account_id];
 
-		if (!isset($account))	// not in request cache --> try instance cache
+		if (!isset($account))
+		{
+			// not in request cache --> try instance cache
 		{
 			$instance = self::getInstance();
+		}
 
 			$account = egw_cache::getCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id);
 
-			if (!isset($account))	// not in instance cache --> read from backend
+			if (!isset($account))
+			{
+				// not in instance cache --> read from backend
 			{
 				if (($account = $instance->backend->read($account_id)))
 				{
 					if ($instance->get_type($account_id) == 'u')
 					{
 						if (!isset($account['memberships'])) $account['memberships'] = $instance->backend->memberships($account_id);
+			}
 					}
 					else
 					{
-						if (!isset($account['members'])) $account['members'] = $instance->backend->members($account_id);
+						if (!isset($account['members']))
+						{
+							$account['members'] = $instance->backend->members($account_id);
+						}
 					}
 					egw_cache::setCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id, $account, self::READ_CACHE_TIMEOUT);
 				}
@@ -1138,7 +1213,10 @@ 
 			$account['members-active'] = array();
 			foreach((array)$account['members'] as $id => $lid)
 			{
-				if ($instance->is_active($id)) $account['members-active'][$id] = $lid;
+				if ($instance->is_active($id))
+				{
+					$account['members-active'][$id] = $lid;
+				}
 			}
 			egw_cache::setCache($instance->config['install_id'], __CLASS__, 'account-'.$account_id, $account, self::READ_CACHE_TIMEOUT);
 		}
@@ -1162,7 +1240,11 @@ 
 	 */
 	private static function setup_cache()
 	{
-		if (is_array(self::$cache)) return;	// cache is already setup
+		if (is_array(self::$cache))
+		{
+			return;
+		}
+		// cache is already setup
 
 		if (self::$use_session_cache && is_object($GLOBALS['egw']->session))
 		{
@@ -1220,10 +1302,13 @@ 
 	 */
 	function get_list($_type='both',$start = null,$sort = '', $order = '', $query = '', $offset = null,$query_type='')
 	{
-		if (is_array($_type))	// XML-RPC
+		if (is_array($_type))
+		{
+			// XML-RPC
 		{
 			return array_values($this->search($_type));
 		}
+		}
 		return array_values($this->search(array(
 			'type'       => $_type,
 			'start'      => $start,
@@ -1337,14 +1422,23 @@ 
 	 */
 	function get_account_name($accountid,&$lid,&$fname,&$lname)
 	{
-		if (!($data = $this->read($accountid))) return false;
+		if (!($data = $this->read($accountid)))
+		{
+			return false;
+		}
 
 		$lid   = $data['account_lid'];
 		$fname = $data['account_firstname'];
 		$lname = $data['account_lastname'];
 
-		if (empty($fname)) $fname = $lid;
-		if (empty($lname)) $lname = $this->get_type($accountid) == 'g' ? lang('Group') : lang('user');
+		if (empty($fname))
+		{
+			$fname = $lid;
+		}
+		if (empty($lname))
+		{
+			$lname = $this->get_type($accountid) == 'g' ? lang('Group') : lang('user');
+		}
 
 		return true;
 	}

phpgwapi/inc/class.accounts_ads.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -129,7 +129,7 @@ 
 	/**
 	 * Factory method and singelton to get adLDAP object for given configuration or default server config
 	 *
-	 * @param array $config=null values for keys 'ads_domain', 'ads_host' (required) and optional 'ads_admin_user', 'ads_admin_passwd', 'ads_connection'
+	 * @param array $config values for keys 'ads_domain', 'ads_host' (required) and optional 'ads_admin_user', 'ads_admin_passwd', 'ads_connection'
 	 * @return adLDAP
 	 * @throws adLDAPException
 	 */
@@ -1138,7 +1138,7 @@ 
 	 *
 	 * @param int $_account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return boolean lastlogin time
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
@@ -1335,7 +1335,7 @@ 
 	 * - activate user
 	 *
 	 * @param array $attributes The attributes to set to the user account
-	 * @return bool
+	 * @return string|boolean
 	 */
 	public function create($attributes)
 	{
@@ -1525,7 +1525,7 @@ 
     * @param string $username The username to query
     * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
     * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return bool
+    * @return string|boolean
     */
     public function modify($username, $attributes, $isGUID = false)
     {
@@ -1590,7 +1590,7 @@ 
 	 * Extended to allow to specify $attribute["container"] as string, because array hardcodes "OU=", while Samba4 and win2008r2 uses "CN=Users"
 	 *
 	 * @param array $attributes Default attributes of the group
-	 * @return bool
+	 * @return string|boolean
 	 */
 	public function create($attributes)
 	{

Indentation +174 added lines, -174 removed lines

@@ -803,11 +803,11 @@ 
 	}
 
 	/**
-	* Add seconds between 1601-01-01 and 1970-01-01 and multiply by 10000000
-	*
-	* @param long $unixTime
-	* @return long windowsTime
-	*/
+	 * Add seconds between 1601-01-01 and 1970-01-01 and multiply by 10000000
+	 *
+	 * @param long $unixTime
+	 * @return long windowsTime
+	 */
 	public static function convertUnixTimeToWindowsTime($unixTime)
 	{
 		return ($unixTime + 11644477200) * 10000000;
@@ -1260,10 +1260,10 @@ 
 	}
 
 	/**
-    * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
-    *
-    * Extended to use mbstring to convert from arbitrary charset to utf-8
-	*/
+	 * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
+	 *
+	 * Extended to use mbstring to convert from arbitrary charset to utf-8
+	 */
 	protected function encode8Bit(&$item, $key)
 	{
 		if ($this->charset != 'utf-8' && $key != 'password')
@@ -1291,29 +1291,29 @@ 
 		return $this->userClass;
 	}
 
-    /**
-    * Get the group class interface
-    *
-    * @return adLDAPGroups
-    */
-    public function group() {
-        if (!$this->groupClass) {
-            $this->groupClass = new adLDAPGroups_egw($this);
-        }
-        return $this->groupClass;
-    }
-
-    /**
-    * Get the utils class interface
-    *
-    * @return adLDAPUtils
-    */
-    public function utilities() {
-        if (!$this->utilClass) {
-            $this->utilClass = new adLDAPUtils_egw($this);
-        }
-        return $this->utilClass;
-    }
+	/**
+	 * Get the group class interface
+	 *
+	 * @return adLDAPGroups
+	 */
+	public function group() {
+		if (!$this->groupClass) {
+			$this->groupClass = new adLDAPGroups_egw($this);
+		}
+		return $this->groupClass;
+	}
+
+	/**
+	 * Get the utils class interface
+	 *
+	 * @return adLDAPUtils
+	 */
+	public function utilities() {
+		if (!$this->utilClass) {
+			$this->utilClass = new adLDAPUtils_egw($this);
+		}
+		return $this->utilClass;
+	}
 }
 
 /**
@@ -1402,45 +1402,45 @@ 
 		return true;
 	}
 
-    /**
-    * Encode a password for transmission over LDAP
-    *
-    * Extended to use mbstring to convert from arbitrary charset to UTF-16LE
-    *
-    * @param string $password The password to encode
-    * @return string
-    */
-    public function encodePassword($password)
-    {
-        $password="\"".$password."\"";
-        if (function_exists('mb_convert_encoding'))
-        {
-            return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
-        }
-        $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
-        return $encoded;
-    }
-
-    /**
-     * Set a password
-     *
-     * Requires "Reset password" priviledges from bind user!
-     *
+	/**
+	 * Encode a password for transmission over LDAP
+	 *
+	 * Extended to use mbstring to convert from arbitrary charset to UTF-16LE
+	 *
+	 * @param string $password The password to encode
+	 * @return string
+	 */
+	public function encodePassword($password)
+	{
+		$password="\"".$password."\"";
+		if (function_exists('mb_convert_encoding'))
+		{
+			return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
+		}
+		$encoded="";
+		for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+		return $encoded;
+	}
+
+	/**
+	 * Set a password
+	 *
+	 * Requires "Reset password" priviledges from bind user!
+	 *
 	 * We can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2!
 	 *
-     * @param string $dn
-     * @param string $password
-     * @return boolean
-     */
-    public function setPassword($dn, $password)
-    {
-    	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
-    		'unicodePwd' => $this->encodePassword($password),
-    	));
-    	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
-    	return $result;
-    }
+	 * @param string $dn
+	 * @param string $password
+	 * @return boolean
+	 */
+	public function setPassword($dn, $password)
+	{
+		$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
+			'unicodePwd' => $this->encodePassword($password),
+		));
+		if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+		return $result;
+	}
 
 	/**
 	 * Check if we can to a real password change, not just a password reset
@@ -1454,30 +1454,30 @@ 
 		return function_exists('ldap_modify_batch');
 	}
 
-    /**
-    * Set the password of a user - This must be performed over SSL
-    *
-    * @param string $username The username to modify
-    * @param string $password The new password
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-	* @param string $old_password old password for password change, if supported
-    * @return bool
-    */
-    public function password($username, $password, $isGUID = false, $old_password=null)
-    {
-        if ($username === NULL) { return false; }
-        if ($password === NULL) { return false; }
-        if (!$this->adldap->getLdapBind()) { return false; }
-        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
-            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
-        }
-
-        $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
-            return false;
-        }
-
-        $add=array();
+	/**
+	 * Set the password of a user - This must be performed over SSL
+	 *
+	 * @param string $username The username to modify
+	 * @param string $password The new password
+	 * @param bool $isGUID Is the username passed a GUID or a samAccountName
+	 * @param string $old_password old password for password change, if supported
+	 * @return bool
+	 */
+	public function password($username, $password, $isGUID = false, $old_password=null)
+	{
+		if ($username === NULL) { return false; }
+		if ($password === NULL) { return false; }
+		if (!$this->adldap->getLdapBind()) { return false; }
+		if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+		}
+
+		$userDn = $this->dn($username, $isGUID);
+		if ($userDn === false) {
+			return false;
+		}
+
+		$add=array();
 
 		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
 			$add["unicodePwd"][0] = $this->encodePassword($password);
@@ -1499,76 +1499,76 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
-            $err = ldap_errno($this->adldap->getLdapConnection());
-            if ($err) {
-                $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
-                    $msg .= ' Your password might not match the password policy.';
-                }
-                throw new adLDAPException($msg);
-            }
-            else {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-    * Modify a user
-    *
-    * @param string $username The username to query
-    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return bool
-    */
-    public function modify($username, $attributes, $isGUID = false)
-    {
-        if ($username === NULL) { return "Missing compulsory field [username]"; }
-        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
-            throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
-        }
-
-        // Find the dn of the user
-        $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
-            return false;
-        }
-
-        // Translate the update to the LDAP schema
-        $mod = $this->adldap->adldap_schema($attributes);
-
-        // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
-            return false;
-        }
-
-        // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
-                $controlOptions = array("NORMAL_ACCOUNT");
-            }
-            else {
-                $controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
-            }
-            $mod["userAccountControl"][0] = $this->accountControl($controlOptions);
-        }
+		if ($result === false){
+			$err = ldap_errno($this->adldap->getLdapConnection());
+			if ($err) {
+				$msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
+				if($err == 53) {
+					$msg .= ' Your password might not match the password policy.';
+				}
+				throw new adLDAPException($msg);
+			}
+			else {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Modify a user
+	 *
+	 * @param string $username The username to query
+	 * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+	 * @param bool $isGUID Is the username passed a GUID or a samAccountName
+	 * @return bool
+	 */
+	public function modify($username, $attributes, $isGUID = false)
+	{
+		if ($username === NULL) { return "Missing compulsory field [username]"; }
+		if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+			throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
+		}
+
+		// Find the dn of the user
+		$userDn = $this->dn($username, $isGUID);
+		if ($userDn === false) {
+			return false;
+		}
+
+		// Translate the update to the LDAP schema
+		$mod = $this->adldap->adldap_schema($attributes);
+
+		// Check to see if this is an enabled status update
+		if (!$mod && !array_key_exists("enabled", $attributes)){
+			return false;
+		}
+
+		// Set the account control attribute (only if specified)
+		if (array_key_exists("enabled", $attributes)){
+			if ($attributes["enabled"]){
+				$controlOptions = array("NORMAL_ACCOUNT");
+			}
+			else {
+				$controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
+			}
+			$mod["userAccountControl"][0] = $this->accountControl($controlOptions);
+		}
 		// we can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2
 		unset($mod['unicodePwd']);
 
 		if ($mod)
 		{
-	        // Do the update
-	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
-	        if ($result == false) {
+			// Do the update
+			$result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
+			if ($result == false) {
 				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
-	        	return false;
-	        }
+				return false;
+			}
 		}
-        if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
+		if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
 		{
 			return false;
 		}
@@ -1633,23 +1633,23 @@ 
 		return $this->adldap->encode8bit($item, $key);
 	}
 
-    /**
-    * Escape strings for the use in LDAP filters
-    *
-    * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
-    * Ported from Perl's Net::LDAP::Util escape_filter_value
-    *
-    * @param string $str The string the parse
-    * @author Port by Andreas Gohr <andi@splitbrain.org>
-    * @return string
-    */
-    public function ldapSlashes($str){
-        return preg_replace_callback(
-      		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
-            	return "\\".join("", unpack("H2", $matches[1]));
-        	},
-        	$str
-    	);
-    }
+	/**
+	 * Escape strings for the use in LDAP filters
+	 *
+	 * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
+	 * Ported from Perl's Net::LDAP::Util escape_filter_value
+	 *
+	 * @param string $str The string the parse
+	 * @author Port by Andreas Gohr <andi@splitbrain.org>
+	 * @return string
+	 */
+	public function ldapSlashes($str){
+		return preg_replace_callback(
+	  		'/([\x00-\x1F\*\(\)\\\\])/',
+			function ($matches) {
+				return "\\".join("", unpack("H2", $matches[1]));
+			},
+			$str
+		);
+	}
 }

Spacing +113 added lines, -122 removed lines

@@ -129,10 +129,10 @@ 
 	 * @return adLDAP
 	 * @throws adLDAPException
 	 */
-	public static function get_adldap(array &$config=null)
+	public static function get_adldap(array &$config = null)
 	{
 		static $adldap = array();
-		if (!$config) $config =& $GLOBALS['egw_info']['server'];
+		if (!$config) $config = & $GLOBALS['egw_info']['server'];
 
 		if (!isset($adldap[$config['ads_domain']]))
 		{
@@ -140,7 +140,7 @@ 
 			if (empty($config['ads_domain'])) throw new Exception("Required ADS domain missing!");
 
 			$base_dn_parts = array();
-			foreach(explode('.', $config['ads_domain']) as $dc)
+			foreach (explode('.', $config['ads_domain']) as $dc)
 			{
 				$base_dn_parts[] = 'DC='.$dc;
 			}
@@ -168,7 +168,7 @@ 
 	 * @param int $account_id
 	 * @return string|NULL
 	 */
-	protected function get_sid($account_id=null)
+	protected function get_sid($account_id = null)
 	{
 		static $domain_sid = null;
 		if (!isset($domain_sid))
@@ -203,14 +203,14 @@ 
 	 * @param boolean $set_if_empty =false true set from DN of "Domain Users" group #
 	 * @return string
 	 */
-	public function ads_context($set_if_empty=false)
+	public function ads_context($set_if_empty = false)
 	{
 		if (empty($this->frontend->config[self::ADS_CONTEXT]))
 		{
 			if ($set_if_empty && ($dn = $this->id2name(-self::DOMAIN_USERS_GROUP, 'account_dn')))
 			{
 				$dn = preg_replace('/^CN=.*?,(CN|OU)=/i', '$1=', $dn);
-				config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT]=$dn, 'phpgwapi');
+				config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT] = $dn, 'phpgwapi');
 			}
 			else
 			{
@@ -247,7 +247,7 @@ 
 	 * @param boolean $reconnect =false true: reconnect even if already connected
 	 * @return resource
 	 */
-	public function ldap_connection($reconnect=false)
+	public function ldap_connection($reconnect = false)
 	{
 		if (($reconnect || !($ds = $this->adldap->getLdapConnection())) &&
 			// call connect, thought I dont know how it can be not connected ...
@@ -411,8 +411,7 @@ 
 		$data = translation::convert($_data, 'utf-8');
 
 		// no need to calculate sid, if already calculated
-		$sid = is_string($data['objectsid']) ? $data['objectsid'] :
-			$this->adldap->utilities()->getTextSID($data['objectsid'][0]);
+		$sid = is_string($data['objectsid']) ? $data['objectsid'] : $this->adldap->utilities()->getTextSID($data['objectsid'][0]);
 		$account_id = -self::sid2account_id($sid);
 
 		$group = array(
@@ -426,10 +425,8 @@ 
 			'account_lastname'  => lang('Group'),
 			'account_fullname'  => lang('Group').' '.$data['samaccountname'][0],
 			'account_email'     => $data['mail'][0],
-			'account_created'   => !isset($data['whencreated'][0]) ? null :
-				self::_when2ts($data['whencreated'][0]),
-			'account_modified'  => !isset($data['whenchanged'][0]) ? null :
-				self::_when2ts($data['whenchanged'][0]),
+			'account_created'   => !isset($data['whencreated'][0]) ? null : self::_when2ts($data['whencreated'][0]),
+			'account_modified'  => !isset($data['whenchanged'][0]) ? null : self::_when2ts($data['whenchanged'][0]),
 			'account_description' => $data['description'][0],
 			'mailAllowed'       => true,
 		);
@@ -449,7 +446,7 @@ 
 	{
 		if (!($data = $this->filter(array('objectsid' => $this->get_sid($account_id)), 'g', self::$group_attributes)))
 		{
-			return false;	// group not found
+			return false; // group not found
 		}
 		$group = $this->_ldap2group(array_shift($data));
 
@@ -472,8 +469,7 @@ 
 		$data = translation::convert($_data, 'utf-8');
 
 		// no need to calculate sid, if already calculated
-		$sid = is_string($data['objectsid']) ? $data['objectsid'] :
-			$this->adldap->utilities()->getTextSID($data['objectsid'][0]);
+		$sid = is_string($data['objectsid']) ? $data['objectsid'] : $this->adldap->utilities()->getTextSID($data['objectsid'][0]);
 		$account_id = self::sid2account_id($sid);
 
 		$user = array(
@@ -489,22 +485,18 @@ 
 			'account_email'     => $data['mail'][0],
 			'account_fullname'  => $data['displayname'][0],
 			'account_phone'     => $data['telephonenumber'][0],
-			'account_status'    => $data['useraccountcontrol'][0] & 2 ? false : 'A',
-			'account_expires'   => !isset($data['accountexpires']) || $data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 :
-				$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]),
-			'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 :
-				$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),
-			'account_created' => !isset($data['whencreated'][0]) ? null :
-				self::_when2ts($data['whencreated'][0]),
-			'account_modified' => !isset($data['whenchanged'][0]) ? null :
-				self::_when2ts($data['whenchanged'][0]),
+			'account_status'    => $data['useraccountcontrol'][0]&2 ? false : 'A',
+			'account_expires'   => !isset($data['accountexpires']) || $data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]),
+			'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),
+			'account_created' => !isset($data['whencreated'][0]) ? null : self::_when2ts($data['whencreated'][0]),
+			'account_modified' => !isset($data['whenchanged'][0]) ? null : self::_when2ts($data['whenchanged'][0]),
 		);
 		// expired accounts are NOT active
 		if ($user['account_expires'] !== -1 && $user['account_expires'] < time())
 		{
 			$user['account_status'] = false;
 		}
-		$user['person_id'] = $user['account_guid'];	// id of contact
+		$user['person_id'] = $user['account_guid']; // id of contact
 		//error_log(__METHOD__."(".array2string($data).") returning ".array2string($user));
 		return $user;
 	}
@@ -534,7 +526,7 @@ 
 	{
 		if (!($data = $this->filter(array('objectsid' => $this->get_sid($account_id)), 'u', self::$user_attributes)))
 		{
-			return false;	// user not found
+			return false; // user not found
 		}
 		$user = $this->_ldap2user(array_shift($data));
 
@@ -557,10 +549,10 @@ 
 	 */
 	protected static function _when2ts($_when)
 	{
-		static $utc=null;
+		static $utc = null;
 		if (!isset($utc)) $utc = new DateTimeZone('UTC');
 
-		list($when) = explode('.', $_when);	// remove .0Z not understood by createFromFormat
+		list($when) = explode('.', $_when); // remove .0Z not understood by createFromFormat
 		$datetime = egw_time::createFromFormat(self::WHEN_FORMAT, $when, $utc);
 		if (egw_time::$server_timezone) $datetime->setTimezone(egw_time::$server_timezone);
 
@@ -575,7 +567,7 @@ 
 	 * @param array $old =null current data
 	 * @return int|false account_id or false on error
 	 */
-	protected function _save_group(array &$data, array $old=null)
+	protected function _save_group(array &$data, array $old = null)
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 
@@ -586,7 +578,7 @@ 
 				'account_description' => 'description',
 			);
 			$attributes = array();
-			foreach($new2adldap as $egw => $adldap)
+			foreach ($new2adldap as $egw => $adldap)
 			{
 				$attributes[$adldap] = (string)$data[$egw];
 			}
@@ -623,11 +615,11 @@ 
 			'account_description' => 'description',
 		);
 		$ldap = array();
-		foreach($egw2adldap as $egw => $adldap)
+		foreach ($egw2adldap as $egw => $adldap)
 		{
 			if (isset($data[$egw]) && (string)$data[$egw] != (string)$old[$egw])
 			{
-				switch($egw)
+				switch ($egw)
 				{
 					case 'account_description':
 						$ldap[$adldap] = !empty($data[$egw]) ? $data[$egw] : array();
@@ -640,7 +632,7 @@ 
 			}
 		}
 		// attributes not (yet) suppored by adldap
-		if ($ldap && !($ret = @ldap_modify($ds=$this->ldap_connection(), $old['account_dn'], $ldap)))
+		if ($ldap && !($ret = @ldap_modify($ds = $this->ldap_connection(), $old['account_dn'], $ldap)))
 		{
 			error_log(__METHOD__."(".array2string($data).") ldap_modify($ds, '$old[account_dn]', ".array2string($ldap).') returned '.array2string($ret));
 			return false;
@@ -656,7 +648,7 @@ 
 	 * @param array $old =null current data
 	 * @return int|false account_id or false on error
 	 */
-	protected function _save_user(array &$data, array $old=null)
+	protected function _save_user(array &$data, array $old = null)
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 		if (!isset($data['account_fullname']) && !empty($data['account_firstname']) && !empty($data['account_lastname']))
@@ -676,12 +668,12 @@ 
 				'account_status'    => 'enabled',
 			);
 			$attributes = array();
-			foreach($new2adldap as $egw => $adldap)
+			foreach ($new2adldap as $egw => $adldap)
 			{
 				if ($egw == 'account_passwd' && (empty($data[$egw]) ||
 					!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()))
 				{
-					continue;	// do not try to set password, if no SSL or TLS, whole user creation will fail
+					continue; // do not try to set password, if no SSL or TLS, whole user creation will fail
 				}
 				if (isset($data[$egw])) $attributes[$adldap] = $data[$egw];
 			}
@@ -718,7 +710,7 @@ 
 			'account_firstname' => 'firstname',
 			'account_lastname'  => 'surname',
 			'account_email'     => 'email',
-			'account_fullname'  => 'display_name',	// handeled currently in rename above, as not supported by adLDAP
+			'account_fullname'  => 'display_name', // handeled currently in rename above, as not supported by adLDAP
 			'account_passwd'    => 'password',
 			'account_status'    => 'enabled',
 			'account_primary_group' => 'primarygroupid',
@@ -731,7 +723,7 @@ 
 		// for a new entry set certain values (eg. profilePath) to in setup configured value
 		if ($new_entry)
 		{
-			foreach($this->frontend->config as $name => $value)
+			foreach ($this->frontend->config as $name => $value)
 			{
 				if (substr($name, 0, 8) == 'ads_new_')
 				{
@@ -739,22 +731,22 @@ 
 				}
 			}
 		}
-		foreach($egw2adldap as $egw => $adldap)
+		foreach ($egw2adldap as $egw => $adldap)
 		{
 			if (isset($data[$egw]) && (string)$data[$egw] != (string)$old[$egw])
 			{
-				switch($egw)
+				switch ($egw)
 				{
 					case 'account_passwd':
 						if (!empty($data[$egw]) && ($this->adldap->getUseSSL() || $this->adldap->getUseTLS()))
 						{
-							$attributes[$adldap] = $data[$egw];	// only try to set password, if no SSL or TLS
+							$attributes[$adldap] = $data[$egw]; // only try to set password, if no SSL or TLS
 						}
 						break;
 					case 'account_primary_group':
 						// setting a primary group seems to fail, if user is no member of that group
 						if (isset($old['memberships'][$data[$egw]]) ||
-							$this->adldap->group()->addUser($group=$this->id2name($data[$egw]), $data['account_id']))
+							$this->adldap->group()->addUser($group = $this->id2name($data[$egw]), $data['account_id']))
 						{
 							$old['memberships'][$data[$egw]] = $group;
 							$ldap[$adldap] = abs($data[$egw]);
@@ -765,11 +757,10 @@ 
 						$ldap['userPrincipalName'] = $data[$egw].'@'.$this->frontend->config['ads_domain'];
 						break;
 					case 'account_expires':
-						$attributes[$adldap] = $data[$egw] == -1 ? self::EXPIRES_NEVER :
-							self::convertUnixTimeToWindowsTime($data[$egw]);
+						$attributes[$adldap] = $data[$egw] == -1 ? self::EXPIRES_NEVER : self::convertUnixTimeToWindowsTime($data[$egw]);
 						break;
 					case 'account_status':
-						if ($new_entry && empty($data['account_passwd'])) continue;	// cant active new account without passwd!
+						if ($new_entry && empty($data['account_passwd'])) continue; // cant active new account without passwd!
 						$attributes[$adldap] = $data[$egw] == 'A';
 						break;
 					case 'account_lastpwd_change':
@@ -791,7 +782,7 @@ 
 		}
 		//elseif ($attributes) error_log(__METHOD__."(".array2string($data).") adldap->user()->modify('$data[account_lid]', ".array2string($attributes).') returned '.array2string($ret).' '.function_backtrace());
 		// attributes not (yet) suppored by adldap
-		if ($ldap && !($ret = @ldap_modify($ds=$this->ldap_connection(), $old['account_dn'], $ldap)))
+		if ($ldap && !($ret = @ldap_modify($ds = $this->ldap_connection(), $old['account_dn'], $ldap)))
 		{
 			error_log(__METHOD__."(".array2string($data).") ldap_modify($ds, '$old[account_dn]', ".array2string($ldap).') returned '.array2string($ret).' ('.ldap_error($ds).') '.function_backtrace());
 			return false;
@@ -864,11 +855,11 @@ 
 			$query = ldap::quote(strtolower($param['query']));
 
 			$accounts = array();
-			if($param['type'] !== 'groups')
+			if ($param['type'] !== 'groups')
 			{
 				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -899,14 +890,14 @@ 
 					$membership_filter = '(|(memberOf='.$this->id2name((int)$param['type'], 'account_dn').')(PrimaryGroupId='.abs($param['type']).'))';
 					$filter = $filter ? "(&$membership_filter$filter)" : $membership_filter;
 				}
-				foreach($this->filter($filter, 'u', self::$user_attributes) as $account_id => $data)
+				foreach ($this->filter($filter, 'u', self::$user_attributes) as $account_id => $data)
 				{
 					$account = $this->_ldap2user($data);
 					if ($param['active'] && !$this->frontend->is_active($account))
 					{
 						continue;
 					}
-					$account['account_fullname'] = common::display_fullname($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$account['account_id']);
+					$account['account_fullname'] = common::display_fullname($account['account_lid'], $account['account_firstname'], $account['account_lastname'], $account['account_id']);
 					$accounts[$account_id] = $account;
 				}
 			}
@@ -915,9 +906,9 @@ 
 				$query = ldap::quote(strtolower($param['query']));
 
 				$filter = null;
-				if(!empty($query) && $query != '*')
+				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -931,16 +922,16 @@ 
 					}
 					$filter = "(|(cn=$query)(description=$query))";
 				}
-				foreach($this->filter($filter, 'g', self::$group_attributes) as $account_id => $data)
+				foreach ($this->filter($filter, 'g', self::$group_attributes) as $account_id => $data)
 				{
 					$accounts[$account_id] = $this->_ldap2group($data);
 				}
 			}
 			// sort the array
 			$this->_callback_sort = strtoupper($param['sort']);
-			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
+			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',', $param['order']);
 			$sortedAccounts = $accounts;
-			uasort($sortedAccounts,array($this,'_sort_callback'));
+			uasort($sortedAccounts, array($this, '_sort_callback'));
 			$account_search[$unl_serial]['data'] = $sortedAccounts;
 
 			$account_search[$unl_serial]['total'] = $this->total = count($accounts);
@@ -948,7 +939,7 @@ 
 		//echo "<p>accounts_ldap::search() found $this->total: ".microtime()."</p>\n";
 		// return only the wanted accounts
 		reset($sortedAccounts);
-		if(is_numeric($start) && is_numeric($offset))
+		if (is_numeric($start) && is_numeric($offset))
 		{
 			$account_search[$serial]['data'] = array_slice($sortedAccounts, $start, $offset);
 			$account_search[$serial]['total'] = $this->total;
@@ -979,19 +970,19 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	protected function _sort_callback($a,$b)
+	protected function _sort_callback($a, $b)
 	{
-		foreach($this->_callback_order as $col )
+		foreach ($this->_callback_order as $col)
 		{
-			if($this->_callback_sort != 'DESC')
+			if ($this->_callback_sort != 'DESC')
 			{
-				$cmp = strcasecmp( $a[$col], $b[$col] );
+				$cmp = strcasecmp($a[$col], $b[$col]);
 			}
 			else
 			{
-				$cmp = strcasecmp( $b[$col], $a[$col] );
+				$cmp = strcasecmp($b[$col], $a[$col]);
 			}
-			if ( $cmp != 0 )
+			if ($cmp != 0)
 			{
 				return $cmp;
 			}
@@ -1010,9 +1001,9 @@ 
 	 * @param array $accounts =array() array to add filtered accounts too, default empty array
 	 * @return array account_id => account_lid or values for $attrs pairs
 	 */
-	protected function filter($attr_filter, $account_type=null, array $attrs=null, array $accounts=array())
+	protected function filter($attr_filter, $account_type = null, array $attrs = null, array $accounts = array())
 	{
-		switch($account_type)
+		switch ($account_type)
 		{
 			case 'u':
 				$type_filter = '(samaccounttype='.adLDAP::ADLDAP_NORMAL_ACCOUNT.')';
@@ -1037,25 +1028,25 @@ 
 			}
 			else
 			{
-				foreach($attr_filter as $attr => $value)
+				foreach ($attr_filter as $attr => $value)
 				{
 					$filter .= '('.$attr.'='.$this->adldap->utilities()->ldapSlashes($value).')';
 				}
 			}
 			$filter .= $type_filter.')';
 		}
-		$sri = ldap_search($ds=$this->ldap_connection(), $context=$this->ads_context(), $filter,
+		$sri = ldap_search($ds = $this->ldap_connection(), $context = $this->ads_context(), $filter,
 			$attrs ? $attrs : self::$default_attributes);
 		if (!$sri)
 		{
 			if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
-			$sri = ldap_search($ds=$this->ldap_connection(true), $context=$this->ads_context(), $filter,
+			$sri = ldap_search($ds = $this->ldap_connection(true), $context = $this->ads_context(), $filter,
 				$attrs ? $attrs : self::$default_attributes);
 		}
 
 		if ($sri && ($allValues = ldap_get_entries($ds, $sri)))
 		{
-			foreach($allValues as $key => $data)
+			foreach ($allValues as $key => $data)
 			{
 				if ($key === 'count') continue;
 
@@ -1069,7 +1060,7 @@ 
 
 				if ($data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT && $rid < self::MIN_ACCOUNT_ID)
 				{
-					continue;	// ignore system accounts incl. "Administrator"
+					continue; // ignore system accounts incl. "Administrator"
 				}
 				$accounts[($data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP ? '-' : '').$rid] =
 					$attrs ? $data : translation::convert($data['samaccountname'][0], 'utf-8');
@@ -1093,7 +1084,7 @@ 
 	 * @param string $account_type u = user, g = group, default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	public function name2id($name, $which='account_lid', $account_type=null)
+	public function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		static $to_ldap = array(
 			'account_lid'   => 'samaccountname',
@@ -1105,7 +1096,7 @@ 
 		$ret = false;
 		if (isset($to_ldap[$which]))
 		{
-			foreach($this->filter(array($to_ldap[$which] => $name), $account_type) as $account_id => $account_lid)
+			foreach ($this->filter(array($to_ldap[$which] => $name), $account_type) as $account_id => $account_lid)
 			{
 				unset($account_lid);
 				$ret = $account_id;
@@ -1125,9 +1116,9 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string/false converted value or false on error ($account_id not found)
 	 */
-	public function id2name($account_id, $which='account_lid')
+	public function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -1139,9 +1130,9 @@ 
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
-		unset($_account_id, $ip);	// not used, but required by function signature
+		unset($_account_id, $ip); // not used, but required by function signature
 
-		return false;	// not longer supported
+		return false; // not longer supported
 	}
 
 	/**
@@ -1181,21 +1172,21 @@ 
 	 * @param int $account_id uidnumber
 	 * @return int number of added or removed memberships
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!($account = $this->id2name($account_id))) return;
 		$current = array_keys($this->memberships($account_id));
 
 		$changed = 0;
-		foreach(array(
-			'add' => array_diff($groups, $current),		// add account to all groups he is currently not in
-			'remove' => array_diff($current, $groups),	// remove account from all groups he is only currently in
+		foreach (array(
+			'add' => array_diff($groups, $current), // add account to all groups he is currently not in
+			'remove' => array_diff($current, $groups), // remove account from all groups he is only currently in
 		) as $op => $memberships)
 		{
 			$func = $op.($account_id > 0 ? 'User' : 'Group');
-			foreach($memberships as $gid)
+			foreach ($memberships as $gid)
 			{
-				$ok = $this->adldap->group()->$func($group=$this->id2name($gid), $account);
+				$ok = $this->adldap->group()->$func($group = $this->id2name($gid), $account);
 				//error_log(__METHOD__.'('.array2string($groups).", $account_id) $func('$group', '$account') returned ".array2string($ok));
 				$changed += (int)$ok;
 			}
@@ -1217,15 +1208,15 @@ 
 		$current = array_keys($this->members($gid));
 
 		$changed = 0;
-		foreach(array(
-			'add' => array_diff($users, $current),	// add members currently not in
-			'remove' => array_diff($current, $users),	// remove members only currently in
+		foreach (array(
+			'add' => array_diff($users, $current), // add members currently not in
+			'remove' => array_diff($current, $users), // remove members only currently in
 		) as $op => $members)
 		{
-			foreach($members as $account_id)
+			foreach ($members as $account_id)
 			{
 				$func = $op.($account_id > 0 ? 'User' : 'Group');
-				$ok = $this->adldap->group()->$func($group, $account=$this->id2name($account_id));
+				$ok = $this->adldap->group()->$func($group, $account = $this->id2name($account_id));
 				//error_log(__METHOD__.'('.array2string($users).", $account_id) $func('$group', '$account') returned ".array2string($ok));
 				$changed += (int)$ok;
 			}
@@ -1250,7 +1241,7 @@ 
 	 */
 	public $charset = 'iso-8859-1';
 
-	function __construct(array $options=array())
+	function __construct(array $options = array())
 	{
 		if (isset($options['charset']))
 		{
@@ -1337,19 +1328,19 @@ 
 	public function create($attributes)
 	{
 		// Check for compulsory fields
-		if (!array_key_exists("username", $attributes)){ return "Missing compulsory field [username]"; }
-		if (!array_key_exists("firstname", $attributes)){ return "Missing compulsory field [firstname]"; }
-		if (!array_key_exists("surname", $attributes)){ return "Missing compulsory field [surname]"; }
-		if (!array_key_exists("email", $attributes)){ return "Missing compulsory field [email]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
-
-		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())){
+		if (!array_key_exists("username", $attributes)) { return "Missing compulsory field [username]"; }
+		if (!array_key_exists("firstname", $attributes)) { return "Missing compulsory field [firstname]"; }
+		if (!array_key_exists("surname", $attributes)) { return "Missing compulsory field [surname]"; }
+		if (!array_key_exists("email", $attributes)) { return "Missing compulsory field [email]"; }
+		if (!array_key_exists("container", $attributes)) { return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"])) { return "Container attribute must be an array or string."; }
+
+		if (array_key_exists("password", $attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())) {
 			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
 		}
 
 		if (!array_key_exists("display_name", $attributes)) {
-			$attributes["display_name"] = $attributes["firstname"] . " " . $attributes["surname"];
+			$attributes["display_name"] = $attributes["firstname"]." ".$attributes["surname"];
 		}
 
 		// Translate the schema
@@ -1372,20 +1363,20 @@ 
 		// Determine the container
 		if (is_array($attributes['container'])) {
 			$attributes["container"] = array_reverse($attributes["container"]);
-			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
+			$attributes["container"] = "OU=".implode(",OU=", $attributes["container"]);
 		}
 		// we can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2
 		unset($add['unicodePwd']);
 
 		// Add the entry
-		$result = ldap_add($ds=$this->adldap->getLdapConnection(), $dn="CN=" . $add["cn"][0] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
+		$result = ldap_add($ds = $this->adldap->getLdapConnection(), $dn = "CN=".$add["cn"][0].",".$attributes["container"].",".$this->adldap->getBaseDn(), $add);
 		if ($result != true) {
 			error_log(__METHOD__."(".array2string($attributes).") ldap_add($ds, '$dn', ".array2string($add).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 			return false;
 		}
 
 		// now password can be added to still disabled account
-		if (array_key_exists("password",$attributes))
+		if (array_key_exists("password", $attributes))
 		{
 			if (!$this->setPassword($dn, $attributes['password'])) return false;
 
@@ -1412,13 +1403,13 @@ 
     */
     public function encodePassword($password)
     {
-        $password="\"".$password."\"";
+        $password = "\"".$password."\"";
         if (function_exists('mb_convert_encoding'))
         {
             return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
         }
-        $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+        $encoded = "";
+        for ($i = 0; $i < strlen($password); $i++) { $encoded .= "{$password{$i}}\000"; }
         return $encoded;
     }
 
@@ -1435,7 +1426,7 @@ 
      */
     public function setPassword($dn, $password)
     {
-    	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
+    	$result = ldap_mod_replace($ds = $this->adldap->getLdapConnection(), $dn, array(
     		'unicodePwd' => $this->encodePassword($password),
     	));
     	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
@@ -1463,7 +1454,7 @@ 
 	* @param string $old_password old password for password change, if supported
     * @return bool
     */
-    public function password($username, $password, $isGUID = false, $old_password=null)
+    public function password($username, $password, $isGUID = false, $old_password = null)
     {
         if ($username === NULL) { return false; }
         if ($password === NULL) { return false; }
@@ -1477,7 +1468,7 @@ 
             return false;
         }
 
-        $add=array();
+        $add = array();
 
 		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
 			$add["unicodePwd"][0] = $this->encodePassword($password);
@@ -1499,11 +1490,11 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
+        if ($result === false) {
             $err = ldap_errno($this->adldap->getLdapConnection());
             if ($err) {
-                $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
+                $msg = 'Error '.$err.': '.ldap_err2str($err).'.';
+                if ($err == 53) {
                     $msg .= ' Your password might not match the password policy.';
                 }
                 throw new adLDAPException($msg);
@@ -1541,13 +1532,13 @@ 
         $mod = $this->adldap->adldap_schema($attributes);
 
         // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
+        if (!$mod && !array_key_exists("enabled", $attributes)) {
             return false;
         }
 
         // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
+        if (array_key_exists("enabled", $attributes)) {
+            if ($attributes["enabled"]) {
                 $controlOptions = array("NORMAL_ACCOUNT");
             }
             else {
@@ -1561,14 +1552,14 @@ 
 		if ($mod)
 		{
 	        // Do the update
-	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
+	        $result = @ldap_modify($ds = $this->adldap->getLdapConnection(), $userDn, $mod);
 	        if ($result == false) {
 				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 	        	return false;
 	        }
 		}
-        if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
+        if (array_key_exists("password", $attributes) && !$this->setPassword($userDn, $attributes['password']))
 		{
 			return false;
 		}
@@ -1591,10 +1582,10 @@ 
 	 */
 	public function create($attributes)
 	{
-		if (!is_array($attributes)){ return "Attributes must be an array"; }
-		if (!array_key_exists("group_name", $attributes)){ return "Missing compulsory field [group_name]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
+		if (!is_array($attributes)) { return "Attributes must be an array"; }
+		if (!array_key_exists("group_name", $attributes)) { return "Missing compulsory field [group_name]"; }
+		if (!array_key_exists("container", $attributes)) { return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"])) { return "Container attribute must be an array or string."; }
 
 		//$member_array = array();
 		//$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com";
@@ -1610,9 +1601,9 @@ 
 		// Determine the container
 		if (is_array($attributes['container'])) {
 			$attributes["container"] = array_reverse($attributes["container"]);
-			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
+			$attributes["container"] = "OU=".implode(",OU=", $attributes["container"]);
 		}
-		$result = ldap_add($this->adldap->getLdapConnection(), "CN=" . $add["cn"] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
+		$result = ldap_add($this->adldap->getLdapConnection(), "CN=".$add["cn"].",".$attributes["container"].",".$this->adldap->getBaseDn(), $add);
 		if ($result != true) {
 			return false;
 		}
@@ -1643,10 +1634,10 @@ 
     * @author Port by Andreas Gohr <andi@splitbrain.org>
     * @return string
     */
-    public function ldapSlashes($str){
+    public function ldapSlashes($str) {
         return preg_replace_callback(
       		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
+        	function($matches) {
             	return "\\".join("", unpack("H2", $matches[1]));
         	},
         	$str

Braces +234 added lines, -78 removed lines

@@ -132,12 +132,21 @@ 
 	public static function get_adldap(array &$config=null)
 	{
 		static $adldap = array();
-		if (!$config) $config =& $GLOBALS['egw_info']['server'];
+		if (!$config)
+		{
+			$config =& $GLOBALS['egw_info']['server'];
+		}
 
 		if (!isset($adldap[$config['ads_domain']]))
 		{
-			if (empty($config['ads_host'])) throw new Exception("Required ADS host name(s) missing!");
-			if (empty($config['ads_domain'])) throw new Exception("Required ADS domain missing!");
+			if (empty($config['ads_host']))
+			{
+				throw new Exception("Required ADS host name(s) missing!");
+			}
+			if (empty($config['ads_domain']))
+			{
+				throw new Exception("Required ADS domain missing!");
+			}
 
 			$base_dn_parts = array();
 			foreach(explode('.', $config['ads_domain']) as $dc)
@@ -156,7 +165,10 @@ 
 				'charset' => translation::charset(),
 			);
 			$adldap[$config['ads_domain']] = new adLDAP_egw($options);
-			if (self::$debug) error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
+			if (self::$debug)
+			{
+				error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
+			}
 		}
 		//else error_log(__METHOD__."() returning cached adLDAP ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
 		return $adldap[$config['ads_domain']];
@@ -237,7 +249,10 @@ 
 			throw new egw_exception_wrong_userinput("Wrong or not configured ADS context '$context' (baseDN='$base')!");
 		}
 		$container = $matches[1];
-		if (self::$debug) error_log(__METHOD__."() context='$context', base='$base' returning ".array2string($container));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."() context='$context', base='$base' returning ".array2string($container));
+		}
 		return $container;
 	}
 
@@ -330,10 +345,16 @@ 
 	 */
 	public function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$ret = $account_id < 0 ? $this->_read_group($account_id) : $this->_read_user($account_id);
-		if (self::$debug) error_log(__METHOD__."($account_id) returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($account_id) returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -366,7 +387,10 @@ 
 		}
 		$ret = $is_group ? $this->_save_group($data, $old) : $this->_save_user($data, $old);
 
-		if (self::$debug) error_log(__METHOD__.'('.array2string($data).') returning '.array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($data).') returning '.array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -396,7 +420,10 @@ 
 		{
 			$ret = $this->adldap->user()->delete($account_lid);
 		}
-		if (self::$debug) error_log(__METHOD__."($account_id) account_lid='$account_lid' returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($account_id) account_lid='$account_lid' returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -558,11 +585,17 @@ 
 	protected static function _when2ts($_when)
 	{
 		static $utc=null;
-		if (!isset($utc)) $utc = new DateTimeZone('UTC');
+		if (!isset($utc))
+		{
+			$utc = new DateTimeZone('UTC');
+		}
 
 		list($when) = explode('.', $_when);	// remove .0Z not understood by createFromFormat
 		$datetime = egw_time::createFromFormat(self::WHEN_FORMAT, $when, $utc);
-		if (egw_time::$server_timezone) $datetime->setTimezone(egw_time::$server_timezone);
+		if (egw_time::$server_timezone)
+		{
+			$datetime->setTimezone(egw_time::$server_timezone);
+		}
 
 		return $datetime->getTimestamp();
 	}
@@ -579,12 +612,15 @@ 
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 
-		if (!$old)	// new entry
+		if (!$old)
+		{
+			// new entry
 		{
 			static $new2adldap = array(
 				'account_lid'       => 'group_name',
 				'account_description' => 'description',
 			);
+		}
 			$attributes = array();
 			foreach($new2adldap as $egw => $adldap)
 			{
@@ -664,7 +700,9 @@ 
 			$data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
 		}
 
-		if (($new_entry = !$old))	// new entry
+		if (($new_entry = !$old))
+		{
+			// new entry
 		{
 			static $new2adldap = array(
 				'account_lid'       => 'username',
@@ -675,6 +713,7 @@ 
 				'account_passwd'    => 'password',
 				'account_status'    => 'enabled',
 			);
+		}
 			$attributes = array();
 			foreach($new2adldap as $egw => $adldap)
 			{
@@ -683,7 +722,10 @@ 
 				{
 					continue;	// do not try to set password, if no SSL or TLS, whole user creation will fail
 				}
-				if (isset($data[$egw])) $attributes[$adldap] = $data[$egw];
+				if (isset($data[$egw]))
+				{
+					$attributes[$adldap] = $data[$egw];
+				}
 			}
 			$attributes['enabled'] = !isset($data['account_status']) || $data['account_status'] === 'A';
 			$attributes['container'] = $this->_get_container();
@@ -769,7 +811,11 @@ 
 							self::convertUnixTimeToWindowsTime($data[$egw]);
 						break;
 					case 'account_status':
-						if ($new_entry && empty($data['account_passwd'])) continue;	// cant active new account without passwd!
+						if ($new_entry && empty($data['account_passwd']))
+						{
+							continue;
+						}
+						// cant active new account without passwd!
 						$attributes[$adldap] = $data[$egw] == 'A';
 						break;
 					case 'account_lastpwd_change':
@@ -849,8 +895,14 @@ 
 		}
 		// if it's a limited query, check if the unlimited query is cached
 		$start = $param['start'];
-		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $maxmatchs = 15;
-		if (!($offset = $param['offset'])) $offset = $maxmatchs;
+		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))
+		{
+			$maxmatchs = 15;
+		}
+		if (!($offset = $param['offset']))
+		{
+			$offset = $maxmatchs;
+		}
 		unset($param['start']);
 		unset($param['offset']);
 		$unl_serial = serialize($param);
@@ -1048,7 +1100,10 @@ 
 			$attrs ? $attrs : self::$default_attributes);
 		if (!$sri)
 		{
-			if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
+			if (self::$debug)
+			{
+				error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
+			}
 			$sri = ldap_search($ds=$this->ldap_connection(true), $context=$this->ads_context(), $filter,
 				$attrs ? $attrs : self::$default_attributes);
 		}
@@ -1057,7 +1112,10 @@ 
 		{
 			foreach($allValues as $key => $data)
 			{
-				if ($key === 'count') continue;
+				if ($key === 'count')
+				{
+					continue;
+				}
 
 				if ($account_type && !($account_type == 'u' && $data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT ||
 					$account_type == 'g' && $data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP))
@@ -1075,7 +1133,10 @@ 
 					$attrs ? $data : translation::convert($data['samaccountname'][0], 'utf-8');
 			}
 		}
-		else if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter')=$sri allValues=".array2string($allValues));
+		else if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter')=$sri allValues=".array2string($allValues));
+		}
 
 		//error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returning ".array2string($accounts).' '.function_backtrace());
 		return $accounts;
@@ -1112,7 +1173,10 @@ 
 				break;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__."('$name', '$which', '$account_type') returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."('$name', '$which', '$account_type') returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -1154,7 +1218,10 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!($data = $this->frontend->read($account_id)) || $data['account_id'] <= 0) return false;
+		if (!($data = $this->frontend->read($account_id)) || $data['account_id'] <= 0)
+		{
+			return false;
+		}
 
 		return $data['memberships'];
 	}
@@ -1169,7 +1236,10 @@ 
 	 */
 	function members($gid)
 	{
-		if (!($data = $this->frontend->read($gid)) || $data['account_id'] >= 0) return false;
+		if (!($data = $this->frontend->read($gid)) || $data['account_id'] >= 0)
+		{
+			return false;
+		}
 
 		return $data['members'];
 	}
@@ -1183,7 +1253,10 @@ 
 	 */
 	function set_memberships($groups,$account_id)
 	{
-		if (!($account = $this->id2name($account_id))) return;
+		if (!($account = $this->id2name($account_id)))
+		{
+			return;
+		}
 		$current = array_keys($this->memberships($account_id));
 
 		$changed = 0;
@@ -1200,7 +1273,10 @@ 
 				$changed += (int)$ok;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__.'('.array2string($groups).", $account_id) current=".array2string($current)." returning $changed");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($groups).", $account_id) current=".array2string($current)." returning $changed");
+		}
 		return $changed;
 	}
 
@@ -1213,7 +1289,10 @@ 
 	 */
 	function set_members($users, $gid)
 	{
-		if (!($group = $this->id2name($gid))) return;
+		if (!($group = $this->id2name($gid)))
+		{
+			return;
+		}
 		$current = array_keys($this->members($gid));
 
 		$changed = 0;
@@ -1230,7 +1309,10 @@ 
 				$changed += (int)$ok;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__.'('.array2string($users).", $gid) current=".array2string($current)." returning $changed");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($users).", $gid) current=".array2string($current)." returning $changed");
+		}
 		return $changed;
 	}
 }
@@ -1284,8 +1366,10 @@ 
 	 *
 	 * @return adLDAPUsers
 	 */
-	public function user() {
-		if (!$this->userClass) {
+	public function user()
+	{
+		if (!$this->userClass)
+		{
 			$this->userClass = new adLDAPUsers_egw($this);
 		}
 		return $this->userClass;
@@ -1296,8 +1380,10 @@ 
     *
     * @return adLDAPGroups
     */
-    public function group() {
-        if (!$this->groupClass) {
+    public function group()
+    {
+        if (!$this->groupClass)
+        {
             $this->groupClass = new adLDAPGroups_egw($this);
         }
         return $this->groupClass;
@@ -1308,8 +1394,10 @@ 
     *
     * @return adLDAPUtils
     */
-    public function utilities() {
-        if (!$this->utilClass) {
+    public function utilities()
+    {
+        if (!$this->utilClass)
+        {
             $this->utilClass = new adLDAPUtils_egw($this);
         }
         return $this->utilClass;
@@ -1337,18 +1425,32 @@ 
 	public function create($attributes)
 	{
 		// Check for compulsory fields
-		if (!array_key_exists("username", $attributes)){ return "Missing compulsory field [username]"; }
-		if (!array_key_exists("firstname", $attributes)){ return "Missing compulsory field [firstname]"; }
-		if (!array_key_exists("surname", $attributes)){ return "Missing compulsory field [surname]"; }
-		if (!array_key_exists("email", $attributes)){ return "Missing compulsory field [email]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
-
-		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())){
+		if (!array_key_exists("username", $attributes))
+		{
+return "Missing compulsory field [username]"; }
+		if (!array_key_exists("firstname", $attributes))
+		{
+return "Missing compulsory field [firstname]"; }
+		if (!array_key_exists("surname", $attributes))
+		{
+return "Missing compulsory field [surname]"; }
+		if (!array_key_exists("email", $attributes))
+		{
+return "Missing compulsory field [email]"; }
+		if (!array_key_exists("container", $attributes))
+		{
+return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"]))
+		{
+return "Container attribute must be an array or string."; }
+
+		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()))
+		{
 			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
 		}
 
-		if (!array_key_exists("display_name", $attributes)) {
+		if (!array_key_exists("display_name", $attributes))
+		{
 			$attributes["display_name"] = $attributes["firstname"] . " " . $attributes["surname"];
 		}
 
@@ -1370,7 +1472,8 @@ 
 		$add["userAccountControl"][0] = $this->accountControl($control_options);
 
 		// Determine the container
-		if (is_array($attributes['container'])) {
+		if (is_array($attributes['container']))
+		{
 			$attributes["container"] = array_reverse($attributes["container"]);
 			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
 		}
@@ -1379,7 +1482,8 @@ 
 
 		// Add the entry
 		$result = ldap_add($ds=$this->adldap->getLdapConnection(), $dn="CN=" . $add["cn"][0] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
-		if ($result != true) {
+		if ($result != true)
+		{
 			error_log(__METHOD__."(".array2string($attributes).") ldap_add($ds, '$dn', ".array2string($add).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 			return false;
 		}
@@ -1387,7 +1491,10 @@ 
 		// now password can be added to still disabled account
 		if (array_key_exists("password",$attributes))
 		{
-			if (!$this->setPassword($dn, $attributes['password'])) return false;
+			if (!$this->setPassword($dn, $attributes['password']))
+			{
+				return false;
+			}
 
 			// now account can be enabled
 			if ($attributes["enabled"])
@@ -1395,7 +1502,10 @@ 
 				$control_options = array("NORMAL_ACCOUNT");
 				$mod = array("userAccountControl" => $this->accountControl($control_options));
 				$result = ldap_modify($ds, $dn, $mod);
-				if (!$result) error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$dn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
+				if (!$result)
+				{
+					error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$dn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
+				}
 			}
 		}
 
@@ -1418,7 +1528,9 @@ 
             return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
         }
         $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+        for ($i=0; $i <strlen($password); $i++)
+        {
+$encoded.="{$password{$i}}\000"; }
         return $encoded;
     }
 
@@ -1438,7 +1550,10 @@ 
     	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
     		'unicodePwd' => $this->encodePassword($password),
     	));
-    	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+    	if (!$result)
+    	{
+    		error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+    	}
     	return $result;
     }
 
@@ -1465,26 +1580,36 @@ 
     */
     public function password($username, $password, $isGUID = false, $old_password=null)
     {
-        if ($username === NULL) { return false; }
-        if ($password === NULL) { return false; }
-        if (!$this->adldap->getLdapBind()) { return false; }
-        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+        if ($username === NULL)
+        {
+return false; }
+        if ($password === NULL)
+        {
+return false; }
+        if (!$this->adldap->getLdapBind())
+        {
+return false; }
+        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())
+        {
             throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
         }
 
         $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
+        if ($userDn === false)
+        {
             return false;
         }
 
         $add=array();
 
-		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
+		if (empty($old_password) || !function_exists('ldap_modify_batch'))
+		{
 			$add["unicodePwd"][0] = $this->encodePassword($password);
 
 			$result = @ldap_mod_replace($this->adldap->getLdapConnection(), $userDn, $add);
 		}
-		else {
+		else
+		{
 			$mods = array(
 				array(
 					"attrib"  => "unicodePwd",
@@ -1499,16 +1624,20 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
+        if ($result === false)
+        {
             $err = ldap_errno($this->adldap->getLdapConnection());
-            if ($err) {
+            if ($err)
+            {
                 $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
+                if($err == 53)
+                {
                     $msg .= ' Your password might not match the password policy.';
                 }
                 throw new adLDAPException($msg);
             }
-            else {
+            else
+            {
                 return false;
             }
         }
@@ -1526,14 +1655,18 @@ 
     */
     public function modify($username, $attributes, $isGUID = false)
     {
-        if ($username === NULL) { return "Missing compulsory field [username]"; }
-        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+        if ($username === NULL)
+        {
+return "Missing compulsory field [username]"; }
+        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())
+        {
             throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
         }
 
         // Find the dn of the user
         $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
+        if ($userDn === false)
+        {
             return false;
         }
 
@@ -1541,16 +1674,20 @@ 
         $mod = $this->adldap->adldap_schema($attributes);
 
         // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
+        if (!$mod && !array_key_exists("enabled", $attributes))
+        {
             return false;
         }
 
         // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
+        if (array_key_exists("enabled", $attributes))
+        {
+            if ($attributes["enabled"])
+            {
                 $controlOptions = array("NORMAL_ACCOUNT");
             }
-            else {
+            else
+            {
                 $controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
             }
             $mod["userAccountControl"][0] = $this->accountControl($controlOptions);
@@ -1562,14 +1699,18 @@ 
 		{
 	        // Do the update
 	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
-	        if ($result == false) {
-				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
+	        if ($result == false)
+	        {
+				if (isset($mod['unicodePwd']))
+				{
+					$mod['unicodePwd'] = '***';
+				}
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 	        	return false;
 	        }
 		}
         if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
-		{
+        {
 			return false;
 		}
 		return true;
@@ -1591,10 +1732,18 @@ 
 	 */
 	public function create($attributes)
 	{
-		if (!is_array($attributes)){ return "Attributes must be an array"; }
-		if (!array_key_exists("group_name", $attributes)){ return "Missing compulsory field [group_name]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
+		if (!is_array($attributes))
+		{
+return "Attributes must be an array"; }
+		if (!array_key_exists("group_name", $attributes))
+		{
+return "Missing compulsory field [group_name]"; }
+		if (!array_key_exists("container", $attributes))
+		{
+return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"]))
+		{
+return "Container attribute must be an array or string."; }
 
 		//$member_array = array();
 		//$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com";
@@ -1604,16 +1753,21 @@ 
 		$add["cn"] = $attributes["group_name"];
 		$add["samaccountname"] = $attributes["group_name"];
 		$add["objectClass"] = "Group";
-		if (!empty($attributes["description"])) $add["description"] = $attributes["description"];
+		if (!empty($attributes["description"]))
+		{
+			$add["description"] = $attributes["description"];
+		}
 		//$add["member"] = $member_array; UNTESTED
 
 		// Determine the container
-		if (is_array($attributes['container'])) {
+		if (is_array($attributes['container']))
+		{
 			$attributes["container"] = array_reverse($attributes["container"]);
 			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
 		}
 		$result = ldap_add($this->adldap->getLdapConnection(), "CN=" . $add["cn"] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
-		if ($result != true) {
+		if ($result != true)
+		{
 			return false;
 		}
 		return true;
@@ -1643,10 +1797,12 @@ 
     * @author Port by Andreas Gohr <andi@splitbrain.org>
     * @return string
     */
-    public function ldapSlashes($str){
+    public function ldapSlashes($str)
+    {
         return preg_replace_callback(
       		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
+        	function ($matches)
+        	{
             	return "\\".join("", unpack("H2", $matches[1]));
         	},
         	$str