update pMachine to EllisLab

update copyright year
update Code Igniter to CodeIgniter

3 files changed, 302 insertions, 302 deletions

diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 58cc69a96..bfb212cfd 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -1,12 +1,12 @@
 <?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

 /**

- * Code Igniter

+ * CodeIgniter

  *

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

  *

  * @package		CodeIgniter

  * @author		Rick Ellis

- * @copyright	Copyright (c) 2006, pMachine, Inc.

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

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

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

  * @since		Version 1.0

diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php
index f065e54fb..5b955ad12 100644
--- a/system/database/drivers/postgre/postgre_result.php
+++ b/system/database/drivers/postgre/postgre_result.php
@@ -1,173 +1,173 @@
-<?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
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * Postgres 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_postgre_result extends CI_DB_result {
-
-	/**
-	 * Number of rows in the result set
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function num_rows()
-	{
-		return @pg_num_rows($this->result_id);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Number of fields in the result set
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function num_fields()
-	{
-		return @pg_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[] = pg_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 		= pg_field_name($this->result_id, $i);
-			$F->type 		= pg_field_type($this->result_id, $i);
-			$F->max_length	= pg_field_size($this->result_id, $i);
-			$F->primary_key = $i == 0;
-			$F->default		= '';
-
-			$retval[] = $F;
-		}
-		
-		return $retval;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Free the result
-	 *
-	 * @return	null
-	 */		
-	function free_result()
-	{
-		if (is_resource($this->result_id))
-		{
-			pg_free_result($this->result_id);
-			$this->result_id = FALSE;
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * 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 pg_result_seek($this->result_id, $n);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Result - associative array
-	 *
-	 * Returns the result set as an array
-	 *
-	 * @access	private
-	 * @return	array
-	 */
-	function _fetch_assoc()
-	{
-		return pg_fetch_assoc($this->result_id);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Result - object
-	 *
-	 * Returns the result set as an object
-	 *
-	 * @access	private
-	 * @return	object
-	 */
-	function _fetch_object()
-	{
-		return pg_fetch_object($this->result_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

+ */

+

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

+

+/**

+ * Postgres 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_postgre_result extends CI_DB_result {

+

+	/**

+	 * Number of rows in the result set

+	 *

+	 * @access	public

+	 * @return	integer

+	 */

+	function num_rows()

+	{

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

+	}

+	

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

+

+	/**

+	 * Number of fields in the result set

+	 *

+	 * @access	public

+	 * @return	integer

+	 */

+	function num_fields()

+	{

+		return @pg_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[] = pg_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 		= pg_field_name($this->result_id, $i);

+			$F->type 		= pg_field_type($this->result_id, $i);

+			$F->max_length	= pg_field_size($this->result_id, $i);

+			$F->primary_key = $i == 0;

+			$F->default		= '';

+

+			$retval[] = $F;

+		}

+		

+		return $retval;

+	}

+

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

+

+	/**

+	 * Free the result

+	 *

+	 * @return	null

+	 */		

+	function free_result()

+	{

+		if (is_resource($this->result_id))

+		{

+			pg_free_result($this->result_id);

+			$this->result_id = FALSE;

+		}

+	}

+

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

+

+	/**

+	 * 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 pg_result_seek($this->result_id, $n);

+	}

+

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

+

+	/**

+	 * Result - associative array

+	 *

+	 * Returns the result set as an array

+	 *

+	 * @access	private

+	 * @return	array

+	 */

+	function _fetch_assoc()

+	{

+		return pg_fetch_assoc($this->result_id);

+	}

+	

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

+

+	/**

+	 * Result - object

+	 *

+	 * Returns the result set as an object

+	 *

+	 * @access	private

+	 * @return	object

+	 */

+	function _fetch_object()

+	{

+		return pg_fetch_object($this->result_id);

+	}

+	

+}

+

 ?>
\ No newline at end of file
diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php
index bebe09415..9d56af363 100644
--- a/system/database/drivers/postgre/postgre_utility.php
+++ b/system/database/drivers/postgre/postgre_utility.php
@@ -1,129 +1,129 @@
-<?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
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * Postgre Utility Class
- *
- * @category	Database
- * @author		Rick Ellis
- * @link		http://www.codeigniter.com/user_guide/database/
- */
-class CI_DB_postgre_utility extends CI_DB_utility {
-
-	
-	/**
-	 * Create database
-	 *
-	 * @access	private
-	 * @param	string	the database name
-	 * @return	bool
-	 */
-	function _create_database($name)
-	{
-		return "CREATE DATABASE ".$name;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Drop database
-	 *
-	 * @access	private
-	 * @param	string	the database name
-	 * @return	bool
-	 */
-	function _drop_database($name)
-	{
-		return "DROP DATABASE ".$name;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * List databases
-	 *
-	 * @access	private
-	 * @return	bool
-	 */
-	function _list_databases()
-	{
-		return "SELECT datname FROM pg_database";
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Drop Table
-	 *
-	 * @access	private
-	 * @return	bool
-	 */
-	function _drop_table($table)
-	{
-		return "DROP TABLE ".$this->db->_escape_table($table)." CASCADE";
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Optimize table query
-	 *
-	 * Is table optimization supported in Postgre?
-	 *
-	 * @access	private
-	 * @param	string	the table name
-	 * @return	object
-	 */
-	function _optimize_table($table)
-	{
-		return FALSE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Repair table query
-	 *
-	 * Are table repairs supported in Postgre?
-	 *
-	 * @access	private
-	 * @param	string	the table name
-	 * @return	object
-	 */
-	function _repair_table($table)
-	{
-		return FALSE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Postgre 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

+ */

+

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

+

+/**

+ * Postgre Utility Class

+ *

+ * @category	Database

+ * @author		Rick Ellis

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

+ */

+class CI_DB_postgre_utility extends CI_DB_utility {

+

+	

+	/**

+	 * Create database

+	 *

+	 * @access	private

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _create_database($name)

+	{

+		return "CREATE DATABASE ".$name;

+	}

+

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

+

+	/**

+	 * Drop database

+	 *

+	 * @access	private

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _drop_database($name)

+	{

+		return "DROP DATABASE ".$name;

+	}

+

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

+

+	/**

+	 * List databases

+	 *

+	 * @access	private

+	 * @return	bool

+	 */

+	function _list_databases()

+	{

+		return "SELECT datname FROM pg_database";

+	}

+

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

+

+	/**

+	 * Drop Table

+	 *

+	 * @access	private

+	 * @return	bool

+	 */

+	function _drop_table($table)

+	{

+		return "DROP TABLE ".$this->db->_escape_table($table)." CASCADE";

+	}

+

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

+

+	/**

+	 * Optimize table query

+	 *

+	 * Is table optimization supported in Postgre?

+	 *

+	 * @access	private

+	 * @param	string	the table name

+	 * @return	object

+	 */

+	function _optimize_table($table)

+	{

+		return FALSE;

+	}

+

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

+

+	/**

+	 * Repair table query

+	 *

+	 * Are table repairs supported in Postgre?

+	 *

+	 * @access	private

+	 * @param	string	the table name

+	 * @return	object

+	 */

+	function _repair_table($table)

+	{

+		return FALSE;

+	}

+

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

+

+	/**

+	 * Postgre 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