← All changes | Inc/Admin/Frames/Admin.php +34 -157 4.2.10 → 4.0.2.2 View file →

		@@ -1,11 +1,11 @@
1	1	<?php
2	2
3		-namespace PXLBSAdminify\Inc\Admin\Frames;
	3	+namespace WPAdminify\Inc\Admin\Frames;
4	4
5		-use PXLBSAdminify\Inc\Utils;
6		-use PXLBSAdminify\Inc\Modules\MenuEditor\MenuEditorOptions;
7		-use PXLBSAdminify\Inc\Admin\AdminSettings;
	5	+use WPAdminify\Inc\Utils;
	6	+use WPAdminify\Inc\Modules\MenuEditor\MenuEditorOptions;
	7	+use WPAdminify\Inc\Admin\AdminSettings;
8	8
9	9	// no direct access allowed
10	10	if (!defined('ABSPATH')) {
11	11	exit;
		@@ -65,10 +65,10 @@
65	65	* @return void
66	66	*/
67	67	public function load_scripts()
68	68	{
69		- wp_enqueue_style('frame-adminify--admin', PXLBSADMINIFY_ASSETS . 'admin/css/admin' . Utils::assets_ext('.css'), [], PXLBSADMINIFY_VER);
70		- wp_enqueue_script('frame-adminify--admin', PXLBSADMINIFY_ASSETS . 'admin/js/frame' . Utils::assets_ext('.js'), ['jquery', 'react'], PXLBSADMINIFY_VER, true);
	69	+ wp_enqueue_style('frame-adminify--admin', WP_ADMINIFY_ASSETS . 'admin/css/admin' . Utils::assets_ext('.css'), [], WP_ADMINIFY_VER);
	70	+ wp_enqueue_script('frame-adminify--admin', WP_ADMINIFY_ASSETS . 'admin/js/frame' . Utils::assets_ext('.js'), ['jquery', 'react'], WP_ADMINIFY_VER, true);
71	71
72	72	$localize_array_data = [
73	73	'ajax_url' => admin_url('admin-ajax.php'),
74	74	'security_nonce' => wp_create_nonce('adminify_nonce')
		@@ -73,10 +73,10 @@
73	73	'ajax_url' => admin_url('admin-ajax.php'),
74	74	'security_nonce' => wp_create_nonce('adminify_nonce')
75	75	];
76	76
77		- wp_localize_script( 'frame-adminify--admin', 'PXLBSADMINIFY_FRAME', $localize_array_data );
78		- wp_localize_script( 'frame-adminify--admin', 'PXLBSADMINIFY_FRAME_NOT_ALLOWED_URLS', self::get_not_allowed_urls() );
	77	+ wp_localize_script( 'frame-adminify--admin', 'WPAdminify', $localize_array_data );
	78	+ wp_localize_script( 'frame-adminify--admin', 'WPAdminifyFrameNotAllowedURLs', self::get_not_allowed_urls() );
79	79	}
80	80
81	81	public static function get_not_allowed_urls() {
82	82
		@@ -92,12 +92,8 @@
92	92	'query_params' => ['action' => 'elementor']
93	93	],
94	94	[
95	95	'url' => '*',
96		- 'query_params' => ['action' => 'architect'] // Added for thrive page builder
97		- ],
98		- [
99		- 'url' => '*',
100	96	'query_params' => ['bricks' => 'true']
101	97	],
102	98	[
103	99	'url' => '*',
		@@ -103,66 +99,18 @@
103	99	'url' => '*',
104	100	'query_params' => ['ct_builder' => 'true', 'oxygen_iframe!']
105	101	],
106	102	[
107		- 'url' => '*',
108		- 'query_params' => ['page' => 'latepoint'] // added for latepoint
	103	+ 'url' => '/wp-admin/post-new.php',
	104	+ 'post_type' => ['post', 'page']
109	105	],
110	106	[
111		- 'url' => '*',
112		- 'query_params' => ['page' => 'sbi-setup']
113		- ],
114		- [
115		- 'url' => '*',
116		- 'query_params' => ['page' => 'sbtt']
117		- ],
118		- [
119		- 'url' => '*',
120		- 'query_params' => ['page' => 'cff-setup']
121		- ],
122		- [
123		- 'url' => '*',
124		- 'query_params' => ['page' => 'rank-math-registration']
125		- ],
126		- [
127		- 'url' => '*',
128		- 'query_params' => ['page' => 'googlesitekit-splash']
129		- ],
130		- [
131		- 'url' => '*',
132		- 'query_params' => ['page' => 'cff-feed-builder']
133		- ],
134		- [
135		- 'url' => '*',
136		- 'query_params' => ['page' => 'sbi-feed-builder']
137		- ],
138		- [
139		- 'url' => '*',
140		- 'query_params' => ['page' => 'sbr']
141		- ],
142		- [
143		- 'url' => '*',
144		- 'query_params' => ['page' => 'ctf-feed-builder']
145		- ],
146		- [
147		- 'url' => '*',
148		- 'query_params' => ['page' => 'sby-feed-builder']
149		- ],
150		- [
151		- 'url' => '*',
152		- 'query_params' => ['page' => 'suretriggers']
153		- ],
154		- // [
155		- // 'url' => '/wp-admin/post-new.php',
156		- // 'post_type' => ['post', 'page']
157		- // ],
158		- // [
159		- // 'url' => '/wp-admin/post.php',
160		- // 'post_type' => ['post', 'page']
161		- // ]
	107	+ 'url' => '/wp-admin/post.php',
	108	+ 'post_type' => ['post', 'page']
	109	+ ]
