New development version of codeigniter 2.

Submitter is maintainer.

PR:		ports/151956
Submitted by:	Bo-Yi Wu <appleboy.tw@gmail.com>
Approved by:	glarkin (codeigniter maintainer)
		itetcu (implicit)

5 files changed, 105 insertions, 515 deletions

diff --git a/www/codeigniter-devel/Makefile b/www/codeigniter-devel/Makefile
index ecfe309382c7..c78fc3cb8165 100644
--- a/www/codeigniter-devel/Makefile
+++ b/www/codeigniter-devel/Makefile
@@ -4,66 +4,69 @@
 #
 # $FreeBSD$
 #
-
 PORTNAME=	codeigniter
-PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	www
-MASTER_SITES=	http://codeigniter.com/download_files/ \
-		LOCAL/glarkin
-DISTNAME=	CodeIgniter_${PORTVERSION}
+MASTER_SITES=	http://bitbucket.org/ellislab/codeigniter/get/ \
+		http://www.codeigniter.org.tw/download_files/
+DISTNAME=	98b57d21e524
+PKG_SUFX=	-devel
 
-MAINTAINER=	glarkin@FreeBSD.org
+MAINTAINER=	appleboy.tw@gmail.com
 COMMENT=	A framework for developing PHP web applications
 
 USE_ZIP=	yes
-
 NO_BUILD=	yes
 USE_PHP=	session pcre
-WANT_PHP_WEB=	yes
+NT_PHP_WEB=	yes
 
 CI_SYS_DIR=	system
-CI_CONF_DIR=	${CI_SYS_DIR}/application/config
+CI_CONF_DIR=	application/config
+WRKSRC=	${WRKDIR}/codeigniter
+WWWDIR=	${PREFIX}/www/codeigniter
+PORTDOCS=	*
 
 # These are all user-configurable files that we'll install
-# a .sample copy for each.
 CI_CONF_FILES=	index.php ${CI_CONF_DIR}/autoload.php \
 		${CI_CONF_DIR}/config.php ${CI_CONF_DIR}/constants.php \
 		${CI_CONF_DIR}/database.php \
+		${CI_CONF_DIR}/doctypes.php \
+		${CI_CONF_DIR}/foreign_chars.php \
+		${CI_CONF_DIR}/profiler.php \
 		${CI_CONF_DIR}/hooks.php ${CI_CONF_DIR}/mimes.php \
 		${CI_CONF_DIR}/routes.php ${CI_CONF_DIR}/smileys.php \
 		${CI_CONF_DIR}/user_agents.php
 
 # This is the rest of the CodeIgniter installation that doesn't change
 STD_BITS=	${CI_CONF_DIR}/index.html \
-		${CI_SYS_DIR}/application/controllers \
-		${CI_SYS_DIR}/application/errors \
-		${CI_SYS_DIR}/application/helpers \
-		${CI_SYS_DIR}/application/hooks \
-		${CI_SYS_DIR}/application/index.html \
-		${CI_SYS_DIR}/application/language \
-		${CI_SYS_DIR}/application/libraries \
-		${CI_SYS_DIR}/application/models \
-		${CI_SYS_DIR}/application/views \
+		application/controllers \
+		application/core \
+		application/errors \
+		application/helpers \
+		application/hooks \
+		application/index.html \
+		application/language \
+		application/libraries \
+		application/models \
+		application/views \
+		application/third_party \
 		${CI_SYS_DIR}/cache \
-		${CI_SYS_DIR}/codeigniter \
+		${CI_SYS_DIR}/core \
 		${CI_SYS_DIR}/database \
 		${CI_SYS_DIR}/fonts \
 		${CI_SYS_DIR}/helpers \
 		${CI_SYS_DIR}/language \
 		${CI_SYS_DIR}/libraries \
-		${CI_SYS_DIR}/logs \
-		${CI_SYS_DIR}/plugins \
-		${CI_SYS_DIR}/scaffolding
+		${CI_SYS_DIR}/logs
 
 OPTIONS=	APACHE "Configure for Apache-2.x" off \
