update pMachine to EllisLab

update copyright year
update Code Igniter to CodeIgniter

4 files changed, 380 insertions, 380 deletions

diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php
index b2713b660..b00da8ba2 100644
--- a/system/codeigniter/Base4.php
+++ b/system/codeigniter/Base4.php
@@ -1,67 +1,67 @@
-<?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.3
- * @filesource
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * CI_BASE - For PHP 4
- *
- * This file is used only when Code Igniter is being run under PHP 4.
- *
- * In order to allow CI to work under PHP 4 we had to make the Loader class
- * the parent of the Controller Base class.  It's the only way we can
- * enable functions like $this->load->library('email') to instantiate
- * classes that can then be used within controllers as $this->email->send()
- *
- * PHP 4 also has trouble referencing the CI super object within application
- * constructors since objects do not exist until the class is fully
- * instantiated.  Basically PHP 4 sucks...
- *
- * Since PHP 5 doesn't suffer from this problem so we load one of
- * two files based on the version of PHP being run.
- *
- * @package		CodeIgniter
- * @subpackage	codeigniter
- * @category	front-controller
- * @author		Rick Ellis
- * @link		http://www.codeigniter.com/user_guide/
- */
- class CI_Base extends CI_Loader {
-
-	function CI_Base()
-	{
-		// This allows syntax like $this->load->foo() to work
-		parent::CI_Loader();
-		$this->load =& $this;
-		
-		// This allows resources used within controller constructors to work
-		global $OBJ;
-		$OBJ = $this->load; // Do NOT use a reference.
-	}
-}
-
-function &get_instance()
-{
-	global $CI, $OBJ;
-	
-	if (is_object($CI))
-	{
-		return $CI;
-	}
-	
-	return $OBJ->load;
-}
-
+<?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.3

+ * @filesource

+ */

+

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

+

+/**

+ * CI_BASE - For PHP 4

+ *

+ * This file is used only when CodeIgniter is being run under PHP 4.

+ *

+ * In order to allow CI to work under PHP 4 we had to make the Loader class

+ * the parent of the Controller Base class.  It's the only way we can

+ * enable functions like $this->load->library('email') to instantiate

+ * classes that can then be used within controllers as $this->email->send()

+ *

+ * PHP 4 also has trouble referencing the CI super object within application

+ * constructors since objects do not exist until the class is fully

+ * instantiated.  Basically PHP 4 sucks...

+ *

+ * Since PHP 5 doesn't suffer from this problem so we load one of

+ * two files based on the version of PHP being run.

+ *

+ * @package		CodeIgniter

+ * @subpackage	codeigniter

+ * @category	front-controller

+ * @author		Rick Ellis

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

+ */

+ class CI_Base extends CI_Loader {

+

+	function CI_Base()

+	{

+		// This allows syntax like $this->load->foo() to work

+		parent::CI_Loader();

+		$this->load =& $this;

+		

+		// This allows resources used within controller constructors to work

+		global $OBJ;

+		$OBJ = $this->load; // Do NOT use a reference.

+	}

+}

+

+function &get_instance()

+{

+	global $CI, $OBJ;

+	

+	if (is_object($CI))

+	{

+		return $CI;

+	}

+	

+	return $OBJ->load;

+}

+

 ?>
\ No newline at end of file
diff --git a/system/codeigniter/Base5.php b/system/codeigniter/Base5.php
index 0d036fae2..d1531a571 100644
--- a/system/codeigniter/Base5.php
+++ b/system/codeigniter/Base5.php
@@ -1,54 +1,54 @@
-<?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.3
- * @filesource
- */
-
-
-// ------------------------------------------------------------------------
-
-/**
- * CI_BASE - For PHP 5
- *
- * This file contains some code used only when Code Igniter is being
- * run under PHP 5.  It allows us to manage the CI super object more
- * gracefully than what is possible with PHP 4.
- *
- * @package		CodeIgniter
- * @subpackage	codeigniter
- * @category	front-controller
- * @author		Rick Ellis
- * @link		http://www.codeigniter.com/user_guide/
- */
-
-class CI_Base {
-
-	private static $instance;
-
-	public function CI_Base()
-	{
-		self::$instance =& $this;
-	}
-
-	public static function &get_instance()
-	{
-		return self::$instance;
-	}
-}
-
-function &get_instance()
-{
-	return CI_Base::get_instance();
-}
-
-
+<?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.3

