0ct0pu5/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

+ canViewIP for User model

Browse source
This commit is contained in:
Visman 2018-09-05 14:48:40 +07:00
parent f9bc7cd9f7
commit 321ea884eb
5 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Controllers/Routing.php
View file

@ -126,6 +126,11 @@ class Routing
$r->add(['GET', 'POST'], '/admin/users', 'AdminUsers:view', 'AdminUsers');
$r->add(['GET', 'POST'], '/admin/users/result/{data}[/{page:[1-9]\d*}]', 'AdminUsersResult:view', 'AdminUsersResult');
if ($user->canViewIP) {
$r->add('GET', '/admin/get/host/{ip:[0-9a-fA-F:.]+}', 'AdminHost:view', 'AdminHost');
$r->add('GET', '/admin/users/user/{id:[2-9]|[1-9]\d+}[/{page:[1-9]\d*}]', 'AdminUsersStat:view', 'AdminUserStat');
}
}
// только админ
if ($user->isAdmin) {
@ -148,8 +153,6 @@ class Routing
$r->add('POST', '/admin/maintenance/rebuild', 'AdminMaintenance:rebuild', 'AdminMaintenanceRebuild');
$r->add('GET', '/admin/maintenance/rebuild/{token}/{clear:[01]}/{limit:[1-9]\d*}/{start:[1-9]\d*}', 'AdminMaintenance:rebuild', 'AdminRebuildIndex' );
$r->add('GET', '/admin/get/host/{ip:[0-9a-fA-F:.]+}', 'AdminHost:view', 'AdminHost');
$r->add('GET', '/admin/users/user/{id:[2-9]|[1-9]\d+}[/{page:[1-9]\d*}]', 'AdminUsersStat:view', 'AdminUserStat');
}
$uri = $_SERVER['REQUEST_URI'];

2
app/Models/Pages/Admin/Users/Result.php
View file

@ -23,7 +23,7 @@ class Result extends Users
}
if (isset($data['ip'])) {
if (! $this->user->isAdmin) {
if (! $this->user->canViewIP) {
return $this->c->Message->message('Bad request');
}

2
app/Models/Pages/Admin/Users/View.php
View file

@ -120,7 +120,7 @@ class View extends Users
$this->aIndex = 'users';
$this->formSearch = $this->form($data);
if ($this->user->isAdmin) {
if ($this->user->canViewIP) {
$this->formIP = $this->formIP($data);
}

2
app/Models/Rules/Profile.php
View file

@ -85,7 +85,7 @@ class Profile extends Rules
protected function getviewIP()
{
return $this->user->isAdmin;
return $this->user->canViewIP;
}
protected function getuseAvatar()

10
app/Models/User/Model.php
View file

@ -309,4 +309,14 @@ class Model extends DataModel
{
return (int) (empty($this->a['disp_posts']) ? $this->c->config->o_disp_posts_default : $this->a['disp_posts']);
}
/**
* Статус показа ip пользователей
*
* @return bool
*/
protected function getcanViewIP()
{
return $this->isAdmin;
}
}