GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robin Millette 2009-06-17 16:55:01 -04:00
parent 28d02ec8cd
commit b58dc5e961
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -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 like 'image/gif', 'video/mpeg', 'audio/mpeg', etc. Make sure you
setup your server to properly reckognize the types you want to setup your server to properly reckognize the types you want to
support. 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 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 in php.ini to be large enough to handle your upload. In httpd.conf

1
config.php.sample
View File

@ -222,5 +222,6 @@ $config['sphinx']['port'] = 3312;
// $config['attachments']['file_quota'] = 5000000; // $config['attachments']['file_quota'] = 5000000;
// $config['attachments']['user_quota'] = 50000000; // $config['attachments']['user_quota'] = 50000000;
// $config['attachments']['monthly_quota'] = 15000000; // $config['attachments']['monthly_quota'] = 15000000;
// $config['attachments']['uploads'] = true;
// $config['oohembed']['endpoint'] = 'http://oohembed.com/oohembed/'; // $config['oohembed']['endpoint'] = 'http://oohembed.com/oohembed/';

1
lib/common.php
View File

@ -200,6 +200,7 @@ $config =
'file_quota' => 5000000, 'file_quota' => 5000000,
'user_quota' => 50000000, 'user_quota' => 50000000,
'monthly_quota' => 15000000, 'monthly_quota' => 15000000,
'uploads' => true,
), ),
'group' => 'group' =>
array('maxaliases' => 3), array('maxaliases' => 3),

18
lib/noticeform.php
View File

@ -90,7 +90,9 @@ class NoticeForm extends Form
$this->user = common_current_user(); $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'), $this->out->element('dd', array('id' => 'notice_text-count'),
'140'); '140');
$this->out->elementEnd('dl'); $this->out->elementEnd('dl');
$this->out->element('label', array('for' => 'notice_data-attach'),_('Attach')); if (common_config('attachments', 'uploads')) {
$this->out->element('input', array('id' => 'notice_data-attach', $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
'type' => 'file', $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
'name' => 'attach', $this->out->element('input', array('id' => 'notice_data-attach',
'title' => _('Attach a file'))); 'type' => 'file',
$this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota')); 'name' => 'attach',
'title' => _('Attach a file')));
}
if ($this->action) { if ($this->action) {
$this->out->hidden('notice_return-to', $this->action, 'returnto'); $this->out->hidden('notice_return-to', $this->action, 'returnto');
} }