-		PROD "Install for production server (see: make confighelp)" Off \
-		MSSQL "Install MSSQL support for PHP" Off \
-		MYSQL "Install MySQL support for PHP" Off \
-		MYSQLI "Install MySQLi support for PHP" Off \
-		ODBC "Install ODBC support for PHP" Off \
-		PGSQL "Install PostgreSQL support for PHP" Off \
-		SQLITE "Install SQLite support for PHP" Off
+	PROD "Install for production server (see: make confighelp)" Off \
+	MSSQL "Install MSSQL support for PHP" Off \
+	MYSQL "Install MySQL support for PHP" Off \
+	MYSQLI "Install MySQLi support for PHP" Off \
+	ODBC "Install ODBC support for PHP" Off \
+	PGSQL "Install PostgreSQL support for PHP" Off \
+	SQLITE "Install SQLite support for PHP" Off
 
 .include <bsd.port.pre.mk>
 
@@ -149,9 +152,6 @@ confighelp:
 	@${ECHO_MSG} "http://codeigniter.com/user_guide/installation/index.html"
 	@${ECHO_MSG} ""
 
-post-patch:
-	@cd ${WRKSRC} && ${RM} system/libraries/Upload.php.orig
-
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${WWWDIR}
 	@for i in ${CI_CONF_FILES}; do \
@@ -191,7 +191,7 @@ post-install:
 	fi
 .endif
 .if !defined(NOPORTDOCS)
