From 507c97f8f6f487362b665d6b9b92f4d0d8caf474 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 30 Jul 2020 21:28:05 +0200
Subject: [PATCH] fix pagination and some media bugs

---
 Controller/ApiController.php                                | 2 +-
 Controller/BackendController.php                            | 4 ++--
 Theme/Backend/Components/AccountGroupSelector/popup.tpl.php | 4 ++--
 Theme/Backend/profile-list.tpl.php                          | 4 ++--
 Theme/Backend/profile-single.tpl.php                        | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 52d8b71..71a462c 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -151,7 +151,7 @@ final class ApiController extends Controller
             $request->getData('name') ?? '',
             $uploadedFiles,
             $request->getHeader()->getAccount(),
-            __DIR__ . '/../../../Modules/Media/Files',
+            'Modules/Media/Files',
             '/Accounts/' . $request->getHeader()->getAccount()
         );
 
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index e18b835..20508ce 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -75,9 +75,9 @@ final class BackendController extends Controller
 
         $view->setTemplate('/Modules/Profile/Theme/Backend/profile-list');
 
-        if ($request->getData('ptype') === '-') {
+        if ($request->getData('ptype') === 'p') {
             $view->setData('accounts', ProfileMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25));
-        } elseif ($request->getData('ptype') === '+') {
+        } elseif ($request->getData('ptype') === 'n') {
             $view->setData('accounts', ProfileMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
         } else {
             $view->setData('accounts', ProfileMapper::getAfterPivot(0, null, 25));
diff --git a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
index 35a2062..6dded81 100755
--- a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
@@ -11,7 +11,7 @@
                 </ul>
             </div>
             <div class="tab-content">
-                <input type="radio" id="c-tab-1" name="tabular-2" checked>
+                <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : '' ?>>
                 <div class="tab">
                     <label for="iSearchAcc">Search</label>
                     <input type="text" id="iSearchAcc" name="receiver-search" data-action='[
@@ -54,7 +54,7 @@
                             }
                         ]'><?= $this->getHtml('Close', 'Admin') ?></button>
                 </div>
-                <input type="radio" id="c-tab-2" name="tabular-2">
+                <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : '' ?>>
                 <div class="tab">
                     <label for="iSearchGrp">Search</label>
                     <input type="text" id="iSearchGrp" name="receiver-search" data-action='[
diff --git a/Theme/Backend/profile-list.tpl.php b/Theme/Backend/profile-list.tpl.php
index 0737097..63779af 100755
--- a/Theme/Backend/profile-list.tpl.php
+++ b/Theme/Backend/profile-list.tpl.php
@@ -21,8 +21,8 @@ use phpOMS\Uri\UriFactory;
  */
 $accounts = $this->getData('accounts') ?? [];
 
-$previous = empty($accounts) ? '{/prefix}profile/list' : '{/prefix}profile/list?{?}&id=' . \reset($accounts)->getId() . '&ptype=-';
-$next     = empty($accounts) ? '{/prefix}profile/list' : '{/prefix}profile/list?{?}&id=' . \end($accounts)->getId() . '&ptype=+';
+$previous = empty($accounts) ? '{/prefix}profile/list' : '{/prefix}profile/list?{?}&id=' . \reset($accounts)->getId() . '&ptype=p';
+$next     = empty($accounts) ? '{/prefix}profile/list' : '{/prefix}profile/list?{?}&id=' . \end($accounts)->getId() . '&ptype=n';
 ?>
 <div class="row">
     <div class="col-xs-12">
diff --git a/Theme/Backend/profile-single.tpl.php b/Theme/Backend/profile-single.tpl.php
index 473f00a..7c9cb27 100755
--- a/Theme/Backend/profile-single.tpl.php
+++ b/Theme/Backend/profile-single.tpl.php
@@ -50,7 +50,7 @@ echo $this->getData('nav')->render();
         </ul>
     </div>
     <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2" checked>
+        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : '' ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
@@ -166,7 +166,7 @@ echo $this->getData('nav')->render();
             </div>
         </div>
         <?php if ($this->request->getHeader()->getAccount() === $account->getId()) : ?>
-        <input type="radio" id="c-tab-2" name="tabular-2">
+        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : '' ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-4">