Fixes #3177. Don't show the authorize twitter plugin setting if the admin hasn't...

diff --git a/mod/twitter_api/languages/en.php b/mod/twitter_api/languages/en.php
index 9d8554a9ee2e85368704b46e936fde6d570d2d1f..f4b3c7f9429feae93351718439eefd5dae10f54c 100644 (file)
--- a/mod/twitter_api/languages/en.php
+++ b/mod/twitter_api/languages/en.php
@@ -21,6 +21,8 @@ $english = array(
 
        'twitter_api:usersettings:authorized' => "You have authorized %s to access your Twitter account: @%s.",
        'twitter_api:usersettings:revoke' => 'Click <a href="%s">here</a> to revoke access.',
+       'twitter_api:usersettings:site_not_configured' => 'An administrator must first configure Twitter before it can be used.',
+
        'twitter_api:revoke:success' => 'Twitter access has been revoked.',
 
        'twitter_api:login' => 'Allow existing users who have connected their Twitter account to sign in with Twitter?',

diff --git a/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php b/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php
index 65d04b8837b1e17151896ac85d430fad7714e40e..edcea2f0d6e0371eeaafee45938cb50beb5555bf 100644 (file)
--- a/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php
+++ b/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php
@@ -9,6 +9,14 @@ $twitter_name = elgg_get_plugin_user_setting('twitter_name', $user_guid, 'twitte
 $access_key = elgg_get_plugin_user_setting('access_key', $user_guid, 'twitter_api');
 $access_secret = elgg_get_plugin_user_setting('access_secret', $user_guid, 'twitter_api');
 
+$site_key = elgg_get_plugin_setting('consumer_key', 'twitter_api');
+$site_secret = elgg_get_plugin_setting('consumer_secret', 'twitter_api');
+
+if (!($site_key && $site_secret)) {
+       echo '<div>' . elgg_echo('twitter_api:usersettings:site_not_configured') . '</div>';
+       return true;
+}
+
 $site_name = elgg_get_site_entity()->name;
 echo '<div>' . elgg_echo('twitter_api:usersettings:description', array($site_name)) . '</div>';