Replace remaining occurrences of admin/users route by moderation/users

diff --git a/src/Module/Moderation/Users/Create.php b/src/Module/Moderation/Users/Create.php
index a017cf681e748c84771d783042e0ce99dbb2f50d..e4b802baff6b72387089aabb18e6ed9864472441 100644 (file)
--- a/src/Module/Moderation/Users/Create.php
+++ b/src/Module/Moderation/Users/Create.php
@@ -32,7 +32,7 @@ class Create extends BaseUsers
        {
                $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_nickname = $request['new_user_nickname'] ?? '';
@@ -42,20 +42,20 @@ class Create extends BaseUsers
                if ($nu_name !== '' && $nu_email !== '' && $nu_nickname !== '') {
                        try {
                                User::createMinimal($nu_name, $nu_email, $nu_nickname, $nu_language);
-                               $this->baseUrl->redirect('admin/users');
+                               $this->baseUrl->redirect('moderation/users');
                        } catch (\Exception $ex) {
                                $this->systemMessages->addNotice($ex->getMessage());
                        }
                }
 
-               $this->baseUrl->redirect('admin/users/create');
+               $this->baseUrl->redirect('moderation/users/create');
        }
 
        protected function content(array $request = []): string
        {
                parent::content();
 
-               $t = Renderer::getMarkupTemplate('admin/users/create.tpl');
+               $t = Renderer::getMarkupTemplate('moderation/users/create.tpl');
                return self::getTabsHTML('all') . Renderer::replaceMacros($t, [
                        // strings //
                        '$title'  => $this->t('Administration'),

diff --git a/src/Module/Moderation/Users/Pending.php b/src/Module/Moderation/Users/Pending.php
index 569d0404c7af5fa64d6eafa16f7e94cdd02c6fab..465f6fbfa19ea6a74d8825dd77d38a52b504f6a1 100644 (file)
--- a/src/Module/Moderation/Users/Pending.php
+++ b/src/Module/Moderation/Users/Pending.php
@@ -33,7 +33,7 @@ class Pending extends BaseUsers
        {
                $this->checkModerationAccess();
 
-               self::checkFormSecurityTokenRedirectOnError('/admin/users/pending', 'admin_users_pending');
+               self::checkFormSecurityTokenRedirectOnError('moderation/users/pending', 'admin_users_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->baseUrl->redirect('admin/users/pending');
+               $this->baseUrl->redirect('moderation/users/pending');
        }
 
        protected function content(array $request = []): string
@@ -65,22 +65,22 @@ class Pending extends BaseUsers
                        $user = User::getById($uid, ['username', 'blocked']);
                        if (!$user) {
                                $this->systemMessages->addNotice($this->t('User not found'));
-                               $this->baseUrl->redirect('admin/users');
+                               $this->baseUrl->redirect('moderation/users');
                        }
                }
 
                switch ($action) {
                        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'] ?? '');
                                $this->systemMessages->addNotice($this->t('Account approved.'));
-                               $this->baseUrl->redirect('admin/users/pending');
+                               $this->baseUrl->redirect('moderation/users/pending');
                                break;
                        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'] ?? '');
                                $this->systemMessages->addNotice($this->t('Registration revoked'));
-                               $this->baseUrl->redirect('admin/users/pending');
+                               $this->baseUrl->redirect('moderation/users/pending');
                                break;
                }
 
@@ -90,7 +90,7 @@ class Pending extends BaseUsers
 
                $count = Register::getPendingCount();
 
-               $t = Renderer::getMarkupTemplate('admin/users/pending.tpl');
+               $t = Renderer::getMarkupTemplate('moderation/users/pending.tpl');
                return self::getTabsHTML('pending') . Renderer::replaceMacros($t, [
                        // strings //
                        '$title' => $this->t('Administration'),

diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php
index e80d3b8ee03f3c97c172daeed7d2a1f9db4b7e1e..2eaa2c4a5ca274faf6ce52e69a82ffe38f797396 100644 (file)
--- a/src/Module/Notifications/Ping.php
+++ b/src/Module/Notifications/Ping.php
@@ -241,7 +241,7 @@ class Ping extends BaseModule
                                                ],
                                                $this->l10n->t('{0} requested registration'),
                                                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) {
@@ -252,7 +252,7 @@ class Ping extends BaseModule
                                        ],
                                        $this->l10n->t('{0} and %d others requested registration', count($registrations) - 1),
                                        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')
                                );
                        }
 

diff --git a/src/Module/Register.php b/src/Module/Register.php
index c168c517ef6a584a9d1ef183530decc62aae9161..ad3e1feeacce1932d265bd18996ef7ecb7012657 100644 (file)
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -406,11 +406,11 @@ class Register extends BaseModule
                                'type'         => Model\Notification\Type::SYSTEM,
                                'event'        => $event,
                                'uid'          => $admin['uid'],
-                               'link'         => DI::baseUrl()->get(true) . '/admin/users/',
+                               'link'         => DI::baseUrl()->get(true) . '/moderation/users/',
                                'source_name'  => $user['username'],
                                'source_mail'  => $user['email'],
                                '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),
                                'show_in_notification_page' => false
                        ]);

