EGroupware / egroupware

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

Indentation -1 removed lines

@@ -26,7 +26,6 @@
 the session didn't work properly.
 
 This may be resolved with 4.3.3.
-
  */
 class ADODB_Encrypt_Secret {
 	/**

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

Indentation +1 added lines, -1 removed lines

@@ -299,7 +299,7 @@
 		$arr['expireref'] = $$var;
 	}
 	$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr,
-    	'sesskey',$autoQuote = true);
+		'sesskey',$autoQuote = true);
 	
 	if (!$rs) {
 		ADOConnection::outp( '

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

Indentation +2 added lines, -2 removed lines

@@ -188,8 +188,8 @@
 		$arr['expireref'] = $$var;
 	}
 	$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,
-	    $arr,
-    	'sesskey',$autoQuote = true);
+		$arr,
+		'sesskey',$autoQuote = true);
 
 	if (!$rs) {
 		ADOConnection::outp( '

phpgwapi/inc/adodb/adodb-errorpear.inc.php

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 * @param $errmsg	the native error msg from the database
 * @param $p1		$fn specific parameter - see below
 * @param $P2		$fn specific parameter - see below
-	*/
+   */
 function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
 {
 global $ADODB_Last_PEAR_Error;

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

Indentation +26 added lines, -26 removed lines

@@ -281,35 +281,35 @@
 		return round(($hits/($reqs+$hits))*100,2);
 	}
 	
-    // start hack 
-    var $optimizeTableLow = 'CHECK TABLE %s FAST QUICK';
-    var $optimizeTableHigh = 'OPTIMIZE TABLE %s';
+	// start hack 
+	var $optimizeTableLow = 'CHECK TABLE %s FAST QUICK';
+	var $optimizeTableHigh = 'OPTIMIZE TABLE %s';
     
-    /** 
-     * @see adodb_perf#optimizeTable
-     */
-     function optimizeTable( $table, $mode = ADODB_OPT_LOW) 
-     {
-        if ( !is_string( $table)) return false;
+	/** 
+	 * @see adodb_perf#optimizeTable
+	 */
+	 function optimizeTable( $table, $mode = ADODB_OPT_LOW) 
+	 {
+		if ( !is_string( $table)) return false;
         
-        $conn = $this->conn;
-        if ( !$conn) return false;
+		$conn = $this->conn;
+		if ( !$conn) return false;
         
-        $sql = '';
-        switch( $mode) {
-            case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break;
-            case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break;
-            default : 
-            {
-                // May dont use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0)
-                ADOConnection::outp( sprintf( "<p>%s: '%s' using of undefined mode '%s'</p>", __CLASS__, __FUNCTION__, $mode));
-                return false;
-            }
-        }
-        $sql = sprintf( $sql, $table);
+		$sql = '';
+		switch( $mode) {
+			case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break;
+			case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break;
+			default : 
+			{
+				// May dont use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0)
+				ADOConnection::outp( sprintf( "<p>%s: '%s' using of undefined mode '%s'</p>", __CLASS__, __FUNCTION__, $mode));
+				return false;
+			}
+		}
+		$sql = sprintf( $sql, $table);
         
-        return $conn->Execute( $sql) !== false;
-     }
-    // end hack 
+		return $conn->Execute( $sql) !== false;
+	 }
+	// end hack 
 }
 ?>