-	@cd ${WRKSRC}/user_guide/ && ${COPYTREE_SHARE} . ${DOCSDIR}
+	@cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/codeigniter-devel/files/patch-system__libraries__Upload.php b/www/codeigniter-devel/files/patch-system__libraries__Upload.php
deleted file mode 100644
index 25582add045a..000000000000
--- a/www/codeigniter-devel/files/patch-system__libraries__Upload.php
+++ /dev/null
@@ -1,245 +0,0 @@
---- ./system/libraries/Upload.php.orig	2009-04-22 10:15:09.000000000 -0400
-+++ ./system/libraries/Upload.php	2010-07-12 09:16:30.000000000 -0400
-@@ -6,7 +6,7 @@
-  *
-  * @package		CodeIgniter
-  * @author		ExpressionEngine Dev Team
-- * @copyright	Copyright (c) 2008 - 2009, EllisLab, Inc.
-+ * @copyright	Copyright (c) 2008 - 2010, EllisLab, Inc.
-  * @license		http://codeigniter.com/user_guide/license.html
-  * @link		http://codeigniter.com
-  * @since		Version 1.0
-@@ -26,31 +26,33 @@
-  */
- class CI_Upload {
- 	
--	var $max_size		= 0;
--	var $max_width		= 0;
--	var $max_height		= 0;
--	var $max_filename	= 0;
--	var $allowed_types	= "";
--	var $file_temp		= "";
--	var $file_name		= "";
--	var $orig_name		= "";
--	var $file_type		= "";
--	var $file_size		= "";
--	var $file_ext		= "";
--	var $upload_path	= "";
--	var $overwrite		= FALSE;
--	var $encrypt_name	= FALSE;
--	var $is_image		= FALSE;
--	var $image_width	= '';
--	var $image_height	= '';
--	var $image_type		= '';
--	var $image_size_str	= '';
--	var $error_msg		= array();
--	var $mimes			= array();
--	var $remove_spaces	= TRUE;
--	var $xss_clean		= FALSE;
--	var $temp_prefix	= "temp_file_";
--		
-+	var $max_size				= 0;
-+	var $max_width				= 0;
-+	var $max_height				= 0;
-+	var $max_filename			= 0;
-+	var $allowed_types			= "";
-+	var $file_temp				= "";
-+	var $file_name				= "";
-+	var $orig_name				= "";
-+	var $file_type				= "";
-+	var $file_size				= "";
-+	var $file_ext				= "";
-+	var $upload_path			= "";
-+	var $overwrite				= FALSE;
-+	var $encrypt_name			= FALSE;
-+	var $is_image				= FALSE;
-+	var $image_width			= '';
-+	var $image_height			= '';
-+	var $image_type				= '';
-+	var $image_size_str			= '';
-+	var $error_msg				= array();
-+	var $mimes					= array();
-+	var $remove_spaces			= TRUE;
-+	var $xss_clean				= FALSE;
-+	var $temp_prefix			= "temp_file_";
-+	var $client_name			= '';
-+	
-+	var $_file_name_override	= '';	
- 	/**
- 	 * Constructor
- 	 *
-@@ -101,7 +103,8 @@
- 							'mimes'				=> array(),
- 							'remove_spaces'		=> TRUE,
- 							'xss_clean'			=> FALSE,
--							'temp_prefix'		=> "temp_file_"
-+							'temp_prefix'		=> "temp_file_",
-+							'client_name'		=> ''
- 						);	
- 	
- 	
-@@ -124,6 +127,10 @@
- 				$this->$key = $val;
- 			}
- 		}
-+		
-+		// if a file_name was provided in the config, use it instead of the user input
-+		// supplied file name for all uploads until initialized again
-+		$this->_file_name_override = $this->file_name;
- 	}
- 	
- 	// --------------------------------------------------------------------
-@@ -187,17 +194,12 @@
- 
- 		// Set the uploaded data as class variables
- 		$this->file_temp = $_FILES[$field]['tmp_name'];		
--		$this->file_name = $this->_prep_filename($_FILES[$field]['name']);
--		$this->file_size = $_FILES[$field]['size'];		
-+		$this->file_size = $_FILES[$field]['size'];	
- 		$this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES[$field]['type']);
--		$this->file_type = strtolower($this->file_type);
--		$this->file_ext	 = $this->get_extension($_FILES[$field]['name']);
--		
--		// Convert the file size to kilobytes
--		if ($this->file_size > 0)
--		{
--			$this->file_size = round($this->file_size/1024, 2);
--		}
-+		$this->file_type = strtolower(trim(stripslashes($this->file_type), '"'));
-+		$this->file_name = $this->_prep_filename($_FILES[$field]['name']);
-+		$this->file_ext	 = $this->get_extension($this->file_name);
-+		$this->client_name = $this->file_name;
- 
- 		// Is the file type allowed to be uploaded?
- 		if ( ! $this->is_allowed_filetype())
-@@ -205,6 +207,25 @@
- 			$this->set_error('upload_invalid_filetype');
- 			return FALSE;
- 		}
-+				
-+		// if we're overriding, let's now make sure the new name and type is allowed
-+		if ($this->_file_name_override != '')
-+		{
-+			$this->file_name = $this->_prep_filename($this->_file_name_override);
-+			$this->file_ext  = $this->get_extension($this->file_name);
-+
-+			if ( ! $this->is_allowed_filetype(TRUE))
-+			{
-+				$this->set_error('upload_invalid_filetype');
-+				return FALSE;				
-+			}
-+		}
-+		
-+		// Convert the file size to kilobytes
-+		if ($this->file_size > 0)
-+		{
-+			$this->file_size = round($this->file_size/1024, 2);
-+		}
- 
- 		// Is the file size within the allowed maximum?
- 		if ( ! $this->is_allowed_filesize())
-@@ -312,6 +333,7 @@
- 						'full_path'			=> $this->upload_path.$this->file_name,
- 						'raw_name'			=> str_replace($this->file_ext, '', $this->file_name),
- 						'orig_name'			=> $this->orig_name,
-+						'client_name'		=> $this->client_name,
- 						'file_ext'			=> $this->file_ext,
- 						'file_size'			=> $this->file_size,
- 						'is_image'			=> $this->is_image(),
-@@ -549,43 +571,49 @@
- 	 * @access	public
- 	 * @return	bool
- 	 */	
--	function is_allowed_filetype()
-+	function is_allowed_filetype($ignore_mime = FALSE)
- 	{
- 		if (count($this->allowed_types) == 0 OR ! is_array($this->allowed_types))
- 		{
- 			$this->set_error('upload_no_file_types');
- 			return FALSE;
- 		}
-+		
-+		$ext = strtolower(ltrim($this->file_ext, '.'));
-+		
-+		if ( ! in_array($ext, $this->allowed_types))
-+		{
-+			return FALSE;
-+		}
- 
-+		// Images get some additional checks
- 		$image_types = array('gif', 'jpg', 'jpeg', 'png', 'jpe');
- 
--		foreach ($this->allowed_types as $val)
-+		if (in_array($ext, $image_types))
- 		{
--			$mime = $this->mimes_types(strtolower($val));
--
--			// Images get some additional checks
--			if (in_array($val, $image_types))
-+			if (getimagesize($this->file_temp) === FALSE)
- 			{
--				if (getimagesize($this->file_temp) === FALSE)
--				{
--					return FALSE;
--				}
--			}
-+				return FALSE;
-+			}			
-+		}
- 
--			if (is_array($mime))
--			{
--				if (in_array($this->file_type, $mime, TRUE))
--				{
--					return TRUE;
--				}
--			}
--			else
-+		if ($ignore_mime === TRUE)
-+		{
-+			return TRUE;
-+		}
-+		
-+		$mime = $this->mimes_types($ext);
-+				
-+		if (is_array($mime))
-+		{
-+			if (in_array($this->file_type, $mime, TRUE))
- 			{
--				if ($mime == $this->file_type)
--				{
--					return TRUE;
--				}	
--			}		
-+				return TRUE;
-+			}			
-+		}
-+		elseif ($mime == $this->file_type)
-+		{
-+				return TRUE;
- 		}
- 		
- 		return FALSE;
-@@ -918,7 +946,7 @@
- 
- 		foreach ($parts as $part)
- 		{
--			if ($this->mimes_types(strtolower($part)) === FALSE)
-+			if ( ! in_array(strtolower($part), $this->allowed_types) OR $this->mimes_types(strtolower($part)) === FALSE)
- 			{
- 				$filename .= '.'.$part.'_';
- 			}
-@@ -928,13 +956,6 @@
- 			}
- 		}
- 
--		// file name override, since the exact name is provided, no need to
--		// run it through a $this->mimes check.
--		if ($this->file_name != '')
--		{
--			$filename = $this->file_name;
--		}
--
- 		$filename .= '.'.$ext;
- 		
- 		return $filename;
diff --git a/www/codeigniter-devel/files/pkg-message-apache.in b/www/codeigniter-devel/files/pkg-message-apache.in
index ba70e0fca94e..800f3358b738 100644
--- a/www/codeigniter-devel/files/pkg-message-apache.in
+++ b/www/codeigniter-devel/files/pkg-message-apache.in
@@ -7,16 +7,16 @@ the CodeIgniter configuration file is loaded.
 
 Optional post-installation instructions include:
 
