diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-23 05:35:20 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-23 05:35:20 -0700 |
| commit | 7bcaa858af31c5c496bc5adc0c73ec333d4c1e63 (patch) | |
| tree | 984d51f5d3cb7400bc14a30df16a23e066d82200 | |
| parent | ccd9cdd6183ac479ef8e88e61814c3209b428eb3 (diff) | |
make file command configurable
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | actions/newnotice.php | 3 | ||||
| -rw-r--r-- | lib/common.php | 3 |
3 files changed, 9 insertions, 1 deletions
@@ -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), |