diff --git a/view/templates/moderation/users/active.tpl b/view/templates/moderation/users/active.tpl
index 8ec13e1fea77e2097f237eef9b48901c7b5bb4c5..482cecaf89c5dcf1701b68cf9830691b72db1907 100644 (file)
--- a/view/templates/moderation/users/active.tpl
+++ b/view/templates/moderation/users/active.tpl
@@ -23,7 +23,7 @@
                                <th></th>
                                {{foreach $th_users as $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_direction_users == "+"}}
                                                                &#8595;
@@ -61,10 +61,10 @@
 
                                        <td class="tools">
                                                {{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>
                                                        </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>
                                                        </a>
                                                {{else}}
@@ -83,6 +83,6 @@
        </form>
        {{$pager nofilter}}
        <p>
-               <a href="{{$base_url}}/admin/users/create">{{$h_newuser}}</a>
+               <a href="{{$base_url}}/moderation/users/create">{{$h_newuser}}</a>
        </p>
 </div>

diff --git a/view/templates/moderation/users/blocked.tpl b/view/templates/moderation/users/blocked.tpl
index 6defaf62f06ce3c31d9f391eaceb832fa545db85..e62ea3a2ddf5f3938edd64f549effef49e745cf2 100644 (file)
--- a/view/templates/moderation/users/blocked.tpl
+++ b/view/templates/moderation/users/blocked.tpl
@@ -24,7 +24,7 @@
                                <th></th>
                                {{foreach $th_users as $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_direction_users == "+"}}
                                                                &#8595;
@@ -62,10 +62,10 @@
 
                                        <td class="tools">
                                                {{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>
                                                        </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>
                                                        </a>
                                                {{else}}

diff --git a/view/templates/moderation/users/index.tpl b/view/templates/moderation/users/index.tpl
index 091940ccc1bf866f3b1f915b985dcf6912288003..6b3ac0d7409758c5b855d4be84a69ee83ad72f8d 100644 (file)
--- a/view/templates/moderation/users/index.tpl
+++ b/view/templates/moderation/users/index.tpl
@@ -23,7 +23,7 @@
                                <th></th>
                                {{foreach $th_users as $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_direction_users == "+"}}
                                                                &#8595;
@@ -61,10 +61,10 @@
 
                                        <td class="tools">
                                                {{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>
                                                        </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>
                                                        </a>
                                                {{else}}
@@ -84,6 +84,6 @@
        </form>
        {{$pager nofilter}}
        <p>
-               <a href="{{$base_url}}/admin/users/create">{{$h_newuser}}</a>
+               <a href="{{$base_url}}/moderation/users/create">{{$h_newuser}}</a>
        </p>
 </div>

diff --git a/view/templates/moderation/users/pending.tpl b/view/templates/moderation/users/pending.tpl
index 43d1e5248b04aaeaee660d6c1a9781f94e5551cf..68a97b8b181ceddcf74a157d546c6456f630cd89 100644 (file)
--- a/view/templates/moderation/users/pending.tpl
+++ b/view/templates/moderation/users/pending.tpl
@@ -38,10 +38,10 @@
                                                <input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"/>
                                        </td>
                                        <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>
                                                </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>
                                                </a>
                                        </td>

diff --git a/view/theme/frio/templates/moderation/users/active.tpl b/view/theme/frio/templates/moderation/users/active.tpl
index 7d5ef4dca4f9401a7e9e7dd53079b140e8e424b5..1972f138ff4614548f0fb0e0b3223823fd825538 100644 (file)
--- a/view/theme/frio/templates/moderation/users/active.tpl
+++ b/view/theme/frio/templates/moderation/users/active.tpl
@@ -4,7 +4,7 @@
 <div id="admin-users" class="adminpage generic-page-wrapper">
        <h1>{{$title}} - {{$page}} ({{$count}})</h1>
        <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>
        <form action="{{$baseurl}}/{{$query_string}}" method="post">
                <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
@@ -21,7 +21,7 @@
                                        {{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])) }}
                                                <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_direction_users == "+"}}
                                                                        &#8595;
@@ -100,28 +100,28 @@
                                        <td colspan="4">
                                        {{if $order_users != $th_users.2.1}}
                                                <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}}
                                                </p>
                                        {{/if}}
 
                                        {{if $order_users != $th_users.3.1}}
                                                <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}}
                                                </p>
                                        {{/if}}
 
                                        {{if $order_users != $th_users.4.1}}
                                                <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}}
                                                </p>
                                        {{/if}}
 
                                        {{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
                                                <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}}
                                                </p>
                                        {{/if}}