-- Open the %%WWWDIR%%/system/application/config/config.php
+- Open the %%WWWDIR%%/application/config/config.php
   file with a text editor and set your base URL.
 
 - If you intend to use a database, open the
-  %%WWWDIR%%/system/application/config/database.php
+  %%WWWDIR%%/application/config/database.php
   file with a text editor and set your database settings.
 
 - Other user-configurable files include:
     %%WWWDIR%%/index.php
-    Any file located in %%WWWDIR%%/system/application/config 
+    Any file located in %%WWWDIR%%/application/config 
 
 - If you are upgrading from a prior release, please visit:
   http://codeigniter.com/user_guide/installation/upgrading.html
diff --git a/www/codeigniter-devel/files/pkg-message-noapache.in b/www/codeigniter-devel/files/pkg-message-noapache.in
index fa06056f1d74..e1e63d89e1bf 100644
--- a/www/codeigniter-devel/files/pkg-message-noapache.in
+++ b/www/codeigniter-devel/files/pkg-message-noapache.in
@@ -4,16 +4,16 @@ You have just installed the CodeIgniter web application framework.
 
 Optional post-installation instructions include:
 
-- Open the %%WWWDIR%%/system/application/config/config.php
+- Open the %%WWWDIR%%/application/config/config.php
   file with a text editor and set your base URL.
 
 - If you intend to use a database, open the
-  %%WWWDIR%%/system/application/config/database.php
+  %%WWWDIR%%/application/config/database.php
   file with a text editor and set your database settings.
 
 - Other user-configurable files include:
     %%WWWDIR%%/index.php
-    Any file located in %%WWWDIR%%/system/application/config 
+    Any file located in %%WWWDIR%%/application/config 
 
 - If you are upgrading from a prior release, please visit:
   http://codeigniter.com/user_guide/installation/upgrading.html
diff --git a/www/codeigniter-devel/pkg-plist b/www/codeigniter-devel/pkg-plist
index d387ba424292..cfe28f483bd7 100644
--- a/www/codeigniter-devel/pkg-plist
+++ b/www/codeigniter-devel/pkg-plist
@@ -1,152 +1,4 @@
 %%NOAPACHE%%%%CONFDIR%%/codeigniter.conf
