From 75b68e9e5891a275c9ce17c5ad6fa550c70fa1b4 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Mon, 27 Dec 2010 04:02:17 +0000
Subject: [PATCH] patched code for codeigniter 1.7.3

---
 codepot/aclocal.m4                            |   4 +-
 codepot/configure                             | 267 ++++++++++--------
 codepot/configure.ac                          |   2 +-
 codepot/src/codepot/config/autoload.php       |   2 +-
 codepot/src/codepot/helpers/Makefile.am       |   3 +-
 codepot/src/codepot/helpers/Makefile.in       |   3 +-
 .../src/codepot/helpers/codepot_helper.php    |  17 ++
 codepot/src/css/code.css                      |  12 +-
 codepot/src/system/codeigniter/Base4.php      |   2 +-
 codepot/src/system/codeigniter/Base5.php      |   2 +-
 .../src/system/codeigniter/CodeIgniter.php    |   4 +-
 codepot/src/system/codeigniter/Common.php     |   2 +-
 codepot/src/system/codeigniter/Compat.php     |   2 +-
 codepot/src/system/database/DB.php            |   2 +-
 codepot/src/system/database/DB_active_rec.php |   2 +-
 codepot/src/system/database/DB_cache.php      |   2 +-
 codepot/src/system/database/DB_driver.php     |   2 +-
 codepot/src/system/database/DB_forge.php      |   2 +-
 codepot/src/system/database/DB_result.php     |   2 +-
 codepot/src/system/database/DB_utility.php    |   2 +-
 .../database/drivers/mssql/mssql_driver.php   |   2 +-
 .../database/drivers/mssql/mssql_forge.php    |   2 +-
 .../database/drivers/mssql/mssql_result.php   |   2 +-
 .../database/drivers/mssql/mssql_utility.php  |   2 +-
 .../database/drivers/mysql/mysql_driver.php   |   2 +-
 .../database/drivers/mysql/mysql_forge.php    |   2 +-
 .../database/drivers/mysql/mysql_result.php   |   2 +-
 .../database/drivers/mysql/mysql_utility.php  |   2 +-
 .../database/drivers/mysqli/mysqli_driver.php |   2 +-
 .../database/drivers/mysqli/mysqli_forge.php  |   2 +-
 .../database/drivers/mysqli/mysqli_result.php |   2 +-
 .../drivers/mysqli/mysqli_utility.php         |   2 +-
 .../database/drivers/oci8/oci8_driver.php     |   2 +-
 .../database/drivers/oci8/oci8_forge.php      |   2 +-
 .../database/drivers/oci8/oci8_result.php     |   2 +-
 .../database/drivers/oci8/oci8_utility.php    |   2 +-
 .../database/drivers/odbc/odbc_driver.php     |   2 +-
 .../database/drivers/odbc/odbc_forge.php      |   2 +-
 .../database/drivers/odbc/odbc_result.php     |   2 +-
 .../database/drivers/odbc/odbc_utility.php    |   2 +-
 .../drivers/postgre/postgre_driver.php        |   2 +-
 .../drivers/postgre/postgre_forge.php         |   2 +-
 .../drivers/postgre/postgre_result.php        |   2 +-
 .../drivers/postgre/postgre_utility.php       |   2 +-
 .../database/drivers/sqlite/sqlite_driver.php |   2 +-
 .../database/drivers/sqlite/sqlite_forge.php  |   2 +-
 .../database/drivers/sqlite/sqlite_result.php |   2 +-
 .../drivers/sqlite/sqlite_utility.php         |   2 +-
 codepot/src/system/helpers/array_helper.php   |   2 +-
 .../system/helpers/compatibility_helper.php   |   2 +-
 codepot/src/system/helpers/cookie_helper.php  |   2 +-
 codepot/src/system/helpers/date_helper.php    |   2 +-
 .../src/system/helpers/directory_helper.php   |   2 +-
 .../src/system/helpers/download_helper.php    |   2 +-
 codepot/src/system/helpers/email_helper.php   |   2 +-
 codepot/src/system/helpers/file_helper.php    |   2 +-
 codepot/src/system/helpers/form_helper.php    |   2 +-
 codepot/src/system/helpers/html_helper.php    |   2 +-
 .../src/system/helpers/inflector_helper.php   |   2 +-
 .../src/system/helpers/language_helper.php    |   2 +-
 codepot/src/system/helpers/number_helper.php  |   2 +-
 codepot/src/system/helpers/path_helper.php    |   2 +-
 .../src/system/helpers/security_helper.php    |   2 +-
 codepot/src/system/helpers/smiley_helper.php  |   2 +-
 codepot/src/system/helpers/string_helper.php  |   2 +-
 codepot/src/system/helpers/text_helper.php    |   2 +-
 .../src/system/helpers/typography_helper.php  |   2 +-
 codepot/src/system/helpers/url_helper.php     |  20 +-
 codepot/src/system/helpers/xml_helper.php     |   2 +-
 codepot/src/system/libraries/Benchmark.php    |   2 +-
 codepot/src/system/libraries/Calendar.php     |   2 +-
 codepot/src/system/libraries/Cart.php         |   2 +-
 codepot/src/system/libraries/Config.php       |   2 +-
 codepot/src/system/libraries/Controller.php   |   2 +-
 codepot/src/system/libraries/Email.php        |   2 +-
 codepot/src/system/libraries/Encrypt.php      |   2 +-
 codepot/src/system/libraries/Exceptions.php   |   2 +-
 .../src/system/libraries/Form_validation.php  |   2 +-
 codepot/src/system/libraries/Ftp.php          |   2 +-
 codepot/src/system/libraries/Hooks.php        |   2 +-
 codepot/src/system/libraries/Image_lib.php    |   2 +-
 codepot/src/system/libraries/Input.php        |   2 +-
 codepot/src/system/libraries/Language.php     |   2 +-
 codepot/src/system/libraries/Loader.php       |   2 +-
 codepot/src/system/libraries/Log.php          |   4 +-
 codepot/src/system/libraries/Model.php        |   2 +-
 codepot/src/system/libraries/Output.php       |   2 +-
 codepot/src/system/libraries/Pagination.php   |   2 +-
 codepot/src/system/libraries/Parser.php       |   2 +-
 codepot/src/system/libraries/Profiler.php     |   2 +-
 codepot/src/system/libraries/Router.php       |   8 +-
 codepot/src/system/libraries/Session.php      |   2 +-
 codepot/src/system/libraries/Sha1.php         |   2 +-
 codepot/src/system/libraries/Table.php        |   2 +-
 codepot/src/system/libraries/Trackback.php    |   2 +-
 codepot/src/system/libraries/Typography.php   |   2 +-
 codepot/src/system/libraries/URI.php          |   2 +-
 codepot/src/system/libraries/Unit_test.php    |   2 +-
 codepot/src/system/libraries/Upload.php       | 163 ++++++-----
 codepot/src/system/libraries/User_agent.php   |   2 +-
 codepot/src/system/libraries/Validation.php   |   2 +-
 codepot/src/system/libraries/Xmlrpc.php       |   2 +-
 codepot/src/system/libraries/Xmlrpcs.php      |   2 +-
 codepot/src/system/libraries/Zip.php          |   2 +-
 codepot/src/system/logs/Makefile.am           |   5 +
 codepot/src/system/logs/Makefile.in           |  66 ++++-
 codepot/src/system/logs/index.html            |  10 +
 codepot/src/system/plugins/captcha_pi.php     |   2 +-
 codepot/src/system/plugins/js_calendar_pi.php |   2 +-
 .../src/system/scaffolding/Scaffolding.php    |   2 +-
 110 files changed, 446 insertions(+), 332 deletions(-)
 create mode 100644 codepot/src/codepot/helpers/codepot_helper.php
 create mode 100644 codepot/src/system/logs/index.html

