permission changes & minor bug fixes

Admin/Settings/Theme/Backend/settings.tpl.php

@@ -766,8 +766,8 @@ echo $this->getData('nav')->render();
                                 </label>
                         <tbody>
                         <?php $count          = 0;
-                            $previousSettings = empty($settings) ? '{/prefix}admin/settings/general' : '{/prefix}admin/settings/general?{?}&sid=' . \reset($settings)->getId() . '&ptype=p';
-                            $nextSettings     = empty($settings) ? '{/prefix}admin/settings/general' : '{/prefix}admin/settings/general?{?}&sid=' . \end($settings)->getId() . '&ptype=n';
+                            $previousSettings = empty($settings) ? 'admin/settings/general' : 'admin/settings/general?{?}&sid=' . \reset($settings)->getId() . '&ptype=p';
+                            $nextSettings     = empty($settings) ? 'admin/settings/general' : 'admin/settings/general?{?}&sid=' . \end($settings)->getId() . '&ptype=n';
 
                             foreach ($settings as $key => $setting) : ++$count;
                         ?>

Controller/ApiController.php

@@ -1048,7 +1048,7 @@ final class ApiController extends Controller
             NotificationLevel::OK,
             'Account',
             'Account successfully created. Link: <a href="'
-                . (UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $account->getId()))
+                . (UriFactory::build('admin/account/settings?{?}&id=' . $account->getId()))
                 . '">Account</a>',
             $account
         );

Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php