-%%PORTDOCS%%%%DOCSDIR%%/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/database/active_record.html
-%%PORTDOCS%%%%DOCSDIR%%/database/caching.html
-%%PORTDOCS%%%%DOCSDIR%%/database/call_function.html
-%%PORTDOCS%%%%DOCSDIR%%/database/configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/database/connecting.html
-%%PORTDOCS%%%%DOCSDIR%%/database/examples.html
-%%PORTDOCS%%%%DOCSDIR%%/database/fields.html
-%%PORTDOCS%%%%DOCSDIR%%/database/forge.html
-%%PORTDOCS%%%%DOCSDIR%%/database/helpers.html
-%%PORTDOCS%%%%DOCSDIR%%/database/index.html
-%%PORTDOCS%%%%DOCSDIR%%/database/queries.html
-%%PORTDOCS%%%%DOCSDIR%%/database/results.html
-%%PORTDOCS%%%%DOCSDIR%%/database/table_data.html
-%%PORTDOCS%%%%DOCSDIR%%/database/transactions.html
-%%PORTDOCS%%%%DOCSDIR%%/database/utilities.html
-%%PORTDOCS%%%%DOCSDIR%%/doc_style/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc_style/template.html
-%%PORTDOCS%%%%DOCSDIR%%/general/alternative_php.html
-%%PORTDOCS%%%%DOCSDIR%%/general/ancillary_classes.html
-%%PORTDOCS%%%%DOCSDIR%%/general/autoloader.html
-%%PORTDOCS%%%%DOCSDIR%%/general/caching.html
-%%PORTDOCS%%%%DOCSDIR%%/general/common_functions.html
-%%PORTDOCS%%%%DOCSDIR%%/general/controllers.html
-%%PORTDOCS%%%%DOCSDIR%%/general/core_classes.html
-%%PORTDOCS%%%%DOCSDIR%%/general/creating_libraries.html
-%%PORTDOCS%%%%DOCSDIR%%/general/credits.html
-%%PORTDOCS%%%%DOCSDIR%%/general/errors.html
-%%PORTDOCS%%%%DOCSDIR%%/general/helpers.html
-%%PORTDOCS%%%%DOCSDIR%%/general/hooks.html
-%%PORTDOCS%%%%DOCSDIR%%/general/libraries.html
-%%PORTDOCS%%%%DOCSDIR%%/general/managing_apps.html
-%%PORTDOCS%%%%DOCSDIR%%/general/models.html
-%%PORTDOCS%%%%DOCSDIR%%/general/plugins.html
-%%PORTDOCS%%%%DOCSDIR%%/general/profiling.html
-%%PORTDOCS%%%%DOCSDIR%%/general/quick_reference.html
-%%PORTDOCS%%%%DOCSDIR%%/general/requirements.html
-%%PORTDOCS%%%%DOCSDIR%%/general/reserved_names.html
-%%PORTDOCS%%%%DOCSDIR%%/general/routing.html
-%%PORTDOCS%%%%DOCSDIR%%/general/scaffolding.html
-%%PORTDOCS%%%%DOCSDIR%%/general/security.html
-%%PORTDOCS%%%%DOCSDIR%%/general/styleguide.html
-%%PORTDOCS%%%%DOCSDIR%%/general/urls.html
-%%PORTDOCS%%%%DOCSDIR%%/general/views.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/array_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/compatibility_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/cookie_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/date_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/directory_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/download_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/email_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/file_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/form_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/html_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/inflector_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/language_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/number_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/path_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/security_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/smiley_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/string_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/text_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/typography_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/url_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/helpers/xml_helper.html
-%%PORTDOCS%%%%DOCSDIR%%/images/appflowchart.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/arrow.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/ci_logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/ci_logo_flame.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/ci_quick_ref.png
-%%PORTDOCS%%%%DOCSDIR%%/images/codeigniter_1.7.1_helper_reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/images/codeigniter_1.7.1_helper_reference.png
-%%PORTDOCS%%%%DOCSDIR%%/images/codeigniter_1.7.1_library_reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/images/codeigniter_1.7.1_library_reference.png
-%%PORTDOCS%%%%DOCSDIR%%/images/file.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/folder.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/nav_bg_darker.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/nav_separator_darker.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/nav_toggle_darker.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/smile.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/transparent.gif
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/downloads.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/index.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/troubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_120.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_130.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_131.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_132.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_133.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_140.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_141.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_150.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_152.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_153.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_154.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_160.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_161.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_162.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_163.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_170.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_171.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_172.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_b11.html
-%%PORTDOCS%%%%DOCSDIR%%/installation/upgrading.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/benchmark.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/calendar.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/cart.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/config.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/email.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/encryption.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/file_uploading.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/form_validation.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/ftp.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/image_lib.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/input.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/language.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/loader.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/output.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/pagination.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/parser.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/sessions.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/table.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/trackback.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/typography.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/unit_testing.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/uri.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/user_agent.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/validation.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/xmlrpc.html
-%%PORTDOCS%%%%DOCSDIR%%/libraries/zip.html
-%%PORTDOCS%%%%DOCSDIR%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%/nav/hacks.txt
-%%PORTDOCS%%%%DOCSDIR%%/nav/moo.fx.js
-%%PORTDOCS%%%%DOCSDIR%%/nav/moo.fx.pack.js
-%%PORTDOCS%%%%DOCSDIR%%/nav/nav.js
-%%PORTDOCS%%%%DOCSDIR%%/nav/prototype.lite.js
-%%PORTDOCS%%%%DOCSDIR%%/nav/user_guide_menu.js
-%%PORTDOCS%%%%DOCSDIR%%/overview/appflow.html
-%%PORTDOCS%%%%DOCSDIR%%/overview/at_a_glance.html
-%%PORTDOCS%%%%DOCSDIR%%/overview/cheatsheets.html
-%%PORTDOCS%%%%DOCSDIR%%/overview/features.html
-%%PORTDOCS%%%%DOCSDIR%%/overview/getting_started.html
-%%PORTDOCS%%%%DOCSDIR%%/overview/goals.html
-%%PORTDOCS%%%%DOCSDIR%%/overview/index.html
-%%PORTDOCS%%%%DOCSDIR%%/overview/mvc.html
-%%PORTDOCS%%%%DOCSDIR%%/toc.html
-%%PORTDOCS%%%%DOCSDIR%%/userguide.css
 @unexec if cmp -s %D/%%WWWDIR%%/index.php.sample %D/%%WWWDIR%%/index.php; then rm -f %D/%%WWWDIR%%/index.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/index.php has not been removed"; fi
 %%WWWDIR%%/index.php.sample
 @exec if [ ! -f %D/%%WWWDIR%%/index.php ]; then cp -p %D/%F %B/index.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/index.php has not been overwritten"; fi
