diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-28 11:33:59 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-28 11:33:59 +0100 |
| commit | 3e0bb3e7c4a34b3e7344665b901918ce54b57d81 (patch) | |
| tree | 53176a0c4efe97aa9fdb464199ffe1a9da1654cd /lib | |
| parent | a76ff563d645ce456d6366b34fd763d5b11ee0d3 (diff) | |
| download | nextcloud-server-3e0bb3e7c4a34b3e7344665b901918ce54b57d81.tar.gz nextcloud-server-3e0bb3e7c4a34b3e7344665b901918ce54b57d81.zip | |
use temporary file managment
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/filestorage/common.php | 6 | ||||
| -rw-r--r-- | lib/filesystemview.php | 3 | ||||
| -rw-r--r-- | lib/installer.php | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index 2e7ad957129..62b12fede09 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -92,7 +92,8 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { return false; } $head=fread($source,8192);//8kb should suffice to determine a mimetype - $tmpFile=tempnam(get_temp_dir(),'OC_TMP_').substr($path,strrpos($path,'.')); + $extention=substr($path,strrpos($path,'.')); + $tmpFile=OC_Helper::tmpFile($extention); file_put_contents($tmpFile,$head); $mime=OC_Helper::getMimeType($tmpFile); unlink($tmpFile); @@ -114,7 +115,8 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { if(!$source){ return false; } - $tmpFile=tempnam(get_temp_dir(),'OC_TMP_').substr($path,strrpos($path,'.')); + $extention=substr($path,strrpos($path,'.')); + $tmpFile=OC_Helper::tmpFile($extention); $target=fopen($tmpFile); $count=OC_Helper::streamCopy($source,$target); return $tmpFile; diff --git a/lib/filesystemview.php b/lib/filesystemview.php index b014c3272f7..5996a5f60fb 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -278,8 +278,9 @@ class OC_FilesystemView { public function toTmpFile($path){ if(OC_Filesystem::isValidPath($path)){ $source=$this->fopen($path,'r'); - $tmpFile=tempnam(get_temp_dir(),'OC_TMP_').substr($path,strrpos($path,'.')); if($source){ + $extention=substr($path,strrpos($path,'.')); + $tmpFile=OC_Helper::tmpFile($extention); return file_put_contents($tmpFile,$source); } } diff --git a/lib/installer.php b/lib/installer.php index 2cc7555f0d6..2a9676998f6 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -62,7 +62,7 @@ class OC_Installer{ //download the file if necesary if($data['source']=='http'){ - $path=tempnam(get_temp_dir(),'oc_installer_'); + $path=OC_Helper::tmpFile('.zip'); if(!isset($data['href'])){ OC_Log::write('core','No href specified when installing app from http',OC_Log::ERROR); return false; @@ -142,9 +142,6 @@ class OC_Installer{ //remove temporary files OC_Helper::rmdirr($extractDir); - if($data['source']=='http'){ - unlink($path); - } //install the database if(is_file($basedir.'/appinfo/database.xml')){ |