+ * @filesource

+ */

+

+

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

+

+/**

+ * CI_BASE - For PHP 5

+ *

+ * This file contains some code used only when CodeIgniter is being

+ * run under PHP 5.  It allows us to manage the CI super object more

+ * gracefully than what is possible with PHP 4.

+ *

+ * @package		CodeIgniter

+ * @subpackage	codeigniter

+ * @category	front-controller

+ * @author		Rick Ellis

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

+ */

+

+class CI_Base {

+

+	private static $instance;

+

+	public function CI_Base()

+	{

+		self::$instance =& $this;

+	}

+

+	public static function &get_instance()

+	{

+		return self::$instance;

+	}

+}

+

+function &get_instance()

+{

+	return CI_Base::get_instance();

+}

+

+

 ?>
\ No newline at end of file
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 12f1a0d5e..aed05ddc2 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.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/codeigniter/Common.php b/system/codeigniter/Common.php
index 4576cd964..36c9356a9 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -1,260 +1,260 @@
-<?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
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * Common Functions
- *
- * Loads the base classes and executes the request.
- *
- * @package		CodeIgniter
- * @subpackage	codeigniter
- * @category	Common Functions
- * @author		Rick Ellis
- * @link		http://www.codeigniter.com/user_guide/
- */
-
-// ------------------------------------------------------------------------
-
-/**
-* Class registry
-*
-* This function acts as a singleton.  If the requested class does not
-* exist it is instantiated and set to a static variable.  If it has
-* previously been instantiated the variable is returned.
-*
-* @access	public
-* @param	string	the class name being requested
-* @param	bool	optional flag that lets classes get loaded but not instantiated
-* @return	object
-*/
-function &load_class($class, $instantiate = TRUE)
-{
-	static $objects = array();
-
-	// Does the class exist?  If so, we're done...
-	if (isset($objects[$class]))
-	{
-		return $objects[$class];
-	}
-			
-	// If the requested class does not exist in the application/libraries
-	// folder we'll load the native class from the system/libraries folder.	
-	if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT))
-	{
-		require(BASEPATH.'libraries/'.$class.EXT);	
-		require(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT);
-		$is_subclass = TRUE;	
-	}
-	else
-	{
-		if (file_exists(APPPATH.'libraries/'.$class.EXT))
-		{
-			require(APPPATH.'libraries/'.$class.EXT);	
-			$is_subclass = FALSE;	
-		}
-		else
-		{
-			require(BASEPATH.'libraries/'.$class.EXT);
-			$is_subclass = FALSE;
-		}
-	}
-
-	if ($instantiate == FALSE)
-	{
-		$objects[$class] = TRUE;
-		return $objects[$class];
-	}
-		
-	if ($is_subclass == TRUE)
-	{
-		$name = config_item('subclass_prefix').$class;
-		$objects[$class] =& new $name();
-		return $objects[$class];
-	}
-
-	$name = ($class != 'Controller') ? 'CI_'.$class : $class;
-	
-	$objects[$class] =& new $name();
-	return $objects[$class];
-}
-
-/**
-* Loads the main config.php file
-*
-* @access	private
-* @return	array
-*/
-function &get_config()
-{
-	static $main_conf;
-		
-	if ( ! isset($main_conf))
-	{
-		if ( ! file_exists(APPPATH.'config/config'.EXT))
-		{
-			exit('The configuration file config'.EXT.' does not exist.');
-		}
-		
-		require(APPPATH.'config/config'.EXT);
-		
-		if ( ! isset($config) OR ! is_array($config))
-		{
-			exit('Your config file does not appear to be formatted correctly.');
-		}
-
-		$main_conf[0] =& $config;
-	}
-	return $main_conf[0];
-}
-
-/**
-* Gets a config item
-*
-* @access	public
-* @return	mixed
-*/
-function config_item($item)
-{
-	static $config_item = array();
-
-	if ( ! isset($config_item[$item]))
-	{
-		$config =& get_config();
-		
-		if ( ! isset($config[$item]))
-		{
-			return FALSE;
-		}
-		$config_item[$item] = $config[$item];
-	}
-
-	return $config_item[$item];
-}
-
-
-/**
-* Error Handler
-*
-* This function lets us invoke the exception class and
-* display errors using the standard error template located
-* in application/errors/errors.php
-* This function will send the error page directly to the
-* browser and exit.
-*
-* @access	public
-* @return	void
-*/
-function show_error($message)
-{
-	$error =& load_class('Exceptions');
-	echo $error->show_error('An Error Was Encountered', $message);
-	exit;
-}
-
-
-/**
-* 404 Page Handler
-*
-* This function is similar to the show_error() function above
-* However, instead of the standard error template it displays
-* 404 errors.
-*
-* @access	public
-* @return	void
-*/
-function show_404($page = '')
-{
-	$error =& load_class('Exceptions');
-	$error->show_404($page);
-	exit;
-}
-
-
-/**
-* Error Logging Interface
-*
-* We use this as a simple mechanism to access the logging
-* class and send messages to be logged.
-*
-* @access	public
-* @return	void
-*/
-function log_message($level = 'error', $message, $php_error = FALSE)
-{
-	static $LOG;
-	
-	$config =& get_config();
-	if ($config['log_threshold'] == 0)
-	{
-		return;
-	}
-
-	$LOG =& load_class('Log');	
-	$LOG->write_log($level, $message, $php_error);
-}
-
-/**
-* Exception Handler
-*
-* This is the custom exception handler that is declaired at the top
-* of Codeigniter.php.  The main reason we use this is permit
-* PHP errors to be logged in our own log files since we may
-* not have access to server logs. Since this function
-* effectively intercepts PHP errors, however, we also need
-* to display errors based on the current error_reporting level.
-* We do that with the use of a PHP error template.
-*
-* @access	private
-* @return	void
-*/
-function _exception_handler($severity, $message, $filepath, $line)
-{	
-	 // We don't bother with "strict" notices since they will fill up
-	 // the log file with information that isn't normally very
-	 // helpful.  For example, if you are running PHP 5 and you
-	 // use version 4 style class functions (without prefixes
-	 // like "public", "private", etc.) you'll get notices telling
-	 // you that these have been deprecated.
-	
-	if ($severity == E_STRICT)
-	{
-		return;
-	}
-
-	$error =& load_class('Exceptions');
-
-	// Should we display the error?
-	// We'll get the current error_reporting level and add its bits
-	// with the severity bits to find out.
-	
-	if (($severity & error_reporting()) == $severity)
-	{
-		$error->show_php_error($severity, $message, $filepath, $line);
-	}
-	
-	// Should we log the error?  No?  We're done...
-	$config =& get_config();
-	if ($config['log_threshold'] == 0)
-	{
-		return;
-	}
-
-	$error->log_exception($severity, $message, $filepath, $line);
-}
-
-
+<?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

