| @@ -10,9 +10,9 @@ | ||
| 10 | 10 | trait Ajax |
| 11 | 11 | { |
| 12 | 12 | public function ajaxCreateNewList(): void |
| 13 | 13 | { |
| 14 | - acym_checkToken(); | |
| 14 | + wp_verify_nonce(acym_getVar('cmd', '_wpnonce'), 'acymnonce') || die('Invalid Token'); | |
| 15 | 15 | $genericImport = acym_getVar('boolean', 'generic', false); |
| 16 | 16 | $selectedListsIds = json_decode(acym_getVar('string', 'selected', '[]')); |
| 17 | 17 | if (empty($selectedListsIds)) { |
| 18 | 18 | $selectedListsIds = []; |
| @@ -29,19 +29,17 @@ | ||
| 29 | 29 | |
| 30 | 30 | $entityHelper = new EntitySelectHelper(); |
| 31 | 31 | $importHelper = new ImportHelper(); |
| 32 | 32 | |
| 33 | - | |
| 34 | - $return = $entityHelper->entitySelect( | |
| 35 | - 'list', | |
| 36 | - ['join' => 'join_lists-'.implode(',', $selectedListsIds)], | |
| 37 | - $entityHelper->getColumnsForList('lists.list_id', true), | |
| 38 | - [], | |
| 39 | - true, | |
| 40 | - $importHelper->additionalDataUsersImport($genericImport) | |
| 33 | + $entityHelper->entitySelect( | |
| 34 | + [ | |
| 35 | + 'display' => true, | |
| 36 | + 'entity' => 'list', | |
| 37 | + 'entityParams' => ['join' => 'join_lists-'.implode(',', $selectedListsIds)], | |
| 38 | + 'columnsToDisplay' => $entityHelper->getColumnsForList('lists.list_id', true), | |
| 39 | + 'additionalData' => fn() => $importHelper->displayAdditionalDataUsersImport($genericImport), | |
| 40 | + ] | |
| 41 | 41 | ); |
| 42 | - | |
| 43 | - echo $return; | |
| 44 | 42 | exit; |
| 45 | 43 | } |
| 46 | 44 | |
| 47 | 45 | public function usersSummary(): void |
| @@ -105,24 +103,24 @@ | ||
| 105 | 103 | if (!empty($matchingListsData->displayNonActive) && $list->active == 0) continue; |
| 106 | 104 | |
| 107 | 105 | $return .= '<div class="grid-x modal__pagination__listing__lists__in-form__list cell">'; |
| 108 | 106 | |
| 109 | - $return .= '<div class="cell shrink"><input type="checkbox" id="modal__pagination__listing__lists__list'.acym_escape($list->id).'" value="'.acym_escape( | |
| 107 | + $return .= '<div class="cell shrink"><input type="checkbox" id="modal__pagination__listing__lists__list'.esc_attr($list->id).'" value="'.esc_attr( | |
| 110 | 108 | $list->id |
| 111 | - ).'" class="modal__pagination__listing__lists__list--checkbox" name="lists_checked[]"'; | |
| 109 | + ).'" class="modal__pagination__listing__lists__list--checkbox" name="lists_checked[]"'.checked( | |
| 110 | + !empty($matchingListsData->idsSelected) && in_array($list->id, $matchingListsData->idsSelected), | |
| 111 | + true, | |
| 112 | + false | |
| 113 | + ); | |
| 112 | 114 | |
| 113 | - if (!empty($matchingListsData->idsSelected) && in_array($list->id, $matchingListsData->idsSelected)) { | |
| 114 | - $return .= 'checked'; | |
| 115 | - } | |
| 116 | - | |
| 117 | - $return .= '></div><i class="cell shrink acymicon-circle" style="color:'.acym_escape( | |
| 115 | + $return .= '></div><i class="cell shrink acymicon-circle" style="color:'.esc_attr( | |
| 118 | 116 | $list->color |
| 119 | - ).'"></i><label class="cell auto" for="modal__pagination__listing__lists__list'.acym_escape($list->id).'"> '; | |
| 117 | + ).'"></i><label class="cell auto" for="modal__pagination__listing__lists__list'.esc_attr($list->id).'"> '; | |
| 120 | 118 | |
| 121 | - $return .= '<span class="modal__pagination__listing__lists__list-name">'.acym_escape($list->name).'</span>'; | |
| 119 | + $return .= '<span class="modal__pagination__listing__lists__list-name">'.esc_html($list->name).'</span>'; | |
| 122 | 120 | |
| 123 | 121 | if (!empty($matchingListsData->needDisplaySub)) { |
| 124 | - $return .= '<span class="modal__pagination__listing__lists__list-subscribers">('.acym_escape($list->subscribers).')</span>'; | |
| 122 | + $return .= '<span class="modal__pagination__listing__lists__list-subscribers">('.esc_html($list->subscribers).')</span>'; | |
| 125 | 123 | } |
| 126 | 124 | |
| 127 | 125 | $return .= '</label></div>'; |
| 128 | 126 | } |
| @@ -136,9 +134,9 @@ | ||
| 136 | 134 | } |
| 137 | 135 | |
| 138 | 136 | public function loadMoreSubscribers(): void |
| 139 | 137 | { |
| 140 | - acym_checkToken(); | |
| 138 | + wp_verify_nonce(acym_getVar('cmd', '_wpnonce'), 'acymnonce') || die('Invalid Token'); | |
| 141 | 139 | $listClass = new ListClass(); |
| 142 | 140 | |
| 143 | 141 | $listId = acym_getVar('int', 'listId'); |
| 144 | 142 | |