clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12143 from MrPetovan/bug/moderation 

Replace remaining occurrences of admin/users route by moderation/users
This commit is contained in:
Tobias Diekershoff 2022-11-08 11:09:36 +01:00 committed by GitHub
parent 939a80ceb0 0a20566199
commit 0c92610f6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Module/Moderation/Users/Create.php
View File

@ -32,7 +32,7 @@ class Create extends BaseUsers
{ {
$this->checkModerationAccess(); $this->checkModerationAccess();
self::checkFormSecurityTokenRedirectOnError('/admin/users/create', 'admin_users_create'); self::checkFormSecurityTokenRedirectOnError('moderation/users/create', 'admin_users_create');
$nu_name = $request['new_user_name'] ?? ''; $nu_name = $request['new_user_name'] ?? '';
$nu_nickname = $request['new_user_nickname'] ?? ''; $nu_nickname = $request['new_user_nickname'] ?? '';
@ -42,20 +42,20 @@ class Create extends BaseUsers
if ($nu_name !== '' && $nu_email !== '' && $nu_nickname !== '') { if ($nu_name !== '' && $nu_email !== '' && $nu_nickname !== '') {
try { try {
User::createMinimal($nu_name, $nu_email, $nu_nickname, $nu_language); User::createMinimal($nu_name, $nu_email, $nu_nickname, $nu_language);
$this->baseUrl->redirect('admin/users'); $this->baseUrl->redirect('moderation/users');
} catch (\Exception $ex) { } catch (\Exception $ex) {
$this->systemMessages->addNotice($ex->getMessage()); $this->systemMessages->addNotice($ex->getMessage());
} }
} }
$this->baseUrl->redirect('admin/users/create'); $this->baseUrl->redirect('moderation/users/create');
} }
protected function content(array $request = []): string protected function content(array $request = []): string
{ {
parent::content(); parent::content();
$t = Renderer::getMarkupTemplate('admin/users/create.tpl'); $t = Renderer::getMarkupTemplate('moderation/users/create.tpl');
return self::getTabsHTML('all') . Renderer::replaceMacros($t, [ return self::getTabsHTML('all') . Renderer::replaceMacros($t, [
// strings // // strings //
'$title' => $this->t('Administration'), '$title' => $this->t('Administration'),

16
src/Module/Moderation/Users/Pending.php
View File

@ -33,7 +33,7 @@ class Pending extends BaseUsers
{ {
$this->checkModerationAccess(); $this->checkModerationAccess();
self::checkFormSecurityTokenRedirectOnError('/admin/users/pending', 'admin_users_pending'); self::checkFormSecurityTokenRedirectOnError('moderation/users/pending', 'admin_users_pending');
$pending = $request['pending'] ?? []; $pending = $request['pending'] ?? [];
@ -51,7 +51,7 @@ class Pending extends BaseUsers
$this->systemMessages->addInfo($this->tt('%s registration revoked', '%s registrations revoked', count($pending))); $this->systemMessages->addInfo($this->tt('%s registration revoked', '%s registrations revoked', count($pending)));
} }
$this->baseUrl->redirect('admin/users/pending'); $this->baseUrl->redirect('moderation/users/pending');
} }
protected function content(array $request = []): string protected function content(array $request = []): string
@ -65,22 +65,22 @@ class Pending extends BaseUsers
$user = User::getById($uid, ['username', 'blocked']); $user = User::getById($uid, ['username', 'blocked']);
if (!$user) { if (!$user) {
$this->systemMessages->addNotice($this->t('User not found')); $this->systemMessages->addNotice($this->t('User not found'));
$this->baseUrl->redirect('admin/users'); $this->baseUrl->redirect('moderation/users');
} }
} }
switch ($action) { switch ($action) {
case 'allow': case 'allow':
self::checkFormSecurityTokenRedirectOnError('/admin/users/pending', 'admin_users_pending', 't'); self::checkFormSecurityTokenRedirectOnError('moderation/users/pending', 'admin_users_pending', 't');
User::allow(Register::getPendingForUser($uid)['hash'] ?? ''); User::allow(Register::getPendingForUser($uid)['hash'] ?? '');
$this->systemMessages->addNotice($this->t('Account approved.')); $this->systemMessages->addNotice($this->t('Account approved.'));
$this->baseUrl->redirect('admin/users/pending'); $this->baseUrl->redirect('moderation/users/pending');
break; break;
case 'deny': case 'deny':
self::checkFormSecurityTokenRedirectOnError('/admin/users/pending', 'admin_users_pending', 't'); self::checkFormSecurityTokenRedirectOnError('moderation/users/pending', 'admin_users_pending', 't');
User::deny(Register::getPendingForUser($uid)['hash'] ?? ''); User::deny(Register::getPendingForUser($uid)['hash'] ?? '');
$this->systemMessages->addNotice($this->t('Registration revoked')); $this->systemMessages->addNotice($this->t('Registration revoked'));
$this->baseUrl->redirect('admin/users/pending'); $this->baseUrl->redirect('moderation/users/pending');
break; break;
} }
@ -90,7 +90,7 @@ class Pending extends BaseUsers
$count = Register::getPendingCount(); $count = Register::getPendingCount();
$t = Renderer::getMarkupTemplate('admin/users/pending.tpl'); $t = Renderer::getMarkupTemplate('moderation/users/pending.tpl');
return self::getTabsHTML('pending') . Renderer::replaceMacros($t, [ return self::getTabsHTML('pending') . Renderer::replaceMacros($t, [
// strings // // strings //
'$title' => $this->t('Administration'), '$title' => $this->t('Administration'),

4
src/Module/Notifications/Ping.php
View File

@ -241,7 +241,7 @@ class Ping extends BaseModule
], ],
$this->l10n->t('{0} requested registration'), $this->l10n->t('{0} requested registration'),
new \DateTime($reg['created'], new \DateTimeZone('UTC')), new \DateTime($reg['created'], new \DateTimeZone('UTC')),
new Uri($this->baseUrl->get(true) . '/admin/users/pending') new Uri($this->baseUrl->get(true) . '/moderation/users/pending')
); );
} }
} elseif (count($registrations) > 1) { } elseif (count($registrations) > 1) {
@ -252,7 +252,7 @@ class Ping extends BaseModule
], ],
$this->l10n->t('{0} and %d others requested registration', count($registrations) - 1), $this->l10n->t('{0} and %d others requested registration', count($registrations) - 1),
new \DateTime($registrations[0]['created'], new \DateTimeZone('UTC')), new \DateTime($registrations[0]['created'], new \DateTimeZone('UTC')),
new Uri($this->baseUrl->get(true) . '/admin/users/pending') new Uri($this->baseUrl->get(true) . '/moderation/users/pending')
); );
} }