+ */

+

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

+

+/**

+ * Common Functions

+ *

+ * Loads the base classes and executes the request.

+ *

+ * @package		CodeIgniter

+ * @subpackage	codeigniter

+ * @category	Common Functions

+ * @author		Rick Ellis

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

+ */

+

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

+

+/**

+* Class registry

+*

+* This function acts as a singleton.  If the requested class does not

+* exist it is instantiated and set to a static variable.  If it has

+* previously been instantiated the variable is returned.

+*

+* @access	public

+* @param	string	the class name being requested

+* @param	bool	optional flag that lets classes get loaded but not instantiated

+* @return	object

+*/

+function &load_class($class, $instantiate = TRUE)

+{

+	static $objects = array();

+

+	// Does the class exist?  If so, we're done...

+	if (isset($objects[$class]))

+	{

+		return $objects[$class];

+	}

+			

+	// If the requested class does not exist in the application/libraries

+	// folder we'll load the native class from the system/libraries folder.	

+	if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT))

+	{

+		require(BASEPATH.'libraries/'.$class.EXT);	

+		require(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT);

+		$is_subclass = TRUE;	

+	}

+	else

+	{

+		if (file_exists(APPPATH.'libraries/'.$class.EXT))

+		{

+			require(APPPATH.'libraries/'.$class.EXT);	

+			$is_subclass = FALSE;	

+		}

+		else

+		{

+			require(BASEPATH.'libraries/'.$class.EXT);

+			$is_subclass = FALSE;

+		}

+	}

+

+	if ($instantiate == FALSE)