@@ -129,10 +129,10 @@
                                        </td>
                                        <td class="text-right">
                                {{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>
                                                </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>
                                                </a>
                                {{else}}

diff --git a/view/theme/frio/templates/moderation/users/blocked.tpl b/view/theme/frio/templates/moderation/users/blocked.tpl
index 1e77c9aaa9a313dfba91c872846a5e9fe2fa01d9..3bfcced68145e0881dd72dec26dea9240e1d15b6 100644 (file)
--- a/view/theme/frio/templates/moderation/users/blocked.tpl
+++ b/view/theme/frio/templates/moderation/users/blocked.tpl
@@ -20,7 +20,7 @@
                                        {{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])) }}
                                                <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_direction_users == "+"}}
                                                                        &#8595;
@@ -100,28 +100,28 @@
                                        <td colspan="4">
                                        {{if $order_users != $th_users.2.1}}
                                                <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}}
                                                </p>
                                        {{/if}}
 
                                        {{if $order_users != $th_users.3.1}}
                                                <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}}
                                                </p>
                                        {{/if}}
 
                                        {{if $order_users != $th_users.4.1}}
                                                <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}}
                                                </p>
                                        {{/if}}
 
                                        {{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
                                                <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}}
                                                </p>
                                        {{/if}}
@@ -130,11 +130,11 @@
                                        <td class="text-right">
                                {{if $u.is_deletable}}
                                        {{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>
                                                </a>
                                        {{/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>
                                                </a>
                                {{else}}

diff --git a/view/theme/frio/templates/moderation/users/index.tpl b/view/theme/frio/templates/moderation/users/index.tpl
index d46a41c7ab731eb5d571c48b2593ee70ba03c85b..c0abae50007a90aabbabb89dccd992de8e5c737a 100644 (file)
--- a/view/theme/frio/templates/moderation/users/index.tpl
+++ b/view/theme/frio/templates/moderation/users/index.tpl
@@ -4,7 +4,7 @@
 <div id="admin-users" class="adminpage generic-page-wrapper">
        <h1>{{$title}} - {{$page}} ({{$count}})</h1>
        <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>
        <form action="{{$baseurl}}/{{$query_string}}" method="post">
                <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
@@ -21,7 +21,7 @@
                                        {{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])) }}
                                                <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_direction_users == "+"}}
                                                                        &#8595;
@@ -102,28 +102,28 @@
                                        <td colspan="4">
                                        {{if $order_users != $th_users.2.1}}
                                                <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}}
                                                </p>
                                        {{/if}}
 
                                        {{if $order_users != $th_users.3.1}}
                                                <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}}
                                                </p>
                                        {{/if}}
 
                                        {{if $order_users != $th_users.4.1}}
                                                <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}}
                                                </p>
                                        {{/if}}
 
                                        {{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
                                                <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}}
                                                </p>
                                        {{/if}}
