From 78ce3cc370efc9d63b3d473deb37c92f40002d3d Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 2 Oct 2006 02:58:03 +0000 Subject: --- system/helpers/file_helper.php | 7 ++++++- user_guide/database/queries.html | 4 ++-- user_guide/database/results.html | 4 ++-- user_guide/general/changelog.html | 3 ++- user_guide/general/security.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/installation/downloads.html | 3 ++- user_guide/libraries/zip.html | 2 +- user_guide/nav/nav.js | 1 + user_guide/toc.html | 1 + user_guide/userguide.css | 3 ++- 11 files changed, 21 insertions(+), 11 deletions(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 32c0b2cdc..4c7eaa54e 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -42,6 +42,11 @@ function read_file($file) { return FALSE; } + + if (function_exists('file_get_contents')) + { + return file_get_contents($file); + } if ( ! $fp = @fopen($file, 'rb')) { @@ -53,7 +58,7 @@ function read_file($file) $data = ''; if (filesize($file) > 0) { - $data = fread($fp, filesize($file)); + $data =& fread($fp, filesize($file)); } flock($fp, LOCK_UN); diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 954570c70..8575b2534 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -85,7 +85,7 @@ It DOES NOT return a database result set, nor does it set the query timer, or co It simply lets you submit a query. Most users will rarely use this function.

-


Escaping Queries

+

Escaping Queries

It's a very good security practice to escape your data before sumbiting it into your database. Code Igniter has two functions that help you do this:

@@ -107,7 +107,7 @@ Most of the time you'll use the above function rather then this one. Use the fun -


Query Bindings

+

Query Bindings

Bindings enable you to simplify your query syntax by letting the system put the queries together for you. Consider the following example:

diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 75f4357b4..607c9857c 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -181,8 +181,8 @@ Query Results

- -


Result Helper Functions

+
+

Result Helper Functions

$query->num_rows()

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html index 0671b8baa..19366499d 100644 --- a/user_guide/general/changelog.html +++ b/user_guide/general/changelog.html @@ -74,7 +74,8 @@ Change Log
  • Added Zip Encoding Library permitting files to be Zip compressed.
  • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
  • Added support for storing models within sub-folders.
    • -
  • Added simple_query() function to the database classes
    • +
  • Added Download Helper.
    • +
  • Added simple_query() function to the database classes
  • Added $query->free_result();
  • Added $query->field_names() function
  • Added $this->db->platform() function
    • diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 2eeee6d7e..c1062bddd 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -98,7 +98,7 @@ routine is effectively the same as register_globals = off.

    The magic_quotes_runtime directive is turned off during system initialization so that you don't have to remove slashes when retrieving data from your database.

    -


    Best Practices

    +

    Best Practices

    Before accepting any data into your application, whether it be POST data from a form submission, COOKIE data, URI data, XML-RPC data, or even data from the SERVER array, you are encouraged to practice this three step approach:

    diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index c17e0dfd0..92e2461d0 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -136,7 +136,7 @@ Previous Topic:  Date Helper    ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  File Helper +Next Topic:  Download Helper

    Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

    diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 1eb60b1ed..32c538859 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -63,7 +63,8 @@ Downloading Code Igniter

    Downloading Code Igniter