sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More corrections

remotes/origin/certificate-external-storage-visibility
Victor Dubiniuk 2015-09-24 18:23:10 +07:00 committed by Thomas Müller
parent 28df7be319
commit 027fb4e3fe
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/files.php
Unescape Escape View File

@ -151,12 +151,12 @@ class OC_Files {
$streamer->addFileFromStream($fh, basename($file), $fileSize);
fclose($fh);
} elseif (\OC\Files\Filesystem::is_dir($file)) {
$streamer->addDirRecoursive($file);
$streamer->addDirRecursive($file);
}
}
} elseif ($getType === self::ZIP_DIR) {
$file = $dir . '/' . $files;
$streamer->addDirRecoursive($file);
$streamer->addDirRecursive($file);
}
$streamer->finalize();
set_time_limit($executionTime);

14
lib/private/streamer.php
Unescape Escape View File

@ -31,9 +31,6 @@ class Streamer {
// streamer instance
private $streamerInstance;
/** @var string*/
private $extension;
public function __construct(){
/** @var \OCP\IRequest */
$request = \OC::$server->getRequest();
@ -47,12 +44,11 @@ class Streamer {
/**
* Send HTTP headers
* @param string name
* @return bool
* @param string $name
*/
public function sendHeaders($name){
$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
return $this->streamerInstance->sendHeaders($name . $extension);
$this->streamerInstance->sendHeaders($name . $extension);
}
/**
@ -60,13 +56,13 @@ class Streamer {
* @param string $dir
* @param string $internalDir
*/
public function addDirRecoursive($dir, $internalDir='') {
public function addDirRecursive($dir, $internalDir='') {
$dirname = basename($dir);
$rootDir = $internalDir . $dirname;
if (!empty($rootDir)) {
$this->streamerInstance->addEmptyDir($rootDir);
}
$internalDir.= $dirname .= '/';
$internalDir .= $dirname . '/';
// prevent absolute dirs
$internalDir = ltrim($internalDir, '/');
@ -80,7 +76,7 @@ class Streamer {
$this->addFileFromStream($fh, $internalDir . $filename, $filesize);
fclose($fh);
}elseif(\OC\Files\Filesystem::is_dir($file)) {
$this->addDirRecoursive($file, $internalDir);
$this->addDirRecursive($file, $internalDir);
}
}
}