@@ -6,9 +6,9 @@
                     {
                         "key": 1, "listener": "click", "action": [
                             {"key": 1, "type": "dom.popup", "selector": "#group-selector-tpl", "aniIn": "fadeIn", "id": "<?= $this->getId(); ?>"},
-                            {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/group?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+                            {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('admin/group?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
                             {"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1},
-                            {"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/group?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+                            {"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('admin/group?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
                             {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
                         ]
                     }

Theme/Backend/accounts-list.tpl.php

@@ -23,7 +23,7 @@ $accounts = $this->getData('accounts') ?? [];
 
 $tableView            = $this->getData('tableView');
 $tableView->id        = 'accountsList';
-$tableView->baseUri   = '{/prefix}admin/account/list';
+$tableView->baseUri   = 'admin/account/list';
 $tableView->exportUri = '{/api}admin/account/list/export';
 $tableView->setObjects($accounts);
 
@@ -86,7 +86,7 @@ echo $this->getData('nav')->render(); ?>
                         <?php
                         $c = 0;
                         foreach ($accounts as $key => $value) : ++$c;
-                            $url   = UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId());
+                            $url   = UriFactory::build('admin/account/settings?{?}&id=' . $value->getId());
                             $color = 'darkred';
 
                             if ($value->getStatus() === AccountStatus::ACTIVE) { $color       = 'green'; }

Theme/Backend/accounts-single.tpl.php

@@ -41,11 +41,11 @@ $audits      = $this->getData('auditlogs') ?? [];
 $l11n        = $account->l11n;
 
 $previous = empty($audits)
-    ? HttpHeader::getAllHeaders()['Referer'] ?? '{/prefix}admin/account/settings?id={?id}#{\#}'
-    : '{/prefix}admin/account/settings?{?}&audit=' . \reset($audits)->getId() . '&ptype=p#{\#}';
+    ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/account/settings?id={?id}#{\#}'
+    : 'admin/account/settings?{?}&audit=' . \reset($audits)->getId() . '&ptype=p#{\#}';
 $next     = empty($audits)
-    ? HttpHeader::getAllHeaders()['Referer'] ?? '{/prefix}admin/account/settings?id={?id}#{\#}'
-    : '{/prefix}admin/account/settings?{?}&audit=' . \end($audits)->getId() . '&ptype=n#{\#}';
+    ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/account/settings?id={?id}#{\#}'
+    : 'admin/account/settings?{?}&audit=' . \end($audits)->getId() . '&ptype=n#{\#}';
 
 echo $this->getData('nav')->render(); ?>
 
@@ -190,7 +190,7 @@ echo $this->getData('nav')->render(); ?>
                                     $c      = 0;
                                     $groups = $account->getGroups();
                                     foreach ($groups as $key => $value) : ++$c;
-                                        $url = UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId());
+                                        $url = UriFactory::build('admin/group/settings?{?}&id=' . $value->getId());
                                 ?>
                                 <tr data-href="<?= $url; ?>">
                                     <td><a href="#"><i class="fa fa-times"></i></a>
@@ -827,7 +827,7 @@ echo $this->getData('nav')->render(); ?>
                             <tbody>
                             <?php $count = 0;
                             foreach ($audits as $key => $audit) : ++$count;
-                                $url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId());
+                                $url = UriFactory::build('admin/audit/single?{?}&id=' . $audit->getId());
                             ?>
                                 <tr tabindex="0" data-href="<?= $url; ?>">
                                     <td><?= $audit->getId(); ?>

Theme/Backend/groups-list.tpl.php

@@ -24,7 +24,7 @@ $memberCount = $this->getData('memberCount') ?? [];
 
 $tableView            = $this->getData('tableView');
 $tableView->id        = 'groupsList';
-$tableView->baseUri   = '{/prefix}admin/group/list';
+$tableView->baseUri   = 'admin/group/list';
 $tableView->exportUri = '{/api}admin/group/list/export';
 $tableView->setObjects($groups);
 
@@ -85,7 +85,7 @@ echo $this->getData('nav')->render(); ?>
                 <tbody>
                     <?php $c = 0;
                         foreach ($groups as $key => $value) : ++$c;
-                            $url = UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId());
+                            $url = UriFactory::build('admin/group/settings?{?}&id=' . $value->getId());
 
                             $color                                                          = 'darkred';
                             if ($value->getStatus() === GroupStatus::ACTIVE) { $color       = 'green'; }

Theme/Backend/groups-single.tpl.php

@@ -27,11 +27,11 @@ $accounts    = $group->getAccounts();
 $audits      = $this->getData('auditlogs') ?? [];
 
 $previous = empty($audits)
-    ? HttpHeader::getAllHeaders()['Referer'] ?? '{/prefix}admin/group/settings?id={?id}#{\#}'
-    : '{/prefix}admin/group/settings?{?}&audit=' . \reset($audits)->getId() . '&ptype=p#{\#}';
+    ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/group/settings?id={?id}#{\#}'
+    : 'admin/group/settings?{?}&audit=' . \reset($audits)->getId() . '&ptype=p#{\#}';
 $next     = empty($audits)
-    ? HttpHeader::getAllHeaders()['Referer'] ?? '{/prefix}admin/group/settings?id={?id}#{\#}'
-    : '{/prefix}admin/group/settings?{?}&audit=' . \end($audits)->getId() . '&ptype=n#{\#}';
+    ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/group/settings?id={?id}#{\#}'
+    : 'admin/group/settings?{?}&audit=' . \end($audits)->getId() . '&ptype=n#{\#}';
 
 echo $this->getData('nav')->render(); ?>
 
@@ -118,7 +118,7 @@ echo $this->getData('nav')->render(); ?>
                                     <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                                     <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                             <tbody>
-                                <?php $c = 0; foreach ($accounts as $key => $value) : ++$c; $url = UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId()); ?>
+                                <?php $c = 0; foreach ($accounts as $key => $value) : ++$c; $url = UriFactory::build('admin/account/settings?{?}&id=' . $value->getId()); ?>
                                 <tr data-href="<?= $url; ?>">
                                     <td><a href="#"><i class="fa fa-times"></i></a>
                                     <td><a href="<?= $url; ?>"><?= $value->name1; ?> <?= $value->name2; ?></a>
@@ -320,7 +320,7 @@ echo $this->getData('nav')->render(); ?>
                                 <td><?= $this->getHtml('Date', 'Auditor'); ?>
                             <tbody>
                             <?php $count = 0; foreach ($audits as $key => $audit) : ++$count;
-                            $url         = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?>
+                            $url         = UriFactory::build('admin/audit/single?{?}&id=' . $audit->getId()); ?>
                                 <tr tabindex="0" data-href="<?= $url; ?>">
                                     <td><?= $audit->getId(); ?>
                                     <td><?= $this->printHtml($audit->getModule()); ?>

Theme/Backend/modules-list.tpl.php

@@ -25,7 +25,7 @@ $installed = $this->getData('installed') ?? [];
 
 $tableView            = $this->getData('tableView');
 $tableView->id        = 'moduleList';
-$tableView->baseUri   = '{/prefix}admin/module/list';
+$tableView->baseUri   = 'admin/module/list';
 $tableView->exportUri = '{/api}admin/module/list/export';
 $tableView->setObjects($modules);
 ?>
@@ -75,7 +75,7 @@ $tableView->setObjects($modules);
                 <tbody>
                     <?php $count = 0;
                         foreach ($modules as $key => $module) : ++$count;
-                            $url = UriFactory::build('{/prefix}admin/module/info?{?}&id=' . $module->getInternalName());
+                            $url = UriFactory::build('admin/module/info?{?}&id=' . $module->getInternalName());
 
                             if (isset($active[$module->getInternalName()])) {
                                 $status = ModuleStatus::ACTIVE;

Theme/Backend/modules-log.tpl.php

@@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
  */
 $audits = $this->getData('auditlogs') ?? [];
 
-$previous = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? '{/prefix}admin/module/settings?id={?id}#{\#}' : '{/prefix}admin/module/settings?{?}&audit=' . \reset($audits)->getId() . '&ptype=p#{\#}';
-$next     = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? '{/prefix}admin/module/settings?id={?id}#{\#}' : '{/prefix}admin/module/settings?{?}&audit=' . \end($audits)->getId() . '&ptype=n#{\#}';
+$previous = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \reset($audits)->getId() . '&ptype=p#{\#}';
+$next     = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \end($audits)->getId() . '&ptype=n#{\#}';
 
 echo $this->getData('nav')->render();
 ?>
@@ -54,7 +54,7 @@ echo $this->getData('nav')->render();
                     <td><?= $this->getHtml('Date', 'Auditor'); ?>
                 <tbody>
                 <?php $count = 0; foreach ($audits as $key => $audit) : ++$count;
-                $url         = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?>
+                $url         = UriFactory::build('admin/audit/single?{?}&id=' . $audit->getId()); ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td><?= $audit->getId(); ?>
                         <td><?= $this->printHtml($audit->getModule()); ?>

Theme/Backend/page-list.tpl.php

@@ -21,8 +21,8 @@ use phpOMS\Uri\UriFactory;
  */
 $pages = $this->getData('pages') ?? [];
 
-$previous = empty($pages) ? '{/prefix}admin/page/list' : '{/prefix}admin/page/list?{?}&id=' . \reset($pages)->getId() . '&ptype=p';
-$next     = empty($pages) ? '{/prefix}admin/page/list' : '{/prefix}admin/page/list?{?}&id=' . \end($pages)->getId() . '&ptype=n';
+$previous = empty($pages) ? 'admin/page/list' : 'admin/page/list?{?}&id=' . \reset($pages)->getId() . '&ptype=p';
+$next     = empty($pages) ? 'admin/page/list' : 'admin/page/list?{?}&id=' . \end($pages)->getId() . '&ptype=n';
 
 echo $this->getData('nav')->render(); ?>
 
@@ -90,7 +90,7 @@ echo $this->getData('nav')->render(); ?>
                         </label>
                     <tbody>
                         <?php $c                                                          = 0; foreach ($accounts as $key => $value) : ++$c;
-                        $url                                                              = UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId());
+                        $url                                                              = UriFactory::build('admin/account/settings?{?}&id=' . $value->getId());
                         $color                                                            = 'darkred';
                         if ($value->getStatus() === AccountStatus::ACTIVE) { $color       = 'green'; }
                         elseif ($value->getStatus() === AccountStatus::INACTIVE) { $color = 'darkblue'; }

Theme/Backend/settings-general.tpl.php

@@ -710,8 +710,8 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
                                     </label>
                             <tbody>
                             <?php $count          = 0;
-                                $previousSettings = empty($settings) ? '{/prefix}admin/settings/general' : '{/prefix}admin/settings/general?{?}&sid=' . \reset($settings)->getId() . '&ptype=p';
-                                $nextSettings     = empty($settings) ? '{/prefix}admin/settings/general' : '{/prefix}admin/settings/general?{?}&sid=' . \end($settings)->getId() . '&ptype=n';
+                                $previousSettings = empty($settings) ? 'admin/settings/general' : 'admin/settings/general?{?}&sid=' . \reset($settings)->getId() . '&ptype=p';
+                                $nextSettings     = empty($settings) ? 'admin/settings/general' : 'admin/settings/general?{?}&sid=' . \end($settings)->getId() . '&ptype=n';
 
                                 foreach ($settings as $key => $setting) : ++$count;
                             ?>