\ No newline at end of file

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

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 ) {

phpgwapi/inc/adodb/contrib/toxmlrpc.inc.php

Indentation +150 added lines, -150 removed lines

@@ -1,157 +1,157 @@
 <?php
-    /**
-    * Helper functions to convert between ADODB recordset objects and XMLRPC values.
-    * Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
-    * 
-    * @author Daniele Baroncelli
-    * @author Gaetano Giunta
-    * @copyright (c) 2003 Giunta/Baroncelli. All rights reserved.
-    * 
-    * @todo some more error checking here and there
-    * @todo document the xmlrpc-struct used to encode recordset info
-    */
-
-    /**
-    * Include the main libraries
-    */    
-    require_once('xmlrpc.inc');
-    require_once('adodb.inc.php');
+	/**
+	 * Helper functions to convert between ADODB recordset objects and XMLRPC values.
+	 * Uses John Lim's AdoDB and Edd Dumbill's phpxmlrpc libs
+	 * 
+	 * @author Daniele Baroncelli
+	 * @author Gaetano Giunta
+	 * @copyright (c) 2003 Giunta/Baroncelli. All rights reserved.
+	 * 
+	 * @todo some more error checking here and there
+	 * @todo document the xmlrpc-struct used to encode recordset info
+	 */
+
+	/**
+	 * Include the main libraries
+	 */    
+	require_once('xmlrpc.inc');
+	require_once('adodb.inc.php');
             
-    /**
-    * Builds an xmlrpc struct value out of an AdoDB recordset
-    */
-    function rs2xmlrpcval(&$adodbrs) {
-
-        $numfields = $adodbrs->FieldCount();
-        $numrecords = $adodbrs->RecordCount();
-
-        // build structure holding recordset information
-        $fieldstruct = array();
-        for ($i = 0; $i < $numfields; $i++) {
-            $fld = $adodbrs->FetchField($i);
-            $fieldarray = array();
-            if (isset($fld->name))
-                $fieldarray["name"] = new xmlrpcval ($fld->name);
-            if (isset($fld->type))
-                $fieldarray["type"] = new xmlrpcval ($fld->type);
-            if (isset($fld->max_length))
-                $fieldarray["max_length"] = new xmlrpcval ($fld->max_length, "int");
-            if (isset($fld->not_null))
-                $fieldarray["not_null"] = new xmlrpcval ($fld->not_null, "boolean");
-            if (isset($fld->has_default))
-                $fieldarray["has_default"] = new xmlrpcval ($fld->has_default, "boolean");
-            if (isset($fld->default_value))
-                $fieldarray["default_value"] = new xmlrpcval ($fld->default_value);
-            $fieldstruct[$i] = new xmlrpcval ($fieldarray, "struct");
-        }
-        $fieldcount = new xmlrpcval ($numfields, "int");
-        $recordcount = new xmlrpcval ($numrecords, "int");
-        $sql = new xmlrpcval ($adodbrs->sql);
-        $fieldinfo = new xmlrpcval ($fieldstruct, "array");
-
-        $header = new xmlrpcval ( array(
-                "fieldcount" => $fieldcount,
-                "recordcount" => $recordcount,
-                "sql" => $sql,
-                "fieldinfo" => $fieldinfo
-                ), "struct");
-
-        // build structure containing recordset data
-        $rows = array();
-        while (!$adodbrs->EOF) {
-            $columns = array();
-            // This should work on all cases of fetch mode: assoc, num, both or default
-            if ($adodbrs->fetchMode == 'ADODB_FETCH_BOTH' || count($adodbrs->fields) == 2 * $adodbrs->FieldCount())
-                for ($i = 0; $i < $numfields; $i++)
-                    if ($columns[$i] === null)
-                        $columns[$i] = new xmlrpcval ('');
-                    else
-                        $columns[$i] = xmlrpc_encode ($adodbrs->fields[$i]);
-            else
-                foreach ($adodbrs->fields as $val)
-                    if ($val === null)
-                        $columns[$i] = new xmlrpcval ('');
-                    else
-                        $columns[] = xmlrpc_encode ($val);
-
-            $rows[] = new xmlrpcval ($columns, "array");
-
-            $adodbrs->MoveNext();
-        }
-        $body = new xmlrpcval ($rows, "array");
-
-        // put it all together and build final xmlrpc struct
-        $xmlrpcrs = new xmlrpcval ( array(
-                "header" => $header,
-                "body" => $body,
-                ), "struct");
-
-        return $xmlrpcrs;
-
-    }
-
-    /**
-    * Returns an xmlrpc struct value as string out of an AdoDB recordset
-    */    
-    function rs2xmlrpcstring (&$adodbrs) {
-        $xmlrpc = rs2xmlrpcval ($adodbrs);
-        if ($xmlrpc)
-          return $xmlrpc->serialize();
-        else
-          return null;
-    }
-
-    /**
-    * Given a well-formed xmlrpc struct object returns an AdoDB object
-    * 
-    * @todo add some error checking on the input value
-    */
-    function xmlrpcval2rs (&$xmlrpcval) {
-
-        $fields_array = array();
-        $data_array = array();
+	/**
+	 * Builds an xmlrpc struct value out of an AdoDB recordset
+	 */
+	function rs2xmlrpcval(&$adodbrs) {
+
+		$numfields = $adodbrs->FieldCount();
+		$numrecords = $adodbrs->RecordCount();
+
+		// build structure holding recordset information
+		$fieldstruct = array();
+		for ($i = 0; $i < $numfields; $i++) {
+			$fld = $adodbrs->FetchField($i);
+			$fieldarray = array();
+			if (isset($fld->name))
+				$fieldarray["name"] = new xmlrpcval ($fld->name);
+			if (isset($fld->type))
+				$fieldarray["type"] = new xmlrpcval ($fld->type);
+			if (isset($fld->max_length))
+				$fieldarray["max_length"] = new xmlrpcval ($fld->max_length, "int");
+			if (isset($fld->not_null))
+				$fieldarray["not_null"] = new xmlrpcval ($fld->not_null, "boolean");
+			if (isset($fld->has_default))
+				$fieldarray["has_default"] = new xmlrpcval ($fld->has_default, "boolean");
+			if (isset($fld->default_value))
+				$fieldarray["default_value"] = new xmlrpcval ($fld->default_value);
+			$fieldstruct[$i] = new xmlrpcval ($fieldarray, "struct");
+		}
+		$fieldcount = new xmlrpcval ($numfields, "int");
+		$recordcount = new xmlrpcval ($numrecords, "int");
+		$sql = new xmlrpcval ($adodbrs->sql);
+		$fieldinfo = new xmlrpcval ($fieldstruct, "array");
+
+		$header = new xmlrpcval ( array(
+				"fieldcount" => $fieldcount,
+				"recordcount" => $recordcount,
+				"sql" => $sql,
+				"fieldinfo" => $fieldinfo
+				), "struct");
+
+		// build structure containing recordset data
+		$rows = array();
+		while (!$adodbrs->EOF) {
+			$columns = array();
+			// This should work on all cases of fetch mode: assoc, num, both or default
+			if ($adodbrs->fetchMode == 'ADODB_FETCH_BOTH' || count($adodbrs->fields) == 2 * $adodbrs->FieldCount())
+				for ($i = 0; $i < $numfields; $i++)
+					if ($columns[$i] === null)
+						$columns[$i] = new xmlrpcval ('');
+					else
+						$columns[$i] = xmlrpc_encode ($adodbrs->fields[$i]);
+			else
+				foreach ($adodbrs->fields as $val)
+					if ($val === null)
+						$columns[$i] = new xmlrpcval ('');
+					else
+						$columns[] = xmlrpc_encode ($val);
+
+			$rows[] = new xmlrpcval ($columns, "array");
+
+			$adodbrs->MoveNext();
+		}
+		$body = new xmlrpcval ($rows, "array");
+
+		// put it all together and build final xmlrpc struct
+		$xmlrpcrs = new xmlrpcval ( array(
+				"header" => $header,
+				"body" => $body,
+				), "struct");
+
+		return $xmlrpcrs;
+
+	}
+
+	/**
+	 * Returns an xmlrpc struct value as string out of an AdoDB recordset
+	 */    
+	function rs2xmlrpcstring (&$adodbrs) {
+		$xmlrpc = rs2xmlrpcval ($adodbrs);
+		if ($xmlrpc)
+		  return $xmlrpc->serialize();
+		else
+		  return null;
+	}
+
+	/**
+	 * Given a well-formed xmlrpc struct object returns an AdoDB object
+	 * 
+	 * @todo add some error checking on the input value
+	 */
+	function xmlrpcval2rs (&$xmlrpcval) {
+
+		$fields_array = array();
+		$data_array = array();
  
-        // rebuild column information  
-        $header =& $xmlrpcval->structmem('header');
+		// rebuild column information  
+		$header =& $xmlrpcval->structmem('header');
         
-        $numfields = $header->structmem('fieldcount');
-        $numfields = $numfields->scalarval();
-        $numrecords = $header->structmem('recordcount');
-        $numrecords = $numrecords->scalarval();
-        $sqlstring = $header->structmem('sql');
-        $sqlstring = $sqlstring->scalarval();
+		$numfields = $header->structmem('fieldcount');
+		$numfields = $numfields->scalarval();
+		$numrecords = $header->structmem('recordcount');
+		$numrecords = $numrecords->scalarval();
+		$sqlstring = $header->structmem('sql');
+		$sqlstring = $sqlstring->scalarval();
         
-        $fieldinfo =& $header->structmem('fieldinfo');
-        for ($i = 0; $i < $numfields; $i++) {
-            $temp =& $fieldinfo->arraymem($i);
-            $fld = new ADOFieldObject();
-            while (list($key,$value) = $temp->structeach()) {
-                if ($key == "name") $fld->name = $value->scalarval();
-                if ($key == "type") $fld->type = $value->scalarval();
-                if ($key == "max_length") $fld->max_length = $value->scalarval();
-                if ($key == "not_null") $fld->not_null = $value->scalarval();
-                if ($key == "has_default") $fld->has_default = $value->scalarval();
-                if ($key == "default_value") $fld->default_value = $value->scalarval();
-            } // while
-            $fields_array[] = $fld;
-        } // for
-
-        // fetch recordset information into php array
-        $body =& $xmlrpcval->structmem('body');
-        for ($i = 0; $i < $numrecords; $i++) {
-            $data_array[$i]= array();
-            $xmlrpcrs_row =& $body->arraymem($i);
-            for ($j = 0; $j < $numfields; $j++) {
-                $temp =& $xmlrpcrs_row->arraymem($j);
-                $data_array[$i][$j] = $temp->scalarval();
-            } // for j
-        } // for i
-
-        // finally build in-memory recordset object and return it
-        $rs = new ADORecordSet_array();
-        $rs->InitArrayFields($data_array,$fields_array);
-        return $rs;
-
-    }
+		$fieldinfo =& $header->structmem('fieldinfo');
+		for ($i = 0; $i < $numfields; $i++) {
+			$temp =& $fieldinfo->arraymem($i);
+			$fld = new ADOFieldObject();
+			while (list($key,$value) = $temp->structeach()) {
+				if ($key == "name") $fld->name = $value->scalarval();
+				if ($key == "type") $fld->type = $value->scalarval();
+				if ($key == "max_length") $fld->max_length = $value->scalarval();
+				if ($key == "not_null") $fld->not_null = $value->scalarval();
+				if ($key == "has_default") $fld->has_default = $value->scalarval();
+				if ($key == "default_value") $fld->default_value = $value->scalarval();
+			} // while
+			$fields_array[] = $fld;
+		} // for
+
+		// fetch recordset information into php array
+		$body =& $xmlrpcval->structmem('body');
+		for ($i = 0; $i < $numrecords; $i++) {
+			$data_array[$i]= array();
+			$xmlrpcrs_row =& $body->arraymem($i);
+			for ($j = 0; $j < $numfields; $j++) {
+				$temp =& $xmlrpcrs_row->arraymem($j);
+				$data_array[$i][$j] = $temp->scalarval();
+			} // for j
+		} // for i
+
+		// finally build in-memory recordset object and return it
+		$rs = new ADORecordSet_array();
+		$rs->InitArrayFields($data_array,$fields_array);
+		return $rs;
+
+	}
 
 ?>

phpgwapi/inc/adodb/rsfilter.inc.php

Indentation +5 added lines, -5 removed lines

@@ -43,12 +43,12 @@
 	$rows = $rs->RecordCount();
 	for ($i=0; $i < $rows; $i++) {
 		if (is_array ($fn)) {
-        	$obj = $fn[0];
-        	$method = $fn[1];
-        	$obj->$method ($rs->_array[$i],$rs);
-      } else {
+			$obj = $fn[0];
+			$method = $fn[1];
+			$obj->$method ($rs->_array[$i],$rs);
+	  } else {
 			$fn($rs->_array[$i],$rs);
-      }
+	  }
 	  
 	}
 	if (!$rs->EOF) {

phpgwapi/inc/adodb/adodb-error.inc.php

Indentation +106 added lines, -106 removed lines

@@ -51,7 +51,7 @@ 
 	if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == $ADODB_LANG) ;
 	else {
 		include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");
-    }
+	}
 	return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : $ADODB_LANG_ARRAY[DB_ERROR];
 }
 
