summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/facebookhome.php24
-rw-r--r--actions/grouprss.php153
-rw-r--r--lib/facebookaction.php6
-rw-r--r--theme/base/css/facebookapp.css26
4 files changed, 200 insertions, 9 deletions
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index 3558cf671..e17c0f813 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -43,11 +43,11 @@ class FacebookhomeAction extends FacebookAction
function handle($args)
{
parent::handle($args);
-
+
// 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')) {
+ if ($this->arg('skip') || $args['fb_sig_request_method'] == 'GET') {
$this->facebook->api_client->data_setUserPreference(
FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
}
@@ -191,7 +191,7 @@ class FacebookhomeAction extends FacebookAction
$this->showStylesheets();
- $this->elementStart('div', array('class' => 'content'));
+ $this->elementStart('div', array('class' => 'facebook_guide'));
$instructions = sprintf(_('If you would like the %s app to automatically update ' .
'your Facebook status with your latest notice, you need ' .
@@ -207,11 +207,19 @@ class FacebookhomeAction extends FacebookAction
$this->elementStart('ul', array('id' => 'fb-permissions-list'));
$this->elementStart('li', array('id' => 'fb-permissions-item'));
- $this->elementStart('fb:prompt-permission', array('perms' => 'status_update',
- 'next_fbjs' => 'document.setLocation(\'' . "$this->app_uri/index.php" . '\')'));
- $this->element('span', array('class' => 'facebook-button'),
- sprintf(_('Allow %s to update my Facebook status'), $this->app_name));
- $this->elementEnd('fb:prompt-permission');
+
+ $next = urlencode("$this->app_uri/index.php");
+ $api_key = common_config('facebook', 'apikey');
+
+ $auth_url = 'http://www.facebook.com/authorize.php?api_key=' .
+ $api_key . '&v=1.0&ext_perm=status_update&next=' . $next .
+ '&next_cancel=' . $next . '&submit=skip';
+
+ $this->elementStart('span', array('class' => 'facebook-button'));
+ $this->element('a', array('href' => $auth_url),
+ sprintf(_('Okay, do it!'), $this->app_name));
+ $this->elementEnd('span');
+
$this->elementEnd('li');
$this->elementStart('li', array('id' => 'fb-permissions-item'));
diff --git a/actions/grouprss.php b/actions/grouprss.php
new file mode 100644
index 000000000..1a7b858b1
--- /dev/null
+++ b/actions/grouprss.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Group main page
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Group
+ * @package Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+ exit(1);
+}
+
+require_once INSTALLDIR.'/lib/rssaction.php';
+
+define('MEMBERS_PER_SECTION', 81);
+
+/**
+ * Group RSS feed
+ *
+ * @category Group
+ * @package Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://laconi.ca/
+ */
+
+class groupRssAction extends Rss10Action
+{
+ /** group we're viewing. */
+ var $group = null;
+
+ /**
+ * Is this page read-only?
+ *
+ * @return boolean true
+ */
+
+ function isReadOnly()
+ {
+ return true;
+ }
+
+ /**
+ * Prepare the action
+ *
+ * Reads and validates arguments and instantiates the attributes.
+ *
+ * @param array $args $_REQUEST args
+ *
+ * @return boolean success flag
+ */
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ if (!common_config('inboxes','enabled')) {
+ $this->serverError(_('Inboxes must be enabled for groups to work'));
+ return false;
+ }
+
+ $nickname_arg = $this->arg('nickname');
+ $nickname = common_canonical_nickname($nickname_arg);
+
+ // Permanent redirect on non-canonical nickname
+
+ if ($nickname_arg != $nickname) {
+ $args = array('nickname' => $nickname);
+ common_redirect(common_local_url('showgroup', $args), 301);
+ return false;
+ }
+
+ if (!$nickname) {
+ $this->clientError(_('No nickname'), 404);
+ return false;
+ }
+
+ $this->group = User_group::staticGet('nickname', $nickname);
+
+ if (!$this->group) {
+ $this->clientError(_('No such group'), 404);
+ return false;
+ }
+
+ return true;
+ }
+
+ function getNotices($limit=0)
+ {
+
+ $group = $this->group;
+
+ if (is_null($group)) {
+ return null;
+ }
+
+ $notice = $group->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
+
+ while ($notice->fetch()) {
+ $notices[] = clone($notice);
+ }
+
+ return $notices;
+ }
+
+ function getChannel()
+ {
+ $group = $this->group;
+ $c = array('url' => common_local_url('grouprss',
+ array('nickname' =>
+ $group->nickname)),
+ 'title' => $group->nickname,
+ 'link' => common_local_url('showgroup', array('nickname' => $group->nickname)),
+ 'description' => sprintf(_('Microblog by %s group'), $group->nickname));
+ return $c;
+ }
+
+ function getImage()
+ {
+ return $this->group->homepage_logo;
+ }
+
+ # override parent to add X-SUP-ID URL
+
+ function initRss($limit=0)
+ {
+ $url = common_local_url('sup', null, $this->group->id);
+ header('X-SUP-ID: '.$url);
+ parent::initRss($limit);
+ }
+}
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index c781b86f4..a12c7d6f9 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -276,6 +276,8 @@ class FacebookAction extends Action
function showInstructions()
{
+ $this->elementStart('div', array('class' => 'facebook_guide'));
+
$this->elementStart('dl', array('class' => 'system_notice'));
$this->element('dt', null, 'Page Notice');
@@ -292,6 +294,9 @@ class FacebookAction extends Action
$this->text($loginmsg_part2);
$this->elementEnd('dd');
$this->elementEnd('dl');
+
+ $this->elementEnd('div');
+
}
@@ -315,7 +320,6 @@ class FacebookAction extends Action
'action' => 'index.php'));
$this->elementStart('fieldset');
- $this->element('legend', null, _('Login to site'));
$this->elementStart('ul', array('class' => 'form_datas'));
$this->elementStart('li');
diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css
index 0d8c879cd..af188ad7a 100644
--- a/theme/base/css/facebookapp.css
+++ b/theme/base/css/facebookapp.css
@@ -2,3 +2,29 @@
@import url("../../identica/css/display.css");
span.facebook-button { border: 2px solid #777; padding: 5px; display: block; float: left; margin-right: 20px; -moz-border-radius: 4px; border-radius:4px; -webkit-border-radius:4px; font-weight: bold; background-color:#A9BF4F; color:#fff; font-size:1.2em }
+
+span.facebook-button a { color:#fff }
+
+.notice div.entry-content dl,
+.notice div.entry-content dt,
+.notice div.entry-content dd {
+margin-right:5px;
+}
+
+#content_inner p {
+margin-bottom:18px;
+}
+
+#content_inner ul {
+list-style-type:none;
+}
+
+.facebook_guide p {
+margin-bottom:18px;
+font-size:1.3em;
+font-weight:bold;
+}
+
+.form_settings label {
+margin-right:18px;
+}