From e42c18ededbc4b8c8e4ef89a7e7a324e6c7c8a8a Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 3 Dec 2009 00:10:21 +0000 Subject: added url to twitter's docs --- config.php.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config.php.sample') diff --git a/config.php.sample b/config.php.sample index 9fccb84f3..97645e870 100644 --- a/config.php.sample +++ b/config.php.sample @@ -186,7 +186,7 @@ $config['sphinx']['port'] = 3312; // // $config['twitterbridge']['enabled'] = true; -// Twitter OAuth settings +// Twitter OAuth settings. Documentation is at http://apiwiki.twitter.com/OAuth-FAQ // $config['twitter']['consumer_key'] = 'YOURKEY'; // $config['twitter']['consumer_secret'] = 'YOURSECRET'; -- cgit v1.2.3-54-g00ecf From f9dd83caa72a799916725888a631725d532d780e Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 1 Mar 2010 19:56:16 -0500 Subject: Modify configuration to have an option to allow uploads regardless of mime type --- config.php.sample | 2 ++ lib/mediafile.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'config.php.sample') diff --git a/config.php.sample b/config.php.sample index b8852dc67..5c5fb5b53 100644 --- a/config.php.sample +++ b/config.php.sample @@ -275,6 +275,8 @@ $config['sphinx']['port'] = 3312; // Support for file uploads (attachments), // select supported mimetypes and quotas (in bytes) // $config['attachments']['supported'] = array('image/png', 'application/ogg'); +// $config['attachments']['supported'] = true; //allow all file types to be uploaded + // $config['attachments']['file_quota'] = 5000000; // $config['attachments']['user_quota'] = 50000000; // $config['attachments']['monthly_quota'] = 15000000; diff --git a/lib/mediafile.php b/lib/mediafile.php index e3d5b1dbc..10d90d008 100644 --- a/lib/mediafile.php +++ b/lib/mediafile.php @@ -262,7 +262,7 @@ class MediaFile $filetype = MIME_Type::autoDetect($stream['uri']); } - if (in_array($filetype, common_config('attachments', 'supported'))) { + if (common_config('attachments', 'supported') === true || in_array($filetype, common_config('attachments', 'supported'))) { return $filetype; } $media = MIME_Type::getMedia($filetype); -- cgit v1.2.3-54-g00ecf From e97515c8779705bf732840df0611cc2025a4781f Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 5 Mar 2010 17:05:00 -0800 Subject: Remove unused variables, update Twitter ones --- config.php.sample | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'config.php.sample') diff --git a/config.php.sample b/config.php.sample index 5c5fb5b53..9e0b4e2ac 100644 --- a/config.php.sample +++ b/config.php.sample @@ -188,9 +188,6 @@ $config['sphinx']['port'] = 3312; // Disable SMS // $config['sms']['enabled'] = false; -// Disable Twitter integration -// $config['twitter']['enabled'] = false; - // Twitter integration source attribute. Note: default is StatusNet // $config['integration']['source'] = 'StatusNet'; @@ -198,7 +195,7 @@ $config['sphinx']['port'] = 3312; // // NOTE: if you enable this you must also set $config['avatar']['path'] // -// $config['twitterbridge']['enabled'] = true; +// $config['twitterimport']['enabled'] = true; // Twitter OAuth settings // $config['twitter']['consumer_key'] = 'YOURKEY'; @@ -212,10 +209,6 @@ $config['sphinx']['port'] = 3312; // $config['throttle']['count'] = 100; // $config['throttle']['timespan'] = 3600; -// List of users banned from posting (nicknames and/or IDs) -// $config['profile']['banned'][] = 'hacker'; -// $config['profile']['banned'][] = 12345; - // Config section for the built-in Facebook application // $config['facebook']['apikey'] = 'APIKEY'; // $config['facebook']['secret'] = 'SECRET'; -- cgit v1.2.3-54-g00ecf