162	110	];
163	111
164		- return apply_filters( 'pxlbsadminify_frame_not_allowed_urls', $not_allowed_urls );
	112	+ return apply_filters( 'adminify_frame_not_allowed_urls', $not_allowed_urls );
165	113	}
166	114
167	115	/**
168	116	* Adds the 'frame-adminify-app="true"' attribute to the given attribute string.
		@@ -183,9 +131,9 @@
183	131	* @return void
184	132	*/
185	133	public function load_template()
186	134	{
187		- Utils::load_template('Templates.php');
	135	+ adminify_load_template('Templates.php');
188	136	}
189	137
190	138	public function capture_wp_menu($parent_file)
191	139	{
		@@ -190,9 +138,9 @@
190	138	public function capture_wp_menu($parent_file)
191	139	{
192	140	global $menu, $submenu;
193	141
194		- $menu_build = pxlbsadminify_build_menu($menu, $submenu, $this->menu_settings);
	142	+ $menu_build = jltwp_adminify_build_menu($menu, $submenu, $this->menu_settings);
195	143
196	144	$this->enqueue_menu($menu_build);
197	145
198	146	return $parent_file;
		@@ -202,41 +150,13 @@
202	150	{
203	151	$outputter = function () use ($menu) {
204	152
205	153	$current_user = wp_get_current_user();
206		- $light_dark_mode = $this->options['light_dark_mode'];
207		- if( !isset($light_dark_mode['admin_ui_mode']) ) {
208		- $default_light_dark_mode = [
209		- 'admin_ui_mode' => 'light',
210		- 'admin_ui_logo_type' => 'image_logo',
211		- 'admin_ui_light_mode' => [
212		- 'admin_ui_light_logo_text' => 'Adminify',
213		- 'admin_ui_light_logo_text_typo' => array_fill_keys(
214		- ['font-family', 'font-weight', 'font-style', 'font-size', 'letter-spacing', 'color', 'type', 'unit'], ''
215		- ) + ['unit' => 'px'],
216		- 'admin_ui_light_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''),
217		- 'light_logo_size' => ['width' => 120, 'height' => 32, 'unit' => 'px'],
218		- 'mini_admin_ui_light_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''),
219		- ],
220		- 'admin_ui_dark_mode' => [
221		- 'admin_ui_dark_logo_text' => 'Adminify',
222		- 'admin_ui_dark_logo_text_typo' => array_fill_keys(
223		- ['font-family', 'font-weight', 'font-style', 'font-size', 'letter-spacing', 'color', 'type', 'unit'], ''
224		- ) + ['unit' => 'px'],
225		- 'admin_ui_dark_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''),
226		- 'dark_logo_size' => ['width' => 150, 'height' => 45, 'unit' => 'px'],
227		- 'mini_admin_ui_dark_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''),
228		- 'schedule_dark_mode' => array_fill_keys(['enable_schedule_dark_mode', 'schedule_dark_mode_type', 'schedule_dark_mode_start_time', 'schedule_dark_mode_end_time'], ''),
229		- ],
230		- ];
231		- $light_dark_mode = array_merge($default_light_dark_mode, $light_dark_mode);
232		- }else{
233		- $light_dark_mode['admin_ui_mode'] = empty(get_user_meta(get_current_user_id(), 'color_mode', true)) ? $light_dark_mode['admin_ui_mode'] : get_user_meta(get_current_user_id(), 'color_mode', true);
234		- }
	154	+
235	155	$menu_settings = [
236	156	'menu' => $menu,
237	157	'admin_bar_dark_light_btn' => $this->options['admin_bar_dark_light_btn'],
238		- 'light_dark_mode' => $light_dark_mode ,
	158	+ 'light_dark_mode' => $this->options['light_dark_mode'],
239	159	'menu_layout_settings' => $this->options['menu_layout_settings'],
240	160	'user_info' => [
241	161	'img' => get_avatar($current_user->user_email, 72, '', ''),
242	162	'display_name' => esc_html($current_user->display_name),
		@@ -243,13 +163,13 @@
243	163	'profile_url' => esc_url(admin_url('profile.php')),
244	164	'username' => esc_html($current_user->user_login),
245	165	'email' => wp_kses_post(is_email($current_user->user_email)),
246	166	],
247		- 'image_path' => PXLBSADMINIFY_ASSETS_IMAGE,
248		- 'is_pro' => (class_exists('\\PXLBSAdminify\\Pro\\Adminify_Pro') && !empty(\PXLBSAdminify\Pro\Adminify_Pro::is_premium())) ? true : false
	167	+ 'image_path' => WP_ADMINIFY_ASSETS_IMAGE,
	168	+ 'is_pro' => (class_exists('\\WPAdminify\\Pro\\Adminify_Pro') && !empty(\WPAdminify\Pro\Adminify_Pro::is_premium())) ? true : false
249	169	];
250	170
251		- $data = "var frame_adminify_menu=" . wp_json_encode($menu_settings);
	171	+ $data = "var frame_adminify_menu=" . json_encode($menu_settings);
252	172	wp_print_inline_script_tag($data, ["id" => "frame_adminify_menu"]);
253	173	};
254	174
255	175	add_action("admin_footer", $outputter, 0);
		@@ -259,28 +179,29 @@
259	179
260	180	public function get_admin_bar_menu_list()
261	181	{
262	182	global $wp_admin_bar;
	183	+
263	184	$admin_bar_data = $this->nodes_to_array($wp_admin_bar->get_nodes());
264	185	$admin_bar_data_nested = $this->format_to_nested($admin_bar_data);
265	186
	187	+
266	188	$admin_bar_menu_data = [];
267	189
268	190	// Admin Bar Exits
269		- if ( Utils::is_plugin_active('admin-bar/admin-bar.php') ) {
270		- $admin_bar_items = get_option('pxlbsadminify_adminbar_settings');
	191	+ if ( Utils::is_plugin_active('admin-bar/admin-bar.php') || Utils::is_plugin_active('admin-bar-pro/admin-bar-pro.php') ) {
	192	+ $admin_bar_items = get_option('_jltadminbar_settings');
271	193
272		- // Only build the customized admin bar when settings exist.
273		- // Otherwise fall through so the default admin bar data is still
274		- // printed and `adminify_admin_bar_data` is always defined.
275		- if ( !empty($admin_bar_items) ) {
	194	+ if( empty($admin_bar_items) ) return;
276	195
277	196	$existing_admin_bar = !empty($admin_bar_items['existing_admin_bar']) ? $admin_bar_items['existing_admin_bar'] : '';
278	197	$saved_admin_bar = !empty($admin_bar_items['saved_admin_bar']) ? $admin_bar_items['saved_admin_bar'] : [];
279	198
280	199	$parsed_admin_bar_backend = empty($saved_admin_bar) ? $existing_admin_bar : $this->parse_menu_items($saved_admin_bar, $existing_admin_bar, 'backend');
	200	+
281	201	$nested_admin_bar = $this->format_to_nested($parsed_admin_bar_backend);
282	202	$formated_admin_menu = $this->associative_to_index_array($nested_admin_bar);
	203	+
283	204	$remove_admin_menu = [];
284	205	foreach ($formated_admin_menu as $key => $value) {
285	206	if($value['id'] === 'wp-logo' || $value['id'] === 'site-name'|| $value['id'] === 'updates'|| $value['id'] === 'menu-toggle'|| $value['id'] === 'comments') {
286	207	continue;
		@@ -286,19 +207,10 @@
286	207	continue;
287	208	}
288	209	$remove_admin_menu[$key] = $value;
289	210	}
290		-
	211	+
291	212	$admin_bar_menu_data = $this->nodes_to_array_for_admin_bar($remove_admin_menu);
292		- foreach($admin_bar_menu_data as $key => $value){
293		- if( array_key_exists($value['id'],$admin_bar_data_nested)){
294		- $value['href'] = $admin_bar_data_nested[$value['id']]['href'];
295		- $value = $this->return_original_admin_bar_item_url($value, $admin_bar_data_nested[$value['id']]);
296		- }
297		- $admin_bar_menu_data[$key] = $value;
298		- }
299		-
300		- } // end if ( !empty($admin_bar_items) )
301	213	}
302	214
303	215	unset($admin_bar_data_nested['wp-logo']);
304	216	unset($admin_bar_data_nested['site-name']);
		@@ -305,61 +217,31 @@
305	217	unset($admin_bar_data_nested['updates']);
306	218	unset($admin_bar_data_nested['menu-toggle']);
307	219	unset($admin_bar_data_nested['comments']);
308	220
309		- $admin_bar_data_nested = pxlbsadminify_replaceAmpersandInHref($admin_bar_data_nested);
310	221
311		- // WP Adminify Pricing/Upgrade - open in new tab
312		- if (isset($admin_bar_data_nested['wp-adminify-settings']['submenu'])) {
313		- foreach ($admin_bar_data_nested['wp-adminify-settings']['submenu'] as $key => &$bar_item) {
314		- if (isset($bar_item['href']) && strpos($bar_item['href'], 'wp-adminify-settings-pricing') !== false) {
315		- $bar_item['href'] = 'https://wpadminify.com/pricing';
316		- $bar_item['meta']['target'] = '_blank';
317		- break;
318		- }
319		- }
320		- unset($bar_item);
321		- }
322		-
323	222	$outputter = function () use ($admin_bar_data_nested, $admin_bar_menu_data) {
324	223	$extra_data = [
325	224	'data' => !empty($admin_bar_menu_data) ? $admin_bar_menu_data : array_values($admin_bar_data_nested),
326	225	'logout_url' => wp_logout_url(home_url('/')),
327		- // 'site_url' => site_url('/'),
328		- 'site_url' => home_url(),
	226	+ 'site_url' => site_url(),
329	227	'admin_url' => admin_url(),
330	228	'search' => $this->options['admin_bar_search'],
331	229	'notification' => $this->options['admin_bar_notif'],
332	230	'light_dark_switcher' => $this->options['admin_bar_dark_light_btn'],
333	231	];
334		- $data = "var adminify_admin_bar_data=" . wp_json_encode($extra_data);
	232	+ $data = "var adminify_admin_bar_data=" . json_encode($extra_data);
335	233	wp_print_inline_script_tag($data, ["id" => "adminify_admin_bar_data"]);
336	234	};
337	235
338	236	add_action("admin_footer", $outputter, 0);
339	237	add_action("wp_footer", $outputter, 0);
	238	+
340	239	return $admin_bar_data;
341	240	}
342	241
343		- public function return_original_admin_bar_item_url( $value ,$admin_bar_data_nested ){
344		- if( array_key_exists('submenu',$value) ){
345		- foreach($value['submenu'] as $submenuKey => $submenuItem){
346		- $submenuId = $submenuItem['id'] ?? null;
347		- if( $submenuId && isset($admin_bar_data_nested['submenu'][$submenuId]) ){
348		- $submenuItem = $this->return_original_admin_bar_item_url($submenuItem, $admin_bar_data_nested['submenu'][$submenuId]);
349		- $submenuItem['href'] = $admin_bar_data_nested['submenu'][$submenuId]['href'] ?? $submenuItem['href'];
350		- }
351		- $value['submenu'][$submenuKey] = $submenuItem;
352		- }
353		- }
354		- return $value;
355		- }
356		-
357	242	public function adminify_adminbar_localize_script(){
358		- // get_admin_bar_menu_list() returns an array and prints its script via
359		- // wp_print_inline_script_tag() on the footer hook, so call it for that side effect
360		- // rather than echoing the return value.
361		- $this->get_admin_bar_menu_list();
	243	+ echo $this->get_admin_bar_menu_list();
362	244	}
363	245
364	246	/**
365	247	* Turn admin bar items object to array
		@@ -483,18 +365,13 @@
483	365	$disable_for[$hidden_key] = strtolower($hidden_user['value']);
484	366
485	367	}
486	368
487		- if (\PXLBSAdminify\Inc\Utils::restrict_for($disable_for)) {
488		- unset($flat_array[$menu_id]);
	369	+ if (\WPAdminify\Inc\Utils::restricted_for($disable_for)) {
489	370	continue;
490	371	}
491	372	}
492	373
493		- if ( isset($menu['parent']) && $menu['parent'] && !isset($flat_array[$menu['parent']]) ) {
494		- unset($flat_array[$menu_id]);
495		- continue;
496		- }
497	374
498	375	if (!isset($menu['parent']) || !$menu['parent'] || !isset($flat_array[$menu['parent']])) {
499	376	$nested_array[$menu_id] = $menu;
500	377