From 7bcaa858af31c5c496bc5adc0c73ec333d4c1e63 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 23 Jun 2009 05:35:20 -0700
Subject: make file command configurable

---
 README                | 4 ++++
 actions/newnotice.php | 3 +++
 lib/common.php        | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README b/README
index de1099600..1a57d6a80 100644
--- a/README
+++ b/README
@@ -1232,6 +1232,10 @@ supported: an array of mime types you accept to store and distribute,
            setup your server to properly reckognize the types you want to
            support.
 uploads:   false to disable uploading files with notices (true by default).
+filecommand: The required MIME_Type library may need to use the 'file'
+	     command. It tries the one in the Web server's path, but if
+	     you're having problems with uploads, try setting this to the
+	     correct value. Note: 'file' must accept '-b' and '-i' options.
 
 For quotas, be sure you've set the upload_max_filesize and post_max_size
 in php.ini to be large enough to handle your upload. In httpd.conf
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 09652d2b3..b7d9ec1dd 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -116,6 +116,9 @@ class NewnoticeAction extends Action
     function getUploadedFileType() {
         require_once 'MIME/Type.php';
 
+        $cmd = &PEAR::getStaticProperty('MIME_Type', 'fileCmd');
+        $cmd = common_config('attachments', 'filecommand');
+
         $filetype = MIME_Type::autoDetect($_FILES['attach']['tmp_name']);
         if (in_array($filetype, common_config('attachments', 'supported'))) {
             return $filetype;
diff --git a/lib/common.php b/lib/common.php
index 20f1ab35e..76eb4a978 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -202,7 +202,7 @@ $config =
         array('run' => 'web',
               'frequency' => 10000,
               'reporturl' => 'http://laconi.ca/stats/report'),
-        'attachments' => 
+        'attachments' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/file/',
               'path' => $_path . '/file/',
@@ -241,6 +241,7 @@ $config =
         'user_quota' => 50000000,
         'monthly_quota' => 15000000,
         'uploads' => true,
+        'filecommand' => '/usr/bin/file',
         ),
         'group' =>
         array('maxaliases' => 3),
-- 
cgit v1.2.3-54-g00ecf