ExpressionEngine Dev Team in credit

5 files changed, 366 insertions, 100 deletions

diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php
index f3ec03524..4d276f437 100644
--- a/system/codeigniter/Base4.php
+++ b/system/codeigniter/Base4.php
@@ -5,7 +5,7 @@
  * An open source application development framework for PHP 4.3.2 or newer

  *

  * @package		CodeIgniter

- * @author		Rick Ellis

+ * @author		ExpressionEngine Dev Team

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

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

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

@@ -35,7 +35,7 @@
  * @package		CodeIgniter

  * @subpackage	codeigniter

  * @category	front-controller

- * @author		Rick Ellis

+ * @author		ExpressionEngine Dev Team

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

  */

  class CI_Base extends CI_Loader {

diff --git a/system/codeigniter/Base5.php b/system/codeigniter/Base5.php
index 3c43273da..9b59197d9 100644
--- a/system/codeigniter/Base5.php
+++ b/system/codeigniter/Base5.php
@@ -5,7 +5,7 @@
  * An open source application development framework for PHP 4.3.2 or newer

  *

  * @package		CodeIgniter

- * @author		Rick Ellis

+ * @author		ExpressionEngine Dev Team

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

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

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

@@ -26,7 +26,7 @@
  * @package		CodeIgniter

  * @subpackage	codeigniter

  * @category	front-controller

- * @author		Rick Ellis

+ * @author		ExpressionEngine Dev Team

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

  */

 

diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 39d07b0da..fc9524802 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -1 +1,267 @@
-<?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.codeigniter.com/user_guide/license.html
 * @link		http://www.codeigniter.com
 * @since		Version 1.0
 * @filesource
 */

// ------------------------------------------------------------------------

/**
 * System Front Controller
 *
 * Loads the base classes and executes the request.
 *
 * @package		CodeIgniter
 * @subpackage	codeigniter
 * @category	Front-controller
 * @author		Rick Ellis
 * @link		http://www.codeigniter.com/user_guide/
 */

// CI Version
define('CI_VERSION',	'1.5.5');

/*
 * ------------------------------------------------------
 *  Load the global functions
 * ------------------------------------------------------
 */
require(BASEPATH.'codeigniter/Common'.EXT);

/*
 * ------------------------------------------------------
 *  Load the compatibility override functions
 * ------------------------------------------------------
 */
require(BASEPATH.'codeigniter/Compat'.EXT);
	
/*
 * ------------------------------------------------------
 *  Define a custom error handler so we can log PHP errors
 * ------------------------------------------------------
 */
set_error_handler('_exception_handler');
set_magic_quotes_runtime(0); // Kill magic quotes

/*
 * ------------------------------------------------------
 *  Start the timer... tick tock tick tock...
 * ------------------------------------------------------
 */

$BM =& load_class('Benchmark');
$BM->mark('total_execution_time_start');
$BM->mark('loading_time_base_classes_start');

/*
 * ------------------------------------------------------
 *  Instantiate the hooks class
 * ------------------------------------------------------
 */

$EXT =& load_class('Hooks');

/*
 * ------------------------------------------------------
 *  Is there a "pre_system" hook?
 * ------------------------------------------------------
 */
$EXT->_call_hook('pre_system');

/*
 * ------------------------------------------------------
 *  Instantiate the base classes
 * ------------------------------------------------------
 */

$CFG =& load_class('Config');
$URI =& load_class('URI');
$RTR =& load_class('Router');
$OUT =& load_class('Output');

/*
 * ------------------------------------------------------
 *	Is there a valid cache file?  If so, we're done...
 * ------------------------------------------------------
 */

if ($EXT->_call_hook('cache_override') === FALSE)
{
	if ($OUT->_display_cache($CFG, $RTR) == TRUE)
	{
		exit;
	}
}

/*
 * ------------------------------------------------------
 *  Load the remaining base classes
 * ------------------------------------------------------
 */

$IN		=& load_class('Input');
$LANG	=& load_class('Language');

/*
 * ------------------------------------------------------
 *  Load the app controller and local controller
 * ------------------------------------------------------
 *
 *  Note: Due to the poor object handling in PHP 4 we'll
 *  conditionally load different versions of the base
 *  class.  Retaining PHP 4 compatibility requires a bit of a hack.
 *
 *  Note: The Loader class needs to be included first
 *
 */
if (floor(phpversion()) < 5)
{
	load_class('Loader', FALSE);
	require(BASEPATH.'codeigniter/Base4'.EXT);
}
else
{
	require(BASEPATH.'codeigniter/Base5'.EXT);
}

// Load the base controller class
load_class('Controller', FALSE);

// Load the local application controller
// Note: The Router class automatically validates the controller path.  If this include fails it 
// means that the default controller in the Routes.php file is not resolving to something valid.
if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT))
{
	show_error('Unable to load your default controller.  Please make sure the controller specified in your Routes.php file is valid.');
}

