diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2008-05-05 20:29:43 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2008-05-05 20:29:43 +0200 |
| commit | 14031d152b76e7744d6f8a70964ecae77ca55179 (patch) | |
| tree | 2738a95460ee4efd5a70e5853f419e6a10d4539f | |
| parent | 5f6b5442e5a3d7fa5cf6c047ed716b82946629a2 (diff) | |
implemented fopen mode constants
| -rw-r--r-- | system/codeigniter/Common.php | 4 | ||||
| -rw-r--r-- | system/helpers/file_helper.php | 6 | ||||
| -rw-r--r-- | system/libraries/Email.php | 2 | ||||
| -rw-r--r-- | system/libraries/Log.php | 2 | ||||
| -rw-r--r-- | system/libraries/Upload.php | 2 | ||||
| -rw-r--r-- | system/libraries/Zip.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index 05720a459..b6a4ce4c5 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -46,7 +46,7 @@ function is_really_writable($file) {
$file = rtrim($file, '/').'/'.md5(rand(1,100));
- if (($fp = @fopen($file, 'ab')) === FALSE)
+ if (($fp = @fopen($file, FOPEN_WRITE_CREATE_EOF)) === FALSE)
{
return FALSE;
}
@@ -56,7 +56,7 @@ function is_really_writable($file) @unlink($file);
return TRUE;
}
- elseif (($fp = @fopen($file, 'ab')) === FALSE)
+ elseif (($fp = @fopen($file, FOPEN_WRITE_CREATE_EOF)) === FALSE)
{
return FALSE;
}
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 1eb8348e9..2bcb98b4d 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -50,7 +50,7 @@ if (! function_exists('read_file')) return file_get_contents($file);
}
- if (! $fp = @fopen($file, 'rb'))
+ if (! $fp = @fopen($file, FOPEN_READ_BOF))
{
return FALSE;
}
@@ -85,7 +85,7 @@ if (! function_exists('read_file')) */
if (! function_exists('write_file'))
{
- function write_file($path, $data, $mode = 'wb')
+ function write_file($path, $data, $mode = FOPEN_WRITE_CREATE_BOF)
{
if (! $fp = @fopen($path, $mode))
{
@@ -167,7 +167,7 @@ if (! function_exists('get_filenames')) {
function get_filenames($source_dir, $include_path = FALSE, $_recursion = FALSE)
{
- $_filedata = array();
+ static $_filedata = array();
if ($fp = @opendir($source_dir))
{
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 3b4dddd00..d71f593e9 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1070,7 +1070,7 @@ class CI_Email { $attachment[$z++] = $h;
$file = filesize($filename) +1;
- if (! $fp = fopen($filename, 'r'))
+ if (! $fp = fopen($filename, FOPEN_READ_BOF))
{
$this->_set_error_message('email_attachment_unreadable', $filename);
return FALSE;
diff --git a/system/libraries/Log.php b/system/libraries/Log.php index 247aee13c..370ab7922 100644 --- a/system/libraries/Log.php +++ b/system/libraries/Log.php @@ -97,7 +97,7 @@ class CI_Log { $message .= "<"."?php if (!defined('BASEPATH')) exit('No direct script access allowed'); ?".">\n\n";
}
- if (! $fp = @fopen($filepath, "a"))
+ if (! $fp = @fopen($filepath, FOPEN_WRITE_CREATE_EOF))
{
return FALSE;
}
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index f13907000..853c162bd 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -741,7 +741,7 @@ class CI_Upload { return FALSE;
}
- if (! $fp = @fopen($file, 'r+b'))
+ if (! $fp = @fopen($file, FOPEN_READ_WRITE_BOF))
{
return FALSE;
}
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index 4bdc92547..6b5988017 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -301,7 +301,7 @@ class CI_Zip { */
function archive($filepath)
{
- if (! ($fp = @fopen($filepath, "wb")))
+ if (! ($fp = @fopen($filepath, FOPEN_WRITE_CREATE_BOF)))
{
return FALSE;
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9817d162a..615d363bc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -72,7 +72,7 @@ SVN Commit: not currently released</p> <ul>
<li>Added 'application/vnd.ms-powerpoint' to list of mime types.</li>
<li>Added 'audio/mpg' to list of mime types.</li>
- <li>Added new user-modifiable file constants.php containing file mode constants.</li>
+ <li>Added new user-modifiable file constants.php containing file mode and fopen constants.</li>
<li>Added the ability to set CRLF settings via config in the <a href="libraries/email.html">Email</a> class.</li>
</ul>
</li>
|