@@ -91,84 +91,84 @@ 
 function adodb_error_pg($errormsg)
 {
 	if (is_numeric($errormsg)) return (integer) $errormsg;
-    static $error_regexps = array(
-            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
-            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
-            '/divide by zero$/'                     => DB_ERROR_DIVZERO,
-            '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,
-            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,
-            '/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,
-            '/referential integrity violation/'     => DB_ERROR_CONSTRAINT,
+	static $error_regexps = array(
+			'/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
+			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
+			'/divide by zero$/'                     => DB_ERROR_DIVZERO,
+			'/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,
+			'/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,
+			'/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,
+			'/referential integrity violation/'     => DB_ERROR_CONSTRAINT,
 			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/'     
 			 	 => DB_ERROR_ALREADY_EXISTS
-        );
+		);
 	reset($error_regexps);
-    while (list($regexp,$code) = each($error_regexps)) {
-        if (preg_match($regexp, $errormsg)) {
-            return $code;
-        }
-    }
-    // Fall back to DB_ERROR if there was no mapping.
-    return DB_ERROR;
+	while (list($regexp,$code) = each($error_regexps)) {
+		if (preg_match($regexp, $errormsg)) {
+			return $code;
+		}
+	}
+	// Fall back to DB_ERROR if there was no mapping.
+	return DB_ERROR;
 }
 	
 function adodb_error_odbc()
 {
 static $MAP = array(
-            '01004' => DB_ERROR_TRUNCATED,
-            '07001' => DB_ERROR_MISMATCH,
-            '21S01' => DB_ERROR_MISMATCH,
-            '21S02' => DB_ERROR_MISMATCH,
-            '22003' => DB_ERROR_INVALID_NUMBER,
-            '22008' => DB_ERROR_INVALID_DATE,
-            '22012' => DB_ERROR_DIVZERO,
-            '23000' => DB_ERROR_CONSTRAINT,
-            '24000' => DB_ERROR_INVALID,
-            '34000' => DB_ERROR_INVALID,
-            '37000' => DB_ERROR_SYNTAX,
-            '42000' => DB_ERROR_SYNTAX,
-            'IM001' => DB_ERROR_UNSUPPORTED,
-            'S0000' => DB_ERROR_NOSUCHTABLE,
-            'S0001' => DB_ERROR_NOT_FOUND,
-            'S0002' => DB_ERROR_NOSUCHTABLE,
-            'S0011' => DB_ERROR_ALREADY_EXISTS,
-            'S0012' => DB_ERROR_NOT_FOUND,
-            'S0021' => DB_ERROR_ALREADY_EXISTS,
-            'S0022' => DB_ERROR_NOT_FOUND,
+			'01004' => DB_ERROR_TRUNCATED,
+			'07001' => DB_ERROR_MISMATCH,
+			'21S01' => DB_ERROR_MISMATCH,
+			'21S02' => DB_ERROR_MISMATCH,
+			'22003' => DB_ERROR_INVALID_NUMBER,
+			'22008' => DB_ERROR_INVALID_DATE,
+			'22012' => DB_ERROR_DIVZERO,
+			'23000' => DB_ERROR_CONSTRAINT,
+			'24000' => DB_ERROR_INVALID,
+			'34000' => DB_ERROR_INVALID,
+			'37000' => DB_ERROR_SYNTAX,
+			'42000' => DB_ERROR_SYNTAX,
+			'IM001' => DB_ERROR_UNSUPPORTED,
+			'S0000' => DB_ERROR_NOSUCHTABLE,
+			'S0001' => DB_ERROR_NOT_FOUND,
+			'S0002' => DB_ERROR_NOSUCHTABLE,
+			'S0011' => DB_ERROR_ALREADY_EXISTS,
+			'S0012' => DB_ERROR_NOT_FOUND,
+			'S0021' => DB_ERROR_ALREADY_EXISTS,
+			'S0022' => DB_ERROR_NOT_FOUND,
 			'S1000' => DB_ERROR_NOSUCHTABLE,
-            'S1009' => DB_ERROR_INVALID,
-            'S1090' => DB_ERROR_INVALID,
-            'S1C00' => DB_ERROR_NOT_CAPABLE
-        );
+			'S1009' => DB_ERROR_INVALID,
+			'S1090' => DB_ERROR_INVALID,
+			'S1C00' => DB_ERROR_NOT_CAPABLE
+		);
 		return $MAP;
 }
 
 function adodb_error_ibase()
 {
 static $MAP = array(
-            -104 => DB_ERROR_SYNTAX,
-            -150 => DB_ERROR_ACCESS_VIOLATION,
-            -151 => DB_ERROR_ACCESS_VIOLATION,
-            -155 => DB_ERROR_NOSUCHTABLE,
-            -157 => DB_ERROR_NOSUCHFIELD,
-            -158 => DB_ERROR_VALUE_COUNT_ON_ROW,
-            -170 => DB_ERROR_MISMATCH,
-            -171 => DB_ERROR_MISMATCH,
-            -172 => DB_ERROR_INVALID,
-            -204 => DB_ERROR_INVALID,
-            -205 => DB_ERROR_NOSUCHFIELD,
-            -206 => DB_ERROR_NOSUCHFIELD,
-            -208 => DB_ERROR_INVALID,
-            -219 => DB_ERROR_NOSUCHTABLE,
-            -297 => DB_ERROR_CONSTRAINT,
-            -530 => DB_ERROR_CONSTRAINT,
-            -803 => DB_ERROR_CONSTRAINT,
-            -551 => DB_ERROR_ACCESS_VIOLATION,
-            -552 => DB_ERROR_ACCESS_VIOLATION,
-            -922 => DB_ERROR_NOSUCHDB,
-            -923 => DB_ERROR_CONNECT_FAILED,
-            -924 => DB_ERROR_CONNECT_FAILED
-        );
+			-104 => DB_ERROR_SYNTAX,
+			-150 => DB_ERROR_ACCESS_VIOLATION,
+			-151 => DB_ERROR_ACCESS_VIOLATION,
+			-155 => DB_ERROR_NOSUCHTABLE,
+			-157 => DB_ERROR_NOSUCHFIELD,
+			-158 => DB_ERROR_VALUE_COUNT_ON_ROW,
+			-170 => DB_ERROR_MISMATCH,
+			-171 => DB_ERROR_MISMATCH,
+			-172 => DB_ERROR_INVALID,
+			-204 => DB_ERROR_INVALID,
+			-205 => DB_ERROR_NOSUCHFIELD,
+			-206 => DB_ERROR_NOSUCHFIELD,
+			-208 => DB_ERROR_INVALID,
+			-219 => DB_ERROR_NOSUCHTABLE,
+			-297 => DB_ERROR_CONSTRAINT,
+			-530 => DB_ERROR_CONSTRAINT,
+			-803 => DB_ERROR_CONSTRAINT,
+			-551 => DB_ERROR_ACCESS_VIOLATION,
+			-552 => DB_ERROR_ACCESS_VIOLATION,
+			-922 => DB_ERROR_NOSUCHDB,
+			-923 => DB_ERROR_CONNECT_FAILED,
+			-924 => DB_ERROR_CONNECT_FAILED
+		);
 		
 		return $MAP;
 }