@@ -178,28 +30,49 @@
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php.sample
 @exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php ]; then cp -p %D/%F %B/user_agents.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php has not been overwritten"; fi
-%%WWWDIR%%/system/application/controllers/index.html
-%%WWWDIR%%/system/application/controllers/welcome.php
-%%WWWDIR%%/system/application/errors/error_404.php
-%%WWWDIR%%/system/application/errors/error_db.php
-%%WWWDIR%%/system/application/errors/error_general.php
-%%WWWDIR%%/system/application/errors/error_php.php
-%%WWWDIR%%/system/application/errors/index.html
-%%WWWDIR%%/system/application/helpers/index.html
-%%WWWDIR%%/system/application/hooks/index.html
-%%WWWDIR%%/system/application/index.html
-%%WWWDIR%%/system/application/language/english/index.html
-%%WWWDIR%%/system/application/libraries/index.html
-%%WWWDIR%%/system/application/models/index.html
-%%WWWDIR%%/system/application/views/index.html
-%%WWWDIR%%/system/application/views/welcome_message.php
+@unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php has not been removed"; fi
+%%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php.sample
+@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php ]; then cp -p %D/%F %B/doctypes.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php has not been overwritten"; fi
+@unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php has not been removed"; fi
+%%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php.sample
+@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php ]; then cp -p %D/%F %B/foreign_chars.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php has not been overwritten"; fi
+@unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/profiler.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/profiler.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/profiler.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/profiler.php has not been removed"; fi
+%%WWWDIR%%/%%CI_CONF_DIR%%/profiler.php.sample
+%%WWWDIR%%/application/controllers/index.html
+%%WWWDIR%%/application/controllers/welcome.php
+%%WWWDIR%%/application/core/index.html
+%%WWWDIR%%/application/errors/error_404.php
+%%WWWDIR%%/application/errors/error_db.php
+%%WWWDIR%%/application/errors/error_general.php
+%%WWWDIR%%/application/errors/error_php.php
+%%WWWDIR%%/application/errors/index.html
+%%WWWDIR%%/application/helpers/index.html
+%%WWWDIR%%/application/hooks/index.html
+%%WWWDIR%%/application/index.html
+%%WWWDIR%%/application/language/english/index.html
+%%WWWDIR%%/application/libraries/index.html
+%%WWWDIR%%/application/models/index.html
+%%WWWDIR%%/application/third_party/index.html
+%%WWWDIR%%/application/views/index.html
+%%WWWDIR%%/application/views/welcome_message.php
+%%WWWDIR%%/system/cache/.htaccess
 %%WWWDIR%%/system/cache/index.html
