mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1526 from nextcloud/more-error-handling-in-copyr-stable10 

[stable10] Graceful error handling and logging
This commit is contained in:
Morris Jobke 2016-09-28 22:40:56 +02:00 committed by GitHub
parent 3e93dbd404 2ecf5722ec
commit bf0dfa997f
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/legacy/util.php
View File

@ -336,7 +336,16 @@ class OC_Util {
* @return void
*/
public static function copyr($source, \OCP\Files\Folder $target) {
$logger = \OC::$server->getLogger();
// Verify if folder exists
$dir = opendir($source);
if($dir === false) {
$logger->error(sprintf('Could not opendir "%s"', $source), ['app' => 'core']);
return;
}
// Copy the files
while (false !== ($file = readdir($dir))) {
if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
if (is_dir($source . '/' . $file)) {
@ -344,7 +353,13 @@ class OC_Util {
self::copyr($source . '/' . $file, $child);
} else {
$child = $target->newFile($file);
stream_copy_to_stream(fopen($source . '/' . $file,'r'), $child->fopen('w'));
$sourceStream = fopen($source . '/' . $file, 'r');
if($sourceStream === false) {
$logger->error(sprintf('Could not fopen "%s"', $source . '/' . $file), ['app' => 'core']);
closedir($dir);
return;
}
stream_copy_to_stream($sourceStream, $child->fopen('w'));
}
}
}