summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-10-21 21:44:22 +0200
committeradmin <devnull@localhost>2006-10-21 21:44:22 +0200
commite334c472fb4be44feec3a73402fc4a2b062cbfc0 (patch)
tree553f17d67e7ef652016ec85b2a576bb2210f0ff8 /user_guide
parentbd6bee75dd26ade1c8d9cfd104bb913065797c59 (diff)
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/changelog.html6
-rw-r--r--user_guide/database/active_record.html14
-rw-r--r--user_guide/database/caching.html24
-rw-r--r--user_guide/database/call_function.html8
-rw-r--r--user_guide/database/configuration.html28
-rw-r--r--user_guide/database/connecting.html12
-rw-r--r--user_guide/database/examples.html4
-rw-r--r--user_guide/database/fields.html6
-rw-r--r--user_guide/database/helpers.html2
-rw-r--r--user_guide/database/index.html2
-rw-r--r--user_guide/database/queries.html10
-rw-r--r--user_guide/database/results.html6
-rw-r--r--user_guide/database/table_data.html2
-rw-r--r--user_guide/database/transactions.html8
-rw-r--r--user_guide/database/utilities.html10
-rw-r--r--user_guide/general/alternative_php.html10
-rw-r--r--user_guide/general/ancillary_classes.html6
-rw-r--r--user_guide/general/autoloader.html2
-rw-r--r--user_guide/general/caching.html6
-rw-r--r--user_guide/general/changelog.html4
-rw-r--r--user_guide/general/controllers.html22
-rw-r--r--user_guide/general/core_classes.html6
-rw-r--r--user_guide/general/creating_libraries.html20
-rw-r--r--user_guide/general/credits.html4
-rw-r--r--user_guide/general/errors.html14
-rw-r--r--user_guide/general/helpers.html6
-rw-r--r--user_guide/general/hooks.html22
-rw-r--r--user_guide/general/index.html10
-rw-r--r--user_guide/general/libraries.html4
-rw-r--r--user_guide/general/models.html12
-rw-r--r--user_guide/general/multiple_apps.html2
-rw-r--r--user_guide/general/plugins.html8
-rw-r--r--user_guide/general/profiling.html2
-rw-r--r--user_guide/general/quick_reference.html2
-rw-r--r--user_guide/general/requirements.html2
-rw-r--r--user_guide/general/routing.html14
-rw-r--r--user_guide/general/scaffolding.html10
-rw-r--r--user_guide/general/security.html12
-rw-r--r--user_guide/general/urls.html10
-rw-r--r--user_guide/general/views.html8
-rw-r--r--user_guide/helpers/array_helper.html4
-rw-r--r--user_guide/helpers/cookie_helper.html6
-rw-r--r--user_guide/helpers/date_helper.html12
-rw-r--r--user_guide/helpers/directory_helper.html4
-rw-r--r--user_guide/helpers/download_helper.html4
-rw-r--r--user_guide/helpers/file_helper.html2
-rw-r--r--user_guide/helpers/form_helper.html14
-rw-r--r--user_guide/helpers/html_helper.html2
-rw-r--r--user_guide/helpers/index.html6
-rw-r--r--user_guide/helpers/inflector_helper.html2
-rw-r--r--user_guide/helpers/security_helper.html4
-rw-r--r--user_guide/helpers/string_helper.html4
-rw-r--r--user_guide/helpers/text_helper.html2
-rw-r--r--user_guide/helpers/typography_helper.html8
-rw-r--r--user_guide/helpers/url_helper.html10
-rw-r--r--user_guide/helpers/xml_helper.html2
-rw-r--r--user_guide/images/appflowchart.gifbin25276 -> 25273 bytes
-rw-r--r--user_guide/images/ci_logo.jpgbin5602 -> 5601 bytes
-rw-r--r--user_guide/images/ci_quick_ref.pngbin94476 -> 94906 bytes
-rw-r--r--user_guide/index.html12
-rw-r--r--user_guide/installation/downloads.html2
-rw-r--r--user_guide/installation/index.html4
-rw-r--r--user_guide/installation/troubleshooting.html6
-rw-r--r--user_guide/installation/upgrade_120.html2
-rw-r--r--user_guide/installation/upgrade_130.html10
-rw-r--r--user_guide/installation/upgrade_131.html4
-rw-r--r--user_guide/installation/upgrade_132.html4
-rw-r--r--user_guide/installation/upgrade_133.html6
-rw-r--r--user_guide/installation/upgrade_140.html6
-rw-r--r--user_guide/installation/upgrade_141.html8
-rw-r--r--user_guide/installation/upgrade_150.html10
-rw-r--r--user_guide/installation/upgrade_b11.html4
-rw-r--r--user_guide/installation/upgrading.html2
-rw-r--r--user_guide/libraries/benchmark.html12
-rw-r--r--user_guide/libraries/calendar.html8
-rw-r--r--user_guide/libraries/config.html6
-rw-r--r--user_guide/libraries/email.html4
-rw-r--r--user_guide/libraries/encryption.html16
-rw-r--r--user_guide/libraries/file_uploading.html16
-rw-r--r--user_guide/libraries/image_lib.html18
-rw-r--r--user_guide/libraries/input.html6
-rw-r--r--user_guide/libraries/language.html6
-rw-r--r--user_guide/libraries/loader.html22
-rw-r--r--user_guide/libraries/output.html6
-rw-r--r--user_guide/libraries/pagination.html6
-rw-r--r--user_guide/libraries/parser.html8
-rw-r--r--user_guide/libraries/sessions.html22
-rw-r--r--user_guide/libraries/table.html10
-rw-r--r--user_guide/libraries/trackback.html6
-rw-r--r--user_guide/libraries/unit_testing.html12
-rw-r--r--user_guide/libraries/uri.html6
-rw-r--r--user_guide/libraries/user_agent.html4
-rw-r--r--user_guide/libraries/validation.html26
-rw-r--r--user_guide/libraries/xmlrpc.html42
-rw-r--r--user_guide/libraries/zip.html6
-rw-r--r--user_guide/license.html4
-rwxr-xr-xuser_guide/nav/moo.fx.pack.js6
-rwxr-xr-xuser_guide/nav/prototype.lite.js112
-rw-r--r--user_guide/overview/appflow.html2
-rw-r--r--user_guide/overview/at_a_glance.html24
-rw-r--r--user_guide/overview/features.html4
-rw-r--r--user_guide/overview/goals.html4
-rw-r--r--user_guide/overview/index.html2
-rw-r--r--user_guide/overview/mvc.html10
-rw-r--r--user_guide/toc.html186
-rw-r--r--user_guide/userguide.css10
106 files changed, 579 insertions, 579 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 01acd0f41..cc1c28df7 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -67,7 +67,7 @@ Change Log
<p>Release Date: October 19, 2006</p>
<p class="important"><strong>Important:</strong>&nbsp; In Beta 3, the way native libraries are extended has changed slightly thanks to
-a suggestion offered by coolfactor in our forums. Please check the documentation below if you are extending classes.</p>
+a suggestion offered by coolfactor in our forums. Please check the documentation below if you are extending classes.</p>
<ul>
<li>Added <a href="./database/utilities.html">DB utility class</a>, permitting DB backups, CVS or XML files from DB results, and various other functions.</li>
@@ -168,7 +168,7 @@ a suggestion offered by coolfactor in our forums. Please check the documentatio
<li>Fixed a bug in which loading a language file was producing a "file contains no data" message.</li>
<li>Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.</li>
<li>Fixed some missing prefixes when using the database prefix feature.</li>
-<li>Fixed a typo in the Calendar class (cal_november).</li>
+<li>Fixed a typo in the Calendar class (cal_november).</li>
<li>Fixed a bug in the <dfn>form_checkbox()</dfn> helper.</li>
<li>Fixed a bug that was allowing the second segment of the URI to be identical to the class name.</li>
<li>Fixed an evaluation bug in the database initialization function.</li>
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index f30b3d8b6..b5c94a2cd 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -66,9 +66,9 @@ Active Record
<h1>Active Record Class</h1>
-<p>Code Igniter uses a modified version of the Active Record Database Pattern.
-This pattern allows information to be retrieved, inserted, and updated in your database with minimal scripting.
-In some cases only one or two lines of code are necessary to perform a database action.
+<p>Code Igniter uses a modified version of the Active Record Database Pattern.
+This pattern allows information to be retrieved, inserted, and updated in your database with minimal scripting.
+In some cases only one or two lines of code are necessary to perform a database action.
Code Igniter does not require that each database table be its own class file. It instead provides a more simplified interface.</p>
<p>Beyond simplicity, a major benefit to using the Active Record features is that it allows you to create database independent applications, since the query syntax
@@ -182,7 +182,7 @@ $query = $this->db->get();<br />
<p>Multiple function calls can be made if you need several joins in one query.</p>
-<p>If you need something other than a natural JOIN you can specify it via the third parameter of the function.
+<p>If you need something other than a natural JOIN you can specify it via the third parameter of the function.
Options are: left, right, outer, inner, left outer, and right outer.</p>
<code>
@@ -353,7 +353,7 @@ $this->db->orlike('body', $match);
<h2>$this->db->orderby();</h2>
-<p>Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by.
+<p>Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by.
The second parameter lets you set the direction of the result. Options are <kbd>asc</kbd> or <kbd>desc</kbd> or <kbd>RAND()</kbd></p>
<code>$this->db->orderby("title", "desc");
@@ -563,7 +563,7 @@ $this->db->delete('mytable', array('id' => $id));
// DELETE FROM mytable <br />
// WHERE id = $id</code>
-<p>The first parameter is the table name, the second is the where clause. You can also use the <dfn>where()</dfn> or <dfn>orwhere()</dfn> functions instead of passing
+<p>The first parameter is the table name, the second is the where clause. You can also use the <dfn>where()</dfn> or <dfn>orwhere()</dfn> functions instead of passing
the data to the second parameter of the function:
<code>
diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html
index 8a43268e9..ce5535c23 100644
--- a/user_guide/database/caching.html
+++ b/user_guide/database/caching.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -86,24 +86,24 @@ when caching is enabled. Do NOT load this class manually.<br /><br />
<h2>How Does Caching Work?</h2>
-<p>Code Igniter's query caching system happens dynamically when your pages are viewed.
+<p>Code Igniter's query caching system happens dynamically when your pages are viewed.
When caching is enabled, the first time a web page is loaded, the query result object will
be serialized and stored in a text file on your server. The next time the page is loaded the cache file will be used instead of
accessing your database. Your database usage can effectively be reduced to zero for any pages that have been cached.</p>
-<p>Only <dfn>read-type</dfn> (SELECT) queries can be cached, since these are the only type of queries that produce a result.
+<p>Only <dfn>read-type</dfn> (SELECT) queries can be cached, since these are the only type of queries that produce a result.
<dfn>Write-type</dfn> (INSERT, UPDATE, etc.) queries, since they don't generate a result, will not be cached by the system.</p>
-<p>Cache files DO NOT expire. Any queries that have been cached will remain cached until you delete them. The caching system
-permits you clear caches associated with individual pages, or you can delete the entire collection of cache files.
+<p>Cache files DO NOT expire. Any queries that have been cached will remain cached until you delete them. The caching system
+permits you clear caches associated with individual pages, or you can delete the entire collection of cache files.
Typically you'll to use the housekeeping functions described below to delete cache files after certain
events take place, like when you've added new information to your database.</p>
<h2>Will Caching Improve Your Site's Performance?</h2>
-<p>Getting a performance gain as a result of caching depends on many factors.
+<p>Getting a performance gain as a result of caching depends on many factors.
If you have a highly optimized database under very little load, you probably won't see a performance boost.
-If your database is under heavy use you probably will see an improved response, assuming your file-system is not
+If your database is under heavy use you probably will see an improved response, assuming your file-system is not
overly taxed. Remember that caching simply changes how your information is retrieved, shifting it from being a database
operation to a file-system one.</p>
@@ -113,24 +113,24 @@ single answer to the question of whether you should cache your database. It rea
<h2>How are Cache Files Stored?</h2>
-<p>Code Igniter places the result of EACH query into its own cache file. Sets of cache files are further organized into
+<p>Code Igniter places the result of EACH query into its own cache file. Sets of cache files are further organized into
sub-folders corresponding to your controller functions. To be precise, the sub-folders are named identically to the
first two segments of your URI (the controller class name and function name).</p>
<p>For example, let's say you have a controller called <dfn>blog</dfn> with a function called <dfn>comments</dfn> that
-contains three queries. The caching system will create a cache folder
+contains three queries. The caching system will create a cache folder
called <kbd>blog+comments</kbd>, into which it will write three cache files.</p>
<p>If you use dynamic queries that change based on information in your URI (when using pagination, for example), each instance of
-the query will produce its own cache file. It's possible, therefore, to end up with many times more cache files than you have
+the query will produce its own cache file. It's possible, therefore, to end up with many times more cache files than you have
queries.</p>
<h2>Managing your Cache Files</h2>
<p>Since cache files do not expire, you'll need to build deletion routines into your application. For example, let's say you have a blog
-that allows user commenting. Whenever a new comment is submitted you'll want to delete the cache files associated with the
-controller function that serves up your comments. You'll find two delete functions described below that help you
+that allows user commenting. Whenever a new comment is submitted you'll want to delete the cache files associated with the
+controller function that serves up your comments. You'll find two delete functions described below that help you
clear data.</p>
diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html
index 43bc9729c..a437b43aa 100644
--- a/user_guide/database/call_function.html
+++ b/user_guide/database/call_function.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -66,15 +66,15 @@ Custom Function Calls
<h2>$this->db->call_function();</h2>
-<p>This function enables you to call PHP database functions that are not natively included in Code Igniter, in a platform independent manner.
-For example, lets say you want to call the <dfn>mysql_get_client_info()</dfn> function, which is <strong>not</strong> natively supported
+<p>This function enables you to call PHP database functions that are not natively included in Code Igniter, in a platform independent manner.
+For example, lets say you want to call the <dfn>mysql_get_client_info()</dfn> function, which is <strong>not</strong> natively supported
by Code Igniter. You could do so like this:
</p>
<code>$this->db->call_function('<var>get_client_info</var>');</code>
<p>You must supply the name of the function, <strong>without</strong> the <var>mysql_</var> prefix, in the first parameter. The prefix is added
-automatically based on which database driver is currently being used. This permits you to run the same function on different database platforms.
+automatically based on which database driver is currently being used. This permits you to run the same function on different database platforms.
Obviously not all function calls are identical between platforms, so there are limits to how useful this function can be in terms of portability.</p>
<p>Any parameters needed by the function you are calling will be added to the second parameter.</p>
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html
index ea287d770..830f81883 100644
--- a/user_guide/database/configuration.html
+++ b/user_guide/database/configuration.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -65,7 +65,7 @@ Configuration
<h1>Database Configuration</h1>
-<p>Code Igniter has a config file that lets you store your database connection values (username, password, database name, etc.).
+<p>Code Igniter has a config file that lets you store your database connection values (username, password, database name, etc.).
The config file is located at:
<p><kbd>application/config/database.php</kbd></p>
@@ -82,8 +82,8 @@ $db['default']['pconnect'] = TRUE;<br />
$db['default']['db_debug'] = FALSE;<br />
$db['default']['active_r'] = TRUE;</code>
-<p>The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store
-multiple sets of connection values. If, for example, you run multiple environments (development, production, test, etc.)
+<p>The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store
+multiple sets of connection values. If, for example, you run multiple environments (development, production, test, etc.)
under a single installation, you can set up a connection group for each, then switch between groups as needed.
For example, to set up a "test" environment you would do this:</p>
@@ -97,7 +97,7 @@ $db['test']['pconnect'] = TRUE;<br />
$db['test']['db_debug'] = FALSE;<br />
$db['test']['active_r'] = TRUE;</code>
-
+
<p>Then, to globally tell the system to use that group you would set this variable located in the config file:</p>
<code>$active_group = "test";</code>
@@ -108,15 +108,15 @@ for the primary connection, but it too can be renamed to something more relevant
<h3>Explanation of Values:</h3>
<ul>
-<li><strong>hostname</strong> - The hostname of your database server. Often this is "localhost".</li>
-<li><strong>username</strong> - The username used to connect to the database.</li>
-<li><strong>password</strong> - The password used to connect to the database.</li>
-<li><strong>database</strong> - The name of the database you want to connect to.</li>
-<li><strong>dbdriver</strong> - The database type. ie: mysql, postgre, obdc, etc. Must be specified in lower case.</li>
-<li><strong>dbprefix</strong> - An optional table prefix which will added to the table name when running <a href="active_record.html">Active Record</a> queries. This permits multiple Code Igniter installations to share one database.</li>
-<li><strong>pconnect</strong> - TRUE/FALSE (boolean) - Whether to use a persistent connection.</li>
-<li><strong>db_debug</strong> - TRUE/FALSE (boolean) - Whether database errors should be displayed.</li>
-<li><strong>active_r</strong> - TRUE/FALSE (boolean) - Whether to load the <a href="active_record.html">Active Record Class</a>. If you are not using the active record class you can have it omitted when the database classes are initialized in order to utilize less resources.</li>
+<li><strong>hostname</strong> - The hostname of your database server. Often this is "localhost".</li>
+<li><strong>username</strong> - The username used to connect to the database.</li>
+<li><strong>password</strong> - The password used to connect to the database.</li>
+<li><strong>database</strong> - The name of the database you want to connect to.</li>
+<li><strong>dbdriver</strong> - The database type. ie: mysql, postgre, obdc, etc. Must be specified in lower case.</li>
+<li><strong>dbprefix</strong> - An optional table prefix which will added to the table name when running <a href="active_record.html">Active Record</a> queries. This permits multiple Code Igniter installations to share one database.</li>
+<li><strong>pconnect</strong> - TRUE/FALSE (boolean) - Whether to use a persistent connection.</li>
+<li><strong>db_debug</strong> - TRUE/FALSE (boolean) - Whether database errors should be displayed.</li>
+<li><strong>active_r</strong> - TRUE/FALSE (boolean) - Whether to load the <a href="active_record.html">Active Record Class</a>. If you are not using the active record class you can have it omitted when the database classes are initialized in order to utilize less resources.</li>
<li><strong>port</strong> - The database port number. Currently only used with the Postgre driver.</li>
</ul>
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html
index c057f69fe..ced947941 100644
--- a/user_guide/database/connecting.html
+++ b/user_guide/database/connecting.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -69,20 +69,20 @@ Connecting
<h2>Automatically Connecting</h2>
-<p>The "auto connect" feature will load and instantiate the database class with every page load.
+<p>The "auto connect" feature will load and instantiate the database class with every page load.
To enable "auto connecting", add the word <var>database</var> to the core array, as indicated in the following file:</p>
<p><kbd>application/config/autoload.php</kbd></p>
<h2>Manually Connecting</h2>
-<p>If only some of your pages require database connectivity you can manually connect to your database by adding this
-line of code in any function where it is needed, or in your class constructor to make the database
+<p>If only some of your pages require database connectivity you can manually connect to your database by adding this
+line of code in any function where it is needed, or in your class constructor to make the database
available globally in that class.</p>
<code>$this->load->database();</code>
-<p class="important">If the above function does <strong>not</strong> contain any information in the first parameter it will connect
+<p class="important">If the above function does <strong>not</strong> contain any information in the first parameter it will connect
to the group specified in your database config file. For most people, this is the preferred method of use.</p>
@@ -133,7 +133,7 @@ $this->load->database('<samp>$dsn</samp>');</code>
$DB2 = $this->load->database('group_two', TRUE);
</code>
-<p>Note: Change the words "group_one" and "group_two" to the specific group names you are connecting to (or
+<p>Note: Change the words "group_one" and "group_two" to the specific group names you are connecting to (or
you can pass the connection values as indicated above).</p>
<p>By setting the second parameter to TRUE (boolean) the function will return the database object.</p>
diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html
index 8916b5ee9..79631042a 100644
--- a/user_guide/database/examples.html
+++ b/user_guide/database/examples.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -182,7 +182,7 @@ foreach ($query->result() as $row)<br />
&nbsp;&nbsp;&nbsp;&nbsp;echo $row->title;<br />
}</code>
-<p>The above <dfn>get()</dfn> function retrieves all the results from the supplied table.
+<p>The above <dfn>get()</dfn> function retrieves all the results from the supplied table.
The <a href="active_record.html">Active Record</a> class contains a full compliment of functions
for working with data.</p>
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html
index 1ae1a392b..8f206638f 100644
--- a/user_guide/database/fields.html
+++ b/user_guide/database/fields.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -80,7 +80,7 @@ foreach ($fields as $field)<br />
}
</code>
-<p>2. You can gather the field names associated with any query you run by calling the function
+<p>2. You can gather the field names associated with any query you run by calling the function
from your query result object:</p>
<code>
@@ -106,7 +106,7 @@ if ($this->db->field_exists('field_name', 'table_name'))<br />
}
</code>
-<p>Note: Replace <em>field_name</em> with the name of the column you are looking for, and replace
+<p>Note: Replace <em>field_name</em> with the name of the column you are looking for, and replace
<em>table_name</em> with the name of the table you are looking for.</p>
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html
index 102794b25..19fe47998 100644
--- a/user_guide/database/helpers.html
+++ b/user_guide/database/helpers.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/database/index.html b/user_guide/database/index.html
index 4f3876ec5..f83aab22b 100644
--- a/user_guide/database/index.html
+++ b/user_guide/database/index.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html
index a13e2d6a5..e558e3d8b 100644
--- a/user_guide/database/queries.html
+++ b/user_guide/database/queries.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -81,24 +81,24 @@ depending on success or failure. When retrieving data you will typically assign
<h2>$this->db->simple_query();</h2>
<p>This is a simplified version of the <dfn>$this->db->query()</dfn> function. It ONLY returns TRUE/FALSE on success or failure.
-It DOES NOT return a database result set, nor does it set the query timer, or compile bind data, or store your query for debugging.
+It DOES NOT return a database result set, nor does it set the query timer, or compile bind data, or store your query for debugging.
It simply lets you submit a query. Most users will rarely use this function.</p>
<h1>Escaping Queries</h1>
-<p>It's a very good security practice to escape your data before submitting it into your database.
+<p>It's a very good security practice to escape your data before submitting it into your database.
Code Igniter has two functions that help you do this:</p>
<ol>
</li>
-<li><strong>$this->db->escape()</strong> This function determines the data type so that it
+<li><strong>$this->db->escape()</strong> This function determines the data type so that it
can escape only string data. It also automatically adds single quotes around the data so you don't have to:
<code>$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";</code>
-<li><strong>$this->db->escape_str()</strong> This function escapes the data passed to it, regardless of type.
+<li><strong>$this->db->escape_str()</strong> This function escapes the data passed to it, regardless of type.
Most of the time you'll use the above function rather then this one. Use the function like this:
<code>$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";</code>
diff --git a/user_guide/database/results.html b/user_guide/database/results.html
index a301bc3f9..bae8a75c7 100644
--- a/user_guide/database/results.html
+++ b/user_guide/database/results.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -119,7 +119,7 @@ Query Results
<h2>row()</h2>
- <p>This function returns a single result row. If your query has more than one row, it returns only the first row.
+ <p>This function returns a single result row. If your query has more than one row, it returns only the first row.
The result is returned as an <strong>object</strong>. Here's a usage example:</p>
<code>
$query = $this->db->query("YOUR QUERY");<br />
@@ -161,7 +161,7 @@ Query Results
<code>$row = $query->row_array(<dfn>5</dfn>);</code>
-
+
<p>In addition, you can walk forward/backwards/first/last through your results using these variations:</p>
<p>
diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html
index 511cc7810..681193366 100644
--- a/user_guide/database/table_data.html
+++ b/user_guide/database/table_data.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html
index ef1f1a6e6..4677ed6ff 100644
--- a/user_guide/database/transactions.html
+++ b/user_guide/database/transactions.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -69,8 +69,8 @@ Transactions
<p>Code Igniter's database abstraction allows you to use <dfn>transactions</dfn> with databases that support transaction-safe table types. In MySQL, you'll need
to be running InnoDB or BDB table types rather then the more common MyISAM. Most other database platforms support transactions natively.</p>
-<p>If you are not familiar with
-transactions we recommend you find a good online resource to learn about them for your particular database. The information below assumes you
+<p>If you are not familiar with
+transactions we recommend you find a good online resource to learn about them for your particular database. The information below assumes you
have a basic understanding of transactions.
</p>
@@ -80,7 +80,7 @@ have a basic understanding of transactions.
because it greatly simplifies the process of running transactions. In most cases all that is required are two lines of code.</p>
<p>Traditionally, transactions have required a fair amount of work to implement since they demand that you to keep track of your queries
-and determine whether to <dfn>commit</dfn> or <dfn>rollback</dfn> based on the success or failure of your queries. This is particularly cumbersome with
+and determine whether to <dfn>commit</dfn> or <dfn>rollback</dfn> based on the success or failure of your queries. This is particularly cumbersome with
nested queries. In contrast,
we've implemented a smart transaction system that does all this for you automatically (you can also manage your transactions manually if you choose to,
but there's really no benefit).</p>
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index f1692808f..cbc791537 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -193,7 +193,7 @@ if ($result !== FALSE)<br />
<a name="csv"></a>
<h2>$this->dbutil->csv_from_result($db_result)</h2>
-<p>Permits you to generate a CSV file from a query result. The first parameter of the function must contain the result object from your query.
+<p>Permits you to generate a CSV file from a query result. The first parameter of the function must contain the result object from your query.
Example:</p>
<code>
@@ -204,7 +204,7 @@ $query = $this->db->query("SELECT * FROM mytable");<br />
echo $this->dbutil->csv_from_result($query);
</code>
-<p>The second and third parameters allows you to
+<p>The second and third parameters allows you to
set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example:
<code>
@@ -221,7 +221,7 @@ If you need to write the file use the <a href="../helpers/file_helper.html">File
<a name="xml"></a>
<h2>$this->dbutil->xml_from_result($db_result)</h2>
-<p>Permits you to generate an XML file from a query result. The first parameter expects a query result object, the second
+<p>Permits you to generate an XML file from a query result. The first parameter expects a query result object, the second
may contain an optional array of config parameters. Example:</p>
<code>
@@ -251,7 +251,7 @@ If you need to write the file use the <a href="../helpers/file_helper.html">File
<p class="important"><strong>Note:</strong>&nbsp; This features is only available for MySQL/MySQLi databases.</p>
<p>Note: Due to the limited execution time and memory available to PHP, backing up very large
-databases may not be possible. If your database is very large you might need to backup directly from your SQL server
+databases may not be possible. If your database is very large you might need to backup directly from your SQL server
via the command line, or have your server admin do it for you if you do not have root privileges.</p>
<h3>Usage Example</h3>
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html
index a06a208ee..2e2e562e9 100644
--- a/user_guide/general/alternative_php.html
+++ b/user_guide/general/alternative_php.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,8 +62,8 @@ Alternate PHP Syntax
<h1>Alternate PHP Syntax for View Files</h1>
-<p>If you do not utilize Code Igniter's <a href="../libraries/parser.html">template engine</a>, you'll be using pure PHP
-in your View files. To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use PHPs alternative
+<p>If you do not utilize Code Igniter's <a href="../libraries/parser.html">template engine</a>, you'll be using pure PHP
+in your View files. To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use PHPs alternative
syntax for control structures and echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code,
and eliminate "echo" statements.</p>
@@ -83,7 +83,7 @@ be that "short tags" are disabled in your PHP ini file.</p>
<h2>Alternative Control Structures</h2>
-<p>Controls structures, like <var>if</var>, <var>for</var>, <var>foreach</var>, and <var>while</var> can be
+<p>Controls structures, like <var>if</var>, <var>for</var>, <var>foreach</var>, and <var>while</var> can be
written in a simplified format as well. Here is an example using foreach:</p>
<code>
@@ -101,7 +101,7 @@ written in a simplified format as well. Here is an example using foreach:</p>
Each of the control structures listed above has a similar closing syntax:
<var>endif</var>, <var>endfor</var>, <var>endforeach</var>, and <var>endwhile</var></p>
-<p>Also notice that instead of using a semicolon after each structure (except the last one), there is a colon. This is
+<p>Also notice that instead of using a semicolon after each structure (except the last one), there is a colon. This is
important!</p>
<p>Here is another example, using if/elseif/else. Notice the colons:</p>
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html
index f04556dea..71d88f3b9 100644
--- a/user_guide/general/ancillary_classes.html
+++ b/user_guide/general/ancillary_classes.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,7 +62,7 @@ Creating Ancillary Classes
<h1>Creating Ancillary Classes</h1>
-<p>In some cases you may want to develop classes that exist apart from your controllers but have the ability to
+<p>In some cases you may want to develop classes that exist apart from your controllers but have the ability to
utilize all of Code Igniter's resources. This is easily possible as you'll see.</p>
<h2>get_instance()</h2>
@@ -80,7 +80,7 @@ This function returns the main Code Igniter object.</p>
etc.
</code>
-<p><kbd>$this</kbd>, however, only works within your controllers, your models, or your views.
+<p><kbd>$this</kbd>, however, only works within your controllers, your models, or your views.
If you would like to use Code Igniter's classes from within your own custom classes you can do so as follows:</p>
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
index 36893e916..bbb839dd7 100644
--- a/user_guide/general/autoloader.html
+++ b/user_guide/general/autoloader.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html
index 6b4c3d1a5..1e3a6bcad 100644
--- a/user_guide/general/caching.html
+++ b/user_guide/general/caching.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -66,7 +66,7 @@ Page Caching
<p>Code Igniter lets you cache your pages in order to achieve maximum performance.
Although Code Igniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the
-server resources, memory, and processing cycles utilized, which affect your page load speeds.
+server resources, memory, and processing cycles utilized, which affect your page load speeds.
By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.
@@ -94,7 +94,7 @@ most logical to you. Once the tag is in place, your pages will begin being cache
<h2>Deleting Caches</h2>
-<p>If you no longer wish to cache a file you can remove the caching tag and it will not longer be refreshed when it expires. Note:
+<p>If you no longer wish to cache a file you can remove the caching tag and it will not longer be refreshed when it expires. Note:
Removing the tag will not delete the cache immediately. It will have to expire normally. If you need to remove it earlier you
will need to manually delete it from your cache folder.</p>
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 7b2617917..44412b960 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -163,7 +163,7 @@ Change Log
<li>Fixed a bug in which loading a language file was producing a "file contains no data" message.</li>
<li>Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.</li>
<li>Fixed some missing prefixes when using the database prefix feature.</li>
-<li>Fixed a typo in the Calendar class (cal_november).</li>
+<li>Fixed a typo in the Calendar class (cal_november).</li>
<li>Fixed a bug in the <dfn>form_checkbox()</dfn> helper.</li>
<li>Fixed a bug that was allowing the second segment of the URI to be identical to the class name.</li>
<li>Fixed an evaluation bug in the database initialization function.</li>
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index f83cab89f..fd6a4bdf0 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -137,14 +137,14 @@ class <var>blog</var> extends Controller {<br />
}<br />
?&gt;</code>
-<p>Also, always make sure your controller <dfn>extends</dfn> the parent controller class so that it can inherit all its functions.</p>
+<p>Also, always make sure your controller <dfn>extends</dfn> the parent controller class so that it can inherit all its functions.</p>
<a name="functions"></a>
<h2>Functions</h2>
-<p>In the above example the function name is <dfn>index()</dfn>. The "index" function is always loaded by default if the
+<p>In the above example the function name is <dfn>index()</dfn>. The "index" function is always loaded by default if the
<strong>second segment</strong> of the URI is empty. Another way to show your "Hello World" message would be this:</p>
<code>www.your-site.com/index.php/<var>blog</var>/<samp>index</samp>/</code>
@@ -208,8 +208,8 @@ passed to your function will be the re-routed ones.</p>
<a name="default"></a>
<h2>Defining a Default Controller</h2>
-<p>Code Igniter can be told to load a default controller when a URI is not present,
-as will be the case when only your site root URL is requested. To specify a default controller, open
+<p>Code Igniter can be told to load a default controller when a URI is not present,
+as will be the case when only your site root URL is requested. To specify a default controller, open
your <dfn>application/config/routes.php</dfn> file and set this variable:</p>
<code>$route['default_controller'] = '<var>Blog</var>';</code>
@@ -230,8 +230,8 @@ Code Igniter permits you to override this behavior through the use of the <kbd>_
&nbsp;&nbsp;&nbsp;&nbsp;// Some code here...<br />
}</code>
-<p class="important"><strong>Important:</strong>&nbsp; If your controller contains a function named <kbd>_remap()</kbd>, it will <strong>always</strong>
-get called regardless of what your URI contains. It overrides the normal behavior in which the URI determines which function is called,
+<p class="important"><strong>Important:</strong>&nbsp; If your controller contains a function named <kbd>_remap()</kbd>, it will <strong>always</strong>
+get called regardless of what your URI contains. It overrides the normal behavior in which the URI determines which function is called,
allowing you to define your own function routing rules.</p>
<p>The overridden function call (typically the second segment of the URI) will be passed as a parameter the <kbd>_remap()</kbd> function:</p>
@@ -256,11 +256,11 @@ allowing you to define your own function routing rules.</p>
<h2>Processing Output</h2>
<p>Code Igniter has an output class that takes care of sending your final rendered data to the web browser automatically. More information on this can be found in the
-<a href="views.html">Views</a> and <a href="../libraries/output.html">Output class</a> pages. In some cases, however, you might want to
-post-process the finalized data in some way and send it to the browser yourself. Code Igniter permits you to
+<a href="views.html">Views</a> and <a href="../libraries/output.html">Output class</a> pages. In some cases, however, you might want to
+post-process the finalized data in some way and send it to the browser yourself. Code Igniter permits you to
add a function named <dfn>_output()</dfn> to your controller that will receive the finalized output data.
-<p><strong>Important:</strong>&nbsp; If your controller contains a function named <kbd>_output()</kbd>, it will <strong>always</strong>
+<p><strong>Important:</strong>&nbsp; If your controller contains a function named <kbd>_output()</kbd>, it will <strong>always</strong>
be called by the output class instead of echoing the finalized data directly. The first parameter of the function will contain the finalized output.</p>
<p>Here is an example:</p>
@@ -364,7 +364,7 @@ Constructors can't return a value, but they can do some default work.</p>
<a name="reserved"></a>
<h2>Reserved Function Names</h2>
-<p>Since your controller classes will extend the main application controller you
+<p>Since your controller classes will extend the main application controller you
must be careful not to name your functions identically to the ones used by that class, otherwise your local functions
will override them. The following
is a list of reserved names. Do not name your controller functions any of these:</p>
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index 6d2f3804f..c5d021e63 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -69,7 +69,7 @@ It is possible, however, to swap any of the core system classes with your own ve
but the option to replace or extend them does exist for those who would like to significantly alter the Code Igniter core.</strong>
</p>
-<p class="important"><strong>Note:</strong>&nbsp; Messing with a core system class has a lot of implications, so make sure you
+<p class="important"><strong>Note:</strong>&nbsp; Messing with a core system class has a lot of implications, so make sure you
know what you are doing before attempting it.</p>
@@ -118,7 +118,7 @@ Extending a class is nearly identical to replacing a class with a couple excepti
<ul>
<li>The class declaration must extend the parent class.</li>
-<li>Your new class name and filename must be prefixed with <kbd>MY_</kbd> (this item is configurable. See below.).</li>
+<li>Your new class name and filename must be prefixed with <kbd>MY_</kbd> (this item is configurable. See below.).</li>
</ul>
<p>For example, to extend the native <kbd>Input</kbd> class you'll create a file named <dfn>application/libraries/</dfn><kbd>MY_Input.php</kbd>, and declare your class with:</p>
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index d76464120..12f8f9fc9 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -63,11 +63,11 @@ Creating Libraries
<h1>Creating Libraries</h1>
<p>When we use the term "Libraries" we are normally referring to the classes that are located in the <kbd>libraries</kbd>
-directory and described in the Class Reference of this user guide. In this case, however, we will instead describe how you can create
-your own libraries within your <dfn>application/libraries</dfn> directory in order to maintain separation between your local resources
+directory and described in the Class Reference of this user guide. In this case, however, we will instead describe how you can create
+your own libraries within your <dfn>application/libraries</dfn> directory in order to maintain separation between your local resources
and the global framework resources.</p>
-<p>As an added bonus, Code Igniter permits your libraries to <kbd>extend</kbd> native classes if you simply need to add some functionality
+<p>As an added bonus, Code Igniter permits your libraries to <kbd>extend</kbd> native classes if you simply need to add some functionality
to an existing library. Or you can even replace native libraries just by placing identically named versions in your <dfn>application/libraries</dfn> folder.
<p>In summary:</p>
@@ -86,7 +86,7 @@ nor can the main Controller class. All other classes are able to be replaced/ex
<h2>Storage</h2>
-<p>Your library classes should be placed within your <dfn>application/libraries</dfn> folder, as this is where Code Igniter will look for them when
+<p>Your library classes should be placed within your <dfn>application/libraries</dfn> folder, as this is where Code Igniter will look for them when
they are initialized.</p>
@@ -120,7 +120,7 @@ class Someclass {<br />
<code>$this->load->library('<kbd>someclass</kbd>');</code>
-<p>Where <em>someclass</em> is the file name, without the ".php" file extension. You can submit the file name capitalized or lower case.
+<p>Where <em>someclass</em> is the file name, without the ".php" file extension. You can submit the file name capitalized or lower case.
Code Igniter doesn't care.</p>
<p>Once loaded you can access your class using the <kbd>lower case</kbd> version:</p>
@@ -132,7 +132,7 @@ Code Igniter doesn't care.</p>
<h2>Passing Parameters When Initializing Your Class</h2>
-<p>In the library loading function you can dynamically pass data via the second parameter and it will be passed to your class
+<p>In the library loading function you can dynamically pass data via the second parameter and it will be passed to your class
constructor:</p>
<code>
@@ -178,7 +178,7 @@ This function returns the Code Igniter super object.</p>
etc.
</code>
-<p><kbd>$this</kbd>, however, only works directly within your controllers, your models, or your views.
+<p><kbd>$this</kbd>, however, only works directly within your controllers, your models, or your views.
If you would like to use Code Igniter's classes from within your own custom classes you can do so as follows:</p>
@@ -231,7 +231,7 @@ Extending a class is nearly identical to replacing a class with a couple excepti
<ul>
<li>The class declaration must extend the parent class.</li>
-<li>Your new class name and filename must be prefixed with <kbd>MY_</kbd> (this item is configurable. See below.).</li>
+<li>Your new class name and filename must be prefixed with <kbd>MY_</kbd> (this item is configurable. See below.).</li>
</ul>
<p>For example, to extend the native <kbd>Email</kbd> class you'll create a file named <dfn>application/libraries/</dfn><kbd>MY_Email.php</kbd>, and declare your class with:</p>
@@ -261,7 +261,7 @@ to load the example above, which extends the Email class, you will use:</p>
<code>$this->load->library('<kbd>email</kbd>');</code>
-<p>Once loaded you will use the class variable as you normally would for the class you are extending. In the case of
+<p>Once loaded you will use the class variable as you normally would for the class you are extending. In the case of
the email class all calls will use:
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index 770b01189..45554904f 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -65,7 +65,7 @@ Credits
<p>Code Igniter was developed by <a href="http://www.ellislab.com">Rick Ellis</a>, who in his other life is CEO of
<a href="http://www.pmachine.com">pMachine, Inc.</a> The core framework was written
specifically for this application, while many of the class libraries, helpers, and sub-systems borrow from the code-base of
-<a href="http://www.pmachine.com/ee/">ExpressionEngine</a>, a Content Management System written by Rick Ellis and
+<a href="http://www.pmachine.com/ee/">ExpressionEngine</a>, a Content Management System written by Rick Ellis and
<a href="http://www.reedmaniac.com">Paul Burdick</a>.</p>
<p>A hat tip goes to Ruby on Rails for inspiring us to create a PHP framework, and for
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html
index 16db19e41..70ee10213 100644
--- a/user_guide/general/errors.html
+++ b/user_guide/general/errors.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,15 +62,15 @@ Error Handling
<h1>Error Handling</h1>
-<p>Code Igniter lets you build error reporting into your applications using the functions described below.
+<p>Code Igniter lets you build error reporting into your applications using the functions described below.
In addition, it has an error logging class that permits error and debugging messages to be saved as text files.</p>
-<p class="important"><strong>Note:</strong> By default, Code Igniter displays all PHP errors. You might
+<p class="important"><strong>Note:</strong> By default, Code Igniter displays all PHP errors. You might
wish to change this behavior once your development is complete. You'll find the <dfn>error_reporting()</dfn>
function located at the top of your main index.php file. Disabling error reporting will NOT prevent log files
from being written if there are errors.</p>
-<p>Unlike most systems in Code Igniter, the error functions are simple procedural interfaces that are available
+<p>Unlike most systems in Code Igniter, the error functions are simple procedural interfaces that are available
globally throughout the application. This approach permits error messages to get triggered without having to worry
about class/function scoping.</p>
@@ -90,7 +90,7 @@ Note that Code Igniter automatically shows 404 messages if controllers are not f
<h2>log_message('<var>level</var>', '<samp>message</samp>')</h2>
-<p>This function lets you write messages to your log files. You must supply one of three "levels"
+<p>This function lets you write messages to your log files. You must supply one of three "levels"
in the first parameter, indicating what type of message it is (debug, error, info), with the message
itself in the second parameter. Example:</p>
@@ -116,8 +116,8 @@ log_message('info', 'The purpose of some variable is to provide some value.');<b
</ol>
-<p class="important"><strong>Note:</strong> In order for the log file to actually be written, the
- "logs" folder must be writable. In addition, you must set the "threshold" for logging.
+<p class="important"><strong>Note:</strong> In order for the log file to actually be written, the
+ "logs" folder must be writable. In addition, you must set the "threshold" for logging.
You might, for example, only want error messages to be logged, and not the other two types.
If you set it to zero logging will be disabled.</p>
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html
index 089d6d08e..e9283e9a7 100644
--- a/user_guide/general/helpers.html
+++ b/user_guide/general/helpers.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -71,12 +71,12 @@ that help you create form elements, <dfn>Text Helpers</dfn> perform various text
<p>Unlike most other systems in Code Igniter, Helpers are not written in an Object Oriented format. They are simple, procedural functions.
Each helper function performs one specific task, with no dependence on other functions.</p>
-<p>Code Igniter does not load Helper Files by default, so the first step in using
+<p>Code Igniter does not load Helper Files by default, so the first step in using
a Helper is to load it. Once loaded, it becomes globally available in your <a href="../general/controllers.html">controller</a> and <a href="../general/views.html">views</a>.</p>
<p>Helpers are typically stored in your <dfn>system/helpers</dfn> directory. Alternately you can create a folder called <kbd>helpers</kbd> inside
your <kbd>application</kbd> folder and store them there. Code Igniter will look first in your <dfn>system/application/helpers</dfn>
-directory. If the directory does not exist or the specified helper is not located there CI will instead look in your global
+directory. If the directory does not exist or the specified helper is not located there CI will instead look in your global
<dfn>system/helpers</dfn> folder.</p>
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index 6bfa94ee9..341451aa7 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,10 +62,10 @@ Hooks - Extending the Framework Core
<h1>Hooks - Extending the Framework Core</h1>
-<p>Code Igniter's Hooks feature provides a means to tap into and modify the inner workings of the framework without hacking the core files.
-When Code Igniter runs it follows a specific execution process, diagramed in the <a href="../overview/appflow.html">Application Flow</a> page.
-There may be instances, however, where you'd like to cause some action to take place at a particular stage in the execution process.
-For example, you might want to run a script right before your controllers get loaded, or right after, or you might want to trigger one of
+<p>Code Igniter's Hooks feature provides a means to tap into and modify the inner workings of the framework without hacking the core files.
+When Code Igniter runs it follows a specific execution process, diagramed in the <a href="../overview/appflow.html">Application Flow</a> page.
+There may be instances, however, where you'd like to cause some action to take place at a particular stage in the execution process.
+For example, you might want to run a script right before your controllers get loaded, or right after, or you might want to trigger one of
your own scripts in some other location.
</p>
@@ -83,14 +83,14 @@ your own scripts in some other location.
<code>
$hook['pre_controller'] = array(<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'class'&nbsp;&nbsp;&nbsp;&nbsp;=> 'MyClass',<br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'function' => 'Myfunction',<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'function' => 'Myfunction',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'filename' => 'Myclass.php',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'filepath' => 'hooks',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'params'&nbsp;&nbsp;&nbsp;=> array('beer', 'wine', 'snacks')<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;);</code>
-<p><strong>Notes:</strong><br />The array index correlates to the name of the particular hook point you want to
-use. In the above example the hook point is <kbd>pre_controller</kbd>. A list of hook points is found below.
+<p><strong>Notes:</strong><br />The array index correlates to the name of the particular hook point you want to
+use. In the above example the hook point is <kbd>pre_controller</kbd>. A list of hook points is found below.
The following items should be defined in your associative hook array:</p>
<ul>
@@ -109,7 +109,7 @@ The following items should be defined in your associative hook array:</p>
<code>
$hook['pre_controller']<kbd>[]</kbd> = array(<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'class'&nbsp;&nbsp;&nbsp;&nbsp;=> 'MyClass',<br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'function' => 'Myfunction',<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'function' => 'Myfunction',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'filename' => 'Myclass.php',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'filepath' => 'hooks',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'params'&nbsp;&nbsp;&nbsp;=> array('beer', 'wine', 'snacks')<br />
@@ -117,7 +117,7 @@ $hook['pre_controller']<kbd>[]</kbd> = array(<br />
<br />
$hook['pre_controller']<kbd>[]</kbd> = array(<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'class'&nbsp;&nbsp;&nbsp;&nbsp;=> 'MyOtherClass',<br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'function' => 'MyOtherfunction',<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'function' => 'MyOtherfunction',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'filename' => 'Myotherclass.php',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'filepath' => 'hooks',<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'params'&nbsp;&nbsp;&nbsp;=> array('red', 'yellow', 'blue')<br />
@@ -149,7 +149,7 @@ Called immediately after your controller is instantiated, but prior to any metho
Called immediately after your controller is fully executed.</li>
<li><strong>display_override</strong><br />
-Overrides the <dfn>_display()</dfn> function, used to send the finalized page to the web browser at the end of system execution. This permits you to
+Overrides the <dfn>_display()</dfn> function, used to send the finalized page to the web browser at the end of system execution. This permits you to
use your own display methodology. Note that the finalized data will be available by calling <dfn>$this->output->get_output()</dfn></li>
<li><strong>cache_override</strong><br />
diff --git a/user_guide/general/index.html b/user_guide/general/index.html
index 9ca01f094..b2e89fafb 100644
--- a/user_guide/general/index.html
+++ b/user_guide/general/index.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -66,17 +66,17 @@ Getting Started
curve while making the process as enjoyable as possible.
</p>
-<p>The first step is to <a href="../installation/index.html">install</a> Code Igniter, then read
+<p>The first step is to <a href="../installation/index.html">install</a> Code Igniter, then read
all the topics in the <strong>Introduction</strong> section of the Table of Contents.</p>
<p>Next, read each of the <strong>General Topics</strong> pages in order.
Each topic builds on the previous one, and includes code examples that you are encouraged to try.</p>
-<p>Once you understand the basics you'll be ready to explore the <strong>Class Reference</strong> and
+<p>Once you understand the basics you'll be ready to explore the <strong>Class Reference</strong> and
<strong>Helper Reference</strong> pages to learn to utilize the native libraries and helper files.</p>
-<p>Feel free to take advantage of our <a href="http://www.codeigniter.com/forums/">Community Forums</a>
-if you have questions or problems, and
+<p>Feel free to take advantage of our <a href="http://www.codeigniter.com/forums/">Community Forums</a>
+if you have questions or problems, and
our <a href="http://www.codeigniter.com/wiki/">Wiki</a> to see code examples posted by other users.</p>
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html
index 5a191bb00..de34a7a09 100644
--- a/user_guide/general/libraries.html
+++ b/user_guide/general/libraries.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -63,7 +63,7 @@ Using Code Igniter Libraries
<h1>Using Code Igniter Libraries</h1>
-<p>All of the available libraries are located in your <dfn>system/libraries</dfn> folder.
+<p>All of the available libraries are located in your <dfn>system/libraries</dfn> folder.
In most cases, to use one of these classes involves initializing it within a <a href="controllers.html">controller</a> using the following initialization function:</p>
<code>$this->load->library('<var>class name</var>'); </code>
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index 3f1c1e224..18e575892 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -78,7 +78,7 @@ Models
<a name="what"></a>
<h2>What is a Model?</h2>
-<p>Models are PHP classes that are designed to work with information in your database. For example, let's say
+<p>Models are PHP classes that are designed to work with information in your database. For example, let's say
you use Code Igniter to manage a blog. You might have a model class that contains functions to insert, update, and
retrieve your blog data. Here is an example of what such a model class might look like:</p>
@@ -127,7 +127,7 @@ class&nbsp;Blogmodel&nbsp;extends&nbsp;Model&nbsp;{<br />
<a name="anatomy"></a>
<h2>Anatomy of a Model</h2>
-<p>Model classes are stored in your <dfn>application/models/</dfn> folder. They can be nested within sub-folders if you
+<p>Model classes are stored in your <dfn>application/models/</dfn> folder. They can be nested within sub-folders if you
want this type of organization.</p>
<p>The basic prototype for a model class is this:</p>
@@ -142,7 +142,7 @@ class&nbsp;<var>Model_name</var>&nbsp;extends&nbsp;Model&nbsp;{<br />
&nbsp;&nbsp;&nbsp;&nbsp;}<br />
}</code>
-<p>Where <var>Model_name</var> is the name of your class. Class names <strong>must</strong> be capitalized.
+<p>Where <var>Model_name</var> is the name of your class. Class names <strong>must</strong> be capitalized.
Make sure your class extends the base Model class.</p>
<p>The file name will be a lower case version of your class name. For example, if your class is this:</p>
@@ -217,13 +217,13 @@ class&nbsp;Blog_controller&nbsp;extends&nbsp;Controller&nbsp;{<br />
<ul>
<li>You can connect using the standard database methods <a href="../database/connecting.html">described here</a>, either from within your Controller class or your Model class.</li>
<li>You can tell the model loading function to auto-connect by passing <kbd>TRUE</kbd> (boolean) via the third parameter,
-and connectivity settings, as defined in your database config file will be used:
+and connectivity settings, as defined in your database config file will be used:
<code>$this->load->model('<var>Model_name</var>', '', <kbd>TRUE</kbd>);</code>
</li>
-<li>You can manually pass database connectivity settings via the third parameter:
+<li>You can manually pass database connectivity settings via the third parameter:
<code>$config['hostname'] = "localhost";<br />
diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html
index db4a0cff1..e7e45850e 100644
--- a/user_guide/general/multiple_apps.html
+++ b/user_guide/general/multiple_apps.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html
index 78b82318d..85190af92 100644
--- a/user_guide/general/plugins.html
+++ b/user_guide/general/plugins.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -63,13 +63,13 @@ Plugins
<h1>Plugins</h1>
-<p>Plugins work almost identically to <a href="helpers.html">Helpers</a>. The main difference is that a plugin usually
+<p>Plugins work almost identically to <a href="helpers.html">Helpers</a>. The main difference is that a plugin usually
provides a single function, whereas a Helper is usually a collection of functions. Helpers are also considered a part of
the core system; plugins are intended to be created and shared by our community.</p>
<p>Plugins should be saved to your <dfn>system/plugins</dfn> directory or you can create a folder called <kbd>plugins</kbd> inside
your <kbd>application</kbd> folder and store them there. Code Igniter will look first in your <dfn>system/application/plugins</dfn>
-directory. If the directory does not exist or the specified plugin is not located there CI will instead look in your global
+directory. If the directory does not exist or the specified plugin is not located there CI will instead look in your global
<dfn>system/plugins</dfn> folder.</p>
@@ -102,7 +102,7 @@ automatically in any function, or you can load a plugin in a specific function t
<h2>Auto-loading Plugins</h2>
-<p>If you find that you need a particular plugin globally throughout your application, you can tell Code Igniter to auto-load it
+<p>If you find that you need a particular plugin globally throughout your application, you can tell Code Igniter to auto-load it
during system initialization. This is done by opening the <var>application/config/autoload.php</var> file and adding the plugin to the autoload array.</p>
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html
index 880aa0c50..2a933e3fe 100644
--- a/user_guide/general/profiling.html
+++ b/user_guide/general/profiling.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html
index b9a293f38..20d3fec9f 100644
--- a/user_guide/general/quick_reference.html
+++ b/user_guide/general/quick_reference.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html
index bf5470c50..3efb3bba2 100644
--- a/user_guide/general/requirements.html
+++ b/user_guide/general/requirements.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index 102f34db4..a0bb67138 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,12 +62,12 @@ URI Routing
<h1>URI Routing</h1>
-<p>Typically there is a one-to-one relationship between a URL string and its corresponding controller class/method.
+<p>Typically there is a one-to-one relationship between a URL string and its corresponding controller class/method.
The segments in a URI normally follow this pattern:</p>
<code>www.your-site.com/<dfn>class</dfn>/<samp>function</samp>/<var>id</var>/</code>
-<p>In some instances, however, you may want to remap this relationship so that a different class/function can be called
+<p>In some instances, however, you may want to remap this relationship so that a different class/function can be called
instead of the one corresponding to the URL.</p>
<p>For example, lets say you want your URLs to have this prototype:</p>
@@ -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>
@@ -95,8 +95,8 @@ permits you to specify your own routing criteria. Routes can either be specified
<code>$route['product/:num'] = "catalog/product_lookup";</code>
-<p>In a route, the array key contains the URI to be matched, while the array value contains the destination it should be re-routed to.
-In the above example, if the literal word "product" is found in the first segment of the URL, and a number is found in the second segment,
+<p>In a route, the array key contains the URI to be matched, while the array value contains the destination it should be re-routed to.
+In the above example, if the literal word "product" is found in the first segment of the URL, and a number is found in the second segment,
the "catalog" class and the "product_lookup" method are instead used.</p>
<p>You can match literal values or you can use two wildcard types:</p>
@@ -110,7 +110,7 @@ the "catalog" class and the "product_lookup" method are instead used.</p>
<strong>:any</strong> will match a segment containing any character.
</p>
-<p class="important"><strong>Note:</strong> Routes will run in the order they are defined.
+<p class="important"><strong>Note:</strong> Routes will run in the order they are defined.
Higher routes will always take precedence over lower ones.</p>
diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html
index b22b351ec..dbe9cb12e 100644
--- a/user_guide/general/scaffolding.html
+++ b/user_guide/general/scaffolding.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,11 +62,11 @@ Scaffolding
<h1>Scaffolding</h1>
-<p>Code Igniter's Scaffolding feature provides a fast and very convenient way to add, edit, or delete information in your database
+<p>Code Igniter's Scaffolding feature provides a fast and very convenient way to add, edit, or delete information in your database
during development.</p>
<p class="important"><strong>Very Important:</strong> Scaffolding is intended for development use only. It provides very little
-security other than a "secret" word, so anyone who has access to your Code Igniter site can potentially edit or delete your information.
+security other than a "secret" word, so anyone who has access to your Code Igniter site can potentially edit or delete your information.
If you use scaffolding make sure you disable it immediately after you are through using it. DO NOT leave it enabled on a live site.
And please, set a secret word before you use it.</p>
@@ -75,7 +75,7 @@ And please, set a secret word before you use it.</p>
<p>Here's a typical scenario: You create a new database table during development and you'd like a quick way to insert some data
into it to work with. Without scaffolding your choices are either to write some inserts using the command line or to use a
-database management tool like phpMyAdmin. With Code Igniter's scaffolding feature you can quickly add some data using its browser
+database management tool like phpMyAdmin. With Code Igniter's scaffolding feature you can quickly add some data using its browser
interface. And when you are through using the data you can easily delete it.</p>
<h2>Setting a Secret Word</h2>
@@ -95,7 +95,7 @@ will launch the scaffolding interface, so please pick something obscure that no
<h2>Enabling Scaffolding</h2>
<p>Note: The information on this page assumes you already know how <a href="controllers.html">controllers</a> work, and that you have
-a working one available. It also assumes you have configured Code Igniter to auto-connect to your <a href="../database/index.html">database</a>.
+a working one available. It also assumes you have configured Code Igniter to auto-connect to your <a href="../database/index.html">database</a>.
If not, the information here won't be very relevant, so you are encouraged to go through those sections first.
Lastly, it assumes you understand what a class constructor is. If not, read the last section of the <a href="controllers.html">controllers</a>
page.</p>
diff --git a/user_guide/general/security.html b/user_guide/general/security.html
index c3218cdba..e8f935d5b 100644
--- a/user_guide/general/security.html
+++ b/user_guide/general/security.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -84,7 +84,7 @@ minimize the possibility that malicious data can be passed to your application.
<h2>GET, POST, and COOKIE Data</h2>
<p>GET data is simply disallowed by Code Igniter since the system utilizes URI segments rather than traditional URL query strings (unless
-you have the query string option enabled in your config file). The global GET
+you have the query string option enabled in your config file). The global GET
array is <strong>unset</strong> by the Input class during system initialization.</p>
<h2>Register_globals</h2>
@@ -100,7 +100,7 @@ retrieving data from your database.</p>
<h1>Best Practices</h1>
-<p>Before accepting any data into your application, whether it be POST data from a form submission, COOKIE data, URI data,
+<p>Before accepting any data into your application, whether it be POST data from a form submission, COOKIE data, URI data,
XML-RPC data, or even data from the SERVER array, you are encouraged to practice this three step approach:</p>
<ol>
@@ -116,15 +116,15 @@ Code Igniter provides the following functions to assist in this process:</p>
<li><h2>XSS Filtering</h2>
-<p>Code Igniter comes with a Cross Site Scripting filter. This filter looks for commonly
+<p>Code Igniter comes with a Cross Site Scripting filter. This filter looks for commonly
used techniques to embed malicious Javascript into your data, or other types of code that attempt to hijack cookies
-or do other malicious things. The XSS Filter is described <a href="../libraries/input.html">here</a>.
+or do other malicious things. The XSS Filter is described <a href="../libraries/input.html">here</a>.
</p>
</li>
<li><h2>Validate the data</h2>
-<p>Code Igniter has a <a href="../libraries/validation.html">Validation Class</a> that assists you in validating, filtering, and prepping
+<p>Code Igniter has a <a href="../libraries/validation.html">Validation Class</a> that assists you in validating, filtering, and prepping
your data.</p>
</li>
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html
index b3b842d46..c90e90f7d 100644
--- a/user_guide/general/urls.html
+++ b/user_guide/general/urls.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -63,7 +63,7 @@ URLS
<h1>Code Igniter URLs</h1>
-<p>By default, URLs in Code Igniter are designed to be search-engine and human friendly. Rather than using the standard "query string"
+<p>By default, URLs in Code Igniter are designed to be search-engine and human friendly. Rather than using the standard "query string"
approach to URLs that is synonymous with dynamic systems, Code Igniter uses a <strong>segment-based</strong> approach:</p>
<code>www.your-site.com/<var>news</var>/<dfn>article</dfn>/<samp>my_article</samp></code>
@@ -82,8 +82,8 @@ approach to URLs that is synonymous with dynamic systems, Code Igniter uses a <s
<li>The third, and any additional segments, represent the ID and any variables that will be passed to the controller.</p>
</ol>
-<p>The <a href="../libraries/uri.html">URI Class</a> and the <a href="../helpers/url_helper.html">URL Helper</a>
-contain functions that make it easy to work with your URI data. In addition, your URLs can be remapped using the
+<p>The <a href="../libraries/uri.html">URI Class</a> and the <a href="../helpers/url_helper.html">URL Helper</a>
+contain functions that make it easy to work with your URI data. In addition, your URLs can be remapped using the
<a href="routing.html">URI Routing</a> feature for more flexibility.</p>
@@ -136,7 +136,7 @@ be accessible using the "trigger" words you've set to invoke your controllers an
<code>index.php?c=controller&m=method</code>
<p class="important"><strong>Please note:</strong> If you are using query strings you will have to build your own URLs, rather than utilizing
-the URL helpers (and other helpers that generate URLs, like some of the form helpers) as these are designed to work with
+the URL helpers (and other helpers that generate URLs, like some of the form helpers) as these are designed to work with
segment based URLs.</p>
diff --git a/user_guide/general/views.html b/user_guide/general/views.html
index d4ccb5148..602d58255 100644
--- a/user_guide/general/views.html
+++ b/user_guide/general/views.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -63,11 +63,11 @@ Views
<h1>Views</h1>
<p>A <dfn>view</dfn> is simply a web page, or a page fragment, like a header, footer, sidebar, etc.
-In fact, views can flexibly be embedded within other views (within other views, etc., etc.) if you need this type
+In fact, views can flexibly be embedded within other views (within other views, etc., etc.) if you need this type
of hierarchy.</p>
<p>Views are never called directly, they must be loaded by a <a href="controllers.html">controller</a>. Remember that in an MVC framework, the Controller acts as the
-traffic cop, so it is responsible for fetching a particular view. If you have not read the <a href="controllers.html">Controllers</a> page
+traffic cop, so it is responsible for fetching a particular view. If you have not read the <a href="controllers.html">Controllers</a> page
you should do so before continuing.</p>
<p>Using the example controller you created in the <a href="controllers.html">controller</a> page, let's add a view to it.</p>
@@ -120,7 +120,7 @@ class Blog extends Controller {
<h2>Adding Dynamic Data to the View</h2>
-<p>Data is passed from the controller to the view by way of an <strong>array</strong> or an <strong>object</strong> in the second
+<p>Data is passed from the controller to the view by way of an <strong>array</strong> or an <strong>object</strong> in the second
parameter of the view loading function. Here is an example using an array:</p>
<code>$data = array(<br />
diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html
index a6044be8f..854d0babe 100644
--- a/user_guide/helpers/array_helper.html
+++ b/user_guide/helpers/array_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -75,7 +75,7 @@ Array Helper
<h2>element()</h2>
-<p>Lets you fetch an item from an array. The function tests whether the array index is set and whether it has a value. If
+<p>Lets you fetch an item from an array. The function tests whether the array index is set and whether it has a value. If
a value exists it is returned. If a value does not exist it returns FALSE, or whatever you've specified as the default value via the third parameter. Example:</p>
<code>
diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html
index 1e352fc11..ec27e5485 100644
--- a/user_guide/helpers/cookie_helper.html
+++ b/user_guide/helpers/cookie_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -99,7 +99,7 @@ set_cookie($cookie);
<p>Only the name and value are required.</p>
<p>The expiration is set in <strong>seconds</strong>, which will be added to the current time. Do not include the time, but rather only the
-number of seconds from <em>now</em> that you wish the cookie to be valid. If the expiration is set to
+number of seconds from <em>now</em> that you wish the cookie to be valid. If the expiration is set to
zero the cookie will only last as long as the browser is open.</p>
<p>To delete a cookie set it with the expiration blank.</p>
<p>For site-wide cookies regardless of how your site is requested, add your URL to the <strong>domain</strong> starting with a period, like this: .your-domain.com</p>
@@ -132,7 +132,7 @@ zero the cookie will only last as long as the browser is open.</p>
<code>delete_cookie("name");</code>
-<p>This function is otherwise identical to <dfn>set_cookie()</dfn>, except that it does not have the value and expiration parameters. You can submit an array
+<p>This function is otherwise identical to <dfn>set_cookie()</dfn>, except that it does not have the value and expiration parameters. You can submit an array
of values in the first parameter or you can set discreet parameters.</p>
<code>delete_cookie($name, $domain, $path, $prefix)</code>
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html
index f787176a7..727ce5206 100644
--- a/user_guide/helpers/date_helper.html
+++ b/user_guide/helpers/date_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -86,7 +86,7 @@ run a site that lets each user set their own timezone settings) there is no bene
<h2>mdate()</h2>
-<p>This function is identical to PHPs <a href="http://www.php.net/date">date()</a> function, except that it lets you
+<p>This function is identical to PHPs <a href="http://www.php.net/date">date()</a> function, except that it lets you
use MySQL style date codes, where each code letter is preceded with a percent sign: %Y %m %d etc.</p>
<p>The benefit of doing dates this way is that you don't have to worry about escaping any characters that
@@ -142,7 +142,7 @@ $gmt = local_to_gmt($now);</code>
<h2>gmt_to_local()</h2>
-<p>Takes a Unix timestamp (referenced to GMT) as input, and converts it to a localized timestamp based on the
+<p>Takes a Unix timestamp (referenced to GMT) as input, and converts it to a localized timestamp based on the
timezone and Daylight Saving time submitted. Example:</p>
<code>
@@ -171,7 +171,7 @@ $unix = mysql_to_unix($mysql);</code>
<p>This can be useful if you need to display a date in a form field for submission.</p>
-<p>The time can be formatted with or without seconds, and it can be set to European or US format. If only
+<p>The time can be formatted with or without seconds, and it can be set to European or US format. If only
the timestamp is submitted it will return the time without seconds formatted for the U.S. Examples:
<code>$now = time();<br />
@@ -185,8 +185,8 @@ echo unix_to_human($now, TRUE, 'eu'); // Euro time with seconds</code>
<h2>human_to_unix()</h2>
-<p>The opposite of the above function. Takes a "human" time as input and returns it as Unix. This function is
-useful if you accept "human" formatted dates submitted via a form. Returns FALSE (boolean) if
+<p>The opposite of the above function. Takes a "human" time as input and returns it as Unix. This function is
+useful if you accept "human" formatted dates submitted via a form. Returns FALSE (boolean) if
the date string passed to it is not formatted as indicated above. Example:</p>
<code>$now = time();<br />
diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html
index 35b2d6db9..34450b131 100644
--- a/user_guide/helpers/directory_helper.html
+++ b/user_guide/helpers/directory_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -90,7 +90,7 @@ only the top level directory set the second parameter to <var>true</var> (boolea
<code>$map = directory_map('./mydirectory/', TRUE);</code>
-<p>Each folder name will be an array index, while its contained files will be numerically indexed.
+<p>Each folder name will be an array index, while its contained files will be numerically indexed.
Here is an example of a typical array:</p>
<code>Array<br />
diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html
index 5b2f1ecfe..14dba661c 100644
--- a/user_guide/helpers/download_helper.html
+++ b/user_guide/helpers/download_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -76,7 +76,7 @@ Download Helper
<h2>force_download('<var>filename</var>', '<var>data</var>')</h2>
-<p>Generates server headers which force data to be downloaded to your desktop. Useful with file downloads.
+<p>Generates server headers which force data to be downloaded to your desktop. Useful with file downloads.
The first parameter is the <strong>name you want the downloaded file to be named</strong>, the second parameter is the file data.
Example:</p>
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html
index 319ebfa9b..d51906d99 100644
--- a/user_guide/helpers/file_helper.html
+++ b/user_guide/helpers/file_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html
index a71aa513d..68d44e662 100644
--- a/user_guide/helpers/form_helper.html
+++ b/user_guide/helpers/form_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -175,7 +175,7 @@ echo form_input($data);<br />
// Would produce:<br /><br />
&lt;input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" /></code>
-<p>If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the
+<p>If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the
third parameter:
<code>$js = 'onClick="some_function()"';<br />
@@ -184,17 +184,17 @@ echo form_input('username', 'johndoe', $js);</code>
<h2>form_password()</h2>
-<p>This function is identical in all respects to the <dfn>form_input()</dfn> function above
+<p>This function is identical in all respects to the <dfn>form_input()</dfn> function above
except that is sets it as a "password" type.</p>
<h2>form_upload()</h2>
-<p>This function is identical in all respects to the <dfn>form_input()</dfn> function above
+<p>This function is identical in all respects to the <dfn>form_input()</dfn> function above
except that is sets it as a "file" type, allowing it to be used to upload files.</p>
<h2>form_textarea()</h2>
-<p>This function is identical in all respects to the <dfn>form_input()</dfn> function above
+<p>This function is identical in all respects to the <dfn>form_input()</dfn> function above
except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above
example, you will instead specify "rows" and "cols".</p>
@@ -224,7 +224,7 @@ echo form_dropdown('shirts', $options, 'large');<br />
&lt;/select></code>
-<p>If you would like the opening &lt;select> to contain additional data, like JavaScript, you can pass it as a string in the
+<p>If you would like the opening &lt;select> to contain additional data, like JavaScript, you can pass it as a string in the
fourth parameter:
<code>$js = 'onChange="some_function()"';<br />
@@ -260,7 +260,7 @@ echo form_checkbox($data);<br />
// Would produce:<br /><br />
&lt;input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" /></code>
-<p>As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the
+<p>As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the
fourth parameter:
<code>$js = 'onClick="some_function()"';<br />
diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html
index 17157bbfa..e32cbc937 100644
--- a/user_guide/helpers/html_helper.html
+++ b/user_guide/helpers/html_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html
index 2a5c69367..129e424ea 100644
--- a/user_guide/helpers/index.html
+++ b/user_guide/helpers/index.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -71,11 +71,11 @@ that help you create form elements, <dfn>Text Helpers</dfn> perform various text
<p>Unlike most other systems in Code Igniter, Helpers are not written in an Object Oriented format. They are simple, procedural functions.
Each helper function performs one specific task, with no dependence on other functions.</p>
-<p>Helpers are intentionally kept very simple so that they can be used within your <strong>View Files</strong> with a minimal amount of code.
+<p>Helpers are intentionally kept very simple so that they can be used within your <strong>View Files</strong> with a minimal amount of code.
This is important if you intend to have designers or non-programmer will be working with your view files, since it keeps the code to a minimum.
</p>
-<p>Code Igniter does not load Helper Files by default, so the first step in using
+<p>Code Igniter does not load Helper Files by default, so the first step in using
a Helper is to load it. Once loaded, it becomes globally available in your <a href="../general/controllers.html">controller</a> and <a href="../general/views.html">views</a>.</p>
<h2>Loading a Helper</h2>
diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html
index ace1b2e07..65cc795eb 100644
--- a/user_guide/helpers/inflector_helper.html
+++ b/user_guide/helpers/inflector_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html
index d45d7c4e1..3953e8b2f 100644
--- a/user_guide/helpers/security_helper.html
+++ b/user_guide/helpers/security_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -76,7 +76,7 @@ Security Helper
<h2>xss_clean()</h2>
-<p>Provides Cross Site Script Hack filtering. This function is an alias to the one in the
+<p>Provides Cross Site Script Hack filtering. This function is an alias to the one in the
<a href="../libraries/input.html">Input class</a>. More info can be found there.</p>
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html
index ca28dc668..f43dfc480 100644
--- a/user_guide/helpers/string_helper.html
+++ b/user_guide/helpers/string_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -84,7 +84,7 @@ String Helper
<li><strong>alnum</strong>:&nbsp; Alpha-numeric string with lower and uppercase characters.</li>
<li><strong>numeric</strong>:&nbsp; Numeric string.</li>
<li><strong>nozero</strong>:&nbsp; Numeric string with no zeros.</li>
-<li><strong>unique</strong>:&nbsp; Encrypted with MD5 and uniquid(). Note: The length parameter is not available for this type.
+<li><strong>unique</strong>:&nbsp; Encrypted with MD5 and uniquid(). Note: The length parameter is not available for this type.
Returns a fixed length 33 character string.</li>
</ul>
diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html
index 75190da3c..1c704c409 100644
--- a/user_guide/helpers/text_helper.html
+++ b/user_guide/helpers/text_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html
index 7213b9d8a..1d1c6d69a 100644
--- a/user_guide/helpers/typography_helper.html
+++ b/user_guide/helpers/typography_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -76,7 +76,7 @@ Typography Helper
<h2>auto_typography()</h2>
-<p>Formats text so that it is semantically and typographically correct HTML. Takes a string as input and returns it with
+<p>Formats text so that it is semantically and typographically correct HTML. Takes a string as input and returns it with
the following formatting:</p>
<ul>
@@ -94,14 +94,14 @@ the following formatting:</p>
<code>$string = auto_typography($string);</code>
-<p><strong>Note:</strong> Typographic formatting can be processor intensive, particularly if you have a lot of content being formatted.
+<p><strong>Note:</strong> Typographic formatting can be processor intensive, particularly if you have a lot of content being formatted.
If you choose to use this function you may want to consider
<a href="../general/caching.html">caching</a> your pages.</p>
<h2>nl2br_except_pre()</h2>
-<p>Converts newlines to &lt;br /&gt; tags unless they appear within &lt;pre&gt; tags.
+<p>Converts newlines to &lt;br /&gt; tags unless they appear within &lt;pre&gt; tags.
This function is identical to the native PHP <dfn>nl2br()</dfn> function, except that it ignores &lt;pre&gt; tags.</p>
<p>Usage example:</p>
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html
index d54acc12f..eb0fd56e1 100644
--- a/user_guide/helpers/url_helper.html
+++ b/user_guide/helpers/url_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -78,7 +78,7 @@ URL Helper
<p>Returns your site URL, as specified in your config file. The index.php file (or whatever you have set as your
site <dfn>index_page</dfn> in your config file) will be added to the URL, as will any URI segments you pass to the function.</p>
-<p>You are encouraged to use this function any time you need to generate a local URL so that your pages become more portable
+<p>You are encouraged to use this function any time you need to generate a local URL so that your pages become more portable
in the event your URL changes.</p>
<p>Segments can be optionally passed to the function as a string or an array. Here is a string example:</p>
@@ -139,9 +139,9 @@ will be added automatically from the information specified in your config file.
<h2>anchor_popup()</h2>
-<p>Nearly identical to the <dfn>anchor()</dfn> function except that it opens the URL in a new window.
+<p>Nearly identical to the <dfn>anchor()</dfn> function except that it opens the URL in a new window.
-You can specify JavaScript window attributes in the third parameter to control how the window is opened. If
+You can specify JavaScript window attributes in the third parameter to control how the window is opened. If
the third parameter is not set it will simply open a new window with your own browser settings. Here is an example
with attributes:</p>
@@ -236,7 +236,7 @@ $url = prep_url($url);</code>
to redirect to a local URL within your site. You will <strong>not</strong> specify the full site URL, but rather simply the URI segments
to the controller you want to direct to. The function will build the URL based on your config file values.</p>
-<p>The second parameter allows you to choose between the "location"
+<p>The second parameter allows you to choose between the "location"
method or the "refresh" method. Location is faster, but on Windows servers it can sometimes be a problem. Example:</p>
<code>if ($logged_in == FALSE)<br />
diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html
index 22e7009b2..0e014fc02 100644
--- a/user_guide/helpers/xml_helper.html
+++ b/user_guide/helpers/xml_helper.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/images/appflowchart.gif b/user_guide/images/appflowchart.gif
index 422332c9e..5ca1ade4c 100644
--- a/user_guide/images/appflowchart.gif
+++ b/user_guide/images/appflowchart.gif
Binary files differ
diff --git a/user_guide/images/ci_logo.jpg b/user_guide/images/ci_logo.jpg
index 3ae0eee07..b31a7972b 100644
--- a/user_guide/images/ci_logo.jpg
+++ b/user_guide/images/ci_logo.jpg
Binary files differ
diff --git a/user_guide/images/ci_quick_ref.png b/user_guide/images/ci_quick_ref.png
index c07d6b469..1e74a4290 100644
--- a/user_guide/images/ci_quick_ref.png
+++ b/user_guide/images/ci_quick_ref.png
Binary files differ
diff --git a/user_guide/index.html b/user_guide/index.html
index 00bf44645..10f084de2 100644
--- a/user_guide/index.html
+++ b/user_guide/index.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -64,13 +64,13 @@ window.onload = function() {
<h2>Welcome to Code Igniter</h2>
-<p>Code Igniter is an Application Development Framework - a toolkit - for people who build web sites using PHP.
-Its goal is to enable you to develop projects much faster than you could if you were writing code
+<p>Code Igniter is an Application Development Framework - a toolkit - for people who build web sites using PHP.
+Its goal is to enable you to develop projects much faster than you could if you were writing code
from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and
-logical structure to access these libraries. Code Igniter lets you creatively focus on your project by
+logical structure to access these libraries. Code Igniter lets you creatively focus on your project by
minimizing the amount of code needed for a given task.</p>
-<p>Please read the Introduction section of the User Guide to learn the broad concepts behind Code Igniter,
+<p>Please read the Introduction section of the User Guide to learn the broad concepts behind Code Igniter,
then read the <a href="general/index.html">Getting Started</a> page.</p>
@@ -81,7 +81,7 @@ then read the <a href="general/index.html">Getting Started</a> page.</p>
<ul>
<li>You want a framework with a small footprint.</li>
<li>You need exceptional performance.</li>
-<li>You need broad compatibility with standard hosting accounts that run a variety of PHP versions and configurations.</li>
+<li>You need broad compatibility with standard hosting accounts that run a variety of PHP versions and configurations.</li>
<li>You want a framework that requires nearly zero configuration.</li>
<li>You want a framework that does not require you to use the command line.</li>
<li>You want a framework that does not require you to adhere to restrictive coding rules.</li>
diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
index c95f6b3cb..7d275816d 100644
--- a/user_guide/installation/downloads.html
+++ b/user_guide/installation/downloads.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html
index 4c572de69..30a3da0cb 100644
--- a/user_guide/installation/index.html
+++ b/user_guide/installation/index.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -72,7 +72,7 @@ Installation Instructions
</ol>
<p>If you wish to increase security by hiding the location of your Code Igniter files you can rename the <dfn>system</dfn> folder
-to something more private. If you do rename it, you must open your main <kbd>index.php</kbd> file and set the <samp>$system_folder</samp>
+to something more private. If you do rename it, you must open your main <kbd>index.php</kbd> file and set the <samp>$system_folder</samp>
variable at the top of the page with the new name you've chosen.</p>
<p>That's it!</p>
diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html
index 521d63888..c41548de4 100644
--- a/user_guide/installation/troubleshooting.html
+++ b/user_guide/installation/troubleshooting.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,8 +62,8 @@ Installation Instructions
<h1>Troubleshooting</h1>
-<p>If you find that no matter what you put in your URL only your default page is loading, it might be that your server
-does not support the PATH_INFO variable needed to serve search-engine friendly URLs.
+<p>If you find that no matter what you put in your URL only your default page is loading, it might be that your server
+does not support the PATH_INFO variable needed to serve search-engine friendly URLs.
As a first step, open your <dfn>application/config/config.php</dfn> file and look for the <kbd>URI Protocol</kbd>
information. It will recommend that you try a couple alternate settings. If it still doesn't work after you've tried this you'll need
diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html
index 03aeba139..55accb43f 100644
--- a/user_guide/installation/upgrade_120.html
+++ b/user_guide/installation/upgrade_120.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html
index 923f789e6..dcba18dbc 100644
--- a/user_guide/installation/upgrade_130.html
+++ b/user_guide/installation/upgrade_130.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,7 +62,7 @@ Upgrading from 1.2 to 1.3
<h1>Upgrading from 1.2 to 1.3</h1>
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.2. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.2. If you
have not upgraded to that version please do so first.</p>
@@ -94,7 +94,7 @@ with a static one.</p>
<p>Version 1.3 contains two new error templates located in <dfn>application/errors</dfn>, and for naming consistency the other error templates have
been renamed.</p>
-<p>If you <strong>have not</strong> customized any of the error templates simply
+<p>If you <strong>have not</strong> customized any of the error templates simply
replace this folder:</p>
<ul>
@@ -137,7 +137,7 @@ replace this folder:</p>
| For example, if a URL is this:
|
| www.your-site.com/index.php/products/view/shoes
-|
+|
| You can optionally add a suffix, like ".html",
| making the page appear to be of a certain type:
|
@@ -152,7 +152,7 @@ $config['url_suffix'] = "";
| Enable Query Strings
|------------------------------------------------
|
-| By default Code Igniter uses search-engine and
+| By default Code Igniter uses search-engine and
| human-friendly segment based URLs:
|
| www.your-site.com/who/what/where/
diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html
index b685b407a..d859c2012 100644
--- a/user_guide/installation/upgrade_131.html
+++ b/user_guide/installation/upgrade_131.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,7 +62,7 @@ Upgrading from 1.3 to 1.3.1
<h1>Upgrading from 1.3 to 1.3.1</h1>
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3. If you
have not upgraded to that version please do so first.</p>
<p>Before performing an update you should take your site offline by replacing the index.php file with a static one.</p>
diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html
index 9af6d96fb..28415a065 100644
--- a/user_guide/installation/upgrade_132.html
+++ b/user_guide/installation/upgrade_132.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,7 +62,7 @@ Upgrading from 1.3.1 to 1.3.2
<h1>Upgrading from 1.3.1 to 1.3.2</h1>
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.1. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.1. If you
have not upgraded to that version please do so first.</p>
<p>Before performing an update you should take your site offline by replacing the index.php file with a static one.</p>
diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html
index eed40cde5..d6ff59a75 100644
--- a/user_guide/installation/upgrade_133.html
+++ b/user_guide/installation/upgrade_133.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,7 +62,7 @@ Upgrading from 1.3.2 to 1.3.3
<h1>Upgrading from 1.3.2 to 1.3.3</h1>
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.2. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.2. If you
have not upgraded to that version please do so first.</p>
<p>Before performing an update you should take your site offline by replacing the index.php file with a static one.</p>
@@ -90,7 +90,7 @@ have not upgraded to that version please do so first.</p>
<p>As of version 1.3.3, Code Igniter does <strong>not</strong> connect automatically to your database when a model is loaded. This
allows you greater flexibility in determining which databases you would like used with your models. If your application is not connecting
-to your database prior to a model being loaded you will have to update your code. There are several options for connecting,
+to your database prior to a model being loaded you will have to update your code. There are several options for connecting,
<a href="../general/models.html">as described here</a>.
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html
index b6e4abbb9..d68489dba 100644
--- a/user_guide/installation/upgrade_140.html
+++ b/user_guide/installation/upgrade_140.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,7 +62,7 @@ Upgrading from 1.3.3 to 1.4.0
<h1>Upgrading from 1.3.3 to 1.4.0</h1>
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.3. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.3.3. If you
have not upgraded to that version please do so first.</p>
<p>Before performing an update you should take your site offline by replacing the index.php file with a static one.</p>
@@ -119,7 +119,7 @@ $config['enable_hooks'] = FALSE;
| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_-
|
| Leave blank to allow all characters -- but only if you are insane.
-|
+|
| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
|
*/
diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html
index e1590e75f..743e3f317 100644
--- a/user_guide/installation/upgrade_141.html
+++ b/user_guide/installation/upgrade_141.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,7 +62,7 @@ Upgrading from 1.3.3 to 1.4.0
<h1>Upgrading from 1.4.0 to 1.4.1</h1>
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.4.0. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.4.0. If you
have not upgraded to that version please do so first.</p>
<p>Before performing an update you should take your site offline by replacing the index.php file with a static one.</p>
@@ -95,13 +95,13 @@ have not upgraded to that version please do so first.</p>
|--------------------------------------------------------------------------
|
| Enables Gzip output compression for faster page loads. When enabled,
-| the output class will test whether your server supports Gzip.
+| the output class will test whether your server supports Gzip.
| Even if it does, however, not all browsers support compression
| so enable only if you are reasonably sure your visitors can handle it.
|
| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
| means you are prematurely outputting something to your browser. It could
-| even be a line of whitespace at the end of one of your scripts. For
+| even be a line of whitespace at the end of one of your scripts. For
| compression to work, nothing can be sent before the output buffer is called
| by the output class. Do not "echo" any values with compression enabled.
|
diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html
index 4e25c54b4..49e12a548 100644
--- a/user_guide/installation/upgrade_150.html
+++ b/user_guide/installation/upgrade_150.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,7 +62,7 @@ Upgrading from 1.4.1 to 1.5.0
<h1>Upgrading from 1.4.1 to 1.5.0</h1>
-<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.4.1. If you
+<p class="important"><strong>Note:</strong> The instructions on this page assume you are running version 1.4.1. If you
have not upgraded to that version please do so first.</p>
<p>Before performing an update you should take your site offline by replacing the index.php file with a static one.</p>
@@ -110,7 +110,7 @@ $db['default']['cachedir'] = '';
|
| This item allows you to set the filename/classname prefix when extending
| native libraries. For more information please see the user guide:
-|
+|
| http://www.codeigniter.com/user_guide/general/core_classes.html
| http://www.codeigniter.com/user_guide/general/creating_libraries.html
|
@@ -127,7 +127,7 @@ $config['subclass_prefix'] = 'MY_';
| Enable/Disable Error Logging
|--------------------------------------------------------------------------
|
-| If you would like errors or debug messages logged set this variable to
+| If you would like errors or debug messages logged set this variable to
| TRUE (boolean). Note: You must set the file permissions on the "logs" folder
| such that it is writable.
|
@@ -141,7 +141,7 @@ $config['log_errors'] = FALSE;
<h2>Step 4: Update your main index.php file</h2>
-<p>If you are running a stock <dfn>index.php</dfn> file simply replace your version with the new one. If you are running one with
+<p>If you are running a stock <dfn>index.php</dfn> file simply replace your version with the new one. If you are running one with
internal modifications, open it and add this line of code near the bottom:</p>
<code>define('FCPATH', __FILE__);</code>
diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html
index c7563a6fb..ef2cf5288 100644
--- a/user_guide/installation/upgrade_b11.html
+++ b/user_guide/installation/upgrade_b11.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -71,7 +71,7 @@ Upgrading from Beta 1.0 to Beta 1.1
<h2>Step 2: Relocate your config folder</h2>
<p>This version of Code Igniter now permits multiple sets of "applications" to all share a common set of backend files. In order to enable
-each application to have its own configuration values, the <kbd>config</kbd> directory must now reside
+each application to have its own configuration values, the <kbd>config</kbd> directory must now reside
inside of your <dfn>application</dfn> folder, so please move it there.</p>
diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html
index fa6f2acfc..061f8a96f 100644
--- a/user_guide/installation/upgrading.html
+++ b/user_guide/installation/upgrading.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html
index 37252b61c..17e67fc84 100644
--- a/user_guide/libraries/benchmark.html
+++ b/user_guide/libraries/benchmark.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -127,9 +127,9 @@ echo $this->benchmark->elapsed_time('dog', 'bird');</code>
<a name="profiler"></a>
<h2>Profiling Your Benchmark Points</h2>
-<p>If you want your benchmark data to be available to the
-<a href="../general/profiling.html">Profiler</a> all of your marked points must be set up in pairs, and
-each mark point name must end with <kbd>_start</kbd> and <kbd>_end</kbd>.
+<p>If you want your benchmark data to be available to the
+<a href="../general/profiling.html">Profiler</a> all of your marked points must be set up in pairs, and
+each mark point name must end with <kbd>_start</kbd> and <kbd>_end</kbd>.
Each pair of points must otherwise be named identically. Example:</p>
<code>
@@ -158,14 +158,14 @@ is sent to the browser, simply place this in one of your view templates:</p>
<code>&lt;?=$this->benchmark->elapsed_time();?&gt;</code>
-<p>You'll notice that it's the same function used in the examples above to calculate the time between two point, except you are
+<p>You'll notice that it's the same function used in the examples above to calculate the time between two point, except you are
<strong>not</strong> using any parameters. When the parameters are absent, Code Igniter does not stop the benchmark until right before the final
output is sent to the browser. It doesn't matter where you use the function call, the timer will continue to run until the very end.</p>
<p>An alternate way to show your elapsed time in your view files is to use this pseudo-variable, if you prefer not to use the pure PHP:</p>
<code>{elapsed_time}</code>
-<p class="important"><strong>Note:</strong> If you want to benchmark anything within your controller
+<p class="important"><strong>Note:</strong> If you want to benchmark anything within your controller
functions you must set your own start/end points.</p>
<a name="memory"></a>
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html
index a13cadf05..c8a8e80ee 100644
--- a/user_guide/libraries/calendar.html
+++ b/user_guide/libraries/calendar.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -65,7 +65,7 @@ Calendaring Class
<h1>Calendaring Class</h1>
-<p>The Calendar class enables you to dynamically create calendars. Your calendars can be formatted through the use of a calendar
+<p>The Calendar class enables you to dynamically create calendars. Your calendars can be formatted through the use of a calendar
template, allowing 100% control over every aspect of its design. In addition, you can pass data to your calendar cells.</p>
<h2>Initializing the Class</h2>
@@ -112,14 +112,14 @@ echo $this->calendar->generate(<kbd>2006</kbd>, <kbd>6</kbd>, <var>$data</var>);
<p>Using the above example, day numbers 3, 7, 13, and 26 will become links pointing to the URLs you've provided.</p>
-<p class="important"><strong>Note:</strong> By default it is assumed that your array will contain links.
+<p class="important"><strong>Note:</strong> By default it is assumed that your array will contain links.
In the section that explains the calendar template below you'll see how you can customize
how data passed to your cells is handled so you can pass different types of information.</p>
<h2>Setting Display Preferences</h2>
-<p>There are seven preferences you can set to control various aspects of the calendar. Preferences are set using an initialization
+<p>There are seven preferences you can set to control various aspects of the calendar. Preferences are set using an initialization
function similar to other classes. Here is an example:
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html
index f8a9f5207..cd20298aa 100644
--- a/user_guide/libraries/config.html
+++ b/user_guide/libraries/config.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -75,7 +75,7 @@ come from the default config file (<samp>application/config/config.php</samp>) o
your text editor you'll see that config items are stored in an array called <var>$config</var>.</p>
<p>You can add your own config items to
-this file, or if you prefer to keep your configuration items separate (assuming you even need config items),
+this file, or if you prefer to keep your configuration items separate (assuming you even need config items),
simply create your own file and save it in <dfn>config</dfn> folder.</p>
<p><strong>Note:</strong> If you do create your own config files use the same format as the primary one, storing your items in
@@ -84,7 +84,7 @@ the array has the same name (assuming an array index is not named the same as an
<h2>Loading a Config File</h2>
-<p><strong>Note:</strong> Code Igniter automatically loads the primary config file (<samp>application/config/config.php</samp>),
+<p><strong>Note:</strong> Code Igniter automatically loads the primary config file (<samp>application/config/config.php</samp>),
so you will only need to load a config file if you have created your own.</p>
<p>There are two ways to load a config file:</p>
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
index ea1b8680a..b8a68e9d1 100644
--- a/user_guide/libraries/email.html
+++ b/user_guide/libraries/email.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -218,7 +218,7 @@ $this->email->to('<var>$list</var>');</code>
<code>$this->email->set_alt_message('<var>This is the alternative message</var>');</code>
<p>This is an optional message string which can be used if you send HTML formatted email. It lets you specify an alternative
-message with no HTML formatting which is added to the header string for people who do not accept HTML email.
+message with no HTML formatting which is added to the header string for people who do not accept HTML email.
If you do not set your own message Code Igniter will extract the message from your HTML email and strip the tags.</p>
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html
index d541174fb..c80d07dcd 100644
--- a/user_guide/libraries/encryption.html
+++ b/user_guide/libraries/encryption.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -66,14 +66,14 @@ Encryption Class
<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.
+still provide a reasonable degree of security for encrypted sessions or other such "light" purposes.
If Mcrypt is available, you'll effectively end up with a double-encrypted message string, which should
provide a very high degree of security.</p>
<h2>Setting your Key</h2>
-<p>A <em>key</em> is a piece of information that controls the cryptographic process and permits an encrypted string to be decoded.
+<p>A <em>key</em> is a piece of information that controls the cryptographic process and permits an encrypted string to be decoded.
In fact, the key you chose will provide the <strong>only</strong> means to decode data that was encrypted with that key,
so not only must you chose the key carefully, you must never change it if you intend use it for persistent data.</p>
@@ -82,12 +82,12 @@ Should someone gain access to your key, the data will be easily decoded. If you
it's impossible to ensure key security so you may want to think carefully before using it for anything
that requires high security, like storing credit card numbers.</p>
-<p>To take maximum advantage of the encryption algorithm, your key should be 32 characters in length (128 bits).
-The key should be as random a string as you can concoct, with numbers and uppercase and lowercase letters.
-Your key should <strong>not</strong> be a simple text string. In order to be cryptographically secure it
+<p>To take maximum advantage of the encryption algorithm, your key should be 32 characters in length (128 bits).
+The key should be as random a string as you can concoct, with numbers and uppercase and lowercase letters.
+Your key should <strong>not</strong> be a simple text string. In order to be cryptographically secure it
needs to be as random as possible.</p>
-<p>Your key can be either stored in your <dfn>application/config/config.php</dfn>, or you can design your own
+<p>Your key can be either stored in your <dfn>application/config/config.php</dfn>, or you can design your own
storage mechanism and pass the key dynamically when encoding/decoding.</p>
<p>To save your key to your <dfn>application/config/config.php</dfn>, open the file and set:</p>
@@ -96,7 +96,7 @@ storage mechanism and pass the key dynamically when encoding/decoding.</p>
<h2>Message Length</h2>
-<p>It's important for you to know that the encoded messages the encryption function generates will be approximately 2.6 times longer than the original
+<p>It's important for you to know that the encoded messages the encryption function generates will be approximately 2.6 times longer than the original
message. For example, if you encrypt the string "my super secret data", which is 21 characters in length, you'll end up
with an encoded string that is roughly 55 characters (we say "roughly" because the encoded string length increments in
64 bit clusters, so it's not exactly linear). Keep this information in mind when selecting your data storage mechanism. Cookies,
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
index 390b45375..730dd0545 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -63,7 +63,7 @@ File Uploading Class
<h1>File Uploading Class</h1>
-<p>Code Igniter's File Uploading Class permits files to be uploaded. You can set various
+<p>Code Igniter's File Uploading Class permits files to be uploaded. You can set various
preferences, restricting the type and size of the files.</p>
@@ -110,7 +110,7 @@ folder:</p>
</body>
</html></textarea>
-<p>You'll notice we are using a form helper to create the opening form tag. File uploads require a multipart form, so the helper
+<p>You'll notice we are using a form helper to create the opening form tag. File uploads require a multipart form, so the helper
creates the proper syntax for you. You'll also notice we have an $error variable. This is so we can show error messages in the event
the user does something wrong.</p>
@@ -165,7 +165,7 @@ class Upload extends Controller {
{
$this->load->library('upload');
- $config['upload_path'] = './uploads/';
+ $config['upload_path'] = './uploads/';
$config['allowed_types'] = 'gif|jpg|png';
$config['max_size'] = '100';
$config['max_width'] = '1024';
@@ -202,7 +202,7 @@ class Upload extends Controller {
<code>www.your-site.com/index.php/<var>upload</var>/</code>
-<p>You should see an upload form. Try uploading an image file (either a jpg, gif, or png). If the path in your
+<p>You should see an upload form. Try uploading an image file (either a jpg, gif, or png). If the path in your
controller is correct it should work.</p>
@@ -221,7 +221,7 @@ controller is correct it should work.</p>
<h2>Setting Preferences</h2>
-<p>Similar to other libraries, you'll control what is allowed to be upload based on your preferences. In the controller you
+<p>Similar to other libraries, you'll control what is allowed to be upload based on your preferences. In the controller you
built above you set the following preferences:</p>
<code>$config['upload_path'] = './uploads/';<br />
@@ -323,7 +323,7 @@ will NOT need to use the <dfn>$this->upload->initialize</dfn> function if you sa
<h2>$this->upload->do_upload()</h2>
-<p>Performs the upload based on the preferences you've set. Note: By default the upload routine expects the file to come from a form field
+<p>Performs the upload based on the preferences you've set. Note: By default the upload routine expects the file to come from a form field
called <dfn>userfile</dfn>, and the form must be a "multipart type:</p>
<code>&lt;form method="post" action="some_action" enctype="multipart/form-data" /></code>
@@ -347,7 +347,7 @@ returns the data so you can assign it however you need.</p>
<h2>$this->upload->data()</h2>
-<p>This is a helper function that returns an array containing all of the data related to the file you uploaded.
+<p>This is a helper function that returns an array containing all of the data related to the file you uploaded.
Here is the array prototype:</p>
<code>Array<br />
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html
index f2a7a5554..c49cad318 100644
--- a/user_guide/libraries/image_lib.html
+++ b/user_guide/libraries/image_lib.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -75,9 +75,9 @@ Image Manipulation Class
<p>All three major image libraries are supported: GD/GD2, NetPBM, and ImageMagick</p>
-<p class="important"><strong>Note:</strong> Watermarking is only available using the GD/GD2 library.
+<p class="important"><strong>Note:</strong> Watermarking is only available using the GD/GD2 library.
In addition, even though other libraries are supported, GD is required in
-order for the script to calculate the image properties. The image processing, however, will be performed with the
+order for the script to calculate the image properties. The image processing, however, will be performed with the
library you specify.</p>
@@ -110,7 +110,7 @@ $this->image_lib->resize();</code>
<p>The above code tells the <dfn>image_resize</dfn> function to look for an image called <em>mypic.jpg</em>
located in the <dfn>source_image</dfn> folder, then create a thumbnail that is 75 X 50 pixels using the GD2 <dfn>image_library</dfn>.
-Since the <dfn>maintain_ratio</dfn> option is enabled, the thumb will be as close to the target <dfn>width</dfn> and
+Since the <dfn>maintain_ratio</dfn> option is enabled, the thumb will be as close to the target <dfn>width</dfn> and
<dfn>height</dfn> as possible while preserving the original aspect ratio. The thumbnail will be called <em>mypic_thumb.jpg</em>
</p>
@@ -316,7 +316,7 @@ will NOT need to use the <dfn>$this->image_lib->initialize</dfn> function if you
<h2>$this->image_lib->resize()</h2>
-<p>The image resizing function lets you resize the original image, create a copy (with or without resizing),
+<p>The image resizing function lets you resize the original image, create a copy (with or without resizing),
or create a thumbnail image.</p>
<p>For practical purposes there is no difference between creating a copy and creating
@@ -355,7 +355,7 @@ target the original image for processing.</p>
<h2>$this->image_lib->crop()</h2>
-<p>The cropping function works nearly identically to the resizing function except it requires that you set
+<p>The cropping function works nearly identically to the resizing function except it requires that you set
preferences for the X and Y axis (in pixels) specifying where to crop, like this:</p>
<code>$config['x_axis'] = '100';<br />
@@ -380,8 +380,8 @@ if ( ! $this->image_lib->crop())<br />
}</code>
-<p>Note: Without a visual interface it is difficult to crop images, so this function is not very useful
-unless you intend to build such an interface. That's exactly what we did using for the photo
+<p>Note: Without a visual interface it is difficult to crop images, so this function is not very useful
+unless you intend to build such an interface. That's exactly what we did using for the photo
gallery module in ExpressionEngine, the CMS we develop. We added a JavaScript UI that lets the cropping
area be selected.</p>
@@ -430,7 +430,7 @@ if ( ! $this->image_lib->rotate())<br />
<ul>
<li><strong>Text</strong>: The watermark message will be generating using text, either with a True Type font that you specify, or
-using the native text output that the GD library supports. If you use the True Type version your GD installation
+using the native text output that the GD library supports. If you use the True Type version your GD installation
must be compiled with True Type support (most are, but not all).</li>
<li><strong>Overlay</strong>: The watermark message will be generated by overlaying an image (usually a transparent PNG or GIF)
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html
index 0ae956628..e53198836 100644
--- a/user_guide/libraries/input.html
+++ b/user_guide/libraries/input.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -107,7 +107,7 @@ Note: This function should only be used to deal with data upon submission. It's
<code>$data = $this->input->xss_clean($data);</code>
-<p>If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your
+<p>If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your
<kbd>application/config/config.php</kbd> file and setting this:
<code>$config['global_xss_filtering'] = TRUE;</code>
@@ -121,7 +121,7 @@ Note: This function should only be used to deal with data upon submission. It's
<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.
+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:
<code>
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html
index 107865318..c40700147 100644
--- a/user_guide/libraries/language.html
+++ b/user_guide/libraries/language.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -70,7 +70,7 @@ your own language files as needed in order to display error and other messages i
<p>Language files are typically stored in your <dfn>system/language</dfn> directory. Alternately you can create a folder called <kbd>language</kbd> inside
your <kbd>application</kbd> folder and store them there. Code Igniter will look first in your <dfn>system/application/language</dfn>
-directory. If the directory does not exist or the specified language is not located there CI will instead look in your global
+directory. If the directory does not exist or the specified language is not located there CI will instead look in your global
<dfn>system/language</dfn> folder.</p>
<p class="important"><strong>Note:</strong>&nbsp; Each language should be stored in its own folder. For example, the English files are located at:
@@ -87,7 +87,7 @@ containing error messages. You might name it: <kbd>error_lang.php</kbd></p>
<code>$lang['language_key'] = "The actual message to be shown";</code>
-<p><strong>Note:</strong> It's a good practice to use a common prefix for all messages in a given file to avoid collisions with
+<p><strong>Note:</strong> It's a good practice to use a common prefix for all messages in a given file to avoid collisions with
similarly named items in other files. For example, if you are creating error messages you might prefix them with <var>error_</var></p>
<code>$lang['<var>error</var>_email_missing'] = "You must submit an email address";<br />
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index 32bbddfe6..d21359792 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -63,7 +63,7 @@ Loader Class
<h1>Loader Class</h1>
-<p>Loader, as the name suggests, is used to load elements. These elements can be libraries (classes) <a href="../general/views.html">View files</a>,
+<p>Loader, as the name suggests, is used to load elements. These elements can be libraries (classes) <a href="../general/views.html">View files</a>,
<a href="../general/helpers.html">Helpers</a>, <a href="../general/plugins.html">Plugins</a>, or your own files.</p>
<p class="important"><strong>Note:</strong> This class is initialized automatically by the system so there is no need to do it manually.</p>
@@ -74,7 +74,7 @@ Loader Class
<h2>$this->load->library('<var>class_name</var>')</h2>
-<p>This function is used to load core classes. Where <var>class_name</var> is the name of the class you want to load.
+<p>This function is used to load core classes. Where <var>class_name</var> is the name of the class you want to load.
Note: We use the terms "class" and "library" interchangeably.</p>
<p>For example, if you would like to send email with Code Igniter, the first step is to load the email class within your controller:</p>
@@ -85,7 +85,7 @@ Note: We use the terms "class" and "library" interchangeably.</p>
Each library is described in detail in its own page, so please read the information regarding each one you would like to use.</p>
-<p>Parameters can be passed to the library via an array in the second parameter.
+<p>Parameters can be passed to the library via an array in the second parameter.
@@ -107,7 +107,7 @@ user guide it is recommended that you do since it shows you how this function is
<p>The first parameter is required. It is the name of the view file you would like to load.</p>
<p>The second <strong>optional</strong> parameter can take
-an associative array or an object as input, which it runs through the PHP <a href="http://www.php.net/extract">extract</a> function to
+an associative array or an object as input, which it runs through the PHP <a href="http://www.php.net/extract">extract</a> function to
convert to variables that can be used in your view files. Again, read the <a href="../general/views.html">Views</a> page to learn
how this might be useful.</p>
@@ -121,13 +121,13 @@ to your browser. Remember to assign it to a variable if you wan the data return
<h2>$this->load->database('<var>options</var>', <kbd>true/false</kbd>)</h2>
-<p>This function lets you load the database class. The two parameters are <strong>optional</strong>. Please see the
+<p>This function lets you load the database class. The two parameters are <strong>optional</strong>. Please see the
<a href="./database/index.html">database</a> section for more info.</p>
<h2>$this->load->scaffolding('<var>table_name</var>')</h2>
-<p>This function lets you enable scaffolding. Please see the
+<p>This function lets you enable scaffolding. Please see the
<a href="../general/scaffolding.html">scaffolding</a> section for more info.</p>
@@ -135,9 +135,9 @@ to your browser. Remember to assign it to a variable if you wan the data return
<h2>$this->load->vars(<samp>$array</samp>)</h2>
<p>This function takes an associative array as input and generates variables using the PHP <a href="http://www.php.net/extract">extract</a> function.
-This function produces the same result as using the second parameter of the <dfn>$this->load->view()</dfn> function above. The reason you might
-want to use this function independently is if you would like to set some global variables in the constructor of your controller
-and have them become available in any view file loaded from any function. You can have multiple calls to this function. The data get cached
+This function produces the same result as using the second parameter of the <dfn>$this->load->view()</dfn> function above. The reason you might
+want to use this function independently is if you would like to set some global variables in the constructor of your controller
+and have them become available in any view file loaded from any function. You can have multiple calls to this function. The data get cached
and merged into one array for conversion to variables.
</p>
@@ -150,7 +150,7 @@ and merged into one array for conversion to variables.
<p>This function loads plugins files, where <var>file_name</var> is the name of the file, without the <kbd>_plugin.php</kbd> extension.</p>
<h2>$this->load->file('<var>filepath/filename</var>', <kbd>true/false</kbd>)</h2>
-<p>This is a generic file loading function. Supply the filepath and name in the first parameter and it will open and read the file.
+<p>This is a generic file loading function. Supply the filepath and name in the first parameter and it will open and read the file.
By default the data is sent to your browser, just like a View file, but if you set the second parameter to <kbd>true</kbd> (boolean)
it will instead return the data as a string.</p>
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
index dd3ce4232..1fd3554cc 100644
--- a/user_guide/libraries/output.html
+++ b/user_guide/libraries/output.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -68,9 +68,9 @@ also responsible for <a href="../general/caching.html">caching</a> your web page
<p class="important"><strong>Note:</strong> This class is initialized automatically by the system so there is no need to do it manually.</p>
-<p>Under normal circumstances you won't even notice the Output class since it works transparently without your intervention.
+<p>Under normal circumstances you won't even notice the Output class since it works transparently without your intervention.
For example, when you use the <a href="../libraries/loader.html">Loader</a> class to load a view file, it's automatically
-passed to the Output class, which will be called automatically by Code Igniter at the end of system execution.
+passed to the Output class, which will be called automatically by Code Igniter at the end of system execution.
It is possible, however, for you to manually intervene with the output if you need to, using either of the two following functions:</p>
<h2>$this->output->set_output();</h2>
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html
index 317878a08..b641e2423 100644
--- a/user_guide/libraries/pagination.html
+++ b/user_guide/libraries/pagination.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -86,7 +86,7 @@ echo $this->pagination->create_links();</code>
<h3>Notes:</h3>
-<p>The <var>$config</var> array contains your configuration variables. It is passed to the <dfn>$this->pagination->initialize</dfn> function as shown above. Although there are some twenty items you can configure, at
+<p>The <var>$config</var> array contains your configuration variables. It is passed to the <dfn>$this->pagination->initialize</dfn> function as shown above. Although there are some twenty items you can configure, at
minimum you need the three shown. Here is a description of what those items represent:</p>
<ul>
@@ -122,7 +122,7 @@ something different you can specify it.</p>
<h4>$config['num_links'] = 2;</h4>
-<p>The number of "digit" links you would like before and after the selected page number. For example, the number 2
+<p>The number of "digit" links you would like before and after the selected page number. For example, the number 2
will place two digits on either side, as in the example links at the very top of this page.</p>
<h2>Adding Enclosing Markup</h2>
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html
index 091817e11..febeaa572 100644
--- a/user_guide/libraries/parser.html
+++ b/user_guide/libraries/parser.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -88,7 +88,7 @@ variables or variable tag pairs. If you've never used a template engine, pseudo-
PHP from your templates (view files).</p>
<p class="important"><strong>Note:</strong> Code Igniter does <strong>not</strong> require you to use this class
-since using pure PHP in your view pages lets them run a little faster. However, some developers prefer to use a template engine if
+since using pure PHP in your view pages lets them run a little faster. However, some developers prefer to use a template engine if
they work with designers who they feel would find some confusion working with PHP.</p>
<p><strong>Also Note:</strong> The Template Parser Class is <strong>not</strong> not a
@@ -125,7 +125,7 @@ and the second parameter contains an associative array of data to be replaced in
template would contain two variables: {blog_title} and {blog_heading}</p>
<p>There is no need to "echo" or do something with the data returned by <dfn>$this->parser->parse()</dfn>. It is automatically
-passed to the output class to be sent to the browser. However, if you do want the data returned instead of sent to the output class you can
+passed to the output class to be sent to the browser. However, if you do want the data returned instead of sent to the output class you can
pass TRUE (boolean) to the third parameter:</p>
<code>$string = $this->parser->parse('blog_template', $data, TRUE);</code>
@@ -156,7 +156,7 @@ repeated, with each iteration containing new values? Consider the template exam
In a case like this, the entire chunk of data between these pairs would be repeated multiple times, corresponding
to the number of rows in a result.</p>
-<p>Parsing variable pairs is done using the identical code shown above to parse single variables,
+<p>Parsing variable pairs is done using the identical code shown above to parse single variables,
except, you will add a multi-dimensional array corresponding to your variable pair data.
Consider this example:</p>
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index e9302d2c6..5b9d20fb9 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -63,9 +63,9 @@ Session Class
<h1>Session Class</h1>
-<p>The Session class permits you maintain a user's "state" and track their activity while they browse your site.
-The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie.
-It can also store the session data in a database table for added security, as this permits the session ID in the
+<p>The Session class permits you maintain a user's "state" and track their activity while they browse your site.
+The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie.
+It can also store the session data in a database table for added security, as this permits the session ID in the
user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to
use the database option you'll need to create the session table as indicated below.
</p>
@@ -75,7 +75,7 @@ generates its own session data, offering more flexibility for developers.</p>
<h2>Initializing a Session</h2>
-<p>Sessions will typically run globally with each page load, so the session class must either be
+<p>Sessions will typically run globally with each page load, so the session class must either be
<a href="../general/libraries.html">initialized</a> in your
<a href="../general/controllers.html">controller</a> constructors, or it can be
<a href="../general/autoloader.html">auto-loaded</a> by the system.
@@ -91,8 +91,8 @@ will cause it to read, create, and update sessions.</p>
<h2>How do Sessions work?</h2>
-<p>When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie.
-If sessions data does <strong>not</strong> exist (or if it has expired) a new session will be created and saved in the cookie.
+<p>When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie.
+If sessions data does <strong>not</strong> exist (or if it has expired) a new session will be created and saved in the cookie.
If a session does exist, its information will be updated and the cookie will be updated.</p>
<p>It's important for you to understand that once initialized, the Session class runs automatically. There is nothing
@@ -137,7 +137,7 @@ the cookie was written.</p>
<code>$this->session->userdata('<samp>item</samp>');</code>
-<p>Where <samp>item</samp> is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you
+<p>Where <samp>item</samp> is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you
will do this:</p>
<code>$session_id = $this->session->userdata('<samp>session_id</samp>');</code>
@@ -176,13 +176,13 @@ encryption process in particular produces a longer data string than the original
<p>While the session data array stored in the user's cookie contains a Session ID,
unless you store session data in a database there is no way to validate it. For some applications that require little or no
-security, session ID validation may not be needed, but if your application requires security, validation is mandatory.</p>
+security, session ID validation may not be needed, but if your application requires security, validation is mandatory.</p>
<p>When session data is available in a database, every time a valid session is found in the user's cookie, a database
query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never
be updated, they can only be generated when a new session is created.</p>
-<p>In order to store sessions, you must first create a database table for this purpose. Here is the basic
+<p>In order to store sessions, you must first create a database table for this purpose. Here is the basic
prototype (for MySQL) required by the session class:</p>
<textarea class="textarea" style="width:100%" cols="50" rows="8">
@@ -232,7 +232,7 @@ do not need to write your own routine to do it.</p>
<td class="td"><strong>sess_expiration</strong></td>
<td class="td">7200</td>
<td class="td">None</td>
-<td class="td">The number of seconds you would like the session to last. The default value is 2 hours (7200 seconds).
+<td class="td">The number of seconds you would like the session to last. The default value is 2 hours (7200 seconds).
If you would like a non-expiring session set the value to zero: 0</td>
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html
index 10bb4b3d9..d41cc88a8 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -75,8 +75,8 @@ HTML Table Class
<h2>Examples</h2>
-<p>Here is an example showing how you can create a table from a multi-dimensional array.
-Note that the first array index will become the table heading (or you can set your own headings using the
+<p>Here is an example showing how you can create a table from a multi-dimensional array.
+Note that the first array index will become the table heading (or you can set your own headings using the
<dfn>set_heading()</dfn> function described in the function reference below).</p>
<code>
@@ -92,7 +92,7 @@ $data = array(<br />
echo $this->table->generate($data);
</code>
-<p>Here is an example of a table created from a database query result. The table class will automatically generate the
+<p>Here is an example of a table created from a database query result. The table class will automatically generate the
headings based on the table names (or you can set your own headings using the <dfn>set_heading()</dfn> function described
in the function reference below).</p>
@@ -165,7 +165,7 @@ $tmpl = array (<br />
$this->table->set_template($tmpl);
</code>
-<p class="important"><strong>Note:</strong>&nbsp; You'll notice there are two sets of "row" blocks in the template. These permit you to create alternating row colors or design elements that alternate with each
+<p class="important"><strong>Note:</strong>&nbsp; You'll notice there are two sets of "row" blocks in the template. These permit you to create alternating row colors or design elements that alternate with each
iteration of the row data.</p>
<p>You are NOT required to submit a complete template. If you only need to change parts of the layout you can simply submit those elements.
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
index ff71ea934..d3357be04 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -123,7 +123,7 @@ else<br />
<p>Receiving Trackbacks is a little more complex than sending them, only because you will need a database table in which to store them,
and you will need to validate the incoming trackback data. You are encouraged to implement a thorough validation process to
guard against spam and duplicate data. You may also want to limit the number of Trackbacks you allow from a particular IP within
-a given span of time to further curtail spam. The process of receiving a Trackback is quite simple;
+a given span of time to further curtail spam. The process of receiving a Trackback is quite simple;
the validation is what takes most of the effort.</p>
<h2>Your Ping URL</h2>
@@ -132,7 +132,7 @@ the validation is what takes most of the effort.</p>
that people will use to send you Trackbacks (we will refer to this as your "Ping URL").</p>
<p>Your Ping URL must point to a controller function where your Trackback receiving code is located, and the URL
-must contain the ID number for each particular entry, so that when the Trackback is received you'll be
+must contain the ID number for each particular entry, so that when the Trackback is received you'll be
able to associate it with a particular entry.</p>
<p>For example, if your controller class is called <dfn>Trackback</dfn>, and the receiving function is called <dfn>receive</dfn>, your
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index f0b3782a9..02229e572 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -66,8 +66,8 @@ Unit Testing Class
<p>Unit testing is an approach to software development in which tests are written for each function in your application.
If you are not familiar with the concept you might do a little googling on the subject.</p>
-<p>Code Igniter's Unit Test class is quite simple, consisting of an evaluation function and two result functions.
-It's not intended to be a full-blown test suite but rather a simple mechanism to evaluate your code
+<p>Code Igniter's Unit Test class is quite simple, consisting of an evaluation function and two result functions.
+It's not intended to be a full-blown test suite but rather a simple mechanism to evaluate your code
to determine if it is producing the correct data type and result.
</p>
@@ -86,7 +86,7 @@ to determine if it is producing the correct data type and result.
<h2>$this->unit->run( <var>test</var>, <var>expected result</var>, '<var>test name</var>' );</h2>
-<p>Where <var>test</var> is the result of the code you wish to test,
+<p>Where <var>test</var> is the result of the code you wish to test,
<var>expected result</var> is the data type you expect, and <var>test name</var> is an optional name you can give your test. Example:</p>
<code>$test = 1 + 1;<br />
@@ -105,7 +105,7 @@ $this->unit->run($test, $expected_result, $test_name);</code>
<code>$this->unit->run('Foo', 'is_string');</code>
-<p>Notice the use of "is_string" in the second parameter? This tells the function to evaluate whether your test is producing a string
+<p>Notice the use of "is_string" in the second parameter? This tells the function to evaluate whether your test is producing a string
as the result. Here is a list of allowed comparison types:</p>
<ul>
@@ -124,7 +124,7 @@ as the result. Here is a list of allowed comparison types:</p>
<h2>Generating Reports</h2>
-<p>You can either display results after each test, or your can run several tests and generate a report at the end.
+<p>You can either display results after each test, or your can run several tests and generate a report at the end.
To show a report directly simply echo or return the <var>run</var> function:</p>
<code>echo $this->unit->run($test, $expected_result);</code>
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
index 9218c0d7f..367e1b798 100644
--- a/user_guide/libraries/uri.html
+++ b/user_guide/libraries/uri.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -70,7 +70,7 @@ also retrieve information about the re-routed segments.</p>
<h2>$this->uri->segment(<var>n</var>)</h2>
-<p>Permits you to retrieve a specific segment. Where <var>n</var> is the segment number you wish to retrieve.
+<p>Permits you to retrieve a specific segment. Where <var>n</var> is the segment number you wish to retrieve.
Segments are numbered from left to right. For example, if your full URL is this:</p>
<code>http://www.your-site.com/index.php/news/local/metro/crime_is_up</code>
@@ -84,7 +84,7 @@ Segments are numbered from left to right. For example, if your full URL is this:
<li>crime_is_up</li>
</ol>
-<p>By default the function returns FALSE (boolean) if the segment does not exist. There is an optional second parameter that
+<p>By default the function returns FALSE (boolean) if the segment does not exist. There is an optional second parameter that
permits you to set your own default value if the segment is missing.
For example, this would tell the function to return the number zero in the event of failure:</p>
diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html
index 6028f7981..86403205d 100644
--- a/user_guide/libraries/user_agent.html
+++ b/user_guide/libraries/user_agent.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -126,7 +126,7 @@ echo $this->agent->platform(); // Platform info (Windows, Linux, Mac, etc.)
<p>Returns TRUE/FALSE (boolean) if the user agent is a known robot.</p>
<p class="important"><strong>Note:</strong>&nbsp; The user agent library only contains the most common robot
-definitions. It is not a complete list of bots. There are hundreds of them so searching for each one would not be
+definitions. It is not a complete list of bots. There are hundreds of them so searching for each one would not be
very efficient. If you find that some bots that commonly visit your site are missing from the list you can add them to your
<dfn>application/config/user_agents.php</dfn> file.</p>
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html
index 0a4905a71..aaf416dac 100644
--- a/user_guide/libraries/validation.html
+++ b/user_guide/libraries/validation.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -75,8 +75,8 @@ Form Validation
<ol>
<li>Check for required data.</li>
-<li>Verify that the data is of the correct type, and meets the correct criteria. (For example, if a username is submitted
-it must be validated to contain only permitted characters. It must be of a minimum length,
+<li>Verify that the data is of the correct type, and meets the correct criteria. (For example, if a username is submitted
+it must be validated to contain only permitted characters. It must be of a minimum length,
and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.)
<li>Sanitize the data for security.</li>
<li>Pre-format the data if needed (Does the data need to be trimmed? HTML encoded? Etc.)</li>
@@ -195,7 +195,7 @@ class Form extends Controller {
<code>www.your-site.com/index.php/<var>form</var>/</code>
-<p><strong>If you submit the form you should simply see the form reload. That's because you haven't set up any validation
+<p><strong>If you submit the form you should simply see the form reload. That's because you haven't set up any validation
rules yet, which we'll get to in a moment.</strong></p>
@@ -219,8 +219,8 @@ and flexible in the event your URLs change.</li>
</ol>
<p>The <dfn>controller</dfn> (form.php) has one function: <dfn>index()</dfn>. This function initializes the validation class and
-loads the <var>form helper</var> and <var>URL helper</var> used by your view files. It also <samp>runs</samp>
-the validation routine. Based on
+loads the <var>form helper</var> and <var>URL helper</var> used by your view files. It also <samp>runs</samp>
+the validation routine. Based on
whether the validation was successful it either presents the form or the success page.</p>
<p><strong>Since you haven't told the validation class to validate anything yet, it returns "false" (boolean false) by default. The <samp>run()</samp>
@@ -313,7 +313,7 @@ $rules['email'] = "required|valid_email";</code>
<h2>Prepping Data</h2>
-<p>In addition to the validation functions like the ones we used above, you can also prep your data in various ways.
+<p>In addition to the validation functions like the ones we used above, you can also prep your data in various ways.
For example, you can set up rules like this:
<code>$rules['username'] = "<kbd>trim</kbd>|required|min_length[5]|max_length[12]|<kbd>xss_clean</kbd>";<br />
@@ -391,17 +391,17 @@ callback function for you to process.</p>
<p><strong>To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.</strong></p>
-<p>The error message was set using the <dfn>$this->validation->set_message</dfn> function.
+<p>The error message was set using the <dfn>$this->validation->set_message</dfn> function.
Just remember that the message key (the first parameter) must match your function name.</p>
-<p class="important"><strong>Note:</strong> You can apply your own custom error messages to any rule, just by setting the
+<p class="important"><strong>Note:</strong> You can apply your own custom error messages to any rule, just by setting the
message similarly. For example, to change the message for the "required" rule you will do this:</p>
<code>$this->validation->set_message('required', 'Your custom message here');</code>
<h2>Re-populating the form</h2>
-<p>Thus far we have only been dealing with errors. It's time to repopulate the form field with the submitted data.
+<p>Thus far we have only been dealing with errors. It's time to repopulate the form field with the submitted data.
This is done similarly to your rules. Add the following code to your controller, just below your rules:</p>
<code>$fields['username'] = 'Username';<br />
@@ -411,7 +411,7 @@ $fields['email'] = 'Email Address';<br />
<br />
$this->validation->set_fields($fields);</code>
-<p>The array keys are the actual names of the form fields, the value represents the full name that you want shown in the
+<p>The array keys are the actual names of the form fields, the value represents the full name that you want shown in the
error message.</p>
<p>The index function of your controller should now look like this:</p>
@@ -512,7 +512,7 @@ and the error messages will contain a more relevant field name.</p>
have set (&lt;p> tags by default).</p>
<p class="important"><strong>Note: </strong>To display errors this way you must remember to set your fields using the <kbd>$this->validation->set_fields</kbd>
-function described earlier. The errors will be turned into variables that have "_error" after your field name.
+function described earlier. The errors will be turned into variables that have "_error" after your field name.
For example, your "username" error will be available at:<br /><dfn>$this->validation->username_error</dfn>.</p>
@@ -666,7 +666,7 @@ like <kbd>trim</kbd>, <kbd>htmlspecialchars</kbd>, <kbd>urldecode</kbd>, etc.</p
<h2>Dealing with Select Menus, Radio Buttons, and Checkboxes</h2>
-<p>If you use select menus, radio buttons or checkboxes, you will want the state of
+<p>If you use select menus, radio buttons or checkboxes, you will want the state of
these items to be retained in the event of an error. The Validation class has three functions that help you do this:</p>
<h2>set_select()</h2>
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html
index 7cd00a268..d768659a5 100644
--- a/user_guide/libraries/xmlrpc.html
+++ b/user_guide/libraries/xmlrpc.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -64,18 +64,18 @@ XML-RPC and XML-RPC Server Classes
<h1>XML-RPC and XML-RPC Server Classes</h1>
-<p>Code Igniter's XML-RPC classes permit you to send requests to another server, or set up
+<p>Code Igniter's XML-RPC classes permit you to send requests to another server, or set up
your own XML-RPC server to receive requests.</p>
<h2>What is XML-RPC?</h2>
-<p>Quite simply it is a way for two computers to communicate over the internet using XML.
-One computer, which we will call the <dfn>client</dfn>, sends an XML-RPC <strong>request</strong> to
+<p>Quite simply it is a way for two computers to communicate over the internet using XML.
+One computer, which we will call the <dfn>client</dfn>, sends an XML-RPC <strong>request</strong> to
another computer, which we will call the <dfn>server</dfn>. Once the server receives and processes the request it
will send back a <strong>response</strong> to the client.</p>
-<p>For example, using the MetaWeblog API, an XML-RPC Client (usually a desktop publishing tool) will
+<p>For example, using the MetaWeblog API, an XML-RPC Client (usually a desktop publishing tool) will
send a request to an XML-RPC Server running on your site. This request might be a new weblog entry
being sent for publication, or it could be a request for an existing entry for editing.
@@ -141,12 +141,12 @@ sent back from the XML-RPC Server.</p>
<h2>Anatomy of a Request</h2>
-<p>An XML-RPC <dfn>request</dfn> is simply the data you are sending to the XML-RPC server. Each piece of data in a request
-is referred to as a <dfn>request parameter</dfn>. The above example has two parameters:
+<p>An XML-RPC <dfn>request</dfn> is simply the data you are sending to the XML-RPC server. Each piece of data in a request
+is referred to as a <dfn>request parameter</dfn>. The above example has two parameters:
The URL and title of your site. When the XML-RPC server receives your request, it will look for parameters it requires.</p>
<p>Request parameters must be placed into an array for transportation, and each parameter can be one
-of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings
+of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings
you will have to include the data type in the request array.</p>
<p>Here is an example of a simple array with three parameters:</p>
@@ -173,10 +173,10 @@ The <a href="#datatypes">Data Types</a> section below has a full list of data
<h2>Creating an XML-RPC Server</h2>
-<p>An XML-RPC Server acts as a traffic cop of sorts, waiting for incoming requests and redirecting them to the
+<p>An XML-RPC Server acts as a traffic cop of sorts, waiting for incoming requests and redirecting them to the
appropriate functions for processing.</p>
-<p>To create your own XML-RPC server involves initializing the XML-RPC Server class in your controller where you expect the incoming
+<p>To create your own XML-RPC server involves initializing the XML-RPC Server class in your controller where you expect the incoming
request to appear, then setting up an array with mapping instructions so that incoming requests can be sent to the appropriate
class and method for processing.</p>
@@ -192,15 +192,15 @@ $config['functions']['<var>update_post</var>'] = array('function' => '<dfn>My_bl
$this->xmlrpcs->initialize($config);<br />
$this->xmlrpcs->serve();</code>
-<p>The above example contains an array specifying two method requests that the Server allows.
+<p>The above example contains an array specifying two method requests that the Server allows.
The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right.
-<p>In other words, if an XML-RPC Client sends a request for the <var>new_post</var> method, your
+<p>In other words, if an XML-RPC Client sends a request for the <var>new_post</var> method, your
server will load the <dfn>My_blog</dfn> class and call the <dfn>new_entry</dfn> function.
-If the request is for the <var>update_post</var> method, your
+If the request is for the <var>update_post</var> method, your
server will load the <dfn>My_blog</dfn> class and call the <dfn>update_entry</dfn> function.</p>
-<p>The function names in the above example are arbitrary. You'll decide what they should be called on your server,
+<p>The function names in the above example are arbitrary. You'll decide what they should be called on your server,
or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.</p>
@@ -225,7 +225,7 @@ to exist with this prototype:</p>
Using this object you will have access to the <em>request parameters</em> enabling you to process the request. When
you are done you will send a <dfn>Response</dfn> back to the Client.<p>
-<p>Below is a real-world example, using the Blogger API. One of the methods in the Blogger API is <dfn>getUserInfo()</dfn>.
+<p>Below is a real-world example, using the Blogger API. One of the methods in the Blogger API is <dfn>getUserInfo()</dfn>.
Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends
back information about that particular user (nickname, user ID, email address, etc.). Here is how the processing
function might look:</p>
@@ -279,7 +279,7 @@ can be only one primary array index. In other words, the basic prototype is thi
<code>$request = array('Response data', 'array');</code>
-<p>Responses, however, usually contain multiple pieces of information. In order to accomplish this we must put the response into its own
+<p>Responses, however, usually contain multiple pieces of information. In order to accomplish this we must put the response into its own
array so that the primary array continues to contain a single piece of data. Here's an example showing how this might be accomplished:</p>
<code>
@@ -314,12 +314,12 @@ $request = array (<br />
<h2>Creating Your Own Client and Server</h2>
-<p>To help you understand everything we've covered thus far, let's create a couple controllers that act as
+<p>To help you understand everything we've covered thus far, let's create a couple controllers that act as
XML-RPC Client and Server. You'll use the Client to send a request to the Server and receive a response.</p>
<h3>The Client</h3>
-<p>Using a text editor, create a controller called <dfn>xmlrpc_client.php</dfn>.
+<p>Using a text editor, create a controller called <dfn>xmlrpc_client.php</dfn>.
In it, place this code and save it to your <samp>applications/controllers/</samp> folder:</p>
<textarea class="textarea" style="width:100%" cols="50" rows="32"><?php
@@ -357,7 +357,7 @@ class Xmlrpc_client extends Controller {
<h3>The Server</h3>
-<p>Using a text editor, create a controller called <dfn>xmlrpc_server.php</dfn>.
+<p>Using a text editor, create a controller called <dfn>xmlrpc_server.php</dfn>.
In it, place this code and save it to your <samp>applications/controllers/</samp> folder:</p>
<textarea class="textarea" style="width:100%" cols="50" rows="30"><?php
@@ -386,7 +386,7 @@ class Xmlrpc_server extends Controller {
'you_said' => $parameters['0'],
'i_respond' => 'Not bad at all.'),
'struct');
-
+
return $this->xmlrpc->send_response($response);
}
}
@@ -442,7 +442,7 @@ $this->xmlrpc->request($request);</code>
<code>$this->xmlrpc->display_response();</code>
<h2>$this->xmlrpc->send_error_message()</h2>
-<p>This function lets you send an error message from your server to the client. First parameter is the error number while the second parameter
+<p>This function lets you send an error message from your server to the client. First parameter is the error number while the second parameter
is the error message.</p>
<code>return $this->xmlrpc->send_error_message('123', 'Requested data not available');</code>
diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html
index c03b54fbf..6f0a38f73 100644
--- a/user_guide/libraries/zip.html
+++ b/user_guide/libraries/zip.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -62,7 +62,7 @@ Zip Encoding Class
<h1>Zip Encoding Class</h1>
-<p>Code Igniter's Zip Encoding Class classes permit you to create Zip archives. Archives can be downloaded to your
+<p>Code Igniter's Zip Encoding Class classes permit you to create Zip archives. Archives can be downloaded to your
desktop or saved to a directory.</p>
@@ -116,7 +116,7 @@ $this->zip->add_data($name, $data);
</code>
-<p>You are allowed to have multiple calls to this function in order to
+<p>You are allowed to have multiple calls to this function in order to
add several files to your archive. Example:</p>
<code>
diff --git a/user_guide/license.html b/user_guide/license.html
index 681ebba7d..b668ac7af 100644
--- a/user_guide/license.html
+++ b/user_guide/license.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -65,7 +65,7 @@ License Agreement
<h1>Code Igniter License Agreement</h1>
-<p>Copyright (c) 2006, pMachine, Inc.<br />
+<p>Copyright (c) 2006, pMachine, Inc.<br />
All rights reserved.</p>
<p>This license is a legal agreement between you and pMachine Inc. for the use of Code Igniter Software (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.</p>
diff --git a/user_guide/nav/moo.fx.pack.js b/user_guide/nav/moo.fx.pack.js
index 8b4228329..b5c360c30 100755
--- a/user_guide/nav/moo.fx.pack.js
+++ b/user_guide/nav/moo.fx.pack.js
@@ -24,7 +24,7 @@ fx.Text.prototype = Object.extend(new fx.Base(), {
fx.Resize = Class.create();
fx.Resize.prototype = {
initialize: function(el, options) {
- this.h = new fx.Height(el, options);
+ this.h = new fx.Height(el, options);
if (options) options.onComplete = null;
this.w = new fx.Width(el, options);
this.el = $(el);
@@ -93,8 +93,8 @@ Multi.prototype = {
getElementsFromArray: function(array) {
var elements = new Array();
- for (i=0;i<array.length;i++) {
- elements.push($(array[i]));
+ for (i=0;i<array.length;i++) {
+ elements.push($(array[i]));
}
return elements;
}
diff --git a/user_guide/nav/prototype.lite.js b/user_guide/nav/prototype.lite.js
index f1520e2c6..e6c362279 100755
--- a/user_guide/nav/prototype.lite.js
+++ b/user_guide/nav/prototype.lite.js
@@ -12,15 +12,15 @@
var Class = {
create: function() {
- return function() {
- this.initialize.apply(this, arguments);
- }
+ return function() {
+ this.initialize.apply(this, arguments);
+ }
}
}
Object.extend = function(destination, source) {
for (property in source) {
- destination[property] = source[property];
+ destination[property] = source[property];
}
return destination;
}
@@ -28,7 +28,7 @@ Object.extend = function(destination, source) {
Function.prototype.bind = function(object) {
var __method = this;
return function() {
- return __method.apply(object, arguments);
+ return __method.apply(object, arguments);
}
}
@@ -36,14 +36,14 @@ function $() {
var elements = new Array();
for (var i = 0; i < arguments.length; i++) {
- var element = arguments[i];
- if (typeof element == 'string')
- element = document.getElementById(element);
+ var element = arguments[i];
+ if (typeof element == 'string')
+ element = document.getElementById(element);
- if (arguments.length == 1)
- return element;
+ if (arguments.length == 1)
+ return element;
- elements.push(element);
+ elements.push(element);
}
return elements;
@@ -54,18 +54,18 @@ function $() {
document.getElementsByClassName = function(className) {
var children = document.getElementsByTagName('*') || document.all;
var elements = new Array();
-
+
for (var i = 0; i < children.length; i++) {
- var child = children[i];
- var classNames = child.className.split(' ');
- for (var j = 0; j < classNames.length; j++) {
- if (classNames[j] == className) {
- elements.push(child);
- break;
- }
- }
+ var child = children[i];
+ var classNames = child.className.split(' ');
+ for (var j = 0; j < classNames.length; j++) {
+ if (classNames[j] == className) {
+ elements.push(child);
+ break;
+ }
+ }
}
-
+
return elements;
}
@@ -77,51 +77,51 @@ if (!window.Element) {
Object.extend(Element, {
remove: function(element) {
- element = $(element);
- element.parentNode.removeChild(element);
+ element = $(element);
+ element.parentNode.removeChild(element);
},
hasClassName: function(element, className) {
- element = $(element);
- if (!element)
- return;
- var a = element.className.split(' ');
- for (var i = 0; i < a.length; i++) {
- if (a[i] == className)
- return true;
- }
- return false;
+ element = $(element);
+ if (!element)
+ return;
+ var a = element.className.split(' ');
+ for (var i = 0; i < a.length; i++) {
+ if (a[i] == className)
+ return true;
+ }
+ return false;
},
addClassName: function(element, className) {
- element = $(element);
- Element.removeClassName(element, className);
- element.className += ' ' + className;
+ element = $(element);
+ Element.removeClassName(element, className);
+ element.className += ' ' + className;
},
-
+
removeClassName: function(element, className) {
- element = $(element);
- if (!element)
- return;
- var newClassName = '';
- var a = element.className.split(' ');
- for (var i = 0; i < a.length; i++) {
- if (a[i] != className) {
- if (i > 0)
- newClassName += ' ';
- newClassName += a[i];
- }
- }
- element.className = newClassName;
+ element = $(element);
+ if (!element)
+ return;
+ var newClassName = '';
+ var a = element.className.split(' ');
+ for (var i = 0; i < a.length; i++) {
+ if (a[i] != className) {
+ if (i > 0)
+ newClassName += ' ';
+ newClassName += a[i];
+ }
+ }
+ element.className = newClassName;
},
-
+
// removes whitespace-only text node children
cleanWhitespace: function(element) {
- element = $(element);
- for (var i = 0; i < element.childNodes.length; i++) {
- var node = element.childNodes[i];
- if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
- Element.remove(node);
- }
+ element = $(element);
+ for (var i = 0; i < element.childNodes.length; i++) {
+ var node = element.childNodes[i];
+ if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+ Element.remove(node);
+ }
}
}); \ No newline at end of file
diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html
index a0ae1dee5..4b0d5d161 100644
--- a/user_guide/overview/appflow.html
+++ b/user_guide/overview/appflow.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html
index ad2a0e794..2ca15af62 100644
--- a/user_guide/overview/at_a_glance.html
+++ b/user_guide/overview/at_a_glance.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -65,9 +65,9 @@ What is Code Igniter?
<h2>Code Igniter is an Application Framework</h2>
-<p>Code Igniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code
+<p>Code Igniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code
from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and
-logical structure to access these libraries. Code Igniter lets you creatively focus on your project by
+logical structure to access these libraries. Code Igniter lets you creatively focus on your project by
minimizing the amount of code needed for a given task.</p>
<h2>Code Igniter is Free</h2>
@@ -76,9 +76,9 @@ For more information please read the <a href="../license.html">license agreement
<h2>Code Igniter Runs on PHP 4</h2>
-<p>Code Igniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling
-in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance),
-at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our
+<p>Code Igniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling
+in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance),
+at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our
potential audience. Major OS vendors like RedHat have yet to support PHP 5, and they are unlikely to do so until 2007, so
we felt that it did not serve the best interests of the PHP community to write Code Igniter in PHP 5.</p>
@@ -99,7 +99,7 @@ is very lean and quite fast.
This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.</p>
<h2>Code Igniter Generates Clean URLs</h2>
-<p>The URLs generated by Code Igniter are clean and search-engine friendly. Rather than using the standard "query string"
+<p>The URLs generated by Code Igniter are clean and search-engine friendly. Rather than using the standard "query string"
approach to URLs that is synonymous with dynamic systems, Code Igniter uses a segment-based approach:</p>
<code>www.your-site.com/<var>news</var>/<dfn>article</dfn>/<samp>345</samp></code>
@@ -107,7 +107,7 @@ approach to URLs that is synonymous with dynamic systems, Code Igniter uses a se
<p>Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.</p>
<h2>Code Igniter Packs a Punch</h2>
-<p>Code Igniter comes with a very nice set of libraries that enable the most commonly needed web development tasks,
+<p>Code Igniter comes with a very nice set of libraries that enable the most commonly needed web development tasks,
like accessing a database, sending email, validating form data, maintaining sessions, manipulating images, working with XML-RPC data and more.</p>
<h2>Code Igniter is Extensible</h2>
@@ -116,7 +116,7 @@ like accessing a database, sending email, validating form data, maintaining sess
<h2>Code Igniter Does Not Require a Template Engine</h2>
<p>Although Code Igniter <em>does</em> come with a simple template parser that can be optionally used, it does not force you to use one.
-Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template
+Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template
engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:</p>
<code>&lt;ul><br />
@@ -133,7 +133,7 @@ engine is usually only marginally easier than learning the basics of PHP. Consi
<code>&lt;ul><br />
<br />
-{foreach from=$addressbook item="name"}<br />
+{foreach from=$addressbook item="name"}<br />
<br />
&lt;li>{$name}&lt;/li><br />
<br />
@@ -141,13 +141,13 @@ engine is usually only marginally easier than learning the basics of PHP. Consi
<br />
&lt;/ul></code>
-<p>Yes, the template engine example is a bit cleaner, but it comes at the price of performance, as the pseudo-code must be converted
+<p>Yes, the template engine example is a bit cleaner, but it comes at the price of performance, as the pseudo-code must be converted
back into PHP to run. Since one of our goals is <em>maximum performance</em>, we opted to not require the use of a template engine.</p>
<h2>Code Igniter is Thoroughly Documented</h2>
<p>Programmers love to code and hate to write documentation. We're no different, of course, but
-since documentation is <strong>as important</strong> as the code itself,
+since documentation is <strong>as important</strong> as the code itself,
we are committed to doing it. Our source code is extremely clean and well commented as well.</p>
diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html
index 4e013f50d..0d4fdffc8 100644
--- a/user_guide/overview/features.html
+++ b/user_guide/overview/features.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -66,7 +66,7 @@ Features
<p>Features in and of themselves are a very poor way to judge an application since they tell you nothing
about the user experience, or how intuitively or intelligently it is designed. Features
don't reveal anything about the quality of the code, or the performance, or the attention to detail, or security practices.
-The only way to really judge an app is to try it and get to know the code. <a href="../installation/">Installing</a>
+The only way to really judge an app is to try it and get to know the code. <a href="../installation/">Installing</a>
Code Igniter is child's play so we encourage you to do just that. In the mean time here's a list of Code Igniter's main features.</p>
<ul>
diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html
index 97d0774ed..c5bf9bafc 100644
--- a/user_guide/overview/goals.html
+++ b/user_guide/overview/goals.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -66,7 +66,7 @@ Goals
<p>Our goal for Code Igniter is <dfn>maximum performance, capability, and flexibility in the smallest, lightest possible package</dfn>.</p>
-<p>To meet this goal we are committed to benchmarking, re-factoring, and simplifying at every step of the development process,
+<p>To meet this goal we are committed to benchmarking, re-factoring, and simplifying at every step of the development process,
rejecting anything that doesn't further the stated objective.</p>
<p>From an technical and architectural standpoint, Code Igniter was created with the following objectives:</p>
diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html
index 83a59f769..beaaa47b4 100644
--- a/user_guide/overview/index.html
+++ b/user_guide/overview/index.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html
index 0f5fbe89b..3d577e902 100644
--- a/user_guide/overview/mvc.html
+++ b/user_guide/overview/mvc.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -63,12 +63,12 @@ MVC
<h1>Model-View-Controller</h1>
-<p>Code Igniter is based on the Model-View-Controller development pattern.
+<p>Code Igniter is based on the Model-View-Controller development pattern.
MVC is a software approach that separates application logic from presentation. In practice, it permits your web pages to contain minimal scripting since the presentation is separate from the PHP scripting.</p>
<ul>
-<li>The <strong>Model</strong> represents your data structures. Typically your model classes will contains functions that help you
+<li>The <strong>Model</strong> represents your data structures. Typically your model classes will contains functions that help you
retrieve, insert, and update information in your your database.</li>
<li>The <strong>View</strong> is the information that is being presented to a user. A View will normally be a web page, but
in Code Igniter, a view can also be a page fragment like a header or footer. It can also be an RSS page, or any other type of "page".</li>
@@ -77,9 +77,9 @@ and any other resources needed to process the HTTP request and generate a web pa
</ul>
-<p>Code Igniter has a fairly loose approach to MVC since Models are not required.
+<p>Code Igniter has a fairly loose approach to MVC since Models are not required.
If you don't need the added separation, or find that maintaining models requires more complexity than you
-want, you can ignore them and build your application minimally using Controllers and Views. Code Igniter also
+want, you can ignore them and build your application minimally using Controllers and Views. Code Igniter also
enables you to incorporate your own existing scripts, or even develop core libraries for the system,
enabling you to work in a way that makes the most sense to you.</p>
diff --git a/user_guide/toc.html b/user_guide/toc.html
index 7f16ee8c1..880dc228d 100644
--- a/user_guide/toc.html
+++ b/user_guide/toc.html
@@ -12,7 +12,7 @@
<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 = new fx.Height('nav', {duration: 400});
myHeight.hide();
}
</script>
@@ -64,111 +64,111 @@ Table of Contents
<h1>Table of Contents</h1>
-<h3>Basic Info</h3>
-<ul>
- <li><a href="./general/requirements.html">Server Requirements</a></li>
- <li><a href="license.html">License Agreement</a></li>
- <li><a href="changelog.html">Change Log</a></li>
- <li><a href="./general/credits.html">Credits</a></li>
+<h3>Basic Info</h3>
+<ul>
+ <li><a href="./general/requirements.html">Server Requirements</a></li>
+ <li><a href="license.html">License Agreement</a></li>
+ <li><a href="changelog.html">Change Log</a></li>
+ <li><a href="./general/credits.html">Credits</a></li>
</ul>
-<h3>Installation</h3>
-<ul>
- <li><a href="./installation/downloads.html">Downloading Code Igniter </a></li>
- <li><a href="./installation/index.html">Installation Instructions</a></li>
- <li><a href="./installation/upgrading.html">Upgrading from an Previous Version</a></li>
- <li><a href="./installation/troubleshooting.html">Troubleshooting</a></li>
-</ul>
-
-<h3>Introduction</h3>
-<ul>
- <li><a href="./overview/at_a_glance.html">Code Igniter at a Glance</a></li>
- <li><a href="./overview/features.html">Supported Features</a></li>
- <li><a href="./overview/appflow.html">Application Flow Chart</a></li>
- <li><a href="./overview/mvc.html">Model-View-Controller</a></li>
- <li><a href="./overview/goals.html">Architectural Goals</a></li>
+<h3>Installation</h3>
+<ul>
+ <li><a href="./installation/downloads.html">Downloading Code Igniter </a></li>
+ <li><a href="./installation/index.html">Installation Instructions</a></li>
+ <li><a href="./installation/upgrading.html">Upgrading from an Previous Version</a></li>
+ <li><a href="./installation/troubleshooting.html">Troubleshooting</a></li>
+</ul>
+
+<h3>Introduction</h3>
+<ul>
+ <li><a href="./overview/at_a_glance.html">Code Igniter at a Glance</a></li>
+ <li><a href="./overview/features.html">Supported Features</a></li>
+ <li><a href="./overview/appflow.html">Application Flow Chart</a></li>
+ <li><a href="./overview/mvc.html">Model-View-Controller</a></li>
+ <li><a href="./overview/goals.html">Architectural Goals</a></li>
</ul>
-<h3>General Topics</h3>
-<ul>
- <li><a href="./general/index.html">Getting Started</a></li>
- <li><a href="./general/urls.html">Code Igniter URLs</a></li>
- <li><a href="./general/controllers.html">Controllers</a></li>
- <li><a href="./general/views.html">Views</a></li>
- <li><a href="./general/models.html">Models</a></li>
- <li><a href="./general/helpers.html">Helpers</a></li>
- <li><a href="./general/plugins.html">Plugins</a></li>
- <li><a href="./general/libraries.html">Using Code Igniter Libraries</a></li>
- <li><a href="./general/creating_libraries.html">Creating Your Own Libraries</a></li>
+<h3>General Topics</h3>
+<ul>
+ <li><a href="./general/index.html">Getting Started</a></li>
+ <li><a href="./general/urls.html">Code Igniter URLs</a></li>
+ <li><a href="./general/controllers.html">Controllers</a></li>
+ <li><a href="./general/views.html">Views</a></li>
+ <li><a href="./general/models.html">Models</a></li>
+ <li><a href="./general/helpers.html">Helpers</a></li>
+ <li><a href="./general/plugins.html">Plugins</a></li>
+ <li><a href="./general/libraries.html">Using Code Igniter Libraries</a></li>
+ <li><a href="./general/creating_libraries.html">Creating Your Own Libraries</a></li>
<li><a href="./general/core_classes.html">Creating Core Classes</a></li>
- <li><a href="./general/hooks.html">Hooks - Extending the Core</a></li>
- <li><a href="./general/autoloader.html">Auto-loading Resources</a></li>
- <li><a href="./general/scaffolding.html">Scaffolding</a></li>
- <li><a href="./general/routing.html">URI Routing</a></li>
- <li><a href="./general/errors.html">Error Handling</a></li>
- <li><a href="./general/caching.html">Caching</a></li>
- <li><a href="./general/profiling.html">Profiling Your Application</a></li>
- <li><a href="./general/multiple_apps.html">Running Multiple Applications</a></li>
- <li><a href="./general/alternative_php.html">Alternative PHP Syntax</a></li>
- <li><a href="./general/security.html">Security</a></li>
-</ul>
+ <li><a href="./general/hooks.html">Hooks - Extending the Core</a></li>
+ <li><a href="./general/autoloader.html">Auto-loading Resources</a></li>
+ <li><a href="./general/scaffolding.html">Scaffolding</a></li>
+ <li><a href="./general/routing.html">URI Routing</a></li>
+ <li><a href="./general/errors.html">Error Handling</a></li>
+ <li><a href="./general/caching.html">Caching</a></li>
+ <li><a href="./general/profiling.html">Profiling Your Application</a></li>
+ <li><a href="./general/multiple_apps.html">Running Multiple Applications</a></li>
+ <li><a href="./general/alternative_php.html">Alternative PHP Syntax</a></li>
+ <li><a href="./general/security.html">Security</a></li>
+</ul>
-<h3>Class Reference</h3>
-<ul>
-<li><a href="./libraries/benchmark.html">Benchmarking Class</a></li>
-<li><a href="./libraries/calendar.html">Calendaring Class</a></li>
-<li><a href="./libraries/config.html">Config Class</a></li>
-<li><a href="./database/index.html">Database Class</a></li>
-<li><a href="./libraries/email.html">Email Class</a></li>
-<li><a href="./libraries/encryption.html">Encryption Class</a></li>
-<li><a href="./libraries/file_uploading.html">File Uploading Class</a></li>
-<li><a href="./libraries/table.html">HTML Table Class</a></li>
+<h3>Class Reference</h3>
+<ul>
+<li><a href="./libraries/benchmark.html">Benchmarking Class</a></li>
+<li><a href="./libraries/calendar.html">Calendaring Class</a></li>
+<li><a href="./libraries/config.html">Config Class</a></li>
+<li><a href="./database/index.html">Database Class</a></li>
+<li><a href="./libraries/email.html">Email Class</a></li>
+<li><a href="./libraries/encryption.html">Encryption Class</a></li>
+<li><a href="./libraries/file_uploading.html">File Uploading Class</a></li>
+<li><a href="./libraries/table.html">HTML Table Class</a></li>
<li><a href="./libraries/image_lib.html">Image Manipulation Class</a></li>
-<li><a href="./libraries/input.html">Input and Security Class</a></li>
-<li><a href="./libraries/loader.html">Loader Class</a></li>
-<li><a href="./libraries/language.html">Language Class</a></li>
-<li><a href="./libraries/output.html">Output Class</a></li>
-<li><a href="./libraries/pagination.html">Pagination Class</a></li>
-<li><a href="./libraries/sessions.html">Session Class</a></li>
-<li><a href="./libraries/trackback.html">Trackback Class</a></li>
-<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>
-
-
-
-<h3>Helper Reference</h3>
-<ul>
-<li><a href="./helpers/array_helper.html">Array Helper</a></li>
-<li><a href="./helpers/cookie_helper.html">Cookie Helper</a></li>
-<li><a href="./helpers/date_helper.html">Date Helper</a></li>
-<li><a href="./helpers/directory_helper.html">Directory Helper</a></li>
-<li><a href="./helpers/download_helper.html">Download Helper</a></li>
-<li><a href="./helpers/file_helper.html">File Helper</a></li>
-<li><a href="./helpers/form_helper.html">Form Helper</a></li>
-<li><a href="./helpers/html_helper.html">HTML Helper</a></li>
-<li><a href="./helpers/inflector_helper.html">Inflector Helper</a></li>
-<li><a href="./helpers/security_helper.html">Security Helper</a></li>
-<li><a href="./helpers/string_helper.html">String Helper</a></li>
-<li><a href="./helpers/text_helper.html">Text Helper</a></li>
-<li><a href="./helpers/typography_helper.html">Typography Helper</a></li>
-<li><a href="./helpers/url_helper.html">URL Helper</a></li>
-<li><a href="./helpers/xml_helper.html">XML Helper</a></li>
+<li><a href="./libraries/input.html">Input and Security Class</a></li>
+<li><a href="./libraries/loader.html">Loader Class</a></li>
+<li><a href="./libraries/language.html">Language Class</a></li>
+<li><a href="./libraries/output.html">Output Class</a></li>
+<li><a href="./libraries/pagination.html">Pagination Class</a></li>
+<li><a href="./libraries/sessions.html">Session Class</a></li>
+<li><a href="./libraries/trackback.html">Trackback Class</a></li>
+<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>
+
+
+
+<h3>Helper Reference</h3>
+<ul>
+<li><a href="./helpers/array_helper.html">Array Helper</a></li>
+<li><a href="./helpers/cookie_helper.html">Cookie Helper</a></li>
+<li><a href="./helpers/date_helper.html">Date Helper</a></li>
+<li><a href="./helpers/directory_helper.html">Directory Helper</a></li>
+<li><a href="./helpers/download_helper.html">Download Helper</a></li>
+<li><a href="./helpers/file_helper.html">File Helper</a></li>
+<li><a href="./helpers/form_helper.html">Form Helper</a></li>
+<li><a href="./helpers/html_helper.html">HTML Helper</a></li>
+<li><a href="./helpers/inflector_helper.html">Inflector Helper</a></li>
+<li><a href="./helpers/security_helper.html">Security Helper</a></li>
+<li><a href="./helpers/string_helper.html">String Helper</a></li>
+<li><a href="./helpers/text_helper.html">Text Helper</a></li>
+<li><a href="./helpers/typography_helper.html">Typography Helper</a></li>
+<li><a href="./helpers/url_helper.html">URL Helper</a></li>
+<li><a href="./helpers/xml_helper.html">XML Helper</a></li>
</ul>
-<h3>Additional Resources</h3>
+<h3>Additional Resources</h3>
-<ul>
-<li><a href="./general/quick_reference.html">Quick Reference Chart</a></li>
-<li><a href="http://www.codeigniter.com/forums/">Community Forums</a></li>
-<li><a href="http://www.codeigniter.com/wiki/">Community Wiki</a></li>
+<ul>
+<li><a href="./general/quick_reference.html">Quick Reference Chart</a></li>
+<li><a href="http://www.codeigniter.com/forums/">Community Forums</a></li>
+<li><a href="http://www.codeigniter.com/wiki/">Community Wiki</a></li>
</ul>
diff --git a/user_guide/userguide.css b/user_guide/userguide.css
index d58ec96f2..a90f60890 100644
--- a/user_guide/userguide.css
+++ b/user_guide/userguide.css
@@ -240,7 +240,7 @@ padding: 3px 2px 3px 10px;
font-weight: bold;
font-style: normal;
}
-#content kbd {
+#content kbd {
font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
color: #A70000;
font-weight: bold;
@@ -299,12 +299,12 @@ padding: 3px 2px 3px 10px;
margin: 6px 0 8px 0;
padding: 0;
}
-
+
#content .important .leftpad {
margin: 6px 0 8px 0;
padding-left: 20px;
}
-
+
#content .critical {
background: #FBE6F2;
border: 1px solid #E68F8F;
@@ -312,7 +312,7 @@ padding: 3px 2px 3px 10px;
margin: 10px 0 5px 0;
padding: 10px;
}
-
+
#content .critical p {
margin: 5px 0 6px 0;
padding: 0;
@@ -368,7 +368,7 @@ form {
height: 1.5em;
padding: 0;
margin: 0;
-}
+}
.textarea {
font-family: Lucida Grande, Verdana, Geneva, Sans-serif;