forked from GNUsocial/gnu-social
trac750 Better workflow for asking user for status update permission
This commit is contained in:
parent
aea172bee0
commit
12f7ec980c
@ -31,14 +31,41 @@ class FacebookhomeAction extends FacebookAction
|
||||
$facebook = get_facebook();
|
||||
$fbuid = $facebook->require_login();
|
||||
|
||||
// If the user has opted not to initially allow the app to have
|
||||
// Facebook status update permission, store that preference. Only
|
||||
// promt the user the first time she uses the app
|
||||
if ($this->arg('skip')) {
|
||||
$facebook->api_client->data_setUserPreference(
|
||||
FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
|
||||
}
|
||||
|
||||
// Check to see whether there's already a Facebook link for this user
|
||||
$flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
|
||||
|
||||
if ($flink) {
|
||||
|
||||
$user = $flink->getUser();
|
||||
common_set_user($user);
|
||||
|
||||
// If this is the first time the user has started the app
|
||||
// prompt for Facebook status update permission
|
||||
if (!$facebook->api_client->users_hasAppPermission('status_update')) {
|
||||
|
||||
if ($facebook->api_client->data_getUserPreference(
|
||||
FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
|
||||
$this->getUpdatePermission();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Use is authenticated and has already been prompted once for
|
||||
// Facebook status update permission? Then show the main page
|
||||
// of the app
|
||||
$this->showHome($flink, null);
|
||||
|
||||
} else {
|
||||
|
||||
// User hasn't authenticated yet, prompt for creds
|
||||
$this->login($fbuid);
|
||||
}
|
||||
|
||||
@ -73,7 +100,9 @@ class FacebookhomeAction extends FacebookAction
|
||||
// XXX: Do some error handling here
|
||||
|
||||
$this->setDefaults();
|
||||
$this->showHome($flink, _('You can now use Identi.ca from Facebook!'));
|
||||
//$this->showHome($flink, _('You can now use Identi.ca from Facebook!'));
|
||||
|
||||
$this->getUpdatePermission();
|
||||
return;
|
||||
|
||||
} else {
|
||||
@ -90,7 +119,10 @@ class FacebookhomeAction extends FacebookAction
|
||||
$facebook = get_facebook();
|
||||
|
||||
// A default prefix string for notices
|
||||
$facebook->api_client->data_setUserPreference(1, 'dented: ');
|
||||
$facebook->api_client->data_setUserPreference(
|
||||
FACEBOOK_NOTICE_PREFIX, 'dented: ');
|
||||
$facebook->api_client->data_setUserPreference(
|
||||
FACEBOOK_PROMPTED_UPDATE_PREF, 'false');
|
||||
}
|
||||
|
||||
function showHome($flink, $msg)
|
||||
@ -138,4 +170,58 @@ class FacebookhomeAction extends FacebookAction
|
||||
return $nl->show();
|
||||
}
|
||||
|
||||
function getUpdatePermission() {
|
||||
|
||||
$facebook = get_facebook();
|
||||
$fbuid = $facebook->require_login();
|
||||
|
||||
start_fbml();
|
||||
|
||||
common_element('link', array('rel' => 'stylesheet',
|
||||
'type' => 'text/css',
|
||||
'href' => getFacebookCSS()));
|
||||
|
||||
$this->showLogo();
|
||||
|
||||
common_element_start('div', array('class' => 'content'));
|
||||
|
||||
// Figure what the URL of our app is.
|
||||
$app_props = $facebook->api_client->Admin_getAppProperties(
|
||||
array('canvas_name', 'application_name'));
|
||||
$app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/index.php';
|
||||
$app_name = $app_props['application_name'];
|
||||
|
||||
$instructions = sprintf(_('If you would like the %s app to automatically update ' .
|
||||
'your Facebook status with your latest notice, you need ' .
|
||||
'to give it permission.'), $app_name);
|
||||
|
||||
common_element_start('p');
|
||||
common_element('span', array('id' => 'permissions_notice'), $instructions);
|
||||
common_element_end('p');
|
||||
|
||||
common_element_start('form', array('method' => 'post',
|
||||
'action' => $app_url,
|
||||
'id' => 'facebook-skip-permissions'));
|
||||
|
||||
common_element_start('ul', array('id' => 'fb-permissions-list'));
|
||||
common_element_start('li', array('id' => 'fb-permissions-item'));
|
||||
common_element_start('fb:prompt-permission', array('perms' => 'status_update',
|
||||
'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
|
||||
common_element('span', array('class' => 'facebook-button'),
|
||||
_('Allow Identi.ca to update my Facebook status'));
|
||||
common_element_end('fb:prompt-permission');
|
||||
common_element_end('li');
|
||||
|
||||
common_element_start('li', array('id' => 'fb-permissions-item'));
|
||||
common_submit('skip', _('Skip'));
|
||||
common_element_end('li');
|
||||
common_element_end('ul');
|
||||
|
||||
common_element_end('form');
|
||||
common_element_end('div');
|
||||
|
||||
common_end_xml();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -50,12 +50,13 @@ class FacebooksettingsAction extends FacebookAction
|
||||
$flink->set_flags($noticesync, $replysync, false);
|
||||
$result = $flink->update($original);
|
||||
|
||||
$facebook->api_client->data_setUserPreference(1, substr($prefix, 0, 128));
|
||||
$facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX,
|
||||
substr($prefix, 0, 128));
|
||||
|
||||
if ($result) {
|
||||
$this->show_form('Sync preferences saved.', true);
|
||||
$this->showForm('Sync preferences saved.', true);
|
||||
} else {
|
||||
$this->show_form('There was a problem saving your sync preferences!');
|
||||
$this->showForm('There was a problem saving your sync preferences!');
|
||||
}
|
||||
}
|
||||
|
||||
@ -68,17 +69,6 @@ class FacebooksettingsAction extends FacebookAction
|
||||
|
||||
$this->showHeader('Settings', $msg, $success);
|
||||
|
||||
common_element_start('p');
|
||||
|
||||
// Figure what the URL of our app is.
|
||||
$app_props = $facebook->api_client->Admin_getAppProperties(array('canvas_name'));
|
||||
$app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/settings.php';
|
||||
|
||||
common_element_start('fb:prompt-permission', array('perms' => 'status_update',
|
||||
'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
|
||||
common_element('h2', null, _('Allow Identi.ca to update my Facebook status'));
|
||||
common_element_end('fb:prompt-permission');
|
||||
common_element_end('p');
|
||||
|
||||
if ($facebook->api_client->users_hasAppPermission('status_update')) {
|
||||
|
||||
@ -90,7 +80,7 @@ class FacebooksettingsAction extends FacebookAction
|
||||
common_checkbox('noticesync', _('Automatically update my Facebook status with my notices.'),
|
||||
($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true);
|
||||
|
||||
common_checkbox('replysync', _('Send local "@" replies to Facebook.'),
|
||||
common_checkbox('replysync', _('Send "@" replies to Facebook.'),
|
||||
($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
|
||||
|
||||
$prefix = $facebook->api_client->data_getUserPreference(1);
|
||||
@ -103,6 +93,31 @@ class FacebooksettingsAction extends FacebookAction
|
||||
|
||||
common_element_end('form');
|
||||
|
||||
} else {
|
||||
|
||||
// Figure what the URL of our app is.
|
||||
$app_props = $facebook->api_client->Admin_getAppProperties(
|
||||
array('canvas_name', 'application_name'));
|
||||
$app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/settings.php';
|
||||
$app_name = $app_props['application_name'];
|
||||
|
||||
$instructions = sprintf(_('If you would like the %s app to automatically update ' .
|
||||
'your Facebook status with your latest notice, you need ' .
|
||||
'to give it permission.'), $app_name);
|
||||
|
||||
common_element_start('p');
|
||||
common_element('span', array('id' => 'permissions_notice'), $instructions);
|
||||
common_element_end('p');
|
||||
|
||||
common_element_start('ul', array('id' => 'fb-permissions-list'));
|
||||
common_element_start('li', array('id' => 'fb-permissions-item'));
|
||||
common_element_start('fb:prompt-permission', array('perms' => 'status_update',
|
||||
'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
|
||||
common_element('span', array('class' => 'facebook-button'),
|
||||
_('Allow Identi.ca to update my Facebook status'));
|
||||
common_element_end('fb:prompt-permission');
|
||||
common_element_end('li');
|
||||
common_element_end('ul');
|
||||
}
|
||||
|
||||
$this->showFooter();
|
||||
|
@ -21,6 +21,8 @@ require_once INSTALLDIR.'/extlib/facebook/facebook.php';
|
||||
require_once INSTALLDIR.'/lib/noticelist.php';
|
||||
|
||||
define("FACEBOOK_SERVICE", 2); // Facebook is foreign_service ID 2
|
||||
define("FACEBOOK_NOTICE_PREFIX", 1);
|
||||
define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
|
||||
|
||||
// Gets all the notices from users with a Facebook link since a given ID
|
||||
function get_facebook_notices($since)
|
||||
|
Loading…
Reference in New Issue
Block a user