diff options
| author | Zach Copley <zach@controlyourself.ca> | 2008-09-07 02:21:18 -0400 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2008-09-07 02:21:18 -0400 |
| commit | 6b42c984eef502a9e6174f1c7b5122b678b8bf4b (patch) | |
| tree | 3a51bcf641e00ef6f0593cf9af58338453a3ebcb | |
| parent | 9eca4e08745be9375048577bee2078012aa5cd21 (diff) | |
Twitter integration - added $config option for source attribute when posting to Twitter
darcs-hash:20080907062118-7b5ce-b4412446bbf245b1d14a78b01ecde0f71f621185.gz
| -rw-r--r-- | config.php.sample | 3 | ||||
| -rw-r--r-- | lib/common.php | 6 | ||||
| -rw-r--r-- | lib/util.php | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/config.php.sample b/config.php.sample index 875dc8b25..900d99c41 100644 --- a/config.php.sample +++ b/config.php.sample @@ -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'; diff --git a/lib/common.php b/lib/common.php index d1bab51a6..8ea8fa0fa 100644 --- a/lib/common.php +++ b/lib/common.php @@ -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'); diff --git a/lib/util.php b/lib/util.php index 5b6b59f80..b67782af3 100644 --- a/lib/util.php +++ b/lib/util.php @@ -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 ); |