← All changes | Inc/Admin/Frames/Admin.php +26 -57 4.2.22 → 4.0.5.4 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,18 +65,18 @@
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		- 'security_nonce' => wp_create_nonce('pxlbsadminify_frame_nonce')
	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
		@@ -160,9 +160,9 @@
160	160	// 'post_type' => ['post', 'page']
161	161	// ]
162	162	];
163	163
164		- return apply_filters( 'pxlbsadminify_frame_not_allowed_urls', $not_allowed_urls );
	164	+ return apply_filters( 'adminify_frame_not_allowed_urls', $not_allowed_urls );
165	165	}
166	166
167	167	/**
168	168	* Adds the 'frame-adminify-app="true"' attribute to the given attribute string.
		@@ -183,15 +183,9 @@
183	183	* @return void
184	184	*/
185	185	public function load_template()
186	186	{
187		- // async-upload.php & friends fire admin_init but answer with a raw payload,
188		- // so the frame markup would be read as part of the response.
189		- if ( ! Utils::is_admin_page_request() ) {
190		- return;
191		- }
192		-
193		- Utils::load_template('Templates.php');
	187	+ adminify_load_template('Templates.php');
194	188	}
195	189
196	190	public function capture_wp_menu($parent_file)
197	191	{
		@@ -196,9 +190,9 @@
196	190	public function capture_wp_menu($parent_file)
197	191	{
198	192	global $menu, $submenu;
199	193
200		- $menu_build = pxlbsadminify_build_menu($menu, $submenu, $this->menu_settings);
	194	+ $menu_build = jltwp_adminify_build_menu($menu, $submenu, $this->menu_settings);
201	195
202	196	$this->enqueue_menu($menu_build);
203	197
204	198	return $parent_file;
		@@ -214,9 +208,9 @@
214	208	$default_light_dark_mode = [
215	209	'admin_ui_mode' => 'light',
216	210	'admin_ui_logo_type' => 'image_logo',
217	211	'admin_ui_light_mode' => [
218		- 'admin_ui_light_logo_text' => 'Adminify',
	212	+ 'admin_ui_light_logo_text' => 'WP Adminify',
219	213	'admin_ui_light_logo_text_typo' => array_fill_keys(
220	214	['font-family', 'font-weight', 'font-style', 'font-size', 'letter-spacing', 'color', 'type', 'unit'], ''
221	215	) + ['unit' => 'px'],
222	216	'admin_ui_light_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''),
		@@ -223,9 +217,9 @@
223	217	'light_logo_size' => ['width' => 120, 'height' => 32, 'unit' => 'px'],
224	218	'mini_admin_ui_light_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''),
225	219	],
226	220	'admin_ui_dark_mode' => [
227		- 'admin_ui_dark_logo_text' => 'Adminify',
	221	+ 'admin_ui_dark_logo_text' => 'WP Adminify',
228	222	'admin_ui_dark_logo_text_typo' => array_fill_keys(
229	223	['font-family', 'font-weight', 'font-style', 'font-size', 'letter-spacing', 'color', 'type', 'unit'], ''
230	224	) + ['unit' => 'px'],
231	225	'admin_ui_dark_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''),
		@@ -249,13 +243,13 @@
249	243	'profile_url' => esc_url(admin_url('profile.php')),
250	244	'username' => esc_html($current_user->user_login),
251	245	'email' => wp_kses_post(is_email($current_user->user_email)),
252	246	],
253		- 'image_path' => PXLBSADMINIFY_ASSETS_IMAGE,
254		- 'is_pro' => (class_exists('\\PXLBSAdminify\\Pro\\Adminify_Pro') && !empty(\PXLBSAdminify\Pro\Adminify_Pro::is_premium())) ? true : false
	247	+ 'image_path' => WP_ADMINIFY_ASSETS_IMAGE,
	248	+ 'is_pro' => (class_exists('\\WPAdminify\\Pro\\Adminify_Pro') && !empty(\WPAdminify\Pro\Adminify_Pro::is_premium())) ? true : false
255	249	];
256	250
257		- $data = "var frame_adminify_menu=" . wp_json_encode($menu_settings);
	251	+ $data = "var frame_adminify_menu=" . json_encode($menu_settings);
258	252	wp_print_inline_script_tag($data, ["id" => "frame_adminify_menu"]);
259	253	};
260	254
261	255	add_action("admin_footer", $outputter, 0);
		@@ -271,16 +265,12 @@
271	265
272	266	$admin_bar_menu_data = [];
273	267
274	268	// Admin Bar Exits
275		- if ( Utils::is_plugin_active('admin-bar/admin-bar.php') ) {
	269	+ if ( Utils::is_plugin_active('admin-bar/admin-bar.php') || Utils::is_plugin_active('admin-bar-pro/admin-bar-pro.php') ) {
276	270	$admin_bar_items = get_option('_jltadminbar_settings');
	271	+ if( empty($admin_bar_items) ) return;
277	272
278		- // Only build the customized admin bar when settings exist.
279		- // Otherwise fall through so the default admin bar data is still
280		- // printed and `adminify_admin_bar_data` is always defined.
281		- if ( !empty($admin_bar_items) ) {
282		-
283	273	$existing_admin_bar = !empty($admin_bar_items['existing_admin_bar']) ? $admin_bar_items['existing_admin_bar'] : '';
284	274	$saved_admin_bar = !empty($admin_bar_items['saved_admin_bar']) ? $admin_bar_items['saved_admin_bar'] : [];
285	275
286	276	$parsed_admin_bar_backend = empty($saved_admin_bar) ? $existing_admin_bar : $this->parse_menu_items($saved_admin_bar, $existing_admin_bar, 'backend');
		@@ -297,14 +287,12 @@
297	287	$admin_bar_menu_data = $this->nodes_to_array_for_admin_bar($remove_admin_menu);
298	288	foreach($admin_bar_menu_data as $key => $value){
299	289	if( array_key_exists($value['id'],$admin_bar_data_nested)){
300	290	$value['href'] = $admin_bar_data_nested[$value['id']]['href'];
301		- $value = $this->return_original_admin_bar_item_url($value, $admin_bar_data_nested[$value['id']]);
302	291	}
	292	+ $value = $this->return_original_admin_bar_item_url($value, $admin_bar_data_nested[$value['id']]);
303	293	$admin_bar_menu_data[$key] = $value;
304	294	}
305		-
306		- } // end if ( !empty($admin_bar_items) )
307	295	}
308	296
309	297	unset($admin_bar_data_nested['wp-logo']);
310	298	unset($admin_bar_data_nested['site-name']);
		@@ -311,22 +299,9 @@
311	299	unset($admin_bar_data_nested['updates']);
312	300	unset($admin_bar_data_nested['menu-toggle']);
313	301	unset($admin_bar_data_nested['comments']);
314	302
315		- $admin_bar_data_nested = pxlbsadminify_replaceAmpersandInHref($admin_bar_data_nested);
316		-
317		- // WP Adminify Pricing/Upgrade - open in new tab
318		- if (isset($admin_bar_data_nested['wp-adminify-settings']['submenu'])) {
319		- foreach ($admin_bar_data_nested['wp-adminify-settings']['submenu'] as $key => &$bar_item) {
320		- if (isset($bar_item['href']) && strpos($bar_item['href'], 'wp-adminify-settings-pricing') !== false) {
321		- $bar_item['href'] = 'https://wpadminify.com/pricing';
322		- $bar_item['meta']['target'] = '_blank';
323		- break;
324		- }
325		- }
326		- unset($bar_item);
327		- }
328		-
	303	+ $admin_bar_data_nested = jlt_adminify_replaceAmpersandInHref($admin_bar_data_nested);
329	304	$outputter = function () use ($admin_bar_data_nested, $admin_bar_menu_data) {
330	305	$extra_data = [
331	306	'data' => !empty($admin_bar_menu_data) ? $admin_bar_menu_data : array_values($admin_bar_data_nested),
332	307	'logout_url' => wp_logout_url(home_url('/')),
		@@ -336,9 +311,9 @@
336	311	'search' => $this->options['admin_bar_search'],
337	312	'notification' => $this->options['admin_bar_notif'],
338	313	'light_dark_switcher' => $this->options['admin_bar_dark_light_btn'],
339	314	];
340		- $data = "var adminify_admin_bar_data=" . wp_json_encode($extra_data);
	315	+ $data = "var adminify_admin_bar_data=" . json_encode($extra_data);
341	316	wp_print_inline_script_tag($data, ["id" => "adminify_admin_bar_data"]);
342	317	};
343	318
344	319	add_action("admin_footer", $outputter, 0);
		@@ -348,13 +323,10 @@
348	323
349	324	public function return_original_admin_bar_item_url( $value ,$admin_bar_data_nested ){
350	325	if( array_key_exists('submenu',$value) ){
351	326	foreach($value['submenu'] as $submenuKey => $submenuItem){
352		- $submenuId = $submenuItem['id'] ?? null;
353		- if( $submenuId && isset($admin_bar_data_nested['submenu'][$submenuId]) ){
354		- $submenuItem = $this->return_original_admin_bar_item_url($submenuItem, $admin_bar_data_nested['submenu'][$submenuId]);
355		- $submenuItem['href'] = $admin_bar_data_nested['submenu'][$submenuId]['href'] ?? $submenuItem['href'];
356		- }
	327	+ $submenuItem = $this->return_original_admin_bar_item_url($submenuItem, $admin_bar_data_nested['submenu'][$submenuItem['id']]);
	328	+ $submenuItem['href'] = $admin_bar_data_nested['submenu'][$submenuItem['id']]['href'];
357	329	$value['submenu'][$submenuKey] = $submenuItem;
358	330	}
359	331	}
360	332	return $value;
		@@ -360,12 +332,9 @@
360	332	return $value;
361	333	}
362	334
363	335	public function adminify_adminbar_localize_script(){
364		- // get_admin_bar_menu_list() returns an array and prints its script via
365		- // wp_print_inline_script_tag() on the footer hook, so call it for that side effect
366		- // rather than echoing the return value.
367		- $this->get_admin_bar_menu_list();
	336	+ echo $this->get_admin_bar_menu_list();
368	337	}
369	338
370	339	/**
371	340	* Turn admin bar items object to array
		@@ -489,9 +458,9 @@
489	458	$disable_for[$hidden_key] = strtolower($hidden_user['value']);
490	459
491	460	}
492	461
493		- if (\PXLBSAdminify\Inc\Utils::restrict_for($disable_for)) {
	462	+ if (\WPAdminify\Inc\Utils::restrict_for($disable_for)) {
494	463	unset($flat_array[$menu_id]);
495	464	continue;
496	465	}
497	466	}