include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT);

// Set a mark point for benchmarking
$BM->mark('loading_time_base_classes_end');


/*
 * ------------------------------------------------------
 *  Security check
 * ------------------------------------------------------
 *
 *  None of the functions in the app controller or the
 *  loader class can be called via the URI, nor can
 *  controller functions that begin with an underscore
 */
$class  = $RTR->fetch_class();
$method = $RTR->fetch_method();


if ( ! class_exists($class)
	OR $method == 'controller'
	OR substr($method, 0, 1) == '_'
	OR in_array($method, get_class_methods('Controller'), TRUE)
	)
{
	show_404();
}

/*
 * ------------------------------------------------------
 *  Is there a "pre_controller" hook?
 * ------------------------------------------------------
 */
$EXT->_call_hook('pre_controller');

/*
 * ------------------------------------------------------
 *  Instantiate the controller and call requested method
 * ------------------------------------------------------
 */

// Mark a start point so we can benchmark the controller
$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start');

$CI = new $class();

// Is this a scaffolding request?
if ($RTR->scaffolding_request === TRUE)
{
	if ($EXT->_call_hook('scaffolding_override') === FALSE)
	{
		$CI->_ci_scaffolding();
	}
}
else
{
	/*
	 * ------------------------------------------------------
	 *  Is there a "post_controller_constructor" hook?
	 * ------------------------------------------------------
	 */
	$EXT->_call_hook('post_controller_constructor');
	
	// Is there a "remap" function?
	if (method_exists($CI, '_remap'))
	{
		$CI->_remap($method);
	}
	else
	{
		if ( ! method_exists($CI, $method))
		{
			show_404();
		}

		// Call the requested method.
		// Any URI segments present (besides the class/function) will be passed to the method for convenience		
		call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3)));		
	}
}

// Mark a benchmark end point
$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end');

/*
 * ------------------------------------------------------
 *  Is there a "post_controller" hook?
 * ------------------------------------------------------
 */
$EXT->_call_hook('post_controller');

/*
 * ------------------------------------------------------
 *  Send the final rendered output to the browser
 * ------------------------------------------------------
 */

if ($EXT->_call_hook('display_override') === FALSE)
{
	$OUT->_display();
}

/*
 * ------------------------------------------------------
 *  Is there a "post_system" hook?
 * ------------------------------------------------------
 */
$EXT->_call_hook('post_system');

/*
 * ------------------------------------------------------
 *  Close the DB connection if one exists
 * ------------------------------------------------------
 */
if (class_exists('CI_DB') AND isset($CI->db))
{
	$CI->db->close();
}


?>
\ No newline at end of file
+<?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		ExpressionEngine Dev Team

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

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

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

+ * @since		Version 1.0

+ * @filesource

+ */

+

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

+

+/**

+ * System Front Controller

+ *

+ * Loads the base classes and executes the request.

+ *

+ * @package		CodeIgniter

+ * @subpackage	codeigniter

+ * @category	Front-controller

+ * @author		ExpressionEngine Dev Team

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

+ */

+

+// CI Version

+define('CI_VERSION',	'1.5.5');

+

+/*

+ * ------------------------------------------------------

+ *  Load the global functions

+ * ------------------------------------------------------

+ */

+require(BASEPATH.'codeigniter/Common'.EXT);

+

+/*

+ * ------------------------------------------------------

+ *  Load the compatibility override functions

+ * ------------------------------------------------------

+ */

+require(BASEPATH.'codeigniter/Compat'.EXT);

+	

+/*

+ * ------------------------------------------------------

+ *  Define a custom error handler so we can log PHP errors

+ * ------------------------------------------------------

+ */

+set_error_handler('_exception_handler');

+set_magic_quotes_runtime(0); // Kill magic quotes

+

+/*

+ * ------------------------------------------------------

+ *  Start the timer... tick tock tick tock...

+ * ------------------------------------------------------

+ */

+

+$BM =& load_class('Benchmark');

+$BM->mark('total_execution_time_start');

+$BM->mark('loading_time_base_classes_start');

+

+/*

+ * ------------------------------------------------------

+ *  Instantiate the hooks class

+ * ------------------------------------------------------

+ */

+

+$EXT =& load_class('Hooks');

+

+/*

+ * ------------------------------------------------------

+ *  Is there a "pre_system" hook?

+ * ------------------------------------------------------

+ */

+$EXT->_call_hook('pre_system');

+

