summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/facebookinvite.php9
-rw-r--r--actions/facebooksettings.php2
-rw-r--r--lib/facebookaction.php2
3 files changed, 9 insertions, 4 deletions
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index b3653c78b..7addc4b31 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -40,6 +40,10 @@ class FacebookinviteAction extends FacebookAction
$this->show_header('Invite');
+
+ // Get a list of users who are already using the app for exclusion
+ $exclude_ids = $facebook->api_client->friends_getAppUsers();
+
$content = 'You have been invited to Identi.ca! ' .
htmlentities('<fb:req-choice url="http://apps.facebook.com/identica_app/" label="Add"/>');
@@ -50,8 +54,9 @@ class FacebookinviteAction extends FacebookAction
'content' => $content));
$actiontext = 'Invite your friends to use Identi.ca.';
- common_element_start('fb:multi-friend-selector', array('showborder' => 'false',
- 'actiontext' => $actiontext));
+ common_element('fb:multi-friend-selector', array('showborder' => 'false',
+ 'actiontext' => $actiontext,
+ 'exclude_ids' => implode(',', $exclude_ids)));
common_element_end('fb:request-form');
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 88364c797..862dc0732 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -70,8 +70,8 @@ class FacebooksettingsAction extends FacebookAction
common_element_start('p');
common_element('fb:add-section-button', array('section' => 'profile'));
common_element_end('p');
- common_element_end('fb:if-section-not-added');
+ common_element_end('fb:if-section-not-added');
common_element_start('p');
common_element_start('fb:prompt-permission', array('perms' => 'status_update'));
common_element('h2', null, _('Allow Identi.ca to update my Facebook status'));
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index ddf81c034..3a00c71dd 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -48,7 +48,7 @@ class FacebookAction extends Action
common_element('fb:tab-item', array('title' => 'Home',
'href' => 'index.php',
'selected' => ($selected == 'Home')));
- common_element('fb:tab-item', array('title' => 'Invite Friends',
+ common_element('fb:tab-item', array('title' => 'Invite',
'href' => 'invite.php',
'selected' => ($selected == 'Invite')));
common_element('fb:tab-item', array('title' => 'Settings',