diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 333509e..d77a62f 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -22,12 +22,12 @@ use Modules\Admin\Models\Account; use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountPermission; use Modules\Admin\Models\AccountPermissionMapper; -use Modules\Admin\Models\ModuleMapper; use Modules\Admin\Models\Group; use Modules\Admin\Models\GroupMapper; use Modules\Admin\Models\GroupPermission; use Modules\Admin\Models\GroupPermissionMapper; use Modules\Admin\Models\LocalizationMapper; +use Modules\Admin\Models\ModuleMapper; use Modules\Admin\Models\ModuleStatusUpdateType; use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\PermissionState; @@ -63,9 +63,9 @@ use phpOMS\System\MimeType; use phpOMS\Uri\HttpUri; use phpOMS\Uri\UriFactory; use phpOMS\Utils\Parser\Markdown\Markdown; +use phpOMS\Utils\StringUtils; use phpOMS\Validation\Network\Email as EmailValidator; use phpOMS\Version\Version; -use phpOMS\Utils\StringUtils; /** * Admin controller class. @@ -283,7 +283,7 @@ final class ApiController extends Controller 'id' => $id, 'name' => $name, 'content' => $content, - 'app' => $app, + 'app' => $app, 'module' => $module, 'group' => $group, 'account' => $account, @@ -521,8 +521,8 @@ final class ApiController extends Controller } } - $app = new App(); - $app->name = $request->getData('appName') ?? ''; + $app = new App(); + $app->name = $request->getData('appName') ?? ''; $app->theme = $request->getData('theme') ?? ''; AppMapper::create($app); @@ -1083,7 +1083,7 @@ final class ApiController extends Controller 'PRE:Module:Admin-module-status-update', '', [ $request->header->account, - ['status' => $status, 'module' => $module] + ['status' => $status, 'module' => $module], ] ); switch ($status) { @@ -1123,7 +1123,7 @@ final class ApiController extends Controller StringUtils::intHash(ModuleMapper::class), 'module-status', $module, self::MODULE_NAME, - $request->getOrigin() + $request->getOrigin(), ] ); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index ae13370..f2b89db 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -30,9 +30,9 @@ use phpOMS\Contract\RenderableInterface; use phpOMS\DataStorage\Database\RelationType; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; +use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\StringUtils; use phpOMS\Views\View; -use phpOMS\Utils\Parser\Markdown\Markdown; /** * Admin controller class. diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index ef0d505..4f37a8e 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -14,22 +14,22 @@ declare(strict_types=1); return [ 'Navigation' => [ - 'Admin' => 'Admin', - 'Create' => 'Create', - 'Front' => 'Front', - 'General' => 'General', - 'Groups' => 'Groups', - 'List' => 'List', - 'Members' => 'Members', - 'Modules' => 'Modules', - 'Settings' => 'Settings', - 'Log' => 'Log', - 'Info' => 'Info', - 'Account' => 'Account', - 'Pages' => 'Pages', + 'Admin' => 'Admin', + 'Create' => 'Create', + 'Front' => 'Front', + 'General' => 'General', + 'Groups' => 'Groups', + 'List' => 'List', + 'Members' => 'Members', + 'Modules' => 'Modules', + 'Settings' => 'Settings', + 'Log' => 'Log', + 'Info' => 'Info', + 'Account' => 'Account', + 'Pages' => 'Pages', 'Permissions' => 'Permissions', - 'Navigation' => 'Navigation', - 'Routes' => 'Routes', - 'Accounts' => 'Accounts', + 'Navigation' => 'Navigation', + 'Routes' => 'Routes', + 'Accounts' => 'Accounts', ], ]; diff --git a/Theme/Backend/page-list.tpl.php b/Theme/Backend/page-list.tpl.php index b88c454..7840ada 100644 --- a/Theme/Backend/page-list.tpl.php +++ b/Theme/Backend/page-list.tpl.php @@ -15,7 +15,7 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; /** - * @var \phpOMS\Views\View $this + * @var \phpOMS\Views\View $this * @var \Modules\Admin\Models\Page[] $pages */ $pages = $this->getData('pages') ?? [];