diff --git a/codepot/aclocal.m4 b/codepot/aclocal.m4
index 2437a145..bf29edef 100644
--- a/codepot/aclocal.m4
+++ b/codepot/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/codepot/configure b/codepot/configure
index 4c0017bd..e5b511ff 100755
--- a/codepot/configure
+++ b/codepot/configure
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for codepot 0.1.0.
+# Generated by GNU Autoconf 2.67 for codepot 0.1.1.
 #
 # Report bugs to <Hyung-Hwan Chung <hyunghwan.chung@gmail.com>>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -318,7 +318,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -358,19 +358,19 @@ else
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -532,7 +532,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -551,8 +551,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='codepot'
 PACKAGE_TARNAME='codepot'
-PACKAGE_VERSION='0.1.0'
-PACKAGE_STRING='codepot 0.1.0'
+PACKAGE_VERSION='0.1.1'
+PACKAGE_STRING='codepot 0.1.1'
 PACKAGE_BUGREPORT='Hyung-Hwan Chung <hyunghwan.chung@gmail.com>'
 PACKAGE_URL='http://www.abiyo.net/codepot'
 
@@ -717,8 +717,9 @@ do
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -763,7 +764,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -789,7 +790,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -993,7 +994,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1009,7 +1010,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1039,8 +1040,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1048,7 +1049,7 @@ Try \`$0 --help' for more information."
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1066,13 +1067,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1095,7 +1096,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1109,8 +1110,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1125,9 +1126,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1166,11 +1167,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1196,7 +1197,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures codepot 0.1.0 to adapt to many kinds of systems.
+\`configure' configures codepot 0.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1210,7 +1211,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1262,7 +1263,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of codepot 0.1.0:";;
+     short | recursive ) echo "Configuration of codepot 0.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1340,10 +1341,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-codepot configure 0.1.0
-generated by GNU Autoconf 2.65
+codepot configure 0.1.1
+generated by GNU Autoconf 2.67
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1357,8 +1358,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by codepot $as_me 0.1.0, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by codepot $as_me 0.1.1, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -1468,11 +1469,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1506,11 +1505,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1523,11 +1520,9 @@ _ASBOX
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1541,11 +1536,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1600,7 +1593,12 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1615,7 +1613,11 @@ do
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
@@ -1691,7 +1693,7 @@ if $ac_cache_corrupted; then
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -1708,16 +1710,22 @@ ac_config_headers="$ac_config_headers ./config.h"
 
 ac_aux_dir=
 for ac_dir in ac/aux "$srcdir"/ac/aux; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in ac/aux \"$srcdir\"/ac/aux" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ac/aux \"$srcdir\"/ac/aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1837,11 +1845,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -1863,7 +1871,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -1873,7 +1881,7 @@ then
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2111,7 +2119,7 @@ done
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2119,7 +2127,7 @@ SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2153,7 +2161,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2169,7 +2177,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='codepot'
- VERSION='0.1.0'
+ VERSION='0.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3208,6 +3216,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -3370,19 +3379,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -3578,7 +3587,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -3631,8 +3640,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by codepot $as_me 0.1.0, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by codepot $as_me 0.1.1, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3694,11 +3703,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-codepot config.status 0.1.0
-configured by $0, generated by GNU Autoconf 2.65,
+codepot config.status 0.1.1
+configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -3716,11 +3725,16 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -3742,6 +3756,7 @@ do
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -3754,7 +3769,7 @@ do
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -3763,7 +3778,7 @@ Try \`$0 --help' for more information.";;
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -3865,7 +3880,7 @@ do
     "src/system/Makefile") CONFIG_FILES="$CONFIG_FILES src/system/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -3902,7 +3917,7 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -3919,7 +3934,7 @@ if test "x$ac_cr" = x; then
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -3933,18 +3948,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -4033,20 +4048,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -4074,7 +4097,7 @@ for ac_last_try in false false :; do
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -4159,7 +4182,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -4172,7 +4195,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -4200,7 +4223,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -4227,7 +4250,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -4364,22 +4387,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -4390,19 +4413,19 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -4451,7 +4474,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -4472,7 +4495,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/codepot/configure.ac b/codepot/configure.ac
index 7066f628..e9618429 100644
--- a/codepot/configure.ac
+++ b/codepot/configure.ac
@@ -1,7 +1,7 @@
 
 dnl AC_PREREQ(2.59)
 
-AC_INIT([codepot],[0.1.0],[Hyung-Hwan Chung <hyunghwan.chung@gmail.com>],,[http://www.abiyo.net/codepot])
+AC_INIT([codepot],[0.1.1],[Hyung-Hwan Chung <hyunghwan.chung@gmail.com>],,[http://www.abiyo.net/codepot])
 AC_CONFIG_HEADER([./config.h])
 AC_CONFIG_AUX_DIR([ac/aux])
 AC_CONFIG_MACRO_DIR([ac/m4])
diff --git a/codepot/src/codepot/config/autoload.php b/codepot/src/codepot/config/autoload.php
index ea08f8b1..79ade0be 100644
--- a/codepot/src/codepot/config/autoload.php
+++ b/codepot/src/codepot/config/autoload.php
@@ -51,7 +51,7 @@ $autoload['libraries'] = array('database', 'lang_detect');
 |	$autoload['helper'] = array('url', 'file');
 */
 
-$autoload['helper'] = array();
+$autoload['helper'] = array('codepot');
 
 
 /*
diff --git a/codepot/src/codepot/helpers/Makefile.am b/codepot/src/codepot/helpers/Makefile.am
index daa150fc..b4bf6a5a 100644
--- a/codepot/src/codepot/helpers/Makefile.am
+++ b/codepot/src/codepot/helpers/Makefile.am
@@ -1,6 +1,7 @@
 wwwdir=$(WWWDIR)/codepot/helpers
 www_DATA =  \
-	index.html
+	index.html \
+	codepot_helper.php
 
 EXTRA_DIST = $(www_DATA)
 
diff --git a/codepot/src/codepot/helpers/Makefile.in b/codepot/src/codepot/helpers/Makefile.in
index 3eb2259e..d76cfd96 100644
--- a/codepot/src/codepot/helpers/Makefile.in
+++ b/codepot/src/codepot/helpers/Makefile.in
@@ -166,7 +166,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 wwwdir = $(WWWDIR)/codepot/helpers
 www_DATA = \
-	index.html
+	index.html \
+	codepot_helper.php
 
 EXTRA_DIST = $(www_DATA)
 all: all-am
diff --git a/codepot/src/codepot/helpers/codepot_helper.php b/codepot/src/codepot/helpers/codepot_helper.php
new file mode 100644
index 00000000..045caa20
--- /dev/null
+++ b/codepot/src/codepot/helpers/codepot_helper.php
@@ -0,0 +1,17 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+if ( ! function_exists('base_url_make'))
+{
+	function base_url_make($path)
+	{
+		$CI =& get_instance();
+		$url = $CI->config->slash_item('base_url');
+		if (substr($url, -1) == '/')
+		{
+			for ($i = 0; substr($path, $i, 1) == '/'; $i++);
+			return $url . substr($path, $i);
+		}
+		else return $url . $path;
+	}
+}
+
diff --git a/codepot/src/css/code.css b/codepot/src/css/code.css
index 66af7e89..51a3e7c2 100644
--- a/codepot/src/css/code.css
+++ b/codepot/src/css/code.css
@@ -17,8 +17,8 @@
 
 #code_folder_mainarea_result_info {
 	position: absolute;
-	top: 5;
-	right: 5;
+	top: 5px;
+	right: 2px;
 	width: 22em;
 	background: #E5ECF9 none repeat scroll 0 0;
 	border: #D4DBE8 1px solid;
@@ -62,8 +62,8 @@
 
 #code_file_mainarea_result_info {
 	position: absolute;
-	top: 5;
-	right: 5;
+	top: 5px;
+	right: 2px;
 	width: 22em;
 	background: #E5ECF9 none repeat scroll 0 0;
 	border: #D4DBE8 1px solid;
@@ -107,8 +107,8 @@
 
 #code_blame_mainarea_result_info {
 	position: absolute;
-	top: 5;
-	right: 5;
+	top: 5px;
+	right: 2px;
 	width: 22em;
 	background: #E5ECF9 none repeat scroll 0 0;
 	border: #D4DBE8 1px solid;
diff --git a/codepot/src/system/codeigniter/Base4.php b/codepot/src/system/codeigniter/Base4.php
index 91a43502..3561c256 100644
--- a/codepot/src/system/codeigniter/Base4.php
+++ b/codepot/src/system/codeigniter/Base4.php
@@ -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.3
diff --git a/codepot/src/system/codeigniter/Base5.php b/codepot/src/system/codeigniter/Base5.php
index a2cca72c..5d944ae5 100644
--- a/codepot/src/system/codeigniter/Base5.php
+++ b/codepot/src/system/codeigniter/Base5.php
@@ -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.3
diff --git a/codepot/src/system/codeigniter/CodeIgniter.php b/codepot/src/system/codeigniter/CodeIgniter.php
index dac137bf..87f7abc2 100644
--- a/codepot/src/system/codeigniter/CodeIgniter.php
+++ b/codepot/src/system/codeigniter/CodeIgniter.php
@@ -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
@@ -28,7 +28,7 @@
  */
 
 // CI Version
-define('CI_VERSION',	'1.7.2');
+define('CI_VERSION',	'1.7.3');
 
 /*
  * ------------------------------------------------------
diff --git a/codepot/src/system/codeigniter/Common.php b/codepot/src/system/codeigniter/Common.php
index eb9dce64..3b84ffcc 100644
--- a/codepot/src/system/codeigniter/Common.php
+++ b/codepot/src/system/codeigniter/Common.php
@@ -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
diff --git a/codepot/src/system/codeigniter/Compat.php b/codepot/src/system/codeigniter/Compat.php
index 958ab4c0..40017a93 100644
--- a/codepot/src/system/codeigniter/Compat.php
+++ b/codepot/src/system/codeigniter/Compat.php
@@ -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
diff --git a/codepot/src/system/database/DB.php b/codepot/src/system/database/DB.php
index 0f734d74..f174687c 100644
--- a/codepot/src/system/database/DB.php
+++ b/codepot/src/system/database/DB.php
@@ -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
diff --git a/codepot/src/system/database/DB_active_rec.php b/codepot/src/system/database/DB_active_rec.php
index 07021999..bf4d5117 100644
--- a/codepot/src/system/database/DB_active_rec.php
+++ b/codepot/src/system/database/DB_active_rec.php
@@ -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
diff --git a/codepot/src/system/database/DB_cache.php b/codepot/src/system/database/DB_cache.php
index 8b0ad4fb..d3968b31 100644
--- a/codepot/src/system/database/DB_cache.php
+++ b/codepot/src/system/database/DB_cache.php
@@ -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
diff --git a/codepot/src/system/database/DB_driver.php b/codepot/src/system/database/DB_driver.php
index 014dfd44..b2a3c2eb 100644
--- a/codepot/src/system/database/DB_driver.php
+++ b/codepot/src/system/database/DB_driver.php
@@ -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
diff --git a/codepot/src/system/database/DB_forge.php b/codepot/src/system/database/DB_forge.php
index 4050e300..c5931db2 100644
--- a/codepot/src/system/database/DB_forge.php
+++ b/codepot/src/system/database/DB_forge.php
@@ -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
diff --git a/codepot/src/system/database/DB_result.php b/codepot/src/system/database/DB_result.php
index 4614e29f..b9e64fee 100644
--- a/codepot/src/system/database/DB_result.php
+++ b/codepot/src/system/database/DB_result.php
@@ -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
diff --git a/codepot/src/system/database/DB_utility.php b/codepot/src/system/database/DB_utility.php
index 33c68fae..94e7a0bd 100644
--- a/codepot/src/system/database/DB_utility.php
+++ b/codepot/src/system/database/DB_utility.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mssql/mssql_driver.php b/codepot/src/system/database/drivers/mssql/mssql_driver.php
index 97ac971b..f301ba53 100644
--- a/codepot/src/system/database/drivers/mssql/mssql_driver.php
+++ b/codepot/src/system/database/drivers/mssql/mssql_driver.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mssql/mssql_forge.php b/codepot/src/system/database/drivers/mssql/mssql_forge.php
index 632b4d90..f6a17811 100644
--- a/codepot/src/system/database/drivers/mssql/mssql_forge.php
+++ b/codepot/src/system/database/drivers/mssql/mssql_forge.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mssql/mssql_result.php b/codepot/src/system/database/drivers/mssql/mssql_result.php
index a56a3a9e..e7b33804 100644
--- a/codepot/src/system/database/drivers/mssql/mssql_result.php
+++ b/codepot/src/system/database/drivers/mssql/mssql_result.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mssql/mssql_utility.php b/codepot/src/system/database/drivers/mssql/mssql_utility.php
index 9fa257a6..da887b81 100644
--- a/codepot/src/system/database/drivers/mssql/mssql_utility.php
+++ b/codepot/src/system/database/drivers/mssql/mssql_utility.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mysql/mysql_driver.php b/codepot/src/system/database/drivers/mysql/mysql_driver.php
index fe185980..85a6ef4a 100644
--- a/codepot/src/system/database/drivers/mysql/mysql_driver.php
+++ b/codepot/src/system/database/drivers/mysql/mysql_driver.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mysql/mysql_forge.php b/codepot/src/system/database/drivers/mysql/mysql_forge.php
index d343b36a..ccacf99f 100644
--- a/codepot/src/system/database/drivers/mysql/mysql_forge.php
+++ b/codepot/src/system/database/drivers/mysql/mysql_forge.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mysql/mysql_result.php b/codepot/src/system/database/drivers/mysql/mysql_result.php
index 2e955070..acc58662 100644
--- a/codepot/src/system/database/drivers/mysql/mysql_result.php
+++ b/codepot/src/system/database/drivers/mysql/mysql_result.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mysql/mysql_utility.php b/codepot/src/system/database/drivers/mysql/mysql_utility.php
index 2c8b264c..3277b0ff 100644
--- a/codepot/src/system/database/drivers/mysql/mysql_utility.php
+++ b/codepot/src/system/database/drivers/mysql/mysql_utility.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mysqli/mysqli_driver.php b/codepot/src/system/database/drivers/mysqli/mysqli_driver.php
index 488b074a..5d7200fb 100644
--- a/codepot/src/system/database/drivers/mysqli/mysqli_driver.php
+++ b/codepot/src/system/database/drivers/mysqli/mysqli_driver.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mysqli/mysqli_forge.php b/codepot/src/system/database/drivers/mysqli/mysqli_forge.php
index 0992274e..262d491e 100644
--- a/codepot/src/system/database/drivers/mysqli/mysqli_forge.php
+++ b/codepot/src/system/database/drivers/mysqli/mysqli_forge.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mysqli/mysqli_result.php b/codepot/src/system/database/drivers/mysqli/mysqli_result.php
index 00fc0db4..81d22cc9 100644
--- a/codepot/src/system/database/drivers/mysqli/mysqli_result.php
+++ b/codepot/src/system/database/drivers/mysqli/mysqli_result.php
@@ -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
diff --git a/codepot/src/system/database/drivers/mysqli/mysqli_utility.php b/codepot/src/system/database/drivers/mysqli/mysqli_utility.php
index 7ebda4c5..44fd0f7a 100644
--- a/codepot/src/system/database/drivers/mysqli/mysqli_utility.php
+++ b/codepot/src/system/database/drivers/mysqli/mysqli_utility.php
@@ -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
diff --git a/codepot/src/system/database/drivers/oci8/oci8_driver.php b/codepot/src/system/database/drivers/oci8/oci8_driver.php
index 61457194..75819235 100644
--- a/codepot/src/system/database/drivers/oci8/oci8_driver.php
+++ b/codepot/src/system/database/drivers/oci8/oci8_driver.php
@@ -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
diff --git a/codepot/src/system/database/drivers/oci8/oci8_forge.php b/codepot/src/system/database/drivers/oci8/oci8_forge.php
index c3e9cb98..d77ed8de 100644
--- a/codepot/src/system/database/drivers/oci8/oci8_forge.php
+++ b/codepot/src/system/database/drivers/oci8/oci8_forge.php
@@ -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
diff --git a/codepot/src/system/database/drivers/oci8/oci8_result.php b/codepot/src/system/database/drivers/oci8/oci8_result.php
index 1d0b7db2..cab538e2 100644
--- a/codepot/src/system/database/drivers/oci8/oci8_result.php
+++ b/codepot/src/system/database/drivers/oci8/oci8_result.php
@@ -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
diff --git a/codepot/src/system/database/drivers/oci8/oci8_utility.php b/codepot/src/system/database/drivers/oci8/oci8_utility.php
index c8049c24..74670eaa 100644
--- a/codepot/src/system/database/drivers/oci8/oci8_utility.php
+++ b/codepot/src/system/database/drivers/oci8/oci8_utility.php
@@ -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
diff --git a/codepot/src/system/database/drivers/odbc/odbc_driver.php b/codepot/src/system/database/drivers/odbc/odbc_driver.php
index dacbaaba..6cb3080d 100644
--- a/codepot/src/system/database/drivers/odbc/odbc_driver.php
+++ b/codepot/src/system/database/drivers/odbc/odbc_driver.php
@@ -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
diff --git a/codepot/src/system/database/drivers/odbc/odbc_forge.php b/codepot/src/system/database/drivers/odbc/odbc_forge.php
index 99cb282a..1ae559b6 100644
--- a/codepot/src/system/database/drivers/odbc/odbc_forge.php
+++ b/codepot/src/system/database/drivers/odbc/odbc_forge.php
@@ -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
diff --git a/codepot/src/system/database/drivers/odbc/odbc_result.php b/codepot/src/system/database/drivers/odbc/odbc_result.php
index d6f15015..5ae46df6 100644
--- a/codepot/src/system/database/drivers/odbc/odbc_result.php
+++ b/codepot/src/system/database/drivers/odbc/odbc_result.php
@@ -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
diff --git a/codepot/src/system/database/drivers/odbc/odbc_utility.php b/codepot/src/system/database/drivers/odbc/odbc_utility.php
index 85707a07..4e6848e8 100644
--- a/codepot/src/system/database/drivers/odbc/odbc_utility.php
+++ b/codepot/src/system/database/drivers/odbc/odbc_utility.php
@@ -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
diff --git a/codepot/src/system/database/drivers/postgre/postgre_driver.php b/codepot/src/system/database/drivers/postgre/postgre_driver.php
index 9258da68..bac179d4 100644
--- a/codepot/src/system/database/drivers/postgre/postgre_driver.php
+++ b/codepot/src/system/database/drivers/postgre/postgre_driver.php
@@ -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
diff --git a/codepot/src/system/database/drivers/postgre/postgre_forge.php b/codepot/src/system/database/drivers/postgre/postgre_forge.php
index 471dd80c..c98ef425 100644
--- a/codepot/src/system/database/drivers/postgre/postgre_forge.php
+++ b/codepot/src/system/database/drivers/postgre/postgre_forge.php
@@ -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
diff --git a/codepot/src/system/database/drivers/postgre/postgre_result.php b/codepot/src/system/database/drivers/postgre/postgre_result.php
index 8e45eb1c..545f413e 100644
--- a/codepot/src/system/database/drivers/postgre/postgre_result.php
+++ b/codepot/src/system/database/drivers/postgre/postgre_result.php
@@ -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
diff --git a/codepot/src/system/database/drivers/postgre/postgre_utility.php b/codepot/src/system/database/drivers/postgre/postgre_utility.php
index 235954fa..dda22ddb 100644
--- a/codepot/src/system/database/drivers/postgre/postgre_utility.php
+++ b/codepot/src/system/database/drivers/postgre/postgre_utility.php
@@ -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
diff --git a/codepot/src/system/database/drivers/sqlite/sqlite_driver.php b/codepot/src/system/database/drivers/sqlite/sqlite_driver.php
index 0cb79977..05e38848 100644
--- a/codepot/src/system/database/drivers/sqlite/sqlite_driver.php
+++ b/codepot/src/system/database/drivers/sqlite/sqlite_driver.php
@@ -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
diff --git a/codepot/src/system/database/drivers/sqlite/sqlite_forge.php b/codepot/src/system/database/drivers/sqlite/sqlite_forge.php
index 0688ba36..b7d25e75 100644
--- a/codepot/src/system/database/drivers/sqlite/sqlite_forge.php
+++ b/codepot/src/system/database/drivers/sqlite/sqlite_forge.php
@@ -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
diff --git a/codepot/src/system/database/drivers/sqlite/sqlite_result.php b/codepot/src/system/database/drivers/sqlite/sqlite_result.php
index c1c24c78..7b063122 100644
--- a/codepot/src/system/database/drivers/sqlite/sqlite_result.php
+++ b/codepot/src/system/database/drivers/sqlite/sqlite_result.php
@@ -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
diff --git a/codepot/src/system/database/drivers/sqlite/sqlite_utility.php b/codepot/src/system/database/drivers/sqlite/sqlite_utility.php
index f66464e3..5629dac9 100644
--- a/codepot/src/system/database/drivers/sqlite/sqlite_utility.php
+++ b/codepot/src/system/database/drivers/sqlite/sqlite_utility.php
@@ -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
diff --git a/codepot/src/system/helpers/array_helper.php b/codepot/src/system/helpers/array_helper.php
index 39d0c88c..b7289900 100644
--- a/codepot/src/system/helpers/array_helper.php
+++ b/codepot/src/system/helpers/array_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/compatibility_helper.php b/codepot/src/system/helpers/compatibility_helper.php
index c217f7f5..e7b21c66 100644
--- a/codepot/src/system/helpers/compatibility_helper.php
+++ b/codepot/src/system/helpers/compatibility_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/cookie_helper.php b/codepot/src/system/helpers/cookie_helper.php
index 7607ffb4..40afadb5 100644
--- a/codepot/src/system/helpers/cookie_helper.php
+++ b/codepot/src/system/helpers/cookie_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/date_helper.php b/codepot/src/system/helpers/date_helper.php
index fae9e66e..0e978166 100644
--- a/codepot/src/system/helpers/date_helper.php
+++ b/codepot/src/system/helpers/date_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/directory_helper.php b/codepot/src/system/helpers/directory_helper.php
index a6fb7841..791cf0d1 100644
--- a/codepot/src/system/helpers/directory_helper.php
+++ b/codepot/src/system/helpers/directory_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/download_helper.php b/codepot/src/system/helpers/download_helper.php
index a8f7b1a7..638ebaa8 100644
--- a/codepot/src/system/helpers/download_helper.php
+++ b/codepot/src/system/helpers/download_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/email_helper.php b/codepot/src/system/helpers/email_helper.php
index df602b11..046562a9 100644
--- a/codepot/src/system/helpers/email_helper.php
+++ b/codepot/src/system/helpers/email_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/file_helper.php b/codepot/src/system/helpers/file_helper.php
index 0d7b5d5a..fea54a1f 100644
--- a/codepot/src/system/helpers/file_helper.php
+++ b/codepot/src/system/helpers/file_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/form_helper.php b/codepot/src/system/helpers/form_helper.php
index c5e977a4..31b36efd 100644
--- a/codepot/src/system/helpers/form_helper.php
+++ b/codepot/src/system/helpers/form_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/html_helper.php b/codepot/src/system/helpers/html_helper.php
index 427d1ce3..c18a6877 100644
--- a/codepot/src/system/helpers/html_helper.php
+++ b/codepot/src/system/helpers/html_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/inflector_helper.php b/codepot/src/system/helpers/inflector_helper.php
index e65968a9..ffa99cc2 100644
--- a/codepot/src/system/helpers/inflector_helper.php
+++ b/codepot/src/system/helpers/inflector_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/language_helper.php b/codepot/src/system/helpers/language_helper.php
index e97a8c78..442619c9 100644
--- a/codepot/src/system/helpers/language_helper.php
+++ b/codepot/src/system/helpers/language_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/number_helper.php b/codepot/src/system/helpers/number_helper.php
index a041a60b..cf683f2a 100644
--- a/codepot/src/system/helpers/number_helper.php
+++ b/codepot/src/system/helpers/number_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/path_helper.php b/codepot/src/system/helpers/path_helper.php
index 502fae4b..030b6bff 100644
--- a/codepot/src/system/helpers/path_helper.php
+++ b/codepot/src/system/helpers/path_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/security_helper.php b/codepot/src/system/helpers/security_helper.php
index 9cc70aaf..1fc47b34 100644
--- a/codepot/src/system/helpers/security_helper.php
+++ b/codepot/src/system/helpers/security_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/smiley_helper.php b/codepot/src/system/helpers/smiley_helper.php
index f085e53b..3a31be36 100644
--- a/codepot/src/system/helpers/smiley_helper.php
+++ b/codepot/src/system/helpers/smiley_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/string_helper.php b/codepot/src/system/helpers/string_helper.php
index 3f7f09a1..c0409dc5 100644
--- a/codepot/src/system/helpers/string_helper.php
+++ b/codepot/src/system/helpers/string_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/text_helper.php b/codepot/src/system/helpers/text_helper.php
index 06910e41..1e672937 100644
--- a/codepot/src/system/helpers/text_helper.php
+++ b/codepot/src/system/helpers/text_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/typography_helper.php b/codepot/src/system/helpers/typography_helper.php
index 2706d53b..5621e6dd 100644
--- a/codepot/src/system/helpers/typography_helper.php
+++ b/codepot/src/system/helpers/typography_helper.php
@@ -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
diff --git a/codepot/src/system/helpers/url_helper.php b/codepot/src/system/helpers/url_helper.php
index e8dfcce2..90ea9207 100644
--- a/codepot/src/system/helpers/url_helper.php
+++ b/codepot/src/system/helpers/url_helper.php
@@ -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
@@ -63,22 +63,6 @@ if ( ! function_exists('base_url'))
 		$CI =& get_instance();
 		return $CI->config->slash_item('base_url');
 	}
-
-}
-
-if ( ! function_exists('base_url_make'))
-{
-	function base_url_make($path)
-	{
-		$CI =& get_instance();
-		$url = $CI->config->slash_item('base_url');
-		if (substr($url, -1) == '/')
-		{
-			for ($i = 0; substr($path, $i, 1) == '/'; $i++);
-			return $url . substr($path, $i);
-		}
-		else return $url . $path;
-	}
 }
 
 // ------------------------------------------------------------------------
@@ -606,4 +590,4 @@ if ( ! function_exists('_parse_attributes'))
 
 
 /* End of file url_helper.php */
-/* Location: ./system/helpers/url_helper.php */
+/* Location: ./system/helpers/url_helper.php */
\ No newline at end of file
diff --git a/codepot/src/system/helpers/xml_helper.php b/codepot/src/system/helpers/xml_helper.php
index 2a4c808c..712f6777 100644
--- a/codepot/src/system/helpers/xml_helper.php
+++ b/codepot/src/system/helpers/xml_helper.php
@@ -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
diff --git a/codepot/src/system/libraries/Benchmark.php b/codepot/src/system/libraries/Benchmark.php
index 695029ed..d485ee21 100644
--- a/codepot/src/system/libraries/Benchmark.php
+++ b/codepot/src/system/libraries/Benchmark.php
@@ -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
diff --git a/codepot/src/system/libraries/Calendar.php b/codepot/src/system/libraries/Calendar.php
index 68d40225..275bf245 100644
--- a/codepot/src/system/libraries/Calendar.php
+++ b/codepot/src/system/libraries/Calendar.php
@@ -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
diff --git a/codepot/src/system/libraries/Cart.php b/codepot/src/system/libraries/Cart.php
index 2eb8b75b..643d2eca 100644
--- a/codepot/src/system/libraries/Cart.php
+++ b/codepot/src/system/libraries/Cart.php
@@ -6,7 +6,7 @@
  *
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2006 - 2009, EllisLab, Inc.
+ * @copyright	Copyright (c) 2006 - 2010, EllisLab, Inc.
  * @license		http://codeigniter.com/user_guide/license.html
  * @link		http://codeigniter.com
  * @since		Version 1.0
diff --git a/codepot/src/system/libraries/Config.php b/codepot/src/system/libraries/Config.php
index 4ef27863..76012077 100644
--- a/codepot/src/system/libraries/Config.php
+++ b/codepot/src/system/libraries/Config.php
@@ -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
diff --git a/codepot/src/system/libraries/Controller.php b/codepot/src/system/libraries/Controller.php
index 5e93de3b..c5637c95 100644
--- a/codepot/src/system/libraries/Controller.php
+++ b/codepot/src/system/libraries/Controller.php
@@ -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
diff --git a/codepot/src/system/libraries/Email.php b/codepot/src/system/libraries/Email.php
index 58581593..d0f2ea9a 100644
--- a/codepot/src/system/libraries/Email.php
+++ b/codepot/src/system/libraries/Email.php
@@ -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
diff --git a/codepot/src/system/libraries/Encrypt.php b/codepot/src/system/libraries/Encrypt.php
index 95c758fb..c893fbf9 100644
--- a/codepot/src/system/libraries/Encrypt.php
+++ b/codepot/src/system/libraries/Encrypt.php
@@ -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
diff --git a/codepot/src/system/libraries/Exceptions.php b/codepot/src/system/libraries/Exceptions.php
index 9c655a17..bd567ccd 100644
--- a/codepot/src/system/libraries/Exceptions.php
+++ b/codepot/src/system/libraries/Exceptions.php
@@ -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
diff --git a/codepot/src/system/libraries/Form_validation.php b/codepot/src/system/libraries/Form_validation.php
index 1497d851..640bf918 100644
--- a/codepot/src/system/libraries/Form_validation.php
+++ b/codepot/src/system/libraries/Form_validation.php
@@ -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
diff --git a/codepot/src/system/libraries/Ftp.php b/codepot/src/system/libraries/Ftp.php
index 6fb17049..16ad9ad4 100644
--- a/codepot/src/system/libraries/Ftp.php
+++ b/codepot/src/system/libraries/Ftp.php
@@ -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
diff --git a/codepot/src/system/libraries/Hooks.php b/codepot/src/system/libraries/Hooks.php
index 0b5d4680..6d736c3f 100644
--- a/codepot/src/system/libraries/Hooks.php
+++ b/codepot/src/system/libraries/Hooks.php
@@ -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
diff --git a/codepot/src/system/libraries/Image_lib.php b/codepot/src/system/libraries/Image_lib.php
index 169c6e48..0b29c1fb 100644
--- a/codepot/src/system/libraries/Image_lib.php
+++ b/codepot/src/system/libraries/Image_lib.php
@@ -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
diff --git a/codepot/src/system/libraries/Input.php b/codepot/src/system/libraries/Input.php
index e7bf7277..39681519 100644
--- a/codepot/src/system/libraries/Input.php
+++ b/codepot/src/system/libraries/Input.php
@@ -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
diff --git a/codepot/src/system/libraries/Language.php b/codepot/src/system/libraries/Language.php
index b679c891..515d04a4 100644
--- a/codepot/src/system/libraries/Language.php
+++ b/codepot/src/system/libraries/Language.php
@@ -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
diff --git a/codepot/src/system/libraries/Loader.php b/codepot/src/system/libraries/Loader.php
index 781c83c6..4a03312c 100644
--- a/codepot/src/system/libraries/Loader.php
+++ b/codepot/src/system/libraries/Loader.php
@@ -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
diff --git a/codepot/src/system/libraries/Log.php b/codepot/src/system/libraries/Log.php
index 3e811613..4e6b3bc3 100644
--- a/codepot/src/system/libraries/Log.php
+++ b/codepot/src/system/libraries/Log.php
@@ -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
@@ -114,4 +114,4 @@ class CI_Log {
 // END Log Class
 
 /* End of file Log.php */
-/* Location: ./system/libraries/Log.php */
+/* Location: ./system/libraries/Log.php */
\ No newline at end of file
diff --git a/codepot/src/system/libraries/Model.php b/codepot/src/system/libraries/Model.php
index f5e501b0..e9c2d24d 100644
--- a/codepot/src/system/libraries/Model.php
+++ b/codepot/src/system/libraries/Model.php
@@ -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
diff --git a/codepot/src/system/libraries/Output.php b/codepot/src/system/libraries/Output.php
index 4423ac72..f320b414 100644
--- a/codepot/src/system/libraries/Output.php
+++ b/codepot/src/system/libraries/Output.php
@@ -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
diff --git a/codepot/src/system/libraries/Pagination.php b/codepot/src/system/libraries/Pagination.php
index d73c58e0..d6321f41 100644
--- a/codepot/src/system/libraries/Pagination.php
+++ b/codepot/src/system/libraries/Pagination.php
@@ -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
diff --git a/codepot/src/system/libraries/Parser.php b/codepot/src/system/libraries/Parser.php
index da324375..399b14b2 100644
--- a/codepot/src/system/libraries/Parser.php
+++ b/codepot/src/system/libraries/Parser.php
@@ -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
diff --git a/codepot/src/system/libraries/Profiler.php b/codepot/src/system/libraries/Profiler.php
index ecd0e708..84f7871b 100644
--- a/codepot/src/system/libraries/Profiler.php
+++ b/codepot/src/system/libraries/Profiler.php
@@ -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
diff --git a/codepot/src/system/libraries/Router.php b/codepot/src/system/libraries/Router.php
index f7b59e4a..7dbad037 100644
--- a/codepot/src/system/libraries/Router.php
+++ b/codepot/src/system/libraries/Router.php
@@ -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
@@ -307,7 +307,7 @@ class CI_Router {
 	 */	
 	function set_class($class)
 	{
-		$this->class = $class;
+		$this->class = str_replace(array('/', '.'), '', $class);
 	}
 	
 	// --------------------------------------------------------------------
@@ -366,7 +366,7 @@ class CI_Router {
 	 */	
 	function set_directory($dir)
 	{
-		$this->directory = $dir.'/';
+		$this->directory = str_replace(array('/', '.'), '', $dir).'/';
 	}
 
 	// --------------------------------------------------------------------
@@ -386,4 +386,4 @@ class CI_Router {
 // END Router Class
 
 /* End of file Router.php */
-/* Location: ./system/libraries/Router.php */
+/* Location: ./system/libraries/Router.php */
\ No newline at end of file
diff --git a/codepot/src/system/libraries/Session.php b/codepot/src/system/libraries/Session.php
index 5e0ce48e..bd942681 100644
--- a/codepot/src/system/libraries/Session.php
+++ b/codepot/src/system/libraries/Session.php
@@ -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
diff --git a/codepot/src/system/libraries/Sha1.php b/codepot/src/system/libraries/Sha1.php
index 6c39a5b1..f9611a8a 100644
--- a/codepot/src/system/libraries/Sha1.php
+++ b/codepot/src/system/libraries/Sha1.php
@@ -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
diff --git a/codepot/src/system/libraries/Table.php b/codepot/src/system/libraries/Table.php
index 86d54217..a990d406 100644
--- a/codepot/src/system/libraries/Table.php
+++ b/codepot/src/system/libraries/Table.php
@@ -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.3.1
diff --git a/codepot/src/system/libraries/Trackback.php b/codepot/src/system/libraries/Trackback.php
index ab8f46a6..9b1737c5 100644
--- a/codepot/src/system/libraries/Trackback.php
+++ b/codepot/src/system/libraries/Trackback.php
@@ -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
diff --git a/codepot/src/system/libraries/Typography.php b/codepot/src/system/libraries/Typography.php
index 242ca3cb..0f0a8b7a 100644
--- a/codepot/src/system/libraries/Typography.php
+++ b/codepot/src/system/libraries/Typography.php
@@ -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
diff --git a/codepot/src/system/libraries/URI.php b/codepot/src/system/libraries/URI.php
index 68b67805..23efb38c 100644
--- a/codepot/src/system/libraries/URI.php
+++ b/codepot/src/system/libraries/URI.php
@@ -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
diff --git a/codepot/src/system/libraries/Unit_test.php b/codepot/src/system/libraries/Unit_test.php
index d1db6297..29aeaae9 100644
--- a/codepot/src/system/libraries/Unit_test.php
+++ b/codepot/src/system/libraries/Unit_test.php
@@ -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.3.1
diff --git a/codepot/src/system/libraries/Upload.php b/codepot/src/system/libraries/Upload.php
index 600263aa..a97b7bdf 100644
--- a/codepot/src/system/libraries/Upload.php
+++ b/codepot/src/system/libraries/Upload.php
@@ -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 @@ class CI_Upload {
 							'mimes'				=> array(),
 							'remove_spaces'		=> TRUE,
 							'xss_clean'			=> FALSE,
-							'temp_prefix'		=> "temp_file_"
+							'temp_prefix'		=> "temp_file_",
+							'client_name'		=> ''
 						);	
 	
 	
@@ -124,6 +127,10 @@ class CI_Upload {
 				$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 @@ class CI_Upload {
 
 		// 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 @@ class CI_Upload {
 			$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 @@ class CI_Upload {
 						'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 @@ class CI_Upload {
 	 * @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));
+			if (getimagesize($this->file_temp) === FALSE)
+			{
+				return FALSE;
+			}			
+		}
 
-			// Images get some additional checks
-			if (in_array($val, $image_types))
+		if ($ignore_mime === TRUE)
+		{
+			return TRUE;
+		}
+		
+		$mime = $this->mimes_types($ext);
+				
+		if (is_array($mime))
+		{
+			if (in_array($this->file_type, $mime, TRUE))
 			{
-				if (getimagesize($this->file_temp) === FALSE)
-				{
-					return FALSE;
-				}
-			}
-
-			if (is_array($mime))
-			{
-				if (in_array($this->file_type, $mime, TRUE))
-				{
-					return TRUE;
-				}
-			}
-			else
-			{
-				if ($mime == $this->file_type)
-				{
-					return TRUE;
-				}	
-			}		
+				return TRUE;
+			}			
+		}
+		elseif ($mime == $this->file_type)
+		{
+				return TRUE;
 		}
 		
 		return FALSE;
@@ -918,7 +946,7 @@ class CI_Upload {
 
 		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 @@ class CI_Upload {
 			}
 		}
 
-		// 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;
@@ -946,4 +967,4 @@ class CI_Upload {
 // END Upload Class
 
 /* End of file Upload.php */
-/* Location: ./system/libraries/Upload.php */
+/* Location: ./system/libraries/Upload.php */
\ No newline at end of file
diff --git a/codepot/src/system/libraries/User_agent.php b/codepot/src/system/libraries/User_agent.php
index 180b93de..a7c7a760 100644
--- a/codepot/src/system/libraries/User_agent.php
+++ b/codepot/src/system/libraries/User_agent.php
@@ -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
diff --git a/codepot/src/system/libraries/Validation.php b/codepot/src/system/libraries/Validation.php
index 5e7759f1..a42b7760 100644
--- a/codepot/src/system/libraries/Validation.php
+++ b/codepot/src/system/libraries/Validation.php
@@ -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
diff --git a/codepot/src/system/libraries/Xmlrpc.php b/codepot/src/system/libraries/Xmlrpc.php
index 5460842b..fe5562fe 100644
--- a/codepot/src/system/libraries/Xmlrpc.php
+++ b/codepot/src/system/libraries/Xmlrpc.php
@@ -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
diff --git a/codepot/src/system/libraries/Xmlrpcs.php b/codepot/src/system/libraries/Xmlrpcs.php
index c7daa600..429ab847 100644
--- a/codepot/src/system/libraries/Xmlrpcs.php
+++ b/codepot/src/system/libraries/Xmlrpcs.php
@@ -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
diff --git a/codepot/src/system/libraries/Zip.php b/codepot/src/system/libraries/Zip.php
index f81da856..af50ca1c 100644
--- a/codepot/src/system/libraries/Zip.php
+++ b/codepot/src/system/libraries/Zip.php
@@ -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
diff --git a/codepot/src/system/logs/Makefile.am b/codepot/src/system/logs/Makefile.am
index e69de29b..f0994303 100644
--- a/codepot/src/system/logs/Makefile.am
+++ b/codepot/src/system/logs/Makefile.am
@@ -0,0 +1,5 @@
+wwwdir=$(WWWDIR)/system/logs
+www_DATA =  \
+        index.html
+
+EXTRA_DIST = $(www_DATA)
diff --git a/codepot/src/system/logs/Makefile.in b/codepot/src/system/logs/Makefile.in
index 45ae570b..d12a3c4c 100644
--- a/codepot/src/system/logs/Makefile.in
+++ b/codepot/src/system/logs/Makefile.in
@@ -14,6 +14,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -44,6 +45,29 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(wwwdir)"
+DATA = $(www_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -140,7 +164,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-wwwdir = @wwwdir@
+wwwdir = $(WWWDIR)/system/logs
+www_DATA = \
+        index.html
+
+EXTRA_DIST = $(www_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -174,6 +202,26 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+install-wwwDATA: $(www_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(wwwdir)" || $(MKDIR_P) "$(DESTDIR)$(wwwdir)"
+	@list='$(www_DATA)'; test -n "$(wwwdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(wwwdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(wwwdir)" || exit $$?; \
+	done
+
+uninstall-wwwDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(www_DATA)'; test -n "$(wwwdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(wwwdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(wwwdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -213,8 +261,11 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(wwwdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -260,7 +311,7 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-wwwDATA
 
 install-dvi: install-dvi-am
 
@@ -304,7 +355,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-wwwDATA
 
 .MAKE: install-am install-strip
 
@@ -314,9 +365,10 @@ uninstall-am:
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+	install-strip install-wwwDATA installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-wwwDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/codepot/src/system/logs/index.html b/codepot/src/system/logs/index.html
new file mode 100644
index 00000000..c942a79c
--- /dev/null
+++ b/codepot/src/system/logs/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/codepot/src/system/plugins/captcha_pi.php b/codepot/src/system/plugins/captcha_pi.php
index 36a74c42..77f29f8b 100644
--- a/codepot/src/system/plugins/captcha_pi.php
+++ b/codepot/src/system/plugins/captcha_pi.php
@@ -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
diff --git a/codepot/src/system/plugins/js_calendar_pi.php b/codepot/src/system/plugins/js_calendar_pi.php
index 19d05681..3c304fd1 100644
--- a/codepot/src/system/plugins/js_calendar_pi.php
+++ b/codepot/src/system/plugins/js_calendar_pi.php
@@ -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
diff --git a/codepot/src/system/scaffolding/Scaffolding.php b/codepot/src/system/scaffolding/Scaffolding.php
index fb2ee5da..d110626b 100644
--- a/codepot/src/system/scaffolding/Scaffolding.php
+++ b/codepot/src/system/scaffolding/Scaffolding.php
@@ -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