eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Show global key and secret, if defined, in Twitter bridge admin panel

Browse Source
This commit is contained in:
Zach Copley
2010-03-03 01:49:14 +00:00
parent 097e3f89b6
commit 32c08f53de
2 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/TwitterBridge/TwitterBridgePlugin.php
View File

@@ -88,15 +88,15 @@ class TwitterBridgePlugin extends Plugin
static function hasKeys()
{
$key = common_config('twitter', 'consumer_key');
$secret = common_config('twitter', 'consumer_secret');
$ckey = common_config('twitter', 'consumer_key');
$csecret = common_config('twitter', 'consumer_secret');
if (empty($key) && empty($secret)) {
$key = common_config('twitter', 'global_consumer_key');
$secret = common_config('twitter', 'global_consumer_secret');
if (empty($ckey) && empty($csecret)) {
$ckey = common_config('twitter', 'global_consumer_key');
$csecret = common_config('twitter', 'global_consumer_secret');
}
if (!empty($key) && !empty($secret)) {
if (!empty($ckey) && !empty($csecret)) {
return true;
}
@@ -115,6 +115,8 @@ class TwitterBridgePlugin extends Plugin
function onRouterInitialized($m)
{
$m->connect('admin/twitter', array('action' => 'twitteradminpanel'));
if (self::hasKeys()) {
$m->connect(
'twitter/authorization',
@@ -133,8 +135,6 @@ class TwitterBridgePlugin extends Plugin
}
}
$m->connect('admin/twitter', array('action' => 'twitteradminpanel'));
return true;
}