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

Render RegiserThrottle extra profile data properly

This commit is contained in:
Mikael Nordfeldth 2016-02-13 01:16:34 +01:00
parent 799c2e47fe
commit 8ef2abf30b
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/RegisterThrottle/RegisterThrottlePlugin.php
View File

@ -160,7 +160,7 @@ class RegisterThrottlePlugin extends Plugin
return true; return true;
} }
$ri = Registration_ip::getKV('user_id', $profile->id); $ri = Registration_ip::getKV('user_id', $target->getID());
$ipaddress = null; $ipaddress = null;
if ($ri instanceof Registration_ip) { if ($ri instanceof Registration_ip) {
$ipaddress = $ri->ipaddress; $ipaddress = $ri->ipaddress;
@ -172,12 +172,17 @@ class RegisterThrottlePlugin extends Plugin
$action->element('h2', null, _('Registration IP')); $action->element('h2', null, _('Registration IP'));
// TRANS: Label for the information about which IP a users registered from.
$action->element('strong', null, _('Registered from:')); $action->element('strong', null, _('Registered from:'));
$action->element('a', $el = 'span';
[ 'class'=>'ipaddress', $attrs = ['class'=>'ipaddress'];
'href'=>common_local_url('ipregistrations', array('ipaddress'=>$ipaddress)), if (!is_null($ipaddress)) {
], $el = 'a';
$ipaddress ?: 'unknown'); $attrs['href'] = common_local_url('ipregistrations', array('ipaddress'=>$ipaddress));
}
$action->element($el, $attrs,
// TRANS: Unknown IP address.
$ipaddress ?: _('unknown'));
$action->elementEnd('div'); $action->elementEnd('div');
} }

2
plugins/RegisterThrottle/actions/ipregistrations.php
View File

@ -15,7 +15,7 @@ class IpregistrationsAction extends ManagedAction
protected function doPreparation() protected function doPreparation()
{ {
if (!$scoped->hasRight(Right::SILENCEUSER) && !$scoped->hasRole(Profile_role::ADMINISTRATOR)) { if (!$this->scoped->hasRight(Right::SILENCEUSER) && !$this->scoped->hasRole(Profile_role::ADMINISTRATOR)) {
throw new AuthorizationException(_('You are not authorized to view this page.')); throw new AuthorizationException(_('You are not authorized to view this page.'));
} }