Continue with getter/setter cleanup

This commit is contained in:
Dennis Eichhorn 2023-05-30 15:44:14 +02:00
parent cde0fdc3f1
commit da627309c3
21 changed files with 111 additions and 113 deletions

View File

@ -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<array> $data */
$data = $this->getData('data') ?? [];
$data = $this->data['data'] ?? [];
include $media->getSourceByName('template.php')->getAbsolutePath();

View File

@ -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();

View File

@ -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<array> $data */
$data = $this->getData('data') ?? [];
$data = $this->data['data'] ?? [];
include $media->getSourceByName('template.php')->getAbsolutePath();

View File

@ -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();

View File

@ -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();
?>
<div id="iSettings" class="tabview tab-2 url-rewrite">

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">

View File

@ -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(); ?>
<div class="row">
<div class="col-xs-12">

View File

@ -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(); ?>
<div id="iaccount-tabs" class="tabview tab-2 url-rewrite">
<div class="box wf-100 col-xs-12">

View File

@ -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(); ?>
<div class="row">
<div class="col-xs-12 col-md-6">

View File

@ -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(); ?>
<div class="row">
<div class="col-xs-12">

View File

@ -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(); ?>
<div id="igroup-tabs" class="tabview tab-2 url-rewrite">
<div class="box wf-100 col-xs-12">

View File

@ -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();
?>
<div class="row">

View File

@ -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])) {
<div class="col-xs-12 col-md-8">
<div class="portlet">
<div class="portlet-body">
<article><?= $this->getData('introduction'); ?></article>
<article><?= $this->data['introduction']; ?></article>
</div>
</div>
</div>

View File

@ -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';

View File

@ -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();
?>
<div class="row">

View File

@ -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();
?>
<div class="row">

View File

@ -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 : ?>
<div class="row">
<div class="col-xs-12">

View File

@ -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(); ?>
<div class="row">
<div class="col-xs-12">

View File

@ -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();