diff options
author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
commit | 8f371a4954ec84f9ea80c26e654a4793714f8a07 (patch) | |
tree | 912d83e6e2adbe136d892f0a41ea1730dc11206a /user_guide/helpers/security_helper.html | |
parent | 806b82448ddccece1311228519dc1410dacd0971 (diff) | |
parent | 4b9c62980599228f070b401c7673dce8085b0c61 (diff) |
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'user_guide/helpers/security_helper.html')
-rw-r--r-- | user_guide/helpers/security_helper.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 49e0365d1..e0cace325 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -71,19 +71,19 @@ Security Helper <h2>xss_clean()</h2> -<p>Provides Cross Site Script Hack filtering. This function is an alias to the one in the -<a href="../libraries/input.html">Input class</a>. More info can be found there.</p> +<p>Provides Cross Site Script Hack filtering. This function is an alias to the one in the +<a href="../libraries/input.html">Input class</a>. More info can be found there.</p> <h2>sanitize_filename()</h2> -<p>Provides protection against directory traversal. This function is an alias to the one in the -<a href="../libraries/security.html">Security class</a>. More info can be found there.</p> +<p>Provides protection against directory traversal. This function is an alias to the one in the +<a href="../libraries/security.html">Security class</a>. More info can be found there.</p> <h2>do_hash()</h2> -<p>Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords. Will create SHA1 by default. Examples:</p> +<p>Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords. Will create SHA1 by default. Examples:</p> <code> $str = do_hash($str); // SHA1<br /> @@ -91,13 +91,13 @@ $str = do_hash($str); // SHA1<br /> $str = do_hash($str, 'md5'); // MD5 </code> -<p class="important"><strong>Note:</strong> This function was formerly named <kbd>dohash()</kbd>, which has been deprecated in favour of <kbd>do_hash()</kbd>.</p> +<p class="important"><strong>Note:</strong> This function was formerly named <kbd>dohash()</kbd>, which has been deprecated in favour of <kbd>do_hash()</kbd>.</p> <h2>strip_image_tags()</h2> -<p>This is a security function that will strip image tags from a string. It leaves the image URL as plain text.</p> +<p>This is a security function that will strip image tags from a string. It leaves the image URL as plain text.</p> <code>$string = strip_image_tags($string);</code> |