diff options
author | Robin Millette <millette@plantard.controlezvous.ca> | 2009-01-22 20:33:34 +0000 |
---|---|---|
committer | Robin Millette <millette@plantard.controlezvous.ca> | 2009-01-22 20:33:34 +0000 |
commit | 9e9b8349a2d32ae664a5b000ef34a7bb13a039f5 (patch) | |
tree | 029c69c1c9acf04fbe91994896d971cd25e7a48e /actions | |
parent | 5a84d7f975c2ae356d1fbd88757414ecb385ff5e (diff) | |
parent | 248fd763bde70537e5e9a14db435c27a52849c9a (diff) |
Merge branch 'master' of /var/www/trunk
Diffstat (limited to 'actions')
-rw-r--r-- | actions/favorited.php | 7 | ||||
-rw-r--r-- | actions/public.php | 10 | ||||
-rw-r--r-- | actions/subscribers.php | 92 | ||||
-rw-r--r-- | actions/subscriptions.php | 113 | ||||
-rw-r--r-- | actions/usergroups.php | 3 |
5 files changed, 152 insertions, 73 deletions
diff --git a/actions/favorited.php b/actions/favorited.php index 0223564f3..4155b3a23 100644 --- a/actions/favorited.php +++ b/actions/favorited.php @@ -181,10 +181,9 @@ class FavoritedAction extends Action $qry .= ' LIMIT ' . $offset . ', ' . $limit; } - // XXX: Figure out how to cache this query - - $notice = new Notice; - $notice->query(sprintf($qry, common_config('popular', 'dropoff'))); + $notice = Memcached_DataObject::cachedQuery('Notice', + sprintf($qry, common_config('popular', 'dropoff')), + 600); $nl = new NoticeList($notice, $this); diff --git a/actions/public.php b/actions/public.php index 0ceeef98e..b51a95f24 100644 --- a/actions/public.php +++ b/actions/public.php @@ -197,4 +197,14 @@ class PublicAction extends Action 'version' => 'Atom 1.0', 'item' => 'publicatom'))); } + + function showSections() + { + $top = new TopPostersSection($this); + $top->show(); + $pop = new PopularNoticeSection($this); + $pop->show(); + $gbp = new GroupsByPostsSection($this); + $gbp->show(); + } } diff --git a/actions/subscribers.php b/actions/subscribers.php index 31d0468d9..408829b54 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -1,9 +1,12 @@ <?php -/* - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, Inc. +/** + * Laconica, the distributed open-source microblogging tool * - * This program is free software: you can redistribute it and/or modify + * List a user's subscribers + * + * 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. @@ -15,56 +18,85 @@ * * 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 Social + * @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); } +if (!defined('LACONICA')) { + exit(1); +} -require_once(INSTALLDIR.'/lib/gallery.php'); +/** + * List a user's subscribers + * + * @category Social + * @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 SubscribersAction extends GalleryAction { - - function gallery_type() + function title() { - return _('Subscribers'); + if ($this->page == 1) { + return sprintf(_('%s subscribers'), $this->user->nickname); + } else { + return sprintf(_('%s subscribers, page %d'), + $this->user->nickname, + $this->page); + } } - function get_instructions(&$profile) + function showPageNotice() { $user =& common_current_user(); - if ($user && ($user->id == $profile->id)) { - return _('These are the people who listen to your notices.'); + if ($user && ($user->id == $this->profile->id)) { + $this->element('p', null, + _('These are the people who listen to '. + 'your notices.')); } else { - return sprintf(_('These are the people who listen to %s\'s notices.'), $profile->nickname); + $this->element('p', null, + sprintf(_('These are the people who '. + 'listen to %s\'s notices.'), + $this->profile->nickname)); } } - function fields() + function showContent() { - return array('subscriber', 'subscribed'); - } + $offset = ($this->page-1) * PROFILES_PER_PAGE; + $limit = PROFILES_PER_PAGE + 1; - function div_class() - { - return 'subscribers'; - } + $subscribers = $this->user->getSubscribers($offset, $limit); - function get_other(&$subs) - { - return $subs->subscriber; - } + if ($subscribers) { + $subscribers_list = new SubscribersList($subscribers, $this->user, $this); + $subscribers_list->show(); + } - function profile_list_class() - { - return 'SubscribersList'; + $subscribers->free(); + + $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE, + $this->page, 'subscribers', + array('nickname' => $this->user->nickname)); } } class SubscribersList extends ProfileList { - function show_owner_controls($profile) + function showOwnerControls($profile) { - common_block_form($profile, array('action' => 'subscribers', - 'nickname' => $this->owner->nickname)); + $bf = new BlockForm($this->out, $profile, + array('action' => 'subscribers', + 'nickname' => $this->owner->nickname)); + $bf->show(); } } diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 7a87a144f..bcc557891 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -1,9 +1,12 @@ <?php -/* - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, Inc. +/** + * Laconica, the distributed open-source microblogging tool * - * This program is free software: you can redistribute it and/or modify + * List of a user's subscriptions + * + * 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. @@ -15,73 +18,107 @@ * * 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 Social + * @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); } +if (!defined('LACONICA')) { + exit(1); +} -require_once(INSTALLDIR.'/lib/gallery.php'); +/** + * A list of the user's subscriptions + * + * @category Social + * @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/ + */ + +if (!defined('LACONICA')) { exit(1); } class SubscriptionsAction extends GalleryAction { - - function gallery_type() + function title() { - return _('Subscriptions'); + if ($this->page == 1) { + return sprintf(_('%s subscriptions'), $this->user->nickname); + } else { + return sprintf(_('%s subscriptions, page %d'), + $this->user->nickname, + $this->page); + } } - function get_instructions(&$profile) + function showPageNotice() { $user =& common_current_user(); - if ($user && ($user->id == $profile->id)) { - return _('These are the people whose notices you listen to.'); + if ($user && ($user->id == $this->profile->id)) { + $this->element('p', null, + _('These are the people whose notices '. + 'you listen to.')); } else { - return sprintf(_('These are the people whose notices %s listens to.'), $profile->nickname); + $this->element('p', null, + sprintf(_('These are the people whose '. + 'notices %s listens to.'), + $this->profile->nickname)); } } - function fields() + function getAllTags() { - return array('subscribed', 'subscriber'); + return $this->getTags('subscribed', 'subscriber'); } - function div_class() + function showContent() { - return 'subscriptions'; - } + parent::showContent(); - function get_other(&$subs) - { - return $subs->subscribed; - } + $offset = ($this->page-1) * PROFILES_PER_PAGE; + $limit = PROFILES_PER_PAGE + 1; - function profile_list_class() - { - return 'SubscriptionsList'; + $subscriptions = $this->user->getSubscriptions($offset, $limit); + + if ($subscriptions) { + $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this); + $subscriptions_list->show(); + } + + $subscriptions->free(); + + $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE, + $this->page, 'subscriptions', + array('nickname' => $this->user->nickname)); } } class SubscriptionsList extends ProfileList { - - function show_owner_controls($profile) + function showOwnerControls($profile) { - $sub = Subscription::pkeyGet(array('subscriber' => $this->owner->id, 'subscribed' => $profile->id)); if (!$sub) { return; } - $this->elementStart('form', array('id' => 'subedit-' . $profile->id, - 'method' => 'post', - 'class' => 'subedit', - 'action' => common_local_url('subedit'))); - $this->hidden('token', common_session_token()); - $this->hidden('profile', $profile->id); - $this->checkbox('jabber', _('Jabber'), $sub->jabber); - $this->checkbox('sms', _('SMS'), $sub->sms); - $this->submit('save', _('Save')); - $this->elementEnd('form'); + $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id, + 'method' => 'post', + 'class' => 'form_subcription_edit', + 'action' => common_local_url('subedit'))); + $this->out->hidden('token', common_session_token()); + $this->out->hidden('profile', $profile->id); + $this->out->checkbox('jabber', _('Jabber'), $sub->jabber); + $this->out->checkbox('sms', _('SMS'), $sub->sms); + $this->out->submit('save', _('Save')); + $this->out->elementEnd('form'); return; } } diff --git a/actions/usergroups.php b/actions/usergroups.php index 62ad3b3a2..f56f9c6b2 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -108,7 +108,8 @@ class UsergroupsAction extends Action function showLocalNav() { - // XXX: Add to the subscriptions tabset + $nav = new SubGroupNav($this, $this->user); + $nav->show(); } function showContent() |