@@ -55,9 +55,9 @@ final class Config // How to sort pages in tree view (comparison callback) const TREE_VIEW_SORT = 'strnatcmp'; - - // alternate mime.cache path (optional) - //const MIME_CACHE_PATH = '/usr/local/share/mime/mime.cache'; + + // Path to mime.cache + const MIME_CACHE_PATH = '/usr/share/mime/mime.cache'; } ?> include/config.class.php @@ -21,24 +21,13 @@ class MIME protected function uint32_at($pos) { return Binary::uint32($this->cache, $pos); } protected function nuint32_at($pos, $n) { return Binary::nuint32($n, $this->cache, $pos); } - public function __construct($mime_cache=null) + public function __construct($mime_cache='/usr/share/mime/mime.cache') { - if ($mime_cache === null) - { - if (defined('Config::MIME_CACHE_PATH')) - { - $mime_cache = Config::MIME_CACHE_PATH; - } - else - { - $mime_cache = '/usr/share/mime/mime.cache'; - } - } if (!is_readable($mime_cache)) { - throw new Exception('unable to read mime.cache file'); + throw new Exception('unable to read '.$mime_cache); } - + $this->cache = file_get_contents($mime_cache); $this->version = sprintf('%d.%d', $this->uint16_at(0), $this->uint16_at(2)); include/mime.class.php @@ -85,7 +85,7 @@ class WikiPage return NULL; if (!$this->mime_type) { - $mime = new MIME; + $mime = new MIME(Config::MIME_CACHE_PATH); $this->mime_type = $mime->bufferGetType($this->object->data, $this->getName()); } return $this->mime_type; include/wikipage.class.php 0969cfe74824516770ec61e4c256e4a7ec68e95a Patrik Fimml patrik@fimml.at http://github.com/patrikf/ewiki/commit/7ee81089153a8f8c4050efd8b70c4e9846dc1018 7ee81089153a8f8c4050efd8b70c4e9846dc1018 2009-07-03T15:04:28-07:00 2009-07-03T14:58:11-07:00 Handle alternative mime.cache location outside MIME class This way, the MIME class is easier to reuse. 91b4c7ce82bed188f3f1b2918a56acbfdd4ed4f1 Patrik Fimml patrik@fimml.at