diff --git a/Admin/Hooks/Web/Api.php b/Admin/Hooks/Web/Api.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/Admin/Install/Media/CsvExporter/defaultCsvExporter.csv.php b/Admin/Install/Media/CsvExporter/defaultCsvExporter.csv.php old mode 100644 new mode 100755 diff --git a/Admin/Install/Media/EmailExporter/defaultEmailExporter.mail.php b/Admin/Install/Media/EmailExporter/defaultEmailExporter.mail.php old mode 100644 new mode 100755 diff --git a/Admin/Install/Media/ExcelExporter/defaultExcelExporter.xls.php b/Admin/Install/Media/ExcelExporter/defaultExcelExporter.xls.php old mode 100644 new mode 100755 diff --git a/Admin/Install/Media/PdfExporter/defaultPdfExporter.pdf.php b/Admin/Install/Media/PdfExporter/defaultPdfExporter.pdf.php old mode 100644 new mode 100755 diff --git a/Admin/Install/Media/WordExporter/defaultWordExporter.doc.php b/Admin/Install/Media/WordExporter/defaultWordExporter.doc.php old mode 100644 new mode 100755 diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php old mode 100644 new mode 100755 index 9fd3f80..5279b40 --- a/Admin/Settings/Theme/Backend/settings.tpl.php +++ b/Admin/Settings/Theme/Backend/settings.tpl.php @@ -766,8 +766,8 @@ echo $this->getData('nav')->render();
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; ?> diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 5e90dbf..d05aa0e 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -1048,7 +1048,7 @@ final class ApiController extends Controller NotificationLevel::OK, 'Account', 'Account successfully created. Link: Account', $account ); diff --git a/ICAL.txt b/ICAL.txt old mode 100644 new mode 100755 diff --git a/Models/AccountCredentialMapper.php b/Models/AccountCredentialMapper.php old mode 100644 new mode 100755 diff --git a/Models/App.php b/Models/App.php old mode 100644 new mode 100755 diff --git a/Models/AppMapper.php b/Models/AppMapper.php old mode 100644 new mode 100755 diff --git a/Models/NullModule.php b/Models/NullModule.php old mode 100644 new mode 100755 diff --git a/Models/PermissionAbstractMapper.php b/Models/PermissionAbstractMapper.php old mode 100644 new mode 100755 diff --git a/Models/PermissionQueryBuilder.php b/Models/PermissionQueryBuilder.php 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/Components/GroupTagSelector/group-selector.tpl.php b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php index 39c0101..e1c62ae 100755 --- a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php +++ b/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} ] } 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/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php index 0be04cd..4d64605 100755 --- a/Theme/Backend/accounts-list.tpl.php +++ b/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(); ?> $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'; } diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index dcf7a6e..0022981 100755 --- a/Theme/Backend/accounts-single.tpl.php +++ b/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()); ?>