Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-16 12:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automated formatting changes

Browse Source
This commit is contained in:
Formatter Bot 2021-04-04 15:13:05 +00:00
parent 3104ac6cbd
commit 872770844b
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Controller/ApiController.php
View File

@ -43,6 +43,9 @@ use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\RequestMethod; use phpOMS\Message\Http\RequestMethod;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\Http\Rest; use phpOMS\Message\Http\Rest;
use phpOMS\Message\Mail\Email;
use phpOMS\Message\Mail\MailHandler;
use phpOMS\Message\Mail\SubmitType;
use phpOMS\Message\NotificationLevel; use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
@ -57,11 +60,6 @@ use phpOMS\Uri\HttpUri;
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\Message\Mail\Email;
use phpOMS\Message\Mail\Imap;
use phpOMS\Message\Mail\MailHandler;
use phpOMS\Message\Mail\SubmitType;
use phpOMS\System\CharsetType;
/** /**
* Admin controller class. * Admin controller class.

6
Controller/BackendController.php
View File

@ -14,6 +14,7 @@ declare(strict_types=1);
namespace Modules\Admin\Controller; namespace Modules\Admin\Controller;
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;
@ -31,7 +32,6 @@ use phpOMS\Message\ResponseAbstract;
use phpOMS\Module\ModuleInfo; use phpOMS\Module\ModuleInfo;
use phpOMS\Utils\StringUtils; use phpOMS\Utils\StringUtils;
use phpOMS\Views\View; use phpOMS\Views\View;
use Model\SettingMapper;
/** /**
* Admin controller class. * Admin controller class.
@ -78,7 +78,7 @@ final class BackendController extends Controller
*/ */
public function viewSettingsGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewSettingsGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$generalSettings = $this->app->appSettings->get(null, [ $generalSettings = $this->app->appSettings->get(null, [
SettingsEnum::PASSWORD_PATTERN, SettingsEnum::LOGIN_TIMEOUT, SettingsEnum::PASSWORD_INTERVAL, SettingsEnum::PASSWORD_HISTORY, SettingsEnum::LOGIN_TRIES, SettingsEnum::LOGGING_STATUS, SettingsEnum::LOGGING_PATH, SettingsEnum::DEFAULT_ORGANIZATION, SettingsEnum::PASSWORD_PATTERN, SettingsEnum::LOGIN_TIMEOUT, SettingsEnum::PASSWORD_INTERVAL, SettingsEnum::PASSWORD_HISTORY, SettingsEnum::LOGIN_TRIES, SettingsEnum::LOGGING_STATUS, SettingsEnum::LOGGING_PATH, SettingsEnum::DEFAULT_ORGANIZATION,
SettingsEnum::LOGIN_STATUS, SettingsEnum::DEFAULT_LOCALIZATION, SettingsEnum::ADMIN_MAIL, SettingsEnum::LOGIN_STATUS, SettingsEnum::DEFAULT_LOCALIZATION, SettingsEnum::ADMIN_MAIL,
@ -90,8 +90,6 @@ final class BackendController extends Controller
$view->setData('defaultlocalization', LocalizationMapper::get((int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION])); $view->setData('defaultlocalization', LocalizationMapper::get((int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION]));
$view->setData('settings', SettingMapper::getAll()); $view->setData('settings', SettingMapper::getAll());
return $view; return $view;
} }

4
Models/Address.php
View File

@ -49,7 +49,7 @@ class Address extends Location
{ {
$data = parent::toArray(); $data = parent::toArray();
$data['name'] = $this->name; $data['name'] = $this->name;
$data['addition'] = $this->addition; $data['addition'] = $this->addition;
return $data; return $data;
@ -80,7 +80,7 @@ class Address extends Location
$data = \json_decode($serialized, true); $data = \json_decode($serialized, true);
$this->name = $data['name']; $this->name = $data['name'];
$this->addition = $data['addition']; $this->addition = $data['addition'];
} }
} }

2
Theme/Backend/settings-general.tpl.php
View File

@ -20,7 +20,7 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
$generalSettings = $this->getData('generalSettings') ?? []; $generalSettings = $this->getData('generalSettings') ?? [];
$settings = $this->getData('settings') ?? []; $settings = $this->getData('settings') ?? [];
$countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants(); $countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants();
$countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); $countries = \phpOMS\Localization\ISO3166NameEnum::getConstants();