Automated formatting changes

This commit is contained in:
Formatter Bot 2021-08-29 09:16:09 +00:00
parent fba7d2c382
commit 56d0d6ed29
8 changed files with 184 additions and 191 deletions

View File

@ -58,10 +58,10 @@ use phpOMS\System\File\Local\Directory;
use phpOMS\System\File\Local\File; use phpOMS\System\File\Local\File;
use phpOMS\System\MimeType; use phpOMS\System\MimeType;
use phpOMS\Uri\HttpUri; use phpOMS\Uri\HttpUri;
use phpOMS\Uri\UriFactory;
use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\Validation\Network\Email as EmailValidator; use phpOMS\Validation\Network\Email as EmailValidator;
use phpOMS\Version\Version; use phpOMS\Version\Version;
use phpOMS\Uri\UriFactory;
/** /**
* Admin controller class. * Admin controller class.

View File

@ -14,8 +14,8 @@ declare(strict_types=1);
namespace Modules\Admin\Controller; namespace Modules\Admin\Controller;
use Model\SettingMapper;
use Model\NullSetting; use Model\NullSetting;
use Model\SettingMapper;
use Model\SettingsEnum; use Model\SettingsEnum;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Admin\Models\AccountPermissionMapper; use Modules\Admin\Models\AccountPermissionMapper;
@ -30,7 +30,6 @@ use phpOMS\Contract\RenderableInterface;
use phpOMS\DataStorage\Database\RelationType; use phpOMS\DataStorage\Database\RelationType;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Module\ModuleInfo;
use phpOMS\Utils\StringUtils; use phpOMS\Utils\StringUtils;
use phpOMS\Views\View; use phpOMS\Views\View;

View File

@ -14,18 +14,18 @@ declare(strict_types=1);
return [ return [
'Navigation' => [ 'Navigation' => [
'Admin' => 'Admin', 'Admin' => 'Admin',
'Create' => 'Create', 'Create' => 'Create',
'Front' => 'Front', 'Front' => 'Front',
'General' => 'General', 'General' => 'General',
'Groups' => 'Groups', 'Groups' => 'Groups',
'List' => 'List', 'List' => 'List',
'Members' => 'Members', 'Members' => 'Members',
'Modules' => 'Modules', 'Modules' => 'Modules',
'Settings' => 'Settings', 'Settings' => 'Settings',
'Log' => 'Log', 'Log' => 'Log',
'Info' => 'Info', 'Info' => 'Info',
'Account' => 'Account', 'Account' => 'Account',
'Accounts' => 'Accounts', 'Accounts' => 'Accounts',
], ],
]; ];

View File

@ -13,174 +13,174 @@
declare(strict_types=1); declare(strict_types=1);
return ['Admin' => [ return ['Admin' => [
':s1' => 'Active', ':s1' => 'Active',
':s2' => 'Inactive', ':s2' => 'Inactive',
':s3' => 'Timeout', ':s3' => 'Timeout',
':s4' => 'Banned', ':s4' => 'Banned',
'Account' => 'Account', 'Account' => 'Account',
'Account/Group' => 'Account/Group', 'Account/Group' => 'Account/Group',
'Accounts' => 'Accounts', 'Accounts' => 'Accounts',
'Activate' => 'Activate', 'Activate' => 'Activate',
'Active' => 'Active', 'Active' => 'Active',
'Activity' => 'Activity', 'Activity' => 'Activity',
'Address' => 'Address', 'Address' => 'Address',
'All' => 'All', 'All' => 'All',
'Amount' => 'Amount', 'Amount' => 'Amount',
'App' => 'App', 'App' => 'App',
'Area' => 'Area', 'Area' => 'Area',
'AuditLog' => 'Audit Log', 'AuditLog' => 'Audit Log',
'Available' => 'Available', 'Available' => 'Available',
'Banned' => 'Banned', 'Banned' => 'Banned',
'Cache' => 'Cache', 'Cache' => 'Cache',
'Change' => 'Change', 'Change' => 'Change',
'Children' => 'Children', 'Children' => 'Children',
'City' => 'City', 'City' => 'City',
'Close' => 'Close', 'Close' => 'Close',
'Comp' => 'Comp.', 'Comp' => 'Comp.',
'Component' => 'Component', 'Component' => 'Component',
'Country' => 'Country', 'Country' => 'Country',
'Create' => 'Create', 'Create' => 'Create',
'CreateProfile' => 'Create Profile', 'CreateProfile' => 'Create Profile',
'Created' => 'Created', 'Created' => 'Created',
'CreatedBy' => 'Created By', 'CreatedBy' => 'Created By',
'Currency' => 'Currency', 'Currency' => 'Currency',
'Currencyformat' => 'Currency Format', 'Currencyformat' => 'Currency Format',
'Customized' => 'Customized', 'Customized' => 'Customized',
'Deactivate' => 'Deactivate', 'Deactivate' => 'Deactivate',
'DecimalPoint' => 'Decimal Point', 'DecimalPoint' => 'Decimal Point',
'Defaults' => 'Defaults', 'Defaults' => 'Defaults',
'Delete' => 'Delete', 'Delete' => 'Delete',
'Description' => 'Description', 'Description' => 'Description',
'Design' => 'Design', 'Design' => 'Design',
'Ele' => 'Ele.', 'Ele' => 'Ele.',
'Element' => 'Element', 'Element' => 'Element',
'Email' => 'Email', 'Email' => 'Email',
'EmailAdmin' => 'Email Admin', 'EmailAdmin' => 'Email Admin',
'Fast' => 'Fast', 'Fast' => 'Fast',
'Features' => 'Features', 'Features' => 'Features',
'File' => 'File', 'File' => 'File',
'General' => 'General', 'General' => 'General',
'Glass' => 'Glass', 'Glass' => 'Glass',
'Group' => 'Group', 'Group' => 'Group',
'GroupStatus1' => 'Active', 'GroupStatus1' => 'Active',
'GroupStatus2' => 'Inactive', 'GroupStatus2' => 'Inactive',
'GroupStatus4' => 'Hidden', 'GroupStatus4' => 'Hidden',
'Groups' => 'Groups', 'Groups' => 'Groups',
'Heavy' => 'Heavy', 'Heavy' => 'Heavy',
'Inactive' => 'Inactive', 'Inactive' => 'Inactive',
'Install' => 'Install', 'Install' => 'Install',
'Installed' => 'Installed', 'Installed' => 'Installed',
'Images' => 'Images', 'Images' => 'Images',
'LAddress' => 'Local Address', 'LAddress' => 'Local Address',
'Language' => 'Language', 'Language' => 'Language',
'Large' => 'Large', 'Large' => 'Large',
'Length' => 'Length', 'Length' => 'Length',
'Light' => 'Light', 'Light' => 'Light',
'Load' => 'Load', 'Load' => 'Load',
'Localization' => 'Localization', 'Localization' => 'Localization',
'Log' => 'Log', 'Log' => 'Log',
'LogPath' => 'Log Path', 'LogPath' => 'Log Path',
'Logging' => 'Logging', 'Logging' => 'Logging',
'LoginRetries' => 'Login Retries', 'LoginRetries' => 'Login Retries',
'Loginname' => 'Login Name', 'Loginname' => 'Login Name',
'LoginImage' => 'Login Image', 'LoginImage' => 'Login Image',
'Long' => 'Long', 'Long' => 'Long',
'Lowercase' => 'Lowercase', 'Lowercase' => 'Lowercase',
'Maintenance' => 'Maintenance', 'Maintenance' => 'Maintenance',
'Medium' => 'Medium', 'Medium' => 'Medium',
'Member' => 'Member', 'Member' => 'Member',
'Members' => 'Members', 'Members' => 'Members',
'Memcache' => 'Memcache', 'Memcache' => 'Memcache',
'MemoryLimit' => 'Memory Limit', 'MemoryLimit' => 'Memory Limit',
'Message' => 'Message', 'Message' => 'Message',
'Module' => 'Module', 'Module' => 'Module',
'Modules' => 'Modules', 'Modules' => 'Modules',
'Name' => 'Name', 'Name' => 'Name',
'Name1' => 'Name 1', 'Name1' => 'Name 1',
'Name2' => 'Name 2', 'Name2' => 'Name 2',
'Name3' => 'Name 3', 'Name3' => 'Name 3',
'None' => 'None', 'None' => 'None',
'Numberformat' => 'Numberformat', 'Numberformat' => 'Numberformat',
'Numeric' => 'Numeric', 'Numeric' => 'Numeric',
'Organization' => 'Organization', 'Organization' => 'Organization',
'OrganizationName' => 'Organization Name', 'OrganizationName' => 'Organization Name',
'Page' => 'Page', 'Page' => 'Page',
'Parent' => 'Parent', 'Parent' => 'Parent',
'Parents' => 'Parents', 'Parents' => 'Parents',
'Password' => 'Password', 'Password' => 'Password',
'PasswordChangeInterval' => 'Password Change Interval (days)', 'PasswordChangeInterval' => 'Password Change Interval (days)',
'PasswordHistory' => 'Password History', 'PasswordHistory' => 'Password History',
'PasswordRegex' => 'Password Regex', 'PasswordRegex' => 'Password Regex',
'Perm' => 'Perm.', 'Perm' => 'Perm.',
'Permission' => 'Permission', 'Permission' => 'Permission',
'Permissions' => 'Permissions', 'Permissions' => 'Permissions',
'Person' => 'Person', 'Person' => 'Person',
'Precision' => 'Precision', 'Precision' => 'Precision',
'Profile' => 'Profile', 'Profile' => 'Profile',
'RAddress' => 'Remote Address', 'RAddress' => 'Remote Address',
'ReCache' => 'Re-Cache', 'ReCache' => 'Re-Cache',
'Read' => 'Read', 'Read' => 'Read',
'Release' => 'Release', 'Release' => 'Release',
'Reset' => 'Reset', 'Reset' => 'Reset',
'Running' => 'Running', 'Running' => 'Running',
'Sea' => 'Sea', 'Sea' => 'Sea',
'Search' => 'Search', 'Search' => 'Search',
'Security' => 'Security', 'Security' => 'Security',
'Settings' => 'Settings', 'Settings' => 'Settings',
'SettingsGeneral' => 'Settings - General', 'SettingsGeneral' => 'Settings - General',
'Short' => 'Short', 'Short' => 'Short',
'Single' => 'Single', 'Single' => 'Single',
'Slow' => 'Slow', 'Slow' => 'Slow',
'Small' => 'Small', 'Small' => 'Small',
'Specialchar' => 'Special character', 'Specialchar' => 'Special character',
'Speed' => 'Speed', 'Speed' => 'Speed',
'Status' => 'Status', 'Status' => 'Status',
'Status0' => 'None', 'Status0' => 'None',
'Status1' => 'Active', 'Status1' => 'Active',
'Status2' => 'Inactive', 'Status2' => 'Inactive',
'Status3' => 'Timehout', 'Status3' => 'Timehout',
'Status4' => 'Banned', 'Status4' => 'Banned',
'Tablespoon' => 'Tablespoon', 'Tablespoon' => 'Tablespoon',
'Teaspoon' => 'Teaspoon', 'Teaspoon' => 'Teaspoon',
'Temperature' => 'Temperature', 'Temperature' => 'Temperature',
'Theme' => 'Theme', 'Theme' => 'Theme',
'ThousandsSeparator' => 'Thousands Separator', 'ThousandsSeparator' => 'Thousands Separator',
'Time' => 'Time', 'Time' => 'Time',
'Timeformat' => 'Timeformat', 'Timeformat' => 'Timeformat',
'Timeout' => 'Timeout', 'Timeout' => 'Timeout',
'TimeoutPeriod' => 'Timeout Period (minutes)', 'TimeoutPeriod' => 'Timeout Period (minutes)',
'Timestamp' => 'Timestamp', 'Timestamp' => 'Timestamp',
'Timezone' => 'Timezone', 'Timezone' => 'Timezone',
'Total' => 'Total', 'Total' => 'Total',
'Type' => 'Type', 'Type' => 'Type',
'Uninstall' => 'Uninstall', 'Uninstall' => 'Uninstall',
'Unit' => 'Unit', 'Unit' => 'Unit',
'Update' => 'Update', 'Update' => 'Update',
'Uppercase' => 'Uppercase', 'Uppercase' => 'Uppercase',
'Username' => 'Username', 'Username' => 'Username',
'Version' => 'Version', 'Version' => 'Version',
'VeryFast' => 'Very Fast', 'VeryFast' => 'Very Fast',
'VeryHeavy' => 'Very Heavy', 'VeryHeavy' => 'Very Heavy',
'VeryLarge' => 'Very Large', 'VeryLarge' => 'Very Large',
'VeryLight' => 'Very Light', 'VeryLight' => 'Very Light',
'VeryLong' => 'Very Long', 'VeryLong' => 'Very Long',
'VeryShort' => 'Very Short', 'VeryShort' => 'Very Short',
'VerySlow' => 'Very Slow', 'VerySlow' => 'Very Slow',
'VerySmall' => 'Very Small', 'VerySmall' => 'Very Small',
'Volume' => 'Volume', 'Volume' => 'Volume',
'Warnings' => 'Warnings', 'Warnings' => 'Warnings',
'Website' => 'Website', 'Website' => 'Website',
'Weight' => 'Weight', 'Weight' => 'Weight',
'Zip' => 'Zip', 'Zip' => 'Zip',
'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)', 'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)',
'i:PasswordChangeInterval' => 'Interval in which passwards need to be changed (-1 = never)', 'i:PasswordChangeInterval' => 'Interval in which passwards need to be changed (-1 = never)',
'i:PasswordHistory' => 'New password has to be different from the last N passwords', 'i:PasswordHistory' => 'New password has to be different from the last N passwords',
'i:PasswordRegex' => 'Password requirement for users', 'i:PasswordRegex' => 'Password requirement for users',
'i:TimeoutPeriod' => 'Timeout period after too many logins', 'i:TimeoutPeriod' => 'Timeout period after too many logins',
'i:loc' => 'IP address or URL for remote access.', 'i:loc' => 'IP address or URL for remote access.',
'i:mail' => 'Email address.', 'i:mail' => 'Email address.',
'i:oname' => 'Organization name.', 'i:oname' => 'Organization name.',
'i:rc' => 'Forcing re-cache for every user.', 'i:rc' => 'Forcing re-cache for every user.',
'i:rem' => 'IP address or URL for remote access.', 'i:rem' => 'IP address or URL for remote access.',
'i:timef' => 'Time format.', 'i:timef' => 'Time format.',
]]; ]];

View File

@ -13,7 +13,6 @@
declare(strict_types=1); declare(strict_types=1);
use Modules\Admin\Models\ModuleStatusUpdateType; use Modules\Admin\Models\ModuleStatusUpdateType;
use phpOMS\Message\Http\HttpHeader;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** /**

View File

@ -12,7 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use Modules\Admin\Models\ModuleStatusUpdateType;
use phpOMS\Message\Http\HttpHeader; use phpOMS\Message\Http\HttpHeader;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;

View File

@ -12,10 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use Modules\Admin\Models\ModuleStatusUpdateType;
use phpOMS\Message\Http\HttpHeader;
use phpOMS\Uri\UriFactory;
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */

View File

@ -708,7 +708,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
<i class="filter fa fa-filter"></i> <i class="filter fa fa-filter"></i>
</label> </label>
<tbody> <tbody>
<?php $count = 0; <?php $count = 0;
$previousSettings = empty($settings) ? '{/prefix}admin/settings/general' : '{/prefix}admin/settings/general?{?}&sid=' . \reset($settings)->getId() . '&ptype=p'; $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'; $nextSettings = empty($settings) ? '{/prefix}admin/settings/general' : '{/prefix}admin/settings/general?{?}&sid=' . \end($settings)->getId() . '&ptype=n';