+	{

+		$objects[$class] = TRUE;

+		return $objects[$class];

+	}

+		

+	if ($is_subclass == TRUE)

+	{

+		$name = config_item('subclass_prefix').$class;

+		$objects[$class] =& new $name();

+		return $objects[$class];

+	}

+

+	$name = ($class != 'Controller') ? 'CI_'.$class : $class;

+	

+	$objects[$class] =& new $name();

+	return $objects[$class];

+}

+

+/**

+* Loads the main config.php file

+*

+* @access	private

+* @return	array

+*/

+function &get_config()

+{

+	static $main_conf;

+		

+	if ( ! isset($main_conf))

+	{

+		if ( ! file_exists(APPPATH.'config/config'.EXT))

+		{

+			exit('The configuration file config'.EXT.' does not exist.');

+		}

+		

+		require(APPPATH.'config/config'.EXT);

+		

+		if ( ! isset($config) OR ! is_array($config))

+		{

+			exit('Your config file does not appear to be formatted correctly.');

+		}

+

+		$main_conf[0] =& $config;

+	}

+	return $main_conf[0];

+}

+

+/**

+* Gets a config item

+*

+* @access	public

+* @return	mixed

+*/

+function config_item($item)

+{

+	static $config_item = array();

+

+	if ( ! isset($config_item[$item]))

+	{

+		$config =& get_config();

+		

+		if ( ! isset($config[$item]))

+		{

+			return FALSE;

+		}

+		$config_item[$item] = $config[$item];

+	}

+

+	return $config_item[$item];

+}

+

+

+/**

+* Error Handler

+*

+* This function lets us invoke the exception class and

+* display errors using the standard error template located

+* in application/errors/errors.php

+* This function will send the error page directly to the

+* browser and exit.

+*

+* @access	public

+* @return	void

+*/

+function show_error($message)

+{

+	$error =& load_class('Exceptions');

+	echo $error->show_error('An Error Was Encountered', $message);

+	exit;

+}

+

+

+/**

+* 404 Page Handler

+*

+* This function is similar to the show_error() function above

+* However, instead of the standard error template it displays

+* 404 errors.

+*

+* @access	public

+* @return	void

+*/

+function show_404($page = '')

+{

+	$error =& load_class('Exceptions');

+	$error->show_404($page);

+	exit;

+}

+

+

+/**

+* Error Logging Interface

+*

+* We use this as a simple mechanism to access the logging

+* class and send messages to be logged.

+*

+* @access	public

+* @return	void

+*/

+function log_message($level = 'error', $message, $php_error = FALSE)

+{

+	static $LOG;

+	

+	$config =& get_config();

+	if ($config['log_threshold'] == 0)

+	{

+		return;

+	}

+

+	$LOG =& load_class('Log');	

+	$LOG->write_log($level, $message, $php_error);

+}

+

+/**

+* Exception Handler

+*

+* This is the custom exception handler that is declaired at the top

+* of Codeigniter.php.  The main reason we use this is permit

+* PHP errors to be logged in our own log files since we may

+* not have access to server logs. Since this function

+* effectively intercepts PHP errors, however, we also need

+* to display errors based on the current error_reporting level.

+* We do that with the use of a PHP error template.

+*

+* @access	private

+* @return	void

+*/

+function _exception_handler($severity, $message, $filepath, $line)

+{	

+	 // We don't bother with "strict" notices since they will fill up

+	 // the log file with information that isn't normally very

+	 // helpful.  For example, if you are running PHP 5 and you

+	 // use version 4 style class functions (without prefixes

+	 // like "public", "private", etc.) you'll get notices telling

+	 // you that these have been deprecated.

+	

+	if ($severity == E_STRICT)

+	{

+		return;

+	}

+

+	$error =& load_class('Exceptions');

+

+	// Should we display the error?

+	// We'll get the current error_reporting level and add its bits

+	// with the severity bits to find out.

+	

+	if (($severity & error_reporting()) == $severity)

+	{

+		$error->show_php_error($severity, $message, $filepath, $line);

+	}

+	

+	// Should we log the error?  No?  We're done...

+	$config =& get_config();

+	if ($config['log_threshold'] == 0)

+	{

+		return;

+	}

+

+	$error->log_exception($severity, $message, $filepath, $line);

+}

+

+

 ?>
\ No newline at end of file