From 3883630c8e5fd633114c775a0a2aad6b75745012 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 2 Jun 2009 20:50:57 -0600 Subject: [PATCH] Don't maintain PHP based mime magic lookup anymore --- framework/Mime/lib/Horde/Mime/Magic.php | 48 --------------------------- framework/Mime/lib/Horde/Mime/mime.magic.php | Bin 16925 -> 0 bytes framework/Mime/package.xml | 1 - 3 files changed, 49 deletions(-) delete mode 100644 framework/Mime/lib/Horde/Mime/mime.magic.php diff --git a/framework/Mime/lib/Horde/Mime/Magic.php b/framework/Mime/lib/Horde/Mime/Magic.php index a945a62ee..4802cc261 100644 --- a/framework/Mime/lib/Horde/Mime/Magic.php +++ b/framework/Mime/lib/Horde/Mime/Magic.php @@ -47,21 +47,6 @@ class Horde_Mime_Magic } /** - * Returns a copy of the MIME magic file. - * - * @return array The MIME magic file. - */ - static protected function _getMimeMagicFile() - { - if (is_null(self::$_magic)) { - require dirname(__FILE__) . '/mime.magic.php'; - self::$_magic = $mime_magic; - } - - return self::$_magic; - } - - /** * Attempt to convert a file extension to a MIME type, based * on the global Horde and application specific config files. * @@ -196,26 +181,6 @@ class Horde_Mime_Magic return trim(mime_content_type($path)); } - /* Use a built-in magic file. */ - $mime_magic = self::_getMimeMagicFile(); - if (!($fp = @fopen($path, 'rb'))) { - return false; - } - - reset($mime_magic); - while (list($offset, $odata) = each($mime_magic)) { - reset($odata); - while (list($length, $ldata) = each($odata)) { - @fseek($fp, $offset, SEEK_SET); - $lookup = @fread($fp, $length); - if (!empty($ldata[$lookup])) { - fclose($fp); - return $ldata[$lookup]; - } - } - } - fclose($fp); - return false; } @@ -256,19 +221,6 @@ class Horde_Mime_Magic return $type; } - /* Use a built-in magic file. */ - $mime_magic = self::_getMimeMagicFile(); - reset($mime_magic); - while (list($offset, $odata) = each($mime_magic)) { - reset($odata); - while (list($length, $ldata) = each($odata)) { - $lookup = substr($data, $offset, $length); - if (!empty($ldata[$lookup])) { - return $ldata[$lookup]; - } - } - } - return false; } } diff --git a/framework/Mime/lib/Horde/Mime/mime.magic.php b/framework/Mime/lib/Horde/Mime/mime.magic.php deleted file mode 100644 index 0ee89d226e1f174b769fe6c51f12f9e2ca131f53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16925 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 diff --git a/framework/Mime/package.xml b/framework/Mime/package.xml index fea92bcb7..36c8a2a18 100644 --- a/framework/Mime/package.xml +++ b/framework/Mime/package.xml @@ -96,7 +96,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> - -- 2.11.0