diff --git a/apps/dav/lib/connector/sabre/file.php b/apps/dav/lib/connector/sabre/file.php
index c66f627c0a371eacefa4e50a868721ac6a692a24..6a0a39d04e7af9dd81e098f2c8087c3fc6eb7250 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 b0628e394be5705f609c80648f5b2b99ead66dcf..b058f0ebf5b72f0c918f1d67aa37508337e2de37 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/lib/helper.php b/apps/files/lib/helper.php
index 9a4e8d59786ad1b68c64eb77131a92548e728aa6..4f960518839792625f199070b72e2c541aabd295 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 046f954106a34ed03e84bee161a3d3e137fa8fb8..aa1f926ea35d69a4dd5aa60d39601144405b2c22 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -41,7 +41,7 @@ $thumbSize = 1024;
<input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
<input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
<input type="hidden" name="previewSupported" value="<?php p($_['previewSupported'] ? 'true' : 'false'); ?>" id="previewSupported">
-<input type="hidden" name="mimetypeIcon" value="<?php p(OC_Helper::mimetypeIcon($_['mimetype'])); ?>" id="mimetypeIcon">
+<input type="hidden" name="mimetypeIcon" value="<?php p(\OC::$server->getMimeTypeDetector()->mimeTypeIcon($_['mimetype'])); ?>" id="mimetypeIcon">
<input type="hidden" name="filesize" value="<?php p($_['nonHumanFileSize']); ?>" id="filesize">
<input type="hidden" name="maxSizeAnimateGif" value="<?php p($_['maxSizeAnimateGif']); ?>" id="maxSizeAnimateGif">
diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php
index 22a218f472aac51dd6d81cd063ab1a3d5ecacece..d3c38f3d4e109291fa09e1f3317c31d4489511a3 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 b8f9f6ec138c78d97ff61b04224e5e98e7bd0ed9..6495290371228d116b1a130323fa5417bbff0066 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -83,18 +83,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
@@ -281,39 +269,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);
- }
-
- /**
- * 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
- *
- * @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/lib/private/preview.php b/lib/private/preview.php
index 38c043030fc7e0ac5d8913b9bde8e94b9a000e3e..44d38b354a9acbd3bffa00a48c1664dd3ec5e37c 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 6298f25edc13a3136f930b0db9c948093fd0f70d..982ecde5850ec18b6bf64fc5d5e7bf48ed0bf0e1 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 );
}
/**
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index dbc89b716d0880de29e142e74d5681c41433c830..c2620896157816ea299e3b42ebb0f9daeba77ba8 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -71,28 +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');
- }
-
- $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);