← All changes | back/Controllers/DashboardController.php +8 -14 10.0.1 → 11.1.0 View file →

		@@ -8,10 +8,8 @@
8	8	use AcyMailing\Controllers\Dashboard\Migration;
9	9
10	10	class DashboardController extends AcymController
11	11	{
12		- var $errorMailer;
13		-
14	12	use Listing;
15	13	use Walkthrough;
16	14	use Migration;
17	15
		@@ -24,9 +22,9 @@
24	22	'step_editor' => ['editor-wysid'],
25	23	];
26	24	}
27	25
28		- public function upgrade()
	26	+ public function upgrade(): void
29	27	{
30	28	acym_setVar('layout', 'upgrade');
31	29
32	30	$version = acym_getVar('string', 'version', 'enterprise');
		@@ -35,9 +33,9 @@
35	33
36	34	parent::display($data);
37	35	}
38	36
39		- public function features()
	37	+ public function features(): void
40	38	{
41	39	if (!file_exists(ACYM_NEW_FEATURES_SPLASHSCREEN_JSON)) {
42	40	$this->listing();
43	41
		@@ -45,33 +43,29 @@
45	43	}
46	44
47	45	$splashJson = acym_fileGetContent(ACYM_NEW_FEATURES_SPLASHSCREEN_JSON);
48	46	$version = json_decode($splashJson);
49		- if (version_compare($this->config->get('previous_version', '10.0.1'), $version->max_version, '>=')) {
50		- @unlink(ACYM_NEW_FEATURES_SPLASHSCREEN_JSON);
	47	+ if (version_compare($this->config->get('previous_version', '11.1.0'), $version->max_version, '>=')) {
	48	+ acym_deleteFile(ACYM_NEW_FEATURES_SPLASHSCREEN_JSON);
51	49	$this->listing();
52	50
53	51	return;
54	52	}
55	53
56		- ob_start();
57		- include ACYM_NEW_FEATURES_SPLASHSCREEN;
58		- $data = [
59		- 'content' => ob_get_clean(),
60		- ];
61		-
62		- if (!@unlink(ACYM_NEW_FEATURES_SPLASHSCREEN_JSON)) {
	54	+ if (!acym_deleteFile(ACYM_NEW_FEATURES_SPLASHSCREEN_JSON)) {
63	55	$this->listing();
64	56
65	57	return;
66	58	}
67	59
	60	+ $data['splashJson'] = $version;
	61	+
68	62	acym_setVar('layout', 'features');
69	63
70	64	parent::display($data);
71	65	}
72	66
73		- public function acychecker()
	67	+ public function acychecker(): void
74	68	{
75	69	acym_setVar('layout', 'acychecker');
76	70
77	71	parent::display();