4
src/Module/Register.php
View File

@ -406,11 +406,11 @@ class Register extends BaseModule
'type' => Model\Notification\Type::SYSTEM, 'type' => Model\Notification\Type::SYSTEM,
'event' => $event, 'event' => $event,
'uid' => $admin['uid'], 'uid' => $admin['uid'],
'link' => DI::baseUrl()->get(true) . '/admin/users/', 'link' => DI::baseUrl()->get(true) . '/moderation/users/',
'source_name' => $user['username'], 'source_name' => $user['username'],
'source_mail' => $user['email'], 'source_mail' => $user['email'],
'source_nick' => $user['nickname'], 'source_nick' => $user['nickname'],
'source_link' => DI::baseUrl()->get(true) . '/admin/users/', 'source_link' => DI::baseUrl()->get(true) . '/moderation/users/',
'source_photo' => User::getAvatarUrl($user, Proxy::SIZE_THUMB), 'source_photo' => User::getAvatarUrl($user, Proxy::SIZE_THUMB),
'show_in_notification_page' => false 'show_in_notification_page' => false
]); ]);

8
view/templates/moderation/users/active.tpl
View File

@ -23,7 +23,7 @@
<th></th> <th></th>
{{foreach $th_users as $th}} {{foreach $th_users as $th}}
<th> <th>
<a href="{{$baseurl}}/admin/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}"> <a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
{{if $order_users == $th.1}} {{if $order_users == $th.1}}
{{if $order_direction_users == "+"}} {{if $order_direction_users == "+"}}
&#8595; &#8595;
@ -61,10 +61,10 @@
<td class="tools"> <td class="tools">
{{if $u.is_deletable}} {{if $u.is_deletable}}
<a href="{{$baseurl}}/admin/users/active/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}"> <a href="{{$baseurl}}/moderation/users/active/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}">
<span class="icon block {{if $u.blocked==0}}dim{{/if}}"></span> <span class="icon block {{if $u.blocked==0}}dim{{/if}}"></span>
</a> </a>
<a href="{{$baseurl}}/admin/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')"> <a href="{{$baseurl}}/moderation/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')">
<span class="icon drop"></span> <span class="icon drop"></span>
</a> </a>
{{else}} {{else}}
@ -83,6 +83,6 @@
</form> </form>
{{$pager nofilter}} {{$pager nofilter}}
<p> <p>
<a href="{{$base_url}}/admin/users/create">{{$h_newuser}}</a> <a href="{{$base_url}}/moderation/users/create">{{$h_newuser}}</a>
</p> </p>
</div> </div>

