update pMachine to EllisLab

update copyright year
update Code Igniter to CodeIgniter

3 files changed, 811 insertions, 811 deletions

diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 877f445bb..b82618c6a 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -1,484 +1,484 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
-/**
- * Code Igniter
- *
- * An open source application development framework for PHP 4.3.2 or newer
- *
- * @package		CodeIgniter
- * @author		Rick Ellis
- * @copyright	Copyright (c) 2006, pMachine, Inc.
- * @license		http://www.codeignitor.com/user_guide/license.html
- * @link		http://www.codeigniter.com
- * @since		Version 1.0
- * @filesource
- */
-
-// ------------------------------------------------------------------------
-
-
-
-/**
- * SQLite Database Adapter Class
- *
- * Note: _DB is an extender class that the app controller
- * creates dynamically based on whether the active record
- * class is being used or not.
- *
- * @package		CodeIgniter
- * @subpackage	Drivers
- * @category	Database
- * @author		Rick Ellis
- * @link		http://www.codeigniter.com/user_guide/database/
- */
-class CI_DB_sqlite_driver extends CI_DB {
-
-	/**
-	 * Non-persistent database connection
-	 *
-	 * @access	private called by the base class
-	 * @return	resource
-	 */	
-	function db_connect()
-	{
-		if ( ! $conn_id = @sqlite_open($this->database, 0666, $error))
-		{
-			log_message('error', $error);
-			
-			if ($this->db_debug)
-			{
-				$this->display_error($error, '', TRUE);
-			}
-			
-			return FALSE;
-		}
-		
-		return $conn_id;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Persistent database connection
-	 *
-	 * @access	private called by the base class
-	 * @return	resource
-	 */	
-	function db_pconnect()
-	{
-		if ( ! $conn_id = @sqlite_popen($this->database, 0666, $error))
-		{
-			log_message('error', $error);
-			
-			if ($this->db_debug)
-			{
-				$this->display_error($error, '', TRUE);
-			}
-			
-			return FALSE;
-		}
-		
-		return $conn_id;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Select the database
-	 *
-	 * @access	private called by the base class
-	 * @return	resource
-	 */	
-	function db_select()
-	{
-		return TRUE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Version number query string
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	function _version()
-	{
-		return sqlite_libversion();
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Execute the query
-	 *
-	 * @access	private called by the base class
-	 * @param	string	an SQL query
-	 * @return	resource
-	 */	
-	function _execute($sql)
-	{
-		$sql = $this->_prep_query($sql);
-		return @sqlite_query($this->conn_id, $sql);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Prep the query
-	 *
-	 * If needed, each database adapter can prep the query string
-	 *
-	 * @access	private called by execute()
-	 * @param	string	an SQL query
-	 * @return	string
-	 */	
-	function _prep_query($sql)
-	{
-		return $sql;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Begin Transaction
-	 *
-	 * @access	public
-	 * @return	bool		
-	 */	
-	function trans_begin($test_mode = FALSE)
-	{
-		if ( ! $this->trans_enabled)
-		{
-			return TRUE;
-		}
-		
-		// When transactions are nested we only begin/commit/rollback the outermost ones
-		if ($this->_trans_depth > 0)
-		{
-			return TRUE;
-		}
-
-		// Reset the transaction failure flag.
-		// If the $test_mode flag is set to TRUE transactions will be rolled back
-		// even if the queries produce a successful result.
-		$this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE;
-
-		$this->simple_query('BEGIN TRANSACTION');
-		return TRUE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Commit Transaction
-	 *
-	 * @access	public
-	 * @return	bool		
-	 */	
-	function trans_commit()
-	{
-		if ( ! $this->trans_enabled)
-		{
-			return TRUE;
-		}
-
-		// When transactions are nested we only begin/commit/rollback the outermost ones
-		if ($this->_trans_depth > 0)
-		{
-			return TRUE;
-		}
-
-		$this->simple_query('COMMIT');
-		return TRUE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Rollback Transaction
-	 *
-	 * @access	public
-	 * @return	bool		
-	 */	
-	function trans_rollback()
-	{
-		if ( ! $this->trans_enabled)
-		{
-			return TRUE;
-		}
-
-		// When transactions are nested we only begin/commit/rollback the outermost ones
-		if ($this->_trans_depth > 0)
-		{
-			return TRUE;
-		}
-
-		$this->simple_query('ROLLBACK');
-		return TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Escape String
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */
-	function escape_str($str)	
-	{
-		return sqlite_escape_string($str);
-	}
-		
-	// --------------------------------------------------------------------
-
-	/**
-	 * Affected Rows
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function affected_rows()
-	{
-		return sqlite_changes($this->conn_id);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Insert ID
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function insert_id()
-	{
-		return @sqlite_last_insert_rowid($this->conn_id);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * "Count All" query
-	 *
-	 * Generates a platform-specific query string that counts all records in
-	 * the specified database
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */
-	function count_all($table = '')
-	{
-		if ($table == '')
-			return '0';
-	
-		$query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`");
-		
-		if ($query->num_rows() == 0)
-			return '0';
-
-		$row = $query->row();
-		return $row->numrows;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * List table query
-	 *
-	 * Generates a platform-specific query string so that the table names can be fetched
-	 *
-	 * @access	private
-	 * @return	string
-	 */
-	function _list_tables()
-	{
-		return "SELECT name from sqlite_master WHERE type='table'";
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Show column query
-	 *
-	 * Generates a platform-specific query string so that the column names can be fetched
-	 *
-	 * @access	public
-	 * @param	string	the table name
-	 * @return	string
-	 */
-	function _list_columns($table = '')
-	{
-		// Not supported
-		return FALSE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Field data query
-	 *
-	 * Generates a platform-specific query so that the column data can be retrieved
-	 *
-	 * @access	public
-	 * @param	string	the table name
-	 * @return	object
-	 */
-	function _field_data($table)
-	{
-		return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1";
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * The error message string
-	 *
-	 * @access	private
-	 * @return	string
-	 */
-	function _error_message()
-	{
-		return sqlite_error_string(sqlite_last_error($this->conn_id));
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * The error message number
-	 *
-	 * @access	private
-	 * @return	integer
-	 */
-	function _error_number()
-	{
-		return sqlite_last_error($this->conn_id);
-	}
-		
-	// --------------------------------------------------------------------
-
-	/**
-	 * Escape Table Name
-	 *
-	 * This function adds backticks if the table name has a period
-	 * in it. Some DBs will get cranky unless periods are escaped
-	 *
-	 * @access	private
-	 * @param	string	the table name
-	 * @return	string
-	 */
-	function _escape_table($table)
-	{
-		if (stristr($table, '.'))
-		{
-			$table = preg_replace("/\./", "`.`", $table);
-		}
-		
-		return $table;
-	}
-		
-	// --------------------------------------------------------------------
-
-	/**
-	 * Insert statement
-	 *
-	 * Generates a platform-specific insert string from the supplied data
-	 *
-	 * @access	public
-	 * @param	string	the table name
-	 * @param	array	the insert keys
-	 * @param	array	the insert values
-	 * @return	string
-	 */
-	function _insert($table, $keys, $values)
-	{	
-		return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")";
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Update statement
-	 *
-	 * Generates a platform-specific update string from the supplied data
-	 *
-	 * @access	public
-	 * @param	string	the table name
-	 * @param	array	the update data
-	 * @param	array	the where clause
-	 * @return	string
-	 */
-	function _update($table, $values, $where)
-	{
-		foreach($values as $key => $val)
-		{
-			$valstr[] = $key." = ".$val;
-		}
-	
-		return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Delete statement
-	 *
-	 * Generates a platform-specific delete string from the supplied data
-	 *
-	 * @access	public
-	 * @param	string	the table name
-	 * @param	array	the where clause
-	 * @return	string
-	 */	
-	function _delete($table, $where)
-	{
-		return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Limit string
-	 *
-	 * Generates a platform-specific LIMIT clause
-	 *
-	 * @access	public
-	 * @param	string	the sql query string
-	 * @param	integer	the number of rows to limit the query to
-	 * @param	integer	the offset value
-	 * @return	string
-	 */
-	function _limit($sql, $limit, $offset)
-	{	
-		if ($offset == 0)
-		{
-			$offset = '';
-		}
-		else
-		{
-			$offset .= ", ";
-		}
-		
-		return $sql."LIMIT ".$offset.$limit;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Close DB Connection
-	 *
-	 * @access	public
-	 * @param	resource
-	 * @return	void
-	 */
-	function _close($conn_id)
-	{
-		@sqlite_close($conn_id);
-	}
-
-
-}
-
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+/**

+ * CodeIgniter

+ *

+ * An open source application development framework for PHP 4.3.2 or newer

+ *

+ * @package		CodeIgniter

+ * @author		Rick Ellis

+ * @copyright	Copyright (c) 2006, EllisLab, Inc.

+ * @license		http://www.codeignitor.com/user_guide/license.html

+ * @link		http://www.codeigniter.com

+ * @since		Version 1.0

+ * @filesource

+ */

+

+// ------------------------------------------------------------------------

+

+

+

+/**

+ * SQLite Database Adapter Class

+ *

+ * Note: _DB is an extender class that the app controller

+ * creates dynamically based on whether the active record

+ * class is being used or not.

+ *

+ * @package		CodeIgniter

+ * @subpackage	Drivers

+ * @category	Database

+ * @author		Rick Ellis

+ * @link		http://www.codeigniter.com/user_guide/database/

+ */

+class CI_DB_sqlite_driver extends CI_DB {

+

+	/**

+	 * Non-persistent database connection

+	 *

+	 * @access	private called by the base class

+	 * @return	resource

+	 */	

+	function db_connect()

+	{

+		if ( ! $conn_id = @sqlite_open($this->database, 0666, $error))

+		{

+			log_message('error', $error);

+			

+			if ($this->db_debug)

+			{

+				$this->display_error($error, '', TRUE);

+			}

+			

+			return FALSE;

+		}

+		

+		return $conn_id;

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Persistent database connection

+	 *

+	 * @access	private called by the base class

+	 * @return	resource

+	 */	

+	function db_pconnect()

+	{

+		if ( ! $conn_id = @sqlite_popen($this->database, 0666, $error))

+		{

+			log_message('error', $error);

+			

+			if ($this->db_debug)

+			{

+				$this->display_error($error, '', TRUE);

+			}

+			

+			return FALSE;

+		}

+		

+		return $conn_id;

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Select the database

+	 *

+	 * @access	private called by the base class

+	 * @return	resource

+	 */	

+	function db_select()

+	{

+		return TRUE;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Version number query string

+	 *

+	 * @access	public

+	 * @return	string

+	 */

+	function _version()

+	{

+		return sqlite_libversion();

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Execute the query

+	 *

+	 * @access	private called by the base class

+	 * @param	string	an SQL query

+	 * @return	resource

+	 */	

+	function _execute($sql)

+	{

+		$sql = $this->_prep_query($sql);

+		return @sqlite_query($this->conn_id, $sql);

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Prep the query

+	 *

+	 * If needed, each database adapter can prep the query string

+	 *

+	 * @access	private called by execute()

+	 * @param	string	an SQL query

+	 * @return	string

+	 */	

+	function _prep_query($sql)

+	{

+		return $sql;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Begin Transaction

+	 *

+	 * @access	public

+	 * @return	bool		

+	 */	

+	function trans_begin($test_mode = FALSE)

+	{

+		if ( ! $this->trans_enabled)

+		{

+			return TRUE;

+		}

+		

+		// When transactions are nested we only begin/commit/rollback the outermost ones

+		if ($this->_trans_depth > 0)

+		{

+			return TRUE;

+		}

+

+		// Reset the transaction failure flag.

+		// If the $test_mode flag is set to TRUE transactions will be rolled back

+		// even if the queries produce a successful result.

+		$this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE;

+

+		$this->simple_query('BEGIN TRANSACTION');

+		return TRUE;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Commit Transaction

+	 *

+	 * @access	public

+	 * @return	bool		

+	 */	

+	function trans_commit()

+	{

+		if ( ! $this->trans_enabled)

+		{

+			return TRUE;

+		}

+

+		// When transactions are nested we only begin/commit/rollback the outermost ones

+		if ($this->_trans_depth > 0)

+		{

+			return TRUE;

+		}

+

+		$this->simple_query('COMMIT');

+		return TRUE;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Rollback Transaction

+	 *

+	 * @access	public

+	 * @return	bool		

+	 */	

+	function trans_rollback()

+	{

+		if ( ! $this->trans_enabled)

+		{

+			return TRUE;

+		}

+

+		// When transactions are nested we only begin/commit/rollback the outermost ones

+		if ($this->_trans_depth > 0)

+		{

+			return TRUE;

+		}

+

+		$this->simple_query('ROLLBACK');

+		return TRUE;

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Escape String

+	 *

+	 * @access	public

+	 * @param	string

+	 * @return	string

+	 */

+	function escape_str($str)	

+	{

+		return sqlite_escape_string($str);

+	}

+		

+	// --------------------------------------------------------------------

+

+	/**

+	 * Affected Rows

+	 *

+	 * @access	public

+	 * @return	integer

+	 */

+	function affected_rows()

+	{

+		return sqlite_changes($this->conn_id);

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Insert ID

+	 *

+	 * @access	public

+	 * @return	integer

+	 */

+	function insert_id()

+	{

+		return @sqlite_last_insert_rowid($this->conn_id);

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * "Count All" query

+	 *

+	 * Generates a platform-specific query string that counts all records in

+	 * the specified database

+	 *

+	 * @access	public

+	 * @param	string

+	 * @return	string

+	 */

+	function count_all($table = '')

+	{

+		if ($table == '')

+			return '0';

+	

+		$query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`");

+		

+		if ($query->num_rows() == 0)

+			return '0';

+

+		$row = $query->row();

+		return $row->numrows;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * List table query

+	 *

+	 * Generates a platform-specific query string so that the table names can be fetched

+	 *

+	 * @access	private

+	 * @return	string

+	 */

+	function _list_tables()

+	{

+		return "SELECT name from sqlite_master WHERE type='table'";

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Show column query

+	 *

+	 * Generates a platform-specific query string so that the column names can be fetched

+	 *

+	 * @access	public

+	 * @param	string	the table name

+	 * @return	string

+	 */

+	function _list_columns($table = '')

+	{

+		// Not supported

+		return FALSE;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Field data query

+	 *

+	 * Generates a platform-specific query so that the column data can be retrieved

+	 *

+	 * @access	public

+	 * @param	string	the table name

+	 * @return	object

+	 */

+	function _field_data($table)

+	{

+		return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1";

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * The error message string

+	 *

+	 * @access	private

+	 * @return	string

+	 */

+	function _error_message()

+	{

+		return sqlite_error_string(sqlite_last_error($this->conn_id));

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * The error message number

+	 *

+	 * @access	private

+	 * @return	integer

+	 */

+	function _error_number()

+	{

+		return sqlite_last_error($this->conn_id);

+	}

+		

+	// --------------------------------------------------------------------

+

+	/**

+	 * Escape Table Name

+	 *

+	 * This function adds backticks if the table name has a period

+	 * in it. Some DBs will get cranky unless periods are escaped

+	 *

+	 * @access	private

+	 * @param	string	the table name

+	 * @return	string

+	 */

+	function _escape_table($table)

+	{

+		if (stristr($table, '.'))

+		{

+			$table = preg_replace("/\./", "`.`", $table);

+		}

+		

+		return $table;

+	}

+		

+	// --------------------------------------------------------------------

+

+	/**

+	 * Insert statement

+	 *

+	 * Generates a platform-specific insert string from the supplied data

+	 *

+	 * @access	public

+	 * @param	string	the table name

+	 * @param	array	the insert keys

+	 * @param	array	the insert values

+	 * @return	string

+	 */

+	function _insert($table, $keys, $values)

+	{	

+		return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")";

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Update statement

+	 *

+	 * Generates a platform-specific update string from the supplied data

+	 *

+	 * @access	public

+	 * @param	string	the table name

+	 * @param	array	the update data

+	 * @param	array	the where clause

+	 * @return	string

+	 */

+	function _update($table, $values, $where)

+	{

+		foreach($values as $key => $val)

+		{

+			$valstr[] = $key." = ".$val;

+		}

+	

+		return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where);

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Delete statement

+	 *

+	 * Generates a platform-specific delete string from the supplied data

+	 *

+	 * @access	public

+	 * @param	string	the table name

+	 * @param	array	the where clause

+	 * @return	string

+	 */	

+	function _delete($table, $where)

+	{

+		return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where);

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Limit string

+	 *

+	 * Generates a platform-specific LIMIT clause

+	 *

+	 * @access	public

+	 * @param	string	the sql query string

+	 * @param	integer	the number of rows to limit the query to

+	 * @param	integer	the offset value

+	 * @return	string

+	 */

+	function _limit($sql, $limit, $offset)

+	{	

+		if ($offset == 0)

+		{

+			$offset = '';

+		}

+		else

+		{

+			$offset .= ", ";

+		}

+		

+		return $sql."LIMIT ".$offset.$limit;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Close DB Connection

+	 *

+	 * @access	public

+	 * @param	resource

+	 * @return	void

+	 */

+	function _close($conn_id)

+	{

+		@sqlite_close($conn_id);

+	}

+

+

+}

+

 ?>
\ No newline at end of file
diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php
index a406a935c..a16a5b054 100644
--- a/system/database/drivers/sqlite/sqlite_result.php
+++ b/system/database/drivers/sqlite/sqlite_result.php
@@ -1,176 +1,176 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
-/**
- * Code Igniter
- *
- * An open source application development framework for PHP 4.3.2 or newer
- *
- * @package		CodeIgniter
- * @author		Rick Ellis
- * @copyright	Copyright (c) 2006, pMachine, Inc.
- * @license		http://www.codeignitor.com/user_guide/license.html
- * @link		http://www.codeigniter.com
- * @since		Version 1.0
- * @filesource
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * SQLite Result Class
- *
- * This class extends the parent result class: CI_DB_result
- *
- * @category	Database
- * @author		Rick Ellis
- * @link		http://www.codeigniter.com/user_guide/database/
- */
-class CI_DB_sqlite_result extends CI_DB_result {
-	
-	/**
-	 * Number of rows in the result set
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function num_rows()
-	{
-		return @sqlite_num_rows($this->result_id);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Number of fields in the result set
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function num_fields()
-	{
-		return @sqlite_num_fields($this->result_id);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch Field Names
-	 *
-	 * Generates an array of column names
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	function list_fields()
-	{
-		$field_names = array();
-		for ($i = 0; $i < $this->num_fields(); $i++)
-		{
-			$Ffield_names[] = sqlite_field_name($this->result_id, $i);
-		}
-		
-		return $field_names;
-	}
-
-	// Deprecated
-	function field_names()
-	{
-		return $this->list_fields();
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Field data
-	 *
-	 * Generates an array of objects containing field meta-data
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	function field_data()
-	{
-		$retval = array();
-		for ($i = 0; $i < $this->num_fields(); $i++)
-		{
-			$F 				= new stdClass();
-			$F->name 		= sqlite_field_name($this->result_id, $i);
-			$F->type 		= 'varchar';
-			$F->max_length	= 0;
-			$F->primary_key = 0;
-			$F->default		= '';
-
-			$retval[] = $F;
-		}
-		
-		return $retval;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Free the result
-	 *
-	 * @return	null
-	 */		
-	function free_result()
-	{
-		// Not implemented in SQLite
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Data Seek
-	 *
-	 * Moves the internal pointer to the desired offset.  We call
-	 * this internally before fetching results to make sure the
-	 * result set starts at zero
-	 *
-	 * @access	private
-	 * @return	array
-	 */
-	function _data_seek($n = 0)
-	{
-		return sqlite_seek($this->result_id, $n);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Result - associative array
-	 *
-	 * Returns the result set as an array
-	 *
-	 * @access	private
-	 * @return	array
-	 */
-	function _fetch_assoc()
-	{
-		return sqlite_fetch_array($this->result_id);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Result - object
-	 *
-	 * Returns the result set as an object
-	 *
-	 * @access	private
-	 * @return	object
-	 */
-	function _fetch_object()
-	{
-		if (function_exists('sqlite_fetch_object'))
-		{
-			return sqlite_fetch_object($this->result_id);
-		}
-		else
-		{
-			return $this->_fetch_assoc();
-		}
-	}
-
-}
-
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+/**

+ * CodeIgniter

+ *

+ * An open source application development framework for PHP 4.3.2 or newer

+ *

+ * @package		CodeIgniter

+ * @author		Rick Ellis

+ * @copyright	Copyright (c) 2006, EllisLab, Inc.

+ * @license		http://www.codeignitor.com/user_guide/license.html

+ * @link		http://www.codeigniter.com

+ * @since		Version 1.0

+ * @filesource

+ */

+

+// ------------------------------------------------------------------------

+

+/**

+ * SQLite Result Class

+ *

+ * This class extends the parent result class: CI_DB_result

+ *

+ * @category	Database

+ * @author		Rick Ellis

+ * @link		http://www.codeigniter.com/user_guide/database/

+ */

+class CI_DB_sqlite_result extends CI_DB_result {

+	

+	/**

+	 * Number of rows in the result set

+	 *

+	 * @access	public

+	 * @return	integer

+	 */

+	function num_rows()

+	{

+		return @sqlite_num_rows($this->result_id);

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Number of fields in the result set

+	 *

+	 * @access	public

+	 * @return	integer

+	 */

+	function num_fields()

+	{

+		return @sqlite_num_fields($this->result_id);

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Fetch Field Names

+	 *

+	 * Generates an array of column names

+	 *

+	 * @access	public

+	 * @return	array

+	 */

+	function list_fields()

+	{

+		$field_names = array();

+		for ($i = 0; $i < $this->num_fields(); $i++)

+		{

+			$Ffield_names[] = sqlite_field_name($this->result_id, $i);

+		}

+		

+		return $field_names;

+	}

+

+	// Deprecated

+	function field_names()

+	{

+		return $this->list_fields();

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Field data

+	 *

+	 * Generates an array of objects containing field meta-data

+	 *

+	 * @access	public

+	 * @return	array

+	 */

+	function field_data()

+	{

+		$retval = array();

+		for ($i = 0; $i < $this->num_fields(); $i++)

+		{

+			$F 				= new stdClass();

+			$F->name 		= sqlite_field_name($this->result_id, $i);

+			$F->type 		= 'varchar';

+			$F->max_length	= 0;

+			$F->primary_key = 0;

+			$F->default		= '';

+

+			$retval[] = $F;

+		}

+		

+		return $retval;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Free the result

+	 *

+	 * @return	null

+	 */		

+	function free_result()

+	{

+		// Not implemented in SQLite

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Data Seek

+	 *

+	 * Moves the internal pointer to the desired offset.  We call

+	 * this internally before fetching results to make sure the

+	 * result set starts at zero

+	 *

+	 * @access	private

+	 * @return	array

+	 */

+	function _data_seek($n = 0)

+	{

+		return sqlite_seek($this->result_id, $n);

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Result - associative array

+	 *

+	 * Returns the result set as an array

+	 *

+	 * @access	private

+	 * @return	array

+	 */

+	function _fetch_assoc()

+	{

+		return sqlite_fetch_array($this->result_id);

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Result - object

+	 *

+	 * Returns the result set as an object

+	 *

+	 * @access	private

+	 * @return	object

+	 */

+	function _fetch_object()

+	{

+		if (function_exists('sqlite_fetch_object'))

+		{

+			return sqlite_fetch_object($this->result_id);

+		}

+		else

+		{

+			return $this->_fetch_assoc();

+		}

+	}

+

+}

+

 ?>
\ No newline at end of file
diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php
index 91649c78d..9683b1756 100644
--- a/system/database/drivers/sqlite/sqlite_utility.php
+++ b/system/database/drivers/sqlite/sqlite_utility.php
@@ -1,154 +1,154 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
-/**
- * Code Igniter
- *
- * An open source application development framework for PHP 4.3.2 or newer
- *
- * @package		CodeIgniter
- * @author		Rick Ellis
- * @copyright	Copyright (c) 2006, pMachine, Inc.
- * @license		http://www.codeignitor.com/user_guide/license.html
- * @link		http://www.codeigniter.com
- * @since		Version 1.0
- * @filesource
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * SQLite Utility Class
- *
- * @category	Database
- * @author		Rick Ellis
- * @link		http://www.codeigniter.com/user_guide/database/
- */
-class CI_DB_sqlite_utility extends CI_DB_utility {
-
-
-	/**
-	 * Create database
-	 *
-	 * @access	public
-	 * @param	string	the database name
-	 * @return	bool
-	 */
-	function _create_database()
-	{
-		// In SQLite, a database is created when you connect to the database.
-		// We'll return TRUE so that an error isn't generated
-		return TRUE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Drop database
-	 *
-	 * @access	private
-	 * @param	string	the database name
-	 * @return	bool
-	 */
-	function _drop_database($name)
-	{
-		if ( ! @file_exists($this->db->database) OR ! @unlink($this->db->database))
-		{
-			if ($this->db->db_debug)
-			{
-				return $this->db->display_error('db_unable_to_drop');
-			}
-			return FALSE;
-		}
-		return TRUE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * List databases
-	 *
-	 * I don't believe you can do a database listing with SQLite
-	 * since each database is its own file.  I suppose we could
-	 * try reading a directory looking for SQLite files, but
-	 * that doesn't seem like a terribly good idea
-	 *
-	 * @access	private
-	 * @return	bool
-	 */
-	function _list_databases()
-	{
-		if ($this->db_debug)
-		{
-			return $this->display_error('db_unsuported_feature');
-		}
-		return array();
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Drop Table
-	 *
-	 *  Unsupported feature in SQLite
-	 *
-	 * @access	private
-	 * @return	bool
-	 */
-	function _drop_table($table)
-	{
-		if ($this->db->db_debug)
-		{
-			return $this->db->display_error('db_unsuported_feature');
-		}
-		return array();
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Optimize table query
-	 *
-	 * Is optimization even supported in SQLite?
-	 *
-	 * @access	private
-	 * @param	string	the table name
-	 * @return	object
-	 */
-	function _optimize_table($table)
-	{
-		return FALSE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Repair table query
-	 *
-	 * Are table repairs even supported in SQLite?
-	 *
-	 * @access	private
-	 * @param	string	the table name
-	 * @return	object
-	 */
-	function _repair_table($table)
-	{
-		return FALSE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * SQLite Export
-	 *
-	 * @access	private
-	 * @param	array	Preferences
-	 * @return	mixed
-	 */
-	function _backup($params = array())
-	{
-		// Currently unsupported
-		return $this->db->display_error('db_unsuported_feature');
-	}
-
-}
-
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+/**

+ * CodeIgniter

+ *

+ * An open source application development framework for PHP 4.3.2 or newer

+ *

+ * @package		CodeIgniter

+ * @author		Rick Ellis

+ * @copyright	Copyright (c) 2006, EllisLab, Inc.

+ * @license		http://www.codeignitor.com/user_guide/license.html

+ * @link		http://www.codeigniter.com

+ * @since		Version 1.0

+ * @filesource

+ */

+

+// ------------------------------------------------------------------------

+

+/**

+ * SQLite Utility Class

+ *

+ * @category	Database

+ * @author		Rick Ellis

+ * @link		http://www.codeigniter.com/user_guide/database/

+ */

+class CI_DB_sqlite_utility extends CI_DB_utility {

+

+

+	/**

+	 * Create database

+	 *

+	 * @access	public

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _create_database()

+	{

+		// In SQLite, a database is created when you connect to the database.

+		// We'll return TRUE so that an error isn't generated

+		return TRUE;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Drop database

+	 *

+	 * @access	private

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _drop_database($name)

+	{

+		if ( ! @file_exists($this->db->database) OR ! @unlink($this->db->database))

+		{

+			if ($this->db->db_debug)

+			{

+				return $this->db->display_error('db_unable_to_drop');

+			}

+			return FALSE;

+		}

+		return TRUE;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * List databases

+	 *

+	 * I don't believe you can do a database listing with SQLite

+	 * since each database is its own file.  I suppose we could

+	 * try reading a directory looking for SQLite files, but

+	 * that doesn't seem like a terribly good idea

+	 *

+	 * @access	private

+	 * @return	bool

+	 */

+	function _list_databases()

+	{

+		if ($this->db_debug)

+		{

+			return $this->display_error('db_unsuported_feature');

+		}

+		return array();

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Drop Table

+	 *

+	 *  Unsupported feature in SQLite

+	 *

+	 * @access	private

+	 * @return	bool

+	 */

+	function _drop_table($table)

+	{

+		if ($this->db->db_debug)

+		{

+			return $this->db->display_error('db_unsuported_feature');

+		}

+		return array();

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Optimize table query

+	 *

+	 * Is optimization even supported in SQLite?

+	 *

+	 * @access	private

+	 * @param	string	the table name

+	 * @return	object

+	 */

+	function _optimize_table($table)

+	{

+		return FALSE;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Repair table query

+	 *

+	 * Are table repairs even supported in SQLite?

+	 *

+	 * @access	private

+	 * @param	string	the table name

+	 * @return	object

+	 */

+	function _repair_table($table)

+	{

+		return FALSE;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * SQLite Export

+	 *

+	 * @access	private

+	 * @param	array	Preferences

+	 * @return	mixed

+	 */

+	function _backup($params = array())

+	{

+		// Currently unsupported

+		return $this->db->display_error('db_unsuported_feature');

+	}

+

+}

+

 ?>
\ No newline at end of file