diff options
author | Derek Jones <derek.jones@ellislab.com> | 2008-05-05 22:07:09 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2008-05-05 22:07:09 +0200 |
commit | 3be20e26b7d3c0f60bc60b314a85138100edab52 (patch) | |
tree | bd134700b39e5331a190d47684ddf29c11cd951e /system | |
parent | 14031d152b76e7744d6f8a70964ecae77ca55179 (diff) |
tweak to the new fopen mode constant names
Diffstat (limited to 'system')
-rw-r--r-- | system/application/config/constants.php | 18 | ||||
-rw-r--r-- | system/codeigniter/Common.php | 4 | ||||
-rw-r--r-- | system/helpers/file_helper.php | 4 | ||||
-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 |
7 files changed, 18 insertions, 16 deletions
diff --git a/system/application/config/constants.php b/system/application/config/constants.php index 3909941ec..3f7975635 100644 --- a/system/application/config/constants.php +++ b/system/application/config/constants.php @@ -26,12 +26,14 @@ define('DIR_WRITE_MODE', 0777); | These modes are used when working with fopen()/popen()
|
*/
-define('FOPEN_READ_BOF', 'rb');
-define('FOPEN_READ_WRITE_BOF', 'r+b');
-define('FOPEN_WRITE_CREATE_BOF', 'wb'); // truncates existing file data, use with care
-define('FOPEN_READ_WRITE_CREATE_BOF', 'w+b'); // truncates existing file data, use with care
-define('FOPEN_WRITE_CREATE_EOF', 'ab');
-define('FOPEN_READ_WRITE_CREATE_EOF', 'a+b');
-define('FOPEN_WRITE_CREATE_STRICT', 'xb');
-define('FOPEN_READ_WRITE_CREATE_STRICT','x+b');
+
+define('FOPEN_READ', 'rb');
+define('FOPEN_READ_WRITE', 'r+b');
+define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
+define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
+define('FOPEN_WRITE_CREATE', 'ab');
+define('FOPEN_READ_WRITE_CREATE', 'a+b');
+define('FOPEN_WRITE_CREATE_STRICT', 'xb');
+define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
+
?>
\ No newline at end of file diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index b6a4ce4c5..c5c548cdf 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, FOPEN_WRITE_CREATE_EOF)) === FALSE)
+ if (($fp = @fopen($file, FOPEN_WRITE_CREATE)) === FALSE)
{
return FALSE;
}
@@ -56,7 +56,7 @@ function is_really_writable($file) @unlink($file);
return TRUE;
}
- elseif (($fp = @fopen($file, FOPEN_WRITE_CREATE_EOF)) === FALSE)
+ elseif (($fp = @fopen($file, FOPEN_WRITE_CREATE)) === FALSE)
{
return FALSE;
}
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 2bcb98b4d..147a7fdf1 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, FOPEN_READ_BOF))
+ if (! $fp = @fopen($file, FOPEN_READ))
{
return FALSE;
}
@@ -85,7 +85,7 @@ if (! function_exists('read_file')) */
if (! function_exists('write_file'))
{
- function write_file($path, $data, $mode = FOPEN_WRITE_CREATE_BOF)
+ function write_file($path, $data, $mode = FOPEN_WRITE_CREATE_DESTRUCTIVE)
{
if (! $fp = @fopen($path, $mode))
{
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index d71f593e9..e0fa689b3 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, FOPEN_READ_BOF))
+ if (! $fp = fopen($filename, FOPEN_READ))
{
$this->_set_error_message('email_attachment_unreadable', $filename);
return FALSE;
diff --git a/system/libraries/Log.php b/system/libraries/Log.php index 370ab7922..26757ba50 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, FOPEN_WRITE_CREATE_EOF))
+ if (! $fp = @fopen($filepath, FOPEN_WRITE_CREATE))
{
return FALSE;
}
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 853c162bd..0fc38dc4f 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -741,7 +741,7 @@ class CI_Upload { return FALSE;
}
- if (! $fp = @fopen($file, FOPEN_READ_WRITE_BOF))
+ if (! $fp = @fopen($file, FOPEN_READ_WRITE))
{
return FALSE;
}
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index 6b5988017..f7f47ab42 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, FOPEN_WRITE_CREATE_BOF)))
+ if (! ($fp = @fopen($filepath, FOPEN_WRITE_CREATE_DESTRUCTIVE)))
{
return FALSE;
}
|