@@ -132,15 +132,15 @@
                                        <td class="text-right">
                                {{if $u.is_deletable}}
                                        {{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>
                                                </a>
                                        {{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>
                                                </a>
                                        {{/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>
                                                </a>
                                {{else}}

diff --git a/view/theme/frio/templates/moderation/users/pending.tpl b/view/theme/frio/templates/moderation/users/pending.tpl
index dfb8d7e101d446b880565be0b5d32b422547cd93..dbe54029e361df52f2ee99304149e2748811a7c0 100644 (file)
--- a/view/theme/frio/templates/moderation/users/pending.tpl
+++ b/view/theme/frio/templates/moderation/users/pending.tpl
@@ -33,8 +33,8 @@
                                        <td>{{$u.name}}</td>
                                        <td>{{$u.email}}</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}}/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/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/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>
                                </tr>
                        {{if $u.note}}

diff --git a/view/theme/quattro/templates/admin/users/active.tpl b/view/theme/quattro/templates/admin/users/active.tpl
index 7aef3f3d1c7f000af9d7f5140fc0b802d985d70b..77d13ab1571e6ae4bc9d9bbbac907508d9153d92 100644 (file)
--- a/view/theme/quattro/templates/admin/users/active.tpl
+++ b/view/theme/quattro/templates/admin/users/active.tpl
@@ -22,7 +22,7 @@
                                <th></th>
                        {{foreach $th_users as $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_direction_users == "+"}}
                                                        &#8595;
@@ -59,10 +59,10 @@
                                        </td>
                                        <td class="tools">
                                        {{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>
                                                </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>
                                                </a>
                                        {{else}}

diff --git a/view/theme/quattro/templates/admin/users/blocked.tpl b/view/theme/quattro/templates/admin/users/blocked.tpl
index 09d84b33bc535ebf45c954bc7b064258135f76b6..9ac81d5460aa14b5915d7b47e84958fab28621a7 100644 (file)
--- a/view/theme/quattro/templates/admin/users/blocked.tpl
+++ b/view/theme/quattro/templates/admin/users/blocked.tpl
@@ -24,7 +24,7 @@
                                <th></th>
                        {{foreach $th_users as $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_direction_users == "+"}}
                                                        &#8595;
@@ -61,10 +61,10 @@
                                        </td>
                                        <td class="tools">
                                        {{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>
                                                </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>
                                                </a>
                                        {{else}}

diff --git a/view/theme/quattro/templates/admin/users/index.tpl b/view/theme/quattro/templates/admin/users/index.tpl
index a666274761ae3a794af23c5502c27dccaf3850db..8ec16ce99de8f725675e3c871af70e6359d073ad 100644 (file)
--- a/view/theme/quattro/templates/admin/users/index.tpl
+++ b/view/theme/quattro/templates/admin/users/index.tpl
@@ -22,7 +22,7 @@
                                <th></th>
                        {{foreach $th_users as $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_direction_users == "+"}}
                                                        &#8595;
@@ -59,10 +59,10 @@
                                        </td>
                                        <td class="tools">
                                        {{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>
                                                </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>
                                                </a>
                                        {{else}}
@@ -82,6 +82,6 @@
                {{$pager nofilter}}
        </form>
        <p>
-               <a href="{{$base_url}}/admin/users/create">{{$h_newuser}}</a>
+               <a href="{{$base_url}}/moderation/users/create">{{$h_newuser}}</a>
        </p>
 </div>

diff --git a/view/theme/quattro/templates/admin/users/pending.tpl b/view/theme/quattro/templates/admin/users/pending.tpl
index a2f9950148bebe5b783f8bc899d3ead20bd0c6d2..944f9af281deddab78926fc230fd442f66e0665a 100644 (file)
--- a/view/theme/quattro/templates/admin/users/pending.tpl
+++ b/view/theme/quattro/templates/admin/users/pending.tpl
@@ -38,10 +38,10 @@
                                                <input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"/>
                                        </td>
                                        <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>
                                                </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>
                                                </a>
                                        </td>