← All changes | back/Controllers/Scenarios/Listing.php +32 -12 10.0.1 → 11.1.0 View file →

		@@ -7,20 +7,24 @@
7	7	use AcyMailing\Helpers\ToolbarHelper;
8	8
9	9	trait Listing
10	10	{
11		- function listing()
	11	+ public function listing(): void
12	12	{
13	13	if (!acym_level(ACYM_ENTERPRISE)) {
14	14	acym_redirect(acym_completeLink('dashboard&task=upgrade&version=enterprise', false, true));
15	15	}
	16	+ $ordering = $this->getVarFiltersListing('cmd', 'scenario_ordering', 'ordering');
	17	+ $orderingSortOrder = $this->getVarFiltersListing('cmd', 'scenario_ordering_sort_order', 'asc');
16	18
17	19	acym_setVar('layout', 'listing');
18	20
19		- $data = [];
	21	+ $data = [
	22	+ 'ordering' => $ordering,
	23	+ 'ordering_sort_order' => $orderingSortOrder,
	24	+ 'pagination' => new PaginationHelper(),
	25	+ ];
20	26
21		- $data['pagination'] = new PaginationHelper();
22		-
23	27	$this->prepareListingFilters($data);
24	28	$this->prepareListingElements($data);
25	29	$this->prepareToolbar($data);
26	30
		@@ -26,19 +30,20 @@
26	30
27	31	parent::display($data);
28	32	}
29	33
30		- private function prepareListingFilters(&$data)
	34	+ private function prepareListingFilters(array &$data): void
31	35	{
32	36	$data['search'] = $this->getVarFiltersListing('string', 'scenario_search', '');
33	37	$data['status'] = $this->getVarFiltersListing('string', 'scenarios_status', '');
34		- $data['ordering'] = $this->getVarFiltersListing('string', 'scenarios_ordering', 'id');
35		- $data['ordering_sort_order'] = $this->getVarFiltersListing('string', 'scenarios_ordering_sort_order', 'asc');
	38	+ $data['ordering'] = $this->getVarFiltersListing('cmd', 'scenarios_ordering', 'id');
	39	+ $data['ordering_sort_order'] = $this->getVarFiltersListing('cmd', 'scenarios_ordering_sort_order', 'asc');
36	40	$data['page'] = $this->getVarFiltersListing('int', 'scenarios_pagination_page', 1);
37	41	}
38	42
39		- private function prepareListingElements(&$data)
	43	+ private function prepareListingElements(array &$data): void
40	44	{
	45	+ // Prepare the pagination
41	46	$scenarioPerPage = $data['pagination']->getListLimit();
42	47
43	48	$matchingScenarios = $this->getMatchingElementsFromData(
44	49	[
		@@ -52,9 +57,9 @@
52	57	$data['status'],
53	58	$data['page']
54	59	);
55	60
56		- $data['pagination']->setStatus($matchingScenarios['total'], $data['page'], $scenarioPerPage);
	61	+ $data['pagination']->setStatus($matchingScenarios['total']->total, $data['page'], $scenarioPerPage);
57	62
58	63	$data['scenarios'] = $matchingScenarios['elements'];
59	64	$data['totalOverall'] = $matchingScenarios['totalOverall'];
60	65	$data['scenariosNumberStatus'] = $matchingScenarios['scenariosNumberStatus'];
		@@ -59,9 +64,9 @@
59	64	$data['totalOverall'] = $matchingScenarios['totalOverall'];
60	65	$data['scenariosNumberStatus'] = $matchingScenarios['scenariosNumberStatus'];
61	66	}
62	67
63		- protected function prepareToolbar(&$data)
	68	+ protected function prepareToolbar(array &$data): void
64	69	{
65	70	$data['toolbar'] = new ToolbarHelper();
66	71	$data['toolbar']->addSearchBar($data['search'], 'scenario_search');
67	72
		@@ -67,11 +72,11 @@
67	72
68	73	$data['toolbar']->addButton(acym_translation('ACYM_CREATE'), ['data-task' => 'edit', 'data-step' => 'editScenario'], 'add', true);
69	74	}
70	75
71		- public function duplicate()
	76	+ public function duplicate(): void
72	77	{
73		- acym_checkToken();
	78	+ wp_verify_nonce(acym_getVar('cmd', '_wpnonce'), 'acymnonce') || die('Invalid Token');
74	79
75	80	$scenarioIds = acym_getVar('array', 'elements_checked', []);
76	81
77	82	acym_arrayToInteger($scenarioIds);
		@@ -86,6 +91,21 @@
86	91	$scenarioClass->duplicate($scenarioId);
87	92	}
88	93
89	94	$this->listing();
	95	+ }
	96	+
	97	+ public function ajaxSetOrdering(): void
	98	+ {
	99	+ wp_verify_nonce(acym_getVar('cmd', '_wpnonce'), 'acymnonce') || die('Invalid Token');
	100	+
	101	+ $order = json_decode(acym_getVar('string', 'order', '[]'), true);
	102	+
	103	+ $error = false;
	104	+ foreach ($order as $index => $scenarioId) {
	105	+ $query = 'UPDATE #__acym_scenario SET `ordering` = '.intval($index + 1).' WHERE `id` = '.intval($scenarioId);
	106	+ $error = acym_query($query) < 0 || $error;
	107	+ }
	108	+
	109	+ acym_sendAjaxResponse('', [], !$error);
90	110	}
91	111	}