From 4f20e3bac0dec72ede10f947ee3d1125071d4564 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 18 Dec 2015 13:42:59 +0100 Subject: [PATCH 1/3] Removed deprecated OC_Helper::getSecureMimeType --- apps/dav/lib/connector/sabre/file.php | 2 +- apps/files/download.php | 2 +- apps/files_versions/download.php | 2 +- lib/private/helper.php | 11 ----------- tests/lib/helper.php | 12 ------------ 5 files changed, 3 insertions(+), 26 deletions(-) diff --git a/apps/dav/lib/connector/sabre/file.php b/apps/dav/lib/connector/sabre/file.php index c66f627c0a..6a0a39d04e 100644 --- a/apps/dav/lib/connector/sabre/file.php +++ b/apps/dav/lib/connector/sabre/file.php @@ -329,7 +329,7 @@ class File extends Node implements IFile { if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') { return $mimeType; } - return \OC_Helper::getSecureMimeType($mimeType); + return \OC::$server->getMimeTypeDetector()->getSecureMimeType($mimeType); } /** diff --git a/apps/files/download.php b/apps/files/download.php index b0628e394b..b058f0ebf5 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -39,7 +39,7 @@ if(!\OC\Files\Filesystem::file_exists($filename)) { exit; } -$ftype=\OC_Helper::getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename )); +$ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename )); header('Content-Type:'.$ftype); OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php index 22a218f472..d3c38f3d4e 100644 --- a/apps/files_versions/download.php +++ b/apps/files_versions/download.php @@ -35,7 +35,7 @@ $versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision; $view = new OC\Files\View('/'); -$ftype = \OC_Helper::getSecureMimeType($view->getMimeType('/'.$uid.'/files/'.$filename)); +$ftype = \OC::$server->getMimeTypeDetector()->getSecureMimeType($view->getMimeType('/'.$uid.'/files/'.$filename)); header('Content-Type:'.$ftype); OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); diff --git a/lib/private/helper.php b/lib/private/helper.php index c6223d2147..29ecd85388 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -346,17 +346,6 @@ class OC_Helper { return \OC::$server->getMimeTypeDetector()->detectPath($path); } - /** - * Get a secure mimetype that won't expose potential XSS. - * - * @param string $mimeType - * @return string - * @deprecated 8.2.0 Use \OC::$server->getMimeTypeDetector()->getSecureMimeType($mimeType) - */ - static function getSecureMimeType($mimeType) { - return \OC::$server->getMimeTypeDetector()->getSecureMimeType($mimeType); - } - /** * get the mimetype form a data string * diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 9ad3af3d60..576209df06 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -71,18 +71,6 @@ class Test_Helper extends \Test\TestCase { ]; } - function testGetSecureMimeType() { - $dir=OC::$SERVERROOT.'/tests/data'; - - $result = OC_Helper::getSecureMimeType('image/svg+xml'); - $expected = 'text/plain'; - $this->assertEquals($result, $expected); - - $result = OC_Helper::getSecureMimeType('image/png'); - $expected = 'image/png'; - $this->assertEquals($result, $expected); - } - function testGetStringMimeType() { if (\OC_Util::runningOnWindows()) { $this->markTestSkipped('[Windows] Strings have mimetype application/octet-stream on Windows'); From a54be132fca86ceb6d6bb87368f55937f41e94a2 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 18 Dec 2015 13:43:44 +0100 Subject: [PATCH 2/3] Removed deprecated unsused function OC_Helper::getStringMimeType --- lib/private/helper.php | 11 ----------- tests/lib/helper.php | 10 ---------- 2 files changed, 21 deletions(-) diff --git a/lib/private/helper.php b/lib/private/helper.php index 29ecd85388..f329d53fa7 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -346,17 +346,6 @@ class OC_Helper { return \OC::$server->getMimeTypeDetector()->detectPath($path); } - /** - * get the mimetype form a data string - * - * @param string $data - * @return string - * @deprecated 8.2.0 Use \OC::$server->getMimeTypeDetector()->detectString($data) - */ - static function getStringMimeType($data) { - return \OC::$server->getMimeTypeDetector()->detectString($data); - } - /** * detect if a given program is found in the search PATH * diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 576209df06..114354c793 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -71,16 +71,6 @@ class Test_Helper extends \Test\TestCase { ]; } - function testGetStringMimeType() { - if (\OC_Util::runningOnWindows()) { - $this->markTestSkipped('[Windows] Strings have mimetype application/octet-stream on Windows'); - } - - $result = OC_Helper::getStringMimeType("/data/data.tar.gz"); - $expected = 'text/plain; charset=us-ascii'; - $this->assertEquals($result, $expected); - } - function testIsSubDirectory() { $result = OC_Helper::isSubDirectory("./data/", "/anotherDirectory/"); $this->assertFalse($result); From b460bde7c6c3c70fc0010133c00f1e76a952fa48 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 18 Dec 2015 14:00:20 +0100 Subject: [PATCH 3/3] Removed deprecated OC_Helper::mimeTypeIcon function --- apps/files/lib/helper.php | 8 ++++---- apps/files_sharing/templates/public.php | 2 +- lib/private/helper.php | 23 ----------------------- lib/private/preview.php | 2 +- lib/private/template/functions.php | 4 +--- 5 files changed, 7 insertions(+), 32 deletions(-) diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 9a4e8d5978..4f96051883 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -66,15 +66,15 @@ class Helper { */ public static function determineIcon($file) { if($file['type'] === 'dir') { - $icon = \OC_Helper::mimetypeIcon('dir'); + $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir'); // TODO: move this part to the client side, using mountType if ($file->isShared()) { - $icon = \OC_Helper::mimetypeIcon('dir-shared'); + $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared'); } elseif ($file->isMounted()) { - $icon = \OC_Helper::mimetypeIcon('dir-external'); + $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external'); } }else{ - $icon = \OC_Helper::mimetypeIcon($file->getMimetype()); + $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype()); } return substr($icon, 0, -3) . 'svg'; diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 046f954106..aa1f926ea3 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -41,7 +41,7 @@ $thumbSize = 1024; - + diff --git a/lib/private/helper.php b/lib/private/helper.php index f329d53fa7..95f6be27cc 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -137,18 +137,6 @@ class OC_Helper { return OC::$server->getURLGenerator()->imagePath($app, $image); } - /** - * get path to icon of file type - * @param string $mimetype mimetype - * @return string the url - * - * Returns the path to the image of this file type. - * @deprecated 8.2.0 Use \OC::$server->getMimeTypeDetector()->mimeTypeIcon($mimetype) - */ - public static function mimetypeIcon($mimetype) { - return \OC::$server->getMimeTypeDetector()->mimeTypeIcon($mimetype); - } - /** * get path to preview of file * @param string $path path @@ -335,17 +323,6 @@ class OC_Helper { return self::$templateManager; } - /** - * Try to guess the mimetype based on filename - * - * @param string $path - * @return string - * @deprecated 8.2.0 Use \OC::$server->getMimeTypeDetector()->detectPath($path) - */ - static public function getFileNameMimeType($path) { - return \OC::$server->getMimeTypeDetector()->detectPath($path); - } - /** * detect if a given program is found in the search PATH * diff --git a/lib/private/preview.php b/lib/private/preview.php index 38c043030f..44d38b354a 100644 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -1168,7 +1168,7 @@ class Preview { */ private function getMimeIcon() { $image = new \OC_Image(); - $mimeIconWebPath = \OC_Helper::mimetypeIcon($this->mimeType); + $mimeIconWebPath = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($this->mimeType); if (empty(\OC::$WEBROOT)) { $mimeIconServerPath = \OC::$SERVERROOT . $mimeIconWebPath; } else { diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php index 6298f25edc..982ecde585 100644 --- a/lib/private/template/functions.php +++ b/lib/private/template/functions.php @@ -173,11 +173,9 @@ function image_path( $app, $image ) { * make OC_Helper::mimetypeIcon available as a simple function * @param string $mimetype mimetype * @return string link to the image - * - * For further information have a look at OC_Helper::mimetypeIcon */ function mimetype_icon( $mimetype ) { - return OC_Helper::mimetypeIcon( $mimetype ); + return \OC::$server->getMimeTypeDetector()->mimeTypeIcon( $mimetype ); } /**