From 773898ca303b1af65d39db16c93983f91a946f8f Mon Sep 17 00:00:00 2001 From: Wes Baker Date: Wed, 10 Oct 2012 11:11:12 -0300 Subject: Correcting the breadcrumb in the 2.1.3 update instructions. --- user_guide/installation/upgrade_213.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/installation/upgrade_213.html b/user_guide/installation/upgrade_213.html index 14286a509..2dd2ff0ac 100644 --- a/user_guide/installation/upgrade_213.html +++ b/user_guide/installation/upgrade_213.html @@ -42,7 +42,7 @@ CodeIgniter Home  ›  User Guide Home  ›  -Upgrading from 2.1.1 to 2.1.2 +Upgrading from 2.1.2 to 2.1.3
Search User Guide   
-- cgit v1.2.3-24-g4f1b From 8bcdb30539d226041fbe0f8c7e3c0b5d038edebc Mon Sep 17 00:00:00 2001 From: Michael Brooks Date: Sat, 27 Oct 2012 17:01:47 -0700 Subject: Fix language typo in Migrations library lang and line were out of order --- system/libraries/Migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index df2dd7ce3..ffa640ba6 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -220,7 +220,7 @@ class CI_Migration { { if ( ! $migrations = $this->find_migrations()) { - $this->_error_string = $this->line->lang('migration_none_found'); + $this->_error_string = $this->lang->line('migration_none_found'); return false; } -- cgit v1.2.3-24-g4f1b From 24c560c5c79605df124f208346c8bff5c152cd1c Mon Sep 17 00:00:00 2001 From: Patrick Zeinert Date: Mon, 5 Nov 2012 07:24:05 -0600 Subject: Error on line 1407 of db_active_rec.php traces to mis-named variables Corrected variables to $k2 and $v2 --- system/database/DB_active_rec.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 10febb1fc..129eaa7b6 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1404,7 +1404,7 @@ class CI_DB_active_record extends CI_DB_driver { } else { - $not[] = $k.'-'.$v; + $not[] = $k2.'-'.$v2; } if ($escape === FALSE) -- cgit v1.2.3-24-g4f1b From c4df02a089a874b621b77c892863eb42ce505cf0 Mon Sep 17 00:00:00 2001 From: Thomas Traub Date: Wed, 21 Nov 2012 18:22:59 +0100 Subject: Convert liefeeds to Unix style --- application/config/migration.php | 80 ++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/application/config/migration.php b/application/config/migration.php index afa264562..df42a3cae 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -1,41 +1,41 @@ -migration->latest() this is the version that schema will -| be upgraded / downgraded to. -| -*/ -$config['migration_version'] = 0; - - -/* -|-------------------------------------------------------------------------- -| Migrations Path -|-------------------------------------------------------------------------- -| -| Path to your migrations folder. -| Typically, it will be within your application path. -| Also, writing permission is required within the migrations path. -| -*/ -$config['migration_path'] = APPPATH . 'migrations/'; - - -/* End of file migration.php */ +migration->latest() this is the version that schema will +| be upgraded / downgraded to. +| +*/ +$config['migration_version'] = 0; + + +/* +|-------------------------------------------------------------------------- +| Migrations Path +|-------------------------------------------------------------------------- +| +| Path to your migrations folder. +| Typically, it will be within your application path. +| Also, writing permission is required within the migrations path. +| +*/ +$config['migration_path'] = APPPATH . 'migrations/'; + + +/* End of file migration.php */ /* Location: ./application/config/migration.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 4606acc6e1f01ffcdbf740c41f593b3a82d94c1e Mon Sep 17 00:00:00 2001 From: moi90 Date: Fri, 15 Mar 2013 16:48:56 +0100 Subject: Email library: htmlspecialchars for _header_str --- system/libraries/Email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 9ec40af9d..d01d5c197 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1954,7 +1954,7 @@ class CI_Email { } } - $msg .= "
".$this->_header_str."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'
'; + $msg .= "
".htmlspecialchars($this->_header_str)."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'
'; return $msg; } -- cgit v1.2.3-24-g4f1b From 4c866e0b911fcc82cf49b317178788ce3c319bd4 Mon Sep 17 00:00:00 2001 From: brian978 Date: Mon, 3 Dec 2012 21:18:20 +0200 Subject: Added small improvement to the _remove_evil_attributes function Signed-off-by: brian978 Signed-off-by: Wes Baker Conflicts: system/core/Security.php --- system/core/Security.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/system/core/Security.php b/system/core/Security.php index 00089d765..b0d39b981 100755 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -619,17 +619,16 @@ class CI_Security { $count = 0; $attribs = array(); - // find occurrences of illegal attribute strings without quotes - preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER); + // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes) + preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is', $str, $matches, PREG_SET_ORDER); foreach ($matches as $attr) { - $attribs[] = preg_quote($attr[0], '/'); } - // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes) - preg_match_all("/(".implode('|', $evil_attributes).")\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is", $str, $matches, PREG_SET_ORDER); + // find occurrences of illegal attribute strings without quotes + preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER); foreach ($matches as $attr) { @@ -639,7 +638,7 @@ class CI_Security { // replace illegal attribute strings that are inside an html tag if (count($attribs) > 0) { - $str = preg_replace("/<(\/?[^><]+?)([^A-Za-z<>\-])(.*?)(".implode('|', $attribs).")(.*?)([\s><])([><]*)/i", '<$1 $3$5$6$7', $str, -1, $count); + $str = preg_replace('/(<]+?)([^A-Za-z<>\-])(.*?)('.implode('|', $attribs).')(.*?)([\s><]?)([><]*)/i', '$1$2 $4$6$7$8', $str, -1, $count); } } while ($count); @@ -873,4 +872,4 @@ class CI_Security { } /* End of file Security.php */ -/* Location: ./system/libraries/Security.php */ \ No newline at end of file +/* Location: ./system/libraries/Security.php */ -- cgit v1.2.3-24-g4f1b From c5f99fdcc5c4a918b5b8fe3ddbd56ab25ad1c22b Mon Sep 17 00:00:00 2001 From: Wes Baker Date: Mon, 8 Jul 2013 17:22:21 -0400 Subject: Updating User Guide for 2.1.4. --- application/controllers/welcome.php | 9 ++- system/core/CodeIgniter.php | 2 +- system/core/Security.php | 2 +- user_guide/changelog.html | 23 +++++++- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/forge.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/doc_style/index.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/cli.html | 2 +- user_guide/general/common_functions.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_drivers.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/drivers.html | 2 +- user_guide/general/environments.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/reserved_names.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/security.html | 4 +- user_guide/general/styleguide.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/captcha_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 4 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/email_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/language_helper.html | 2 +- user_guide/helpers/number_helper.html | 2 +- user_guide/helpers/path_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 5 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_154.html | 2 +- user_guide/installation/upgrade_160.html | 2 +- user_guide/installation/upgrade_161.html | 2 +- user_guide/installation/upgrade_162.html | 2 +- user_guide/installation/upgrade_163.html | 2 +- user_guide/installation/upgrade_170.html | 2 +- user_guide/installation/upgrade_171.html | 2 +- user_guide/installation/upgrade_172.html | 2 +- user_guide/installation/upgrade_200.html | 4 +- user_guide/installation/upgrade_201.html | 2 +- user_guide/installation/upgrade_202.html | 2 +- user_guide/installation/upgrade_203.html | 12 ++-- user_guide/installation/upgrade_210.html | 4 +- user_guide/installation/upgrade_211.html | 4 +- user_guide/installation/upgrade_212.html | 2 +- user_guide/installation/upgrade_213.html | 2 +- user_guide/installation/upgrade_214.html | 84 ++++++++++++++++++++++++++++ user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 3 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/caching.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/cart.html | 2 +- user_guide/libraries/config.html | 8 +-- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/form_validation.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 4 +- user_guide/libraries/javascript.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/migration.html | 4 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/security.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/typography.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/cheatsheets.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/getting_started.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- user_guide/tutorial/conclusion.html | 2 +- user_guide/tutorial/create_news_items.html | 28 +++++----- user_guide/tutorial/hard_coded_pages.html | 24 ++++---- user_guide/tutorial/index.html | 4 +- user_guide/tutorial/news_section.html | 4 +- user_guide/tutorial/static_pages.html | 24 ++++---- 147 files changed, 312 insertions(+), 200 deletions(-) create mode 100644 user_guide/installation/upgrade_214.html diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php index 21bef43d9..e4570974f 100644 --- a/application/controllers/welcome.php +++ b/application/controllers/welcome.php @@ -7,10 +7,10 @@ class Welcome extends CI_Controller { * * Maps to the following URL * http://example.com/index.php/welcome - * - or - + * - or - * http://example.com/index.php/welcome/index * - or - - * Since this controller is set as the default controller in + * Since this controller is set as the default controller in * config/routes.php, it's displayed at http://example.com/ * * So any other public methods not prefixed with an underscore will @@ -21,6 +21,11 @@ class Welcome extends CI_Controller { { $this->load->view('welcome_message'); } + + public function test() + { + var_dump($this->security->xss_clean(" - +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version 2.1.4

@@ -57,6 +57,27 @@ Change Log

Change Log

+

Version 2.1.4

+

Release Date: July 8, 2013

+ + +
    +
  • General Changes +
      +
    • Improved security in xss_clean().
    • +
    +
  • +
+ +

Bug fixes for 2.1.4:

+
    +
  • Fixed a bug (#1936) - Migrations Library method latest() had a typo when retrieving language values.
  • +
  • Fixed a bug (#2021) - Migrations Library configuration file was mistakenly using Windows style line feeds.
  • +
  • Fixed a bug (#1969) - Active Record method set_update_batch() was using the incorrect variables and would cause an error.
  • +
  • Fixed a bug (#2337) - Email Library method print_debugger() was not using htmlspecialchar() when being shown in the browser.
  • +
+ +

Version 2.1.3

Release Date: October 8, 2012

diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index a16de380f..6dd38d1be 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 1d881feb3..5251fc7c3 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 955ebb498..e5fbac36b 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index a3b3167ae..e35e712de 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 61e8fc4f9..a6be45303 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index f427ab402..dcd5344d1 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index ad71fb352..5b09144a2 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index d6bf10a8d..a845e2de8 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 1cb92d6a5..fd49bd95b 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 941197b0b..f486fb5c0 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index aa6941442..c00337f91 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 0f7108202..a93d4c5c5 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index b1e467da9..bdbf447af 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 7a3d93605..63dc85b5b 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index fea59f1a2..2689abe78 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index a44f8609f..df3eb19d6 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 2705cc16f..043f86e23 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 90724034e..32dfd7a65 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 8410335ca..c421fb2bf 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 229525158..8ad0eb511 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index 4be648d10..ecd6c3598 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index b48f3f526..5cc001570 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 82f9ca9b5..c38926d25 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index ba8777162..0acd10a04 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index c60d8b5d1..9625ac4c0 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index cd603af18..8ead0e48e 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 218c4fe00..a3c3cc9e5 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index a4874d3a7..5d35d4d0b 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html index 55e82b780..533c09236 100644 --- a/user_guide/general/environments.html +++ b/user_guide/general/environments.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index c73651b42..382974e9a 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 83b04ffce..0949ca914 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index aa4321cb1..1e649f70e 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index e4b1a9298..d2ec687a5 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 32deea4a5..862792ae6 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/models.html b/user_guide/general/models.html index e07f694e4..8fcc49daa 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index f8b3b4321..1497ff2b5 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index aabdef512..8f5812883 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index f8b3d8228..5c0c5ae37 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index fd86f06b1..784970c1a 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 8ba47431b..a2817ee6b 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 9c603c694..6c48eacd0 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

@@ -85,7 +85,7 @@ routine is effectively the same as register_globals = off.

error_reporting

- In production environments, it is typically desirable to disable PHP's + In production environments, it is typically desirable to disable PHP's error reporting by setting the internal error_reporting flag to a value of 0. This disables native PHP errors from being rendered as output, which may potentially contain sensitive information. diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 76bacc581..5e982e7b3 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -34,7 +34,7 @@

- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 55ab86f24..dbe9ea33c 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/general/views.html b/user_guide/general/views.html index f010bc803..a7e4b54fc 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index b95d4fd15..753c50bf3 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index f9aa89b95..bca5df893 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 09ee7405f..55dc75658 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 5a0f0bd3f..f03456c8a 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

@@ -149,7 +149,7 @@ echo standard_date($format, $time); DATE_RFC1123 RFC 1123 - Sun, 14 Aug 2005 16:13:03 UTC + Sun, 14 Aug 2005 16:13:03 UTC DATE_RFC2822 diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 649e0c4ea..592a1a4f4 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 266e5ea65..b5fe499dc 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 7bfd5e600..c87fee7e8 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 3624a27ab..f15cbab0b 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 081131116..e6ba41907 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 8e6ab2241..89ed32641 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 89604ab5c..fd332678c 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 0a1ac9e2a..671d44f97 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index 74dbd5072..f545ac2b7 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index aa53e318f..f18d4dfe8 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 95f38c94c..227677251 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 29f0894df..e0b37dd65 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 2931021b2..6ca7cef2b 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index e404bfe39..db2b494d6 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index f0fe47e82..a1f92c1a5 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index df3d496de..b2fe0dbc3 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index fd54d7ccd..0f2c79e39 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/index.html b/user_guide/index.html index 8aa21b1bc..a44f1dedd 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version Location

diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 245ee891a..4a0468235 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.1.3

CodeIgniter User Guide Version 2.1.4

@@ -58,7 +58,8 @@ Downloading CodeIgniter

Downloading CodeIgniter

    -
  • CodeIgniter V 2.1.3 (Current version)
  • +
  • CodeIgniter V 2.1.4 (Current version)
  • +
  • CodeIgniter V 2.1.3
  • CodeIgniter V 2.1.2
  • CodeIgniter V 2.1.1
  • CodeIgniter V 2.1.0
  • diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index cca3d497f..21db0c2bd 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 2f000a3fc..85c8aecf7 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 2a54b84c3..b909325b5 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index b84121f3c..05c822ec6 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 7e066bc61..0858bb51c 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index a15ade3eb..e1ec42a14 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index a040cc839..9a22fdcb4 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 208cb1e96..5e1553787 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index de5bd159a..3435c3ec2 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index e456cb49d..93967322a 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index e33f0de60..8c95a673e 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 574bd4b04..10b27381e 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 11906438a..9cc0e694a 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index c9d6ccb52..4f66419db 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 1fdd3a2bb..e3a8b20df 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index 98ccde8dd..23bd5e4e8 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 38f2d4c9c..5f8eadfcf 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 94c4eb86d..89a924b62 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index dfd68e6a9..a534125c7 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index 85234f85a..ed3b6ae90 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index f51ac0661..44dc778e5 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    @@ -104,7 +104,7 @@ to

    The compatibility helper has been removed from the CodeIgniter core. All methods in it should be natively available in supported PHP versions.

    Step 6: Update Class extension

    -

    All core classes are now prefixed with CI_. Update Models and Controllers to extend CI_Model and CI_Controller, respectively.

    +

    All core classes are now prefixed with CI_. Update Models and Controllers to extend CI_Model and CI_Controller, respectively.

    Step 7: Update Parent Constructor calls

    All native CodeIgniter classes now use the PHP 5 __construct() convention. Please update extended libraries to call parent::__construct().

    diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 557d8f0f0..146d0226b 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html index 064198190..d25c35d78 100644 --- a/user_guide/installation/upgrade_202.html +++ b/user_guide/installation/upgrade_202.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index d3648fa15..c905da427 100644 --- a/user_guide/installation/upgrade_203.html +++ b/user_guide/installation/upgrade_203.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    @@ -65,7 +65,7 @@ Upgrading from 2.0.2 to 2.0.3

    Replace all files and directories in your "system" folder and replace your index.php file. If any modifications were made to your index.php they will need to be made fresh in this new one.

    Note: If you have any custom developed files in these folders please make copies of them first.

    - +

    Step 2: Update your main index.php file

    If you are running a stock index.php file simply replace your version with the new one.

    @@ -97,10 +97,10 @@ Upgrading from 2.0.2 to 2.0.3 CREATE INDEX last_activity_idx ON ci_sessions(last_activity); ALTER TABLE ci_sessions MODIFY user_agent VARCHAR(120); - - - - + + + +
    diff --git a/user_guide/installation/upgrade_210.html b/user_guide/installation/upgrade_210.html index 0a0e0dd2d..f4c13e88a 100644 --- a/user_guide/installation/upgrade_210.html +++ b/user_guide/installation/upgrade_210.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    @@ -64,7 +64,7 @@ Upgrading from 2.0.3 to 2.1.0

    Replace all files and directories in your "system" folder and replace your index.php file. If any modifications were made to your index.php they will need to be made fresh in this new one.

    Note: If you have any custom developed files in these folders please make copies of them first.

    - +

    Step 2: Replace config/user_agents.php

    This config file has been updated to contain more user agent types, please copy it to application/config/user_agents.php.

    diff --git a/user_guide/installation/upgrade_211.html b/user_guide/installation/upgrade_211.html index 67891d96e..d08c899ee 100644 --- a/user_guide/installation/upgrade_211.html +++ b/user_guide/installation/upgrade_211.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    @@ -64,7 +64,7 @@ Upgrading from 2.1.0 to 2.1.1

    Replace all files and directories in your "system" folder and replace your index.php file. If any modifications were made to your index.php they will need to be made fresh in this new one.

    Note: If you have any custom developed files in these folders please make copies of them first.

    - +

    Step 2: Replace config/mimes.php

    This config file has been updated to contain more user mime-types, please copy it to application/config/mimes.php.

    diff --git a/user_guide/installation/upgrade_212.html b/user_guide/installation/upgrade_212.html index ffd169e06..a8ac41dc1 100644 --- a/user_guide/installation/upgrade_212.html +++ b/user_guide/installation/upgrade_212.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrade_213.html b/user_guide/installation/upgrade_213.html index 2dd2ff0ac..56aabe75c 100644 --- a/user_guide/installation/upgrade_213.html +++ b/user_guide/installation/upgrade_213.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version 2.1.4

    diff --git a/user_guide/installation/upgrade_214.html b/user_guide/installation/upgrade_214.html new file mode 100644 index 000000000..ceeb7537a --- /dev/null +++ b/user_guide/installation/upgrade_214.html @@ -0,0 +1,84 @@ + + + + + +Upgrading from 2.1.3 to 2.1.4 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 2.1.4

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 2.1.3 to 2.1.4

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + +

    Step 1: Update your CodeIgniter files

    + +

    Replace all files and directories in your "system" folder and replace your index.php file. If any modifications were made to your index.php they will need to be made fresh in this new one.

    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 0b9113a26..3073ba9fd 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version Location

    diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index eab521047..d4dc975f6 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 2.1.3

    CodeIgniter User Guide Version 2.1.4

    @@ -60,6 +60,7 @@ Upgrading from a Previous Version

    Please read the upgrade notes corresponding to the version you are upgrading from.

      +
    • Upgrading from 2.1.3 to 2.1.4
    • Upgrading from 2.1.2 to 2.1.3
    • Upgrading from 2.1.1 to 2.1.2
    • Upgrading from 2.1.0 to 2.1.1
    • diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 163aaf126..d176b16ad 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.3

      CodeIgniter User Guide Version Location

      diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index 074df945b..0b507079c 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.3

      CodeIgniter User Guide Version Location

      diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 6c0c4a93b..878fa1ac0 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.3

      CodeIgniter User Guide Version Location

      diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index cddad9e63..0868b8cba 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.3

      CodeIgniter User Guide Version Location

      diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 5e5e0780b..feff652d6 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.1.3

      CodeIgniter User Guide Version Location

      @@ -179,7 +179,7 @@ $site_name = $blog_config['site_name'];

      You can place the following configuration files in environment-specific folders:

      - +
      • Default CodeIgniter configuration files
      • Your own custom configuration files
      • @@ -197,8 +197,8 @@ $site_name = $blog_config['site_name'];

        $this->config->base_url();

        This function retrieves the URL to your site, plus an optional path such as to a stylesheet or image.

        -

        The two functions above are normally accessed via the corresponding functions in the URL Helper.

        - +

        The two functions above are normally accessed via the corresponding functions in the URL Helper.

        +

        $this->config->system_url();

        This function retrieves the URL to your system folder.

        diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index aea2e35eb..1debd8ace 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 61ba877bd..08641edfa 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index b17cea429..4439d0e76 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 0ff13d587..fbabec956 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 922ea9a6a..4ab24a293 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 9f9122770..59b0e6410 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 31f3d6260..595a1627a 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        @@ -248,7 +248,7 @@ else
        {
             echo 'Valid';
        } -

        Accepts an optional second string parameter of "IPv4" or "IPv6" to specify an IP format. The default checks for both formats.

        +

        Accepts an optional second string parameter of "IPv4" or "IPv6" to specify an IP format. The default checks for both formats.

        $this->input->user_agent()

        Returns the user agent (web browser) being used by the current user. Returns FALSE if it's not available.

        diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index 5f69e0d90..4c7d6daf1 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index c724579ef..ea16bd459 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 01ec938cb..3f1b80492 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/migration.html b/user_guide/libraries/migration.html index 1b7bdfc8b..783470468 100644 --- a/user_guide/libraries/migration.html +++ b/user_guide/libraries/migration.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        @@ -89,7 +89,7 @@ class Migration_Add_blog extends CI_Migration { 'null' => TRUE, ), )); - + $this->dbforge->create_table('blog'); } diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 481fd5447..4dbac4d08 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 7caf382d4..4b05fc63d 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index b27a83e17..d11806c51 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index f98ddabcf..fea12b1b5 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 85c0fe9fb..33a8a285b 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 2c48ef0e2..e98aa4ad6 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 5a935faf6..c05914f4e 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 58c457a63..2ed6c2299 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index ed1ce28d1..520fda43b 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index e67863995..90adb6533 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 8f7a50098..02685efef 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 5b8777ebc..ee0b452ec 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index a2ed6476c..e253fcd38 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/license.html b/user_guide/license.html index 890f73011..0864e989f 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index cff5a0811..ed9bd534f 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 2c18a968c..ca8febad0 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 1330a7ef1..9ae562ad9 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 2e45f0c30..c5f680dfa 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index 9def8d950..af6ed35fe 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 990d2c4a1..18875d004 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index dd68eae6e..0f5e92a1f 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 2d8f7cf5c..f05df1d36 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/toc.html b/user_guide/toc.html index 92f15b908..db353a283 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -29,7 +29,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/tutorial/conclusion.html b/user_guide/tutorial/conclusion.html index a439ac131..68daed771 100644 --- a/user_guide/tutorial/conclusion.html +++ b/user_guide/tutorial/conclusion.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        diff --git a/user_guide/tutorial/create_news_items.html b/user_guide/tutorial/create_news_items.html index 853044c0c..8effe35ef 100644 --- a/user_guide/tutorial/create_news_items.html +++ b/user_guide/tutorial/create_news_items.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        @@ -72,13 +72,13 @@ Create news items <?php echo form_open('news/create') ?> - +
        @@ -94,18 +94,18 @@ public function create() { $this->load->helper('form'); $this->load->library('form_validation'); - + $data['title'] = 'Create a news item'; - + $this->form_validation->set_rules('title', 'Title', 'required'); $this->form_validation->set_rules('text', 'text', 'required'); - + if ($this->form_validation->run() === FALSE) { - $this->load->view('templates/header', $data); + $this->load->view('templates/header', $data); $this->load->view('news/create'); $this->load->view('templates/footer'); - + } else { @@ -129,27 +129,27 @@ public function create() public function set_news() { $this->load->helper('url'); - + $slug = url_title($this->input->post('title'), 'dash', TRUE); - + $data = array( 'title' => $this->input->post('title'), 'slug' => $slug, 'text' => $this->input->post('text') ); - + return $this->db->insert('news', $data); }

        This new method takes care of inserting the news item into the database. The third line contains a new function, url_title(). This function - provided by the URL helper - strips down the string you pass it, replacing all spaces by dashes (-) and makes sure everything is in lowercase characters. This leaves you with a nice slug, perfect for creating URIs.

        - +

        Let's continue with preparing the record that is going to be inserted later, inside the $data array. Each element corresponds with a column in the database table created earlier. You might notice a new method here, namely the post() method from the input library. This method makes sure the data is sanitized, protecting you from nasty attacks from others. The input library is loaded by default. At last, you insert our $data array into our database.

        Routing

        Before you can start adding news items into your CodeIgniter application you have to add an extra rule to config/routes.php file. Make sure your file contains the following. This makes sure CodeIgniter sees 'create' as a method instead of a news item's slug.

        - +
         $route['news/create'] = 'news/create';
         $route['news/(:any)'] = 'news/view/$1';
        diff --git a/user_guide/tutorial/hard_coded_pages.html b/user_guide/tutorial/hard_coded_pages.html
        index 2f4218222..77ad7f2dd 100644
        --- a/user_guide/tutorial/hard_coded_pages.html
        +++ b/user_guide/tutorial/hard_coded_pages.html
        @@ -28,7 +28,7 @@
         
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        @@ -86,13 +86,13 @@ class Pages extends CI_Controller {

        CodeIgniter 2 Tutorial

        - +

        Our header doesn't do anything exciting. It contains the basic HTML code that we will want to display before loading the main view. You can also see that we echo the $title variable, which we didn't define. We will set this variable in the Pages controller a bit later. Let's go ahead and create a footer at application/views/templates/footer.php that includes the following code.

        - + @@ -106,36 +106,36 @@ class Pages extends CI_Controller {

        The first thing we do is checking whether the page we're looking for does actually exist. We use PHP's native file_exists() to do this check and pass the path where the file is supposed to be. Next is the function show_404(), a CodeIgniter function that renders the default error page and sets the appropriate HTTP headers.

        -

        In the header template you saw we were using the $title variable to customize our page title. This is where we define the title, but instead of assigning the value to a variable, we assign it to the title element in the $data array. The last thing we need to do is loading the views in the order we want them to be displayed. We also pass the $data array to the header view to make its elements available in the header view file.

        - +

        In the header template you saw we were using the $title variable to customize our page title. This is where we define the title, but instead of assigning the value to a variable, we assign it to the title element in the $data array. The last thing we need to do is loading the views in the order we want them to be displayed. We also pass the $data array to the header view to make its elements available in the header view file.

        +

        Routing

        Actually, our controller is already functioning. Point your browser to index.php/pages/view to see your homepage. When you visit index.php/pages/view/about you will see the about page, again including your header and footer. Now we're going to get rid of the pages/view part in our URI. As you may have seen, CodeIgniter does its routing by the class, method and parameter, separated by slashes.

        Open the routing file located at application/config/routes.php and add the following two lines. Remove all other code that sets any element in the $route array.

        - + -

        CodeIgniter reads its routing rules from top to bottom and routes the request to the first matching rule. These routes are stored in the $route array where the keys represent the incoming request and the value the path to the method, as described above.

        +

        CodeIgniter reads its routing rules from top to bottom and routes the request to the first matching rule. These routes are stored in the $route array where the keys represent the incoming request and the value the path to the method, as described above.

        The first rule in our $routes array matches every request - using the wildcard operator (:any) - and passes the value to the view method of the pages class we created earlier. The default controller route makes sure every request to the root goes to the view method as well, which has the first parameter set to 'home' by default.

        diff --git a/user_guide/tutorial/index.html b/user_guide/tutorial/index.html index e5648f9e3..5baf52c6b 100644 --- a/user_guide/tutorial/index.html +++ b/user_guide/tutorial/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        @@ -59,7 +59,7 @@ Introduction

        Tutorial − Introduction

        -

        This tutorial is intended to introduce you to the CodeIgniter framework and the basic principles of MVC architecture. It will show you how a basic CodeIgniter application is constructed in step-by-step fashion.

        +

        This tutorial is intended to introduce you to the CodeIgniter framework and the basic principles of MVC architecture. It will show you how a basic CodeIgniter application is constructed in step-by-step fashion.

        In this tutorial, you will be creating a basic news application. You will begin by writing the code that can load static pages. Next, you will create a news section that reads news items from a database. Finally, you'll add a form to create news items in the database.

        diff --git a/user_guide/tutorial/news_section.html b/user_guide/tutorial/news_section.html index 64c693246..db199848c 100644 --- a/user_guide/tutorial/news_section.html +++ b/user_guide/tutorial/news_section.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        @@ -103,7 +103,7 @@ public function get_news($slug = FALSE) $query = $this->db->get('news'); return $query->result_array(); } - + $query = $this->db->get_where('news', array('slug' => $slug)); return $query->row_array(); } diff --git a/user_guide/tutorial/static_pages.html b/user_guide/tutorial/static_pages.html index 13e406358..be05436ef 100644 --- a/user_guide/tutorial/static_pages.html +++ b/user_guide/tutorial/static_pages.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.1.3

        CodeIgniter User Guide Version Location

        @@ -109,15 +109,15 @@ We will be creating two "views" (page templates) that act as our page

        CodeIgniter 2 Tutorial

        - + -

        The header contains the basic HTML code that you'll want to display before loading the main view, together with a heading. +

        The header contains the basic HTML code that you'll want to display before loading the main view, together with a heading. It will also output the $title variable, which we'll define later in the controller. Now create a footer at application/views/templates/footer.php that includes the following code:

        - + @@ -127,8 +127,8 @@ Now create a footer at application/views/templates/footer.php that in

        Earlier you set up a controller with a view() method. The method accepts one parameter, which is the name of the page to be loaded. The static page templates will be located in the application/views/pages/ directory.

        -

        In that directory, create two files named home.php and about.php. -Within those files, type some text − anything you'd like − and save them. +

        In that directory, create two files named home.php and about.php. +Within those files, type some text − anything you'd like − and save them. If you like to be particularly un-original, try "Hello World!".

        In order to load those pages, you'll have to check whether the requested page actually exists:

        @@ -136,15 +136,15 @@ If you like to be particularly un-original, try "Hello World!".

         public function view($page = 'home')
         {
        -			
        +
         	if ( ! file_exists('application/views/pages/'.$page.'.php'))
         	{
         		// Whoops, we don't have a page for that!
         		show_404();
         	}
        -	
        +
         	$data['title'] = ucfirst($page); // Capitalize the first letter
        -	
        +
         	$this->load->view('templates/header', $data);
         	$this->load->view('pages/'.$page, $data);
         	$this->load->view('templates/footer', $data);
        @@ -160,7 +160,7 @@ public function view($page = 'home')
         
         

        The last thing that has to be done is loading the views in the order they should be displayed. The second parameter in the view() method is used to pass values to the view. Each value in the $data array is assigned to a variable with the name of its key. So the value of $data['title'] in the controller is equivalent to $title in the view.

        - +

        Routing

        The controller is now functioning! Point your browser to [your-site-url]index.php/pages/view to see your page. When you visit index.php/pages/view/about you'll see the about page, again including the header and footer.

        @@ -169,7 +169,7 @@ The second parameter in the view() method is used to pass values to t http://example.com/[controller-class]/[controller-method]/[arguments]

        Let's do that. Open the routing file located at application/config/routes.php and add the following two lines. Remove all other code that sets any element in the $route array.

        - +
         $route['default_controller'] = 'pages/view';
         $route['(:any)'] = 'pages/view/$1';
        -- 
        cgit v1.2.3-24-g4f1b
        
        
        From 763e0bac83767dc2b8ae2c92192580a95121a624 Mon Sep 17 00:00:00 2001
        From: Wes Baker 
        Date: Mon, 8 Jul 2013 17:25:20 -0400
        Subject: Revert "Updating User Guide for 2.1.4."
        
        This reverts commit c5f99fdcc5c4a918b5b8fe3ddbd56ab25ad1c22b.
        
        Signed-off-by: Wes Baker 
        ---
         application/controllers/welcome.php | 9 ++-------
         system/core/Security.php            | 2 +-
         2 files changed, 3 insertions(+), 8 deletions(-)
        
        diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
        index e4570974f..21bef43d9 100644
        --- a/application/controllers/welcome.php
        +++ b/application/controllers/welcome.php
        @@ -7,10 +7,10 @@ class Welcome extends CI_Controller {
         	 *
         	 * Maps to the following URL
         	 * 		http://example.com/index.php/welcome
        -	 *	- or -
        +	 *	- or -  
         	 * 		http://example.com/index.php/welcome/index
         	 *	- or -
        -	 * Since this controller is set as the default controller in
        +	 * Since this controller is set as the default controller in 
         	 * config/routes.php, it's displayed at http://example.com/
         	 *
         	 * So any other public methods not prefixed with an underscore will
        @@ -21,11 +21,6 @@ class Welcome extends CI_Controller {
         	{
         		$this->load->view('welcome_message');
         	}
        -
        -	public function test()
        -	{
        -		var_dump($this->security->xss_clean("
        Date: Mon, 8 Jul 2013 17:47:45 -0400
        Subject: Fixing a typo in the user guide.
        
        ---
         user_guide/database/active_record.html       | 2 +-
         user_guide/database/caching.html             | 2 +-
         user_guide/database/call_function.html       | 2 +-
         user_guide/database/configuration.html       | 2 +-
         user_guide/database/connecting.html          | 2 +-
         user_guide/database/examples.html            | 2 +-
         user_guide/database/fields.html              | 2 +-
         user_guide/database/forge.html               | 2 +-
         user_guide/database/helpers.html             | 2 +-
         user_guide/database/index.html               | 2 +-
         user_guide/database/queries.html             | 2 +-
         user_guide/database/results.html             | 2 +-
         user_guide/database/table_data.html          | 2 +-
         user_guide/database/transactions.html        | 2 +-
         user_guide/database/utilities.html           | 2 +-
         user_guide/doc_style/index.html              | 2 +-
         user_guide/general/alternative_php.html      | 2 +-
         user_guide/general/ancillary_classes.html    | 2 +-
         user_guide/general/autoloader.html           | 2 +-
         user_guide/general/caching.html              | 2 +-
         user_guide/general/cli.html                  | 2 +-
         user_guide/general/common_functions.html     | 2 +-
         user_guide/general/controllers.html          | 2 +-
         user_guide/general/core_classes.html         | 2 +-
         user_guide/general/creating_drivers.html     | 2 +-
         user_guide/general/creating_libraries.html   | 2 +-
         user_guide/general/credits.html              | 2 +-
         user_guide/general/drivers.html              | 2 +-
         user_guide/general/environments.html         | 2 +-
         user_guide/general/errors.html               | 2 +-
         user_guide/general/helpers.html              | 2 +-
         user_guide/general/hooks.html                | 2 +-
         user_guide/general/libraries.html            | 2 +-
         user_guide/general/managing_apps.html        | 2 +-
         user_guide/general/models.html               | 2 +-
         user_guide/general/profiling.html            | 2 +-
         user_guide/general/quick_reference.html      | 2 +-
         user_guide/general/requirements.html         | 2 +-
         user_guide/general/reserved_names.html       | 2 +-
         user_guide/general/routing.html              | 2 +-
         user_guide/general/security.html             | 2 +-
         user_guide/general/styleguide.html           | 2 +-
         user_guide/general/urls.html                 | 2 +-
         user_guide/general/views.html                | 2 +-
         user_guide/helpers/array_helper.html         | 2 +-
         user_guide/helpers/captcha_helper.html       | 2 +-
         user_guide/helpers/cookie_helper.html        | 2 +-
         user_guide/helpers/date_helper.html          | 2 +-
         user_guide/helpers/directory_helper.html     | 2 +-
         user_guide/helpers/download_helper.html      | 2 +-
         user_guide/helpers/email_helper.html         | 2 +-
         user_guide/helpers/file_helper.html          | 2 +-
         user_guide/helpers/form_helper.html          | 2 +-
         user_guide/helpers/html_helper.html          | 2 +-
         user_guide/helpers/inflector_helper.html     | 2 +-
         user_guide/helpers/language_helper.html      | 2 +-
         user_guide/helpers/number_helper.html        | 2 +-
         user_guide/helpers/path_helper.html          | 2 +-
         user_guide/helpers/security_helper.html      | 2 +-
         user_guide/helpers/smiley_helper.html        | 2 +-
         user_guide/helpers/string_helper.html        | 2 +-
         user_guide/helpers/text_helper.html          | 2 +-
         user_guide/helpers/typography_helper.html    | 2 +-
         user_guide/helpers/url_helper.html           | 2 +-
         user_guide/helpers/xml_helper.html           | 2 +-
         user_guide/index.html                        | 2 +-
         user_guide/installation/index.html           | 2 +-
         user_guide/installation/troubleshooting.html | 2 +-
         user_guide/installation/upgrade_120.html     | 2 +-
         user_guide/installation/upgrade_130.html     | 2 +-
         user_guide/installation/upgrade_131.html     | 2 +-
         user_guide/installation/upgrade_132.html     | 2 +-
         user_guide/installation/upgrade_133.html     | 2 +-
         user_guide/installation/upgrade_140.html     | 2 +-
         user_guide/installation/upgrade_141.html     | 2 +-
         user_guide/installation/upgrade_150.html     | 2 +-
         user_guide/installation/upgrade_152.html     | 2 +-
         user_guide/installation/upgrade_153.html     | 2 +-
         user_guide/installation/upgrade_154.html     | 2 +-
         user_guide/installation/upgrade_160.html     | 2 +-
         user_guide/installation/upgrade_161.html     | 2 +-
         user_guide/installation/upgrade_162.html     | 2 +-
         user_guide/installation/upgrade_163.html     | 2 +-
         user_guide/installation/upgrade_170.html     | 2 +-
         user_guide/installation/upgrade_171.html     | 2 +-
         user_guide/installation/upgrade_172.html     | 2 +-
         user_guide/installation/upgrade_200.html     | 2 +-
         user_guide/installation/upgrade_201.html     | 2 +-
         user_guide/installation/upgrade_202.html     | 2 +-
         user_guide/installation/upgrade_203.html     | 2 +-
         user_guide/installation/upgrade_210.html     | 2 +-
         user_guide/installation/upgrade_211.html     | 2 +-
         user_guide/installation/upgrade_212.html     | 2 +-
         user_guide/installation/upgrade_b11.html     | 2 +-
         user_guide/libraries/benchmark.html          | 2 +-
         user_guide/libraries/caching.html            | 2 +-
         user_guide/libraries/calendar.html           | 2 +-
         user_guide/libraries/cart.html               | 2 +-
         user_guide/libraries/config.html             | 2 +-
         user_guide/libraries/email.html              | 2 +-
         user_guide/libraries/encryption.html         | 2 +-
         user_guide/libraries/file_uploading.html     | 2 +-
         user_guide/libraries/form_validation.html    | 2 +-
         user_guide/libraries/ftp.html                | 2 +-
         user_guide/libraries/image_lib.html          | 2 +-
         user_guide/libraries/input.html              | 2 +-
         user_guide/libraries/javascript.html         | 2 +-
         user_guide/libraries/language.html           | 2 +-
         user_guide/libraries/loader.html             | 2 +-
         user_guide/libraries/migration.html          | 2 +-
         user_guide/libraries/output.html             | 2 +-
         user_guide/libraries/pagination.html         | 2 +-
         user_guide/libraries/parser.html             | 2 +-
         user_guide/libraries/security.html           | 2 +-
         user_guide/libraries/sessions.html           | 2 +-
         user_guide/libraries/table.html              | 2 +-
         user_guide/libraries/trackback.html          | 2 +-
         user_guide/libraries/typography.html         | 2 +-
         user_guide/libraries/unit_testing.html       | 2 +-
         user_guide/libraries/uri.html                | 2 +-
         user_guide/libraries/user_agent.html         | 2 +-
         user_guide/libraries/xmlrpc.html             | 2 +-
         user_guide/libraries/zip.html                | 2 +-
         user_guide/license.html                      | 2 +-
         user_guide/overview/appflow.html             | 2 +-
         user_guide/overview/at_a_glance.html         | 2 +-
         user_guide/overview/cheatsheets.html         | 2 +-
         user_guide/overview/features.html            | 2 +-
         user_guide/overview/getting_started.html     | 2 +-
         user_guide/overview/goals.html               | 2 +-
         user_guide/overview/index.html               | 2 +-
         user_guide/overview/mvc.html                 | 2 +-
         user_guide/toc.html                          | 2 +-
         user_guide/tutorial/conclusion.html          | 2 +-
         user_guide/tutorial/create_news_items.html   | 2 +-
         user_guide/tutorial/hard_coded_pages.html    | 2 +-
         user_guide/tutorial/index.html               | 2 +-
         user_guide/tutorial/news_section.html        | 2 +-
         user_guide/tutorial/static_pages.html        | 2 +-
         139 files changed, 139 insertions(+), 139 deletions(-)
        
        diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
        index 6dd38d1be..e88a31485 100644
        --- a/user_guide/database/active_record.html
        +++ b/user_guide/database/active_record.html
        @@ -27,7 +27,7 @@
         
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 5251fc7c3..21325ec3a 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index e5fbac36b..6da549288 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index e35e712de..f4caf176a 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index a6be45303..ca58eb901 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index dcd5344d1..6e86db205 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 5b09144a2..538df927d 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index a845e2de8..df1129007 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index fd49bd95b..f7e9081ee 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/index.html b/user_guide/database/index.html index f486fb5c0..ae696c41d 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index c00337f91..1ba4b69ae 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/results.html b/user_guide/database/results.html index a93d4c5c5..53d6e61d1 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index bdbf447af..383cae273 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 63dc85b5b..dc7fb98f3 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 2689abe78..3441c45f7 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index df3eb19d6..665085f93 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 043f86e23..19dc816af 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 32dfd7a65..2fa18e75d 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index c421fb2bf..220471f8d 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 8ad0eb511..9f1fef5d6 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index ecd6c3598..82116ce92 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 5cc001570..f19f10e59 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index c38926d25..8610abe64 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 0acd10a04..60b4407bf 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index 9625ac4c0..2393da72b 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 8ead0e48e..e789f9317 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index a3c3cc9e5..3a2e238b6 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index 5d35d4d0b..a5479fdde 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html index 533c09236..2b21267a0 100644 --- a/user_guide/general/environments.html +++ b/user_guide/general/environments.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 382974e9a..b52cde943 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 0949ca914..d63c745a7 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 1e649f70e..02936003c 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index d2ec687a5..df461e750 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 862792ae6..1d7630f67 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 8fcc49daa..5e5a835e6 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 1497ff2b5..82e438d57 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 8f5812883..41708b48e 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 5c0c5ae37..ffa978ad4 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 784970c1a..3a2149ac6 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index a2817ee6b..d47553955 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 6c48eacd0..acab22617 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 5e982e7b3..b27ecafb3 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -34,7 +34,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index dbe9ea33c..396a339ad 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/general/views.html b/user_guide/general/views.html index a7e4b54fc..4faf6af66 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 753c50bf3..db1043f5d 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index bca5df893..0d3e137ac 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 55dc75658..7391d7398 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index f03456c8a..1c6c05a8d 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 592a1a4f4..933918511 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index b5fe499dc..7c50c19c6 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index c87fee7e8..eaa73c607 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index f15cbab0b..9291431cd 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index e6ba41907..29355093a 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 89ed32641..b2e418d6c 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index fd332678c..41efb57dc 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 671d44f97..afd12a348 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index f545ac2b7..b351c3529 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index f18d4dfe8..3b3947f58 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 227677251..c97de8e1a 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index e0b37dd65..046e4fa37 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 6ca7cef2b..c173a1312 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index db2b494d6..edce5cb01 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index a1f92c1a5..1882580e8 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index b2fe0dbc3..a133dd15f 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 0f2c79e39..aba5806de 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/index.html b/user_guide/index.html index a44f1dedd..729dcdbab 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 21db0c2bd..93c140921 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 85c8aecf7..2f9fe9ced 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index b909325b5..070369227 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 05c822ec6..20a6d2b60 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 0858bb51c..fe0876e5e 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index e1ec42a14..8866f13bd 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 9a22fdcb4..b4d46c644 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 5e1553787..735f050db 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 3435c3ec2..64d3f6aba 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 93967322a..06b8e9a33 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 8c95a673e..cb06bfb0d 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 10b27381e..e9e67936f 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 9cc0e694a..322de06bc 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index 4f66419db..e450b4413 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index e3a8b20df..58ad35136 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index 23bd5e4e8..d093555cd 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 5f8eadfcf..9eb661389 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 89a924b62..a1e75beb8 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index a534125c7..71d952052 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index ed3b6ae90..4abb0f0fc 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index 44dc778e5..307a3a9f8 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 146d0226b..60d5054e4 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html index d25c35d78..c0ce31dc0 100644 --- a/user_guide/installation/upgrade_202.html +++ b/user_guide/installation/upgrade_202.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index c905da427..2a68fe8e9 100644 --- a/user_guide/installation/upgrade_203.html +++ b/user_guide/installation/upgrade_203.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_210.html b/user_guide/installation/upgrade_210.html index f4c13e88a..6c3b02590 100644 --- a/user_guide/installation/upgrade_210.html +++ b/user_guide/installation/upgrade_210.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_211.html b/user_guide/installation/upgrade_211.html index d08c899ee..6469fbb71 100644 --- a/user_guide/installation/upgrade_211.html +++ b/user_guide/installation/upgrade_211.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_212.html b/user_guide/installation/upgrade_212.html index a8ac41dc1..35fde109c 100644 --- a/user_guide/installation/upgrade_212.html +++ b/user_guide/installation/upgrade_212.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 3073ba9fd..022f381a2 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index d176b16ad..acf2a6244 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index 0b507079c..65aa33728 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 878fa1ac0..b8ddf624c 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 0868b8cba..103120453 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index feff652d6..91b726acb 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 1debd8ace..f407d809f 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 08641edfa..b2fb76961 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 4439d0e76..e34db2f87 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index fbabec956..be376e15b 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 4ab24a293..efb86dec3 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 59b0e6410..c8c2a24e0 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 595a1627a..26ed9c2c8 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index 4c7d6daf1..26ca52f9a 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index ea16bd459..2af1ae7ff 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 3f1b80492..a9ceee0f3 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/migration.html b/user_guide/libraries/migration.html index 783470468..721abfb35 100644 --- a/user_guide/libraries/migration.html +++ b/user_guide/libraries/migration.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 4dbac4d08..9f029929b 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 4b05fc63d..9df696658 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index d11806c51..63c9c84c6 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index fea12b1b5..2e6479a93 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 33a8a285b..be81a9ced 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index e98aa4ad6..ccef6c76d 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index c05914f4e..8f3da779a 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 2ed6c2299..21e636b0a 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 520fda43b..c8ef0fa2a 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 90adb6533..41980a879 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 02685efef..b59b9dcb5 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index ee0b452ec..9a866b1e7 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index e253fcd38..89f147942 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/license.html b/user_guide/license.html index 0864e989f..3f1c67538 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index ed9bd534f..98aa02d5c 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index ca8febad0..a74774dff 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 9ae562ad9..4a611f746 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index c5f680dfa..ecaabfcbe 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index af6ed35fe..a24e77080 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 18875d004..49e61126a 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 0f5e92a1f..46b68797b 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index f05df1d36..e0621c361 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/toc.html b/user_guide/toc.html index db353a283..9079dc84a 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -29,7 +29,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/tutorial/conclusion.html b/user_guide/tutorial/conclusion.html index 68daed771..8ad8fcbbe 100644 --- a/user_guide/tutorial/conclusion.html +++ b/user_guide/tutorial/conclusion.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/tutorial/create_news_items.html b/user_guide/tutorial/create_news_items.html index 8effe35ef..0d5fba3b5 100644 --- a/user_guide/tutorial/create_news_items.html +++ b/user_guide/tutorial/create_news_items.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/tutorial/hard_coded_pages.html b/user_guide/tutorial/hard_coded_pages.html index 77ad7f2dd..0e32567ad 100644 --- a/user_guide/tutorial/hard_coded_pages.html +++ b/user_guide/tutorial/hard_coded_pages.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/tutorial/index.html b/user_guide/tutorial/index.html index 5baf52c6b..f117e33c1 100644 --- a/user_guide/tutorial/index.html +++ b/user_guide/tutorial/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/tutorial/news_section.html b/user_guide/tutorial/news_section.html index db199848c..e07d4d4e7 100644 --- a/user_guide/tutorial/news_section.html +++ b/user_guide/tutorial/news_section.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        diff --git a/user_guide/tutorial/static_pages.html b/user_guide/tutorial/static_pages.html index be05436ef..15ed01dbc 100644 --- a/user_guide/tutorial/static_pages.html +++ b/user_guide/tutorial/static_pages.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version Location

        CodeIgniter User Guide Version 2.1.4

        -- cgit v1.2.3-24-g4f1b From 32cd82fc017195480a0d73acc19c7c64962153da Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 15 Sep 2013 23:17:46 +0200 Subject: Add default get_email to Duser_Driver This fixes a possible endless loop when the function is not implemented in the driver, but the array says it is. It also allows us to simply call it without checking if it's implemented. Signed-off-by: Florian Pritz --- application/libraries/Duser/Duser.php | 6 ++++-- application/models/muser.php | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/application/libraries/Duser/Duser.php b/application/libraries/Duser/Duser.php index 96d61e3cc..ecb0cd9c7 100644 --- a/application/libraries/Duser/Duser.php +++ b/application/libraries/Duser/Duser.php @@ -31,6 +31,10 @@ abstract class Duser_Driver extends CI_Driver { public function username_exists($username) { return false; } + + public function get_email($userid) { + return null; + } } class Duser extends CI_Driver_Library { @@ -98,8 +102,6 @@ class Duser extends CI_Driver_Library { public function get_email($userid) { - $this->require_implemented(__FUNCTION__); - return $this->{$this->_adapter}->get_email($userid); } } diff --git a/application/models/muser.php b/application/models/muser.php index 2dd7280e8..7a3627b18 100644 --- a/application/models/muser.php +++ b/application/models/muser.php @@ -142,10 +142,6 @@ class Muser extends CI_Model { function get_email($userid) { - if (!$this->duser->is_implemented("get_email")) { - return false; - } - return $this->duser->get_email($userid); } -- cgit v1.2.3-24-g4f1b From a301dbf1cbe6d001e3488c458fd0868ff0608888 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 16 Sep 2013 16:26:35 +0200 Subject: Duser_Driver/username_exists: return null if not implemented false means we know it doesn't exist, null means we don't know. Signed-off-by: Florian Pritz --- application/libraries/Duser/Duser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/libraries/Duser/Duser.php b/application/libraries/Duser/Duser.php index ecb0cd9c7..42d6b1d62 100644 --- a/application/libraries/Duser/Duser.php +++ b/application/libraries/Duser/Duser.php @@ -29,7 +29,7 @@ abstract class Duser_Driver extends CI_Driver { abstract public function login($username, $password); public function username_exists($username) { - return false; + return null; } public function get_email($userid) { -- cgit v1.2.3-24-g4f1b From 2172c2049fc8b8eca5dbed7b659a089e20d1fadd Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 16 Sep 2013 16:43:13 +0200 Subject: Duser: Add some comments Signed-off-by: Florian Pritz --- application/libraries/Duser/Duser.php | 10 ++++++++++ application/libraries/Duser/drivers/Duser_db.php | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/application/libraries/Duser/Duser.php b/application/libraries/Duser/Duser.php index 42d6b1d62..b615528f7 100644 --- a/application/libraries/Duser/Duser.php +++ b/application/libraries/Duser/Duser.php @@ -24,14 +24,24 @@ abstract class Duser_Driver extends CI_Driver { * - username string * - userid INT > 0 * + * @param username + * @param password * @return mixed array on success, false on failure */ abstract public function login($username, $password); + /* + * @param username + * @return boolean true is username exists, false otherwise + */ public function username_exists($username) { return null; } + /* + * @param userid + * @return string email address of the user + */ public function get_email($userid) { return null; } diff --git a/application/libraries/Duser/drivers/Duser_db.php b/application/libraries/Duser/drivers/Duser_db.php index 1258ec585..5252ec48e 100644 --- a/application/libraries/Duser/drivers/Duser_db.php +++ b/application/libraries/Duser/drivers/Duser_db.php @@ -9,6 +9,10 @@ class Duser_db extends Duser_Driver { + /* FIXME: If you use this driver as a template, remove can_reset_password + * and can_register_new_users. These features require the DB driver and + * will NOT work with other drivers. + */ public $optional_functions = array( 'username_exists', 'can_reset_password', -- cgit v1.2.3-24-g4f1b From bb9f9274e8c2d661a1adffd87c87c3d81ec47b4d Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 16 Sep 2013 16:49:58 +0200 Subject: Duser: Rework optional functions Not implemented functions return null and code using these no longer has to check if they are implemented, but it has to handle null properly. Signed-off-by: Florian Pritz --- application/libraries/Duser/Duser.php | 13 ++++--------- application/libraries/Duser/drivers/Duser_db.php | 2 -- application/views/user/profile.php | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/application/libraries/Duser/Duser.php b/application/libraries/Duser/Duser.php index b615528f7..38ee967c9 100644 --- a/application/libraries/Duser/Duser.php +++ b/application/libraries/Duser/Duser.php @@ -9,14 +9,11 @@ abstract class Duser_Driver extends CI_Driver { - // List of optional functions or function groups that are implemented + // List of optional functions that are implemented // - // Possible values are names of functions already implemented in this - // abstract class or the function groups listed below. - // - // Possible function groups are: - // - can_register_new_users - // - can_reset_password + // Possible values are: + // - can_register_new_users (only supported with the DB driver!) + // - can_reset_password (only supported with the DB driver!) public $optional_functions = array(); /* @@ -101,8 +98,6 @@ class Duser extends CI_Driver_Library { public function username_exists($username) { - $this->require_implemented(__FUNCTION__); - if ($username === false) { return false; } diff --git a/application/libraries/Duser/drivers/Duser_db.php b/application/libraries/Duser/drivers/Duser_db.php index 5252ec48e..0f4298258 100644 --- a/application/libraries/Duser/drivers/Duser_db.php +++ b/application/libraries/Duser/drivers/Duser_db.php @@ -14,10 +14,8 @@ class Duser_db extends Duser_Driver { * will NOT work with other drivers. */ public $optional_functions = array( - 'username_exists', 'can_reset_password', 'can_register_new_users', - 'get_email', ); public function login($username, $password) diff --git a/application/views/user/profile.php b/application/views/user/profile.php index bcd740612..1840f9fc1 100644 --- a/application/views/user/profile.php +++ b/application/views/user/profile.php @@ -7,7 +7,7 @@
        - +
        -- cgit v1.2.3-24-g4f1b From d1d83c9e97fc4542a0b8c19ddf27fef3a0beb46e Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 16 Sep 2013 21:22:52 +0200 Subject: Remove executable bits Signed-off-by: Florian Pritz --- application/.htaccess | 0 application/cache/.htaccess | 0 application/cache/index.html | 0 application/controllers/index.html | 0 application/core/index.html | 0 application/errors/error_404.php | 0 application/errors/error_db.php | 0 application/errors/error_general.php | 0 application/errors/error_php.php | 0 application/errors/index.html | 0 application/helpers/index.html | 0 application/hooks/index.html | 0 application/index.html | 0 application/language/english/index.html | 0 application/libraries/index.html | 0 application/logs/index.html | 0 application/models/index.html | 0 application/third_party/index.html | 0 application/views/index.html | 0 index.php | 0 system/.htaccess | 0 system/core/Benchmark.php | 0 system/core/CodeIgniter.php | 0 system/core/Common.php | 0 system/core/Config.php | 0 system/core/Controller.php | 0 system/core/Exceptions.php | 0 system/core/Hooks.php | 0 system/core/Input.php | 0 system/core/Lang.php | 0 system/core/Loader.php | 0 system/core/Model.php | 0 system/core/Output.php | 0 system/core/Router.php | 0 system/core/Security.php | 0 system/core/URI.php | 0 system/core/Utf8.php | 0 system/core/index.html | 0 system/database/DB.php | 0 system/database/DB_active_rec.php | 0 system/database/DB_cache.php | 0 system/database/DB_forge.php | 0 system/database/DB_result.php | 0 system/database/DB_utility.php | 0 system/database/drivers/index.html | 0 system/database/drivers/mssql/index.html | 0 system/database/drivers/mssql/mssql_driver.php | 0 system/database/drivers/mssql/mssql_forge.php | 0 system/database/drivers/mssql/mssql_result.php | 0 system/database/drivers/mssql/mssql_utility.php | 0 system/database/drivers/mysql/index.html | 0 system/database/drivers/mysql/mysql_driver.php | 0 system/database/drivers/mysql/mysql_forge.php | 0 system/database/drivers/mysql/mysql_result.php | 0 system/database/drivers/mysql/mysql_utility.php | 0 system/database/drivers/mysqli/index.html | 0 system/database/drivers/mysqli/mysqli_driver.php | 0 system/database/drivers/mysqli/mysqli_forge.php | 0 system/database/drivers/mysqli/mysqli_result.php | 0 system/database/drivers/mysqli/mysqli_utility.php | 0 system/database/drivers/oci8/index.html | 0 system/database/drivers/oci8/oci8_driver.php | 0 system/database/drivers/oci8/oci8_forge.php | 0 system/database/drivers/oci8/oci8_result.php | 0 system/database/drivers/oci8/oci8_utility.php | 0 system/database/drivers/odbc/index.html | 0 system/database/drivers/odbc/odbc_driver.php | 0 system/database/drivers/odbc/odbc_forge.php | 0 system/database/drivers/odbc/odbc_result.php | 0 system/database/drivers/odbc/odbc_utility.php | 0 system/database/drivers/postgre/index.html | 0 system/database/drivers/postgre/postgre_driver.php | 0 system/database/drivers/postgre/postgre_forge.php | 0 system/database/drivers/postgre/postgre_result.php | 0 system/database/drivers/postgre/postgre_utility.php | 0 system/database/drivers/sqlite/index.html | 0 system/database/drivers/sqlite/sqlite_driver.php | 0 system/database/drivers/sqlite/sqlite_forge.php | 0 system/database/drivers/sqlite/sqlite_result.php | 0 system/database/drivers/sqlite/sqlite_utility.php | 0 system/database/index.html | 0 system/fonts/index.html | 0 system/fonts/texb.ttf | Bin system/helpers/array_helper.php | 0 system/helpers/captcha_helper.php | 0 system/helpers/cookie_helper.php | 0 system/helpers/date_helper.php | 0 system/helpers/directory_helper.php | 0 system/helpers/download_helper.php | 0 system/helpers/email_helper.php | 0 system/helpers/file_helper.php | 0 system/helpers/form_helper.php | 0 system/helpers/html_helper.php | 0 system/helpers/index.html | 0 system/helpers/inflector_helper.php | 0 system/helpers/language_helper.php | 0 system/helpers/number_helper.php | 0 system/helpers/path_helper.php | 0 system/helpers/security_helper.php | 0 system/helpers/smiley_helper.php | 0 system/helpers/string_helper.php | 0 system/helpers/text_helper.php | 0 system/helpers/typography_helper.php | 0 system/helpers/url_helper.php | 0 system/helpers/xml_helper.php | 0 system/index.html | 0 system/language/english/calendar_lang.php | 0 system/language/english/date_lang.php | 0 system/language/english/db_lang.php | 0 system/language/english/email_lang.php | 0 system/language/english/form_validation_lang.php | 0 system/language/english/ftp_lang.php | 0 system/language/english/imglib_lang.php | 0 system/language/english/index.html | 0 system/language/english/number_lang.php | 0 system/language/english/profiler_lang.php | 0 system/language/english/unit_test_lang.php | 0 system/language/english/upload_lang.php | 0 system/language/index.html | 0 system/libraries/Cache/Cache.php | 0 system/libraries/Cache/drivers/Cache_apc.php | 0 system/libraries/Cache/drivers/Cache_dummy.php | 0 system/libraries/Cache/drivers/Cache_file.php | 0 system/libraries/Cache/drivers/Cache_memcached.php | 0 system/libraries/Calendar.php | 0 system/libraries/Cart.php | 0 system/libraries/Driver.php | 0 system/libraries/Email.php | 0 system/libraries/Encrypt.php | 0 system/libraries/Form_validation.php | 0 system/libraries/Ftp.php | 0 system/libraries/Image_lib.php | 0 system/libraries/Javascript.php | 0 system/libraries/Log.php | 0 system/libraries/Pagination.php | 0 system/libraries/Parser.php | 0 system/libraries/Profiler.php | 0 system/libraries/Session.php | 0 system/libraries/Sha1.php | 0 system/libraries/Table.php | 0 system/libraries/Trackback.php | 0 system/libraries/Typography.php | 0 system/libraries/Unit_test.php | 0 system/libraries/Upload.php | 0 system/libraries/User_agent.php | 0 system/libraries/Xmlrpc.php | 0 system/libraries/Xmlrpcs.php | 0 system/libraries/Zip.php | 0 system/libraries/index.html | 0 system/libraries/javascript/Jquery.php | 0 150 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 application/.htaccess mode change 100755 => 100644 application/cache/.htaccess mode change 100755 => 100644 application/cache/index.html mode change 100755 => 100644 application/controllers/index.html mode change 100755 => 100644 application/core/index.html mode change 100755 => 100644 application/errors/error_404.php mode change 100755 => 100644 application/errors/error_db.php mode change 100755 => 100644 application/errors/error_general.php mode change 100755 => 100644 application/errors/error_php.php mode change 100755 => 100644 application/errors/index.html mode change 100755 => 100644 application/helpers/index.html mode change 100755 => 100644 application/hooks/index.html mode change 100755 => 100644 application/index.html mode change 100755 => 100644 application/language/english/index.html mode change 100755 => 100644 application/libraries/index.html mode change 100755 => 100644 application/logs/index.html mode change 100755 => 100644 application/models/index.html mode change 100755 => 100644 application/third_party/index.html mode change 100755 => 100644 application/views/index.html mode change 100755 => 100644 index.php mode change 100755 => 100644 system/.htaccess mode change 100755 => 100644 system/core/Benchmark.php mode change 100755 => 100644 system/core/CodeIgniter.php mode change 100755 => 100644 system/core/Common.php mode change 100755 => 100644 system/core/Config.php mode change 100755 => 100644 system/core/Controller.php mode change 100755 => 100644 system/core/Exceptions.php mode change 100755 => 100644 system/core/Hooks.php mode change 100755 => 100644 system/core/Input.php mode change 100755 => 100644 system/core/Lang.php mode change 100755 => 100644 system/core/Loader.php mode change 100755 => 100644 system/core/Model.php mode change 100755 => 100644 system/core/Output.php mode change 100755 => 100644 system/core/Router.php mode change 100755 => 100644 system/core/Security.php mode change 100755 => 100644 system/core/URI.php mode change 100755 => 100644 system/core/Utf8.php mode change 100755 => 100644 system/core/index.html mode change 100755 => 100644 system/database/DB.php mode change 100755 => 100644 system/database/DB_active_rec.php mode change 100755 => 100644 system/database/DB_cache.php mode change 100755 => 100644 system/database/DB_forge.php mode change 100755 => 100644 system/database/DB_result.php mode change 100755 => 100644 system/database/DB_utility.php mode change 100755 => 100644 system/database/drivers/index.html mode change 100755 => 100644 system/database/drivers/mssql/index.html mode change 100755 => 100644 system/database/drivers/mssql/mssql_driver.php mode change 100755 => 100644 system/database/drivers/mssql/mssql_forge.php mode change 100755 => 100644 system/database/drivers/mssql/mssql_result.php mode change 100755 => 100644 system/database/drivers/mssql/mssql_utility.php mode change 100755 => 100644 system/database/drivers/mysql/index.html mode change 100755 => 100644 system/database/drivers/mysql/mysql_driver.php mode change 100755 => 100644 system/database/drivers/mysql/mysql_forge.php mode change 100755 => 100644 system/database/drivers/mysql/mysql_result.php mode change 100755 => 100644 system/database/drivers/mysql/mysql_utility.php mode change 100755 => 100644 system/database/drivers/mysqli/index.html mode change 100755 => 100644 system/database/drivers/mysqli/mysqli_driver.php mode change 100755 => 100644 system/database/drivers/mysqli/mysqli_forge.php mode change 100755 => 100644 system/database/drivers/mysqli/mysqli_result.php mode change 100755 => 100644 system/database/drivers/mysqli/mysqli_utility.php mode change 100755 => 100644 system/database/drivers/oci8/index.html mode change 100755 => 100644 system/database/drivers/oci8/oci8_driver.php mode change 100755 => 100644 system/database/drivers/oci8/oci8_forge.php mode change 100755 => 100644 system/database/drivers/oci8/oci8_result.php mode change 100755 => 100644 system/database/drivers/oci8/oci8_utility.php mode change 100755 => 100644 system/database/drivers/odbc/index.html mode change 100755 => 100644 system/database/drivers/odbc/odbc_driver.php mode change 100755 => 100644 system/database/drivers/odbc/odbc_forge.php mode change 100755 => 100644 system/database/drivers/odbc/odbc_result.php mode change 100755 => 100644 system/database/drivers/odbc/odbc_utility.php mode change 100755 => 100644 system/database/drivers/postgre/index.html mode change 100755 => 100644 system/database/drivers/postgre/postgre_driver.php mode change 100755 => 100644 system/database/drivers/postgre/postgre_forge.php mode change 100755 => 100644 system/database/drivers/postgre/postgre_result.php mode change 100755 => 100644 system/database/drivers/postgre/postgre_utility.php mode change 100755 => 100644 system/database/drivers/sqlite/index.html mode change 100755 => 100644 system/database/drivers/sqlite/sqlite_driver.php mode change 100755 => 100644 system/database/drivers/sqlite/sqlite_forge.php mode change 100755 => 100644 system/database/drivers/sqlite/sqlite_result.php mode change 100755 => 100644 system/database/drivers/sqlite/sqlite_utility.php mode change 100755 => 100644 system/database/index.html mode change 100755 => 100644 system/fonts/index.html mode change 100755 => 100644 system/fonts/texb.ttf mode change 100755 => 100644 system/helpers/array_helper.php mode change 100755 => 100644 system/helpers/captcha_helper.php mode change 100755 => 100644 system/helpers/cookie_helper.php mode change 100755 => 100644 system/helpers/date_helper.php mode change 100755 => 100644 system/helpers/directory_helper.php mode change 100755 => 100644 system/helpers/download_helper.php mode change 100755 => 100644 system/helpers/email_helper.php mode change 100755 => 100644 system/helpers/file_helper.php mode change 100755 => 100644 system/helpers/form_helper.php mode change 100755 => 100644 system/helpers/html_helper.php mode change 100755 => 100644 system/helpers/index.html mode change 100755 => 100644 system/helpers/inflector_helper.php mode change 100755 => 100644 system/helpers/language_helper.php mode change 100755 => 100644 system/helpers/number_helper.php mode change 100755 => 100644 system/helpers/path_helper.php mode change 100755 => 100644 system/helpers/security_helper.php mode change 100755 => 100644 system/helpers/smiley_helper.php mode change 100755 => 100644 system/helpers/string_helper.php mode change 100755 => 100644 system/helpers/text_helper.php mode change 100755 => 100644 system/helpers/typography_helper.php mode change 100755 => 100644 system/helpers/url_helper.php mode change 100755 => 100644 system/helpers/xml_helper.php mode change 100755 => 100644 system/index.html mode change 100755 => 100644 system/language/english/calendar_lang.php mode change 100755 => 100644 system/language/english/date_lang.php mode change 100755 => 100644 system/language/english/db_lang.php mode change 100755 => 100644 system/language/english/email_lang.php mode change 100755 => 100644 system/language/english/form_validation_lang.php mode change 100755 => 100644 system/language/english/ftp_lang.php mode change 100755 => 100644 system/language/english/imglib_lang.php mode change 100755 => 100644 system/language/english/index.html mode change 100755 => 100644 system/language/english/number_lang.php mode change 100755 => 100644 system/language/english/profiler_lang.php mode change 100755 => 100644 system/language/english/unit_test_lang.php mode change 100755 => 100644 system/language/english/upload_lang.php mode change 100755 => 100644 system/language/index.html mode change 100755 => 100644 system/libraries/Cache/Cache.php mode change 100755 => 100644 system/libraries/Cache/drivers/Cache_apc.php mode change 100755 => 100644 system/libraries/Cache/drivers/Cache_dummy.php mode change 100755 => 100644 system/libraries/Cache/drivers/Cache_file.php mode change 100755 => 100644 system/libraries/Cache/drivers/Cache_memcached.php mode change 100755 => 100644 system/libraries/Calendar.php mode change 100755 => 100644 system/libraries/Cart.php mode change 100755 => 100644 system/libraries/Driver.php mode change 100755 => 100644 system/libraries/Email.php mode change 100755 => 100644 system/libraries/Encrypt.php mode change 100755 => 100644 system/libraries/Form_validation.php mode change 100755 => 100644 system/libraries/Ftp.php mode change 100755 => 100644 system/libraries/Image_lib.php mode change 100755 => 100644 system/libraries/Javascript.php mode change 100755 => 100644 system/libraries/Log.php mode change 100755 => 100644 system/libraries/Pagination.php mode change 100755 => 100644 system/libraries/Parser.php mode change 100755 => 100644 system/libraries/Profiler.php mode change 100755 => 100644 system/libraries/Session.php mode change 100755 => 100644 system/libraries/Sha1.php mode change 100755 => 100644 system/libraries/Table.php mode change 100755 => 100644 system/libraries/Trackback.php mode change 100755 => 100644 system/libraries/Typography.php mode change 100755 => 100644 system/libraries/Unit_test.php mode change 100755 => 100644 system/libraries/Upload.php mode change 100755 => 100644 system/libraries/User_agent.php mode change 100755 => 100644 system/libraries/Xmlrpc.php mode change 100755 => 100644 system/libraries/Xmlrpcs.php mode change 100755 => 100644 system/libraries/Zip.php mode change 100755 => 100644 system/libraries/index.html mode change 100755 => 100644 system/libraries/javascript/Jquery.php diff --git a/application/.htaccess b/application/.htaccess old mode 100755 new mode 100644 diff --git a/application/cache/.htaccess b/application/cache/.htaccess old mode 100755 new mode 100644 diff --git a/application/cache/index.html b/application/cache/index.html old mode 100755 new mode 100644 diff --git a/application/controllers/index.html b/application/controllers/index.html old mode 100755 new mode 100644 diff --git a/application/core/index.html b/application/core/index.html old mode 100755 new mode 100644 diff --git a/application/errors/error_404.php b/application/errors/error_404.php old mode 100755 new mode 100644 diff --git a/application/errors/error_db.php b/application/errors/error_db.php old mode 100755 new mode 100644 diff --git a/application/errors/error_general.php b/application/errors/error_general.php old mode 100755 new mode 100644 diff --git a/application/errors/error_php.php b/application/errors/error_php.php old mode 100755 new mode 100644 diff --git a/application/errors/index.html b/application/errors/index.html old mode 100755 new mode 100644 diff --git a/application/helpers/index.html b/application/helpers/index.html old mode 100755 new mode 100644 diff --git a/application/hooks/index.html b/application/hooks/index.html old mode 100755 new mode 100644 diff --git a/application/index.html b/application/index.html old mode 100755 new mode 100644 diff --git a/application/language/english/index.html b/application/language/english/index.html old mode 100755 new mode 100644 diff --git a/application/libraries/index.html b/application/libraries/index.html old mode 100755 new mode 100644 diff --git a/application/logs/index.html b/application/logs/index.html old mode 100755 new mode 100644 diff --git a/application/models/index.html b/application/models/index.html old mode 100755 new mode 100644 diff --git a/application/third_party/index.html b/application/third_party/index.html old mode 100755 new mode 100644 diff --git a/application/views/index.html b/application/views/index.html old mode 100755 new mode 100644 diff --git a/index.php b/index.php old mode 100755 new mode 100644 diff --git a/system/.htaccess b/system/.htaccess old mode 100755 new mode 100644 diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php old mode 100755 new mode 100644 diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php old mode 100755 new mode 100644 diff --git a/system/core/Common.php b/system/core/Common.php old mode 100755 new mode 100644 diff --git a/system/core/Config.php b/system/core/Config.php old mode 100755 new mode 100644 diff --git a/system/core/Controller.php b/system/core/Controller.php old mode 100755 new mode 100644 diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php old mode 100755 new mode 100644 diff --git a/system/core/Hooks.php b/system/core/Hooks.php old mode 100755 new mode 100644 diff --git a/system/core/Input.php b/system/core/Input.php old mode 100755 new mode 100644 diff --git a/system/core/Lang.php b/system/core/Lang.php old mode 100755 new mode 100644 diff --git a/system/core/Loader.php b/system/core/Loader.php old mode 100755 new mode 100644 diff --git a/system/core/Model.php b/system/core/Model.php old mode 100755 new mode 100644 diff --git a/system/core/Output.php b/system/core/Output.php old mode 100755 new mode 100644 diff --git a/system/core/Router.php b/system/core/Router.php old mode 100755 new mode 100644 diff --git a/system/core/Security.php b/system/core/Security.php old mode 100755 new mode 100644 diff --git a/system/core/URI.php b/system/core/URI.php old mode 100755 new mode 100644 diff --git a/system/core/Utf8.php b/system/core/Utf8.php old mode 100755 new mode 100644 diff --git a/system/core/index.html b/system/core/index.html old mode 100755 new mode 100644 diff --git a/system/database/DB.php b/system/database/DB.php old mode 100755 new mode 100644 diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php old mode 100755 new mode 100644 diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php old mode 100755 new mode 100644 diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php old mode 100755 new mode 100644 diff --git a/system/database/DB_result.php b/system/database/DB_result.php old mode 100755 new mode 100644 diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/index.html b/system/database/drivers/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/index.html b/system/database/drivers/mssql/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/index.html b/system/database/drivers/mysql/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/index.html b/system/database/drivers/mysqli/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/index.html b/system/database/drivers/oci8/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/index.html b/system/database/drivers/odbc/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/index.html b/system/database/drivers/postgre/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/index.html b/system/database/drivers/sqlite/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php old mode 100755 new mode 100644 diff --git a/system/database/index.html b/system/database/index.html old mode 100755 new mode 100644 diff --git a/system/fonts/index.html b/system/fonts/index.html old mode 100755 new mode 100644 diff --git a/system/fonts/texb.ttf b/system/fonts/texb.ttf old mode 100755 new mode 100644 diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/email_helper.php b/system/helpers/email_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/index.html b/system/helpers/index.html old mode 100755 new mode 100644 diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/language_helper.php b/system/helpers/language_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/number_helper.php b/system/helpers/number_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php old mode 100755 new mode 100644 diff --git a/system/index.html b/system/index.html old mode 100755 new mode 100644 diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/index.html b/system/language/english/index.html old mode 100755 new mode 100644 diff --git a/system/language/english/number_lang.php b/system/language/english/number_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/unit_test_lang.php b/system/language/english/unit_test_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php old mode 100755 new mode 100644 diff --git a/system/language/index.html b/system/language/index.html old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/drivers/Cache_dummy.php b/system/libraries/Cache/drivers/Cache_dummy.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php old mode 100755 new mode 100644 diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php old mode 100755 new mode 100644 diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php old mode 100755 new mode 100644 diff --git a/system/libraries/Email.php b/system/libraries/Email.php old mode 100755 new mode 100644 diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php old mode 100755 new mode 100644 diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php old mode 100755 new mode 100644 diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php old mode 100755 new mode 100644 diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php old mode 100755 new mode 100644 diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php old mode 100755 new mode 100644 diff --git a/system/libraries/Log.php b/system/libraries/Log.php old mode 100755 new mode 100644 diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php old mode 100755 new mode 100644 diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php old mode 100755 new mode 100644 diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php old mode 100755 new mode 100644 diff --git a/system/libraries/Session.php b/system/libraries/Session.php old mode 100755 new mode 100644 diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php old mode 100755 new mode 100644 diff --git a/system/libraries/Table.php b/system/libraries/Table.php old mode 100755 new mode 100644 diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php old mode 100755 new mode 100644 diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php old mode 100755 new mode 100644 diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php old mode 100755 new mode 100644 diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php old mode 100755 new mode 100644 diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php old mode 100755 new mode 100644 diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php old mode 100755 new mode 100644 diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php old mode 100755 new mode 100644 diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php old mode 100755 new mode 100644 diff --git a/system/libraries/index.html b/system/libraries/index.html old mode 100755 new mode 100644 diff --git a/system/libraries/javascript/Jquery.php b/system/libraries/javascript/Jquery.php old mode 100755 new mode 100644 -- cgit v1.2.3-24-g4f1b From 2f374d188317a30ed51df9647ec1bdc0f36313de Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 22 Sep 2013 09:21:00 +0200 Subject: Add FluxBB authentication driver To enable set: $config['authentication_driver'] = 'fluxbb'; $config['auth_fluxbb'] = array('database' => 'fluxbb'); Signed-off-by: Pierre Schmitz Add example array to config.php Remove $optional_functions from Duser_fluxbb to follow bb9f9274e8c2d661a1adffd87c87c3d81ec47b4d. Signed-off-by: Florian Pritz --- application/config/config.php | 5 ++ application/libraries/Duser/Duser.php | 2 +- .../libraries/Duser/drivers/Duser_fluxbb.php | 53 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 application/libraries/Duser/drivers/Duser_fluxbb.php diff --git a/application/config/config.php b/application/config/config.php index 388776cda..5d6ea5d1f 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -408,6 +408,11 @@ if (extension_loaded("ldap")) { ); } +// This is only used it the driver is set to fluxbb +$config['auth_fluxbb'] = array( + 'database' => 'fluxbb' +); + // possible values: production, development $config['environment'] = "production"; diff --git a/application/libraries/Duser/Duser.php b/application/libraries/Duser/Duser.php index 38ee967c9..07a16190c 100644 --- a/application/libraries/Duser/Duser.php +++ b/application/libraries/Duser/Duser.php @@ -49,7 +49,7 @@ class Duser extends CI_Driver_Library { protected $_adapter = null; protected $valid_drivers = array( - 'duser_db', 'duser_ldap' + 'duser_db', 'duser_ldap', 'duser_fluxbb' ); function __construct() diff --git a/application/libraries/Duser/drivers/Duser_fluxbb.php b/application/libraries/Duser/drivers/Duser_fluxbb.php new file mode 100644 index 000000000..b32e2ac8e --- /dev/null +++ b/application/libraries/Duser/drivers/Duser_fluxbb.php @@ -0,0 +1,53 @@ + + * + * Licensed under AGPLv3 + * (see COPYING for full license text) + * + */ + +class Duser_fluxbb extends Duser_Driver { + + private $CI = null; + private $config = array(); + + function __construct() + { + $this->CI =& get_instance(); + $this->config = $this->CI->config->item('auth_fluxbb'); + } + + public function login($username, $password) + { + $query = $this->CI->db->query(' + SELECT username, id + FROM '.$this->config['database'].'.users + WHERE username LIKE ? AND password = ? + ', array($username, sha1($password)))->row_array(); + + if (!empty($query)) { + return array( + 'username' => $query['username'], + 'userid' => $query['id'] + ); + } else { + return false; + } + } + + public function username_exists($username) + { + $query = $this->CI->db->query(' + SELECT id + FROM '.$this->config['database'].'.users + WHERE username LIKE ? + ', array($username)); + + if ($query->num_rows() > 0) { + return true; + } else { + return false; + } + } +} -- cgit v1.2.3-24-g4f1b From 8956c3aec70ccc98ce2aa95249fc0d1c70809284 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 22 Sep 2013 09:36:59 +0200 Subject: Use InnoDB for the files table The files table was MyISAM even though all other tables were InnoDB. We should avoid mixing types here (backups, transactions and performance). Signed-off-by: Pierre Schmitz Signed-off-by: Florian Pritz --- application/config/migration.php | 2 +- application/migrations/010_files_innodb.php | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 application/migrations/010_files_innodb.php diff --git a/application/config/migration.php b/application/config/migration.php index 5fef0ad40..6cfd09a30 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = true; | be upgraded / downgraded to. | */ -$config['migration_version'] = 9; +$config['migration_version'] = 10; /* diff --git a/application/migrations/010_files_innodb.php b/application/migrations/010_files_innodb.php new file mode 100644 index 000000000..b32f94724 --- /dev/null +++ b/application/migrations/010_files_innodb.php @@ -0,0 +1,16 @@ +db->query(" + ALTER TABLE `files` ENGINE = InnoDB; + "); + } + + public function down() + { + } +} -- cgit v1.2.3-24-g4f1b From 6ec220c0c59868c86a40cc8373fdea32879f7cb5 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 22 Sep 2013 12:13:24 +0200 Subject: duser_fluxbb: Replace like with equals We don't use wildcards so we don't need like. Signed-off-by: Florian Pritz --- application/libraries/Duser/drivers/Duser_fluxbb.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/libraries/Duser/drivers/Duser_fluxbb.php b/application/libraries/Duser/drivers/Duser_fluxbb.php index b32e2ac8e..1790e830b 100644 --- a/application/libraries/Duser/drivers/Duser_fluxbb.php +++ b/application/libraries/Duser/drivers/Duser_fluxbb.php @@ -23,7 +23,7 @@ class Duser_fluxbb extends Duser_Driver { $query = $this->CI->db->query(' SELECT username, id FROM '.$this->config['database'].'.users - WHERE username LIKE ? AND password = ? + WHERE username = ? AND password = ? ', array($username, sha1($password)))->row_array(); if (!empty($query)) { @@ -41,7 +41,7 @@ class Duser_fluxbb extends Duser_Driver { $query = $this->CI->db->query(' SELECT id FROM '.$this->config['database'].'.users - WHERE username LIKE ? + WHERE username = ? ', array($username)); if ($query->num_rows() > 0) { -- cgit v1.2.3-24-g4f1b From 260da3941fafbe40877aa2ecb52169b460e0e644 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 22 Sep 2013 12:17:06 +0200 Subject: duser_db: Remove case sensitive username check Signed-off-by: Florian Pritz --- application/libraries/Duser/drivers/Duser_db.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/application/libraries/Duser/drivers/Duser_db.php b/application/libraries/Duser/drivers/Duser_db.php index 0f4298258..a58b5a298 100644 --- a/application/libraries/Duser/drivers/Duser_db.php +++ b/application/libraries/Duser/drivers/Duser_db.php @@ -28,11 +28,7 @@ class Duser_db extends Duser_Driver { WHERE `username` = ? ', array($username))->row_array(); - if (!isset($query["username"]) || $query["username"] !== $username) { - return false; - } - - if (!isset($query["password"])) { + if (empty($query)) { return false; } -- cgit v1.2.3-24-g4f1b From 3ec93bf546c4cfff82f1fb34eeae1f18319c59c1 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 22 Sep 2013 14:31:07 +0200 Subject: Add debugging support for email Signed-off-by: Florian Pritz --- application/views/footer.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application/views/footer.php b/application/views/footer.php index 0383e195e..a61e690cc 100644 --- a/application/views/footer.php +++ b/application/views/footer.php @@ -17,6 +17,13 @@ if (is_cli_client() && !isset($force_full_html)) {
      + +config->item("environment") == "development" && property_exists($CI, "email")) { + echo $CI->email->print_debugger(); +} +?> -- cgit v1.2.3-24-g4f1b From 36a1bb6770cb76ec7baf4e215c4379b070c60639 Mon Sep 17 00:00:00 2001 From: Markus Cisler Date: Thu, 5 Sep 2013 18:40:06 +0200 Subject: almost migrated to bootstrap3 --- application/views/file/file_info.php | 2 +- application/views/file/html_header.php | 34 +- application/views/file/nav_history.php | 2 +- application/views/file/upload_form.php | 26 +- application/views/footer.php | 2 +- application/views/header.php | 40 +- application/views/user/apikeys.php | 6 +- application/views/user/hash_password.php | 29 +- application/views/user/invite.php | 2 +- application/views/user/login.php | 14 +- application/views/user/nav.php | 8 +- application/views/user/profile.php | 46 +- application/views/user/register.php | 46 +- application/views/user/reset_password_form.php | 2 +- .../views/user/reset_password_username_form.php | 22 +- data/css/bootstrap-2.3.2.min.css | 874 --------------------- data/css/bootstrap-theme.min.css | 1 + data/css/bootstrap.min.css | 9 + data/css/style.css | 45 +- data/fonts/glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes data/fonts/glyphicons-halflings-regular.svg | 228 ++++++ data/fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes data/fonts/glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes data/js/bootstrap-2.3.2.min.js | 7 - data/js/bootstrap.min.js | 6 + 25 files changed, 442 insertions(+), 1009 deletions(-) delete mode 100644 data/css/bootstrap-2.3.2.min.css create mode 100644 data/css/bootstrap-theme.min.css create mode 100644 data/css/bootstrap.min.css create mode 100644 data/fonts/glyphicons-halflings-regular.eot create mode 100644 data/fonts/glyphicons-halflings-regular.svg create mode 100644 data/fonts/glyphicons-halflings-regular.ttf create mode 100644 data/fonts/glyphicons-halflings-regular.woff delete mode 100644 data/js/bootstrap-2.3.2.min.js create mode 100644 data/js/bootstrap.min.js diff --git a/application/views/file/file_info.php b/application/views/file/file_info.php index 82a3e4f81..dedc35fea 100644 --- a/application/views/file/file_info.php +++ b/application/views/file/file_info.php @@ -1,6 +1,6 @@
      - +
      diff --git a/application/views/file/html_header.php b/application/views/file/html_header.php index c40c35bca..fe9644744 100644 --- a/application/views/file/html_header.php +++ b/application/views/file/html_header.php @@ -12,30 +12,32 @@ include(FCPATH."application/views/header.php"); ?> -
      +
      +
      +
      -
      ID