From d435061f8e1bd2d9e8f005213a492c96ad2b2361 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 21 Mar 2018 14:17:12 +0100 Subject: [PATCH] Remove deprecated and unused OCP\Response Signed-off-by: Morris Jobke --- apps/files_versions/download.php | 4 +- lib/composer/composer/autoload_classmap.php | 1 - lib/composer/composer/autoload_static.php | 1 - lib/public/Response.php | 66 --------------------- 4 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 lib/public/Response.php diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php index 833077fbcc..c61e046102 100644 --- a/apps/files_versions/download.php +++ b/apps/files_versions/download.php @@ -48,11 +48,11 @@ $view = new OC\Files\View('/'); $ftype = \OC::$server->getMimeTypeDetector()->getSecureMimeType($view->getMimeType('/'.$uid.'/files/'.$filename)); header('Content-Type:'.$ftype); -OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); +\OC_Response::setContentDispositionHeader(basename($filename), 'attachment'); header('Pragma: public');// enable caching in IE header('Expires: 0'); header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); -OCP\Response::setContentLengthHeader($view->filesize($versionName)); +\OC_Response::setContentLengthHeader($view->filesize($versionName)); OC_Util::obEnd(); diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 3331d57e13..ecd7f155c0 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -255,7 +255,6 @@ return array( 'OCP\\Remote\\IInstance' => $baseDir . '/lib/public/Remote/IInstance.php', 'OCP\\Remote\\IInstanceFactory' => $baseDir . '/lib/public/Remote/IInstanceFactory.php', 'OCP\\Remote\\IUser' => $baseDir . '/lib/public/Remote/IUser.php', - 'OCP\\Response' => $baseDir . '/lib/public/Response.php', 'OCP\\RichObjectStrings\\Definitions' => $baseDir . '/lib/public/RichObjectStrings/Definitions.php', 'OCP\\RichObjectStrings\\IValidator' => $baseDir . '/lib/public/RichObjectStrings/IValidator.php', 'OCP\\RichObjectStrings\\InvalidObjectExeption' => $baseDir . '/lib/public/RichObjectStrings/InvalidObjectExeption.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index e35ef7d7a0..8fbff8a1e1 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -285,7 +285,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OCP\\Remote\\IInstance' => __DIR__ . '/../../..' . '/lib/public/Remote/IInstance.php', 'OCP\\Remote\\IInstanceFactory' => __DIR__ . '/../../..' . '/lib/public/Remote/IInstanceFactory.php', 'OCP\\Remote\\IUser' => __DIR__ . '/../../..' . '/lib/public/Remote/IUser.php', - 'OCP\\Response' => __DIR__ . '/../../..' . '/lib/public/Response.php', 'OCP\\RichObjectStrings\\Definitions' => __DIR__ . '/../../..' . '/lib/public/RichObjectStrings/Definitions.php', 'OCP\\RichObjectStrings\\IValidator' => __DIR__ . '/../../..' . '/lib/public/RichObjectStrings/IValidator.php', 'OCP\\RichObjectStrings\\InvalidObjectExeption' => __DIR__ . '/../../..' . '/lib/public/RichObjectStrings/InvalidObjectExeption.php', diff --git a/lib/public/Response.php b/lib/public/Response.php deleted file mode 100644 index 782dcb8862..0000000000 --- a/lib/public/Response.php +++ /dev/null @@ -1,66 +0,0 @@ - - * @author Bart Visscher - * @author Frank Karlitschek - * @author Lukas Reschke - * @author Morris Jobke - * @author Robin Appelman - * @author Stefan Weil - * @author Thomas Müller - * @author Vincent Petry - * - * @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 - * - */ - -/** - * Public interface of ownCloud for apps to use. - * Response Class. - * - */ - -// use OCP namespace for all classes that are considered public. -// This means that they should be used by apps instead of the internal ownCloud classes -namespace OCP; - -/** - * This class provides convenient functions to send the correct http response headers - * @since 4.0.0 - * @deprecated 8.1.0 - Use AppFramework controllers instead and modify the response object - */ -class Response { - - /** - * Sets the content disposition header (with possible workarounds) - * @param string $filename file name - * @param string $type disposition type, either 'attachment' or 'inline' - * @since 7.0.0 - */ - static public function setContentDispositionHeader( $filename, $type = 'attachment' ) { - \OC_Response::setContentDispositionHeader( $filename, $type ); - } - - /** - * Sets the content length header (with possible workarounds) - * @param string|int|float $length Length to be sent - * @since 8.1.0 - */ - static public function setContentLengthHeader($length) { - \OC_Response::setContentLengthHeader($length); - } -}