Ratioed: remove actions

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 08d94167ec657949c961437804c31e2f51534e35..19f6dd446ffaf93b0c9916ed4a85051f075f102a 100644 (file)
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -24,7 +24,6 @@ class RatioedPanel extends Active
                        return Renderer::replaceMacros($template, array('$config' => DI::baseUrl() . '/settings/addon'));
                }
 
-               $action = $this->parameters['action'] ?? '';
                $uid    = $this->parameters['uid']      ?? 0;
                $user   = [];
 
@@ -32,31 +31,10 @@ class RatioedPanel extends Active
                        $user = User::getById($uid, ['username', 'blocked']);
                        if (!$user) {
                                $this->systemMessages->addNotice($this->t('User not found'));
-                               $this->baseUrl->redirect('moderation/users');
+                               $this->baseUrl->redirect('ratioed');
                        }
                }
 
-               switch ($action) {
-                       case 'delete':
-                               if ($this->session->getLocalUserId() != $uid) {
-                                       self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
-                                       // delete user
-                                       User::remove($uid);
-
-                                       $this->systemMessages->addNotice($this->t('User "%s" deleted', $user['username']));
-                               } else {
-                                       $this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
-                               }
-
-                               $this->baseUrl->redirect('moderation/users/active');
-                               break;
-                       case 'block':
-                               self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
-                               User::block($uid);
-                               $this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
-                               $this->baseUrl->redirect('moderation/users/active');
-                               break;
-               }
                $pager = new Pager($this->l10n, $this->args->getQueryString(), 100);
 
                $valid_orders = [
@@ -69,11 +47,11 @@ class RatioedPanel extends Active
                ];
 
                $order             = 'last-item';
-               $order_direction = '-';
+               $order_direction = '+';
                if (!empty($_REQUEST['o'])) {
                        $new_order = $_REQUEST['o'];
-                       if ($new_order[0] === '+') {
-                               $order_direction = '+';
+                       if ($new_order[0] === '-') {
+                               $order_direction = '-';
                                $new_order         = substr($new_order, 1);
                        }
 

diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index c64cb1dc0801a5b332770e3a1e7a45e3aa115f64..24ae20b8e2658e775a8e3a0d24f295354b1ecf9d 100644 (file)
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -11,12 +11,7 @@
                <table id="users" class="table table-hover">
                        <thead>
                                <tr>
-                                       <th>
-                                               <div class="checkbox">
-                                                       <input type="checkbox" id="admin-settings-users-select" class="selecttoggle" data-select-class="users_ckbx"/>
-                                                       <label for="admin-settings-users-select"></label>
-                                               </div>
-                                       </th>
+                                       <th></th>
                                        <th></th>
                                        {{foreach $th_users as $k=>$th}}
                                                {{if $k < 2 || $order_users == $th.1 || ($k==4 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.5.1])) }}
@@ -42,16 +37,7 @@
                        <tbody>
                        {{foreach $users as $u}}
                                <tr id="user-{{$u.uid}}" class="{{if $u.ratioed}}blocked{{/if}}">
-                                       <td>
-                                               {{if $u.is_deletable}}
-                                               <div class="checkbox">
-                                                       <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
-                                                       <label for="id_user_{{$u.uid}}"></label>
-                                               </div>
-                                               {{else}}
-                                               &nbsp;
-                                               {{/if}}
-                                       </td>
+                                       <td></td>
                                        <td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
                                        <td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
                                        <td>{{$u.email}}</td>
@@ -151,14 +137,6 @@
                        {{/foreach}}
                        </tbody>
                </table>
-               <div class="panel-footer">
-                       <button type="submit" name="page_users_block" value="1" class="btn btn-warning">
-                               <i class="fa fa-ban" aria-hidden="true"></i> {{$block}}
-                       </button>
-                       <button type="submit" name="page_users_delete" value="1" class="btn btn-danger" onclick="return confirm_delete('{{$confirm_delete_multi}}')">
-                               <i class="fa fa-trash" aria-hidden="true"></i> {{$delete}}
-                       </button>
-               </div>
                {{$pager nofilter}}
        </form>
 </div>