@@ -176,17 +176,17 @@ 
 function adodb_error_ifx()
 {
 static $MAP = array(
-            '-201'    => DB_ERROR_SYNTAX,
-            '-206'    => DB_ERROR_NOSUCHTABLE,
-            '-217'    => DB_ERROR_NOSUCHFIELD,
-            '-329'    => DB_ERROR_NODBSELECTED,
-            '-1204'   => DB_ERROR_INVALID_DATE,
-            '-1205'   => DB_ERROR_INVALID_DATE,
-            '-1206'   => DB_ERROR_INVALID_DATE,
-            '-1209'   => DB_ERROR_INVALID_DATE,
-            '-1210'   => DB_ERROR_INVALID_DATE,
-            '-1212'   => DB_ERROR_INVALID_DATE
-       );
+			'-201'    => DB_ERROR_SYNTAX,
+			'-206'    => DB_ERROR_NOSUCHTABLE,
+			'-217'    => DB_ERROR_NOSUCHFIELD,
+			'-329'    => DB_ERROR_NODBSELECTED,
+			'-1204'   => DB_ERROR_INVALID_DATE,
+			'-1205'   => DB_ERROR_INVALID_DATE,
+			'-1206'   => DB_ERROR_INVALID_DATE,
+			'-1209'   => DB_ERROR_INVALID_DATE,
+			'-1210'   => DB_ERROR_INVALID_DATE,
+			'-1212'   => DB_ERROR_INVALID_DATE
+	   );
 	   
 	   return $MAP;
 }
