From 56d0d6ed295b2952fd5d55e1e7bf0b19e9fe212c Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Sun, 29 Aug 2021 09:16:09 +0000 Subject: [PATCH] Automated formatting changes --- Controller/ApiController.php | 2 +- Controller/BackendController.php | 3 +- Theme/Backend/Lang/Navigation.en.lang.php | 24 +- Theme/Backend/Lang/en.lang.php | 338 +++++++++++----------- Theme/Backend/modules-info.tpl.php | 1 - Theme/Backend/modules-log.tpl.php | 1 - Theme/Backend/modules-settings.tpl.php | 4 - Theme/Backend/settings-general.tpl.php | 2 +- 8 files changed, 184 insertions(+), 191 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9e048b3..d9fb241 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -58,10 +58,10 @@ use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\File; use phpOMS\System\MimeType; use phpOMS\Uri\HttpUri; +use phpOMS\Uri\UriFactory; use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Validation\Network\Email as EmailValidator; use phpOMS\Version\Version; -use phpOMS\Uri\UriFactory; /** * Admin controller class. diff --git a/Controller/BackendController.php b/Controller/BackendController.php index b2dcd4d..ba500f8 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\Admin\Controller; -use Model\SettingMapper; use Model\NullSetting; +use Model\SettingMapper; use Model\SettingsEnum; use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountPermissionMapper; @@ -30,7 +30,6 @@ use phpOMS\Contract\RenderableInterface; use phpOMS\DataStorage\Database\RelationType; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Module\ModuleInfo; use phpOMS\Utils\StringUtils; use phpOMS\Views\View; diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index cc63fac..5b453dd 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -14,18 +14,18 @@ declare(strict_types=1); return [ 'Navigation' => [ - 'Admin' => 'Admin', - 'Create' => 'Create', - 'Front' => 'Front', - 'General' => 'General', - 'Groups' => 'Groups', - 'List' => 'List', - 'Members' => 'Members', - 'Modules' => 'Modules', + 'Admin' => 'Admin', + 'Create' => 'Create', + 'Front' => 'Front', + 'General' => 'General', + 'Groups' => 'Groups', + 'List' => 'List', + 'Members' => 'Members', + 'Modules' => 'Modules', 'Settings' => 'Settings', - 'Log' => 'Log', - 'Info' => 'Info', - 'Account' => 'Account', - 'Accounts' => 'Accounts', + 'Log' => 'Log', + 'Info' => 'Info', + 'Account' => 'Account', + 'Accounts' => 'Accounts', ], ]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 52bd403..b18bda9 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,174 +13,174 @@ declare(strict_types=1); return ['Admin' => [ - ':s1' => 'Active', - ':s2' => 'Inactive', - ':s3' => 'Timeout', - ':s4' => 'Banned', - 'Account' => 'Account', - 'Account/Group' => 'Account/Group', - 'Accounts' => 'Accounts', - 'Activate' => 'Activate', - 'Active' => 'Active', - 'Activity' => 'Activity', - 'Address' => 'Address', - 'All' => 'All', - 'Amount' => 'Amount', - 'App' => 'App', - 'Area' => 'Area', - 'AuditLog' => 'Audit Log', - 'Available' => 'Available', - 'Banned' => 'Banned', - 'Cache' => 'Cache', - 'Change' => 'Change', - 'Children' => 'Children', - 'City' => 'City', - 'Close' => 'Close', - 'Comp' => 'Comp.', - 'Component' => 'Component', - 'Country' => 'Country', - 'Create' => 'Create', - 'CreateProfile' => 'Create Profile', - 'Created' => 'Created', - 'CreatedBy' => 'Created By', - 'Currency' => 'Currency', - 'Currencyformat' => 'Currency Format', - 'Customized' => 'Customized', - 'Deactivate' => 'Deactivate', - 'DecimalPoint' => 'Decimal Point', - 'Defaults' => 'Defaults', - 'Delete' => 'Delete', - 'Description' => 'Description', - 'Design' => 'Design', - 'Ele' => 'Ele.', - 'Element' => 'Element', - 'Email' => 'Email', - 'EmailAdmin' => 'Email Admin', - 'Fast' => 'Fast', - 'Features' => 'Features', - 'File' => 'File', - 'General' => 'General', - 'Glass' => 'Glass', - 'Group' => 'Group', - 'GroupStatus1' => 'Active', - 'GroupStatus2' => 'Inactive', - 'GroupStatus4' => 'Hidden', - 'Groups' => 'Groups', - 'Heavy' => 'Heavy', - 'Inactive' => 'Inactive', - 'Install' => 'Install', - 'Installed' => 'Installed', - 'Images' => 'Images', - 'LAddress' => 'Local Address', - 'Language' => 'Language', - 'Large' => 'Large', - 'Length' => 'Length', - 'Light' => 'Light', - 'Load' => 'Load', - 'Localization' => 'Localization', - 'Log' => 'Log', - 'LogPath' => 'Log Path', - 'Logging' => 'Logging', - 'LoginRetries' => 'Login Retries', - 'Loginname' => 'Login Name', + ':s1' => 'Active', + ':s2' => 'Inactive', + ':s3' => 'Timeout', + ':s4' => 'Banned', + 'Account' => 'Account', + 'Account/Group' => 'Account/Group', + 'Accounts' => 'Accounts', + 'Activate' => 'Activate', + 'Active' => 'Active', + 'Activity' => 'Activity', + 'Address' => 'Address', + 'All' => 'All', + 'Amount' => 'Amount', + 'App' => 'App', + 'Area' => 'Area', + 'AuditLog' => 'Audit Log', + 'Available' => 'Available', + 'Banned' => 'Banned', + 'Cache' => 'Cache', + 'Change' => 'Change', + 'Children' => 'Children', + 'City' => 'City', + 'Close' => 'Close', + 'Comp' => 'Comp.', + 'Component' => 'Component', + 'Country' => 'Country', + 'Create' => 'Create', + 'CreateProfile' => 'Create Profile', + 'Created' => 'Created', + 'CreatedBy' => 'Created By', + 'Currency' => 'Currency', + 'Currencyformat' => 'Currency Format', + 'Customized' => 'Customized', + 'Deactivate' => 'Deactivate', + 'DecimalPoint' => 'Decimal Point', + 'Defaults' => 'Defaults', + 'Delete' => 'Delete', + 'Description' => 'Description', + 'Design' => 'Design', + 'Ele' => 'Ele.', + 'Element' => 'Element', + 'Email' => 'Email', + 'EmailAdmin' => 'Email Admin', + 'Fast' => 'Fast', + 'Features' => 'Features', + 'File' => 'File', + 'General' => 'General', + 'Glass' => 'Glass', + 'Group' => 'Group', + 'GroupStatus1' => 'Active', + 'GroupStatus2' => 'Inactive', + 'GroupStatus4' => 'Hidden', + 'Groups' => 'Groups', + 'Heavy' => 'Heavy', + 'Inactive' => 'Inactive', + 'Install' => 'Install', + 'Installed' => 'Installed', + 'Images' => 'Images', + 'LAddress' => 'Local Address', + 'Language' => 'Language', + 'Large' => 'Large', + 'Length' => 'Length', + 'Light' => 'Light', + 'Load' => 'Load', + 'Localization' => 'Localization', + 'Log' => 'Log', + 'LogPath' => 'Log Path', + 'Logging' => 'Logging', + 'LoginRetries' => 'Login Retries', + 'Loginname' => 'Login Name', 'LoginImage' => 'Login Image', - 'Long' => 'Long', - 'Lowercase' => 'Lowercase', - 'Maintenance' => 'Maintenance', - 'Medium' => 'Medium', - 'Member' => 'Member', - 'Members' => 'Members', - 'Memcache' => 'Memcache', - 'MemoryLimit' => 'Memory Limit', - 'Message' => 'Message', - 'Module' => 'Module', - 'Modules' => 'Modules', - 'Name' => 'Name', - 'Name1' => 'Name 1', - 'Name2' => 'Name 2', - 'Name3' => 'Name 3', - 'None' => 'None', - 'Numberformat' => 'Numberformat', - 'Numeric' => 'Numeric', - 'Organization' => 'Organization', - 'OrganizationName' => 'Organization Name', - 'Page' => 'Page', - 'Parent' => 'Parent', - 'Parents' => 'Parents', - 'Password' => 'Password', - 'PasswordChangeInterval' => 'Password Change Interval (days)', - 'PasswordHistory' => 'Password History', - 'PasswordRegex' => 'Password Regex', - 'Perm' => 'Perm.', - 'Permission' => 'Permission', - 'Permissions' => 'Permissions', - 'Person' => 'Person', - 'Precision' => 'Precision', - 'Profile' => 'Profile', - 'RAddress' => 'Remote Address', - 'ReCache' => 'Re-Cache', - 'Read' => 'Read', - 'Release' => 'Release', - 'Reset' => 'Reset', - 'Running' => 'Running', - 'Sea' => 'Sea', - 'Search' => 'Search', - 'Security' => 'Security', - 'Settings' => 'Settings', - 'SettingsGeneral' => 'Settings - General', - 'Short' => 'Short', - 'Single' => 'Single', - 'Slow' => 'Slow', - 'Small' => 'Small', - 'Specialchar' => 'Special character', - 'Speed' => 'Speed', - 'Status' => 'Status', - 'Status0' => 'None', - 'Status1' => 'Active', - 'Status2' => 'Inactive', - 'Status3' => 'Timehout', - 'Status4' => 'Banned', - 'Tablespoon' => 'Tablespoon', - 'Teaspoon' => 'Teaspoon', - 'Temperature' => 'Temperature', - 'Theme' => 'Theme', - 'ThousandsSeparator' => 'Thousands Separator', - 'Time' => 'Time', - 'Timeformat' => 'Timeformat', - 'Timeout' => 'Timeout', - 'TimeoutPeriod' => 'Timeout Period (minutes)', - 'Timestamp' => 'Timestamp', - 'Timezone' => 'Timezone', - 'Total' => 'Total', - 'Type' => 'Type', - 'Uninstall' => 'Uninstall', - 'Unit' => 'Unit', - 'Update' => 'Update', - 'Uppercase' => 'Uppercase', - 'Username' => 'Username', - 'Version' => 'Version', - 'VeryFast' => 'Very Fast', - 'VeryHeavy' => 'Very Heavy', - 'VeryLarge' => 'Very Large', - 'VeryLight' => 'Very Light', - 'VeryLong' => 'Very Long', - 'VeryShort' => 'Very Short', - 'VerySlow' => 'Very Slow', - 'VerySmall' => 'Very Small', - 'Volume' => 'Volume', - 'Warnings' => 'Warnings', - 'Website' => 'Website', - 'Weight' => 'Weight', - 'Zip' => 'Zip', - 'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)', - '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:PasswordRegex' => 'Password requirement for users', - 'i:TimeoutPeriod' => 'Timeout period after too many logins', - 'i:loc' => 'IP address or URL for remote access.', - 'i:mail' => 'Email address.', - 'i:oname' => 'Organization name.', - 'i:rc' => 'Forcing re-cache for every user.', - 'i:rem' => 'IP address or URL for remote access.', - 'i:timef' => 'Time format.', + 'Long' => 'Long', + 'Lowercase' => 'Lowercase', + 'Maintenance' => 'Maintenance', + 'Medium' => 'Medium', + 'Member' => 'Member', + 'Members' => 'Members', + 'Memcache' => 'Memcache', + 'MemoryLimit' => 'Memory Limit', + 'Message' => 'Message', + 'Module' => 'Module', + 'Modules' => 'Modules', + 'Name' => 'Name', + 'Name1' => 'Name 1', + 'Name2' => 'Name 2', + 'Name3' => 'Name 3', + 'None' => 'None', + 'Numberformat' => 'Numberformat', + 'Numeric' => 'Numeric', + 'Organization' => 'Organization', + 'OrganizationName' => 'Organization Name', + 'Page' => 'Page', + 'Parent' => 'Parent', + 'Parents' => 'Parents', + 'Password' => 'Password', + 'PasswordChangeInterval' => 'Password Change Interval (days)', + 'PasswordHistory' => 'Password History', + 'PasswordRegex' => 'Password Regex', + 'Perm' => 'Perm.', + 'Permission' => 'Permission', + 'Permissions' => 'Permissions', + 'Person' => 'Person', + 'Precision' => 'Precision', + 'Profile' => 'Profile', + 'RAddress' => 'Remote Address', + 'ReCache' => 'Re-Cache', + 'Read' => 'Read', + 'Release' => 'Release', + 'Reset' => 'Reset', + 'Running' => 'Running', + 'Sea' => 'Sea', + 'Search' => 'Search', + 'Security' => 'Security', + 'Settings' => 'Settings', + 'SettingsGeneral' => 'Settings - General', + 'Short' => 'Short', + 'Single' => 'Single', + 'Slow' => 'Slow', + 'Small' => 'Small', + 'Specialchar' => 'Special character', + 'Speed' => 'Speed', + 'Status' => 'Status', + 'Status0' => 'None', + 'Status1' => 'Active', + 'Status2' => 'Inactive', + 'Status3' => 'Timehout', + 'Status4' => 'Banned', + 'Tablespoon' => 'Tablespoon', + 'Teaspoon' => 'Teaspoon', + 'Temperature' => 'Temperature', + 'Theme' => 'Theme', + 'ThousandsSeparator' => 'Thousands Separator', + 'Time' => 'Time', + 'Timeformat' => 'Timeformat', + 'Timeout' => 'Timeout', + 'TimeoutPeriod' => 'Timeout Period (minutes)', + 'Timestamp' => 'Timestamp', + 'Timezone' => 'Timezone', + 'Total' => 'Total', + 'Type' => 'Type', + 'Uninstall' => 'Uninstall', + 'Unit' => 'Unit', + 'Update' => 'Update', + 'Uppercase' => 'Uppercase', + 'Username' => 'Username', + 'Version' => 'Version', + 'VeryFast' => 'Very Fast', + 'VeryHeavy' => 'Very Heavy', + 'VeryLarge' => 'Very Large', + 'VeryLight' => 'Very Light', + 'VeryLong' => 'Very Long', + 'VeryShort' => 'Very Short', + 'VerySlow' => 'Very Slow', + 'VerySmall' => 'Very Small', + 'Volume' => 'Volume', + 'Warnings' => 'Warnings', + 'Website' => 'Website', + 'Weight' => 'Weight', + 'Zip' => 'Zip', + 'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)', + '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:PasswordRegex' => 'Password requirement for users', + 'i:TimeoutPeriod' => 'Timeout period after too many logins', + 'i:loc' => 'IP address or URL for remote access.', + 'i:mail' => 'Email address.', + 'i:oname' => 'Organization name.', + 'i:rc' => 'Forcing re-cache for every user.', + 'i:rem' => 'IP address or URL for remote access.', + 'i:timef' => 'Time format.', ]]; diff --git a/Theme/Backend/modules-info.tpl.php b/Theme/Backend/modules-info.tpl.php index 3697efe..237956c 100644 --- a/Theme/Backend/modules-info.tpl.php +++ b/Theme/Backend/modules-info.tpl.php @@ -13,7 +13,6 @@ declare(strict_types=1); use Modules\Admin\Models\ModuleStatusUpdateType; -use phpOMS\Message\Http\HttpHeader; use phpOMS\Uri\UriFactory; /** diff --git a/Theme/Backend/modules-log.tpl.php b/Theme/Backend/modules-log.tpl.php index 6a7b01f..b104766 100644 --- a/Theme/Backend/modules-log.tpl.php +++ b/Theme/Backend/modules-log.tpl.php @@ -12,7 +12,6 @@ */ declare(strict_types=1); -use Modules\Admin\Models\ModuleStatusUpdateType; use phpOMS\Message\Http\HttpHeader; use phpOMS\Uri\UriFactory; diff --git a/Theme/Backend/modules-settings.tpl.php b/Theme/Backend/modules-settings.tpl.php index 9cfdaca..d06384d 100755 --- a/Theme/Backend/modules-settings.tpl.php +++ b/Theme/Backend/modules-settings.tpl.php @@ -12,10 +12,6 @@ */ declare(strict_types=1); -use Modules\Admin\Models\ModuleStatusUpdateType; -use phpOMS\Message\Http\HttpHeader; -use phpOMS\Uri\UriFactory; - /** * @var \phpOMS\Views\View $this */ diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index 9ced5d6..e97bafc 100755 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -708,7 +708,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization(); - getId() . '&ptype=p'; $nextSettings = empty($settings) ? '{/prefix}admin/settings/general' : '{/prefix}admin/settings/general?{?}&sid=' . \end($settings)->getId() . '&ptype=n';