-%%WWWDIR%%/system/codeigniter/Base4.php
-%%WWWDIR%%/system/codeigniter/Base5.php
-%%WWWDIR%%/system/codeigniter/CodeIgniter.php
-%%WWWDIR%%/system/codeigniter/Common.php
-%%WWWDIR%%/system/codeigniter/Compat.php
-%%WWWDIR%%/system/codeigniter/index.html
+%%WWWDIR%%/system/core/Benchmark.php
+%%WWWDIR%%/system/core/CodeIgniter.php
+%%WWWDIR%%/system/core/Common.php
+%%WWWDIR%%/system/core/Config.php
+%%WWWDIR%%/system/core/Controller.php
+%%WWWDIR%%/system/core/Exceptions.php
+%%WWWDIR%%/system/core/Hooks.php
+%%WWWDIR%%/system/core/Input.php
+%%WWWDIR%%/system/core/Lang.php
+%%WWWDIR%%/system/core/Loader.php
+%%WWWDIR%%/system/core/Model.php
+%%WWWDIR%%/system/core/Output.php
+%%WWWDIR%%/system/core/Router.php
+%%WWWDIR%%/system/core/URI.php
+%%WWWDIR%%/system/core/Unicode.php
+%%WWWDIR%%/system/core/index.html
 %%WWWDIR%%/system/database/DB.php
 %%WWWDIR%%/system/database/DB_active_rec.php
 %%WWWDIR%%/system/database/DB_cache.php
@@ -247,7 +120,7 @@
 %%WWWDIR%%/system/fonts/index.html
 %%WWWDIR%%/system/fonts/texb.ttf
 %%WWWDIR%%/system/helpers/array_helper.php
-%%WWWDIR%%/system/helpers/compatibility_helper.php
+%%WWWDIR%%/system/helpers/captcha_helper.php
 %%WWWDIR%%/system/helpers/cookie_helper.php
 %%WWWDIR%%/system/helpers/date_helper.php
 %%WWWDIR%%/system/helpers/directory_helper.php
@@ -278,34 +151,23 @@
 %%WWWDIR%%/system/language/english/index.html
 %%WWWDIR%%/system/language/english/number_lang.php
 %%WWWDIR%%/system/language/english/profiler_lang.php
-%%WWWDIR%%/system/language/english/scaffolding_lang.php
 %%WWWDIR%%/system/language/english/unit_test_lang.php
 %%WWWDIR%%/system/language/english/upload_lang.php
-%%WWWDIR%%/system/language/english/validation_lang.php
 %%WWWDIR%%/system/language/index.html
-%%WWWDIR%%/system/libraries/Benchmark.php
 %%WWWDIR%%/system/libraries/Calendar.php
 %%WWWDIR%%/system/libraries/Cart.php
-%%WWWDIR%%/system/libraries/Config.php
-%%WWWDIR%%/system/libraries/Controller.php
+%%WWWDIR%%/system/libraries/Driver.php
 %%WWWDIR%%/system/libraries/Email.php
 %%WWWDIR%%/system/libraries/Encrypt.php
-%%WWWDIR%%/system/libraries/Exceptions.php
 %%WWWDIR%%/system/libraries/Form_validation.php
 %%WWWDIR%%/system/libraries/Ftp.php
-%%WWWDIR%%/system/libraries/Hooks.php
 %%WWWDIR%%/system/libraries/Image_lib.php
-%%WWWDIR%%/system/libraries/index.html
-%%WWWDIR%%/system/libraries/Input.php
-%%WWWDIR%%/system/libraries/Language.php
-%%WWWDIR%%/system/libraries/Loader.php
+%%WWWDIR%%/system/libraries/Javascript.php
 %%WWWDIR%%/system/libraries/Log.php
-%%WWWDIR%%/system/libraries/Model.php
-%%WWWDIR%%/system/libraries/Output.php
 %%WWWDIR%%/system/libraries/Pagination.php
 %%WWWDIR%%/system/libraries/Parser.php
 %%WWWDIR%%/system/libraries/Profiler.php
-%%WWWDIR%%/system/libraries/Router.php
+%%WWWDIR%%/system/libraries/Security.php
 %%WWWDIR%%/system/libraries/Session.php
 %%WWWDIR%%/system/libraries/Sha1.php
 %%WWWDIR%%/system/libraries/Table.php
