More corrections
This commit is contained in:
parent
28df7be319
commit
027fb4e3fe
|
@ -151,12 +151,12 @@ class OC_Files {
|
||||||
$streamer->addFileFromStream($fh, basename($file), $fileSize);
|
$streamer->addFileFromStream($fh, basename($file), $fileSize);
|
||||||
fclose($fh);
|
fclose($fh);
|
||||||
} elseif (\OC\Files\Filesystem::is_dir($file)) {
|
} elseif (\OC\Files\Filesystem::is_dir($file)) {
|
||||||
$streamer->addDirRecoursive($file);
|
$streamer->addDirRecursive($file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elseif ($getType === self::ZIP_DIR) {
|
} elseif ($getType === self::ZIP_DIR) {
|
||||||
$file = $dir . '/' . $files;
|
$file = $dir . '/' . $files;
|
||||||
$streamer->addDirRecoursive($file);
|
$streamer->addDirRecursive($file);
|
||||||
}
|
}
|
||||||
$streamer->finalize();
|
$streamer->finalize();
|
||||||
set_time_limit($executionTime);
|
set_time_limit($executionTime);
|
||||||
|
|
|
@ -31,9 +31,6 @@ class Streamer {
|
||||||
// streamer instance
|
// streamer instance
|
||||||
private $streamerInstance;
|
private $streamerInstance;
|
||||||
|
|
||||||
/** @var string*/
|
|
||||||
private $extension;
|
|
||||||
|
|
||||||
public function __construct(){
|
public function __construct(){
|
||||||
/** @var \OCP\IRequest */
|
/** @var \OCP\IRequest */
|
||||||
$request = \OC::$server->getRequest();
|
$request = \OC::$server->getRequest();
|
||||||
|
@ -47,12 +44,11 @@ class Streamer {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send HTTP headers
|
* Send HTTP headers
|
||||||
* @param string name
|
* @param string $name
|
||||||
* @return bool
|
|
||||||
*/
|
*/
|
||||||
public function sendHeaders($name){
|
public function sendHeaders($name){
|
||||||
$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
|
$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 $dir
|
||||||
* @param string $internalDir
|
* @param string $internalDir
|
||||||
*/
|
*/
|
||||||
public function addDirRecoursive($dir, $internalDir='') {
|
public function addDirRecursive($dir, $internalDir='') {
|
||||||
$dirname = basename($dir);
|
$dirname = basename($dir);
|
||||||
$rootDir = $internalDir . $dirname;
|
$rootDir = $internalDir . $dirname;
|
||||||
if (!empty($rootDir)) {
|
if (!empty($rootDir)) {
|
||||||
$this->streamerInstance->addEmptyDir($rootDir);
|
$this->streamerInstance->addEmptyDir($rootDir);
|
||||||
}
|
}
|
||||||
$internalDir.= $dirname .= '/';
|
$internalDir .= $dirname . '/';
|
||||||
// prevent absolute dirs
|
// prevent absolute dirs
|
||||||
$internalDir = ltrim($internalDir, '/');
|
$internalDir = ltrim($internalDir, '/');
|
||||||
|
|
||||||
|
@ -80,7 +76,7 @@ class Streamer {
|
||||||
$this->addFileFromStream($fh, $internalDir . $filename, $filesize);
|
$this->addFileFromStream($fh, $internalDir . $filename, $filesize);
|
||||||
fclose($fh);
|
fclose($fh);
|
||||||
}elseif(\OC\Files\Filesystem::is_dir($file)) {
|
}elseif(\OC\Files\Filesystem::is_dir($file)) {
|
||||||
$this->addDirRecoursive($file, $internalDir);
|
$this->addDirRecursive($file, $internalDir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue