Run pre and post proxies for file_put_contents() streams

Conflicts:
	lib/filesystemview.php
This commit is contained in:
Michael Gapczynski 2012-07-26 22:53:55 -04:00
parent 41a74e3dd2
commit ea18d70c60
1 changed files with 49 additions and 22 deletions

View File

@ -200,12 +200,29 @@ class OC_FilesystemView {
} }
public function file_put_contents($path, $data) { public function file_put_contents($path, $data) {
if(is_resource($data)) {//not having to deal with streams in file_put_contents makes life easier 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); $exists = $this->file_exists($path);
$run = true; $run = true;
if(!$exists) { 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_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)); 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) { if(!$run) {
return false; return false;
} }
@ -215,13 +232,23 @@ class OC_FilesystemView {
fclose($target); fclose($target);
fclose($data); fclose($data);
if(!$exists) { 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_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_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; return $count > 0;
}else{ }else{
return false; return false;
} }
}
}else{ }else{
return $this->basicOperation('file_put_contents',$path,array('create','write'),$data); return $this->basicOperation('file_put_contents',$path,array('create','write'),$data);
} }