@@ -313,35 +175,15 @@
 %%WWWDIR%%/system/libraries/Typography.php
 %%WWWDIR%%/system/libraries/Unit_test.php
 %%WWWDIR%%/system/libraries/Upload.php
-%%WWWDIR%%/system/libraries/URI.php
 %%WWWDIR%%/system/libraries/User_agent.php
-%%WWWDIR%%/system/libraries/Validation.php
 %%WWWDIR%%/system/libraries/Xmlrpc.php
 %%WWWDIR%%/system/libraries/Xmlrpcs.php
 %%WWWDIR%%/system/libraries/Zip.php
+%%WWWDIR%%/system/libraries/index.html
+%%WWWDIR%%/system/libraries/javascript/Jquery.php
 %%WWWDIR%%/system/logs/index.html
-%%WWWDIR%%/system/plugins/captcha_pi.php
-%%WWWDIR%%/system/plugins/index.html
-%%WWWDIR%%/system/plugins/js_calendar_pi.php
-%%WWWDIR%%/system/scaffolding/images/background.jpg
-%%WWWDIR%%/system/scaffolding/images/index.html
-%%WWWDIR%%/system/scaffolding/images/logo.jpg
-%%WWWDIR%%/system/scaffolding/index.html
-%%WWWDIR%%/system/scaffolding/Scaffolding.php
-%%WWWDIR%%/system/scaffolding/views/add.php
-%%WWWDIR%%/system/scaffolding/views/delete.php
-%%WWWDIR%%/system/scaffolding/views/edit.php
-%%WWWDIR%%/system/scaffolding/views/footer.php
-%%WWWDIR%%/system/scaffolding/views/header.php
-%%WWWDIR%%/system/scaffolding/views/index.html
-%%WWWDIR%%/system/scaffolding/views/no_data.php
-%%WWWDIR%%/system/scaffolding/views/stylesheet.css
-%%WWWDIR%%/system/scaffolding/views/view.php
-@dirrm %%WWWDIR%%/system/scaffolding/views
-@dirrm %%WWWDIR%%/system/scaffolding/images
-@dirrm %%WWWDIR%%/system/scaffolding
-@dirrm %%WWWDIR%%/system/plugins
 @dirrm %%WWWDIR%%/system/logs
+@dirrm %%WWWDIR%%/system/libraries/javascript
 @dirrm %%WWWDIR%%/system/libraries
 @dirrm %%WWWDIR%%/system/language/english
 @dirrm %%WWWDIR%%/system/language
@@ -356,28 +198,21 @@
 @dirrm %%WWWDIR%%/system/database/drivers/mssql
 @dirrm %%WWWDIR%%/system/database/drivers
 @dirrm %%WWWDIR%%/system/database
-@dirrm %%WWWDIR%%/system/codeigniter
+@dirrm %%WWWDIR%%/system/core
 @dirrm %%WWWDIR%%/system/cache
-@dirrm %%WWWDIR%%/system/application/views
-@dirrm %%WWWDIR%%/system/application/models
-@dirrm %%WWWDIR%%/system/application/libraries
-@dirrm %%WWWDIR%%/system/application/language/english
-@dirrm %%WWWDIR%%/system/application/language
-@dirrm %%WWWDIR%%/system/application/hooks
-@dirrm %%WWWDIR%%/system/application/helpers
-@dirrm %%WWWDIR%%/system/application/errors
-@dirrm %%WWWDIR%%/system/application/controllers
-@dirrmtry %%WWWDIR%%/system/application/config
-@dirrmtry %%WWWDIR%%/system/application
 @dirrmtry %%WWWDIR%%/system
+@dirrm %%WWWDIR%%/application/views
+@dirrm %%WWWDIR%%/application/third_party
+@dirrm %%WWWDIR%%/application/models
+@dirrm %%WWWDIR%%/application/libraries
+@dirrm %%WWWDIR%%/application/language/english
+@dirrm %%WWWDIR%%/application/language
+@dirrm %%WWWDIR%%/application/hooks
+@dirrm %%WWWDIR%%/application/helpers
+@dirrm %%WWWDIR%%/application/errors
+@dirrm %%WWWDIR%%/application/core
+@dirrm %%WWWDIR%%/application/controllers
+@dirrmtry %%WWWDIR%%/application/config
+@dirrmtry %%WWWDIR%%/application
 @dirrmtry %%WWWDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/overview
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/nav
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libraries
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/installation
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/helpers
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/general
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc_style
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/database
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+