Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
This commit is contained in:
Evan Prodromou
commit
0182b96f7c
@ -78,6 +78,7 @@ class TagSubPlugin extends Plugin
|
|||||||
return false;
|
return false;
|
||||||
case 'TagsubAction':
|
case 'TagsubAction':
|
||||||
case 'TagunsubAction':
|
case 'TagunsubAction':
|
||||||
|
case 'TagsubsAction':
|
||||||
case 'TagSubForm':
|
case 'TagSubForm':
|
||||||
case 'TagUnsubForm':
|
case 'TagUnsubForm':
|
||||||
include_once $dir.'/'.strtolower($cls).'.php';
|
include_once $dir.'/'.strtolower($cls).'.php';
|
||||||
@ -103,6 +104,9 @@ class TagSubPlugin extends Plugin
|
|||||||
array('action' => 'tagunsub'),
|
array('action' => 'tagunsub'),
|
||||||
array('tag' => Router::REGEX_TAG));
|
array('tag' => Router::REGEX_TAG));
|
||||||
|
|
||||||
|
$m->connect(':nickname/tag-subscriptions',
|
||||||
|
array('action' => 'tagsubs'),
|
||||||
|
array('nickname' => Nickname::DISPLAY_FMT));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -179,4 +183,60 @@ class TagSubPlugin extends Plugin
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Menu item for personal subscriptions/groups area
|
||||||
|
*
|
||||||
|
* @param Widget $widget Widget being executed
|
||||||
|
*
|
||||||
|
* @return boolean hook return
|
||||||
|
*/
|
||||||
|
|
||||||
|
function onEndSubGroupNav($widget)
|
||||||
|
{
|
||||||
|
$action = $widget->out;
|
||||||
|
$action_name = $action->trimmed('action');
|
||||||
|
|
||||||
|
$action->menuItem(common_local_url('tagsubs', array('nickname' => $action->user->nickname)),
|
||||||
|
// TRANS: SubMirror plugin menu item on user settings page.
|
||||||
|
_m('MENU', 'Tags'),
|
||||||
|
// TRANS: SubMirror plugin tooltip for user settings menu item.
|
||||||
|
_m('Configure tag subscriptions'),
|
||||||
|
$action_name == 'tagsubs' && $action->arg('nickname') == $action->user->nickname);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a count of mirrored feeds into a user's profile sidebar stats.
|
||||||
|
*
|
||||||
|
* @param Profile $profile
|
||||||
|
* @param array $stats
|
||||||
|
* @return boolean hook return value
|
||||||
|
*/
|
||||||
|
function onProfileStats($profile, &$stats)
|
||||||
|
{
|
||||||
|
$cur = common_current_user();
|
||||||
|
if (!empty($cur) && $cur->id == $profile->id) {
|
||||||
|
$tagsub = new TagSub();
|
||||||
|
$tagsub->profile_id = $profile->id;
|
||||||
|
$entry = array(
|
||||||
|
'id' => 'tagsubs',
|
||||||
|
'label' => _m('Tag subscriptions'),
|
||||||
|
'link' => common_local_url('tagsubs', array('nickname' => $profile->nickname)),
|
||||||
|
'value' => $tagsub->count(),
|
||||||
|
);
|
||||||
|
|
||||||
|
$insertAt = count($stats);
|
||||||
|
foreach ($stats as $i => $row) {
|
||||||
|
if ($row['id'] == 'groups') {
|
||||||
|
// Slip us in after them.
|
||||||
|
$insertAt = $i + 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
array_splice($stats, $insertAt, 0, array($entry));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
194
plugins/TagSub/tagsubsaction.php
Normal file
194
plugins/TagSub/tagsubsaction.php
Normal file
@ -0,0 +1,194 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* StatusNet, the distributed open-source microblogging tool
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* 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 Social
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @author Sarven Capadisli <csarven@status.net>
|
||||||
|
* @copyright 2008-2009 StatusNet, Inc.
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
|
* @link http://status.net/
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A list of the user's subscriptions
|
||||||
|
*
|
||||||
|
* @category Social
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
|
* @link http://status.net/
|
||||||
|
*/
|
||||||
|
class TagSubsAction extends GalleryAction
|
||||||
|
{
|
||||||
|
function title()
|
||||||
|
{
|
||||||
|
if ($this->page == 1) {
|
||||||
|
// TRANS: Header for subscriptions overview for a user (first page).
|
||||||
|
// TRANS: %s is a user nickname.
|
||||||
|
return sprintf(_m('%s\'s tag subscriptions'), $this->user->nickname);
|
||||||
|
} else {
|
||||||
|
// TRANS: Header for subscriptions overview for a user (not first page).
|
||||||
|
// TRANS: %1$s is a user nickname, %2$d is the page number.
|
||||||
|
return sprintf(_m('%1$s\'s tag subscriptions, page %2$d'),
|
||||||
|
$this->user->nickname,
|
||||||
|
$this->page);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function showPageNotice()
|
||||||
|
{
|
||||||
|
$user = common_current_user();
|
||||||
|
if ($user && ($user->id == $this->profile->id)) {
|
||||||
|
$this->element('p', null,
|
||||||
|
// TRANS: Page notice for page with an overview of all tag subscriptions
|
||||||
|
// TRANS: of the logged in user's own profile.
|
||||||
|
_m('You have subscribed to receive all notices on this site containing the following tags:'));
|
||||||
|
} else {
|
||||||
|
$this->element('p', null,
|
||||||
|
// TRANS: Page notice for page with an overview of all subscriptions of a user other
|
||||||
|
// TRANS: than the logged in user. %s is the user nickname.
|
||||||
|
sprintf(_m('%s has subscribed to receive all notices on this site containing the following tags:'),
|
||||||
|
$this->profile->nickname));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function showContent()
|
||||||
|
{
|
||||||
|
if (Event::handle('StartShowTagSubscriptionsContent', array($this))) {
|
||||||
|
parent::showContent();
|
||||||
|
|
||||||
|
$offset = ($this->page-1) * PROFILES_PER_PAGE;
|
||||||
|
$limit = PROFILES_PER_PAGE + 1;
|
||||||
|
|
||||||
|
$cnt = 0;
|
||||||
|
|
||||||
|
$tagsub = new TagSub();
|
||||||
|
$tagsub->profile_id = $this->user->id;
|
||||||
|
$tagsub->limit($limit, $offset);
|
||||||
|
$tagsub->find();
|
||||||
|
|
||||||
|
if ($tagsub->N) {
|
||||||
|
$list = new TagSubscriptionsList($tagsub, $this->user, $this);
|
||||||
|
$cnt = $list->show();
|
||||||
|
if (0 == $cnt) {
|
||||||
|
$this->showEmptyListMessage();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$this->showEmptyListMessage();
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
|
||||||
|
$this->page, 'tagsubs',
|
||||||
|
array('nickname' => $this->user->nickname));
|
||||||
|
|
||||||
|
|
||||||
|
Event::handle('EndShowTagSubscriptionsContent', array($this));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function showEmptyListMessage()
|
||||||
|
{
|
||||||
|
if (common_logged_in()) {
|
||||||
|
$current_user = common_current_user();
|
||||||
|
if ($this->user->id === $current_user->id) {
|
||||||
|
// TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
|
||||||
|
$message = _('You\'re not listening to any hash tags right now. You can push the "Subscribe" button ' .
|
||||||
|
'on any hashtag page to automatically receive any public messages on this site that use that ' .
|
||||||
|
'tag, even if you\'re not subscribed to the poster.');
|
||||||
|
} else {
|
||||||
|
// TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
|
||||||
|
// TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
|
||||||
|
$message = sprintf(_('%s is not listening to any tags.'), $this->user->nickname);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
|
||||||
|
// TRANS: as an anonymous user. %s is the user nickname.
|
||||||
|
$message = sprintf(_m('%s is not listening to any tags.'), $this->user->nickname);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->elementStart('div', 'guide');
|
||||||
|
$this->raw(common_markup_to_html($message));
|
||||||
|
$this->elementEnd('div');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// XXX SubscriptionsList and SubscriptionList are dangerously close
|
||||||
|
|
||||||
|
class TagSubscriptionsList extends SubscriptionList
|
||||||
|
{
|
||||||
|
function newListItem($tagsub)
|
||||||
|
{
|
||||||
|
return new TagSubscriptionsListItem($tagsub, $this->owner, $this->action);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class TagSubscriptionsListItem extends SubscriptionListItem
|
||||||
|
{
|
||||||
|
function startItem()
|
||||||
|
{
|
||||||
|
$this->out->elementStart('li', array('class' => 'tagsub'));
|
||||||
|
}
|
||||||
|
|
||||||
|
function showProfile()
|
||||||
|
{
|
||||||
|
$tagsub = $this->profile;
|
||||||
|
$tag = $tagsub->tag;
|
||||||
|
|
||||||
|
// Relevant portion!
|
||||||
|
$cur = common_current_user();
|
||||||
|
if (!empty($cur) && $cur->id == $this->owner->id) {
|
||||||
|
$this->showOwnerControls();
|
||||||
|
}
|
||||||
|
|
||||||
|
$url = common_local_url('tag', array('tag' => $tag));
|
||||||
|
$linkline = sprintf(_m('#<a href="%s">%s</a> since %s'),
|
||||||
|
htmlspecialchars($url),
|
||||||
|
htmlspecialchars($tag),
|
||||||
|
common_date_string($tagsub->created));
|
||||||
|
|
||||||
|
$this->out->elementStart('div', 'tagsub-item');
|
||||||
|
$this->out->raw($linkline);
|
||||||
|
$this->out->element('div', array('style' => 'clear: both'));
|
||||||
|
$this->out->elementEnd('div');
|
||||||
|
}
|
||||||
|
|
||||||
|
function showActions()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
function showOwnerControls()
|
||||||
|
{
|
||||||
|
$this->out->elementStart('div', 'entity_actions');
|
||||||
|
|
||||||
|
$tagsub = $this->profile; // ?
|
||||||
|
$form = new TagUnsubForm($this->out, $tagsub->tag);
|
||||||
|
$form->show();
|
||||||
|
|
||||||
|
$this->out->elementEnd('div');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -28,6 +28,7 @@ END_OF_FLUSHROUTER_HELP;
|
|||||||
|
|
||||||
require_once INSTALLDIR.'/scripts/commandline.inc';
|
require_once INSTALLDIR.'/scripts/commandline.inc';
|
||||||
|
|
||||||
Cache::delete(Router::cacheKey());
|
$cache = Cache::instance();
|
||||||
|
$cache->delete(Router::cacheKey());
|
||||||
|
|
||||||
print "OK.\n";
|
print "OK.\n";
|
||||||
Loading…
Reference in New Issue
Block a user