Run pre and post proxies for file_put_contents() streams

Conflicts:
	lib/filesystemview.php

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index f147cf5b244f55185968417053a74880370e1de9..a363cee0b8a1cbfb904d4eecdd0c2609bd3251c8 100644 (file)
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -198,29 +198,56 @@ class OC_FilesystemView {
        public function file_get_contents($path){
                return $this->basicOperation('file_get_contents',$path,array('read'));
        }
-       public function file_put_contents($path,$data){
-               if(is_resource($data)){//not having to deal with streams in file_put_contents makes life easier
-                       $exists=$this->file_exists($path);
-                       $run=true;
-                       if(!$exists){
-                               OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_create, array( OC_Filesystem::signal_param_path => $path, OC_Filesystem::signal_param_run => &$run));
-                       }
-                       OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, array( OC_Filesystem::signal_param_path => $path, OC_Filesystem::signal_param_run => &$run));
-                       if(!$run){
-                               return false;
-                       }
-                       $target=$this->fopen($path,'w');
-                       if($target){
-                               $count=OC_Helper::streamCopy($data,$target);
-                               fclose($target);
-                               fclose($data);
-                               if(!$exists){
-                                       OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_create, array( OC_Filesystem::signal_param_path => $path));
+       public function file_put_contents($path, $data) {
+               if(is_resource($data)) {//not having to deal with streams in file_put_contents makes life easier
+                       $absolutePath = $this->getAbsolutePath($path);
+                       if (OC_FileProxy::runPreProxies('file_put_contents', $absolutePath) && OC_Filesystem::isValidPath($path)) {
+                               $path = $this->getRelativePath($absolutePath);
+                               $exists = $this->file_exists($path);
+                               $run = true;
+                               if(!$exists) {
+                                       OC_Hook::emit(
+                                               OC_Filesystem::CLASSNAME,
+                                               OC_Filesystem::signal_create,
+                                               array(
+                                                       OC_Filesystem::signal_param_path => $path,
+                                                       OC_Filesystem::signal_param_run => &$run
+                                               )
+                                       );
+                               }
+                               OC_Hook::emit(
+                                       OC_Filesystem::CLASSNAME,
+                                       OC_Filesystem::signal_write,
+                                       array(
+                                               OC_Filesystem::signal_param_path => $path,
+                                               OC_Filesystem::signal_param_run => &$run
+                                       )
+                               );
+                               if(!$run) {
+                                       return false;
+                               }
+                               $target=$this->fopen($path, 'w');
+                               if($target) {
+                                       $count=OC_Helper::streamCopy($data, $target);
+                                       fclose($target);
+                                       fclose($data);
+                                       if(!$exists) {
+                                               OC_Hook::emit(
+                                                       OC_Filesystem::CLASSNAME,
+                                                       OC_Filesystem::signal_post_create,
+                                                       array( OC_Filesystem::signal_param_path => $path)
+                                               );
+                                       }
+                                       OC_Hook::emit(
+                                               OC_Filesystem::CLASSNAME,
+                                               OC_Filesystem::signal_post_write,
+                                               array( OC_Filesystem::signal_param_path => $path)
+                                       );
+                                       OC_FileProxy::runPostProxies('hash', $absolutePath, $count);
+                                       return $count > 0;
+                               }else{
+                                       return false;
                                }
-                               OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path));
-                               return $count>0;
-                       }else{
-                               return false;
                        }
                }else{
                        return $this->basicOperation('file_put_contents',$path,array('create','write'),$data);