EGroupware / egroupware

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

Indentation +20 added lines, -20 removed lines

@@ -84,8 +84,8 @@ 
 	
 	function _affectedrows()
 	{
-        return sqlite_changes($this->_connectionID);
-    }
+		return sqlite_changes($this->_connectionID);
+	}
 	
 	function ErrorMsg() 
  	{
@@ -240,46 +240,46 @@ 
 	{
 		$false = false;
 		// save old fetch mode
-        global $ADODB_FETCH_MODE;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			   $savem = $this->SetFetchMode(FALSE);
+		}
 		$SQL=sprintf("SELECT name,sql FROM sqlite_master WHERE type='index' AND tbl_name='%s'", strtolower($table));
-        $rs = $this->Execute($SQL);
-        if (!is_object($rs)) {
+		$rs = $this->Execute($SQL);
+		if (!is_object($rs)) {
 			if (isset($savem)) 
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
+			return $false;
+		}
 
 		$indexes = array ();
 		while ($row = $rs->FetchRow()) {
 			if ($primary && preg_match("/primary/i",$row[1]) == 0) continue;
-            if (!isset($indexes[$row[0]])) {
+			if (!isset($indexes[$row[0]])) {
 
 			$indexes[$row[0]] = array(
 				   'unique' => preg_match("/unique/i",$row[1]),
 				   'columns' => array());
 			}
 			/**
-			  * There must be a more elegant way of doing this,
-			  * the index elements appear in the SQL statement
-			  * in cols[1] between parentheses
-			  * e.g CREATE UNIQUE INDEX ware_0 ON warehouse (org,warehouse)
-			  */
+			 * There must be a more elegant way of doing this,
+			 * the index elements appear in the SQL statement
+			 * in cols[1] between parentheses
+			 * e.g CREATE UNIQUE INDEX ware_0 ON warehouse (org,warehouse)
+			 */
 			$cols = explode("(",$row[1]);
 			$cols = explode(")",$cols[1]);
 			array_pop($cols);
 			$indexes[$row[0]]['columns'] = $cols;
 		}
 		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
+			$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
-        return $indexes;
+		return $indexes;
 	}
 
 }

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

Indentation +13 added lines, -13 removed lines

@@ -26,7 +26,7 @@ 
 
    function ADODB_sqlitepo()
    {
-      $this->ADODB_sqlite();
+	  $this->ADODB_sqlite();
    }
 }
 
@@ -40,23 +40,23 @@ 
 
    function ADORecordset_sqlitepo($queryID,$mode=false)
    {
-      $this->ADORecordset_sqlite($queryID,$mode);
+	  $this->ADORecordset_sqlite($queryID,$mode);
    }
    
    // Modified to strip table names from returned fields
    function _fetch($ignore_fields=false)
    {
-      $this->fields = array();
-      $fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
-      if(is_array($fields))
-         foreach($fields as $n => $v)
-         {
-            if(($p = strpos($n, ".")) !== false)
-               $n = substr($n, $p+1);
-            $this->fields[$n] = $v;
-         }
-
-      return !empty($this->fields);
+	  $this->fields = array();
+	  $fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
+	  if(is_array($fields))
+		 foreach($fields as $n => $v)
+		 {
+			if(($p = strpos($n, ".")) !== false)
+			   $n = substr($n, $p+1);
+			$this->fields[$n] = $v;
+		 }
+
+	  return !empty($this->fields);
    }
 }
 ?>
\ No newline at end of file

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

Indentation +67 added lines, -67 removed lines

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

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

Indentation +126 added lines, -126 removed lines

@@ -24,16 +24,16 @@ 
 }
 
 class ADODB_ldap extends ADOConnection {
-    var $databaseType = 'ldap';
+	var $databaseType = 'ldap';
 	var $dataProvider = 'ldap';
 	
 	# Connection information
-    var $username = false;
-    var $password = false;
+	var $username = false;
+	var $password = false;
     
-    # Used during searches
-    var $filter;
-    var $dn;
+	# Used during searches
+	var $filter;
+	var $dn;
 	var $version;
 	var $port = 389;
 
@@ -55,7 +55,7 @@ 
 		$conn_info = array( $host,$this->port);
 		
 		if ( strstr( $host, ':' ) ) {
-		    $conn_info = split( ':', $host );
+			$conn_info = split( ':', $host );
 		} 
 		
 		$this->_connectionID = ldap_connect( $conn_info[0], $conn_info[1] );
@@ -70,10 +70,10 @@ 
 		}
 		
 		if ($username) {
-		    $bind = ldap_bind( $this->_connectionID, $username, $password );
+			$bind = ldap_bind( $this->_connectionID, $username, $password );
 		} else {
 			$username = 'anonymous';
-		    $bind = ldap_bind( $this->_connectionID );		
+			$bind = ldap_bind( $this->_connectionID );		
 		}
 		
 		if (!$bind) {
@@ -154,7 +154,7 @@ 
 		return $rs; 
 	}
 
-    /* closes the LDAP connection */
+	/* closes the LDAP connection */
 	function _close()
 	{
 		@ldap_close( $this->_connectionID );
@@ -166,11 +166,11 @@ 
 		return true;
 	} // SelectDB
 
-    function ServerInfo()
-    {
-        if( !empty( $this->version ) ) return $this->version;
-        $version = array();
-        /*
+	function ServerInfo()
+	{
+		if( !empty( $this->version ) ) return $this->version;
+		$version = array();
+		/*
         Determines how aliases are handled during search. 
         LDAP_DEREF_NEVER (0x00)
         LDAP_DEREF_SEARCHING (0x01)
@@ -181,86 +181,86 @@ 
         aliases are dereferenced when locating the base object but not during the search.  
         Default: LDAP_DEREF_NEVER
         */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, $version['LDAP_OPT_DEREF'] ) ;
-        switch ( $version['LDAP_OPT_DEREF'] ) {
-          case 0:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_NEVER';
-          case 1:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_SEARCHING';
-          case 2:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_FINDING';
-          case 3:
-            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS';
-        }
+		ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, $version['LDAP_OPT_DEREF'] ) ;
+		switch ( $version['LDAP_OPT_DEREF'] ) {
+		  case 0:
+			$version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_NEVER';
+		  case 1:
+			$version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_SEARCHING';
+		  case 2:
+			$version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_FINDING';
+		  case 3:
+			$version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS';
+		}
         