@@ -195,17 +195,17 @@ 
 {
 static $MAP = array(
 			 1 => DB_ERROR_ALREADY_EXISTS,
-            900 => DB_ERROR_SYNTAX,
-            904 => DB_ERROR_NOSUCHFIELD,
-            923 => DB_ERROR_SYNTAX,
-            942 => DB_ERROR_NOSUCHTABLE,
-            955 => DB_ERROR_ALREADY_EXISTS,
-            1476 => DB_ERROR_DIVZERO,
-            1722 => DB_ERROR_INVALID_NUMBER,
-            2289 => DB_ERROR_NOSUCHTABLE,
-            2291 => DB_ERROR_CONSTRAINT,
-            2449 => DB_ERROR_CONSTRAINT
-        );
+			900 => DB_ERROR_SYNTAX,
+			904 => DB_ERROR_NOSUCHFIELD,
+			923 => DB_ERROR_SYNTAX,
+			942 => DB_ERROR_NOSUCHTABLE,
+			955 => DB_ERROR_ALREADY_EXISTS,
+			1476 => DB_ERROR_DIVZERO,
+			1722 => DB_ERROR_INVALID_NUMBER,
+			2289 => DB_ERROR_NOSUCHTABLE,
+			2291 => DB_ERROR_CONSTRAINT,
+			2449 => DB_ERROR_CONSTRAINT
+		);
 	   
 	return $MAP;
 }