+/*

+ * ------------------------------------------------------

+ *  Instantiate the base classes

+ * ------------------------------------------------------

+ */

+

+$CFG =& load_class('Config');

+$URI =& load_class('URI');

+$RTR =& load_class('Router');

+$OUT =& load_class('Output');

+

+/*

+ * ------------------------------------------------------

+ *	Is there a valid cache file?  If so, we're done...

+ * ------------------------------------------------------

+ */

+

+if ($EXT->_call_hook('cache_override') === FALSE)

+{

+	if ($OUT->_display_cache($CFG, $RTR) == TRUE)

+	{

+		exit;

+	}

+}

+

+/*

+ * ------------------------------------------------------

+ *  Load the remaining base classes

+ * ------------------------------------------------------

+ */

+

+$IN		=& load_class('Input');

+$LANG	=& load_class('Language');

+

+/*

+ * ------------------------------------------------------

+ *  Load the app controller and local controller

+ * ------------------------------------------------------

+ *

+ *  Note: Due to the poor object handling in PHP 4 we'll

+ *  conditionally load different versions of the base

+ *  class.  Retaining PHP 4 compatibility requires a bit of a hack.

+ *

+ *  Note: The Loader class needs to be included first

+ *

+ */

+if (floor(phpversion()) < 5)

+{

+	load_class('Loader', FALSE);

+	require(BASEPATH.'codeigniter/Base4'.EXT);

+}

+else

+{

+	require(BASEPATH.'codeigniter/Base5'.EXT);

+}

+

+// Load the base controller class

+load_class('Controller', FALSE);

+

+// Load the local application controller

+// Note: The Router class automatically validates the controller path.  If this include fails it 

+// means that the default controller in the Routes.php file is not resolving to something valid.

+if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT))

+{

+	show_error('Unable to load your default controller.  Please make sure the controller specified in your Routes.php file is valid.');

+}

+

+include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT);

+

+// Set a mark point for benchmarking

+$BM->mark('loading_time_base_classes_end');

+

+

+/*

+ * ------------------------------------------------------

+ *  Security check

+ * ------------------------------------------------------

+ *

+ *  None of the functions in the app controller or the

+ *  loader class can be called via the URI, nor can

+ *  controller functions that begin with an underscore

+ */

+$class  = $RTR->fetch_class();

+$method = $RTR->fetch_method();

+

+

+if ( ! class_exists($class)

+	OR $method == 'controller'

+	OR substr($method, 0, 1) == '_'

+	OR in_array($method, get_class_methods('Controller'), TRUE)

+	)

+{

+	show_404();

+}

+

+/*

+ * ------------------------------------------------------

+ *  Is there a "pre_controller" hook?

+ * ------------------------------------------------------

+ */

+$EXT->_call_hook('pre_controller');

+

+/*

+ * ------------------------------------------------------

+ *  Instantiate the controller and call requested method

+ * ------------------------------------------------------

+ */

+

+// Mark a start point so we can benchmark the controller

+$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start');

+

+$CI = new $class();

+

+// Is this a scaffolding request?

+if ($RTR->scaffolding_request === TRUE)

+{

+	if ($EXT->_call_hook('scaffolding_override') === FALSE)

+	{

+		$CI->_ci_scaffolding();

+	}

+}

+else

+{

+	/*

+	 * ------------------------------------------------------

+	 *  Is there a "post_controller_constructor" hook?

+	 * ------------------------------------------------------

+	 */

+	$EXT->_call_hook('post_controller_constructor');

+	

+	// Is there a "remap" function?

+	if (method_exists($CI, '_remap'))

+	{

+		$CI->_remap($method);

+	}

+	else

+	{

+		if ( ! method_exists($CI, $method))

+		{

+			show_404();

+		}

+

+		// Call the requested method.

+		// Any URI segments present (besides the class/function) will be passed to the method for convenience		

+		call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3)));		

+	}

+}

+

+// Mark a benchmark end point

+$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end');

+

+/*

+ * ------------------------------------------------------

+ *  Is there a "post_controller" hook?

+ * ------------------------------------------------------

+ */

+$EXT->_call_hook('post_controller');

+

+/*

+ * ------------------------------------------------------

+ *  Send the final rendered output to the browser

+ * ------------------------------------------------------

+ */

+

+if ($EXT->_call_hook('display_override') === FALSE)

+{

+	$OUT->_display();

+}

+

+/*

+ * ------------------------------------------------------

+ *  Is there a "post_system" hook?

+ * ------------------------------------------------------

+ */

+$EXT->_call_hook('post_system');

+

+/*

+ * ------------------------------------------------------

+ *  Close the DB connection if one exists

+ * ------------------------------------------------------

+ */

+if (class_exists('CI_DB') AND isset($CI->db))

