From 2e6dd6ef3af48e90fdf3bcdff26275a518e208e0 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Wed, 9 Nov 2022 22:56:18 +0100
Subject: [PATCH] permission changes & minor bug fixes

---
 Admin/Install/Admin.install.php           | 0
 Admin/Install/Media.install.json          | 0
 Admin/Install/Media.php                   | 0
 ICAL.txt                                  | 0
 Models/SettingsEnum.php                   | 0
 Theme/Backend/Lang/Navigation.ar.lang.php | 0
 Theme/Backend/Lang/Navigation.cs.lang.php | 0
 Theme/Backend/Lang/Navigation.da.lang.php | 0
 Theme/Backend/Lang/Navigation.de.lang.php | 0
 Theme/Backend/Lang/Navigation.el.lang.php | 0
 Theme/Backend/Lang/Navigation.en.lang.php | 0
 Theme/Backend/Lang/Navigation.es.lang.php | 0
 Theme/Backend/Lang/Navigation.fi.lang.php | 0
 Theme/Backend/Lang/Navigation.fr.lang.php | 0
 Theme/Backend/Lang/Navigation.hu.lang.php | 0
 Theme/Backend/Lang/Navigation.it.lang.php | 0
 Theme/Backend/Lang/Navigation.ja.lang.php | 0
 Theme/Backend/Lang/Navigation.ko.lang.php | 0
 Theme/Backend/Lang/Navigation.no.lang.php | 0
 Theme/Backend/Lang/Navigation.pl.lang.php | 0
 Theme/Backend/Lang/Navigation.pt.lang.php | 0
 Theme/Backend/Lang/Navigation.ru.lang.php | 0
 Theme/Backend/Lang/Navigation.sv.lang.php | 0
 Theme/Backend/Lang/Navigation.th.lang.php | 0
 Theme/Backend/Lang/Navigation.tr.lang.php | 0
 Theme/Backend/Lang/Navigation.uk.lang.php | 0
 Theme/Backend/Lang/Navigation.zh.lang.php | 0
 Theme/Backend/Lang/ar.lang.php            | 0
 Theme/Backend/Lang/cs.lang.php            | 0
 Theme/Backend/Lang/da.lang.php            | 0
 Theme/Backend/Lang/de.lang.php            | 0
 Theme/Backend/Lang/el.lang.php            | 0
 Theme/Backend/Lang/en.lang.php            | 0
 Theme/Backend/Lang/es.lang.php            | 0
 Theme/Backend/Lang/fi.lang.php            | 0
 Theme/Backend/Lang/fr.lang.php            | 0
 Theme/Backend/Lang/hu.lang.php            | 0
 Theme/Backend/Lang/it.lang.php            | 0
 Theme/Backend/Lang/ja.lang.php            | 0
 Theme/Backend/Lang/ko.lang.php            | 0
 Theme/Backend/Lang/no.lang.php            | 0
 Theme/Backend/Lang/pl.lang.php            | 0
 Theme/Backend/Lang/pt.lang.php            | 0
 Theme/Backend/Lang/ru.lang.php            | 0
 Theme/Backend/Lang/sv.lang.php            | 0
 Theme/Backend/Lang/th.lang.php            | 0
 Theme/Backend/Lang/tr.lang.php            | 0
 Theme/Backend/Lang/uk.lang.php            | 0
 Theme/Backend/Lang/zh.lang.php            | 0
 Theme/Backend/contract-list.tpl.php       | 8 ++++----
 tests/Admin/AdminTest.php                 | 0
 tests/Controller/ApiControllerTest.php    | 0
 tests/Controller/test.pdf                 | 0
 tests/Models/ContractTest.php             | 0
 tests/Models/ContractTypeL11nTest.php     | 0
 tests/Models/ContractTypeTest.php         | 0
 tests/Models/NullContractTest.php         | 0
 tests/Models/NullContractTypeL11nTest.php | 0
 tests/Models/NullContractTypeTest.php     | 0
 59 files changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 Admin/Install/Admin.install.php
 mode change 100644 => 100755 Admin/Install/Media.install.json
 mode change 100644 => 100755 Admin/Install/Media.php
 mode change 100644 => 100755 ICAL.txt
 mode change 100644 => 100755 Models/SettingsEnum.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ar.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.cs.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.da.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.de.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.el.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.en.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.es.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fi.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fr.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.hu.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.it.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ja.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ko.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.no.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pl.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pt.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ru.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.sv.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.th.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.tr.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.uk.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/Navigation.zh.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/ar.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/cs.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/da.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/de.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/el.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/en.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/es.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/fi.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/fr.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/hu.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/it.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/ja.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/ko.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/no.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/pl.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/pt.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/ru.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/sv.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/th.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/tr.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/uk.lang.php
 mode change 100644 => 100755 Theme/Backend/Lang/zh.lang.php
 mode change 100644 => 100755 tests/Admin/AdminTest.php
 mode change 100644 => 100755 tests/Controller/ApiControllerTest.php
 mode change 100644 => 100755 tests/Controller/test.pdf
 mode change 100644 => 100755 tests/Models/ContractTest.php
 mode change 100644 => 100755 tests/Models/ContractTypeL11nTest.php
 mode change 100644 => 100755 tests/Models/ContractTypeTest.php
 mode change 100644 => 100755 tests/Models/NullContractTest.php
 mode change 100644 => 100755 tests/Models/NullContractTypeL11nTest.php
 mode change 100644 => 100755 tests/Models/NullContractTypeTest.php