@@ -214,8 +214,8 @@ 
 {
 static $MAP = array(
 		  208 => DB_ERROR_NOSUCHTABLE,
-          2601 => DB_ERROR_ALREADY_EXISTS
-       );
+		  2601 => DB_ERROR_ALREADY_EXISTS
+	   );
 	   
 	return $MAP;
 }
@@ -224,7 +224,7 @@ 
 {
 static $MAP = array(
 		  1 => DB_ERROR_SYNTAX
-       );
+	   );
 	   
 	return $MAP;
 }
@@ -232,26 +232,26 @@ 
 function adodb_error_mysql()
 {
 static $MAP = array(
-           1004 => DB_ERROR_CANNOT_CREATE,
-           1005 => DB_ERROR_CANNOT_CREATE,
-           1006 => DB_ERROR_CANNOT_CREATE,
-           1007 => DB_ERROR_ALREADY_EXISTS,
-           1008 => DB_ERROR_CANNOT_DROP,
+		   1004 => DB_ERROR_CANNOT_CREATE,
+		   1005 => DB_ERROR_CANNOT_CREATE,
+		   1006 => DB_ERROR_CANNOT_CREATE,
+		   1007 => DB_ERROR_ALREADY_EXISTS,
+		   1008 => DB_ERROR_CANNOT_DROP,
 		   1045 => DB_ERROR_ACCESS_VIOLATION,
-           1046 => DB_ERROR_NODBSELECTED,
+		   1046 => DB_ERROR_NODBSELECTED,
 		   1049 => DB_ERROR_NOSUCHDB,
-           1050 => DB_ERROR_ALREADY_EXISTS,
-           1051 => DB_ERROR_NOSUCHTABLE,
-           1054 => DB_ERROR_NOSUCHFIELD,
-           1062 => DB_ERROR_ALREADY_EXISTS,
-           1064 => DB_ERROR_SYNTAX,
-           1100 => DB_ERROR_NOT_LOCKED,
-           1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
-           1146 => DB_ERROR_NOSUCHTABLE,
-           1048 => DB_ERROR_CONSTRAINT,
-		    2002 => DB_ERROR_CONNECT_FAILED,
+		   1050 => DB_ERROR_ALREADY_EXISTS,
+		   1051 => DB_ERROR_NOSUCHTABLE,
+		   1054 => DB_ERROR_NOSUCHFIELD,
+		   1062 => DB_ERROR_ALREADY_EXISTS,
+		   1064 => DB_ERROR_SYNTAX,
+		   1100 => DB_ERROR_NOT_LOCKED,
+		   1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
+		   1146 => DB_ERROR_NOSUCHTABLE,
+		   1048 => DB_ERROR_CONSTRAINT,
+			2002 => DB_ERROR_CONNECT_FAILED,
 			2005 => DB_ERROR_CONNECT_FAILED
-       );
+	   );
 	   
 	return $MAP;
 }