summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/facebookhome.php168
-rw-r--r--actions/facebookinvite.php9
-rw-r--r--actions/facebookremove.php2
-rw-r--r--actions/facebooksettings.php65
4 files changed, 195 insertions, 49 deletions
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index d2ac7617d..ae29ee1f8 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -19,7 +19,7 @@
if (!defined('LACONICA')) { exit(1); }
-require_once(INSTALLDIR.'/lib/facebookaction.php');
+require_once INSTALLDIR.'/lib/facebookaction.php';
class FacebookhomeAction extends FacebookAction
{
@@ -34,9 +34,43 @@ class FacebookhomeAction extends FacebookAction
// Check to see whether there's already a Facebook link for this user
$flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
+ // 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');
+ }
+
if ($flink) {
+
+ if ($_POST['submit'] == 'Send') {
+ $this->saveNewNotice($flink);
+ return;
+ }
+
+ $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);
}
@@ -71,8 +105,10 @@ 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 {
$msg = _('Incorrect username or password.');
@@ -80,6 +116,7 @@ class FacebookhomeAction extends FacebookAction
}
$this->showLoginForm($msg);
+
}
function setDefaults()
@@ -87,7 +124,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)
@@ -101,19 +141,16 @@ class FacebookhomeAction extends FacebookAction
$notice = $user->getCurrentNotice();
update_profile_box($facebook, $fbuid, $user, $notice);
+ $this->showHeader($msg);
+ $this->showNoticeForm($user);
+ $this->showNav('Home');
- $this->show_header('Home');
+ echo $this->showNotices($user);
- if ($msg) {
- $this->element('fb:success', array('message' => $msg));
- }
-
- echo $this->show_notices($user);
-
- $this->show_footer();
+ $this->showFooter();
}
- function show_notices($user)
+ function showNotices($user)
{
$page = $this->trimmed('page');
@@ -123,16 +160,113 @@ class FacebookhomeAction extends FacebookAction
$notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
- $cnt = $this->show_notice_list($notice);
+ $cnt = $this->showNoticeList($notice);
- common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
- $page, 'all', array('nickname' => $user->nickname));
+ facebookPagination($page > 1, $cnt > NOTICES_PER_PAGE,
+ $page, 'all', array('nickname' => $user->nickname));
}
- function show_notice_list($notice)
+ function showNoticeList($notice)
{
- $nl = new NoticeList($notice);
+ $nl = new FacebookNoticeList($notice);
return $nl->show();
}
+ function getUpdatePermission() {
+
+ $facebook = get_facebook();
+ $fbuid = $facebook->require_login();
+
+ startFBML();
+
+ $this->showStylesheets();
+ $this->showScripts();
+
+ $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();
+
+ }
+
+ function saveNewNotice($flink)
+ {
+
+ $user = $flink->getUser();
+
+ $content = $_POST['status_textarea'];
+
+ if (!$content) {
+ $this->showHome($flink, _('No content!'));
+ return;
+ } else {
+ $content_shortened = common_shorten_links($content);
+
+ if (mb_strlen($content_shortened) > 140) {
+ common_debug("Content = '$content_shortened'", __FILE__);
+ common_debug("mb_strlen(\$content) = " . mb_strlen($content_shortened), __FILE__);
+ $this->showHome($flink, _('That\'s too long. Max notice size is 140 chars.'));
+ return;
+ }
+ }
+
+ $inter = new CommandInterpreter();
+
+ $cmd = $inter->handle_command($user, $content_shortened);
+
+ if ($cmd) {
+ $cmd->execute(new WebChannel());
+ return;
+ }
+
+ $replyto = $this->trimmed('inreplyto');
+
+ $notice = Notice::saveNew($user->id, $content,
+ 'Facebook', 1, ($replyto == 'false') ? null : $replyto);
+
+ if (is_string($notice)) {
+ $this->showHome($flink, 'Error!');
+ return;
+ }
+
+ common_broadcast_notice($notice);
+ $this->showHome($flink, 'Success!');
+ }
+
}
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index 103d5a568..1e6f6496e 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -41,7 +41,7 @@ class FacebookinviteAction extends FacebookAction
$facebook = get_facebook();
$fbuid = $facebook->require_login();
- $this->show_header('Invite');
+ $this->showHeader('Invite');
$this->element('h2', null, _('Thanks for inviting your friends to use Identi.ca!'));
$this->element('p', null, _('Invitations have been sent to the following users:'));
@@ -60,7 +60,7 @@ class FacebookinviteAction extends FacebookAction
$this->elementEnd("ul");
- $this->show_footer();
+ $this->showFooter();
}
function showInviteForm()
@@ -69,7 +69,8 @@ class FacebookinviteAction extends FacebookAction
$facebook = get_facebook();
$fbuid = $facebook->require_login();
- $this->show_header('Invite');
+ $this->showHeader();
+ $this->showNav('Invite');
// Get a list of users who are already using the app for exclusion
$exclude_ids = $facebook->api_client->friends_getAppUsers();
@@ -104,7 +105,7 @@ class FacebookinviteAction extends FacebookAction
$this->elementEnd("ul");
- $this->show_footer();
+ $this->showFooter();
}
diff --git a/actions/facebookremove.php b/actions/facebookremove.php
index d0a0dd951..376e12a2e 100644
--- a/actions/facebookremove.php
+++ b/actions/facebookremove.php
@@ -19,7 +19,7 @@
if (!defined('LACONICA')) { exit(1); }
-require_once(INSTALLDIR.'/lib/facebookaction.php');
+require_once INSTALLDIR.'/lib/facebookaction.php';
class FacebookremoveAction extends FacebookAction
{
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 8b071353a..bc034bc46 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -19,7 +19,7 @@
if (!defined('LACONICA')) { exit(1); }
-require_once(INSTALLDIR.'/lib/facebookaction.php');
+require_once INSTALLDIR.'/lib/facebookaction.php';
class FacebooksettingsAction extends FacebookAction
{
@@ -29,13 +29,13 @@ class FacebooksettingsAction extends FacebookAction
parent::handle($args);
if ($this->arg('save')) {
- $this->save_settings();
+ $this->saveSettings();
} else {
- $this->show_form();
+ $this->showForm();
}
}
- function save_settings() {
+ function saveSettings() {
$noticesync = $this->arg('noticesync');
$replysync = $this->arg('replysync');
@@ -50,36 +50,25 @@ 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!');
}
}
- function show_form($msg = null, $success = false) {
+ function showForm($msg = null, $success = false) {
$facebook = get_facebook();
$fbuid = $facebook->require_login();
$flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
- $this->show_header('Settings', $msg, $success);
-
- $this->elementStart('fb:if-section-not-added', array('section' => 'profile'));
- $this->element('h2', null, _('Add an Identi.ca box to my profile'));
- $this->elementStart('p');
- $this->element('fb:add-section-button', array('section' => 'profile'));
- $this->elementEnd('p');
-
- $this->elementEnd('fb:if-section-not-added');
- $this->elementStart('p');
- $this->elementStart('fb:prompt-permission', array('perms' => 'status_update'));
- $this->element('h2', null, _('Allow Identi.ca to update my Facebook status'));
- $this->elementEnd('fb:prompt-permission');
- $this->elementEnd('p');
+ $this->showHeader($msg, $success);
+ $this->showNav('Settings');
if ($facebook->api_client->users_hasAppPermission('status_update')) {
@@ -91,13 +80,10 @@ class FacebooksettingsAction extends FacebookAction
$this->checkbox('noticesync', _('Automatically update my Facebook status with my notices.'),
($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true);
- $this->checkbox('replysync', _('Send local "@" replies to Facebook.'),
+ $this->checkbox('replysync', _('Send "@" replies to Facebook.'),
($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
- // function $this->input($id, $label, $value=null,$instructions=null)
-
$prefix = $facebook->api_client->data_getUserPreference(1);
-
$this->input('prefix', _('Prefix'),
($prefix) ? $prefix : null,
@@ -106,9 +92,34 @@ class FacebooksettingsAction extends FacebookAction
$this->elementEnd('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->show_footer();
+ $this->showFooter();
}
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-09 22:59:06 +0000