6 files changed, 9 insertions, 9 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;
 		}