6
view/templates/moderation/users/blocked.tpl
View File

@ -24,7 +24,7 @@
<th></th> <th></th>
{{foreach $th_users as $th}} {{foreach $th_users as $th}}
<th> <th>
<a href="{{$baseurl}}/admin/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}"> <a href="{{$baseurl}}/moderation/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
{{if $order_users == $th.1}} {{if $order_users == $th.1}}
{{if $order_direction_users == "+"}} {{if $order_direction_users == "+"}}
&#8595; &#8595;
@ -62,10 +62,10 @@
<td class="tools"> <td class="tools">
{{if $u.is_deletable}} {{if $u.is_deletable}}
<a href="{{$baseurl}}/admin/users/blocked/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}"> <a href="{{$baseurl}}/moderation/users/blocked/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}">
<span class="icon block {{if $u.blocked==0}}dim{{/if}}"></span> <span class="icon block {{if $u.blocked==0}}dim{{/if}}"></span>
</a> </a>
<a href="{{$baseurl}}/admin/users/blocked/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')"> <a href="{{$baseurl}}/moderation/users/blocked/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')">
<span class="icon drop"></span> <span class="icon drop"></span>
</a> </a>
{{else}} {{else}}

8
view/templates/moderation/users/index.tpl
View File

@ -23,7 +23,7 @@
<th></th> <th></th>
{{foreach $th_users as $th}} {{foreach $th_users as $th}}
<th> <th>
<a href="{{$baseurl}}/admin/users?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}"> <a href="{{$baseurl}}/moderation/users?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
{{if $order_users == $th.1}} {{if $order_users == $th.1}}
{{if $order_direction_users == "+"}} {{if $order_direction_users == "+"}}
&#8595; &#8595;
@ -61,10 +61,10 @@
<td class="tools"> <td class="tools">
{{if $u.is_deletable}} {{if $u.is_deletable}}
<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}"> <a href="{{$baseurl}}/moderation/users/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}">
<span class="icon block {{if $u.blocked==0}}dim{{/if}}"></span> <span class="icon block {{if $u.blocked==0}}dim{{/if}}"></span>
</a> </a>
<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')"> <a href="{{$baseurl}}/moderation/users/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')">
<span class="icon drop"></span> <span class="icon drop"></span>
</a> </a>
{{else}} {{else}}
@ -84,6 +84,6 @@
</form> </form>
{{$pager nofilter}} {{$pager nofilter}}
<p> <p>
<a href="{{$base_url}}/admin/users/create">{{$h_newuser}}</a> <a href="{{$base_url}}/moderation/users/create">{{$h_newuser}}</a>
</p> </p>
</div> </div>

4
view/templates/moderation/users/pending.tpl
View File

