From: Robin Millette <millette@controlyourself.ca>
Date: Wed, 17 Jun 2009 20:55:01 +0000 (-0400)
Subject: Added config option to enable or disable file uploads with notices.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b58dc5e96117bdb4de899d37c6eb94ebf1c3dfe6;p=quix0rs-gnu-social.git

Added config option to enable or disable file uploads with notices.
---

diff --git a/README b/README
index 7b22e3c5e8..5aa7270eec 100644
--- a/README
+++ b/README
@@ -1223,6 +1223,7 @@ supported: an array of mime types you accept to store and distribute,
            like 'image/gif', 'video/mpeg', 'audio/mpeg', etc. Make sure you
            setup your server to properly reckognize the types you want to
            support.
+uploads:   false to disable uploading files with notices (true by default).
 
 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/config.php.sample b/config.php.sample
index ed70f85fbb..7649c52623 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -222,5 +222,6 @@ $config['sphinx']['port'] = 3312;
 // $config['attachments']['file_quota'] = 5000000;
 // $config['attachments']['user_quota'] = 50000000;
 // $config['attachments']['monthly_quota'] = 15000000;
+// $config['attachments']['uploads'] = true;
 
 // $config['oohembed']['endpoint'] = 'http://oohembed.com/oohembed/';
diff --git a/lib/common.php b/lib/common.php
index 9c015a15d2..bbd9f78c3e 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -200,6 +200,7 @@ $config =
         'file_quota' => 5000000,
         'user_quota' => 50000000,
         'monthly_quota' => 15000000,
+        'uploads' => true,
         ),
         'group' =>
         array('maxaliases' => 3),
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 0ad3658566..a36b7f31f7 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -90,7 +90,9 @@ class NoticeForm extends Form
             $this->user = common_current_user();
         }
 
-        $this->enctype = 'multipart/form-data';
+        if (common_config('attachments', 'uploads')) {
+            $this->enctype = 'multipart/form-data';
+        }
     }
 
     /**
@@ -148,12 +150,14 @@ class NoticeForm extends Form
         $this->out->element('dd', array('id' => 'notice_text-count'),
                             '140');
         $this->out->elementEnd('dl');
-        $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
-        $this->out->element('input', array('id' => 'notice_data-attach',
-                                           'type' => 'file',
-                                           'name' => 'attach',
-                                           'title' => _('Attach a file')));
-        $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
+        if (common_config('attachments', 'uploads')) {
+            $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
+            $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
+            $this->out->element('input', array('id' => 'notice_data-attach',
+                                               'type' => 'file',
+                                               'name' => 'attach',
+                                               'title' => _('Attach a file')));
+        }
         if ($this->action) {
             $this->out->hidden('notice_return-to', $this->action, 'returnto');
         }