-        /* 
+		/* 
         A limit on the number of entries to return from a search. 
         LDAP_NO_LIMIT (0) means no limit.
         Default: LDAP_NO_LIMIT
         */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_SIZELIMIT, $version['LDAP_OPT_SIZELIMIT'] );
-        if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) {
-           $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT';
-        }
+		ldap_get_option( $this->_connectionID, LDAP_OPT_SIZELIMIT, $version['LDAP_OPT_SIZELIMIT'] );
+		if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) {
+		   $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT';
+		}
         
-        /*
+		/*
         A limit on the number of seconds to spend on a search. 
         LDAP_NO_LIMIT (0) means no limit.
         Default: LDAP_NO_LIMIT
         */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_TIMELIMIT, $version['LDAP_OPT_TIMELIMIT'] );
-        if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) {
-           $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT';
-        }
+		ldap_get_option( $this->_connectionID, LDAP_OPT_TIMELIMIT, $version['LDAP_OPT_TIMELIMIT'] );
+		if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) {
+		   $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT';
+		}
         
-        /*
+		/*
         Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. 
         LDAP_OPT_ON
         LDAP_OPT_OFF
         Default: ON
         */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_REFERRALS, $version['LDAP_OPT_REFERRALS'] );
-        if ( $version['LDAP_OPT_REFERRALS'] == 0 ) {
-           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF';
-        } else {
-           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON';
+		ldap_get_option( $this->_connectionID, LDAP_OPT_REFERRALS, $version['LDAP_OPT_REFERRALS'] );
+		if ( $version['LDAP_OPT_REFERRALS'] == 0 ) {
+		   $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF';
+		} else {
+		   $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON';
         
-        }
-        /*
+		}
+		/*
         Determines whether LDAP I/O operations are automatically restarted if they abort prematurely. 
         LDAP_OPT_ON
         LDAP_OPT_OFF
         Default: OFF
         */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_RESTART, $version['LDAP_OPT_RESTART'] );
-        if ( $version['LDAP_OPT_RESTART'] == 0 ) {
-           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF';
-        } else {
-           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON';
+		ldap_get_option( $this->_connectionID, LDAP_OPT_RESTART, $version['LDAP_OPT_RESTART'] );
+		if ( $version['LDAP_OPT_RESTART'] == 0 ) {
+		   $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF';
+		} else {
+		   $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON';
         
-        }
-        /*
+		}
+		/*
         This option indicates the version of the LDAP protocol used when communicating with the primary LDAP server.
         LDAP_VERSION2 (2)
         LDAP_VERSION3 (3)
         Default: LDAP_VERSION2 (2)
         */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_PROTOCOL_VERSION, $version['LDAP_OPT_PROTOCOL_VERSION'] );
-        if ( $version['LDAP_OPT_PROTOCOL_VERSION'] == 2 ) {
-           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2';
-        } else {
-           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3';
+		ldap_get_option( $this->_connectionID, LDAP_OPT_PROTOCOL_VERSION, $version['LDAP_OPT_PROTOCOL_VERSION'] );
+		if ( $version['LDAP_OPT_PROTOCOL_VERSION'] == 2 ) {
+		   $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2';
+		} else {
+		   $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3';
         
-        }
-        /* The host name (or list of hosts) for the primary LDAP server. */
-        ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); 
-        ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); 
+		}
+		/* The host name (or list of hosts) for the primary LDAP server. */
+		ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); 
+		ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); 
+		ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); 
+		ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); 
         
-        return $this->version = $version;
+		return $this->version = $version;
     
-    }
+	}
 }
 	
 /*--------------------------------------------------------------------------------------
@@ -304,97 +304,97 @@ 
 	   It's currently being used in the _fetch() function and the
 	   GetAssoc() function
        */
-	    $this->_numOfRows = ldap_count_entries( $this->connection->_connectionID, $this->_queryID );
+		$this->_numOfRows = ldap_count_entries( $this->connection->_connectionID, $this->_queryID );
 
 	}
 
-    /*
+	/*
     Return whole recordset as a multi-dimensional associative array
 	*/
 	function &GetAssoc($force_array = false, $first2cols = false) 
 	{
 		$records = $this->_numOfRows;
-        $results = array();
-            for ( $i=0; $i < $records; $i++ ) {
-                foreach ( $this->fields as $k=>$v ) {
-                    if ( is_array( $v ) ) {
-                        if ( $v['count'] == 1 ) {
-                            $results[$i][$k] = $v[0];
-                        } else {
-                            array_shift( $v );
-                            $results[$i][$k] = $v;
-                        } 
-                    }
-                }
-            }
+		$results = array();
+			for ( $i=0; $i < $records; $i++ ) {
+				foreach ( $this->fields as $k=>$v ) {
+					if ( is_array( $v ) ) {
+						if ( $v['count'] == 1 ) {
+							$results[$i][$k] = $v[0];
+						} else {
+							array_shift( $v );
+							$results[$i][$k] = $v;
+						} 
+					}
+				}
+			}
         
 		return $results; 
 	}
     
-    function &GetRowAssoc()
+	function &GetRowAssoc()
 	{
-        $results = array();
-        foreach ( $this->fields as $k=>$v ) {
-            if ( is_array( $v ) ) {
-                if ( $v['count'] == 1 ) {
-                    $results[$k] = $v[0];
-                } else {
-                    array_shift( $v );
-                    $results[$k] = $v;
-                } 
-            }
-        }
+		$results = array();
+		foreach ( $this->fields as $k=>$v ) {
+			if ( is_array( $v ) ) {
+				if ( $v['count'] == 1 ) {
+					$results[$k] = $v[0];
+				} else {
+					array_shift( $v );
+					$results[$k] = $v;
+				} 
+			}
+		}
  
 		return $results; 
 	}
 		
