diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/block.php | 7 | ||||
| -rw-r--r-- | actions/groupblock.php | 7 | ||||
| -rw-r--r-- | actions/groupmembers.php | 18 | ||||
| -rw-r--r-- | actions/peopletag.php | 36 | ||||
| -rw-r--r-- | actions/showgroup.php | 48 | ||||
| -rw-r--r-- | actions/subscribers.php | 18 |
6 files changed, 120 insertions, 14 deletions
diff --git a/actions/block.php b/actions/block.php index 5fae45dff..fe4ec0088 100644 --- a/actions/block.php +++ b/actions/block.php @@ -168,4 +168,11 @@ class BlockAction extends ProfileFormAction return; } } + + function showScripts() + { + parent::showScripts(); + $this->autofocus('form_action-yes'); + } + } diff --git a/actions/groupblock.php b/actions/groupblock.php index ec673358e..88d7634a2 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -214,5 +214,12 @@ class GroupblockAction extends Action 303); } } + + function showScripts() + { + parent::showScripts(); + $this->autofocus('form_action-yes'); + } + } diff --git a/actions/groupmembers.php b/actions/groupmembers.php index a16debd7b..fb4e46dbc 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -212,6 +212,7 @@ class GroupMemberListItem extends ProfileListItem } } + function showGroupBlockForm() { $user = common_current_user(); @@ -224,7 +225,24 @@ class GroupMemberListItem extends ProfileListItem $bf->show(); $this->out->elementEnd('li'); } + } + + function linkAttributes() + { + $aAttrs = parent::linkAttributes(); + + if (common_config('nofollow', 'members')) { + $aAttrs['rel'] .= ' nofollow'; + } + + return $aAttrs; + } + function homepageAttributes() + { + if (common_config('nofollow', 'members')) { + $aAttrs['rel'] = 'nofollow'; + } } } diff --git a/actions/peopletag.php b/actions/peopletag.php index 4ba1dc0f1..456cc21c4 100644 --- a/actions/peopletag.php +++ b/actions/peopletag.php @@ -32,8 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/profilelist.php'; - /** * This class outputs a paginated list of profiles self-tagged with a given tag * @@ -124,8 +122,8 @@ class PeopletagAction extends Action $profile->query(sprintf($qry, $this->tag, $lim)); - $pl = new ProfileList($profile, $this); - $cnt = $pl->show(); + $ptl = new PeopleTagList($profile, $this); // pass the ammunition + $cnt = $ptl->show(); $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE, @@ -146,3 +144,33 @@ class PeopletagAction extends Action } } + +class PeopleTagList extends ProfileList +{ + function newListItem($profile) + { + return new PeopleTagListItem($profile, $this->action); + } +} + +class PeopleTagListItem extends ProfileListItem +{ + function linkAttributes() + { + $aAttrs = parent::linkAttributes(); + + if (common_config('nofollow', 'peopletag')) { + $aAttrs['rel'] .= ' nofollow'; + } + + return $aAttrs; + } + + function homepageAttributes() + { + if (common_config('nofollow', 'peopletag')) { + $aAttrs['rel'] = 'nofollow'; + } + } +} + diff --git a/actions/showgroup.php b/actions/showgroup.php index a0d05ba37..3d369e9eb 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -388,18 +388,23 @@ class ShowgroupAction extends GroupDesignAction $this->elementStart('div', array('id' => 'entity_members', 'class' => 'section')); - $this->element('h2', null, _('Members')); + if (Event::handle('StartShowGroupMembersMiniList', array($this))) { - $pml = new ProfileMiniList($member, $this); - $cnt = $pml->show(); - if ($cnt == 0) { - $this->element('p', null, _('(None)')); - } + $this->element('h2', null, _('Members')); + + $gmml = new GroupMembersMiniList($member, $this); + $cnt = $gmml->show(); + if ($cnt == 0) { + $this->element('p', null, _('(None)')); + } + + if ($cnt > MEMBERS_PER_SECTION) { + $this->element('a', array('href' => common_local_url('groupmembers', + array('nickname' => $this->group->nickname))), + _('All members')); + } - if ($cnt > MEMBERS_PER_SECTION) { - $this->element('a', array('href' => common_local_url('groupmembers', - array('nickname' => $this->group->nickname))), - _('All members')); + Event::handle('EndShowGroupMembersMiniList', array($this)); } $this->elementEnd('div'); @@ -502,3 +507,26 @@ class GroupAdminSection extends ProfileSection return null; } } + +class GroupMembersMiniList extends ProfileMiniList +{ + function newListItem($profile) + { + return new GroupMembersMiniListItem($profile, $this->action); + } +} + +class GroupMembersMiniListItem extends ProfileMiniListItem +{ + function linkAttributes() + { + $aAttrs = parent::linkAttributes(); + + if (common_config('nofollow', 'members')) { + $aAttrs['rel'] .= ' nofollow'; + } + + return $aAttrs; + } +} + diff --git a/actions/subscribers.php b/actions/subscribers.php index 4bced6284..6dda7312d 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -163,4 +163,22 @@ class SubscribersListItem extends SubscriptionListItem $bf->show(); } } + + function linkAttributes() + { + $aAttrs = parent::linkAttributes(); + + if (common_config('nofollow', 'subscribers')) { + $aAttrs['rel'] .= ' nofollow'; + } + + return $aAttrs; + } + + function homepageAttributes() + { + if (common_config('nofollow', 'subscribers')) { + $aAttrs['rel'] = 'nofollow'; + } + } } |