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

Twitter integration - added $config option for source attribute when posting to Twitter 

darcs-hash:20080907062118-7b5ce-b4412446bbf245b1d14a78b01ecde0f71f621185.gz
This commit is contained in:
Zach Copley 2008-09-07 02:21:18 -04:00
parent 9eca4e0874
commit 6b42c984ee
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.php.sample
View File

@ -86,3 +86,6 @@ $config['db']['database'] = 'mysql://laconica:microblog@localhost/laconica';
#optionally show non-local messages in public timeline
#$config['public']['localonly'] = false;
#Twitter integration source attribute. Note: default is Laconica
#$config['integration']['source'] = 'Laconica';

6
lib/common.php
View File

@ -97,11 +97,7 @@ $config =
'daemon' =>
array('piddir' => '/var/run',
'user' => false,
'group' => false),
'memcached' =>
array('enabled' => false,
'server' => 'localhost',
'port' => 11211)
'group' => false)
);
$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');

5
lib/util.php
View File

@ -1104,6 +1104,7 @@ function common_broadcast_notice($notice, $remote=false) {
}
function common_twitter_broadcast($notice, $flink) {
global $config;
$success = true;
$fuser = $flink->getForeignUser();
$twitter_user = $fuser->nickname;
@ -1116,13 +1117,13 @@ function common_twitter_broadcast($notice, $flink) {
CURLOPT_POST => true,
CURLOPT_POSTFIELDS => array(
'status' => $statustxt,
'source' => 'Laconica'
'source' => $config['integration']['source']
),
CURLOPT_RETURNTRANSFER => true,
CURLOPT_FAILONERROR => true,
CURLOPT_HEADER => false,
CURLOPT_FOLLOWLOCATION => true,
// CURLOPT_USERAGENT => "identi.ca",
CURLOPT_USERAGENT => "Laconica",
CURLOPT_CONNECTTIMEOUT => 120, // XXX: Scary!!!! How long should this be?
CURLOPT_TIMEOUT => 120
);