-    function GetRowNums()
-    {
-        $results = array();
-        foreach ( $this->fields as $k=>$v ) {
-        static $i = 0;
-            if (is_array( $v )) {
-                if ( $v['count'] == 1 ) {
-                    $results[$i] = $v[0];
-                } else {
-                    array_shift( $v );
-                    $results[$i] = $v;
-                } 
-            $i++;
-            }
-        }
-        return $results;
-    }
+	function GetRowNums()
+	{
+		$results = array();
+		foreach ( $this->fields as $k=>$v ) {
+		static $i = 0;
+			if (is_array( $v )) {
+				if ( $v['count'] == 1 ) {
+					$results[$i] = $v[0];
+				} else {
+					array_shift( $v );
+					$results[$i] = $v;
+				} 
+			$i++;
+			}
+		}
+		return $results;
+	}
 	
 	function _fetch()
 	{		
 		if ( $this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0 )
-        	return false;
+			return false;
         	
-        if ( $this->_currentRow == 0 ) {
+		if ( $this->_currentRow == 0 ) {
 		  $this->_entryID = ldap_first_entry( $this->connection->_connectionID, $this->_queryID );
-        } else {
-          $this->_entryID = ldap_next_entry( $this->connection->_connectionID, $this->_entryID );
-        }
+		} else {
+		  $this->_entryID = ldap_next_entry( $this->connection->_connectionID, $this->_entryID );
+		}
 	    
-	    $this->fields = ldap_get_attributes( $this->connection->_connectionID, $this->_entryID );
-	    $this->_numOfFields = $this->fields['count'];	
-	    switch ( $this->fetchMode ) {
+		$this->fields = ldap_get_attributes( $this->connection->_connectionID, $this->_entryID );
+		$this->_numOfFields = $this->fields['count'];	
+		switch ( $this->fetchMode ) {
             
-            case LDAP_ASSOC:
-            $this->fields = $this->GetRowAssoc();
-            break;
+			case LDAP_ASSOC:
+			$this->fields = $this->GetRowAssoc();
+			break;
             
-            case LDAP_NUM:
+			case LDAP_NUM:
 			$this->fields = array_merge($this->GetRowNums(),$this->GetRowAssoc());
-            break;
+			break;
             
-            case LDAP_BOTH:
-            default:
+			case LDAP_BOTH:
+			default:
 			$this->fields = $this->GetRowNums();
-            break;
-        }
-        return ( is_array( $this->fields ) );        
+			break;
+		}
+		return ( is_array( $this->fields ) );        
 	}
 	
 	function _close() {

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

Indentation +19 added lines, -19 removed lines

@@ -40,7 +40,7 @@ 
 	function ServerInfo()
 	{
 		return array('description' => @odbtp_get_attr( ODB_ATTR_DBMSNAME, $this->_connectionID),
-		             'version' => @odbtp_get_attr( ODB_ATTR_DBMSVER, $this->_connectionID));
+					 'version' => @odbtp_get_attr( ODB_ATTR_DBMSVER, $this->_connectionID));
 	}
 
 	function ErrorMsg()
@@ -82,9 +82,9 @@ 
 			$path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, $this->_connectionID );
 			//if using vfp dbc file
 			if( !strcasecmp(strrchr($path, '.'), '.dbc') )
-                $path = substr($path,0,strrpos($path,'\/'));
-           	$seqtab = $path . '/' . $seqtab;
-        }
+				$path = substr($path,0,strrpos($path,'\/'));
+		   	$seqtab = $path . '/' . $seqtab;
+		}
 		if($num == false) {
 			if (empty($this->_genSeqSQL)) return false;
 			$ok = $this->Execute(sprintf($this->_genSeqSQL ,$seqtab));
@@ -110,9 +110,9 @@ 
 			$path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, $this->_connectionID );
 			//if using vfp dbc file
 			if( !strcasecmp(strrchr($path, '.'), '.dbc') )
-                $path = substr($path,0,strrpos($path,'\/'));
-           	$seqtab = $path . '/' . $seqtab;
-        }
+				$path = substr($path,0,strrpos($path,'\/'));
+		   	$seqtab = $path . '/' . $seqtab;
+		}
 		$MAXLOOPS = 100;
 		while (--$MAXLOOPS>=0) {
 			$num = $this->GetOne("select seq_value from adodb_seq where seq_name='$seq'");
@@ -147,7 +147,7 @@ 
 	//for access : DRIVER={Microsoft Access Driver (*.mdb)};DBQ=c:\path_to_access_db\base_test.mdb;UID=root;PWD=;
 	//for mssql : DRIVER={SQL Server};SERVER=myserver;UID=myuid;PWD=mypwd;DATABASE=OdbtpTest;
 	//if uid & pwd can be separate
-    function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
+	function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
 	{
 		$this->_connectionID = @odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
 		if ($this->_connectionID === false) {
@@ -182,7 +182,7 @@ 
 				$this->ansiOuter = true;
 				$this->leftOuter = '*=';
 				$this->rightOuter = '=*';
-                $this->hasTop = 'top';
+				$this->hasTop = 'top';
 				$this->hasInsertID = true;
 				$this->hasTransactions = true;
 				$this->_bindInputArray = true;
@@ -199,7 +199,7 @@ 
 				$this->fmtTimeStamp = "#Y-m-d h:i:sA#";
 				$this->sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
 				$this->sysTimeStamp = 'NOW';
-                $this->hasTop = 'top';
+				$this->hasTop = 'top';
 				$this->hasTransactions = false;
 				$this->_canPrepareSP = true;  // For MS Access only.
 				break;
@@ -210,7 +210,7 @@ 
 				$this->sysDate = 'date()';
 				$this->sysTimeStamp = 'datetime()';
 				$this->ansiOuter = true;
-                $this->hasTop = 'top';
+				$this->hasTop = 'top';
 				$this->hasTransactions = false;
 				$this->replaceQuote = "'+chr(39)+'";
 				$this->true = '.T.';
@@ -245,12 +245,12 @@ 
 				else
 					$this->hasTransactions = false;
 		}
-        @odbtp_set_attr(ODB_ATTR_FULLCOLINFO, TRUE, $this->_connectionID );
+		@odbtp_set_attr(ODB_ATTR_FULLCOLINFO, TRUE, $this->_connectionID );
 
 		if ($this->_useUnicodeSQL )
 			@odbtp_set_attr(ODB_ATTR_UNICODESQL, TRUE, $this->_connectionID);
 
-        return true;
+		return true;
 	}
 
 	function _pconnect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
@@ -318,7 +318,7 @@ 
 				$fld->name = $rs->fields[3];
 				$fld->type = $rs->fields[5];
 				$fld->max_length = $rs->fields[6];
-    			$fld->not_null = !empty($rs->fields[9]);
+				$fld->not_null = !empty($rs->fields[9]);
  				$fld->scale = $rs->fields[7];
  				if (!is_null($rs->fields[12])) {
  					$fld->has_default = true;
@@ -547,7 +547,7 @@ 
 		if ($stmtid) {
 				$this->_lastAffectedRows = @odbtp_affected_rows($stmtid);
 		}
-        return $stmtid;
+		return $stmtid;
 	}
 
 	function _close()
@@ -583,7 +583,7 @@ 
 
 		if ($this->connection->odbc_driver == ODB_DRIVER_JET) {
 			if (!@odbtp_get_attr(ODB_ATTR_MAPCHARTOWCHAR,
-			                     $this->connection->_connectionID))
+								 $this->connection->_connectionID))
 			{
 				for ($f = 0; $f < $this->_numOfFields; $f++) {
 					if (@odbtp_field_bindtype($this->_queryID, $f) == ODB_CHAR)
@@ -599,7 +599,7 @@ 
 		$o= new ADOFieldObject();
 		$o->name = @odbtp_field_name($this->_queryID,$off);
 		$o->type = @odbtp_field_type($this->_queryID,$off);
-        $o->max_length = @odbtp_field_length($this->_queryID,$off);
+		$o->max_length = @odbtp_field_length($this->_queryID,$off);
 		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;
@@ -633,7 +633,7 @@ 
 			case ADODB_FETCH_ASSOC:
 				$this->fields = @odbtp_fetch_assoc($this->_queryID, $type);
 				break;
-            default:
+			default:
 				$this->fields = @odbtp_fetch_array($this->_queryID, $type);
 		}
 		return is_array($this->fields);
@@ -650,7 +650,7 @@ 
 		$this->EOF = false;
 		$this->_currentRow = 0;
 		return true;
-    }
+	}
 
 	function MoveLast()
 	{

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

Indentation +2 added lines, -2 removed lines

@@ -71,8 +71,8 @@
 			$fld->scale = $rs->fields[3];
 			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
 				$fld->type ='INT';
-	     		$fld->max_length = $rs->fields[4];
-	    	}	
+		 		$fld->max_length = $rs->fields[4];
+			}	
 		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
 			$fld->binary = (strpos($fld->type,'BLOB') !== false);
 			$fld->default_value = $rs->fields[6];

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

