diff options
103 files changed, 318 insertions, 351 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 32afd51a6..c19c3cd68 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -242,7 +242,7 @@ Change Log <li>Added support for changing the port number in the <a href="./database/configuration.html">Postgre driver</a>.</li>
<li>Moved the list of "allowed URI characters" out of the Router class and into the config file.</li>
<li>Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.</li>
-<li>Updated the Upload class to allow the upload field name to be set when calling <a href="./libraries/file_uploading.html".>do_upload()</a>.</li>
+<li>Updated the Upload class to allow the upload field name to be set when calling <a href="./libraries/file_uploading.html">do_upload()</a>.</li>
<li>Updated the <a href="./libraries/config.html">Config Library</a> to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).</li>
<li>Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.</li>
<li>Updated the <dfn>form_open()</dfn> helper to allow the GET method to be used.</li>
@@ -288,7 +288,7 @@ Change Log <ul>
-<li>Models do <strong>not</strong> connect automatically to the database as of this version. <a href="./general/models.html">More info here</a>.
+<li>Models do <strong>not</strong> connect automatically to the database as of this version. <a href="./general/models.html">More info here</a>.</li>
<li>Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.</li>
<li>Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.</li>
<li>Fixed a bug in the active record "having" function.</li>
@@ -436,8 +436,7 @@ Previous Topic: <a href="license.html">License Agreement</a> <a href="#top">Top of Page</a> ·
<a href="index.html">User Guide Home</a> ·
Next Topic: <a href="./general/credits.html">Credits</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 5d58f6bd4..573c67408 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -369,7 +369,7 @@ The second parameter lets you set the direction of the result. Options are <kbd <h2>$this->db->limit();</h2>
-<p>Lets you limit the number of rows you would like returned by the query:
+<p>Lets you limit the number of rows you would like returned by the query:</p>
<code>
$this->db->limit(10);<br />
@@ -565,7 +565,7 @@ $this->db->delete('mytable', array('id' => $id)); // 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
-the data to the second parameter of the function:
+the data to the second parameter of the function:</p>
<code>
$this->db->where('id', $id);<br />
@@ -603,7 +603,7 @@ Previous Topic: <a href="helpers.html">Query Helper Functions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="transactions.html">Transactions</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index da1e08edd..2e4d16e47 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -217,7 +217,7 @@ Previous Topic: <a href="call_function.html">Custom Function Calls</a <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="utilities.html">Database Utilities Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 1e80ea54f..b439d4460 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -115,7 +115,7 @@ Previous Topic: <a href="fields.html">Field MetaData</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="caching.html">Query Caching</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index b33f2b702..774790c60 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -66,7 +66,7 @@ Configuration <h1>Database Configuration</h1>
<p>CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.).
-The config file is located at:
+The config file is located at:</p>
<p><kbd>application/config/database.php</kbd></p>
@@ -137,7 +137,7 @@ Previous Topic: <a href="examples.html">Quck Start: Usage Examples</a <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="connecting.html">Connecting to your Database</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index aebca25be..e44c145e2 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -111,9 +111,9 @@ $config['active_r'] = TRUE;<br /> <br />
$this->load->database(<samp>$config</samp>);</code>
-<p>For information on each of these values please see the <a href="configuration.html">configuration page</a>.
+<p>For information on each of these values please see the <a href="configuration.html">configuration page</a>.</p>
-<p>Or you can submit your database values as a Data Source Name. DSNs must have this prototype:
+<p>Or you can submit your database values as a Data Source Name. DSNs must have this prototype:</p>
<code>$dsn = 'dbdriver://username:password@hostname/database';<br />
<br />
@@ -122,8 +122,6 @@ $this->load->database('<samp>$dsn</samp>');</code> <p>Note that if you use a DSN you will not be able to specify some of the default values like you can if you use a connection array.</p>
-
-
<h2>Connecting to Multiple Databases</h2>
<p>If you need to connect to more than one database simultaneously you can do so as follows:</p>
@@ -164,7 +162,7 @@ Previous Topic: <a href="configuration.html">Database Configuration</ <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="queries.html">Queries</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 7a8ec92d1..0d8faf3c2 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -214,7 +214,7 @@ Previous Topic: <a href="index.html">Database Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="configuration.html">Database Configuration</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 8d9d7b5d7..c01caae9b 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -165,7 +165,7 @@ Previous Topic: <a href="table_data.html"> Table Data</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="call_function.html">Custom Function Calls</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 4742569d5..e6d0e461c 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -148,7 +148,7 @@ Previous Topic: <a href="results.html">Query Results</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="active_record.html">Active Record Pattern</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 2a57ebc12..c25233294 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -95,7 +95,7 @@ Previous Topic: <a href="../libraries/config.html">Config Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="examples.html">Quick Start: Usage Examples</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index e55a5328a..013d64f33 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -95,15 +95,13 @@ CodeIgniter has two functions that help you do this:</p> <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>
+<code>$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";</code></li>
<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>
-
-</li>
+<code>$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";</code></li>
</ol>
@@ -134,7 +132,7 @@ Previous Topic: <a href="connecting.html">Connecting to your Database <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="results.html">Query Results</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 5b25015bf..f6c1be124 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -134,7 +134,7 @@ Query Results }
</code>
- <p>If you want a specific row returned you can submit the row number as a digit in the first parameter:
+ <p>If you want a specific row returned you can submit the row number as a digit in the first parameter:</p>
<code>$row = $query->row(<dfn>5</dfn>);</code>
@@ -157,7 +157,7 @@ Query Results </code>
- <p>If you want a specific row returned you can submit the row number as a digit in the first parameter:
+ <p>If you want a specific row returned you can submit the row number as a digit in the first parameter:</p>
<code>$row = $query->row_array(<dfn>5</dfn>);</code>
@@ -181,7 +181,7 @@ Query Results </p>
-<br />
+
<h1>Result Helper Functions</h1>
@@ -235,7 +235,7 @@ Previous Topic: <a href="queries.html">Queries</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="helpers.html">Query Helper Functions</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 6792e356f..13b96681a 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -110,7 +110,7 @@ Previous Topic: <a href="transactions.html"> Transactions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="fields.html"> Field Metadata</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index ecc5164d3..75aa4e887 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -122,7 +122,7 @@ if (<kbd>$this->db->trans_status()</kbd> === FALSE)<br /> <h2>Enabling Transactions</h2>
<p>Transactions are enabled automatically the moment you use <dfn>$this->db->trans_start()</dfn>. If you would like to disable transactions you
-can do so using <dfn>$this->db->trans_off()</dfn>:
+can do so using <dfn>$this->db->trans_off()</dfn>:</p>
<code>
<kbd>$this->db->trans_off()</kbd><br /><br />
@@ -138,7 +138,7 @@ $this->db->trans_complete(); <h2>Test Mode</h2>
<p>You can optionally put the transaction system into "test mode", which will cause your queries to be rolled back -- even if the queries produce a valid result.
-To use test mode simply set the first parameter in the <dfn>$this->db->trans_start()</dfn> function to <samp>TRUE</samp>:
+To use test mode simply set the first parameter in the <dfn>$this->db->trans_start()</dfn> function to <samp>TRUE</samp>:</p>
<code>
$this->db->trans_start(<samp>TRUE</samp>); // Query will be rolled back<br />
@@ -190,7 +190,7 @@ Previous Topic: <a href="fields.html">Field MetaData</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="table_data.html">Table Metadata</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index a7601e85f..7de0ea3ed 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -205,7 +205,7 @@ echo $this->dbutil->csv_from_result($query); </code>
<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:
+set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example:</p>
<code>
$delimiter = ",";<br />
@@ -330,7 +330,7 @@ Previous Topic: <a href="caching.html">DB Caching Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../libraries/email.html"> Email Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 2b088919e..7498587ca 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -144,7 +144,7 @@ Previous Topic: <a href="managing_apps.html">Managing Applications</a <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="security.html">Security</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index f6ae7ffa9..58f2b06a7 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -114,7 +114,7 @@ Previous Topic: <a href="creating_libraries.html">Creating Core Libra <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="autoloader.html">Auto-loading Resources</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index f3d474f2e..39a0ce657 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -97,7 +97,7 @@ Previous Topic: <a href="hooks.html">Hooks - Extending the Core</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="scaffolding.html">Scaffolding</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 8756f7c1d..a881f2d42 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -63,11 +63,11 @@ Page Caching <h1>Web Page Caching</h1>
-<p>CodeIgniter lets you cache your pages in order to achieve maximum performance.
+<p>CodeIgniter lets you cache your pages in order to achieve maximum performance.</p>
-Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the
+<p>Although CodeIgniter 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.
-By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.
+By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.</p>
<h2>How Does Caching Work?</h2>
@@ -111,7 +111,7 @@ Previous Topic: <a href="errors.html">Error Handling</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="profiling.html">Profiling Your Application</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index c61660d34..5d83edcd6 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -121,7 +121,7 @@ class Blog extends Controller { <p>If you did it right, you should see <samp>Hello World!</samp>.</p>
-<p>Note: Class names must start with an uppercase letter. In other words, this is valid:
+<p>Note: Class names must start with an uppercase letter. In other words, this is valid:</p>
<code><?php<br />
class <var>Blog</var> extends Controller {<br />
@@ -182,7 +182,7 @@ class Blog extends Controller { <p>If your URI contains more then two segments they will be passed to your function as parameters.</p>
-<p>For example, lets say you have a URI like this:
+<p>For example, lets say you have a URI like this:</p>
<code>www.your-site.com/index.php/<var>products</var>/<samp>shoes</samp>/<kbd>sandals</kbd>/<dfn>123</dfn></code>
@@ -258,7 +258,7 @@ allowing you to define your own function routing rules.</p> <p>CodeIgniter 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. CodeIgniter permits you to
-add a function named <dfn>_output()</dfn> to your controller that will receive the finalized output data.
+add a function named <dfn>_output()</dfn> to your controller that will receive the finalized output data.</p>
<p><strong>Important:</strong> 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>
@@ -317,12 +317,10 @@ called if the URL contains only the sub-folder. Simply name your default contro <dfn>application/config/routes.php</dfn> file</p>
-<p>CodeIgniter also permits you to remap your URIs using its <a href="routing.html">URI Routing</a> feature.
+<p>CodeIgniter also permits you to remap your URIs using its <a href="routing.html">URI Routing</a> feature.</p>
-
-<a name="constructors"></a>
-<h2>Class Constructors</h2>
+<h2><a name="constructors"></a>Class Constructors</h2>
<p>If you intend to use a constructor in any of your Controllers, you <strong>MUST</strong> place the following line of code in it:</p>
@@ -426,8 +424,7 @@ Previous Topic: <a href="urls.html">CodeIgniter URLs</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="views.html">Views</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 2b476e58b..fa467cb2b 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -166,7 +166,7 @@ Previous Topic: <a href="creating_libraries.html">Creating Your Own L <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="hooks.html">Hooks - Extending the Core</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 020f7bed5..b3eaf3d7f 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -68,7 +68,7 @@ your own libraries within your <dfn>application/libraries</dfn> directory in ord and the global framework resources.</p>
<p>As an added bonus, CodeIgniter 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.
+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>
<p>In summary:</p>
@@ -266,7 +266,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
-the email class all calls will use:
+the email class all calls will use:</p>
<code>$this-><kbd>email</kbd>->some_function();</code>
@@ -293,7 +293,7 @@ Previous Topic: <a href="libraries.html">Using CodeIgniter Libraries< <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="core_classes.html">Creating Core System Classes</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 9ac1618da..97aef01b2 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -87,8 +87,7 @@ Previous Topic: <a href="changelog.html">Change Log</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../installation/downloads.html">Downloading CodeIgniter</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 650008114..d78dd4947 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -134,7 +134,7 @@ Previous Topic: <a href="routing.html">URI Routing</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="caching.html">Page Caching</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 0aba208aa..a91c8c21f 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -138,7 +138,7 @@ Previous Topic: <a href="models.html">Models</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="plugins.html">Plugins</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index c864c1edb..0776e32c8 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -104,7 +104,7 @@ The following items should be defined in your associative hook array:</p> <h2>Multiple Calls to the Same Hook</h2>
-<p>If want to use the same hook point with more then one script, simply make your array declaration multi-dimensional, like this:
+<p>If want to use the same hook point with more then one script, simply make your array declaration multi-dimensional, like this:</p>
<code>
$hook['pre_controller']<kbd>[]</kbd> = array(<br />
@@ -185,7 +185,7 @@ Previous Topic: <a href="core_classes.html">Creating Core Classes</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="autoloader.html">Auto-loading Resources</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/index.html b/user_guide/general/index.html index bf9b4ddc6..2d5148b32 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -91,7 +91,7 @@ Previous Topic: <a href="../overview/goals.html">Architectural Goals< <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="urls.html">CodeIgniter URLs</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 38c9987bb..4efd5eefe 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -91,7 +91,7 @@ Previous Topic: <a href="plugins.html">Plugins</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="creating_libraries.html">Creating Libraries</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 103127fb9..836f0c86f 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -89,7 +89,7 @@ put all of the directories located inside your <kbd>application</kbd> folder int own sub-folder.</p>
<p>For example, let's say you want to create two applications, "foo" and "bar". You will structure your
-application folder like this:
+application folder like this:</p>
<code>system/application/<var>foo</var>/<br />
system/application/<var>foo</var>/config/<br />
@@ -130,8 +130,7 @@ Previous Topic: <a href="profiling.html">Profiling Your Application</ <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="alternative_php.html">Alternative PHP Syntax</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/models.html b/user_guide/general/models.html index c1832cca6..6758ceb86 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -251,7 +251,7 @@ Previous Topic: <a href="views.html">Views</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="helpers.html">Helpers</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index ef299aa1b..2fde9272e 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -124,7 +124,7 @@ Previous Topic: <a href="helpers.html">Helpers</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="libraries.html">Using Libraries</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 719501338..a73f00987 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -111,7 +111,7 @@ Previous Topic: <a href="caching.html">Caching</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="managing_apps.html">Managing Applications</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 963f6b051..9680cbd55 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -62,7 +62,7 @@ Quick Reference Chart <h1>Quick Reference Chart</h1>
-<p>For a PDF version of this chart, <a href="http://www.codeigniter.com/downloads/ci_quick_ref.pdf">click here</a>.
+<p>For a PDF version of this chart, <a href="http://www.codeigniter.com/downloads/ci_quick_ref.pdf">click here</a>.</p>
<p><img src="../images/ci_quick_ref.png" width="763" height="994" border="0" /></p>
@@ -74,8 +74,7 @@ Quick Reference Chart <p>
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index e92b51960..1aa0d78a1 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -79,8 +79,7 @@ Server Requirements <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../license.html">License Agreement</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index c4af428a0..2cd0d2f49 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -86,7 +86,7 @@ To overcome this, CodeIgniter allows you to remap the URI handler.</p> <h2>Setting your own routing rules</h2>
<p>Routing rules are defined in your <var>application/config/routes.php</var> file. In it you'll see an array called <dfn>$route</dfn> that
-permits you to specify your own routing criteria. Routes can either be specified using <dfn>wildcards</dfn> or <dfn>Regular Expressions</dnf>
+permits you to specify your own routing criteria. Routes can either be specified using <dfn>wildcards</dfn> or <dfn>Regular Expressions</dfn></p>
<h2>Wildcards</h2>
@@ -172,7 +172,7 @@ Previous Topic: <a href="scaffolding.html">Scaffolding</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="errors.html">Error Handling</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 4f23d3fed..125732e87 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -116,7 +116,7 @@ class Blog extends Controller {<br /> <p>Where <kbd>table_name</kbd> is the name of the table (table, not database) you wish to work with.</p>
-<p>Once you've initialized scaffolding, you will access it with this URL prototype:
+<p>Once you've initialized scaffolding, you will access it with this URL prototype:</p>
<code>www.your-site.com/index.php/<var>class</var>/<dfn>secret_word</dfn>/</code>
@@ -145,7 +145,7 @@ Previous Topic: <a href="autoloader.html">Auto-loading Resources</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="routing.html">URI Routing</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/security.html b/user_guide/general/security.html index fdba2dfc9..24bfe1c46 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -151,7 +151,7 @@ Previous Topic: <a href="alternative_php.html">Alternative PHP</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../libraries/benchmark.html">Benchmarking Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 4df37eebc..21031affb 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -90,7 +90,7 @@ contain functions that make it easy to work with your URI data. In addition, yo <h2>Removing the index.php file</h2>
-<p>By default, the <strong>index.php</strong> file will be included in your URLs:
+<p>By default, the <strong>index.php</strong> file will be included in your URLs:</p>
<code>www.your-site.com/<var>index.php</var>/news/article/my_article</code>
@@ -108,7 +108,7 @@ a request for your index.php file.</p> <h2>Adding a URL Suffix</h2>
<p>In your <dfn>config/config.php</dfn> file you can specify a suffix that will be added to all URLs generated
-by CodeIgniter. For example, if a URL is this:
+by CodeIgniter. For example, if a URL is this:</p>
<code>www.your-site.com/index.php/products/view/shoes</code>
@@ -151,7 +151,7 @@ Previous Topic: <a href="index.html">Getting Started</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="controllers.html">Controllers</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 8adfc6736..737146dbb 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -77,14 +77,14 @@ you should do so before continuing.</p> <p>Using your text editor, create a file called <dfn>blogview.php</dfn>, and put this in it:</p>
<textarea class="textarea" style="width:100%" cols="50" rows="10">
-<html>
-<head>
-<title>My Blog</title>
-</head>
-<body>
- <h1>Welcome to my Blog!</h1>
-</body>
-</html>
+<html>
+<head>
+<title>My Blog</title>
+</head>
+<body>
+ <h1>Welcome to my Blog!</h1>
+</body>
+</html>
</textarea>
<p>Then save the file in your <dfn>application/views/</dfn> folder.</p>
@@ -169,14 +169,14 @@ class Blog extends Controller { <textarea class="textarea" style="width:100%" cols="50" rows="10">
-<html>
-<head>
-<title><?=$title;?></title>
-</head>
-<body>
- <h1><?=$heading;?></h1>
-</body>
-</html>
+<html>
+<head>
+<title><?php echo $title;?></title>
+</head>
+<body>
+ <h1><?php echo $heading;?></h1>
+</body>
+</html>
</textarea>
<p>Then load the page at the URL you've been using and you should see the variables replaced.</p>
@@ -214,26 +214,26 @@ class Blog extends Controller { <textarea class="textarea" style="width:100%" cols="50" rows="24">
-<html>
-<head>
-<title><?=$title;?></title>
-</head>
-<body>
-<h1><?=$heading;?></h1>
+<html>
+<head>
+<title><?=$title;?></title>
+</head>
+<body>
+<h1><?=$heading;?></h1>
-<h3>My Todo List</h3>
+<h3>My Todo List</h3>
-<ul>
-<?php foreach($todo_list as $item):?>
+<ul>
+<?php foreach($todo_list as $item):?>
-<li><?=$item;?></li>
+<li><?=$item;?></li>
-<?php endforeach;?>
-</ul>
+<?php endforeach;?>
+</ul>
-</body>
-</html>
+</body>
+</html>
</textarea>
@@ -249,7 +249,7 @@ Previous Topic: <a href="controllers.html">Controllers</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="models.html">Models</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 893dcaf97..7057c3361 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -117,7 +117,7 @@ Previous Topic: <a href="../libraries/zip.html">Zip Encoding Class</ <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="cookie_helper.html">Cookie Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index bee6f3e08..a81a498df 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -149,7 +149,7 @@ Previous Topic: <a href="array_helper.html">Array Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="date_helper.html">Date Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index b9c48aa5e..00f00ad71 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -172,7 +172,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
-the timestamp is submitted it will return the time without seconds formatted for the U.S. Examples:
+the timestamp is submitted it will return the time without seconds formatted for the U.S. Examples:</p>
<code>$now = time();<br />
<br />
@@ -363,7 +363,7 @@ Previous Topic: <a href="cookie_helper.html">Cookie Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="directory_helper.html">Directory Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index d0be8f6ff..8f1027a83 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -137,7 +137,7 @@ Previous Topic: <a href="date_helper.html">Date Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="download_helper.html">Download Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 3a0e25261..bd5b7483a 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -110,7 +110,7 @@ Previous Topic: <a href="directory_helper.html">Directory Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="file_helper.html">File Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index bebcc90b4..3139569af 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -103,7 +103,7 @@ else<br /> echo 'File written!';<br />
}</code>
-<p>You can optionally set the write mode via the third parameter:
+<p>You can optionally set the write mode via the third parameter:</p>
<code>write_file('./path/to/file.php', $data, <var>'r+'</var>);</code>
@@ -146,7 +146,7 @@ Previous Topic: <a href="directory_helper.html">Directory Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="form_helper.html">Form Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index d1eef8d8b..572f2a205 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -155,7 +155,7 @@ echo form_hidden($data);<br /> <h2>form_input()</h2>
<p>Lets you generate a standard text input field. You can minimally pass the field name and value in the first
-and second parameter:
+and second parameter:</p>
<code>echo form_input('username', 'johndoe');</code>
@@ -176,7 +176,7 @@ echo form_input($data);<br /> <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
-third parameter:
+third parameter:</p>
<code>$js = 'onClick="some_function()"';<br />
<br />
@@ -203,7 +203,7 @@ example, you will instead specify "rows" and "cols".</p> <p>Lets you create a standard drop-down field. The first parameter will contain the name of the field,
the second parameter will contain an associative array of options, and the third parameter will contain the
-value you wish to be selected. Example:
+value you wish to be selected. Example:</p>
<code>$options = array(<br />
'small' => 'Small Shirt',<br />
@@ -225,7 +225,7 @@ echo form_dropdown('shirts', $options, 'large');<br /> <p>If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the
-fourth parameter:
+fourth parameter:</p>
<code>$js = 'onChange="some_function()"';<br />
<br />
@@ -234,7 +234,7 @@ echo form_dropdown('shirts', $options, 'large', $js);</code> <h2>form_checkbox()</h2>
-<p>Lets you generate a checkbox field. Simple example:
+<p>Lets you generate a checkbox field. Simple example:</p>
<code>echo form_checkbox('newsletter', 'accept', TRUE);<br />
@@ -261,7 +261,7 @@ echo form_checkbox($data);<br /> <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
-fourth parameter:
+fourth parameter:</p>
<code>$js = 'onClick="some_function()"';<br />
<br />
@@ -335,7 +335,7 @@ Previous Topic: <a href="file_helper.html">File Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="html_helper.html">HTML Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 2b4196055..620cb1046 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -227,7 +227,7 @@ Previous Topic: <a href="form_helper.html">Form Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="inflector_helper.html"> Inflector Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index ba067df92..1c8935d23 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -123,7 +123,7 @@ This is done by opening the <var>application/config/autoload.php</var> file and <div id="footer">
-<p><a href="#top">Top of Page</a><p>
+<p><a href="#top">Top of Page</a></p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 8c7a26d47..2a4ee559f 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -145,7 +145,7 @@ Previous Topic: <a href="html_helper.html"> HTML Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="security_helper.html">Security Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 2e603afe7..7ba8a83cf 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -123,7 +123,7 @@ Previous Topic: <a href="inflector_helper.html"> Inflector Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="smiley_helper.html">Smiley Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index d690749ed..1603e1659 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -132,25 +132,25 @@ class Smileys extends Controller { <textarea class="textarea" style="width:100%" cols="50" rows="20">
-<html>
-<head>
-<title>Smileys</title>
+<html>
+<head>
+<title>Smileys</title>
-<?php echo js_insert_smiley('blog', 'comments'); ?>
+<?php echo js_insert_smiley('blog', 'comments'); ?>
-</head>
-<body>
+</head>
+<body>
<form name="blog">
<textarea name="comments" cols="40" rows="4"></textarea>
-</form>
+</form>
-<p>Click to insert a smiley!</p>a
+<p>Click to insert a smiley!</p>
-<?php echo $smiley_table; ?>
+<?php echo $smiley_table; ?>
-</body>
-</html>
+</body>
+</html>
</textarea>
@@ -200,7 +200,7 @@ Previous Topic: <a href="security_helper.html">Security Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="string_helper.html">String Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index c5be715a9..0858b78e9 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -95,7 +95,7 @@ Returns a fixed length 33 character string.</li> <h2>alternator()</h2>
-<p>Allows two or more items to be alternated between, when cycling through a loop. Example:
+<p>Allows two or more items to be alternated between, when cycling through a loop. Example:</p>
<code>for ($i = 0; $i < 10; $i++)<br />
{<br />
@@ -136,7 +136,7 @@ Previous Topic: <a href="smiley_helper.html">Smiley Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="text_helper.html">Text Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index e20a07cc3..260fad4a4 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -189,7 +189,7 @@ Previous Topic: <a href="string_helper.html">String Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="typography_helper.html">Typography Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 5bcd2e3f9..48cae2d3f 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -121,7 +121,7 @@ Previous Topic: <a href="text_helper.html">Text Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="url_helper.html">URL Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 7d54867e1..f2dc765b8 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -263,7 +263,7 @@ Previous Topic: <a href="typography_helper.html">Typography Helper</a <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="xml_helper.html">XML Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 35dd88686..5fdd631f2 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -102,7 +102,7 @@ Previous Topic: <a href="url_helper.html">URL Helper</a> ·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/index.html b/user_guide/index.html index 15ecf1ea5..6c61d1263 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -97,7 +97,7 @@ then read the <a href="general/index.html">Getting Started</a> page.</p> <div id="footer">
-<p><a href="#top">Top of Page</a><p>
+<p><a href="#top">Top of Page</a></p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 58eefac00..83037a94c 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -93,8 +93,7 @@ Previous Topic: <a href="../general/credits.html">Credits</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../installation/index.html">Installation Instructions</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index edfa8b53b..ba4579b99 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -93,7 +93,7 @@ Previous Topic: <a href="../general/credits.html">Credits</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="upgrading.html">Upgrading from a Previous Version</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 9813ef2ab..cde190b79 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -87,8 +87,7 @@ Previous Topic: <a href="upgrading.html">Upgrading Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index a3f554c42..048716983 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -89,8 +89,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index f08c8a11b..db59e714c 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -200,8 +200,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 812f5e410..d8dbcef65 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -99,8 +99,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 3ae6a83a8..1e9aa0a08 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -97,8 +97,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 3c0cea6d3..654b6415d 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -91,7 +91,7 @@ have not upgraded to that version please do so first.</p> <p>As of version 1.3.3, CodeIgniter 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,
-<a href="../general/models.html">as described here</a>.
+<a href="../general/models.html">as described here</a>.</p>
<h2>Step 3: Update your user guide</h2>
@@ -109,8 +109,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 0a5158981..ea8f5a03c 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -142,8 +142,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 0324508a0..614f72784 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -146,8 +146,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 13948655e..fcfdf4c63 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -71,7 +71,7 @@ have not upgraded to that version please do so first.</p> <h2>Step 1: Update your CodeIgniter files</h2>
-<p>Replace these files and directories in your "system" folder with the new versions:
+<p>Replace these files and directories in your "system" folder with the new versions:</p>
<ul>
@@ -175,8 +175,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 853e5ce35..b65aebe30 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -71,7 +71,7 @@ have not upgraded to that version please do so first.</p> <h2>Step 1: Update your CodeIgniter files</h2>
-<p>Replace these files and directories in your "system" folder with the new versions:
+<p>Replace these files and directories in your "system" folder with the new versions:</p>
<ul>
@@ -108,8 +108,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 2e9995799..1e6d1483a 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -68,7 +68,7 @@ Upgrading from 1.5.0 to 1.5.2 <h2>Step 1: Update your CodeIgniter files</h2>
-<p>Replace these files and directories in your "system" folder with the new versions:
+<p>Replace these files and directories in your "system" folder with the new versions:</p>
<ul>
@@ -98,8 +98,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 793cd2e75..9d2a0c62f 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -141,8 +141,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../overview/at_a_glance.html">CodeIgniter at a Glance</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 2efa11511..ffe9bf89c 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -90,8 +90,7 @@ Previous Topic: <a href="index.html">Installation Instructions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="troubleshooting.html">Troubleshooting</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index d92f0730a..3568f7726 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -88,7 +88,7 @@ timing of the entire system execution to be shown.</p> <a name="using"></a>
<h2>Using the Benchmark Class</h2>
-<p>The Benchmark class can be used within your <a href="../general/controllers.html">controllers</a>, <a href="../general/views.html">views</a>, or your <a href="../general/models.html">Models</a>. The process for usage is this:
+<p>The Benchmark class can be used within your <a href="../general/controllers.html">controllers</a>, <a href="../general/views.html">views</a>, or your <a href="../general/models.html">Models</a>. The process for usage is this:</p>
<ol>
<li>Mark a start point</li>
@@ -194,7 +194,7 @@ Previous Topic: <a href="../general/security.html"> Security</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="calendar.html">Calendaring Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index c9779081f..01b90fbd0 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -246,7 +246,7 @@ Previous Topic: <a href="benchmark.html">Benchmarking Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="config.html">Config Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 350831e0d..5ab85cc14 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -99,7 +99,7 @@ so you will only need to load a config file if you have created your own.</p> <p>If you need to load multiple config files normally they will be merged into one master config array. Name collisions can occur, however, if
you have identically named array indexes in different config files. To avoid collisions you can set the second parameter to <kbd>TRUE</kbd>
-and each config file will be stored in an array index corresponding to the name of the config file. Example:
+and each config file will be stored in an array index corresponding to the name of the config file. Example:</p>
<code>
// Stored in an array with this prototype: $this->config['blog_settings'] = $config<br />
@@ -111,10 +111,8 @@ $this->config->load('<var>blog_settings</var>', <kbd>TRUE</kbd>);</code> <code>$this->config->load('<var>blog_settings</var>', <dfn>FALSE</dfn>, <kbd>TRUE</kbd>);</code>
-
-
</li>
-<li><strong>Auto-loading</strong></li>
+<li><strong>Auto-loading</strong>
<p>If you find that you need a particular config file globally, you can have it loaded automatically by the system. To do this,
open the <strong>autoload.php</strong> file, located at <samp>application/config/autoload.php</samp>, and add your config file as
@@ -136,7 +134,7 @@ indicated in the file.</p> <p>The function returns FALSE (boolean) if the item you are trying to fetch does not exist.</p>
<p>If you are using the second parameter of the <kbd>$this->config->load</kbd> function in order to assign your config items to a specific index
-you can retrieve it by specifying the index name in the second parameter of the <kbd>$this->config->item()</kbd> function. Example:
+you can retrieve it by specifying the index name in the second parameter of the <kbd>$this->config->item()</kbd> function. Example:</p>
<code>
// Loads a config file named blog_settings.php and assigns it to an index named "blog_settings"<br />
@@ -180,7 +178,7 @@ Previous Topic: <a href="calendar.html">Calendaring Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../database/index.html">Database Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 190dadbdb..cd163c63d 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -271,7 +271,7 @@ $this->email->send();</code> <p>If you have word wrapping enabled (recommended to comply with RFC 822) and you have a very long link in your email it can
get wrapped too, causing it to become un-clickable by the person receiving it. CodeIgniter lets you manually override
-word wrapping within part of your message like this:
+word wrapping within part of your message like this:</p>
<code>The text of your email that<br />
gets wrapped normally.<br />
@@ -281,7 +281,7 @@ gets wrapped normally.<br /> More text that will be<br />
wrapped normally.</code>
-<p>Place the item you do not want word-wrapped between: <var>{unwrap}</var> <var>{/unwrap}</var>
+<p>Place the item you do not want word-wrapped between: <var>{unwrap}</var> <var>{/unwrap}</var></p>
</div>
@@ -295,7 +295,7 @@ Previous Topic: <a href="database/index.html">Database Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="encryption.html">Encryption Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index e3a9762b5..c197dc5de 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -140,7 +140,7 @@ $plaintext_string = $this->encrypt->decode($encrypted_string);</code> <h2>$this->encrypt->set_cipher();</h2>
-<p>Permits you to set an Mcrypt cipher. By default it uses <samp>MCRYPT_RIJNDAEL_256</samp>. Example:
+<p>Permits you to set an Mcrypt cipher. By default it uses <samp>MCRYPT_RIJNDAEL_256</samp>. Example:</p>
<code>$this->encrypt->set_cipher(MCRYPT_BLOWFISH);</code>
<p>Please visit php.net for a list of <a href="http://php.net/mcrypt">available ciphers</a>.</p>
@@ -150,7 +150,7 @@ $plaintext_string = $this->encrypt->decode($encrypted_string);</code> <h2>$this->encrypt->set_mode();</h2>
-<p>Permits you to set an Mcrypt mode. By default it uses <samp>MCRYPT_MODE_ECB</samp>. Example:
+<p>Permits you to set an Mcrypt mode. By default it uses <samp>MCRYPT_MODE_ECB</samp>. Example:</p>
<code>$this->encrypt->set_mode(MCRYPT_MODE_CFB);</code>
<p>Please visit php.net for a list of <a href="http://php.net/mcrypt">available modes</a>.</p>
@@ -179,7 +179,7 @@ Previous Topic: <a href="email.html">Email Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="file_uploading.html">File Uploading Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 21fd2a6ba..d9a993a74 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -89,26 +89,27 @@ preferences, restricting the type and size of the files.</p> folder:</p>
-<textarea class="textarea" style="width:100%" cols="50" rows="23"><html>
-<head>
-<title>Upload Form</title>
-</head>
-<body>
+<textarea class="textarea" style="width:100%" cols="50" rows="23">
+<html>
+<head>
+<title>Upload Form</title>
+</head>
+<body>
-<?=$error;?>
+<?=$error;?>
-<?=form_open_multipart('upload/do_upload'); ?>
+<?=form_open_multipart('upload/do_upload'); ?>
-<input type="file" name="userfile" size="20" />
+<input type="file" name="userfile" size="20" />
-<br /><br />
+<br /><br />
-<input type="submit" value="upload" />
+<input type="submit" value="upload" />
-</form>
+</form>
-</body>
-</html></textarea>
+</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
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
@@ -120,24 +121,24 @@ the user does something wrong.</p> <p>Using a text editor, create a form called <dfn>upload_success.php</dfn>.
In it, place this code and save it to your <samp>applications/views/</samp> folder:</p>
-<textarea class="textarea" style="width:100%" cols="50" rows="20"><html>
-<head>
-<title>Upload Form</title>
-</head>
-<body>
+<textarea class="textarea" style="width:100%" cols="50" rows="20"><html>
+<head>
+<title>Upload Form</title>
+</head>
+<body>
-<h3>Your file was successfully uploaded!</h3>
+<h3>Your file was successfully uploaded!</h3>
-<ul>
-<?php foreach($upload_data as $item => $value):?>
-<li><?=$item;?>: <?=$value;?></li>
-<?php endforeach; ?>
-</ul>
+<ul>
+<?php foreach($upload_data as $item => $value):?>
+<li><?=$item;?>: <?=$value;?></li>
+<?php endforeach; ?>
+</ul>
-<p><?=anchor('upload', 'Upload Another File!'); ?></p>
+<p><?=anchor('upload', 'Upload Another File!'); ?></p>
-</body>
-</html></textarea>
+</body>
+</html></textarea>
<h2>The Controller</h2>
@@ -428,7 +429,7 @@ Previous Topic: <a href="download_helper.html">Download Helper</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="ftp.html">FTP Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 9db0021a7..c9d1888ad 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -300,7 +300,7 @@ Previous Topic: <a href="file_uploading.html">File Uploading Class</a <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="table.html">HTML Table Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 04bd46f8c..d3fbe27a4 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -288,14 +288,14 @@ preferences have no effect on cropping. The "availability" column indicates whi <td class="td">X</td>
</tr>
-
+<tr>
<td class="td"><strong>x_axis</strong></td>
<td class="td">None</td>
<td class="td">None</td>
<td class="td">Sets the X coordinate in pixels for image cropping. For example, a setting of 30 will crop an image 30 pixels from the left.</td>
<td class="td">C</td>
</tr>
-
+<tr>
<td class="td"><strong>y_axis</strong></td>
<td class="td">None</td>
<td class="td">None</td>
@@ -661,7 +661,7 @@ Previous Topic: <a href="table.html">HTML Table Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="input.html">Input Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index f810029ab..b6747135c 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -108,7 +108,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
-<kbd>application/config/config.php</kbd> file and setting this:
+<kbd>application/config/config.php</kbd> file and setting this:</p>
<code>$config['global_xss_filtering'] = TRUE;</code>
@@ -122,7 +122,7 @@ Note: This function should only be used to deal with data upon submission. It's <p>CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided
functions rather then fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and
return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first.
-In other words, normally you might do something like this:
+In other words, normally you might do something like this:</p>
<code>
if ( ! isset($_POST['something']))<br />
@@ -211,7 +211,7 @@ Previous Topic: <a href="image_lib.html">Image Manipulation Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="loader.html">Loader Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 71dc0b976..6a74cc963 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -132,7 +132,7 @@ Previous Topic: <a href="loader.html">Loader Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="output.html">Output Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 98bfd1b07..4b4ec4ceb 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -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.</p>
<h2>$this->load->view('<var>file_name</var>', <samp>$data</samp>, <kbd>true/false</kbd>)</h2>
@@ -164,7 +164,7 @@ Previous Topic: <a href="input.html">Input Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="language.html">Language Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 40858751e..10d59026b 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -75,7 +75,7 @@ It is possible, however, for you to manually intervene with the output if you ne <h2>$this->output->set_output();</h2>
-<p>Permits you to manually set the final output string. Usage example:<p>
+<p>Permits you to manually set the final output string. Usage example:</p>
<code>$this->output->set_output($data);</code>
@@ -85,7 +85,7 @@ For example, if you build a page in one of your controller functions, don't set <h2>$this->output->get_output();</h2>
-<p>Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:<p>
+<p>Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:</p>
<code>$string = $this->output->get_output();</code>
<p>Note that data will only be retrievable from this function if it has been previously sent to the output class by one of the
@@ -94,7 +94,7 @@ CodeIgniter functions like <var>$this->load->view()</var>.</p> <h2>$this->output->set_header();</h2>
-<p>Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:<p>
+<p>Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:</p>
<code>
$this->output->set_header("HTTP/1.0 200 OK");<br />
@@ -131,7 +131,7 @@ Previous Topic: <a href="language.html">Language Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="pagination.html">Pagination Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index fafeb6cfc..edb112d35 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -99,7 +99,7 @@ minimum you need the three shown. Here is a description of what those items rep <li><strong>per_page</strong> The number of items you intend to show per page. In the above example, you would be showing 20 items per page.</li>
</ul>
-<p>The <var>create_links()</var> function returns an empty string when there is no pagination to show.
+<p>The <var>create_links()</var> function returns an empty string when there is no pagination to show.</p>
<h3>Setting preferences in a config file</h3>
@@ -210,7 +210,7 @@ Previous Topic: <a href="output.html">Output Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="sessions.html">Session Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 24bb89ffc..e7b7add11 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -207,7 +207,7 @@ Previous Topic: <a href="trackback.html">Trackback Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="unit_testing.html">Unit Testing Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 5a3c4ae21..30e26263f 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -286,7 +286,7 @@ Previous Topic: <a href="pagination.html">Pagination Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="trackback.html">Trackback Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 28fc76d27..330a3da20 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -119,7 +119,7 @@ $this->table->add_row('John', 'Green', 'Medium');<br /> echo $this->table->generate();
</code>
-<p>Here is the same example, except instead of individual parameters, arrays are used:
+<p>Here is the same example, except instead of individual parameters, arrays are used:</p>
<code>
$this->load->library('table');<br />
@@ -289,7 +289,7 @@ Previous Topic: <a href="ftp.html"> FTP Class</a> &mi <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="image_lib.html">Image Manipulation Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index c54417c86..3dfb20375 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -78,7 +78,7 @@ Trackback Class <h2>Sending Trackbacks</h2>
-<p>A Trackback can be sent from any of your controller functions using code similar to this example:
+<p>A Trackback can be sent from any of your controller functions using code similar to this example:</p>
<code>$this->load->library('trackback');<br />
<br />
@@ -243,7 +243,7 @@ Previous Topic: <a href="sessions.html">Session Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="parser.html">Template Parser Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index bdd64d04b..568bf6c6a 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -202,7 +202,7 @@ Previous Topic: <a href="parser.html">Template Parser Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="uri.html">URI Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index ec7770570..7efca6dd1 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -105,7 +105,7 @@ else<br /> <h2>$this->uri->rsegment(<var>n</var>)</h2>
<p>This function is identical to the previous one, except that it lets you retrieve a specific segment from your
-re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.
+re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.</p>
<h2>$this->uri->slash_segment(<var>n</var>)</h2>
@@ -129,7 +129,7 @@ $this->uri->slash_segment(<var>3</var>, 'both');</code> <h2>$this->uri->slash_rsegment(<var>n</var>)</h2>
<p>This function is identical to the previous one, except that it lets you add slashes a specific segment from your
-re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.
+re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.</p>
@@ -173,8 +173,7 @@ $array = $this->uri->uri_to_assoc(3, $default);</code> <h2>$this->uri->ruri_to_assoc(<var>n</var>)</h2>
<p>This function is identical to the previous one, except that it creates an associative array using the
-re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.
-
+re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.</p>
<h2>$this->uri->assoc_to_uri()</h2>
@@ -203,7 +202,7 @@ $str = $this->uri->assoc_to_uri($array);<br /> <h2>$this->uri->ruri_string(<var>n</var>)</h2>
<p>This function is identical to the previous one, except that it returns the
-re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.
+re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.</p>
@@ -215,7 +214,7 @@ re-routed URI in the event you are using CodeIgniter's <a href="../general/routi <h2>$this->uri->total_rsegments(<var>n</var>)</h2>
<p>This function is identical to the previous one, except that it returns the total number of segments in your
-re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.
+re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.</p>
@@ -250,7 +249,7 @@ Previous Topic: <a href="unit_testing.html">Unit Testing Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="user_agent.html">User Agent Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index e9f6b715b..5bb87a76b 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -81,7 +81,7 @@ various user agent arrays if needed.</p> <h2>Example</h2>
<p>When the User Agent class is initialized it will attempt to determine whether the user agent browsing your site is
-a web browser, a mobile device, or a robot. It will also gather the platform information if it is available.
+a web browser, a mobile device, or a robot. It will also gather the platform information if it is available.</p>
<code>
@@ -110,9 +110,6 @@ echo $this->agent->platform(); // Platform info (Windows, Linux, Mac, etc.) </code>
-
-
-<br />
<h1>Function Reference</h1>
@@ -170,7 +167,7 @@ very efficient. If you find that some bots that commonly visit your site are mis <code>if ($this->agent->accept_lang('en'))<br />
{<br />
echo 'You accept English!';<br />
-}</cod>
+}</code>
<p class="important"><strong>Note:</strong> This function is not typically very reliable
since some browsers do not provide language info, and even among those that do, it is not always accurate. </p>
@@ -183,7 +180,7 @@ since some browsers do not provide language info, and even among those that do, <code>if ($this->agent->accept_charset('utf-8'))<br />
{<br />
echo 'You browser supports UTF-8!';<br />
-}</cod>
+}</code>
<p class="important"><strong>Note:</strong> This function is not typically very reliable
since some browsers do not provide character-set info, and even among those that do, it is not always accurate. </p>
@@ -201,7 +198,7 @@ Previous Topic: <a href="uri.html">URI Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="validation.html">Validation Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 8ba45ba4b..cd239ea40 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -77,7 +77,7 @@ Form Validation <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,
-and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.)
+and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.)</li>
<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>
<li>Prep the data for insertion in the database.</li>
@@ -109,34 +109,35 @@ It also removes all control structures from your form HTML, permitting it to be folder:</p>
-<textarea class="textarea" style="width:100%" cols="50" rows="30"><html>
-<head>
-<title>My Form</title>
-</head>
-<body>
+<textarea class="textarea" style="width:100%" cols="50" rows="30"><html>
+<head>
+<title>My Form</title>
+</head>
+<body>
-<?=$this->validation->error_string; ?>
+<?=$this->validation->error_string; ?>
-<?=form_open('form'); ?>
+<?=form_open('form'); ?>
-<h5>Username</h5>
-<input type="text" name="username" value="" size="50" />
+<h5>Username</h5>
+<input type="text" name="username" value="" size="50" />
-<h5>Password</h5>
-<input type="text" name="password" value="" size="50" />
+<h5>Password</h5>
+<input type="text" name="password" value="" size="50" />
-<h5>Password Confirm</h5>
-<input type="text" name="passconf" value="" size="50" />
+<h5>Password Confirm</h5>
+<input type="text" name="passconf" value="" size="50" />
-<h5>Email Address</h5>
-<input type="text" name="email" value="" size="50" />
+<h5>Email Address</h5>
+<input type="text" name="email" value="" size="50" />
-<div><input type="submit" value="Submit" /></div>
+<div><input type="submit" value="Submit" /></div>
-</form>
+</form>
-</body>
-</html></textarea>
+</body>
+</html>
+</textarea>
<h2>The Success Page</h2>
@@ -146,18 +147,20 @@ folder:</p> folder:</p>
-<textarea class="textarea" style="width:100%" cols="50" rows="14"><html>
-<head>
-<title>My Form</title>
-</head>
-<body>
+<textarea class="textarea" style="width:100%" cols="50" rows="14">
+<html>
+<head>
+<title>My Form</title>
+</head>
+<body>
-<h3>Your form was successfully submitted!</h3>
+<h3>Your form was successfully submitted!</h3>
-<p><?=anchor('form', 'Try it again!'); ?></p>
+<p><?=anchor('form', 'Try it again!'); ?></p>
-</body>
-</html></textarea>
+</body>
+</html>
+</textarea>
<h2>The Controller</h2>
@@ -166,7 +169,7 @@ folder:</p> folder:</p>
-<textarea class="textarea" style="width:100%" cols="50" rows="21"><?php
+<textarea class="textarea" style="width:100%" cols="50" rows="21"><?php
class Form extends Controller {
@@ -314,7 +317,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.
-For example, you can set up rules like this:
+For example, you can set up rules like this:</p>
<code>$rules['username'] = "<kbd>trim</kbd>|required|min_length[5]|max_length[12]|<kbd>xss_clean</kbd>";<br />
$rules['password'] = "<kbd>trim</kbd>|required|matches[passconf]|<kbd>md5</kbd>";<br />
@@ -451,34 +454,36 @@ error message.</p> <p>Now open your <dfn>myform.php</dfn> view file and update the value in each field so that it has an object corresponding to its name:</p>
-<textarea class="textarea" style="width:100%" cols="50" rows="30"><html>
-<head>
-<title>My Form</title>
-</head>
-<body>
+<textarea class="textarea" style="width:100%" cols="50" rows="30">
+<html>
+<head>
+<title>My Form</title>
+</head>
+<body>
-<?=$this->validation->error_string; ?>
+<?=$this->validation->error_string; ?>
-<?=form_open('form'); ?>
+<?=form_open('form'); ?>
-<h5>Username</h5>
-<input type="text" name="username" value="<?=$this->validation->username;?>" size="50" />
+<h5>Username</h5>
+<input type="text" name="username" value="<?=$this->validation->username;?>" size="50" />
-<h5>Password</h5>
-<input type="text" name="password" value="<?=$this->validation->password;?>" size="50" />
+<h5>Password</h5>
+<input type="text" name="password" value="<?=$this->validation->password;?>" size="50" />
-<h5>Password Confirm</h5>
-<input type="text" name="passconf" value="<?=$this->validation->passconf;?>" size="50" />
+<h5>Password Confirm</h5>
+<input type="text" name="passconf" value="<?=$this->validation->passconf;?>" size="50" />
-<h5>Email Address</h5>
-<input type="text" name="email" value="<?=$this->validation->email;?>" size="50" />
+<h5>Email Address</h5>
+<input type="text" name="email" value="<?=$this->validation->email;?>" size="50" />
-<div><input type="submit" value="Submit" /></div>
+<div><input type="submit" value="Submit" /></div>
-</form>
+</form>
-</body>
-</html></textarea>
+</body>
+</html>
+</textarea>
<p>Now reload your page and submit the form so that it triggers an error. Your form fields should be populated
@@ -491,22 +496,22 @@ and the error messages will contain a more relevant field name.</p> <p>If you prefer to show an error message next to each form field, rather than as a list, you can change your form so that it looks like this:</p>
-<textarea class="textarea" style="width:100%" cols="50" rows="20">
-<h5>Username</h5>
-<?=$this->validation->username_error; ?>
-<input type="text" name="username" value="<?=$this->validation->username;?>" size="50" />
+<textarea class="textarea" style="width:100%" cols="50" rows="20">
+<h5>Username</h5>
+<?=$this->validation->username_error; ?>
+<input type="text" name="username" value="<?=$this->validation->username;?>" size="50" />
-<h5>Password</h5>
-<?=$this->validation->password_error; ?>
-<input type="text" name="password" value="<?=$this->validation->password;?>" size="50" />
+<h5>Password</h5>
+<?=$this->validation->password_error; ?>
+<input type="text" name="password" value="<?=$this->validation->password;?>" size="50" />
-<h5>Password Confirm</h5>
-<?=$this->validation->passconf_error; ?>
-<input type="text" name="passconf" value="<?=$this->validation->passconf;?>" size="50" />
+<h5>Password Confirm</h5>
+<?=$this->validation->passconf_error; ?>
+<input type="text" name="passconf" value="<?=$this->validation->passconf;?>" size="50" />
-<h5>Email Address</h5>
-<?=$this->validation->email_error; ?>
-<input type="text" name="email" value="<?=$this->validation->email;?>" size="50" /></textarea>
+<h5>Email Address</h5>
+<?=$this->validation->email_error; ?>
+<input type="text" name="email" value="<?=$this->validation->email;?>" size="50" /></textarea>
<p>If there are no errors, nothing will be shown. If there is an error, the message will appear, wrapped in the delimiters you
have set (<p> tags by default).</p>
@@ -589,16 +594,13 @@ For example, your "username" error will be available at:<br /><dfn>$this->valida <td class="td">Returns FALSE if the form element does not contain a valid email address.</td>
<td class="td"> </td>
</tr>
-
+<tr>
<td class="td"><strong>valid_ip</strong></td>
<td class="td">No</td>
<td class="td">Returns FALSE if the supplied IP is not valid.</td>
<td class="td"> </td>
</tr>
-
-
-
</table>
<p><strong>Note:</strong> These rules can also be called as discreet functions. For example:</p>
@@ -714,7 +716,7 @@ Previous Topic: <a href="user_agent.html">User Agent Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="xmlrpc.html">XML-RPC Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 5d9b9ee64..ba70e11a8 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -88,11 +88,11 @@ Once processed, the server will then send back a response message.</p> <p>Like most other classes in CodeIgniter, the XML-RPC and XML-RPCS classes are initialized in your controller using the <dfn>$this->load->library</dfn> function:</p>
-<p>To load the XML-RPC class you will use:
+<p>To load the XML-RPC class you will use:</p>
<code>$this->load->library('xmlrpc');</code>
<p>Once loaded, the xml-rpc library object will be available using: <dfn>$this->xmlrpc</dfn></p>
-<p>To load the XML-RPC Server class you will use:
+<p>To load the XML-RPC Server class you will use:</p>
<code>
$this->load->library('xmlrpc');<br />
$this->load->library('xmlrpcs');
@@ -193,7 +193,7 @@ $this->xmlrpcs->initialize($config);<br /> $this->xmlrpcs->serve();</code>
<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.
+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>
<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.
@@ -223,7 +223,7 @@ to exist with this prototype:</p> <p>The <var>$request</var> variable is an object compiled by the Server, which contains the data sent by the XML-RPC Client.
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>
+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>.
Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends
@@ -486,7 +486,7 @@ Previous Topic: <a href="validation.html">Validation Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="zip.html">Zip Encoding Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index e1692234f..f92443b54 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -165,7 +165,7 @@ $this->zip->download('my_backup.zip'); </code>
<p>If you would like the Zip archive to maintain the directory structure the file is in, pass <kbd>TRUE</kbd> (boolean) in the
-second parameter. Example:
+second parameter. Example:</p>
<code>
@@ -275,7 +275,7 @@ Previous Topic: <a href="xmlrpc.html"> XML-RPC Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../helpers/array_helper.html">Array Helper</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/license.html b/user_guide/license.html index f938c2cfc..d89cce5e1 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -104,8 +104,7 @@ Previous Topic: <a href="general/requirements.html">Server Requiremen <a href="#top">Top of Page</a> ·
<a href="index.html">User Guide Home</a> ·
Next Topic: <a href="changelog.html">Change Log</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index d10d038a9..ac0f06738 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -92,8 +92,7 @@ Previous Topic: <a href="features.html">CodeIgniter Features</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="mvc.html">Model-View-Controller</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index aadfe558e..2082b0253 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -169,8 +169,7 @@ Previous Topic: <a href="../installation/upgrading.html">Upgrading fr <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="features.html">CodeIgniter Features</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 7033681fd..93c9e2f9d 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -117,8 +117,7 @@ Previous Topic: <a href="at_a_glance.html">CodeIgniter At a Glance</a <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="appflow.html">Application Flow Chart</a>
-<p>
-
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index fba6f61a4..a596cab53 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -95,7 +95,7 @@ Previous Topic: <a href="mvc.html">Model-View-Controller</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../general/index.html">Getting Started</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 133503fa9..87316a63a 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -81,7 +81,7 @@ Introduction <div id="footer">
-<p><a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a><p>
+<p><a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a></p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index baac03da4..fe8d86393 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -97,7 +97,7 @@ Previous Topic: <a href="appflow.html">Application Flow Chart</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="goals.html">Architectural Goals</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/toc.html b/user_guide/toc.html index 12c16183d..88ccaafaf 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -193,7 +193,7 @@ Table of Contents <div id="footer">
-<p><a href="#top">Top of Page</a><p>
+<p><a href="#top">Top of Page</a></p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
|