summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJakob Sack <mail@jakobsack.de>2018-09-02 15:48:13 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2018-10-02 08:13:39 +0200
commita9fa220e6824a76bbb8d4b65a9b80f25383cdee4 (patch)
tree61232a8c256b13a1c53031e957771595747e5fcd /lib
parent7526971c95250807ac1ec485297919a27ee0dcfc (diff)
downloadnextcloud-server-a9fa220e6824a76bbb8d4b65a9b80f25383cdee4.tar.gz
nextcloud-server-a9fa220e6824a76bbb8d4b65a9b80f25383cdee4.zip
Add fix response
implements #7589
Diffstat (limited to 'lib')
-rw-r--r--lib/composer/composer/autoload_classmap.php1
-rw-r--r--lib/composer/composer/autoload_static.php11
-rw-r--r--lib/public/AppFramework/Http/ZipResponse.php75
3 files changed, 82 insertions, 5 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 121f52998e5..fe68bbe6302 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -50,6 +50,7 @@ return array(
'OCP\\AppFramework\\Http\\Template\\LinkMenuAction' => $baseDir . '/lib/public/AppFramework/Http/Template/LinkMenuAction.php',
'OCP\\AppFramework\\Http\\Template\\PublicTemplateResponse' => $baseDir . '/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php',
'OCP\\AppFramework\\Http\\Template\\SimpleMenuAction' => $baseDir . '/lib/public/AppFramework/Http/Template/SimpleMenuAction.php',
+ 'OCP\\AppFramework\\Http\\ZipResponse' => $baseDir . '/lib/public/AppFramework/Http/ZipResponse.php',
'OCP\\AppFramework\\IAppContainer' => $baseDir . '/lib/public/AppFramework/IAppContainer.php',
'OCP\\AppFramework\\Middleware' => $baseDir . '/lib/public/AppFramework/Middleware.php',
'OCP\\AppFramework\\OCSController' => $baseDir . '/lib/public/AppFramework/OCSController.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index ae5b70380f3..257efa3d932 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -7,7 +7,7 @@ namespace Composer\Autoload;
class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
{
public static $prefixLengthsPsr4 = array (
- 'O' =>
+ 'O' =>
array (
'OC\\Settings\\' => 12,
'OC\\Core\\' => 8,
@@ -17,19 +17,19 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
);
public static $prefixDirsPsr4 = array (
- 'OC\\Settings\\' =>
+ 'OC\\Settings\\' =>
array (
0 => __DIR__ . '/../../..' . '/settings',
),
- 'OC\\Core\\' =>
+ 'OC\\Core\\' =>
array (
0 => __DIR__ . '/../../..' . '/core',
),
- 'OC\\' =>
+ 'OC\\' =>
array (
0 => __DIR__ . '/../../..' . '/lib/private',
),
- 'OCP\\' =>
+ 'OCP\\' =>
array (
0 => __DIR__ . '/../../..' . '/lib/public',
),
@@ -80,6 +80,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OCP\\AppFramework\\Http\\Template\\LinkMenuAction' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Template/LinkMenuAction.php',
'OCP\\AppFramework\\Http\\Template\\PublicTemplateResponse' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php',
'OCP\\AppFramework\\Http\\Template\\SimpleMenuAction' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Template/SimpleMenuAction.php',
+ 'OCP\\AppFramework\\Http\\ZipResponse' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/ZipResponse.php',
'OCP\\AppFramework\\IAppContainer' => __DIR__ . '/../../..' . '/lib/public/AppFramework/IAppContainer.php',
'OCP\\AppFramework\\Middleware' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Middleware.php',
'OCP\\AppFramework\\OCSController' => __DIR__ . '/../../..' . '/lib/public/AppFramework/OCSController.php',
diff --git a/lib/public/AppFramework/Http/ZipResponse.php b/lib/public/AppFramework/Http/ZipResponse.php
new file mode 100644
index 00000000000..27ff30d4019
--- /dev/null
+++ b/lib/public/AppFramework/Http/ZipResponse.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Jakob Sack <mail@jakobsack.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Public library to send several files in one zip archive.
+ */
+
+namespace OCP\AppFramework\Http;
+
+use OCP\IRequest;
+use OC\Streamer;
+
+class ZipResponse extends Response implements ICallbackResponse {
+ /** @var resource[] Files to be added to the zip response */
+ private $resources;
+ /** @var string Filename that the zip file should have */
+ private $name;
+ private $request;
+
+ public function __construct(string $name = 'output', IRequest $request) {
+ $this->name = $name;
+ $this->request = $request;
+ }
+
+ public function addResource($r, string $internalName, int $size, int $time = -1) {
+ if (!\is_resource($r)) {
+ return;
+ }
+
+ $this->resources[] = [
+ 'resource' => $r,
+ 'internalName' => $internalName,
+ 'size' => $size,
+ 'time' => $time,
+ ];
+ }
+
+ public function callback(IOutput $output) {
+ $size = 0;
+ $files = count($this->resources);
+
+ foreach ($this->resources as $resource) {
+ $size = $size + $resource['size'];
+ }
+
+ $zip = new Streamer($this->request, $size, $files);
+ $zip->sendHeaders($this->name);
+
+ foreach ($this->resources as $resource) {
+ $zip->addFileFromStream($resource['resource'], $resource['internalName'], $resource['size'], $resource['time']);
+ }
+
+ $zip->finalize();
+ }
+}