Indentation +16 added lines, -16 removed lines

@@ -180,41 +180,41 @@
 
 	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
-        // save old fetch mode
-        global $ADODB_FETCH_MODE;
-        $save = $ADODB_FETCH_MODE;
-        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-        if ($this->fetchMode !== FALSE) {
-               $savem = $this->SetFetchMode(FALSE);
-        }
+		// save old fetch mode
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+			   $savem = $this->SetFetchMode(FALSE);
+		}
 		$false = false;
 		// get index details
 		$table = strtoupper($table);
 		$SQL="SELECT NAME, UNIQUERULE, COLNAMES FROM SYSIBM.SYSINDEXES WHERE TBNAME='$table'";
-        if ($primary) 
+		if ($primary) 
 			$SQL.= " AND UNIQUERULE='P'";
 		$rs = $this->Execute($SQL);
-        if (!is_object($rs)) {
+		if (!is_object($rs)) {
 			if (isset($savem)) 
 				$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
-            return $false;
-        }
+			return $false;
+		}
 		$indexes = array ();
-        // parse index data into array
-        while ($row = $rs->FetchRow()) {
+		// parse index data into array
+		while ($row = $rs->FetchRow()) {
 			$indexes[$row[0]] = array(
 			   'unique' => ($row[1] == 'U' || $row[1] == 'P'),
 			   'columns' => array()
 			);
 			$cols = ltrim($row[2],'+');
 			$indexes[$row[0]]['columns'] = explode('+', $cols);
-        }
+		}
 		if (isset($savem)) { 
-            $this->SetFetchMode($savem);
+			$this->SetFetchMode($savem);
 			$ADODB_FETCH_MODE = $save;
 		}
-        return $indexes;
+		return $indexes;
 	}
 	
 	// Format date column in sql string given an input format that understands Y M D

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

Indentation +15 added lines, -29 removed lines

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

phpgwapi/inc/adodb/adodb.inc.php

Indentation +289 added lines, -290 removed lines

@@ -30,7 +30,6 @@ 
 
 	Latest Download at http://php.weblogs.com/adodb<br>
 	Manual is at http://php.weblogs.com/adodb_manual
