Revert r28215: incorrectly moved files
[lhc/web/wiklou.git] / includes / MimeMagic.php
index df7a474..fd42499 100644 (file)
@@ -24,7 +24,7 @@ image/jpeg jpeg jpg jpe
 image/png png
 image/svg+xml image/svg svg
 image/tiff tiff tif
-image/vnd.djvu djvu
+image/vnd.djvu image/x.djvu image/x-djvu djvu
 image/x-portable-pixmap ppm
 text/plain txt
 text/html html htm
@@ -71,12 +71,13 @@ if ($wgLoadFileinfoExtension) {
        if(!extension_loaded('fileinfo')) dl('fileinfo.' . PHP_SHLIB_SUFFIX);
 }
 
-/** Implements functions related to mime types such as detection and mapping to
-* file extension,
-*
-* Instances of this class are stateles, there only needs to be one global instance
-* of MimeMagic. Please use MimeMagic::singleton() to get that instance.
-*/
+/** 
+ * Implements functions related to mime types such as detection and mapping to
+ * file extension.
+ *
+ * Instances of this class are stateles, there only needs to be one global instance
+ * of MimeMagic. Please use MimeMagic::singleton() to get that instance.
+ */
 class MimeMagic {
 
        /**
@@ -110,56 +111,67 @@ class MimeMagic {
                *   --- load mime.types ---
                */
 
-               global $wgMimeTypeFile;
-
-               $types= MM_WELL_KNOWN_MIME_TYPES;
+               global $wgMimeTypeFile, $IP;
 
-               if ($wgMimeTypeFile) {
-                       if (is_file($wgMimeTypeFile) and is_readable($wgMimeTypeFile)) {
-                               wfDebug("MimeMagic::MimeMagic: loading mime types from $wgMimeTypeFile\n");
+               $types = MM_WELL_KNOWN_MIME_TYPES;
 
-                               $types.= "\n";
-                               $types.= file_get_contents($wgMimeTypeFile);
+               if ( $wgMimeTypeFile == 'includes/mime.types' ) {
+                       $wgMimeTypeFile = "$IP/$wgMimeTypeFile";
+               }
+               
+               if ( $wgMimeTypeFile ) {
+                       if ( is_file( $wgMimeTypeFile ) and is_readable( $wgMimeTypeFile ) ) {
+                               wfDebug( __METHOD__.": loading mime types from $wgMimeTypeFile\n" );
+                               $types .= "\n";
+                               $types .= file_get_contents( $wgMimeTypeFile );
+                       } else {
+                               wfDebug( __METHOD__.": can't load mime types from $wgMimeTypeFile\n" );
                        }
-                       else wfDebug("MimeMagic::MimeMagic: can't load mime types from $wgMimeTypeFile\n");
+               } else {
+                       wfDebug( __METHOD__.": no mime types file defined, using build-ins only.\n" );
                }
-               else wfDebug("MimeMagic::MimeMagic: no mime types file defined, using build-ins only.\n");
 
-               $types= str_replace(array("\r\n","\n\r","\n\n","\r\r","\r"),"\n",$types);
-               $types= str_replace("\t"," ",$types);
+               $types = str_replace( array( "\r\n", "\n\r", "\n\n", "\r\r", "\r" ), "\n", $types );
+               $types = str_replace( "\t", " ", $types );
 
-               $this->mMimeToExt= array();
-               $this->mToMime= array();
+               $this->mMimeToExt = array();
+               $this->mToMime = array();
 
-               $lines= explode("\n",$types);
-               foreach ($lines as $s) {
-                       $s= trim($s);
-                       if (empty($s)) continue;
-                       if (strpos($s,'#')===0) continue;
+               $lines = explode( "\n",$types );
+               foreach ( $lines as $s ) {
+                       $s = trim( $s );
+                       if ( empty( $s ) ) continue;
+                       if ( strpos( $s, '#' ) === 0 ) continue;
 
-                       $s= strtolower($s);
-                       $i= strpos($s,' ');
+                       $s = strtolower( $s );
+                       $i = strpos( $s, ' ' );
 
-                       if ($i===false) continue;
+                       if ( $i === false ) continue;
 
                        #print "processing MIME line $s<br>";
 
-                       $mime= substr($s,0,$i);
-                       $ext= trim(substr($s,$i+1));
+                       $mime = substr( $s, 0, $i );
+                       $ext = trim( substr($s, $i+1 ) );
 
-                       if (empty($ext)) continue;
+                       if ( empty( $ext ) ) continue;
 
-                       if ( !empty($this->mMimeToExt[$mime])) $this->mMimeToExt[$mime] .= ' '.$ext;
-                       else $this->mMimeToExt[$mime]= $ext;
+                       if ( !empty( $this->mMimeToExt[$mime] ) ) {
+                               $this->mMimeToExt[$mime] .= ' ' . $ext;
+                       } else {
+                               $this->mMimeToExt[$mime] = $ext;
+                       }
 
-                       $extensions= explode(' ',$ext);
+                       $extensions = explode( ' ', $ext );
 
-                       foreach ($extensions as $e) {
-                               $e= trim($e);
-                               if (empty($e)) continue;
+                       foreach ( $extensions as $e ) {
+                               $e = trim( $e );
+                               if ( empty( $e ) ) continue;
 
-                               if ( !empty($this->mExtToMime[$e])) $this->mExtToMime[$e] .= ' '.$mime;
-                               else $this->mExtToMime[$e]= $mime;
+                               if ( !empty( $this->mExtToMime[$e] ) ) {
+                                       $this->mExtToMime[$e] .= ' ' . $mime;
+                               } else {
+                                       $this->mExtToMime[$e] = $mime;
+                               }
                        }
                }
 
@@ -168,62 +180,69 @@ class MimeMagic {
                */
 
                global $wgMimeInfoFile;
+               if ( $wgMimeInfoFile == 'includes/mime.info' ) {
+                       $wgMimeInfoFile = "$IP/$wgMimeInfoFile";
+               }
 
-               $info= MM_WELL_KNOWN_MIME_INFO;
-
-               if ($wgMimeInfoFile) {
-                       if (is_file($wgMimeInfoFile) and is_readable($wgMimeInfoFile)) {
-                               wfDebug("MimeMagic::MimeMagic: loading mime info from $wgMimeInfoFile\n");
+               $info = MM_WELL_KNOWN_MIME_INFO;
 
-                               $info.= "\n";
-                               $info.= file_get_contents($wgMimeInfoFile);
+               if ( $wgMimeInfoFile ) {
+                       if ( is_file( $wgMimeInfoFile ) and is_readable( $wgMimeInfoFile ) ) {
+                               wfDebug( __METHOD__.": loading mime info from $wgMimeInfoFile\n" );
+                               $info .= "\n";
+                               $info .= file_get_contents( $wgMimeInfoFile );
+                       } else {
+                               wfDebug(__METHOD__.": can't load mime info from $wgMimeInfoFile\n");
                        }
-                       else wfDebug("MimeMagic::MimeMagic: can't load mime info from $wgMimeInfoFile\n");
+               } else {
+                       wfDebug(__METHOD__.": no mime info file defined, using build-ins only.\n");
                }
-               else wfDebug("MimeMagic::MimeMagic: no mime info file defined, using build-ins only.\n");
 
-               $info= str_replace(array("\r\n","\n\r","\n\n","\r\r","\r"),"\n",$info);
-               $info= str_replace("\t"," ",$info);
+               $info = str_replace( array( "\r\n", "\n\r", "\n\n", "\r\r", "\r" ), "\n", $info);
+               $info = str_replace( "\t", " ", $info );
 
-               $this->mMimeTypeAliases= array();
-               $this->mMediaTypes= array();
+               $this->mMimeTypeAliases = array();
+               $this->mMediaTypes = array();
 
-               $lines= explode("\n",$info);
-               foreach ($lines as $s) {
-                       $s= trim($s);
-                       if (empty($s)) continue;
-                       if (strpos($s,'#')===0) continue;
+               $lines = explode( "\n", $info );
+               foreach ( $lines as $s ) {
+                       $s = trim( $s );
+                       if ( empty( $s ) ) continue;
+                       if ( strpos( $s, '#' ) === 0 ) continue;
 
-                       $s= strtolower($s);
-                       $i= strpos($s,' ');
+                       $s = strtolower( $s );
+                       $i = strpos( $s, ' ' );
 
-                       if ($i===false) continue;
+                       if ( $i === false ) continue;
 
                        #print "processing MIME INFO line $s<br>";
 
-                       $match= array();
-                       if (preg_match('!\[\s*(\w+)\s*\]!',$s,$match)) {
-                               $s= preg_replace('!\[\s*(\w+)\s*\]!','',$s);
-                               $mtype= trim(strtoupper($match[1]));
+                       $match = array();
+                       if ( preg_match( '!\[\s*(\w+)\s*\]!', $s, $match ) ) {
+                               $s = preg_replace( '!\[\s*(\w+)\s*\]!', '', $s );
+                               $mtype = trim( strtoupper( $match[1] ) );
+                       } else {
+                               $mtype = MEDIATYPE_UNKNOWN;
                        }
-                       else $mtype= MEDIATYPE_UNKNOWN;
 
-                       $m= explode(' ',$s);
+                       $m = explode( ' ', $s );
 
-                       if (!isset($this->mMediaTypes[$mtype])) $this->mMediaTypes[$mtype]= array();
+                       if ( !isset( $this->mMediaTypes[$mtype] ) ) {
+                               $this->mMediaTypes[$mtype] = array();
+                       }
 
-                       foreach ($m as $mime) {
-                               $mime= trim($mime);
-                               if (empty($mime)) continue;
+                       foreach ( $m as $mime ) {
+                               $mime = trim( $mime );
+                               if ( empty( $mime ) ) continue;
 
-                               $this->mMediaTypes[$mtype][]= $mime;
+                               $this->mMediaTypes[$mtype][] = $mime;
                        }
 
-                       if (sizeof($m)>1) {
-                               $main= $m[0];
-                               for ($i=1; $i<sizeof($m); $i+= 1) {
-                                       $mime= $m[$i];
-                                       $this->mMimeTypeAliases[$mime]= $main;
+                       if ( sizeof( $m ) > 1 ) {
+                               $main = $m[0];
+                               for ( $i=1; $i<sizeof($m); $i += 1 ) {
+                                       $mime = $m[$i];
+                                       $this->mMimeTypeAliases[$mime] = $main;
                                }
                        }
                }
@@ -243,14 +262,14 @@ class MimeMagic {
        /** returns a list of file extensions for a given mime type
        * as a space separated string.
        */
-       function getExtensionsForType($mime) {
-               $mime= strtolower($mime);
+       function getExtensionsForType( $mime ) {
+               $mime = strtolower( $mime );
 
-               $r= @$this->mMimeToExt[$mime];
+               $r = @$this->mMimeToExt[$mime];
 
-               if (@!$r and isset($this->mMimeTypeAliases[$mime])) {
-                       $mime= $this->mMimeTypeAliases[$mime];
-                       $r= @$this->mMimeToExt[$mime];
+               if ( @!$r and isset( $this->mMimeTypeAliases[$mime] ) ) {
+                       $mime = $this->mMimeTypeAliases[$mime];
+                       $r = @$this->mMimeToExt[$mime];
                }
 
                return $r;
@@ -259,22 +278,22 @@ class MimeMagic {
        /** returns a list of mime types for a given file extension
        * as a space separated string.
        */
-       function getTypesForExtension($ext) {
-               $ext= strtolower($ext);
+       function getTypesForExtension( $ext ) {
+               $ext = strtolower( $ext );
 
-               $r= isset( $this->mExtToMime[$ext] ) ? $this->mExtToMime[$ext] : null;
+               $r = isset( $this->mExtToMime[$ext] ) ? $this->mExtToMime[$ext] : null;
                return $r;
        }
 
        /** returns a single mime type for a given file extension.
        * This is always the first type from the list returned by getTypesForExtension($ext).
        */
-       function guessTypesForExtension($ext) {
-               $m= $this->getTypesForExtension( $ext );
-               if( is_null($m) ) return NULL;
+       function guessTypesForExtension( $ext ) {
+               $m = $this->getTypesForExtension( $ext );
+               if ( is_null( $m ) ) return NULL;
 
-               $m= trim( $m );
-               $m= preg_replace('/\s.*$/','',$m);
+               $m = trim( $m );
+               $m = preg_replace( '/\s.*$/', '', $m );
 
                return $m;
        }
@@ -284,17 +303,17 @@ class MimeMagic {
        * returns true if a match was found, NULL if the mime type is unknown,
        * and false if the mime type is known but no matches where found.
        */
-       function isMatchingExtension($extension,$mime) {
-               $ext= $this->getExtensionsForType($mime);
+       function isMatchingExtension( $extension, $mime ) {
+               $ext = $this->getExtensionsForType( $mime );
 
-               if (!$ext) {
+               if ( !$ext ) {
                        return NULL;  //unknown
                }
 
-               $ext= explode(' ',$ext);
+               $ext = explode( ' ', $ext );
 
-               $extension= strtolower($extension);
-               if (in_array($extension,$ext)) {
+               $extension = strtolower( $extension );
+               if ( in_array( $extension, $ext ) ) {
                        return true;
                }
 
@@ -346,16 +365,18 @@ class MimeMagic {
        * or misinterpreter by the default mime detection (namely xml based formats like XHTML or SVG).
        *
        * @param string $file The file to check
-       * @param bool $useExt switch for allowing to use the file extension to guess the mime type. true by default.
+       * @param mixed $ext The file extension, or true to extract it from the filename. 
+       *                   Set it to false to ignore the extension.
        *
        * @return string the mime type of $file
        */
-       function guessMimeType( $file, $useExt=true ) {
-               $fname = 'MimeMagic::guessMimeType';
-               $mime= $this->detectMimeType($file,$useExt);
+       function guessMimeType( $file, $ext = true ) {
+               $mime = $this->detectMimeType( $file, $ext );
 
                // Read a chunk of the file
+               wfSuppressWarnings();
                $f = fopen( $file, "rt" );
+               wfRestoreWarnings();
                if( !$f ) return "unknown/unknown";
                $head = fread( $f, 1024 );
                fclose( $f );
@@ -368,67 +389,88 @@ class MimeMagic {
                        $mime = "application/x-msmetafile";
                }
 
-               if (strpos($mime,"text/")===0 || $mime==="application/xml") {
+               if ( strpos( $mime, "text/" ) === 0 || $mime === "application/xml" ) {
 
-                       $xml_type= NULL;
-                       $script_type= NULL;
+                       $xml_type = NULL;
+                       $script_type = NULL;
 
                        /*
                        * look for XML formats (XHTML and SVG)
                        */
-                       if ($mime==="text/sgml" ||
-                           $mime==="text/plain" ||
-                           $mime==="text/html" ||
-                           $mime==="text/xml" ||
-                           $mime==="application/xml") {
-
-                               if (substr($head,0,5)=="<?xml") $xml_type= "ASCII";
-                               elseif (substr($head,0,8)=="\xef\xbb\xbf<?xml") $xml_type= "UTF-8";
-                               elseif (substr($head,0,10)=="\xfe\xff\x00<\x00?\x00x\x00m\x00l") $xml_type= "UTF-16BE";
-                               elseif (substr($head,0,10)=="\xff\xfe<\x00?\x00x\x00m\x00l\x00") $xml_type= "UTF-16LE";
+                       if ($mime === "text/sgml" ||
+                           $mime === "text/plain" ||
+                           $mime === "text/html" ||
+                           $mime === "text/xml" ||
+                           $mime === "application/xml") {
+
+                               if ( substr( $head, 0, 5 ) == "<?xml" ) {
+                                       $xml_type = "ASCII";
+                               } elseif ( substr( $head, 0, 8 ) == "\xef\xbb\xbf<?xml") {
+                                       $xml_type = "UTF-8";
+                               } elseif ( substr( $head, 0, 10 ) == "\xfe\xff\x00<\x00?\x00x\x00m\x00l" ) {
+                                       $xml_type = "UTF-16BE";
+                               } elseif ( substr( $head, 0, 10 ) == "\xff\xfe<\x00?\x00x\x00m\x00l\x00") {
+                                       $xml_type = "UTF-16LE";
+                               }
 
-                               if ($xml_type) {
-                                       if ($xml_type!=="UTF-8" && $xml_type!=="ASCII") $head= iconv($xml_type,"ASCII//IGNORE",$head);
+                               if ( $xml_type ) {
+                                       if ( $xml_type !== "UTF-8" && $xml_type !== "ASCII" ) {
+                                               $head = iconv( $xml_type, "ASCII//IGNORE", $head );
+                                       }
 
-                                       $match= array();
-                                       $doctype= "";
-                                       $tag= "";
+                                       $match = array();
+                                       $doctype = "";
+                                       $tag = "";
 
-                                       if (preg_match('%<!DOCTYPE\s+[\w-]+\s+PUBLIC\s+["'."'".'"](.*?)["'."'".'"].*>%sim',$head,$match)) $doctype= $match[1];
-                                       if (preg_match('%<(\w+).*>%sim',$head,$match)) $tag= $match[1];
+                                       if ( preg_match( '%<!DOCTYPE\s+[\w-]+\s+PUBLIC\s+["'."'".'"](.*?)["'."'".'"].*>%sim', 
+                                               $head, $match ) ) {
+                                                       $doctype = $match[1];
+                                               }
+                                       if ( preg_match( '%<(\w+).*>%sim', $head, $match ) ) {
+                                               $tag = $match[1];
+                                       }
 
                                        #print "<br>ANALYSING $file ($mime): doctype= $doctype; tag= $tag<br>";
 
-                                       if (strpos($doctype,"-//W3C//DTD SVG")===0) $mime= "image/svg+xml";
-                                       elseif ($tag==="svg") $mime= "image/svg+xml";
-                                       elseif (strpos($doctype,"-//W3C//DTD XHTML")===0) $mime= "text/html";
-                                       elseif ($tag==="html") $mime= "text/html";
+                                       if ( strpos( $doctype, "-//W3C//DTD SVG" ) === 0 ) {
+                                               $mime = "image/svg+xml";
+                                       } elseif ( $tag === "svg" ) {
+                                               $mime = "image/svg+xml";
+                                       } elseif ( strpos( $doctype, "-//W3C//DTD XHTML" ) === 0 ) {
+                                               $mime = "text/html";
+                                       } elseif ( $tag === "html" ) {
+                                               $mime = "text/html";
+                                       }
                                }
                        }
 
                        /*
                        * look for shell scripts
                        */
-                       if (!$xml_type) {
-                               $script_type= NULL;
-
-                               #detect by shebang
-                               if (substr($head,0,2)=="#!") $script_type= "ASCII";
-                               elseif (substr($head,0,5)=="\xef\xbb\xbf#!") $script_type= "UTF-8";
-                               elseif (substr($head,0,7)=="\xfe\xff\x00#\x00!") $script_type= "UTF-16BE";
-                               elseif (substr($head,0,7)=="\xff\xfe#\x00!") $script_type= "UTF-16LE";
+                       if ( !$xml_type ) {
+                               $script_type = NULL;
+
+                               # detect by shebang
+                               if ( substr( $head, 0, 2) == "#!" ) {
+                                       $script_type = "ASCII";
+                               } elseif ( substr( $head, 0, 5) == "\xef\xbb\xbf#!" ) {
+                                       $script_type = "UTF-8";
+                               } elseif ( substr( $head, 0, 7) == "\xfe\xff\x00#\x00!" ) {
+                                       $script_type = "UTF-16BE";
+                               } elseif ( substr( $head, 0, 7 ) == "\xff\xfe#\x00!" ) {
+                                       $script_type= "UTF-16LE";
+                               }
 
-                               if ($script_type) {
-                                       if ($script_type!=="UTF-8" && $script_type!=="ASCII") $head= iconv($script_type,"ASCII//IGNORE",$head);
+                               if ( $script_type ) {
+                                       if ( $script_type !== "UTF-8" && $script_type !== "ASCII") {
+                                               $head = iconv( $script_type, "ASCII//IGNORE", $head);
+                                       }
 
-                                       $match= array();
-                                       $prog= "";
+                                       $match = array();
 
-                                       if (preg_match('%/?([^\s]+/)(w+)%sim',$head,$match)) {
-                                               $script= $match[2]; // FIXME: $script variable not used; should this be "$prog = $match[2];" instead?
+                                       if ( preg_match( '%/?([^\s]+/)(\w+)%', $head, $match ) ) {
+                                               $mime = "application/x-{$match[2]}";
                                        }
-
-                                       $mime= "application/x-$prog";
                                }
                        }
 
@@ -449,42 +491,43 @@ class MimeMagic {
                                    ( strpos( $head, "<\x00?\x00\t" ) !== false ) ||
                                    ( strpos( $head, "<\x00?\x00=" ) !== false ) ) {
 
-                                       $mime= "application/x-php";
+                                       $mime = "application/x-php";
                                }
                        }
 
                }
 
-               if (isset($this->mMimeTypeAliases[$mime])) $mime= $this->mMimeTypeAliases[$mime];
+               if ( isset( $this->mMimeTypeAliases[$mime] ) ) {
+                       $mime = $this->mMimeTypeAliases[$mime];
+               }
 
-               wfDebug("$fname: final mime type of $file: $mime\n");
+               wfDebug(__METHOD__.": final mime type of $file: $mime\n");
                return $mime;
        }
 
        /** Internal mime type detection, please use guessMimeType() for application code instead.
        * Detection is done using an external program, if $wgMimeDetectorCommand is set.
        * Otherwise, the fileinfo extension and mime_content_type are tried (in this order), if they are available.
-       * If the dections fails and $useExt is true, the mime type is guessed from the file extension, using guessTypesForExtension.
+       * If the dections fails and $ext is not false, the mime type is guessed from the file extension, using 
+       * guessTypesForExtension.
        * If the mime type is still unknown, getimagesize is used to detect the mime type if the file is an image.
        * If no mime type can be determined, this function returns "unknown/unknown".
        *
        * @param string $file The file to check
-       * @param bool $useExt switch for allowing to use the file extension to guess the mime type. true by default.
+       * @param mixed $ext The file extension, or true to extract it from the filename. 
+       *                   Set it to false to ignore the extension.
        *
        * @return string the mime type of $file
        * @access private
        */
-       function detectMimeType( $file, $useExt=true ) {
-               $fname = 'MimeMagic::detectMimeType';
-
+       function detectMimeType( $file, $ext = true ) {
                global $wgMimeDetectorCommand;
 
-               $m= NULL;
-               if ($wgMimeDetectorCommand) {
-                       $fn= wfEscapeShellArg($file);
-                       $m= `$wgMimeDetectorCommand $fn`;
-               }
-               else if (function_exists("finfo_open") && function_exists("finfo_file")) {
+               $m = NULL;
+               if ( $wgMimeDetectorCommand ) {
+                       $fn = wfEscapeShellArg( $file );
+                       $m = `$wgMimeDetectorCommand $fn`;
+               } elseif ( function_exists( "finfo_open" ) && function_exists( "finfo_file" ) ) {
 
                        # This required the fileinfo extension by PECL,
                        # see http://pecl.php.net/package/fileinfo
@@ -499,13 +542,12 @@ class MimeMagic {
                        $mime_magic_resource = finfo_open(FILEINFO_MIME); /* return mime type ala mimetype extension */
 
                        if ($mime_magic_resource) {
-                               $m= finfo_file($mime_magic_resource, $file);
-
-                               finfo_close($mime_magic_resource);
+                               $m = finfo_file( $mime_magic_resource, $file );
+                               finfo_close( $mime_magic_resource );
+                       } else {
+                               wfDebug( __METHOD__.": finfo_open failed on ".FILEINFO_MIME."!\n" );
                        }
-                       else wfDebug("$fname: finfo_open failed on ".FILEINFO_MIME."!\n");
-               }
-               else if (function_exists("mime_content_type")) {
+               } elseif ( function_exists( "mime_content_type" ) ) {
 
                        # NOTE: this function is available since PHP 4.3.0, but only if
                        # PHP was compiled with --with-mime-magic or, before 4.3.2, with --enable-mime-magic.
@@ -516,93 +558,99 @@ class MimeMagic {
                        # Also note that this has been DEPRECATED in favor of the fileinfo extension by PECL, see above.
                        # see http://www.php.net/manual/en/ref.mime-magic.php for details.
 
-                       $m= mime_content_type($file);
+                       $m = mime_content_type($file);
 
                        if ( $m == 'text/plain' ) {
                                // mime_content_type sometimes considers DJVU files to be text/plain.
                                $deja = new DjVuImage( $file );
                                if( $deja->isValid() ) {
-                                       wfDebug("$fname: (re)detected $file as image/vnd.djvu\n");
+                                       wfDebug( __METHOD__.": (re)detected $file as image/vnd.djvu\n" );
                                        $m = 'image/vnd.djvu';
                                }
                        }
+               } else {
+                       wfDebug( __METHOD__.": no magic mime detector found!\n" );
                }
-               else wfDebug("$fname: no magic mime detector found!\n");
 
-               if ($m) {
-                       #normalize
-                       $m= preg_replace('![;, ].*$!','',$m); #strip charset, etc
-                       $m= trim($m);
-                       $m= strtolower($m);
+               if ( $m ) {
+                       # normalize
+                       $m = preg_replace( '![;, ].*$!', '', $m ); #strip charset, etc
+                       $m = trim( $m );
+                       $m = strtolower( $m );
 
-                       if (strpos($m,'unknown')!==false) $m= NULL;
-                       else {
-                               wfDebug("$fname: magic mime type of $file: $m\n");
+                       if ( strpos( $m, 'unknown' ) !== false ) {
+                               $m = NULL;
+                       } else {
+                               wfDebug( __METHOD__.": magic mime type of $file: $m\n" );
                                return $m;
                        }
                }
 
-               #if still not known, use getimagesize to find out the type of image
-               #TODO: skip things that do not have a well-known image extension? Would that be safe?
+               # if still not known, use getimagesize to find out the type of image
+               # TODO: skip things that do not have a well-known image extension? Would that be safe?
                wfSuppressWarnings();
                $gis = getimagesize( $file );
                wfRestoreWarnings();
 
-               $notAnImage= false;
-
-               if ($gis && is_array($gis) && $gis[2]) {
-                       switch ($gis[2]) {
-                               case IMAGETYPE_GIF: $m= "image/gif"; break;
-                               case IMAGETYPE_JPEG: $m= "image/jpeg"; break;
-                               case IMAGETYPE_PNG: $m= "image/png"; break;
-                               case IMAGETYPE_SWF: $m= "application/x-shockwave-flash"; break;
-                               case IMAGETYPE_PSD: $m= "application/photoshop"; break;
-                               case IMAGETYPE_BMP: $m= "image/bmp"; break;
-                               case IMAGETYPE_TIFF_II: $m= "image/tiff"; break;
-                               case IMAGETYPE_TIFF_MM: $m= "image/tiff"; break;
-                               case IMAGETYPE_JPC: $m= "image"; break;
-                               case IMAGETYPE_JP2: $m= "image/jpeg2000"; break;
-                               case IMAGETYPE_JPX: $m= "image/jpeg2000"; break;
-                               case IMAGETYPE_JB2: $m= "image"; break;
-                               case IMAGETYPE_SWC: $m= "application/x-shockwave-flash"; break;
-                               case IMAGETYPE_IFF: $m= "image/vnd.xiff"; break;
-                               case IMAGETYPE_WBMP: $m= "image/vnd.wap.wbmp"; break;
-                               case IMAGETYPE_XBM: $m= "image/x-xbitmap"; break;
+               $notAnImage = false;
+
+               if ( $gis && is_array($gis) && $gis[2] ) {
+                       
+                       switch ( $gis[2] ) {
+                               case IMAGETYPE_GIF: $m = "image/gif"; break;
+                               case IMAGETYPE_JPEG: $m = "image/jpeg"; break;
+                               case IMAGETYPE_PNG: $m = "image/png"; break;
+                               case IMAGETYPE_SWF: $m = "application/x-shockwave-flash"; break;
+                               case IMAGETYPE_PSD: $m = "application/photoshop"; break;
+                               case IMAGETYPE_BMP: $m = "image/bmp"; break;
+                               case IMAGETYPE_TIFF_II: $m = "image/tiff"; break;
+                               case IMAGETYPE_TIFF_MM: $m = "image/tiff"; break;
+                               case IMAGETYPE_JPC: $m = "image"; break;
+                               case IMAGETYPE_JP2: $m = "image/jpeg2000"; break;
+                               case IMAGETYPE_JPX: $m = "image/jpeg2000"; break;
+                               case IMAGETYPE_JB2: $m = "image"; break;
+                               case IMAGETYPE_SWC: $m = "application/x-shockwave-flash"; break;
+                               case IMAGETYPE_IFF: $m = "image/vnd.xiff"; break;
+                               case IMAGETYPE_WBMP: $m = "image/vnd.wap.wbmp"; break;
+                               case IMAGETYPE_XBM: $m = "image/x-xbitmap"; break;
                        }
 
-                       if ($m) {
-                               wfDebug("$fname: image mime type of $file: $m\n");
+                       if ( $m ) {
+                               wfDebug( __METHOD__.": image mime type of $file: $m\n" );
                                return $m;
                        }
-                       else $notAnImage= true;
+                       else {
+                               $notAnImage = true;
+                       }
                } else {
                        // Also test DjVu
                        $deja = new DjVuImage( $file );
                        if( $deja->isValid() ) {
-                               wfDebug("$fname: detected $file as image/vnd.djvu\n");
+                               wfDebug( __METHOD__.": detected $file as image/vnd.djvu\n" );
                                return 'image/vnd.djvu';
                        }
                }
 
-               #if desired, look at extension as a fallback.
-               if ($useExt) {
+               # if desired, look at extension as a fallback.
+               if ( $ext === true ) {
                        $i = strrpos( $file, '.' );
-                       $e= strtolower( $i ? substr( $file, $i + 1 ) : '' );
-
-                       $m= $this->guessTypesForExtension($e);
+                       $ext = strtolower( $i ? substr( $file, $i + 1 ) : '' );
+               }
+               if ( $ext ) {
+                       $m = $this->guessTypesForExtension( $ext );
 
-                       #TODO: if $notAnImage is set, do not trust the file extension if
+                       # TODO: if $notAnImage is set, do not trust the file extension if
                        # the results is one of the image types that should have been recognized
                        # by getimagesize
 
-                       if ($m) {
-                               wfDebug("$fname: extension mime type of $file: $m\n");
+                       if ( $m ) {
+                               wfDebug( __METHOD__.": extension mime type of $file: $m\n" );
                                return $m;
                        }
                }
 
                #unknown type
-               wfDebug("$fname: failed to guess mime type for $file!\n");
+               wfDebug( __METHOD__.": failed to guess mime type for $file!\n" );
                return "unknown/unknown";
        }
 
@@ -622,61 +670,61 @@ class MimeMagic {
        *
        * @return (int?string?) a value to be used with the MEDIATYPE_xxx constants.
        */
-       function getMediaType($path=NULL,$mime=NULL) {
+       function getMediaType( $path = NULL, $mime = NULL ) {
                if( !$mime && !$path ) return MEDIATYPE_UNKNOWN;
 
-               #if mime type is unknown, guess it
-               if( !$mime ) $mime= $this->guessMimeType($path,false);
+               # If mime type is unknown, guess it
+               if( !$mime ) $mime = $this->guessMimeType( $path, false );
 
-               #special code for ogg - detect if it's video (theora),
-               #else label it as sound.
-               if( $mime=="application/ogg" && file_exists($path) ) {
+               # Special code for ogg - detect if it's video (theora),
+               # else label it as sound.
+               if( $mime == "application/ogg" && file_exists( $path ) ) {
 
                        // Read a chunk of the file
                        $f = fopen( $path, "rt" );
-                       if( !$f ) return MEDIATYPE_UNKNOWN;
+                       if ( !$f ) return MEDIATYPE_UNKNOWN;
                        $head = fread( $f, 256 );
                        fclose( $f );
 
-                       $head= strtolower( $head );
+                       $head = strtolower( $head );
 
-                       #This is an UGLY HACK, file should be parsed correctly
-                       if( strpos($head,'theora')!==false ) return MEDIATYPE_VIDEO;
-                       elseif( strpos($head,'vorbis')!==false ) return MEDIATYPE_AUDIO;
-                       elseif( strpos($head,'flac')!==false ) return MEDIATYPE_AUDIO;
-                       elseif( strpos($head,'speex')!==false ) return MEDIATYPE_AUDIO;
+                       # This is an UGLY HACK, file should be parsed correctly
+                       if ( strpos( $head, 'theora' ) !== false ) return MEDIATYPE_VIDEO;
+                       elseif ( strpos( $head, 'vorbis' ) !== false ) return MEDIATYPE_AUDIO;
+                       elseif ( strpos( $head, 'flac' ) !== false ) return MEDIATYPE_AUDIO;
+                       elseif ( strpos( $head, 'speex' ) !== false ) return MEDIATYPE_AUDIO;
                        else return MEDIATYPE_MULTIMEDIA;
                }
 
-               #check for entry for full mime type
+               # check for entry for full mime type
                if( $mime ) {
-                       $type= $this->findMediaType($mime);
-                       if( $type!==MEDIATYPE_UNKNOWN ) return $type;
+                       $type = $this->findMediaType( $mime );
+                       if( $type !== MEDIATYPE_UNKNOWN ) return $type;
                }
 
-               #check for entry for file extension
-               $e= NULL;
-               if( $path ) {
+               # Check for entry for file extension
+               $e = NULL;
+               if ( $path ) {
                        $i = strrpos( $path, '.' );
-                       $e= strtolower( $i ? substr( $path, $i + 1 ) : '' );
+                       $e = strtolower( $i ? substr( $path, $i + 1 ) : '' );
 
-                       #TODO: look at multi-extension if this fails, parse from full path
+                       # TODO: look at multi-extension if this fails, parse from full path
 
-                       $type= $this->findMediaType('.'.$e);
-                       if( $type!==MEDIATYPE_UNKNOWN ) return $type;
+                       $type = $this->findMediaType( '.' . $e );
+                       if ( $type !== MEDIATYPE_UNKNOWN ) return $type;
                }
 
-               #check major mime type
+               # Check major mime type
                if( $mime ) {
-                       $i= strpos($mime,'/');
+                       $i = strpos( $mime, '/' );
                        if( $i !== false ) {
-                               $major= substr($mime,0,$i);
-                               $type= $this->findMediaType($major);
-                               if( $type!==MEDIATYPE_UNKNOWN ) return $type;
+                               $major = substr( $mime, 0, $i );
+                               $type = $this->findMediaType( $major );
+                               if( $type !== MEDIATYPE_UNKNOWN ) return $type;
                        }
                }
 
-               if( !$type ) $type= MEDIATYPE_UNKNOWN;
+               if( !$type ) $type = MEDIATYPE_UNKNOWN;
 
                return $type;
        }
@@ -688,25 +736,26 @@ class MimeMagic {
        * This funktion relies on the mapping defined by $this->mMediaTypes
        * @access private
        */
-       function findMediaType($extMime) {
-
-               if (strpos($extMime,'.')===0) { #if it's an extension, look up the mime types
-                       $m= $this->getTypesForExtension(substr($extMime,1));
-                       if (!$m) return MEDIATYPE_UNKNOWN;
-
-                       $m= explode(' ',$m);
-               }
-               else { #normalize mime type
-                       if (isset($this->mMimeTypeAliases[$extMime])) {
-                               $extMime= $this->mMimeTypeAliases[$extMime];
+       function findMediaType( $extMime ) {
+               if ( strpos( $extMime, '.' ) === 0 ) { #if it's an extension, look up the mime types
+                       $m = $this->getTypesForExtension( substr( $extMime, 1 ) );
+                       if ( !$m ) return MEDIATYPE_UNKNOWN;
+
+                       $m = explode( ' ', $m );
+               } else { 
+                       # Normalize mime type
+                       if ( isset( $this->mMimeTypeAliases[$extMime] ) ) {
+                               $extMime = $this->mMimeTypeAliases[$extMime];
                        }
 
-                       $m= array($extMime);
+                       $m = array($extMime);
                }
 
-               foreach ($m as $mime) {
-                       foreach ($this->mMediaTypes as $type => $codes) {
-                               if (in_array($mime,$codes,true)) return $type;
+               foreach ( $m as $mime ) {
+                       foreach ( $this->mMediaTypes as $type => $codes ) {
+                               if ( in_array($mime, $codes, true ) ) {
+                                       return $type;
+                               }
                        }
                }
 
@@ -714,4 +763,4 @@ class MimeMagic {
        }
 }
 
-?>
+