From da627309c3b3a7806610aabdd485d9aaca373975 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:14 +0200 Subject: [PATCH] Continue with getter/setter cleanup --- .../defaultPdfListExporter.pdf.php | 4 +- .../defaultWordLetterExporter.doc.php | 4 +- .../defaultWordListExporter.doc.php | 4 +- .../defaultWordExporter.doc.php | 4 +- Admin/Settings/Theme/Backend/settings.tpl.php | 6 +- Controller/BackendController.php | 120 +++++++++--------- Controller/CliController.php | 2 +- Theme/Backend/accounts-create.tpl.php | 2 +- Theme/Backend/accounts-list.tpl.php | 6 +- Theme/Backend/accounts-single.tpl.php | 8 +- Theme/Backend/groups-create.tpl.php | 2 +- Theme/Backend/groups-list.tpl.php | 8 +- Theme/Backend/groups-single.tpl.php | 8 +- Theme/Backend/modules-hook-list.tpl.php | 4 +- Theme/Backend/modules-info.tpl.php | 12 +- Theme/Backend/modules-list.tpl.php | 8 +- Theme/Backend/modules-log.tpl.php | 4 +- Theme/Backend/modules-route-list.tpl.php | 4 +- Theme/Backend/modules-settings.tpl.php | 6 +- Theme/Backend/page-list.tpl.php | 4 +- Theme/Backend/settings-general.tpl.php | 4 +- 21 files changed, 111 insertions(+), 113 deletions(-) diff --git a/Admin/Install/Media/PdfListExporter/defaultPdfListExporter.pdf.php b/Admin/Install/Media/PdfListExporter/defaultPdfListExporter.pdf.php index af4d312..0dfdf93 100755 --- a/Admin/Install/Media/PdfListExporter/defaultPdfListExporter.pdf.php +++ b/Admin/Install/Media/PdfListExporter/defaultPdfListExporter.pdf.php @@ -19,10 +19,10 @@ use phpOMS\Autoloader; Autoloader::addPath(__DIR__ . '/../Resources'); /** @var \phpOMS\Views\View $this */ -$media = $this->getData('media'); +$media = $this->data['media']; /** @var array $data */ -$data = $this->getData('data') ?? []; +$data = $this->data['data'] ?? []; include $media->getSourceByName('template.php')->getAbsolutePath(); diff --git a/Admin/Install/Media/WordLetterExporter/defaultWordLetterExporter.doc.php b/Admin/Install/Media/WordLetterExporter/defaultWordLetterExporter.doc.php index 241357d..8e83e76 100755 --- a/Admin/Install/Media/WordLetterExporter/defaultWordLetterExporter.doc.php +++ b/Admin/Install/Media/WordLetterExporter/defaultWordLetterExporter.doc.php @@ -19,8 +19,8 @@ use phpOMS\Autoloader; Autoloader::addPath(__DIR__ . '/../Resources'); /** @var \phpOMS\Views\View $this */ -$media = $this->getData('media'); -$data = $this->getData('data') ?? []; +$media = $this->data['media']; +$data = $this->data['data'] ?? []; include $media->getSourceByName('template.php')->getAbsolutePath(); diff --git a/Admin/Install/Media/WordListExporter/defaultWordListExporter.doc.php b/Admin/Install/Media/WordListExporter/defaultWordListExporter.doc.php index 6d30bae..89fd47a 100755 --- a/Admin/Install/Media/WordListExporter/defaultWordListExporter.doc.php +++ b/Admin/Install/Media/WordListExporter/defaultWordListExporter.doc.php @@ -19,10 +19,10 @@ use phpOMS\Autoloader; Autoloader::addPath(__DIR__ . '/../Resources'); /** @var \phpOMS\Views\View $this */ -$media = $this->getData('media'); +$media = $this->data['media']; /** @var array $data */ -$data = $this->getData('data') ?? []; +$data = $this->data['data'] ?? []; include $media->getSourceByName('template.php')->getAbsolutePath(); diff --git a/Admin/Install/Media/WordPlainTemplate/defaultWordExporter.doc.php b/Admin/Install/Media/WordPlainTemplate/defaultWordExporter.doc.php index 9d948c5..08ac3f4 100755 --- a/Admin/Install/Media/WordPlainTemplate/defaultWordExporter.doc.php +++ b/Admin/Install/Media/WordPlainTemplate/defaultWordExporter.doc.php @@ -19,8 +19,8 @@ use phpOMS\Autoloader; Autoloader::addPath(__DIR__ . '/../Resources'); /** @var \phpOMS\Views\View $this */ -$media = $this->getData('media'); -$data = $this->getData('data') ?? []; +$media = $this->data['media']; +$data = $this->data['data'] ?? []; include $media->getSourceByName('template.php')->getAbsolutePath(); diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php index 8d63981..37910d6 100755 --- a/Admin/Settings/Theme/Backend/settings.tpl.php +++ b/Admin/Settings/Theme/Backend/settings.tpl.php @@ -17,8 +17,8 @@ use phpOMS\Application\ApplicationStatus; use phpOMS\Localization\NullLocalization; use phpOMS\Uri\UriFactory; -$generalSettings = $this->getData('generalSettings') ?? []; -$settings = $this->getData('settings') ?? []; +$generalSettings = $this->data['generalSettings'] ?? []; +$settings = $this->data['settings'] ?? []; $countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants(); $countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); @@ -39,7 +39,7 @@ $serverModes = ApplicationStatus::getConstants(); $l11n = $this->getData('defaultlocalization') ?? new NullLocalization(); -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); ?>
diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 7549663..67fdfbe 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -100,7 +100,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response); $searchFieldData = $request->getLike('.*\-p\-.*'); $searchField = []; @@ -133,7 +133,7 @@ final class BackendController extends Controller } $pageLimit = 25; - $view->addData('pageLimit', $pageLimit); + $view->data['pageLimit'] = $pageLimit; $mapper = AccountMapper::getAll()->with('createdBy'); $list = AccountMapper::find( @@ -149,7 +149,7 @@ final class BackendController extends Controller filters: $filterField ); - $view->setData('accounts', $list['data']); + $view->data['accounts'] = $list['data']; /** @var \Model\Setting[] $exportTemplates */ $exportTemplates = $this->app->appSettings->get( @@ -181,7 +181,7 @@ final class BackendController extends Controller $tableView->setData('hasPrevious', $list['hasPrevious']); $tableView->setData('hasNext', $list['hasNext']); - $view->addData('tableView', $tableView); + $view->data['tableView'] = $tableView; return $view; } @@ -201,7 +201,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response); /** @var \Modules\Admin\Models\Account $account */ $account = AccountMapper::get()->with('groups')->with('l11n')->where('id', (int) $request->getData('id'))->execute(); @@ -209,31 +209,25 @@ final class BackendController extends Controller $account->l11n->loadFromLanguage($request->header->l11n->language); } - $view->addData('account', $account); + $view->data['account'] = $account; /** @var \Modules\Admin\Models\AccountPermission[] $permissions */ $permissions = AccountPermissionMapper::getAll() ->where('account', (int) $request->getData('id')) ->execute(); - $view->addData('permissions', $permissions); + $view->data['permissions'] = $permissions; $accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app->l11nManager, $request, $response); - $view->addData('grpSelector', $accGrpSelector); + $view->data['grpSelector'] = $accGrpSelector; // audit log if ($request->getData('ptype') === 'p') { - $view->setData('auditlogs', - AuditMapper::getAll()->with('createdBy')->where('id', $request->getDataInt('audit') ?? 0, '<')->limit(25)->execute() - ); + $view->data['auditlogs'] = AuditMapper::getAll()->with('createdBy')->where('id', $request->getDataInt('audit') ?? 0, '<')->limit(25)->execute(); } elseif ($request->getData('ptype') === 'n') { - $view->setData('auditlogs', - AuditMapper::getAll()->with('createdBy')->where('id', $request->getDataInt('audit') ?? 0, '>')->limit(25)->execute() - ); + $view->data['auditlogs'] = AuditMapper::getAll()->with('createdBy')->where('id', $request->getDataInt('audit') ?? 0, '>')->limit(25)->execute(); } else { - $view->setData('auditlogs', - AuditMapper::getAll()->with('createdBy')->where('id', 0, '>')->limit(25)->execute() - ); + $view->data['auditlogs'] = AuditMapper::getAll()->with('createdBy')->where('id', 0, '>')->limit(25)->execute(); } return $view; @@ -254,7 +248,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response); return $view; } @@ -274,7 +268,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response); $searchFieldData = $request->getLike('.*\-p\-.*'); $searchField = []; @@ -307,7 +301,7 @@ final class BackendController extends Controller } $pageLimit = 25; - $view->addData('pageLimit', $pageLimit); + $view->data['pageLimit'] = $pageLimit; $mapper = GroupMapper::getAll()->with('createdBy'); $list = GroupMapper::find( @@ -323,10 +317,10 @@ final class BackendController extends Controller filters: $filterField ); - $view->setData('groups', $list['data']); + $view->data['groups'] = $list['data']; $memberCount = GroupMapper::countMembers(); - $view->setData('memberCount', $memberCount); + $view->data['memberCount'] = $memberCount; /** @var \Model\Setting[] $exportTemplates */ $exportTemplates = $this->app->appSettings->get( @@ -358,7 +352,7 @@ final class BackendController extends Controller $tableView->setData('hasPrevious', $list['hasPrevious']); $tableView->setData('hasNext', $list['hasNext']); - $view->addData('tableView', $tableView); + $view->data['tableView'] = $tableView; return $view; } @@ -378,23 +372,27 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); - $view->addData('group', - GroupMapper::get()->with('accounts')->where('id', (int) $request->getData('id'))->execute() - ); + + $view->data['nav'] = $this->app->moduleManager->get('Navigation') + ->createNavigationMid(1000103001, $request, $response); + + $view->data['group'] = GroupMapper::get() + ->with('accounts') + ->where('id', (int) $request->getData('id')) + ->execute(); /** @var \Modules\Admin\Models\GroupPermission[] $permissions */ $permissions = GroupPermissionMapper::getAll() ->where('group', (int) $request->getData('id')) ->execute(); - $view->addData('permissions', $permissions); + $view->data['permissions'] = $permissions; $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); - $view->addData('accGrpSelector', $accGrpSelector); + $view->data['accGrpSelector'] = $accGrpSelector; $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); - $view->addData('editor', $editor); + $view->data['editor'] = $editor; $mapperQuery = AuditMapper::getAll() ->with('createdBy') @@ -405,11 +403,11 @@ final class BackendController extends Controller // audit log if ($request->getData('ptype') === 'p') { - $view->setData('auditlogs', $mapperQuery->where('id', $request->getDataInt('audit') ?? 0, '<')->limit(25)->execute()); + $view->data['auditlogs'] = $mapperQuery->where('id', $request->getDataInt('audit') ?? 0, '<')->limit(25)->execute(); } elseif ($request->getData('ptype') === 'n') { - $view->setData('auditlogs', $mapperQuery->where('id', $request->getDataInt('audit') ?? 0, '>')->limit(25)->execute()); + $view->data['auditlogs'] = $mapperQuery->where('id', $request->getDataInt('audit') ?? 0, '>')->limit(25)->execute(); } else { - $view->setData('auditlogs', $mapperQuery->where('id', 0, '>')->limit(25)->execute()); + $view->data['auditlogs'] = $mapperQuery->where('id', 0, '>')->limit(25)->execute(); } return $view; @@ -430,10 +428,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); - $view->addData('editor', $editor); + $view->data['editor'] = $editor; return $view; } @@ -452,15 +450,15 @@ final class BackendController extends Controller public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { /** @var \phpOMS\Model\Html\Head $head */ - $head = $response->get('Content')->getData('head'); + $head = $response->get('Content')->head; $head->addAsset(AssetType::CSS, 'Modules/Admin/Theme/Backend/css/styles.css?v=1.0.0'); $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-list'); - $view->setData('modules', $this->app->moduleManager->getAllModules()); - $view->setData('active', $this->app->moduleManager->getActiveModules()); - $view->setData('installed', $this->app->moduleManager->getInstalledModules()); + $view->data['modules'] = $this->app->moduleManager->getAllModules(); + $view->data['active'] = $this->app->moduleManager->getActiveModules(); + $view->data['installed'] = $this->app->moduleManager->getInstalledModules(); /** @var \Model\Setting[] $exportTemplates */ $exportTemplates = $this->app->appSettings->get( @@ -490,7 +488,7 @@ final class BackendController extends Controller $tableView->setFilterTemplate('/Web/Backend/Themes/popup-filter-table'); $tableView->setSortTemplate('/Web/Backend/Themes/sort-table'); - $view->addData('tableView', $tableView); + $view->data['tableView'] = $tableView; return $view; } @@ -510,13 +508,13 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-info'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $id = $request->getDataString('id') ?? ''; - $view->setData('modules', $this->app->moduleManager->getAllModules()); - $view->setData('active', $this->app->moduleManager->getActiveModules()); - $view->setData('installed',$this->app->moduleManager->getInstalledModules()); - $view->setData('id', $id); + $view->data['modules'] = $this->app->moduleManager->getAllModules(); + $view->data['active'] = $this->app->moduleManager->getActiveModules(); + $view->data['installed'] = $this->app->moduleManager->getInstalledModules(); + $view->data['id'] = $id; $type = 'Help'; $page = 'introduction'; @@ -540,7 +538,7 @@ final class BackendController extends Controller $toParse = $path === false ? '' : \file_get_contents($path); $content = Markdown::parse($toParse === false ? '' : $toParse); - $view->setData('introduction', $content); + $view->data['introduction'] = $content; return $view; } @@ -560,7 +558,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-log'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $id = $request->getDataString('id') ?? ''; @@ -570,11 +568,11 @@ final class BackendController extends Controller // audit log if ($request->getData('ptype') === 'p') { - $view->setData('auditlogs',$queryMapper->where('id', (int) $request->getData('audit'), '<')->limit(25)->execute()); + $view->data['auditlogs',$queryMapper->where('id'] = (int) $request->getData('audit'), '<')->limit(25)->execute(); } elseif ($request->getData('ptype') === 'n') { - $view->setData('auditlogs',$queryMapper->where('id', (int) $request->getData('audit'), '>')->limit(25)->execute()); + $view->data['auditlogs',$queryMapper->where('id'] = (int) $request->getData('audit'), '>')->limit(25)->execute(); } else { - $view->setData('auditlogs',$queryMapper->where('id', 0, '>')->limit(25)->execute()); + $view->data['auditlogs',$queryMapper->where('id'] = 0, '>')->limit(25)->execute(); } return $view; @@ -595,10 +593,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-route-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $module = $request->getDataString('id') ?? ''; - $view->setData('module', $module); + $view->data['module'] = $module; $appPath = __DIR__ . '/../../../Web'; $activeRoutes = []; @@ -624,7 +622,7 @@ final class BackendController extends Controller $activeRoutes['Socket'] = include __DIR__ . '/../../../Socket/Routes.php'; } - $view->setData('routes', $activeRoutes); + $view->data['routes'] = $activeRoutes; return $view; } @@ -644,10 +642,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-hook-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $module = $request->getDataString('id') ?? ''; - $view->setData('module', $module); + $view->data['module'] = $module; $appPath = __DIR__ . '/../../../Web'; $activeHooks = []; @@ -673,7 +671,7 @@ final class BackendController extends Controller $activeHooks['Socket'] = include __DIR__ . '/../../../Socket/Hooks.php'; } - $view->setData('hooks', $activeHooks); + $view->data['hooks'] = $activeHooks; return $view; } @@ -692,14 +690,14 @@ final class BackendController extends Controller public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $id = $request->getDataString('id') ?? ''; /** @var null|\Model\NullSetting|\Model\Setting[] $settings */ $settings = SettingMapper::getAll()->where('module', $id)->execute(); if ($settings->id > 0) { - $view->setData('settings', \is_array($settings) ? $settings : [$settings]); + $view->data['settings'] = \is_array($settings) ? $settings : [$settings]; } $class = '\\Modules\\' . $request->getData('id') . '\\Models\\SettingsEnum'; @@ -707,7 +705,7 @@ final class BackendController extends Controller $class = null; } - $view->setData('settings_class', $class); + $view->data['settings_class'] = $class; if ($request->getData('id') === 'Admin') { $view->setTemplate('/Modules/' . $request->getData('id') . '/Admin/Settings/Theme/Backend/settings'); @@ -727,8 +725,8 @@ final class BackendController extends Controller module: 'Admin' ); - $view->setData('generalSettings', $generalSettings); - $view->setData('defaultlocalization', LocalizationMapper::get()->where('id', (int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION]->content)->execute()); + $view->data['generalSettings'] = $generalSettings; + $view->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION]->content)->execute(); return $view; } diff --git a/Controller/CliController.php b/Controller/CliController.php index 9c9b01b..ac03ee4 100755 --- a/Controller/CliController.php +++ b/Controller/CliController.php @@ -84,7 +84,7 @@ final class CliController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Cli/event-result'); - $view->setData('event', $event); + $view->data['event'] = $event; return $view; } diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php index f61af8b..2129480 100755 --- a/Theme/Backend/accounts-create.tpl.php +++ b/Theme/Backend/accounts-create.tpl.php @@ -17,7 +17,7 @@ use phpOMS\Account\AccountType; use phpOMS\Uri\UriFactory; /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php index 41a0489..ee1799c 100755 --- a/Theme/Backend/accounts-list.tpl.php +++ b/Theme/Backend/accounts-list.tpl.php @@ -19,9 +19,9 @@ use phpOMS\Uri\UriFactory; * @var \phpOMS\Views\View $this * @var \Modules\Admin\Models\Account[] $accounts */ -$accounts = $this->getData('accounts') ?? []; +$accounts = $this->data['accounts'] ?? []; -$tableView = $this->getData('tableView'); +$tableView = $this->data['tableView']; $tableView->id = 'accountsList'; $tableView->baseUri = 'admin/account/list'; $tableView->exportUri = '{/api}admin/account/list/export'; @@ -38,7 +38,7 @@ $next = $tableView->getNextLink( $this->getData('hasNext') ?? false ); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index e1692f6..be97002 100755 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -35,9 +35,9 @@ use phpOMS\Utils\Converter\WeightType; /** * @var \phpOMS\Views\View $this */ -$account = $this->getData('account'); -$permissions = $this->getData('permissions'); -$audits = $this->getData('auditlogs') ?? []; +$account = $this->data['account']; +$permissions = $this->data['permissions']; +$audits = $this->data['auditlogs'] ?? []; $l11n = $account->l11n; $previous = empty($audits) @@ -47,7 +47,7 @@ $next = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/account/settings?id={?id}#{\#}' : 'admin/account/settings?{?}&audit=' . \end($audits)->id . '&ptype=n#{\#}'; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php index 5f3e0d9..fde9d11 100755 --- a/Theme/Backend/groups-create.tpl.php +++ b/Theme/Backend/groups-create.tpl.php @@ -16,7 +16,7 @@ use phpOMS\Account\GroupStatus; use phpOMS\Uri\UriFactory; /** @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php index 0452785..e4888a4 100755 --- a/Theme/Backend/groups-list.tpl.php +++ b/Theme/Backend/groups-list.tpl.php @@ -19,10 +19,10 @@ use phpOMS\Uri\UriFactory; * @var \phpOMS\Views\View $this * @var \Modules\Admin\Models\Group[] $groups */ -$groups = $this->getData('groups') ?? []; -$memberCount = $this->getData('memberCount') ?? []; +$groups = $this->data['groups'] ?? []; +$memberCount = $this->data['memberCount'] ?? []; -$tableView = $this->getData('tableView'); +$tableView = $this->data['tableView']; $tableView->id = 'groupsList'; $tableView->baseUri = 'admin/group/list'; $tableView->exportUri = '{/api}admin/group/list/export'; @@ -39,7 +39,7 @@ $next = $tableView->getNextLink( $this->getData('hasNext') ?? false ); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php index 8b6542c..b0ed982 100755 --- a/Theme/Backend/groups-single.tpl.php +++ b/Theme/Backend/groups-single.tpl.php @@ -21,10 +21,10 @@ use phpOMS\Uri\UriFactory; /** * @var \phpOMS\Views\View $this */ -$group = $this->getData('group'); -$permissions = $this->getData('permissions'); +$group = $this->data['group']; +$permissions = $this->data['permissions']; $accounts = $group->getAccounts(); -$audits = $this->getData('auditlogs') ?? []; +$audits = $this->data['auditlogs'] ?? []; $previous = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/group/settings?id={?id}#{\#}' @@ -33,7 +33,7 @@ $next = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/group/settings?id={?id}#{\#}' : 'admin/group/settings?{?}&audit=' . \end($audits)->id . '&ptype=n#{\#}'; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/modules-hook-list.tpl.php b/Theme/Backend/modules-hook-list.tpl.php index 362f7b1..3193818 100755 --- a/Theme/Backend/modules-hook-list.tpl.php +++ b/Theme/Backend/modules-hook-list.tpl.php @@ -15,10 +15,10 @@ declare(strict_types=1); /** * @var \phpOMS\Views\View $this */ -$hooks = $this->getData('hooks') ?? []; +$hooks = $this->data['hooks'] ?? []; $module = $this->getData('module') ?? ''; -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/modules-info.tpl.php b/Theme/Backend/modules-info.tpl.php index 89a38f5..efd3967 100755 --- a/Theme/Backend/modules-info.tpl.php +++ b/Theme/Backend/modules-info.tpl.php @@ -18,13 +18,13 @@ use phpOMS\Uri\UriFactory; /** * @var \phpOMS\Views\View $this */ -$modules = $this->getData('modules'); -$active = $this->getData('active'); -$installed = $this->getData('installed'); -$id = $this->getData('id'); +$modules = $this->data['modules']; +$active = $this->data['active']; +$installed = $this->data['installed']; +$id = $this->data['id']; if (isset($installed[$id])) { - echo $this->getData('nav')->render(); + echo $this->data['nav']->render(); } ?> @@ -93,7 +93,7 @@ if (isset($installed[$id])) {
-
getData('introduction'); ?>
+
data['introduction']; ?>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php index ada4643..a2da760 100755 --- a/Theme/Backend/modules-list.tpl.php +++ b/Theme/Backend/modules-list.tpl.php @@ -19,11 +19,11 @@ use phpOMS\Uri\UriFactory; * @var \phpOMS\Views\View $this */ -$modules = $this->getData('modules') ?? []; -$active = $this->getData('active') ?? []; -$installed = $this->getData('installed') ?? []; +$modules = $this->data['modules'] ?? []; +$active = $this->data['active'] ?? []; +$installed = $this->data['installed'] ?? []; -$tableView = $this->getData('tableView'); +$tableView = $this->data['tableView']; $tableView->id = 'moduleList'; $tableView->baseUri = 'admin/module/list'; $tableView->exportUri = '{/api}admin/module/list/export'; diff --git a/Theme/Backend/modules-log.tpl.php b/Theme/Backend/modules-log.tpl.php index 9c2e77b..cebc9e9 100755 --- a/Theme/Backend/modules-log.tpl.php +++ b/Theme/Backend/modules-log.tpl.php @@ -18,12 +18,12 @@ use phpOMS\Uri\UriFactory; /** * @var \phpOMS\Views\View $this */ -$audits = $this->getData('auditlogs') ?? []; +$audits = $this->data['auditlogs'] ?? []; $previous = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \reset($audits)->id . '&ptype=p#{\#}'; $next = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \end($audits)->id . '&ptype=n#{\#}'; -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/modules-route-list.tpl.php b/Theme/Backend/modules-route-list.tpl.php index 2290b8d..0927b1b 100755 --- a/Theme/Backend/modules-route-list.tpl.php +++ b/Theme/Backend/modules-route-list.tpl.php @@ -17,10 +17,10 @@ use phpOMS\Router\RouteVerb; /** * @var \phpOMS\Views\View $this */ -$routes = $this->getData('routes') ?? []; +$routes = $this->data['routes'] ?? []; $module = $this->getData('module') ?? ''; -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/modules-settings.tpl.php b/Theme/Backend/modules-settings.tpl.php index a9f6826..c5f43b0 100755 --- a/Theme/Backend/modules-settings.tpl.php +++ b/Theme/Backend/modules-settings.tpl.php @@ -15,14 +15,14 @@ declare(strict_types=1); /** * @var \phpOMS\Views\View $this */ -$settings = $this->getData('settings') ?? []; +$settings = $this->data['settings'] ?? []; -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); if ($this->hasData('settingsTpl') && \is_file($this->getData('settingsTpl')) ) : - include $this->getData('settingsTpl'); + include $this->data['settingsTpl']; else : ?>
diff --git a/Theme/Backend/page-list.tpl.php b/Theme/Backend/page-list.tpl.php index fb19380..6df09e6 100755 --- a/Theme/Backend/page-list.tpl.php +++ b/Theme/Backend/page-list.tpl.php @@ -19,12 +19,12 @@ use phpOMS\Uri\UriFactory; * @var \phpOMS\Views\View $this * @var \Modules\Admin\Models\Page[] $pages */ -$pages = $this->getData('pages') ?? []; +$pages = $this->data['pages'] ?? []; $previous = empty($pages) ? 'admin/page/list' : '{/base}/admin/page/list?{?}&id=' . \reset($pages)->id . '&ptype=p'; $next = empty($pages) ? 'admin/page/list' : '{/base}/admin/page/list?{?}&id=' . \end($pages)->id . '&ptype=n'; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index 4748868..2b8400b 100755 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -19,8 +19,8 @@ use phpOMS\Uri\UriFactory; /** * @var \phpOMS\Views\View $this */ -$generalSettings = $this->getData('generalSettings') ?? []; -$settings = $this->getData('settings') ?? []; +$generalSettings = $this->data['generalSettings'] ?? []; +$settings = $this->data['settings'] ?? []; $countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants(); $countries = \phpOMS\Localization\ISO3166NameEnum::getConstants();