-
  */
 
  if (!defined('_ADODB_LAYER')) {
@@ -75,11 +74,11 @@ 
 		2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
 		3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
 	*/
-        define('ADODB_FORCE_IGNORE',0);
-        define('ADODB_FORCE_NULL',1);
-        define('ADODB_FORCE_EMPTY',2);
-        define('ADODB_FORCE_VALUE',3);
-    //********************************************************//
+		define('ADODB_FORCE_IGNORE',0);
+		define('ADODB_FORCE_NULL',1);
+		define('ADODB_FORCE_EMPTY',2);
+		define('ADODB_FORCE_VALUE',3);
+	//********************************************************//
 
 
 	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
@@ -129,7 +128,7 @@ 
 
 	/**
 	 	Accepts $src and $dest arrays, replacing string $data
-	*/
+	 */
 	function ADODB_str_replace($src, $dest, $data)
 	{
 		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
@@ -338,7 +337,7 @@ 
 
 		@returns An array with 2 elements: $arr['string'] is the description string,
 			and $arr[version] is the version (also a string).
-	*/
+	 */
 	function ServerInfo()
 	{
 		return array('description' => '', 'version' => '');
@@ -346,7 +345,7 @@ 
 
 	function IsConnected()
 	{
-    	return !empty($this->_connectionID);
+		return !empty($this->_connectionID);
 	}
 
 	function _findvers($str)
@@ -356,9 +355,9 @@ 
 	}
 
 	/**
-	* All error messages go through this bottleneck function.
-	* You can define your own handler by defining the function name in ADODB_OUTP.
-	*/
+	 * All error messages go through this bottleneck function.
+	 * You can define your own handler by defining the function name in ADODB_OUTP.
+	 */
 	function outp($msg,$newline=true)
 	{
 	global $ADODB_FLUSH,$ADODB_OUTP;
@@ -539,8 +538,8 @@ 
 	}
 
 	/**
-	* PEAR DB Compat
-	*/
+	 * PEAR DB Compat
+	 */
 	function Quote($s)
 	{
 		return $this->qstr($s,false);
@@ -548,7 +547,7 @@ 
 
 	/**
 	 Requested by "Karsten Dambekalns" <k.dambekalns@fishfarm.de>
-	*/
+	 */
 	function QMagic($s)
 	{
 		return $this->qstr($s,get_magic_quotes_gpc());
@@ -560,8 +559,8 @@ 
 	}
 
 	/**
-	* PEAR DB Compat - do not use internally.
-	*/
+	 * PEAR DB Compat - do not use internally.
+	 */
 	function ErrorNative()
 	{
 		return $this->ErrorNo();
@@ -569,20 +568,20 @@ 
 
 
    /**
-	* PEAR DB Compat - do not use internally.
-	*/
+    * PEAR DB Compat - do not use internally.
+    */
 	function nextId($seq_name)
 	{
 		return $this->GenID($seq_name);
 	}
 
 	/**
-	*	 Lock a row, will escalate and lock the table if row locking not supported
-	*	will normally free the lock at the end of the transaction
-	*
-	*  @param $table	name of table to lock
-	*  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
-	*/
+	 *	 Lock a row, will escalate and lock the table if row locking not supported
+	 *	will normally free the lock at the end of the transaction
+	 *
+	 *  @param $table	name of table to lock
+	 *  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
+	 */
 	function RowLock($table,$where)
 	{
 		return false;
@@ -599,14 +598,14 @@ 
 	}
 
 	/**
-	* PEAR DB Compat - do not use internally.
-	*
-	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
-	* 	for easy porting :-)
-	*
-	* @param mode	The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
-	* @returns		The previous fetch mode
-	*/
+	 * PEAR DB Compat - do not use internally.
+	 *
+	 * The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
+	 * 	for easy porting :-)
+	 *
+	 * @param mode	The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
+	 * @returns		The previous fetch mode
+	 */
 	function SetFetchMode($mode)
 	{
 		$old = $this->fetchMode;
@@ -621,8 +620,8 @@ 
 
 
 	/**
-	* PEAR DB Compat - do not use internally.
-	*/
+	 * PEAR DB Compat - do not use internally.
+	 */
 	function &Query($sql, $inputarr=false)
 	{
 		$rs = &$this->Execute($sql, $inputarr);
@@ -632,8 +631,8 @@ 
 
 
 	/**
-	* PEAR DB Compat - do not use internally
-	*/
+	 * PEAR DB Compat - do not use internally
+	 */
 	function &LimitQuery($sql, $offset, $count, $params=false)
 	{
 		$rs = &$this->SelectLimit($sql, $count, $offset, $params);
@@ -643,8 +642,8 @@ 
 
 
 	/**
-	* PEAR DB Compat - do not use internally
-	*/
+	 * PEAR DB Compat - do not use internally
+	 */
 	function Disconnect()
 	{
 		return $this->Close();
@@ -709,7 +708,7 @@ 
 		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.<br>
 		c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block
 		   are disabled, making it backward compatible.
-	*/
+	 */
 	function StartTrans($errfn = 'ADODB_TransMonitor')
 	{
 		if ($this->transOff > 0) {
@@ -734,7 +733,7 @@ 
 		@autoComplete if true, monitor sql errors and commit and rollback as appropriate,
 		and if set to false force rollback even if no SQL error detected.
 		@returns true on commit, false on rollback.
-	*/
+	 */
 	function CompleteTrans($autoComplete = true)
 	{
 		if ($this->transOff > 1) {
@@ -776,7 +775,7 @@ 
 
 	/**
 		Check if transaction has failed, only for Smart Transactions.
-	*/
+	 */
 	function HasFailedTrans()
 	{
 		if ($this->transOff > 0) return $this->_transOK == false;
@@ -990,8 +989,8 @@ 
 	}
 
 	/**
-	* @return # rows affected by UPDATE/DELETE
-	*/
+	 * @return # rows affected by UPDATE/DELETE
+	 */
 	function Affected_Rows()
 	{
 		if ($this->hasAffectedRows) {
@@ -1076,24 +1075,24 @@ 
 
 
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows.
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg.
-	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
-	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
-	* BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]		is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
+	 * Will select, getting rows from $offset (1-based), for $nrows.
+	 * This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	 * the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	 * MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	 * eg.
+	 *  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
+	 *  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
+	 *
+	 * Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
+	 * BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
+	 *
+	 * @param sql
+	 * @param [offset]	is the row to start calculations from (1-based)
+	 * @param [nrows]		is the number of rows to get
+	 * @param [inputarr]	array of bind variables
+	 * @param [secs2cache]		is a private parameter only used by jlim
+	 * @return		the recordset ($rs->databaseType == 'array')
+	 */
 	function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
 	{
 		if ($this->hasTop && $nrows > 0) {
@@ -1158,10 +1157,10 @@ 
 	}
 
 	/**
-	* Create serializable recordset. Breaks rs link to connection.
-	*
-	* @param rs			the recordset to serialize
-	*/
+	 * Create serializable recordset. Breaks rs link to connection.
+	 *
+	 * @param rs			the recordset to serialize
+	 */
 	function &SerializableRS(&$rs)
 	{
 		$rs2 =& $this->_rs2rs($rs);
@@ -1172,15 +1171,15 @@ 
 	}
 
 	/**
-	* Convert database recordset to an array recordset
-	* input recordset's cursor should be at beginning, and
-	* old $rs will be closed.
-	*
-	* @param rs			the recordset to copy
-	* @param [nrows]  	number of rows to retrieve (optional)
-	* @param [offset] 	offset by number of rows (optional)
-	* @return 			the new recordset
-	*/
+	 * Convert database recordset to an array recordset
+	 * input recordset's cursor should be at beginning, and
+	 * old $rs will be closed.
+	 *
+	 * @param rs			the recordset to copy
+	 * @param [nrows]  	number of rows to retrieve (optional)
+	 * @param [offset] 	offset by number of rows (optional)
+	 * @return 			the new recordset
+	 */
 	function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true)
 	{
 		if (! $rs) {
@@ -1253,12 +1252,12 @@ 
 	}
 
 	/**
-	* Return first element of first row of sql statement. Recordset is disposed
-	* for you.
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
+	 * Return first element of first row of sql statement. Recordset is disposed
+	 * for you.
+	 *
+	 * @param sql			SQL statement
+	 * @param [inputarr]		input bind array
+	 */
 	function GetOne($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
@@ -1345,10 +1344,10 @@ 
 
 
 	/**
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
+	 *
+	 * @param sql			SQL statement
+	 * @param [inputarr]		input bind array
+	 */
 	function &GetArray($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
@@ -1396,11 +1395,11 @@ 
 
 
 	/**
-	* Return one row of sql statement. Recordset is disposed for you.
-	*
-	* @param sql			SQL statement
-	* @param [inputarr]		input bind array
-	*/
+	 * Return one row of sql statement. Recordset is disposed for you.
+	 *
+	 * @param sql			SQL statement
+	 * @param [inputarr]		input bind array
+	 */
 	function &GetRow($sql,$inputarr=false)
 	{
 	global $ADODB_COUNTRECS;
@@ -1435,24 +1434,24 @@ 
 	}
 
 	/**
-	* Insert or replace a single record. Note: this is not the same as MySQL's replace.
-	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
-	* Also note that no table locking is done currently, so it is possible that the
-	* record be inserted twice by two programs...
-	*
-	* $this->Replace('products', array('prodname' =>"'Nails'","price" => 3.99), 'prodname');
-	*
-	* $table		table name
-	* $fieldArray	associative array of data (you must quote strings yourself).
-	* $keyCol		the primary key field name or if compound key, array of field names
-	* autoQuote		set to true to use a hueristic to quote strings. Works with nulls and numbers
-	*					but does not work with dates nor SQL functions.
-	* has_autoinc	the primary key is an auto-inc field, so skip in insert.
-	*
-	* Currently blob replace not supported
-	*
-	* returns 0 = fail, 1 = update, 2 = insert
-	*/
+	 * Insert or replace a single record. Note: this is not the same as MySQL's replace.
+	 * ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
+	 * Also note that no table locking is done currently, so it is possible that the
+	 * record be inserted twice by two programs...
+	 *
+	 * $this->Replace('products', array('prodname' =>"'Nails'","price" => 3.99), 'prodname');
+	 *
+	 * $table		table name
+	 * $fieldArray	associative array of data (you must quote strings yourself).
+	 * $keyCol		the primary key field name or if compound key, array of field names
+	 * autoQuote		set to true to use a hueristic to quote strings. Works with nulls and numbers
+	 *					but does not work with dates nor SQL functions.
+	 * has_autoinc	the primary key is an auto-inc field, so skip in insert.
+	 *
+	 * Currently blob replace not supported
+	 *
+	 * returns 0 = fail, 1 = update, 2 = insert
+	 */
 
 	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
 	{
@@ -1464,23 +1463,23 @@ 
 
 
 	/**
-	* Will select, getting rows from $offset (1-based), for $nrows.
-	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
-	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
-	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
-	* eg.
-	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
-	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
-	*
-	* BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
-	*
-	* @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
-	* @param sql
-	* @param [offset]	is the row to start calculations from (1-based)
-	* @param [nrows]	is the number of rows to get
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
- 	*/
+	 * Will select, getting rows from $offset (1-based), for $nrows.
+	 * This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	 * the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	 * MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	 * eg.
+	 *  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
+	 *  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
+	 *
+	 * BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
+	 *
+	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
+	 * @param sql
+	 * @param [offset]	is the row to start calculations from (1-based)
+	 * @param [nrows]	is the number of rows to get
+	 * @param [inputarr]	array of bind variables
+	 * @return		the recordset ($rs->databaseType == 'array')
+	 */
 	function &CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
 	{
 		if (!is_numeric($secs2cache)) {
@@ -1496,9 +1495,9 @@ 
 	}
 
 	/**
-	* Flush cached recordsets that match a particular $sql statement.
-	* If $sql == false, then we purge all files in the cache.
- 	*/
+	 * Flush cached recordsets that match a particular $sql statement.
+	 * If $sql == false, then we purge all files in the cache.
+	 */
 	function CacheFlush($sql=false,$inputarr=false)
 	{
 	global $ADODB_CACHE_DIR;
@@ -1530,19 +1529,19 @@ 
 	}
 
 	/**
-	* Private function to generate filename for caching.
-	* Filename is generated based on:
-	*
-	*  - sql statement
-	*  - database type (oci8, ibase, ifx, etc)
-	*  - database name
-	*  - userid
-	*  - setFetchMode (adodb 4.23)
-	*
-	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR).
-	* Assuming that we can have 50,000 files per directory with good performance,
-	* then we can scale to 12.8 million unique cached recordsets. Wow!
- 	*/
+	 * Private function to generate filename for caching.
+	 * Filename is generated based on:
+	 *
+	 *  - sql statement
+	 *  - database type (oci8, ibase, ifx, etc)
+	 *  - database name
+	 *  - userid
+	 *  - setFetchMode (adodb 4.23)
+	 *
+	 * When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR).
+	 * Assuming that we can have 50,000 files per directory with good performance,
+	 * then we can scale to 12.8 million unique cached recordsets. Wow!
+	 */
 	function _gencachename($sql,$createdir)
 	{
 	global $ADODB_CACHE_DIR;
@@ -1712,17 +1711,17 @@ 
 	 *		 be a simple select stmt with no groupby/orderby/limit
 	 *
 	 * "Jonathan Younger" <jyounger@unilab.com>
-  	 */
+	 */
 	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null)
 	{
 		global $ADODB_INCLUDED_LIB;
 
-        //********************************************************//
-        //This is here to maintain compatibility
-        //with older adodb versions. Sets force type to force nulls if $forcenulls is set.
+		//********************************************************//
+		//This is here to maintain compatibility
+		//with older adodb versions. Sets force type to force nulls if $forcenulls is set.
 		if (!isset($force)) {
 				global $ADODB_FORCE_TYPE;
-			    $force = $ADODB_FORCE_TYPE;
+				$force = $ADODB_FORCE_TYPE;
 		}
 		//********************************************************//
 
@@ -1740,7 +1739,7 @@ 
 	 *
 	 * Note: This function should only be used on a recordset
 	 *	   that is run against a single table.
-  	 */
+	 */
 	function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
 	{
 		global $ADODB_INCLUDED_LIB;
@@ -1755,23 +1754,23 @@ 
 
 
 	/**
-	* Update a blob column, given a where clause. There are more sophisticated
-	* blob handling functions that we could have implemented, but all require
-	* a very complex API. Instead we have chosen something that is extremely
-	* simple to understand and use.
-	*
-	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
-	*
-	* Usage to update a $blobvalue which has a primary key blob_id=1 into a
-	* field blobtable.blobcolumn:
-	*
-	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
-	*
-	* Insert example:
-	*
-	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
-	*/
+	 * Update a blob column, given a where clause. There are more sophisticated
+	 * blob handling functions that we could have implemented, but all require
+	 * a very complex API. Instead we have chosen something that is extremely
+	 * simple to understand and use.
+	 *
+	 * Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
+	 *
+	 * Usage to update a $blobvalue which has a primary key blob_id=1 into a
+	 * field blobtable.blobcolumn:
+	 *
+	 *	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
+	 *
+	 * Insert example:
+	 *
+	 *	$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')
 	{
@@ -1779,14 +1778,14 @@ 
 	}
 
 	/**
-	* Usage:
-	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
-	*
-	*	$blobtype supports 'BLOB' and 'CLOB'
-	*
-	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
-	*	$conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
-	*/
+	 * Usage:
+	 *	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
+	 *
+	 *	$blobtype supports 'BLOB' and 'CLOB'
+	 *
+	 *	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+	 *	$conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
+	 */
 	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
 	{
 		$fd = fopen($path,'rb');
@@ -1835,12 +1834,12 @@ 
 	}
 
 	/**
-	* Usage:
-	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
-	*
-	*	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
-	*	$conn->UpdateClob('clobtable','clobcol',$clob,'id=1');
-	*/
+	 * Usage:
+	 *	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
+	 *
+	 *	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
+	 *	$conn->UpdateClob('clobtable','clobcol',$clob,'id=1');
+	 */
 	function UpdateClob($table,$column,$val,$where)
 	{
 		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
@@ -1861,9 +1860,9 @@ 
 
 
 	/**
-	*  Change the SQL connection locale to a specified locale.
-	*  This is used to get the date formats written depending on the client locale.
-	*/
+	 *  Change the SQL connection locale to a specified locale.
+	 *  This is used to get the date formats written depending on the client locale.
+	 */
 	function SetDateLocale($locale = 'En')
 	{
 		$this->locale = $locale;
@@ -2077,12 +2076,12 @@ 
 		return $false;
 	}
 
-    /**
-      * List indexes on a table as an array.
-      * @param table  table name to query
-      * @param primary true to only show primary keys. Not actually used for most databases
-	  *
-      * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
+	/**
+	 * List indexes on a table as an array.
+	 * @param table  table name to query
+	 * @param primary true to only show primary keys. Not actually used for most databases
+	 *
+	 * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
 
 		 Array (
 		    [name_of_index] => Array
@@ -2094,12 +2093,12 @@ 
 		      	[1] => lastname
 	          )
 		)
-      */
-     function &MetaIndexes($table, $primary = false, $owner = false)
-     {
+	 */
+	 function &MetaIndexes($table, $primary = false, $owner = false)
+	 {
 	 		$false = false;
-            return $false;
-     }
+			return $false;
+	 }
 
 	/**
 	 * List columns names in a table as an array.
@@ -2259,12 +2258,12 @@ 
 	}
 
 		/**
-	 *
-	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
-	 * @param fmt 	is the format to apply to it, using date()
-	 *
-	 * @return a timestamp formated as user desires
-	 */
+		 *
+		 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
+		 * @param fmt 	is the format to apply to it, using date()
+		 *
+		 * @return a timestamp formated as user desires
+		 */
 	function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false)
 	{
 		if (!isset($v)) return $this->emptyTimeStamp;
@@ -2283,8 +2282,8 @@ 
 	}
 
 	/**
-	* Quotes a string, without prefixing nor appending quotes.
-	*/
+	 * Quotes a string, without prefixing nor appending quotes.
+	 */
 	function addq($s,$magic_quotes=false)
 	{
 		if (!$magic_quotes) {
@@ -2344,22 +2343,22 @@ 
 
 
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
-	* and/or last one of the recordset. Added by Iv�n Oliva to provide recordset pagination.
-	*
-	* See readme.htm#ex8 for an example of usage.
-	*
-	* @param sql
-	* @param nrows		is the number of rows per page to get
-	* @param page		is the page number to get (1-based)
-	* @param [inputarr]	array of bind variables
-	* @param [secs2cache]		is a private parameter only used by jlim
-	* @return		the recordset ($rs->databaseType == 'array')
-	*
-	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
-	*
-	*/
+	 * Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	 * $nrows rows per page. It also saves two boolean values saying if the given page is the first
+	 * and/or last one of the recordset. Added by Iv�n Oliva to provide recordset pagination.
+	 *
+	 * See readme.htm#ex8 for an example of usage.
+	 *
+	 * @param sql
+	 * @param nrows		is the number of rows per page to get
+	 * @param page		is the page number to get (1-based)
+	 * @param [inputarr]	array of bind variables
+	 * @param [secs2cache]		is a private parameter only used by jlim
+	 * @return		the recordset ($rs->databaseType == 'array')
+	 *
+	 * NOTE: phpLens uses a different algorithm and does not use PageExecute().
+	 *
+	 */
 	function &PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0)
 	{
 		global $ADODB_INCLUDED_LIB;
@@ -2371,17 +2370,17 @@ 
 
 
 	/**
-	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
-	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
-	* and/or last one of the recordset. Added by Iv�n Oliva to provide recordset pagination.
-	*
-	* @param secs2cache	seconds to cache data, set to 0 to force query
-	* @param sql
-	* @param nrows		is the number of rows per page to get
-	* @param page		is the page number to get (1-based)
-	* @param [inputarr]	array of bind variables
-	* @return		the recordset ($rs->databaseType == 'array')
-	*/
+	 * Will select the supplied $page number from a recordset, given that it is paginated in pages of
+	 * $nrows rows per page. It also saves two boolean values saying if the given page is the first
+	 * and/or last one of the recordset. Added by Iv�n Oliva to provide recordset pagination.
+	 *
+	 * @param secs2cache	seconds to cache data, set to 0 to force query
+	 * @param sql
+	 * @param nrows		is the number of rows per page to get
+	 * @param page		is the page number to get (1-based)
+	 * @param [inputarr]	array of bind variables
+	 * @return		the recordset ($rs->databaseType == 'array')
+	 */
 	function &CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false)
 	{
 		/*switch($this->dataProvider) {
@@ -2403,8 +2402,8 @@ 
 	//==============================================================================================
 
 	/**
-	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
-	*/
+	 * Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
+	 */
 	class ADOFetchObj {
 	};
 
@@ -2413,8 +2412,8 @@ 
 	//==============================================================================================
 
 	/**
-	* Lightweight recordset when there are no records to be returned
-	*/
+	 * Lightweight recordset when there are no records to be returned
+	 */
 	class ADORecordSet_empty
 	{
 		var $dataProvider = 'empty';
@@ -2444,11 +2443,11 @@ 
 	if (PHP_VERSION < 5) include_once(ADODB_DIR.'/adodb-php4.inc.php');
 	else include_once(ADODB_DIR.'/adodb-iterator.inc.php');
    /**
-	 * RecordSet class that represents the dataset returned by the database.
-	 * To keep memory overhead low, this class holds only the current row in memory.
-	 * No prefetching of data is done, so the RecordCount() can return -1 ( which
-	 * means recordcount not known).
-	 */
+    * RecordSet class that represents the dataset returned by the database.
+    * To keep memory overhead low, this class holds only the current row in memory.
+    * No prefetching of data is done, so the RecordCount() can return -1 ( which
+    * means recordcount not known).
+    */
 	class ADORecordSet extends ADODB_BASE_RS {
 	/*
 	 * public variables
@@ -2809,8 +2808,8 @@ 
 
 
 	/**
-	* PEAR DB Compat - do not use internally
-	*/
+	 * PEAR DB Compat - do not use internally
+	 */
 	function Free()
 	{
 		return $this->Close();
@@ -2818,8 +2817,8 @@ 
 
 
 	/**
-	* PEAR DB compat, number of rows
-	*/
+	 * PEAR DB compat, number of rows
+	 */
 	function NumRows()
 	{
 		return $this->_numOfRows;
@@ -2827,19 +2826,19 @@ 
 
 
 	/**
-	* PEAR DB compat, number of cols
-	*/
+	 * PEAR DB compat, number of cols
+	 */
 	function NumCols()
 	{
 		return $this->_numOfFields;
 	}
 
 	/**
-	* Fetch a row, returning false if no more rows.
-	* This is PEAR DB compat mode.
-	*
-	* @return false or array containing the current record
-	*/
+	 * Fetch a row, returning false if no more rows.
+	 * This is PEAR DB compat mode.
+	 *
+	 * @return false or array containing the current record
+	 */
 	function &FetchRow()
 	{
 		if ($this->EOF) {
@@ -2854,11 +2853,11 @@ 
 
 
 	/**
-	* Fetch a row, returning PEAR_Error if no more rows.
-	* This is PEAR DB compat mode.
-	*
-	* @return DB_OK or error object
-	*/
+	 * Fetch a row, returning PEAR_Error if no more rows.
+	 * This is PEAR DB compat mode.
+	 *
+	 * @return DB_OK or error object
+	 */
 	function FetchInto(&$arr)
 	{
 		if ($this->EOF) return (defined('PEAR_ERROR_RETURN')) ? new PEAR_Error('EOF',-1): false;
@@ -3064,13 +3063,13 @@ 
 
 
 	 /**
-	 * Portable RecordCount. Pablo Roca <pabloroca@mvps.org>
-	 *
-	 * @return  the number of records from a previous SELECT. All databases support this.
-	 *
-	 * But aware possible problems in multiuser environments. For better speed the table
-	 * must be indexed by the condition. Heavy test this before deploying.
-	 */
+	  * Portable RecordCount. Pablo Roca <pabloroca@mvps.org>
+	  *
+	  * @return  the number of records from a previous SELECT. All databases support this.
+	  *
+	  * But aware possible problems in multiuser environments. For better speed the table
+	  * must be indexed by the condition. Heavy test this before deploying.
+	  */
 	function PO_RecordCount($table="", $condition="") {
 
 		$lnumrows = $this->_numOfRows;
@@ -3129,11 +3128,11 @@ 
 	}
 
 	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default case is lowercase field names.
-	*
-	* @return the object with the properties set to the fields of the current row
-	*/
+	 * Return the fields array of the current row as an object for convenience.
+	 * The default case is lowercase field names.
+	 *
+	 * @return the object with the properties set to the fields of the current row
+	 */
 	function &FetchObj()
 	{
 		$o =& $this->FetchObject(false);
@@ -3141,13 +3140,13 @@ 
 	}
 
 	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default case is uppercase.
-	*
-	* @param $isupper to set the object property names to uppercase
-	*
-	* @return the object with the properties set to the fields of the current row
-	*/
+	 * Return the fields array of the current row as an object for convenience.
+	 * The default case is uppercase.
+	 *
+	 * @param $isupper to set the object property names to uppercase
+	 *
+	 * @return the object with the properties set to the fields of the current row
+	 */
 	function &FetchObject($isupper=true)
 	{
 		if (empty($this->_obj)) {
@@ -3173,14 +3172,14 @@ 
 	}
 
 	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default is lower-case field names.
-	*
-	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
-	*
-	* Fixed bug reported by tim@orotech.net
-	*/
+	 * Return the fields array of the current row as an object for convenience.
+	 * The default is lower-case field names.
+	 *
+	 * @return the object with the properties set to the fields of the current row,
+	 * 	or false if EOF
+	 *
+	 * Fixed bug reported by tim@orotech.net
+	 */
 	function &FetchNextObj()
 	{
 		$o =& $this->FetchNextObject(false);
@@ -3189,16 +3188,16 @@ 
 
 
 	/**
-	* Return the fields array of the current row as an object for convenience.
-	* The default is upper case field names.
-	*
-	* @param $isupper to set the object property names to uppercase
-	*
-	* @return the object with the properties set to the fields of the current row,
-	* 	or false if EOF
-	*
-	* Fixed bug reported by tim@orotech.net
-	*/
+	 * Return the fields array of the current row as an object for convenience.
+	 * The default is upper case field names.
+	 *
+	 * @param $isupper to set the object property names to uppercase
+	 *
+	 * @return the object with the properties set to the fields of the current row,
+	 * 	or false if EOF
+	 *
+	 * Fixed bug reported by tim@orotech.net
+	 */
 	function &FetchNextObject($isupper=true)
 	{
 		$o = false;
@@ -3234,7 +3233,7 @@ 
 	 *	R for autoincrement counter/integer
 	 *
 	 *
-	*/
+	 */
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {