diff options
| author | admin <devnull@localhost> | 2006-10-08 09:21:12 +0200 |
|---|---|---|
| committer | admin <devnull@localhost> | 2006-10-08 09:21:12 +0200 |
| commit | 10c3f41cbe5bd3bb66fd106cc9fb171ffcc7364b (patch) | |
| tree | 7477d21d33dd07221425685756561c3bbd386217 | |
| parent | 86d4e993d9ea21f28124b80f3d0c161aea681cb6 (diff) | |
112 files changed, 273 insertions, 298 deletions
diff --git a/system/application/config/database.php b/system/application/config/database.php index b03cb3ab3..de781646c 100644 --- a/system/application/config/database.php +++ b/system/application/config/database.php @@ -38,7 +38,7 @@ $db['default']['database'] = "test"; $db['default']['dbdriver'] = "mysql"; $db['default']['dbprefix'] = ""; $db['default']['active_r'] = TRUE; -$db['default']['pconnect'] = FALSE; +$db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = TRUE; $db['default']['cachedir'] = APPPATH.'db_cache/'; diff --git a/system/application/config/routes.php b/system/application/config/routes.php index 468ff0ab5..097037e31 100644 --- a/system/application/config/routes.php +++ b/system/application/config/routes.php @@ -40,9 +40,7 @@ */ $route['default_controller'] = "welcome"; -$route['scaffolding_trigger'] = ""; - -// Define your own routes below ------------------------------------------- +$route['scaffolding_trigger'] = "scaffolding"; diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 76b7b9e9c..1c8ad6be0 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -256,7 +256,7 @@ class CI_DB_result { * is used. When caching is enabled we do not load the other driver. * These functions are primarily here to prevent undefined function errors * when a cached result object is in use. They are not otherwise fully - * operational due to the unavailability of database resource IDs with + * operational due to the unavailability of the database resource IDs with * cached results. */ function num_rows() { return $this->num_rows; } diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php index 3cbbbfe6d..23a6bf791 100644 --- a/system/libraries/Calendar.php +++ b/system/libraries/Calendar.php @@ -48,6 +48,7 @@ class CI_Calendar { function CI_Calendar() { $this->CI =& get_instance(); + if ( ! in_array('calendar_lang'.EXT, $this->CI->lang->is_loaded, TRUE)) { $this->CI->lang->load('calendar'); @@ -56,7 +57,6 @@ class CI_Calendar { $this->local_time = time(); log_message('debug', "Calendar Class Initialized"); } - // END CI_Calendar() // -------------------------------------------------------------------- @@ -79,7 +79,6 @@ class CI_Calendar { } } } - // END initialize() // -------------------------------------------------------------------- @@ -241,7 +240,6 @@ class CI_Calendar { return $out; } - // END generate() // -------------------------------------------------------------------- @@ -275,7 +273,6 @@ class CI_Calendar { return $this->CI->lang->line($month); } - // END get_month_name() // -------------------------------------------------------------------- @@ -315,7 +312,6 @@ class CI_Calendar { return $days; } - // END get_day_names() // -------------------------------------------------------------------- @@ -357,7 +353,6 @@ class CI_Calendar { return $date; } - // END adjust_date() // -------------------------------------------------------------------- @@ -378,6 +373,7 @@ class CI_Calendar { return 0; } + // Is the year a leap year? if ($month == 2) { if ($year % 400 == 0 OR ($year % 4 == 0 AND $year % 100 != 0)) @@ -388,7 +384,6 @@ class CI_Calendar { return $days_in_month[$month - 1]; } - // END get_total_days() // -------------------------------------------------------------------- @@ -426,7 +421,6 @@ class CI_Calendar { 'table_close' => '</table>' ); } - // END default_template() // -------------------------------------------------------------------- @@ -465,7 +459,6 @@ class CI_Calendar { } } } - // END parse_template() } diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 2a1de6f37..50b3fab39 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -27,6 +27,7 @@ * @link http://www.codeigniter.com/user_guide/libraries/encryption.html */ class CI_Encrypt { + var $encryption_key = ''; var $_hash_type = 'sha1'; var $_mcrypt_exists = FALSE; @@ -246,10 +247,9 @@ class CI_Encrypt { */ function mcrypt_encode($data, $key) { - $this->_get_mcrypt(); - $init_size = mcrypt_get_iv_size($this->_mcrypt_cipher, $this->_mcrypt_mode); + $init_size = mcrypt_get_iv_size($this->_get_cipher(), $this->_get_mode()); $init_vect = mcrypt_create_iv($init_size, MCRYPT_RAND); - return mcrypt_encrypt($this->_mcrypt_cipher, $key, $data, $this->_mcrypt_mode, $init_vect); + return mcrypt_encrypt($this->_get_cipher(), $key, $data, $this->_get_mode(), $init_vect); } // -------------------------------------------------------------------- @@ -264,10 +264,9 @@ class CI_Encrypt { */ function mcrypt_decode($data, $key) { - $this->_get_mcrypt(); - $init_size = mcrypt_get_iv_size($this->_mcrypt_cipher, $this->_mcrypt_mode); + $init_size = mcrypt_get_iv_size($this->_get_cipher(), $this->_get_mode()); $init_vect = mcrypt_create_iv($init_size, MCRYPT_RAND); - return rtrim(mcrypt_decrypt($this->_mcrypt_cipher, $key, $data, $this->_mcrypt_mode, $init_vect), "\0"); + return rtrim(mcrypt_decrypt($this->_get_cipher(), $key, $data, $this->_get_mode(), $init_vect), "\0"); } // -------------------------------------------------------------------- @@ -301,22 +300,37 @@ class CI_Encrypt { // -------------------------------------------------------------------- /** - * Get Mcrypt value + * Get Mcrypt Cypher Value * * @access private - * @param string * @return string */ - function _get_mcrypt() + function _get_cypher() { if ($this->_mcrypt_cipher == '') { $this->_mcrypt_cipher = MCRYPT_RIJNDAEL_256; } + + return $this->_mcrypt_cipher; + } + + // -------------------------------------------------------------------- + + /** + * Get Mcrypt MOde Value + * + * @access private + * @return string + */ + function _get_mode() + { if ($this->_mcrypt_mode == '') { $this->_mcrypt_mode = MCRYPT_MODE_ECB; } + + return $this->_mcrypt_mode; } // -------------------------------------------------------------------- diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 79b2f9c1c..16583c063 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -148,6 +148,7 @@ class CI_Image_lib { $this->set_error('imglib_source_image_required'); return FALSE; } + /* * Is getimagesize() Available? * diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 98c2cbd55..0d3c87b49 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -179,6 +179,7 @@ class CI_Input { * * @access public * @param string + * @param bool * @return string */ function post($index = '', $xss_clean = FALSE) @@ -213,6 +214,7 @@ class CI_Input { * * @access public * @param string + * @param bool * @return string */ function cookie($index = '', $xss_clean = FALSE) @@ -244,6 +246,31 @@ class CI_Input { return $_COOKIE[$index]; } } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the SERVER array + * + * @access public + * @param string + * @param bool + * @return string + */ + function server($index = '', $xss_clean = FALSE) + { + if ( ! isset($_SERVER[$index])) + { + return FALSE; + } + + if ($xss_clean === TRUE) + { + return $this->xss_clean($_SERVER[$index]); + } + + return $_SERVER[$index]; + } // -------------------------------------------------------------------- @@ -259,15 +286,28 @@ class CI_Input { { return $this->ip_address; } - - $cip = (isset($_SERVER['HTTP_CLIENT_IP']) AND $_SERVER['HTTP_CLIENT_IP'] != "") ? $_SERVER['HTTP_CLIENT_IP'] : FALSE; - $rip = (isset($_SERVER['REMOTE_ADDR']) AND $_SERVER['REMOTE_ADDR'] != "") ? $_SERVER['REMOTE_ADDR'] : FALSE; - $fip = (isset($_SERVER['HTTP_X_FORWARDED_FOR']) AND $_SERVER['HTTP_X_FORWARDED_FOR'] != "") ? $_SERVER['HTTP_X_FORWARDED_FOR'] : FALSE; - - if ($cip && $rip) $this->ip_address = $cip; - elseif ($rip) $this->ip_address = $rip; - elseif ($cip) $this->ip_address = $cip; - elseif ($fip) $this->ip_address = $fip; + + if ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP')) + { + $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; + } + elseif ($this->server('REMOTE_ADDR')) + { + $this->ip_address = $_SERVER['REMOTE_ADDR']; + } + elseif ($this->server('HTTP_CLIENT_IP')) + { + $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; + } + elseif ($this->server('HTTP_X_FORWARDED_FOR')) + { + $this->ip_address = $_SERVER['HTTP_X_FORWARDED_FOR']; + } + + if ($this->ip_address === FALSE) + { + return $this->ip_address = '0.0.0.0'; + } if (strstr($this->ip_address, ',')) { @@ -279,11 +319,7 @@ class CI_Input { { $this->ip_address = '0.0.0.0'; } - - unset($cip); - unset($rip); - unset($fip); - + return $this->ip_address; } diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 90dc0f140..05ee93959 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -611,16 +611,7 @@ class CI_Loader { if (substr($class, 0, 3) == 'my_') { $class = preg_replace("/my_(.+)/", "\\1", $class); - $extend = TRUE; - } - else - { - $extend = FALSE; - } - - // Are we extending one of the base classes? - if ($extend == TRUE) - { + // Load the requested library from the main system/libraries folder if (file_exists(BASEPATH.'libraries/'.ucfirst($class).EXT)) { @@ -638,22 +629,20 @@ class CI_Loader { return $this->_ci_init_class($filename, 'MY_', $params); } - else - { - // Lets search for the requested library file and load it. - // For backward compatibility we'll test for filenames that are - // both uppercase and lower. - foreach (array(ucfirst($class), $class) as $filename) + + // Lets search for the requested library file and load it. + // For backward compatibility we'll test for filenames that are + // both uppercase and lower. + foreach (array(ucfirst($class), $class) as $filename) + { + for ($i = 1; $i < 3; $i++) { - for ($i = 1; $i < 3; $i++) + $path = ($i % 2) ? APPPATH : BASEPATH; + + if (file_exists($path.'libraries/'.$filename.EXT)) { - $path = ($i % 2) ? APPPATH : BASEPATH; - - if (file_exists($path.'libraries/'.$filename.EXT)) - { - include_once($path.'libraries/'.$filename.EXT); - return $this->_ci_init_class($filename, '', $params); - } + include_once($path.'libraries/'.$filename.EXT); + return $this->_ci_init_class($filename, '', $params); } } } @@ -686,7 +675,7 @@ class CI_Loader { if ($prefix == '') { - $name = ( ! class_exists($class)) ? 'CI_'.$class : $class; + $name = (class_exists('CI_'.$class)) ? 'CI_'.$class : $class; } else { @@ -756,24 +745,28 @@ class CI_Loader { // Load libraries if (isset($autoload['libraries']) AND count($autoload['libraries']) > 0) { + // Load the database driver. if (in_array('database', $autoload['libraries'])) { $this->database(); $autoload['libraries'] = array_diff($autoload['libraries'], array('database')); } + // Load the model class. if (in_array('model', $autoload['libraries'])) { $this->model(); $autoload['libraries'] = array_diff($autoload['libraries'], array('model')); } - + + // Load scaffolding if (in_array('scaffolding', $autoload['libraries'])) { $this->scaffolding(); $autoload['libraries'] = array_diff($autoload['libraries'], array('scaffolding')); } + // Load all other libraries foreach ($autoload['libraries'] as $item) { $this->library($item); diff --git a/system/libraries/Log.php b/system/libraries/Log.php index 392742584..eff7cb7fc 100644 --- a/system/libraries/Log.php +++ b/system/libraries/Log.php @@ -61,7 +61,6 @@ class CI_Log { $this->_date_fmt = $config['log_date_format']; } } - // END CI_Log() // -------------------------------------------------------------------- @@ -113,7 +112,7 @@ class CI_Log { @chmod($filepath, 0666); return TRUE; } - // END write_log() + } // END Log Class ?>
\ No newline at end of file diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index efbe6c27f..b29571eee 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -105,16 +105,21 @@ class CI_Pagination { { return ''; } - + // Calculate the total number of pages - $num_pages = intval($this->total_rows / $this->per_page); + $num_pages = ceil($this->total_rows / $this->per_page); + + /* + // Calculate the total number of pages + $num_pages = intval($this->total_rows / $this->per_page); + + // Use modulus to see if our division has a remainder. If so, add one to our page number. + if ($this->total_rows % $this->per_page) + { + $num_pages++; + } + */ - // Use modulus to see if our division has a remainder.If so, add one to our page number. - if ($this->total_rows % $this->per_page) - { - $num_pages++; - } - // Is there only one page? Hm... nothing more to do here then. if ($num_pages == 1) { diff --git a/system/libraries/Router.php b/system/libraries/Router.php index 7a4fd3899..27e3c27cc 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -66,7 +66,6 @@ class CI_Router { */ function _set_route_mapping() { - // Are query strings enabled in the config file? // If so, we're done since segment based URIs are not used with query strings. if ($this->config->item('enable_query_strings') === TRUE AND isset($_GET[$this->config->item('controller_trigger')])) @@ -120,8 +119,7 @@ class CI_Router { { $this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string); } - - + // Explode the URI Segments. The individual segments will // be stored in the $this->segments array. foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) diff --git a/system/libraries/Unit.php b/system/libraries/Unit.php index 6573f4269..439424fbb 100644 --- a/system/libraries/Unit.php +++ b/system/libraries/Unit.php @@ -55,7 +55,7 @@ class CI_Unit { function run($test, $expected = TRUE, $test_name = 'undefined') { if ($this->active == FALSE) - return; + return FALSE; if (in_array($expected, array('is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE)) { diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 13fa8acdf..5bb506cdb 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -248,20 +248,20 @@ class CI_Upload { function data() { return array ( - 'file_name' => $this->file_name, - 'file_type' => $this->file_type, - 'file_path' => $this->file_path, - 'full_path' => $this->file_path.$this->file_name, - 'raw_name' => str_replace($this->file_ext, '', $this->file_name), - 'orig_name' => $this->orig_name, - 'file_ext' => $this->file_ext, - 'file_size' => $this->file_size, - 'is_image' => $this->is_image(), - 'image_width' => $this->image_width, - 'image_height' => $this->image_height, - 'image_type' => $this->image_type, - 'image_size_str' => $this->image_size_str, - ); + 'file_name' => $this->file_name, + 'file_type' => $this->file_type, + 'file_path' => $this->file_path, + 'full_path' => $this->file_path.$this->file_name, + 'raw_name' => str_replace($this->file_ext, '', $this->file_name), + 'orig_name' => $this->orig_name, + 'file_ext' => $this->file_ext, + 'file_size' => $this->file_size, + 'is_image' => $this->is_image(), + 'image_width' => $this->image_width, + 'image_height' => $this->image_height, + 'image_type' => $this->image_type, + 'image_size_str' => $this->image_size_str, + ); } // -------------------------------------------------------------------- @@ -554,7 +554,7 @@ class CI_Upload { // -------------------------------------------------------------------- /** - * VAlidate Upload Path + * Validate Upload Path * * Verifies that it is a valid upload path with proper permissions. * diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php index 5322be0e9..07ca35a33 100644 --- a/system/libraries/Validation.php +++ b/system/libraries/Validation.php @@ -478,7 +478,21 @@ class CI_Validation { { return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $str)) ? FALSE : TRUE; } + + // -------------------------------------------------------------------- + /** + * Validate IP Address + * + * @access public + * @param string + * @return string + */ + function valid_ip($ip) + { + return ( ! preg_match( "/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ip)) ? FALSE : TRUE; + } + // -------------------------------------------------------------------- /** diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index 218388314..e13c713fe 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -41,7 +41,8 @@ class CI_Zip { { log_message('debug', "Zip Compression Class Initialized"); } - + + // -------------------------------------------------------------------- /** * Add Directory diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 32770ceb5..bbc0a4462 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index f78dc2f33..05c6b3304 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 532709cf9..6010d8b94 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index c1a66d39c..63fc67341 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 855fef559..40a3b8c9b 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 08051cadd..d9a2dcab3 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index f3ba357d5..f6e93a952 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 92273df1e..ed1855ce2 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 01f27d039..ccc8060c1 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 8575b2534..9ae382b45 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 607c9857c..d41088192 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 299e6dc3e..b7e80a373 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 318ff48a8..cf095ea85 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index f815039cb..68cf7ffb2 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 9a61396f9..e1bc5cc8d 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index f7c4a8697..ba65447d2 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 4f6f06e2d..a5480b919 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 931d7ab70..8ae889573 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 57f57af5c..49f8e58a8 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index a2da4a81c..53a674b47 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index b73bfb888..73bc4d60f 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 71f2c3428..02777b04e 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index d2ccb2aed..8eb6fae3c 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 7894a9d99..429812752 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 6501bff11..5511c2299 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/index.html b/user_guide/general/index.html index 196d57804..041171f1a 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 7bdd6d830..557a49efa 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 23f62fbed..5999af7fe 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html index c8290e6f4..8537658de 100644 --- a/user_guide/general/multiple_apps.html +++ b/user_guide/general/multiple_apps.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 9dab2e8ef..536c8481d 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 5ab568afb..176adf6dc 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
@@ -69,7 +69,7 @@ This information can be useful during development in order to help with debuggin <h2>Initializing the Class</h2>
-<p><strong>Important:</strong> This class does <kbd>NOT</kbd> need to be initialized. It is loaded automatically by the
+<p class="important"><strong>Important:</strong> This class does <kbd>NOT</kbd> need to be initialized. It is loaded automatically by the
<a href="../libraries/output.html">Output Class</a> if profiling is enabled as shown below.</p>
<h2>Enabling the Profiler</h2>
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 8790e4cf9..a00b46f7f 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 19df5448b..2c8d41bad 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 270fac2a3..44b1eb0b7 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
@@ -79,7 +79,7 @@ www.your-site.com/product/3/<br /> www.your-site.com/product/4/
</p>
-<p>Normally the second segment of the URL is reserved for the function name, but in the example above, it instead has a product ID.
+<p>Normally the second segment of the URL is reserved for the function name, but in the example above it instead has a product ID.
To overcome this, Code Igniter allows you to remap the URI handler.</p>
diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index b00b8c34a..7242cd391 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/security.html b/user_guide/general/security.html index c1062bddd..0e1d2a697 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 6984ddf5b..8f0be8878 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/general/views.html b/user_guide/general/views.html index a8256f6f9..09683c690 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index d1197348f..3a201732b 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 594fa52fa..f489d381a 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 420d891a6..d06f7da5c 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 92e2461d0..c87eff78b 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index f3f78dc5c..ff0a44d28 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index a59516bf4..69712c6d2 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index be61fe556..c1378f29f 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index e10a0ae3e..7e7a9dcda 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index e665b10f4..b48d3bf55 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 18d57a0b1..d4ed83394 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index bbd69f993..affdae3e8 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 75cd93076..bd9527bca 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index d4d625586..b470c71ba 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index e57ca6481..f61d599db 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 49855951e..cb12d9666 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/helpers/user_agent_helper.html b/user_guide/helpers/user_agent_helper.html deleted file mode 100644 index a93243fb7..000000000 --- a/user_guide/helpers/user_agent_helper.html +++ /dev/null @@ -1,100 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-
-<title>Code Igniter User Guide</title>
-
-<style type='text/css' media='all'>@import url('../userguide.css');</style>
-<link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
-
-<script type="text/javascript" src="../nav/nav.js"></script>
-<script type="text/javascript" src="../nav/prototype.lite.js"></script>
-<script type="text/javascript" src="../nav/moo.fx.js"></script>
-<script type="text/javascript">
-window.onload = function() {
- myHeight = new fx.Height('nav', {duration: 400});
- myHeight.hide();
-}
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv='expires' content='-1' />
-<meta http-equiv= 'pragma' content='no-cache' />
-<meta name='robots' content='all' />
-<meta name='author' content='Rick Ellis' />
-<meta name='description' content='Code Igniter User Guide' />
-
-</head>
-<body>
-
-<!-- START NAVIGATION -->
-<div id="nav"><div id="nav_inner"><script type="text/javascript">create_menu('../');</script></div></div>
-<div id="nav2"><a name="top"></a><a href="javascript:void(0);" onclick="myHeight.toggle();"><img src="../images/nav_toggle.jpg" width="153" height="44" border="0" title="Toggle Table of Contents" alt="Toggle Table of Contents" /></a></div>
-<div id="masthead">
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
-<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
-<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
-</tr>
-</table>
-</div>
-<!-- END NAVIGATION -->
-
-
-<!-- START BREADCRUMB -->
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
-<tr>
-<td id="breadcrumb">
-<a href="http://www.codeigniter.com/">Code Igniter Home</a> ›
-<a href="../index.html">User Guide Home</a> ›
-User Agent Helper
-</td>
-<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="www.codeigniter.com/user_guide/" />Search User Guide <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" /> <input type="submit" class="submit" name="sa" value="Go" /></form></td>
-</tr>
-</table>
-<!-- END BREADCRUMB -->
-
-<br clear="all" />
-
-
-<!-- START CONTENT -->
-<div id="content">
-
-
-<h1>User Agent Helper</h1>
-
-<p>The User Agent Helper file helps you work with browser generated data.</p>
-
-
-<h2>Loading this Helper</h2>
-
-<p>This helper is loaded using the following code:</p>
-<code>$this->load->helper('user_agent');</code>
-
-<p>The following functions are available:</p>
-
-<h2>get_OS()</h2>
-
-<p>Returns the operating system used by the person currently browing your site.</p>
-
-<code>
-echo get_OS();</code>
-
-
-</div>
-<!-- END CONTENT -->
-
-
-<div id="footer">
-<p>
-Previous Topic: <a href="typography_helper.html">Typography Helper</a>
- ·
-<a href="#top">Top of Page</a> ·
-<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="xml_helper.html">XML Helper</a>
-<p>
-<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 6c2de5035..d6b286a3c 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/index.html b/user_guide/index.html index 7be18b17c..bb399f242 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 32c538859..560369158 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index d40332a64..438a9b194 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 64ad288e7..66ae7b63e 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index ee026f3b4..25a4bbac4 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index c8a5b1cdb..4ae790d92 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index be7e158d4..78ce2543b 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index fc5a9fbb3..8add34b35 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 228976511..7f0c1832a 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 3418b726f..c8db04795 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 860787be7..a3d16fa71 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 846f62259..245ab6354 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index efa29cc2e..a05b25fe9 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
@@ -65,6 +65,7 @@ Upgrading from a Previous Version <p>Please read the upgrade notes corresponding to the version you are upgrading from.</p>
<ul>
+<li><a href="upgrade_150.html">Upgrading from 1.4.1 to 1.5.0</a></li>
<li><a href="upgrade_141.html">Upgrading from 1.4.0 to 1.4.1</a></li>
<li><a href="upgrade_140.html">Upgrading from 1.3.3 to 1.4.0</a></li>
<li><a href="upgrade_133.html">Upgrading from 1.3.2 to 1.3.3</a></li>
diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 8c1dc2c44..825b9dedf 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index c1db8d8af..cd3e66441 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index a6bab65ba..79921e8cc 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 43b19992b..20597c9e9 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index a8c047535..9be32cf4f 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
@@ -47,7 +47,7 @@ window.onload = function() { <td id="breadcrumb">
<a href="http://www.codeigniter.com/">Code Igniter Home</a> ›
<a href="../index.html">User Guide Home</a> ›
-Encrypt Class
+Encryption Class
</td>
<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="www.codeigniter.com/user_guide/" />Search User Guide <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" /> <input type="submit" class="submit" name="sa" value="Go" /></form></td>
</tr>
@@ -61,9 +61,9 @@ Encrypt Class <div id="content">
-<h1>Encrypt Class</h1>
+<h1>Encryption Class</h1>
-<p>The Encrypt Class provides two-way data encryption. It uses a scheme that pre-compiles
+<p>The Encryption Class provides two-way data encryption. It uses a scheme that pre-compiles
the message using a randomly hashed bitwise XOR encoding scheme, which is then encrypted using
the Mcrypt library. If Mcrypt is not available on your server the encoded message will
still provide a reasonable degree of security for encrypted sessions or other such "light" purposes.
@@ -105,7 +105,7 @@ for example, can only hold 4K of information.</p> <h2>Initializing the Class</h2>
-<p>Like most other classes in Code Igniter, the Encrypt class is initialized in your controller using the <dfn>$this->load->library</dfn> function:</p>
+<p>Like most other classes in Code Igniter, the Encryption class is initialized in your controller using the <dfn>$this->load->library</dfn> function:</p>
<code>$this->load->library('encrypt');</code>
<p>Once loaded, the Encrypt library object will be available using: <dfn>$this->encrypt</dfn></p>
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 4ff79c94e..9e7795796 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 01cf04b23..c33ec20ec 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 883c691a3..4e5ac3b7f 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
@@ -117,9 +117,9 @@ Note: This function should only be used to deal with data upon submission. It's -<h2>Using POST or COOKIE Data</h2>
+<h2>Using POST, COOKIE, or SERVER Data</h2>
-<p>Code Igniter comes with two helper functions that let you fetch POST or COOKIE items. The main advantage of using the provided
+<p>Code Igniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided
functions rather then fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and
return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first.
In other words, normally you might do something like this:
@@ -138,7 +138,13 @@ else<br /> <code>$something = $this->input->post('something');</code>
-<p>The two functions are:</p>
+<p>The three functions are:</p>
+
+<ul>
+<li>$this->input->post()</li>
+<li>$this->input->cookie()</li>
+<li>$this->input->server()</li>
+</ul>
<h2>$this->input->post()</h2>
@@ -158,6 +164,12 @@ else<br /> <code>$this->input->cookie('some_data', TRUE);</code>
+<h2>$this->input->server()</h2>
+
+<p>This function is identical to the above functions, only it fetches server data:</p>
+
+<code>$this->input->server('some_data');</code>
+
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index ba16d4de1..d26a998b0 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 3c1df7fc9..b8da7aaf2 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index ad6a53d8f..015e7ea8f 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 5efe95ba7..d8ac8cd92 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 6c9fc9efd..bf7b13518 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 5aa05c7ff..5a1216f6e 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index f01b3a57b..c2c9e815e 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 5e9cdd233..11a8fc26c 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 3b6b40f93..8d2f2ee31 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 8c033ee50..383567081 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
@@ -590,6 +590,15 @@ For example, your "username" error will be available at:<br /><dfn>$this->valida <td class="td"> </td>
</tr>
+<td class="td"><strong>valid_ip</strong></td>
+<td class="td">No</td>
+<td class="td">Returns FALSE if the supplied IP is not valid.</td>
+<td class="td"> </td>
+</tr>
+
+
+
+
</table>
<p><strong>Note:</strong> These rules can also be called as discreet functions. For example:</p>
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 4cad12661..f25e69795 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index da3715e84..6171ed1c8 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/license.html b/user_guide/license.html index e0875555b..8a046f4ad 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index ee00d965e..8d1955729 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -82,6 +82,7 @@ function create_menu(basepath) '<li><a href="'+base+'libraries/parser.html">Template Parser Class</a></li>' + '<li><a href="'+base+'libraries/unit_testing.html">Unit Testing Class</a></li>' + '<li><a href="'+base+'libraries/uri.html">URI Class</a></li>' + + '<li><a href="'+base+'libraries/user_agent.html">User Agent Class</a></li>' + '<li><a href="'+base+'libraries/validation.html">Validation Class</a></li>' + '<li><a href="'+base+'libraries/xmlrpc.html">XML-RPC Class</a></li>' + '<li><a href="'+base+'libraries/zip.html">Zip Encoding Class</a></li>' + @@ -105,7 +106,6 @@ function create_menu(basepath) '<li><a href="'+base+'helpers/text_helper.html">Text Helper</a></li>' + '<li><a href="'+base+'helpers/typography_helper.html">Typography Helper</a></li>' + '<li><a href="'+base+'helpers/url_helper.html">URL Helper</a></li>' + - '<li><a href="'+base+'helpers/user_agent_helper.html">User Agent Helper</a></li>' + '<li><a href="'+base+'helpers/xml_helper.html">XML Helper</a></li>' + '</ul>' + diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 2f0be9ec9..96ce4d149 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index ed1db6b2e..4ff54f395 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 5038aab2a..241b522b8 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 66db3418a..d20ed486e 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index e062c3a4b..ad14006c8 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index f6fe929be..e78e6a480 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -33,7 +33,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
<td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>
</tr>
</table>
diff --git a/user_guide/toc.html b/user_guide/toc.html index d479aa19a..88b3bd25e 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -34,7 +34,7 @@ window.onload = function() { <div id="masthead">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>
</tr>
</table>
</div>
@@ -136,6 +136,7 @@ Table of Contents <li><a href="./libraries/parser.html">Template Parser Class</a></li>
<li><a href="./libraries/unit_testing.html">Unit Testing Class</a></li>
<li><a href="./libraries/uri.html">URI Class</a></li>
+<li><a href="./libraries/user_agent.html">User Agent Class</a></li>
<li><a href="./libraries/validation.html">Validation Class</a></li>
<li><a href="./libraries/xmlrpc.html">XML-RPC Class</a></li>
</ul>
|