[phpwiki-checkins] SF.net SVN: phpwiki:[9182] trunk

[<var...@us...>]

Revision: 9182
          http://sourceforge.net/p/phpwiki/code/9182
Author:   vargenau
Date:     2014-10-03 15:20:42 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function finfo_open exists

Modified Paths:
--------------
    trunk/lib/plugin/FileInfo.php
    trunk/view.php

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2014-10-03 15:19:03 UTC (rev 9181)
+++ trunk/lib/plugin/FileInfo.php	2014-10-03 15:20:42 UTC (rev 9182)
@@ -182,16 +182,13 @@
 
     function magic($file)
     {
-        if (function_exists('finfo_file') or loadPhpExtension('fileinfo')) {
-            // Valid finfo_open (i.e. libmagic) options:
-            // FILEINFO_NONE | FILEINFO_SYMLINK | FILEINFO_MIME | FILEINFO_COMPRESS | FILEINFO_DEVICES |
-            // FILEINFO_CONTINUE | FILEINFO_PRESERVE_ATIME | FILEINFO_RAW
-            $f = finfo_open( /*FILEINFO_MIME*/);
-            $result = finfo_file(realpath($file));
-            finfo_close($res);
-            return $result;
-        }
-        return '';
+        // Valid finfo_open (i.e. libmagic) options:
+        // FILEINFO_NONE | FILEINFO_SYMLINK | FILEINFO_MIME | FILEINFO_COMPRESS | FILEINFO_DEVICES |
+        // FILEINFO_CONTINUE | FILEINFO_PRESERVE_ATIME | FILEINFO_RAW
+        $f = finfo_open( /*FILEINFO_MIME*/);
+        $result = finfo_file(realpath($file));
+        finfo_close($res);
+        return $result;
     }
 
     function mime_type($file)

Modified: trunk/view.php
===================================================================
--- trunk/view.php	2014-10-03 15:19:03 UTC (rev 9181)
+++ trunk/view.php	2014-10-03 15:20:42 UTC (rev 9182)
@@ -93,12 +93,8 @@
     $filename = str_replace('"', '', $filename);
     header('Content-disposition: filename="' . $filename . '"');
 
-    if (function_exists('finfo_open')) {
-        $finfo = finfo_open(FILEINFO_MIME_TYPE);
-        $mimetype = finfo_file($finfo, $filepath);
-    } else {
-        $mimetype = 'application/octet-stream';
-    }
+    $finfo = finfo_open(FILEINFO_MIME_TYPE);
+    $mimetype = finfo_file($finfo, $filepath);
     header("Content-type: $mimetype");
 
     $length = filesize($filepath);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.