GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

ProfileAction derivatives somewhat migrated to ManagedAction

This commit is contained in:
Mikael Nordfeldth 2014-05-12 22:41:05 +02:00
parent 2755e23707
commit e086ef3a84
7 changed files with 48 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
actions/all.php
View File

@ -41,11 +41,6 @@ class AllAction extends ProfileAction
{ {
var $notice; var $notice;
function isReadOnly($args)
{
return true;
}
protected function prepare(array $args=array()) protected function prepare(array $args=array())
{ {
parent::prepare($args); parent::prepare($args);
@ -69,18 +64,6 @@ class AllAction extends ProfileAction
return true; return true;
} }
protected function handle()
{
parent::handle();
if (!$this->target instanceof Profile) {
// TRANS: Client error when user not found for an action.
$this->clientError(_('No such user.'));
}
$this->showPage();
}
function title() function title()
{ {
if (!empty($this->scoped) && $this->scoped->id == $this->target->id) { if (!empty($this->scoped) && $this->scoped->id == $this->target->id) {

11
actions/showstream.php
View File

@ -72,10 +72,6 @@ class ShowstreamAction extends ProfileAction
return true; return true;
} }
function isReadOnly($args)
{
return true;
}
function title() function title()
{ {
@ -103,13 +99,6 @@ class ShowstreamAction extends ProfileAction
} }
} }
protected function handle()
{
parent::handle();
$this->showPage();
}
function showContent() function showContent()
{ {
$this->showNotices(); $this->showNotices();

23
actions/subqueue.php
View File

@ -44,20 +44,13 @@ require_once(INSTALLDIR.'/lib/profilelist.php');
*/ */
class SubqueueAction extends GalleryAction class SubqueueAction extends GalleryAction
{ {
var $page = null; protected $needLogin = true;
function isReadOnly($args) protected function prepare(array $args=array())
{
return true;
}
// @todo FIXME: most of this belongs in a base class, sounds common to most group actions?
function prepare($args)
{ {
parent::prepare($args); parent::prepare($args);
$cur = common_current_user(); if ($this->scoped->id != $this->target->id) {
if (!$cur || $cur->id != $this->profile->id) {
// TRANS: Client error displayed when trying to approve group applicants without being a group administrator. // TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
$this->clientError(_('You may only approve your own pending subscriptions.')); $this->clientError(_('You may only approve your own pending subscriptions.'));
} }
@ -70,12 +63,12 @@ class SubqueueAction extends GalleryAction
// TRANS: Title of the first page showing pending subscribers still awaiting approval. // TRANS: Title of the first page showing pending subscribers still awaiting approval.
// TRANS: %s is the name of the user. // TRANS: %s is the name of the user.
return sprintf(_('%s subscribers awaiting approval'), return sprintf(_('%s subscribers awaiting approval'),
$this->profile->nickname); $this->target->getNickname());
} else { } else {
// TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval. // TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
// TRANS: %1$s is the name of the user, %2$d is the page number of the members list. // TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
return sprintf(_('%1$s subscribers awaiting approval, page %2$d'), return sprintf(_('%1$s subscribers awaiting approval, page %2$d'),
$this->profile->nickname, $this->target->getNickname(),
$this->page); $this->page);
} }
} }
@ -95,7 +88,7 @@ class SubqueueAction extends GalleryAction
$cnt = 0; $cnt = 0;
$members = $this->profile->getRequests($offset, $limit); $members = $this->target->getRequests($offset, $limit);
if ($members) { if ($members) {
// @fixme change! // @fixme change!
@ -107,7 +100,7 @@ class SubqueueAction extends GalleryAction
$this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE, $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
$this->page, 'subqueue', $this->page, 'subqueue',
array('nickname' => $this->profile->nickname)); // urgh array('nickname' => $this->target->getNickname())); // urgh
} }
} }
@ -134,7 +127,7 @@ class SubQueueListItem extends ProfileListItem
function showApproveButtons() function showApproveButtons()
{ {
$this->out->elementStart('li', 'entity_approval'); $this->out->elementStart('li', 'entity_approval');
$form = new ApproveSubForm($this->out, $this->profile); $form = new ApproveSubForm($this->out, $this->target);
$form->show(); $form->show();
$this->out->elementEnd('li'); $this->out->elementEnd('li');
} }

52
actions/usergroups.php
View File

@ -45,16 +45,8 @@ require_once INSTALLDIR.'/lib/grouplist.php';
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class UsergroupsAction extends ProfileAction class UsergroupsAction extends GalleryAction
{ {
var $page = null;
var $profile = null;
function isReadOnly($args)
{
return true;
}
function title() function title()
{ {
if ($this->page == 1) { if ($this->page == 1) {
@ -70,48 +62,6 @@ class UsergroupsAction extends ProfileAction
} }
} }
function prepare($args)
{
parent::prepare($args);
$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);
if ($this->arg('page') && $this->arg('page') != 1) {
$args['page'] = $this->arg['page'];
}
common_redirect(common_local_url('usergroups', $args), 301);
}
$this->user = User::getKV('nickname', $nickname);
if (!$this->user) {
// TRANS: Client error displayed requesting groups for a non-existing user.
$this->clientError(_('No such user.'), 404);
}
$this->profile = $this->user->getProfile();
if (!$this->profile) {
// TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_('User has no profile.'));
}
$this->page = $this->trimmed('page', 1);
return true;
}
function handle($args)
{
parent::handle($args);
$this->showPage();
}
function showContent() function showContent()
{ {
$this->elementStart('p', array('id' => 'new_group')); $this->elementStart('p', array('id' => 'new_group'));

1
lib/action.php
View File

@ -166,6 +166,7 @@ class Action extends HTMLOutputter // lawsuit
return $this->scoped; return $this->scoped;
} }
// Must be run _after_ prepare
public function getActionName() public function getActionName()
{ {
return $this->action; return $this->action;

75
lib/galleryaction.php
View File

@ -30,67 +30,14 @@ define('AVATARS_PER_PAGE', 80);
// @todo FIXME: Class documentation missing. // @todo FIXME: Class documentation missing.
class GalleryAction extends ProfileAction class GalleryAction extends ProfileAction
{ {
var $profile = null; protected function handle()
var $page = null;
var $tag = null;
function prepare($args)
{ {
parent::prepare($args); // Post from the tag dropdown; redirect to a GET
if ($this->isPost()) {
// FIXME very similar code below common_redirect($this->selfUrl(), 303);
$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);
if ($this->arg('page') && $this->arg('page') != 1) {
$args['page'] = $this->arg['page'];
}
common_redirect(common_local_url($this->trimmed('action'), $args), 301);
} }
$this->user = User::getKV('nickname', $nickname); parent::handle();
if (!$this->user) {
// TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
$this->clientError(_('No such user.'), 404);
}
$this->profile = $this->user->getProfile();
if (!$this->profile) {
// TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_('User has no profile.'));
}
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
$this->tag = $this->trimmed('tag');
$this->q = $this->trimmed('q');
return true;
}
function isReadOnly($args)
{
return true;
}
function handle($args)
{
parent::handle($args);
// Post from the tag dropdown; redirect to a GET
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
common_redirect($this->selfUrl(), 303);
}
$this->showPage();
} }
function showContent() function showContent()
@ -120,14 +67,14 @@ class GalleryAction extends ProfileAction
array('href' => array('href' =>
common_local_url($this->trimmed('action'), common_local_url($this->trimmed('action'),
array('nickname' => array('nickname' =>
$this->user->nickname))), $this->target->getNickname()))),
// TRANS: List element on gallery action page to show all tags. // TRANS: List element on gallery action page to show all tags.
_m('TAGS','All')); _m('TAGS','All'));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementStart('li', array('id'=>'filter_tags_item')); $this->elementStart('li', array('id'=>'filter_tags_item'));
$this->elementStart('form', array('name' => 'bytag', $this->elementStart('form', array('name' => 'bytag',
'id' => 'form_filter_bytag', 'id' => 'form_filter_bytag',
'action' => common_path('?action=' . $this->trimmed('action')), 'action' => common_path('?action=' . $this->getActionName()),
'method' => 'post')); 'method' => 'post'));
$this->elementStart('fieldset'); $this->elementStart('fieldset');
// TRANS: Fieldset legend on gallery action page. // TRANS: Fieldset legend on gallery action page.
@ -136,7 +83,7 @@ class GalleryAction extends ProfileAction
$this->dropdown('tag', _('Tag'), $content, $this->dropdown('tag', _('Tag'), $content,
// TRANS: Dropdown field title on gallery action page for a list containing tags. // TRANS: Dropdown field title on gallery action page for a list containing tags.
_('Choose a tag to narrow list.'), false, $tag); _('Choose a tag to narrow list.'), false, $tag);
$this->hidden('nickname', $this->user->nickname); $this->hidden('nickname', $this->target->getNickname());
// TRANS: Submit button text on gallery action page. // TRANS: Submit button text on gallery action page.
$this->submit('submit', _m('BUTTON','Go')); $this->submit('submit', _m('BUTTON','Go'));
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
@ -154,8 +101,8 @@ class GalleryAction extends ProfileAction
$profile_tag = new Notice_tag(); $profile_tag = new Notice_tag();
$profile_tag->query('SELECT DISTINCT(tag) ' . $profile_tag->query('SELECT DISTINCT(tag) ' .
'FROM profile_tag, subscription ' . 'FROM profile_tag, subscription ' .
'WHERE tagger = ' . $this->profile->id . ' ' . 'WHERE tagger = ' . $this->target->id . ' ' .
'AND ' . $usr . ' = ' . $this->profile->id . ' ' . 'AND ' . $usr . ' = ' . $this->target->id . ' ' .
'AND ' . $lst . ' = tagged ' . 'AND ' . $lst . ' = tagged ' .
'AND tagger != tagged'); 'AND tagger != tagged');
$tags = array(); $tags = array();
@ -173,7 +120,7 @@ class GalleryAction extends ProfileAction
function showProfileBlock() function showProfileBlock()
{ {
$block = new AccountProfileBlock($this, $this->profile); $block = new AccountProfileBlock($this, $this->target);
$block->show(); $block->show();
} }
} }

