← All changes
|
src/Controller/Backend/DynamicGroupsController.php
+24
-12
2.3.17
→
2.1.11
View file →
| @@ -1,21 +1,33 @@ | ||
| 1 | 1 | <?php |
| 2 | - | |
| 3 | -declare(strict_types=1); | |
| 4 | - | |
| 2 | +/** | |
| 3 | + * DynamicGroupsController.php | |
| 4 | + * | |
| 5 | + * The DynamicGroupsController class file. | |
| 6 | + * | |
| 7 | + * PHP versions 5 | |
| 8 | + * | |
| 9 | + * @author Alexander Schneider <[email protected]> | |
| 10 | + * @copyright 2008-2017 Alexander Schneider | |
| 11 | + * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 | |
| 12 | + * @version SVN: $id$ | |
| 13 | + * @link http://wordpress.org/extend/plugins/user-access-manager/ | |
| 14 | + */ | |
| 5 | 15 | namespace UserAccessManager\Controller\Backend; |
| 6 | 16 | |
| 7 | -use JetBrains\PhpStorm\NoReturn; | |
| 8 | 17 | use UserAccessManager\UserGroup\DynamicUserGroup; |
| 9 | -use WP_Role; | |
| 10 | 18 | |
| 19 | +/** | |
| 20 | + * Class DynamicGroupsController | |
| 21 | + * | |
| 22 | + * @package UserAccessManager\Controller\Backend | |
| 23 | + */ | |
| 11 | 24 | class DynamicGroupsController extends ObjectController |
| 12 | 25 | { |
| 13 | 26 | /** |
| 14 | 27 | * Returns the dynamic user groups for the ajax request. |
| 15 | 28 | */ |
| 16 | - #[NoReturn] | |
| 17 | - public function getDynamicGroupsForAjax(): void | |
| 29 | + public function getDynamicGroupsForAjax() | |
| 18 | 30 | { |
| 19 | 31 | if ($this->checkUserAccess() === false) { |
| 20 | 32 | echo json_encode([]); |
| 21 | 33 | $this->php->callExit(); |
| @@ -26,9 +38,9 @@ | ||
| 26 | 38 | $searches = explode(',', $search); |
| 27 | 39 | $search = trim(end($searches)); |
| 28 | 40 | |
| 29 | 41 | $users = $this->wordpress->getUsers([ |
| 30 | - 'search' => '*' . $search . '*', | |
| 42 | + 'search' => '*'.$search.'*', | |
| 31 | 43 | 'fields' => ['ID', 'display_name', 'user_login', 'user_email'] |
| 32 | 44 | ]); |
| 33 | 45 | $matches = array_map( |
| 34 | 46 | function ($element) { |
| @@ -33,9 +45,9 @@ | ||
| 33 | 45 | $matches = array_map( |
| 34 | 46 | function ($element) { |
| 35 | 47 | return [ |
| 36 | 48 | 'id' => $element->ID, |
| 37 | - 'name' => TXT_UAM_USER . ": $element->display_name ($element->user_login)", | |
| 49 | + 'name' => TXT_UAM_USER.": {$element->display_name} ($element->user_login)", | |
| 38 | 50 | 'type' => DynamicUserGroup::USER_TYPE |
| 39 | 51 | ]; |
| 40 | 52 | }, |
| 41 | 53 | $users |
| @@ -41,17 +53,17 @@ | ||
| 41 | 53 | $users |
| 42 | 54 | ); |
| 43 | 55 | |
| 44 | 56 | /** |
| 45 | - * @var WP_Role[] $roles | |
| 57 | + * @var \WP_Role[] $roles | |
| 46 | 58 | */ |
| 47 | 59 | $roles = $this->wordpress->getRoles()->roles; |
| 48 | 60 | |
| 49 | 61 | foreach ($roles as $key => $role) { |
| 50 | - if (str_contains(strtolower($role['name']), strtolower($search))) { | |
| 62 | + if (strpos(strtolower($role['name']), strtolower($search)) !== false) { | |
| 51 | 63 | $matches[] = [ |
| 52 | 64 | 'id' => $key, |
| 53 | - 'name' => TXT_UAM_ROLE . ': ' . $role['name'], | |
| 65 | + 'name' => TXT_UAM_ROLE.': '.$role['name'], | |
| 54 | 66 | 'type' => DynamicUserGroup::ROLE_TYPE |
| 55 | 67 | ]; |
| 56 | 68 | } |
| 57 | 69 | } |