diff --git a/Admin/Install/Admin.install.php b/Admin/Install/Admin.install.php
old mode 100644
new mode 100755
diff --git a/Admin/Install/Media.install.json b/Admin/Install/Media.install.json
old mode 100644
new mode 100755
diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php
old mode 100644
new mode 100755
diff --git a/ICAL.txt b/ICAL.txt
old mode 100644
new mode 100755
diff --git a/Models/SettingsEnum.php b/Models/SettingsEnum.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/contract-list.tpl.php b/Theme/Backend/contract-list.tpl.php
index 5a3e83c..74672f0 100755
--- a/Theme/Backend/contract-list.tpl.php
+++ b/Theme/Backend/contract-list.tpl.php
@@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
  */
 $contracts = $this->getData('contracts') ?? [];
 
-$previous = empty($contracts) ? '{/prefix}contract/list' : '{/prefix}contract/list?{?}&id=' . \reset($contracts)->getId() . '&ptype=p';
-$next     = empty($contracts) ? '{/prefix}contract/list' : '{/prefix}contract/list?{?}&id=' . \end($contracts)->getId() . '&ptype=n';
+$previous = empty($contracts) ? 'contract/list' : 'contract/list?{?}&id=' . \reset($contracts)->getId() . '&ptype=p';
+$next     = empty($contracts) ? 'contract/list' : 'contract/list?{?}&id=' . \end($contracts)->getId() . '&ptype=n';
 
 $now = new \DateTime('now');
 
@@ -73,7 +73,7 @@ echo $this->getData('nav')->render(); ?>
                         </label>
                 <tbody>
                 <?php foreach ($contracts as $key => $value) :
-                    $url = UriFactory::build('{/prefix}contract/single?{?}&id=' . $value->getId());
+                    $url = UriFactory::build('contract/single?{?}&id=' . $value->getId());
 
                     $type = 'ok';
                     if (($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 7776000 > $now->getTimestamp())
@@ -88,7 +88,7 @@ echo $this->getData('nav')->render(); ?>
                 ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->title); ?></a>
-                    <td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $value->account->getId()); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
+                    <td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('profile/single?{?}&for=' . $value->account->getId()); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
                     <td data-label="<?= $this->getHtml('End'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $type;  ?>"><?= $value->end !== null ? $value->end->format('Y-m-d') : ''; ?></span></a>
                 <?php endforeach; ?>
             </table>
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
old mode 100644
new mode 100755
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
old mode 100644
new mode 100755
diff --git a/tests/Controller/test.pdf b/tests/Controller/test.pdf
old mode 100644
new mode 100755
diff --git a/tests/Models/ContractTest.php b/tests/Models/ContractTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/ContractTypeL11nTest.php b/tests/Models/ContractTypeL11nTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/ContractTypeTest.php b/tests/Models/ContractTypeTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/NullContractTest.php b/tests/Models/NullContractTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/NullContractTypeL11nTest.php b/tests/Models/NullContractTypeL11nTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/NullContractTypeTest.php b/tests/Models/NullContractTypeTest.php
old mode 100644
new mode 100755