@ -38,10 +38,10 @@
<input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"/> <input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"/>
</td> </td>
<td class="tools"> <td class="tools">
<a href="{{$baseurl}}/admin/users/pending/allow/{{$u.uid}}?t={{$form_security_token}}" title="{{$approve}}"> <a href="{{$baseurl}}/moderation/users/pending/allow/{{$u.uid}}?t={{$form_security_token}}" title="{{$approve}}">
<span class="icon like"></span> <span class="icon like"></span>
</a> </a>
<a href="{{$baseurl}}/admin/users/pending/deny/{{$u.uid}}?t={{$form_security_token}}" title="{{$deny}}"> <a href="{{$baseurl}}/moderation/users/pending/deny/{{$u.uid}}?t={{$form_security_token}}" title="{{$deny}}">
<span class="icon dislike"></span> <span class="icon dislike"></span>
</a> </a>
</td> </td>

16
view/theme/frio/templates/moderation/users/active.tpl
View File

@ -4,7 +4,7 @@
<div id="admin-users" class="adminpage generic-page-wrapper"> <div id="admin-users" class="adminpage generic-page-wrapper">
<h1>{{$title}} - {{$page}} ({{$count}})</h1> <h1>{{$title}} - {{$page}} ({{$count}})</h1>
<p> <p>
<a href="{{$base_url}}/admin/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a> <a href="{{$base_url}}/moderation/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a>
</p> </p>
<form action="{{$baseurl}}/{{$query_string}}" method="post"> <form action="{{$baseurl}}/{{$query_string}}" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
@ -21,7 +21,7 @@
{{foreach $th_users as $k=>$th}} {{foreach $th_users as $k=>$th}}
{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }} {{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
<th class="th-{{$k}}"> <th class="th-{{$k}}">
<a href="{{$baseurl}}/admin/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order"> <a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order">
{{if $order_users == $th.1}} {{if $order_users == $th.1}}
{{if $order_direction_users == "+"}} {{if $order_direction_users == "+"}}
&#8595; &#8595;
@ -100,28 +100,28 @@
<td colspan="4"> <td colspan="4">
{{if $order_users != $th_users.2.1}} {{if $order_users != $th_users.2.1}}
<p> <p>
<a href="{{$baseurl}}/admin/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order">
&#8597; {{$th_users.2.0}}</a> : {{$u.register_date}} &#8597; {{$th_users.2.0}}</a> : {{$u.register_date}}
</p> </p>
{{/if}} {{/if}}
{{if $order_users != $th_users.3.1}} {{if $order_users != $th_users.3.1}}
<p> <p>
<a href="{{$baseurl}}/admin/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order">
&#8597; {{$th_users.3.0}}</a> : {{$u.login_date}} &#8597; {{$th_users.3.0}}</a> : {{$u.login_date}}
</p> </p>
{{/if}} {{/if}}
{{if $order_users != $th_users.4.1}} {{if $order_users != $th_users.4.1}}
<p> <p>
<a href="{{$baseurl}}/admin/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order">
&#8597; {{$th_users.4.0}}</a> : {{$u.lastitem_date}} &#8597; {{$th_users.4.0}}</a> : {{$u.lastitem_date}}
</p> </p>
{{/if}} {{/if}}
{{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }} {{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
<p> <p>
<a href="{{$baseurl}}/admin/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order">
&#8597; {{$th_users.5.0}}</a> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} &#8597; {{$th_users.5.0}}</a> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}
</p> </p>
{{/if}} {{/if}}
@ -129,10 +129,10 @@
</td> </td>
<td class="text-right"> <td class="text-right">
{{if $u.is_deletable}} {{if $u.is_deletable}}
<a href="{{$baseurl}}/admin/users/active/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}"> <a href="{{$baseurl}}/moderation/users/active/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
<i class="fa fa-ban" aria-hidden="true"></i> <i class="fa fa-ban" aria-hidden="true"></i>
</a> </a>
<a href="{{$baseurl}}/admin/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')"> <a href="{{$baseurl}}/moderation/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
<i class="fa fa-trash" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i>
</a> </a>
{{else}} {{else}}

14
view/theme/frio/templates/moderation/users/blocked.tpl
View File

@ -20,7 +20,7 @@
{{foreach $th_users as $k=>$th}} {{foreach $th_users as $k=>$th}}
{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }} {{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
<th class="th-{{$k}}"> <th class="th-{{$k}}">
<a href="{{$baseurl}}/admin/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order"> <a href="{{$baseurl}}/moderation/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order">
{{if $order_users == $th.1}} {{if $order_users == $th.1}}
{{if $order_direction_users == "+"}} {{if $order_direction_users == "+"}}
&#8595; &#8595;
@ -100,28 +100,28 @@
<td colspan="4"> <td colspan="4">
{{if $order_users != $th_users.2.1}} {{if $order_users != $th_users.2.1}}
<p> <p>
<a href="{{$baseurl}}/admin/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order">
&#8597; {{$th_users.2.0}}</a> : {{$u.register_date}} &#8597; {{$th_users.2.0}}</a> : {{$u.register_date}}
</p> </p>
{{/if}} {{/if}}
{{if $order_users != $th_users.3.1}} {{if $order_users != $th_users.3.1}}
<p> <p>
<a href="{{$baseurl}}/admin/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order">
&#8597; {{$th_users.3.0}}</a> : {{$u.login_date}} &#8597; {{$th_users.3.0}}</a> : {{$u.login_date}}
</p> </p>
{{/if}} {{/if}}
{{if $order_users != $th_users.4.1}} {{if $order_users != $th_users.4.1}}
<p> <p>
<a href="{{$baseurl}}/admin/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order">
&#8597; {{$th_users.4.0}}</a> : {{$u.lastitem_date}} &#8597; {{$th_users.4.0}}</a> : {{$u.lastitem_date}}
</p> </p>
{{/if}} {{/if}}
{{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }} {{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
<p> <p>
<a href="{{$baseurl}}/admin/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order">
&#8597; {{$th_users.5.0}}</a> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} &#8597; {{$th_users.5.0}}</a> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}
</p> </p>
{{/if}} {{/if}}
@ -130,11 +130,11 @@
<td class="text-right"> <td class="text-right">
{{if $u.is_deletable}} {{if $u.is_deletable}}
{{if $u.blocked}} {{if $u.blocked}}
<a href="{{$baseurl}}/admin/users/blocked/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}"> <a href="{{$baseurl}}/moderation/users/blocked/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}">
<i class="fa fa-check-circle-o" aria-hidden="true"></i> <i class="fa fa-check-circle-o" aria-hidden="true"></i>
</a> </a>
{{/if}} {{/if}}
<a href="{{$baseurl}}/admin/users/blocked/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')"> <a href="{{$baseurl}}/moderation/users/blocked/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
<i class="fa fa-trash" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i>
</a> </a>
{{else}} {{else}}

18
view/theme/frio/templates/moderation/users/index.tpl
View File

@ -4,7 +4,7 @@
<div id="admin-users" class="adminpage generic-page-wrapper"> <div id="admin-users" class="adminpage generic-page-wrapper">
<h1>{{$title}} - {{$page}} ({{$count}})</h1> <h1>{{$title}} - {{$page}} ({{$count}})</h1>
<p> <p>
<a href="{{$base_url}}/admin/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a> <a href="{{$base_url}}/moderation/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a>
</p> </p>
<form action="{{$baseurl}}/{{$query_string}}" method="post"> <form action="{{$baseurl}}/{{$query_string}}" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
@ -21,7 +21,7 @@
{{foreach $th_users as $k=>$th}} {{foreach $th_users as $k=>$th}}
{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }} {{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
<th class="th-{{$k}}"> <th class="th-{{$k}}">
<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order"> <a href="{{$baseurl}}/moderation/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order">
{{if $order_users == $th.1}} {{if $order_users == $th.1}}
{{if $order_direction_users == "+"}} {{if $order_direction_users == "+"}}
&#8595; &#8595;
@ -102,28 +102,28 @@
<td colspan="4"> <td colspan="4">
{{if $order_users != $th_users.2.1}} {{if $order_users != $th_users.2.1}}
<p> <p>
<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order">
&#8597; {{$th_users.2.0}}</a> : {{$u.register_date}} &#8597; {{$th_users.2.0}}</a> : {{$u.register_date}}
</p> </p>
{{/if}} {{/if}}
{{if $order_users != $th_users.3.1}} {{if $order_users != $th_users.3.1}}
<p> <p>
<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order">
&#8597; {{$th_users.3.0}}</a> : {{$u.login_date}} &#8597; {{$th_users.3.0}}</a> : {{$u.login_date}}
</p> </p>
{{/if}} {{/if}}
{{if $order_users != $th_users.4.1}} {{if $order_users != $th_users.4.1}}
<p> <p>
<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order">
&#8597; {{$th_users.4.0}}</a> : {{$u.lastitem_date}} &#8597; {{$th_users.4.0}}</a> : {{$u.lastitem_date}}
</p> </p>
{{/if}} {{/if}}
{{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }} {{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
<p> <p>
<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order"> <a href="{{$baseurl}}/moderation/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order">
&#8597; {{$th_users.5.0}}</a> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} &#8597; {{$th_users.5.0}}</a> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}
</p> </p>
{{/if}} {{/if}}
@ -132,15 +132,15 @@
<td class="text-right"> <td class="text-right">
{{if $u.is_deletable}} {{if $u.is_deletable}}
{{if $u.blocked}} {{if $u.blocked}}
<a href="{{$baseurl}}/admin/users/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}"> <a href="{{$baseurl}}/moderation/users/unblock/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$unblock}}">
<i class="fa fa-check-circle-o" aria-hidden="true"></i> <i class="fa fa-check-circle-o" aria-hidden="true"></i>
</a> </a>
{{else}} {{else}}
<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}"> <a href="{{$baseurl}}/moderation/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
<i class="fa fa-ban" aria-hidden="true"></i> <i class="fa fa-ban" aria-hidden="true"></i>
</a> </a>
{{/if}} {{/if}}
<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')"> <a href="{{$baseurl}}/moderation/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
<i class="fa fa-trash" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i>
</a> </a>
{{else}} {{else}}

4
view/theme/frio/templates/moderation/users/pending.tpl
View File

@ -33,8 +33,8 @@
<td>{{$u.name}}</td> <td>{{$u.name}}</td>
<td>{{$u.email}}</td> <td>{{$u.email}}</td>
<td> <td>
<a href="{{$baseurl}}/admin/users/pending/allow/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link btn btn-sm btn-primary" title="{{$approve}}"><i class="fa fa-check" aria-hidden="true"></i></a> <a href="{{$baseurl}}/moderation/users/pending/allow/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link btn btn-sm btn-primary" title="{{$approve}}"><i class="fa fa-check" aria-hidden="true"></i></a>
<a href="{{$baseurl}}/admin/users/pending/deny/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link btn btn-sm btn-warning" title="{{$deny}}"><i class="fa fa-trash-o" aria-hidden="true"></i></a> <a href="{{$baseurl}}/moderation/users/pending/deny/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link btn btn-sm btn-warning" title="{{$deny}}"><i class="fa fa-trash-o" aria-hidden="true"></i></a>
</td> </td>
</tr> </tr>
{{if $u.note}} {{if $u.note}}

6
view/theme/quattro/templates/admin/users/active.tpl
View File

@ -22,7 +22,7 @@
<th></th> <th></th>
{{foreach $th_users as $th}} {{foreach $th_users as $th}}
<th> <th>
<a href="{{$baseurl}}/admin/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}"> <a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
{{if $order_users == $th.1}} {{if $order_users == $th.1}}
{{if $order_direction_users == "+"}} {{if $order_direction_users == "+"}}
&#8595; &#8595;
@ -59,10 +59,10 @@
</td> </td>
<td class="tools"> <td class="tools">
{{if $u.is_deletable}} {{if $u.is_deletable}}
<a href="{{$baseurl}}/admin/users/active/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}"> <a href="{{$baseurl}}/moderation/users/active/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}">
<span class="icon {{if $u.blocked==0}}unlock{{else}}lock{{/if}}"></span> <span class="icon {{if $u.blocked==0}}unlock{{else}}lock{{/if}}"></span>
</a> </a>
<a href="{{$baseurl}}/admin/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')"> <a href="{{$baseurl}}/moderation/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')">
<span class="icon delete"></span> <span class="icon delete"></span>
</a> </a>
{{else}} {{else}}

6
view/theme/quattro/templates/admin/users/blocked.tpl
View File

@ -24,7 +24,7 @@
<th></th> <th></th>
{{foreach $th_users as $th}} {{foreach $th_users as $th}}
<th> <th>
<a href="{{$baseurl}}/admin/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}"> <a href="{{$baseurl}}/moderation/users/blocked?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
{{if $order_users == $th.1}} {{if $order_users == $th.1}}
{{if $order_direction_users == "+"}} {{if $order_direction_users == "+"}}
&#8595; &#8595;
@ -61,10 +61,10 @@
</td> </td>
<td class="tools"> <td class="tools">
{{if $u.is_deletable}} {{if $u.is_deletable}}
<a href="{{$baseurl}}/admin/users/blocked/unblock/{{$u.uid}}?t={{$form_security_token}}" title="{{$unblock}}"> <a href="{{$baseurl}}/moderation/users/blocked/unblock/{{$u.uid}}?t={{$form_security_token}}" title="{{$unblock}}">
<span class="icon lock"></span> <span class="icon lock"></span>
</a> </a>
<a href="{{$baseurl}}/admin/users/blocked/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')"> <a href="{{$baseurl}}/moderation/users/blocked/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')">
<span class="icon delete"></span> <span class="icon delete"></span>
</a> </a>
{{else}} {{else}}

8
view/theme/quattro/templates/admin/users/index.tpl
View File

@ -22,7 +22,7 @@
<th></th> <th></th>
{{foreach $th_users as $th}} {{foreach $th_users as $th}}
<th> <th>
<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}"> <a href="{{$baseurl}}/moderation/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
{{if $order_users == $th.1}} {{if $order_users == $th.1}}
{{if $order_direction_users == "+"}} {{if $order_direction_users == "+"}}
&#8595; &#8595;
@ -59,10 +59,10 @@
</td> </td>
<td class="tools"> <td class="tools">
{{if $u.is_deletable}} {{if $u.is_deletable}}
<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}"> <a href="{{$baseurl}}/moderation/users/block/{{$u.uid}}?t={{$form_security_token}}" title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}">
<span class="icon {{if $u.blocked==0}}unlock{{else}}lock{{/if}}"></span> <span class="icon {{if $u.blocked==0}}unlock{{else}}lock{{/if}}"></span>
</a> </a>
<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')"> <a href="{{$baseurl}}/moderation/users/delete/{{$u.uid}}?t={{$form_security_token}}" title="{{$delete}}" onclick="return confirm_delete('{{$u.name}}')">
<span class="icon delete"></span> <span class="icon delete"></span>
</a> </a>
{{else}} {{else}}
@ -82,6 +82,6 @@
{{$pager nofilter}} {{$pager nofilter}}
</form> </form>
<p> <p>
<a href="{{$base_url}}/admin/users/create">{{$h_newuser}}</a> <a href="{{$base_url}}/moderation/users/create">{{$h_newuser}}</a>
</p> </p>
</div> </div>

4
view/theme/quattro/templates/admin/users/pending.tpl
View File

@ -38,10 +38,10 @@
<input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"/> <input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"/>
</td> </td>
<td class="tools"> <td class="tools">
<a href="{{$baseurl}}/admin/users/pending/allow/{{$u.uid}}?t={{$form_security_token}}" title="{{$approve}}"> <a href="{{$baseurl}}/moderation/users/pending/allow/{{$u.uid}}?t={{$form_security_token}}" title="{{$approve}}">
<span class="icon like"></span> <span class="icon like"></span>
</a> </a>
<a href="{{$baseurl}}/admin/users/pending/deny/{{$u.uid}}?t={{$form_security_token}}" title="{{$deny}}"> <a href="{{$baseurl}}/moderation/users/pending/deny/{{$u.uid}}?t={{$form_security_token}}" title="{{$deny}}">
<span class="icon dislike"></span> <span class="icon dislike"></span>
</a> </a>
</td> </td>