+{

+	$CI->db->close();

+}

+

+

+?>
\ No newline at end of file
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index eee13ab91..327702f10 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -5,7 +5,7 @@
  * An open source application development framework for PHP 4.3.2 or newer

  *

  * @package		CodeIgniter

- * @author		Rick Ellis

+ * @author		ExpressionEngine Dev Team

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

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

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

@@ -23,7 +23,7 @@
  * @package		CodeIgniter

  * @subpackage	codeigniter

  * @category	Common Functions

- * @author		Rick Ellis

+ * @author		ExpressionEngine Dev Team

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

  */

 

diff --git a/system/codeigniter/Compat.php b/system/codeigniter/Compat.php
index 108b0a1aa..82fdf3209 100644
--- a/system/codeigniter/Compat.php
+++ b/system/codeigniter/Compat.php
@@ -1,94 +1,94 @@
-<?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.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
- * @since		Version 1.0
- * @filesource
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * Compatibility Functions
- *
- * Function overrides for older versions of PHP or PHP environments missing
- * certain extensions / libraries
- *
- * @package		CodeIgniter
- * @subpackage	codeigniter
- * @category	Compatibility Functions
- * @author		EllisLab Development Team
- * @link		http://www.codeigniter.com/user_guide/
- */
-
-// ------------------------------------------------------------------------
-
-/*
- * PHP versions prior to 5.0 don't support the E_STRICT constant
- * so we need to explicitly define it otherwise the Exception class 
- * will generate errors when running under PHP 4
- *
- */
-if ( ! defined('E_STRICT'))
-{
-	define('E_STRICT', 2048);
-}
-
-/**
- * ctype_digit()
- *
- * Determines if a string is comprised only of digits
- * http://us.php.net/manual/en/function.ctype_digit.php
- *
- * @access	public
- * @param	string
- * @return	bool
- */
-if (! function_exists('ctype_digit'))
-{
-	function ctype_digit($str)
-	{
-		if (! is_string($str) OR $str == '')
-		{
-			return FALSE;
-		}
-		
-		return ! preg_match('/[^0-9]/', $str);
-	}	
-}
-
-// --------------------------------------------------------------------
-
-/**
- * ctype_alnum()
- *
- * Determines if a string is comprised of only alphanumeric characters
- * http://us.php.net/manual/en/function.ctype-alnum.php
- *
- * @access	public
- * @param	string
- * @return	bool
- */
-if (! function_exists('ctype_alnum'))
-{
-	function ctype_alnum($str)
-	{
-		if (! is_string($str) OR $str == '')
-		{
-			return FALSE;
-		}
-		
-		return ! preg_match('/[^0-9a-z]/i', $str);
-	}	
-}
-
-// --------------------------------------------------------------------
-
+<?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		ExpressionEngine Dev Team

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

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

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

+ * @since		Version 1.0

+ * @filesource

+ */

+

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

+

+/**

+ * Compatibility Functions

+ *

+ * Function overrides for older versions of PHP or PHP environments missing

+ * certain extensions / libraries

+ *

+ * @package		CodeIgniter

+ * @subpackage	codeigniter

+ * @category	Compatibility Functions

+ * @author		EllisLab Development Team

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

+ */

+

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

+

+/*

+ * PHP versions prior to 5.0 don't support the E_STRICT constant

+ * so we need to explicitly define it otherwise the Exception class 

+ * will generate errors when running under PHP 4

+ *

+ */

+if ( ! defined('E_STRICT'))

+{

+	define('E_STRICT', 2048);

+}

+

+/**

+ * ctype_digit()

+ *

+ * Determines if a string is comprised only of digits

+ * http://us.php.net/manual/en/function.ctype_digit.php

+ *

+ * @access	public

+ * @param	string

+ * @return	bool

+ */

+if (! function_exists('ctype_digit'))

+{

+	function ctype_digit($str)

+	{

+		if (! is_string($str) OR $str == '')

+		{

+			return FALSE;

+		}

+		

+		return ! preg_match('/[^0-9]/', $str);

+	}	

+}

+

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

+

+/**

+ * ctype_alnum()

+ *

+ * Determines if a string is comprised of only alphanumeric characters

+ * http://us.php.net/manual/en/function.ctype-alnum.php

+ *

+ * @access	public

+ * @param	string

+ * @return	bool

+ */

+if (! function_exists('ctype_alnum'))

+{

+	function ctype_alnum($str)

+	{

+		if (! is_string($str) OR $str == '')

+		{

+			return FALSE;

+		}

+		

+		return ! preg_match('/[^0-9a-z]/i', $str);

+	}	

+}

+

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

+

 ?>
\ No newline at end of file