50
lib/profileaction.php
View File

@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/groupminilist.php';
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class ProfileAction extends Action class ProfileAction extends ManagedAction
{ {
var $page = null; var $page = null;
var $tag = null; var $tag = null;
@ -68,7 +68,7 @@ class ProfileAction extends Action
if ($this->arg('page') && $this->arg('page') != 1) { if ($this->arg('page') && $this->arg('page') != 1) {
$args['page'] = $this->arg['page']; $args['page'] = $this->arg['page'];
} }
common_redirect(common_local_url($this->trimmed('action'), $args), 301); common_redirect(common_local_url($this->getActionName(), $args), 301);
} }
$this->user = User::getKV('nickname', $nickname); $this->user = User::getKV('nickname', $nickname);
@ -82,15 +82,16 @@ class ProfileAction extends Action
$id = (int)$this->arg('id'); $id = (int)$this->arg('id');
$this->target = Profile::getKV('id', $id); $this->target = Profile::getKV('id', $id);
if (!($this->target instanceof Profile)) { if (!$this->target instanceof Profile) {
// TRANS: Error message displayed when referring to a user without a profile. // TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_m('Profile ID does not exist.')); $this->serverError(_m('Profile ID does not exist.'));
} }
$user = User::getKV('id', $this->target->id); if ($this->target->isLocal()) {
if ($user instanceof User) { // For local users when accessed by id number, redirect to
// This is a local user -- send to their regular profile. // the same action but using the nickname as argument.
common_redirect(common_local_url('showstream', array('nickname' => $user->nickname))); common_redirect(common_local_url($this->getActionName(),
array('nickname'=>$user->getNickname())));
} }
} }
@ -108,6 +109,11 @@ class ProfileAction extends Action
return true; return true;
} }
function isReadOnly($args)
{
return true;
}
function showSections() function showSections()
{ {
$this->showSubscriptions(); $this->showSubscriptions();
@ -127,7 +133,7 @@ class ProfileAction extends Action
private function statsSectionLink($actionClass, $title, $cssClass='') private function statsSectionLink($actionClass, $title, $cssClass='')
{ {
$this->element('a', array('href' => common_local_url($actionClass, $this->element('a', array('href' => common_local_url($actionClass,
array('nickname' => $this->profile->nickname)), array('nickname' => $this->target->getNickname())),
'class' => $cssClass), 'class' => $cssClass),
$title); $title);
} }
@ -141,11 +147,11 @@ class ProfileAction extends Action
// TRANS: H2 text for user subscription statistics. // TRANS: H2 text for user subscription statistics.
$this->statsSectionLink('subscriptions', _('Following')); $this->statsSectionLink('subscriptions', _('Following'));
$this->text(' '); $this->text(' ');
$this->text($this->profile->subscriptionCount()); $this->text($this->target->subscriptionCount());
$this->elementEnd('h2'); $this->elementEnd('h2');
try { try {
$profile = $this->profile->getSubscribed(0, PROFILES_PER_MINILIST + 1); $profile = $this->target->getSubscribed(0, PROFILES_PER_MINILIST + 1);
$pml = new ProfileMiniList($profile, $this); $pml = new ProfileMiniList($profile, $this);
$pml->show(); $pml->show();
} catch (NoResultException $e) { } catch (NoResultException $e) {
@ -169,11 +175,11 @@ class ProfileAction extends Action
// TRANS: H2 text for user subscriber statistics. // TRANS: H2 text for user subscriber statistics.
$this->statsSectionLink('subscribers', _('Followers')); $this->statsSectionLink('subscribers', _('Followers'));
$this->text(' '); $this->text(' ');
$this->text($this->profile->subscriberCount()); $this->text($this->target->subscriberCount());
$this->elementEnd('h2'); $this->elementEnd('h2');
try { try {
$profile = $this->profile->getSubscribers(0, PROFILES_PER_MINILIST + 1); $profile = $this->target->getSubscribers(0, PROFILES_PER_MINILIST + 1);
$sml = new SubscribersMiniList($profile, $this); $sml = new SubscribersMiniList($profile, $this);
$sml->show(); $sml->show();
} catch (NoResultException $e) { } catch (NoResultException $e) {
@ -189,8 +195,8 @@ class ProfileAction extends Action
function showStatistics() function showStatistics()
{ {
$notice_count = $this->profile->noticeCount(); $notice_count = $this->target->noticeCount();
$age_days = (time() - strtotime($this->profile->created)) / 86400; $age_days = (time() - strtotime($this->target->created)) / 86400;
if ($age_days < 1) { if ($age_days < 1) {
// Rather than extrapolating out to a bajillion... // Rather than extrapolating out to a bajillion...
$age_days = 1; $age_days = 1;
@ -203,7 +209,7 @@ class ProfileAction extends Action
// TRANS: H2 text for user statistics. // TRANS: H2 text for user statistics.
$this->element('h2', null, _('Statistics')); $this->element('h2', null, _('Statistics'));
$profile = $this->profile; $profile = $this->target;
$actionParams = array('nickname' => $profile->nickname); $actionParams = array('nickname' => $profile->nickname);
$stats = array( $stats = array(
array( array(
@ -258,7 +264,7 @@ class ProfileAction extends Action
function showGroups() function showGroups()
{ {
$groups = $this->profile->getGroups(0, GROUPS_PER_MINILIST + 1); $groups = $this->target->getGroups(0, GROUPS_PER_MINILIST + 1);
$this->elementStart('div', array('id' => 'entity_groups', $this->elementStart('div', array('id' => 'entity_groups',
'class' => 'section')); 'class' => 'section'));
@ -267,11 +273,11 @@ class ProfileAction extends Action
// TRANS: H2 text for user group membership statistics. // TRANS: H2 text for user group membership statistics.
$this->statsSectionLink('usergroups', _('Groups')); $this->statsSectionLink('usergroups', _('Groups'));
$this->text(' '); $this->text(' ');
$this->text($this->profile->getGroupCount()); $this->text($this->target->getGroupCount());
$this->elementEnd('h2'); $this->elementEnd('h2');
if ($groups instanceof User_group) { if ($groups instanceof User_group) {
$gml = new GroupMiniList($groups, $this->profile, $this); $gml = new GroupMiniList($groups, $this->target, $this);
$cnt = $gml->show(); $cnt = $gml->show();
} else { } else {
// TRANS: Text for user user group membership statistics if user is not a member of any group. // TRANS: Text for user user group membership statistics if user is not a member of any group.
@ -285,9 +291,7 @@ class ProfileAction extends Action
function showLists() function showLists()
{ {
$cur = common_current_user(); $lists = $this->target->getLists($this->scoped);
$lists = $this->profile->getLists($cur);
if ($lists->N > 0) { if ($lists->N > 0) {
$this->elementStart('div', array('id' => 'entity_lists', $this->elementStart('div', array('id' => 'entity_lists',
@ -296,7 +300,7 @@ class ProfileAction extends Action
if (Event::handle('StartShowListsMiniList', array($this))) { if (Event::handle('StartShowListsMiniList', array($this))) {
$url = common_local_url('peopletagsbyuser', $url = common_local_url('peopletagsbyuser',
array('nickname' => $this->profile->nickname)); array('nickname' => $this->target->getNickname()));
$this->elementStart('h2'); $this->elementStart('h2');
$this->element('a', $this->element('a',
@ -317,7 +321,7 @@ class ProfileAction extends Action
$url = $lists->mainpage; $url = $lists->mainpage;
} else { } else {
$url = common_local_url('showprofiletag', $url = common_local_url('showprofiletag',
array('tagger' => $this->profile->nickname, array('tagger' => $this->target->getNickname(),
'tag' => $lists->tag)); 'tag' => $lists->tag));
} }
if (!$first) { if (!$first) {