| @@ -4,9 +4,8 @@ | ||
| 4 | 4 | |
| 5 | 5 | namespace UserAccessManager\Controller\Backend; |
| 6 | 6 | |
| 7 | 7 | use UserAccessManager\Config\WordpressConfig; |
| 8 | -use UserAccessManager\Controller\Backend\Administration\SetupController; | |
| 9 | 8 | use UserAccessManager\Controller\Controller; |
| 10 | 9 | use UserAccessManager\Setup\Database\MissingColumnsException; |
| 11 | 10 | use UserAccessManager\Setup\SetupHandler; |
| 12 | 11 | use UserAccessManager\User\UserHandler; |
| @@ -19,15 +18,10 @@ | ||
| 19 | 18 | public const HANDLE_STYLE_ADMIN = 'UserAccessManagerAdmin'; |
| 20 | 19 | public const HANDLE_SCRIPT_GROUP_SUGGEST = 'UserAccessManagerGroupSuggest'; |
| 21 | 20 | public const HANDLE_SCRIPT_TIME_INPUT = 'UserAccessManagerTimeInput'; |
| 22 | 21 | public const HANDLE_SCRIPT_ADMIN = 'UserAccessManagerFunctions'; |
| 22 | + public const UAM_ERRORS = 'UAM_ERRORS'; | |
| 23 | 23 | |
| 24 | - private const ADMIN_SCRIPTS = [ | |
| 25 | - self::HANDLE_SCRIPT_GROUP_SUGGEST => 'assets/js/jquery.uam-group-suggest.js', | |
| 26 | - self::HANDLE_SCRIPT_TIME_INPUT => 'assets/js/jquery.uam-time-input.js', | |
| 27 | - self::HANDLE_SCRIPT_ADMIN => 'assets/js/functions.js' | |
| 28 | - ]; | |
| 29 | - | |
| 30 | 24 | private string $notice = ''; |
| 31 | 25 | |
| 32 | 26 | public function __construct( |
| 33 | 27 | Php $php, |
| @@ -43,9 +37,9 @@ | ||
| 43 | 37 | * @throws MissingColumnsException |
| 44 | 38 | */ |
| 45 | 39 | public function showAdminNotice(): void |
| 46 | 40 | { |
| 47 | - $messages = $_SESSION[self::UAM_ERRORS] ?? []; | |
| 41 | + $messages = isset($_SESSION[self::UAM_ERRORS]) === true ? $_SESSION[self::UAM_ERRORS] : []; | |
| 48 | 42 | $updateAction = $this->getRequestParameter('uam_update_db'); |
| 49 | 43 | |
| 50 | 44 | if ($this->setupHandler->getDatabaseHandler()->isDatabaseUpdateNecessary() === true |
| 51 | 45 | && $updateAction !== SetupController::UPDATE_BLOG |
| @@ -76,16 +70,28 @@ | ||
| 76 | 70 | UserAccessManager::VERSION, |
| 77 | 71 | 'screen' |
| 78 | 72 | ); |
| 79 | 73 | |
| 80 | - foreach (self::ADMIN_SCRIPTS as $handle => $scriptPath) { | |
| 81 | - $this->wordpress->registerScript( | |
| 82 | - $handle, | |
| 83 | - $urlPath . $scriptPath, | |
| 84 | - ['jquery'], | |
| 85 | - UserAccessManager::VERSION | |
| 86 | - ); | |
| 87 | - } | |
| 74 | + $this->wordpress->registerScript( | |
| 75 | + self::HANDLE_SCRIPT_GROUP_SUGGEST, | |
| 76 | + $urlPath . 'assets/js/jquery.uam-group-suggest.js', | |
| 77 | + ['jquery'], | |
| 78 | + UserAccessManager::VERSION | |
| 79 | + ); | |
| 80 | + | |
| 81 | + $this->wordpress->registerScript( | |
| 82 | + self::HANDLE_SCRIPT_TIME_INPUT, | |
| 83 | + $urlPath . 'assets/js/jquery.uam-time-input.js', | |
| 84 | + ['jquery'], | |
| 85 | + UserAccessManager::VERSION | |
| 86 | + ); | |
| 87 | + | |
| 88 | + $this->wordpress->registerScript( | |
| 89 | + self::HANDLE_SCRIPT_ADMIN, | |
| 90 | + $urlPath . 'assets/js/functions.js', | |
| 91 | + ['jquery'], | |
| 92 | + UserAccessManager::VERSION | |
| 93 | + ); | |
| 88 | 94 | } |
| 89 | 95 | |
| 90 | 96 | public function enqueueStylesAndScripts(): void |
| 91 | 97 | { |
| @@ -90,12 +96,11 @@ | ||
| 90 | 96 | public function enqueueStylesAndScripts(): void |
| 91 | 97 | { |
| 92 | 98 | $this->registerStylesAndScripts(); |
| 93 | 99 | $this->wordpress->enqueueStyle(self::HANDLE_STYLE_ADMIN); |
| 94 | - | |
| 95 | - foreach (array_keys(self::ADMIN_SCRIPTS) as $handle) { | |
| 96 | - $this->wordpress->enqueueScript($handle); | |
| 97 | - } | |
| 100 | + $this->wordpress->enqueueScript(self::HANDLE_SCRIPT_GROUP_SUGGEST); | |
| 101 | + $this->wordpress->enqueueScript(self::HANDLE_SCRIPT_TIME_INPUT); | |
| 102 | + $this->wordpress->enqueueScript(self::HANDLE_SCRIPT_ADMIN); | |
| 98 | 103 | } |
| 99 | 104 | |
| 100 | 105 | public function setupAdminDashboard(): void |
| 101 | 106 | { |
