← All changes | Inc/Classes/Wizard/Adminify_Setup_Wizard.php +38 -150 4.3.2 → 4.0.5.4 View file →

		@@ -1,10 +1,10 @@
1	1	<?php
2	2
3		-namespace PXLBSAdminify\Inc\Classes\Wizard;
	3	+namespace WPAdminify\Inc\Classes\Wizard;
4	4
5		-use \PXLBSAdminify\Inc\Admin\AdminSettings;
6		-use PXLBSAdminify\Inc\Utils;
	5	+use \WPAdminify\Inc\Admin\AdminSettings;
	6	+use WPAdminify\Inc\Utils;
7	7
8	8	// no direct access allowed
9	9	if (!defined('ABSPATH')) {
10	10	exit;
		@@ -16,15 +16,15 @@
16	16	public function __construct() {
17	17
18	18	if (current_user_can('manage_options') && current_user_can('administrator')) {
19	19
20		- add_action('wp_ajax_pxlbsadminify_save_wizard_data', [$this, 'pxlbsadminify_save_wizard_data']);
	20	+ add_action('wp_ajax_wpadminify_save_wizard_data', [$this, 'wpadminify_save_wizard_data']);
21	21
22	22	$this->options = (array) AdminSettings::get_instance()->get();
23	23
24		- $this->setup_wizard();
	24	+ $this->jltwp_adminify_setup_wizard();
25	25
26		- add_action('wp_ajax_pxlbsadminify_drag_and_drop_image', [$this, 'pxlbsadminify_drag_and_drop_image_callback']);
	26	+ add_action('wp_ajax_adminify_drag_and_drop_image', [$this, 'adminify_drag_and_drop_image_callback']);
27	27
28	28	}
29	29
30	30	}
		@@ -29,75 +29,35 @@
29	29
30	30	}
31	31
32	32	// Drag and Drop Image
33		- public function pxlbsadminify_drag_and_drop_image_callback() {
34		- check_ajax_referer('pxlbsadminify_sw');
	33	+ public function adminify_drag_and_drop_image_callback() {
	34	+ check_ajax_referer('jltwp_adminify_sw');
35	35
36		- // Security check - only administrators can upload images via wizard
37		- if (!current_user_can('manage_options')) {
38		- wp_send_json_error(__('You do not have permission to perform this action.', 'adminify'));
39		- }
40		-
41		- // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- nonce verified above; settings array recursively sanitized via wp_kses_post_deep().
42	36	$data_source = empty($_POST['settings']) ? [] : (array) wp_kses_post_deep(wp_unslash($_POST['settings']));
43	37
44		- $base64_image = isset($data_source['image_data']) ? (string) $data_source['image_data'] : '';
	38	+ $base64_image = $data_source['image_data'];
45	39
46		- // Validate the data URI shape before parsing.
47		- if (strpos($base64_image, ';') === false || strpos($base64_image, ',') === false) {
48		- wp_send_json_error(__('Invalid image data.', 'adminify'));
49		- }
50		-
51	40	// Extract the base64 data (remove the data URI scheme)
52	41	list($type, $data) = explode(';', $base64_image);
53	42	list(, $data) = explode(',', $data);
54		- $decoded_data = base64_decode($data, true);
	43	+ $decoded_data = base64_decode($data);
55	44
56		- if ($decoded_data === false) {
57		- wp_send_json_error(__('Invalid image data.', 'adminify'));
58		- }
	45	+ // Define the output file path
	46	+ $upload_dir = wp_upload_dir();
	47	+ $upload_path = $upload_dir['path'] . '/' . $data_source['image_name'];
59	48
60		- // Sanitize the filename: strip any path components and enforce an image extension allowlist.
61		- $raw_name = isset($data_source['image_name']) ? (string) $data_source['image_name'] : '';
62		- $safe_name = sanitize_file_name(basename($raw_name));
63		-
64		- $filetype = wp_check_filetype($safe_name);
65		- $allowed = array('jpg', 'jpeg', 'png', 'gif', 'webp');
66		- if (empty($safe_name) || !in_array(strtolower((string) $filetype['ext']), $allowed, true)) {
67		- wp_send_json_error(__('Invalid image file type.', 'adminify'));
	49	+ // Save the image to the file
	50	+ if (file_put_contents($upload_path, $decoded_data) === false) {
	51	+ wp_send_json_error('Failed to save the image.');
68	52	}
69	53
70		- // Write the decoded bytes into the uploads dir (handles unique filename + path).
71		- $uploaded = wp_upload_bits($safe_name, null, $decoded_data);
72		- if (!empty($uploaded['error']) || empty($uploaded['file'])) {
73		- wp_send_json_error(__('Failed to save the image.', 'adminify'));
74		- }
	54	+ // Get the URL of the uploaded image
	55	+ $upload_url = $upload_dir['url'] . '/' . basename($upload_path);
75	56
76		- // Register the file as a Media Library attachment so it behaves like a normal upload.
77		- $attachment = array(
78		- 'post_mime_type' => $filetype['type'],
79		- 'post_title' => sanitize_text_field(pathinfo($safe_name, PATHINFO_FILENAME)),
80		- 'post_content' => '',
81		- 'post_status' => 'inherit',
82		- );
	57	+ wp_send_json_success($upload_url);
83	58
84		- $attachment_id = wp_insert_attachment($attachment, $uploaded['file']);
85		- if (is_wp_error($attachment_id) || !$attachment_id) {
86		- wp_send_json_error(__('Failed to register the image in the media library.', 'adminify'));
87		- }
88		-
89		- // Generate thumbnails/metadata for the attachment.
90		- require_once ABSPATH . 'wp-admin/includes/image.php';
91		- $metadata = wp_generate_attachment_metadata($attachment_id, $uploaded['file']);
92		- wp_update_attachment_metadata($attachment_id, $metadata);
93		-
94		- wp_send_json_success(
95		- array(
96		- 'id' => $attachment_id,
97		- 'url' => wp_get_attachment_url($attachment_id),
98		- )
99		- );
	59	+ wp_die();
100	60	}
101	61
102	62	public function validate_before_save($settings) {
103	63	foreach ($settings as $key => $setting) {
		@@ -118,44 +78,20 @@
118	78	return $setting;
119	79	}
120	80
121	81	// TEXT validation
122		- public function text_validation($text) {
	82	+ public function wpadminify_text_validation($text) {
123	83	return sanitize_text_field( wp_unslash( $text ?? '' ) );
124	84	}
125	85
126		- // Build the full CSF media field value from an attachment id.
127		- public function build_media_value($attachment_id) {
128		- $attachment_id = absint($attachment_id);
129		- $full = wp_get_attachment_image_src($attachment_id, 'full');
130		- $thumb = wp_get_attachment_image_src($attachment_id, 'thumbnail');
	86	+ public function wpadminify_save_wizard_data() {
	87	+ check_ajax_referer('jltwp_adminify_sw');
131	88
132		- return array(
133		- 'id' => $attachment_id,
134		- 'url' => $full ? $full[0] : wp_get_attachment_url($attachment_id),
135		- 'width' => $full ? $full[1] : '',
136		- 'height' => $full ? $full[2] : '',
137		- 'thumbnail' => $thumb ? $thumb[0] : '',
138		- 'alt' => (string) get_post_meta($attachment_id, '_wp_attachment_image_alt', true),
139		- 'title' => get_the_title($attachment_id),
140		- 'description' => '',
141		- );
142		- }
143		-
144		- public function pxlbsadminify_save_wizard_data() {
145		- check_ajax_referer('pxlbsadminify_sw');
146		-
147		- // Security check - only administrators can save wizard settings
148		- if (!current_user_can('manage_options')) {
149		- wp_send_json_error(__('You do not have permission to perform this action.', 'adminify'));
150		- }
151		-
152		- // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- nonce verified above; settings array recursively sanitized via wp_kses_post_deep().
153	89	$settings = empty($_POST['settings']) ? [] : (array) wp_kses_post_deep(wp_unslash($_POST['settings']));
154	90
155	91	$validate_settings = $this->validate_before_save($settings);
156	92
157		- $settings = get_option('pxlbsadminify_settings', []);
	93	+ $settings = get_option('_wpadminify', []);
158	94
159	95	// Adminify UI
160	96	if( array_key_exists('admin_ui', $validate_settings) ) {
161	97	$settings['admin_ui'] = !empty($validate_settings['admin_ui']) ? true : false;
		@@ -165,21 +101,12 @@
165	101	if( array_key_exists('admin_ui_logo_type', $validate_settings) && array_key_exists('admin_ui_light_mode', $validate_settings)) {
166	102
167	103	$settings['light_dark_mode']['admin_ui_logo_type'] = $validate_settings['admin_ui_logo_type'];
168	104	if($validate_settings['admin_ui_logo_type'] === 'text_logo') {
169		- $settings['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo_text'] = $this->text_validation( $validate_settings['admin_ui_light_mode']['admin_ui_light_logo_text'] );
	105	+ $settings['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo_text'] = $this->wpadminify_text_validation( $validate_settings['admin_ui_light_mode']['admin_ui_light_logo_text'] );
170	106	}
171	107	if($validate_settings['admin_ui_logo_type'] === 'image_logo') {
172		- $logo_value = $validate_settings['admin_ui_light_mode']['admin_ui_light_logo'];
173		- $attachment_id = isset($logo_value['id']) ? absint($logo_value['id']) : 0;
174		-
175		- if ($attachment_id && wp_attachment_is_image($attachment_id)) {
176		- // Rebuild the full media value from the attachment so the CSF
177		- // media field has every key it renders (thumbnail drives the preview).
178		- $settings['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo'] = $this->build_media_value($attachment_id);
179		- } else {
180		- $settings['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo']['url'] = wp_http_validate_url($logo_value['url']);
181		- }
	108	+ $settings['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo']['url'] = wp_http_validate_url($validate_settings['admin_ui_light_mode']['admin_ui_light_logo']['url']);
182	109	}
183	110
184	111	}
185	112
		@@ -187,19 +114,12 @@
187	114	if( array_key_exists('footer_text', $validate_settings) ) {
188	115	$settings['white_label']['wordpress']['footer_text'] = wp_kses_post( $validate_settings['footer_text'] );
189	116	}
190	117
191		- update_option('pxlbsadminify_settings', $settings);
192		-
193		- $is_complete = !empty($_POST['is_complete']) && $_POST['is_complete'] === '1';
194		- if ($is_complete) {
195		- update_option('pxlbsadminify_setup_wizard_ran', '1');
196		- }
197		-
	118	+ update_option('_wpadminify', $settings);
198	119	wp_send_json_success(
199	120	[
200		- 'redirect' => true,
201		- 'is_complete' => $is_complete,
	121	+ 'redirect' => true,
202	122	]
203	123	);
204	124	}
205	125
		@@ -205,56 +125,25 @@
205	125
206	126	public function load_scripts() {
207	127
208	128	// Register
209		- // wp_register_script('wp-adminify-vue-vendors', PXLBSADMINIFY_ASSETS . 'admin/js/vendor' . Utils::assets_ext('.js'), [], PXLBSADMINIFY_VER, true);
210		- wp_register_style('adminify-sw-setup', PXLBSADMINIFY_ASSETS . 'css/setup.css', array(), PXLBSADMINIFY_VER);
211		- wp_register_script('adminify-sw-setup', PXLBSADMINIFY_ASSETS . 'admin/js/wp-adminify--setup-wizard' . Utils::assets_ext('.js'), ['react', 'jquery'], PXLBSADMINIFY_VER, true);
	129	+ // wp_register_script('wp-adminify-vue-vendors', WP_ADMINIFY_ASSETS . 'admin/js/vendor' . Utils::assets_ext('.js'), [], WP_ADMINIFY_VER, true);
	130	+ wp_register_style('wp-adminify-sw-setup', WP_ADMINIFY_ASSETS . 'css/setup.css');
	131	+ wp_register_script('wp-adminify-sw-setup', WP_ADMINIFY_ASSETS . 'admin/js/wp-adminify--setup-wizard' . Utils::assets_ext('.js'), ['react', 'jquery'], WP_ADMINIFY_VER, true);
212	132
213		- // Elementor registers "elementor-ai-media-library" inside the
214		- // WordPress media iframe with dependencies (elementor-v2-ui,
215		- // elementor-v2-icons) that are not registered in this admin
216		- // context. WordPress 6.9.1+ raises a "called incorrectly" notice
217		- // at registration time when that happens. Pre-register empty stubs
218		- // for those handles before wp_enqueue_media() so the dependency
219		- // check passes silently. The wizard does not use Elementor, so we
220		- // also dequeue Elementor's media-library script after enqueue to
221		- // avoid loading unrelated assets here.
222		- if (!wp_script_is('elementor-v2-ui', 'registered')) {
223		- wp_register_script('elementor-v2-ui', '', [], PXLBSADMINIFY_VER, true);
224		- }
225		- if (!wp_script_is('elementor-v2-icons', 'registered')) {
226		- wp_register_script('elementor-v2-icons', '', [], PXLBSADMINIFY_VER, true);
227		- }
228		-
229	133	// Media uploader
230	134	wp_enqueue_media();
231	135
232		- add_action('admin_print_scripts', function () {
233		- if (wp_script_is('elementor-ai-media-library', 'enqueued')) {
234		- wp_dequeue_script('elementor-ai-media-library');
235		- }
236		- }, 999);
237		-
238	136	// Load
239		- wp_enqueue_style('adminify-sw-setup');
	137	+ wp_enqueue_style('wp-adminify-sw-setup');
240	138	// wp_enqueue_script('media-upload');
241		- wp_enqueue_script('adminify-sw-setup');
	139	+ wp_enqueue_script('wp-adminify-sw-setup');
242	140
243	141
244		- $is_network = is_multisite() && is_network_admin();
245		- $settings_url = $is_network
246		- ? network_admin_url('admin.php?page=wp-adminify-settings')
247		- : admin_url('admin.php?page=wp-adminify-settings');
248		- $dashboard_url = $is_network ? network_admin_url('/') : admin_url('/');
249		-
250	142	// Localize Script
251	143	$adminify_data = [
252	144	// 'rest_base' => $this->get_rest_url(''),
253	145	'ajax_url' => admin_url('admin-ajax.php'),
254		- 'admin_url' => $dashboard_url,
255		- 'settings_url' => $settings_url,
256		- 'rest_url' => esc_url_raw(rest_url('adminify/v1/')),
257	146	'settings' => [
258	147	'admin_ui' => $this->options['admin_ui'],
259	148	'admin_ui_logo_type' => $this->options['light_dark_mode']['admin_ui_logo_type'],
260	149	'admin_ui_light_mode' => [
		@@ -264,14 +153,14 @@
264	153	'admin_ui_light_logo_text' => $this->options['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo_text'] ?? '',
265	154	],
266	155	'footer_text' => $this->options['white_label']['wordpress']['footer_text'],
267	156	],
268		- 'images' => PXLBSADMINIFY_ASSETS_IMAGE,
269		- 'wpnonce' => wp_create_nonce('pxlbsadminify_sw'),
	157	+ 'images' => WP_ADMINIFY_ASSETS_IMAGE,
	158	+ 'wpnonce' => wp_create_nonce('jltwp_adminify_sw'),
270	159	'rest_nonce' => wp_create_nonce('wp_rest')
271	160	];
272	161
273		- wp_localize_script('adminify-sw-setup', 'PXLBSADMINIFY_SETUP_WIZARD_DATA', $adminify_data);
	162	+ wp_localize_script('wp-adminify-sw-setup', 'adminify_setup_wizard_data', $adminify_data);
274	163
275	164
276	165	// // Dequeue Styles
277	166	// // wp_dequeue_style('install');
		@@ -285,13 +174,12 @@
285	174	// wp_deregister_script('shortcode');
286	175
287	176	}
288	177
289		- public function setup_wizard() {
	178	+ public function jltwp_adminify_setup_wizard() {
290	179	global $hook_suffix;
291	180
292		- // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only check, no state change.
293		- if (empty($_GET['page']) || 'wp-adminify-setup-wizard' !== sanitize_text_field(wp_unslash($_GET['page']))) {
	181	+ if (empty($_GET['page']) || 'wp-adminify-setup-wizard' !== $_GET['page']) {
294	182	return;
295	183	}
296	184
297	185	require_once ABSPATH . WPINC . '/media-template.php';