← All changes | Inc/Classes/OutputCSS.php +25 -37 4.2.20 → 4.1.3 View file →

		@@ -1,10 +1,10 @@
1	1	<?php
2	2
3		-namespace PXLBSAdminify\Inc\Classes;
	3	+namespace WPAdminify\Inc\Classes;
4	4
5		-use PXLBSAdminify\Inc\Admin\AdminSettings;
6		-use PXLBSAdminify\Inc\Classes\OutputCSS_Body;
	5	+use WPAdminify\Inc\Admin\AdminSettings;
	6	+use WPAdminify\Inc\Classes\OutputCSS_Body;
7	7
8	8
9	9	// no direct access allowed
10	10	if (!defined('ABSPATH')) {
		@@ -24,10 +24,10 @@
24	24	if (is_multisite() && is_network_admin()) {
25	25	return; // only display to network admin if multisite is enbaled
26	26	}
27	27
28		- add_action('admin_enqueue_scripts', [$this, 'output_styles'], 100);
29		- add_action('admin_footer', [$this, 'output_scripts'], 100);
	28	+ add_action('admin_enqueue_scripts', [$this, 'jltwp_adminify_output_styles'], 100);
	29	+ add_action('admin_footer', [$this, 'jltwp_adminify_output_scripts'], 100);
30	30	add_filter('admin_body_class', [$this, 'add_body_classes']);
31	31	}
32	32
33	33	public function add_body_classes($classes)
		@@ -32,14 +32,9 @@
32	32
33	33	public function add_body_classes($classes)
34	34	{
35	35	$folded = $this->options['menu_layout_settings']['menu_mode'] === 'icon_menu' ? 'folded' : '';
36		- // Per-user color_mode meta (saved by the topbar toggle) overrides the global
37		- // admin_ui_mode. Without this, toggling Dark would not persist visually on
38		- // reload because the body class would stay at the global default ('light').
39		- $global_color_mode = !empty($this->options['light_dark_mode']['admin_ui_mode']) ? $this->options['light_dark_mode']['admin_ui_mode'] : 'light';
40		- $user_color_mode = get_user_meta(get_current_user_id(), 'color_mode', true);
41		- $color_mode = !empty($user_color_mode) ? $user_color_mode : $global_color_mode;
	36	+ $color_mode = !empty($this->options['light_dark_mode']['admin_ui_mode']) ? $this->options['light_dark_mode']['admin_ui_mode'] : 'light';
42	37	$color_preset = !empty($this->options['adminify_theme']) ? $this->options['adminify_theme'] : 'preset1';
43	38	// $icon_style = !empty($this->options['menu_layout_settings']['icon_style']) ? $this->options['menu_layout_settings']['icon_style'] : 'classic';
44	39	// $menu_hover_submenu = !empty($this->options['menu_layout_settings']['menu_hover_submenu']) ? $this->options['menu_layout_settings']['menu_hover_submenu'] : 'classic';
45	40	// $menu_mode = !empty($this->options['menu_layout_settings']['menu_mode']) ? $this->options['menu_layout_settings']['menu_mode'] : 'classic';
		@@ -78,53 +73,46 @@
78	73
79	74	return $classes . $bodyclass;
80	75	}
81	76
82		- public function output_styles()
	77	+ public function jltwp_adminify_output_styles()
83	78	{
84		- // $pxlbsadminify_output_css = '';
85		- // $pxlbsadminify_output_css.= 'body.wp-adminify{';
	79	+ // $jltwp_adminify_output_css = '';
	80	+ // $jltwp_adminify_output_css.= 'body.wp-adminify{';
86	81
87		- // $pxlbsadminify_output_css.= '}';
	82	+ // $jltwp_adminify_output_css.= '}';
88	83
89	84	// // Combine the values from above and minifiy them.
90		- // $pxlbsadminify_output_css = preg_replace('#/\*.*?\*/#s', '', $pxlbsadminify_output_css);
91		- // $pxlbsadminify_output_css = preg_replace('/\s*([{}|:;,])\s+/', '$1', $pxlbsadminify_output_css);
92		- // $pxlbsadminify_output_css = preg_replace('/\s\s+(.*)/', '$1', $pxlbsadminify_output_css);
	85	+ // $jltwp_adminify_output_css = preg_replace('#/\*.*?\*/#s', '', $jltwp_adminify_output_css);
	86	+ // $jltwp_adminify_output_css = preg_replace('/\s*([{}|:;,])\s+/', '$1', $jltwp_adminify_output_css);
	87	+ // $jltwp_adminify_output_css = preg_replace('/\s\s+(.*)/', '$1', $jltwp_adminify_output_css);
93	88
94	89	// $adminify_ui = AdminSettings::get_instance()->get('admin_ui');
95	90
96	91	// if (!empty($adminify_ui)) {
97		- // wp_add_inline_style('wp-adminify-admin', wp_strip_all_tags($pxlbsadminify_output_css));
	92	+ // wp_add_inline_style('wp-adminify-admin', wp_strip_all_tags($jltwp_adminify_output_css));
98	93	// } else {
99		- // wp_add_inline_style('wp-adminify-default-ui', wp_strip_all_tags($pxlbsadminify_output_css));
	94	+ // wp_add_inline_style('wp-adminify-default-ui', wp_strip_all_tags($jltwp_adminify_output_css));
100	95	// }
101	96
102	97	// Custom CSS
103	98	if (!empty($this->options['devtools_tabs']['custom_css'])) {
104		- echo "\n<!-- Start of Adminify - Admin Area Custom CSS -->\n";
	99	+ echo "\n<!-- Start of WP Adminify - Admin Area Custom CSS -->\n";
105	100	echo "<style>\n";
106		- echo esc_html( wp_strip_all_tags($this->options['devtools_tabs']['custom_css']) );
	101	+ echo wp_strip_all_tags($this->options['devtools_tabs']['custom_css']);
107	102	echo "\n</style>";
108		- echo "\n<!-- /End of Adminify - Admin Area Custom CSS -->\n";
	103	+ echo "\n<!-- /End of WP Adminify - Admin Area Custom CSS -->\n";
109	104	}
110	105	}
111	106
112		- public function output_scripts()
	107	+ public function jltwp_adminify_output_scripts()
113	108	{
114		- // Custom JS (admin-defined developer tool, saved only by users with the plugin's settings capability).
	109	+ // Custom JS
115	110	if (!empty($this->options['devtools_tabs']['custom_js'])) {
116		- $custom_js = html_entity_decode($this->options['devtools_tabs']['custom_js']);
117		- echo "\n<!-- Start of Adminify - Admin Area Custom JS -->\n";
118		- // Emit through the core helper, which builds a properly-formed inline <script> tag.
119		- if (function_exists('wp_print_inline_script_tag')) {
120		- wp_print_inline_script_tag($custom_js);
121		- } else {
122		- // Fallback for WP < 5.7: neutralise any premature closing tag before printing.
123		- echo "<script>\n";
124		- echo str_replace('</script>', '<\/script>', $custom_js); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- executable inline JS cannot be HTML-escaped; closing tag is neutralised and the value is admin-only config.
125		- echo "\n</script>";
126		- }
127		- echo "\n<!-- /End of Adminify - Admin Area Custom JS -->\n";
	111	+ echo "\n<!-- Start of WP Adminify - Admin Area Custom JS -->\n";
	112	+ echo "<script>\n";
	113	+ echo html_entity_decode($this->options['devtools_tabs']['custom_js']);
	114	+ echo "\n</script>";
	115	+ echo "\n<!-- /End of WP Adminify - Admin Area Custom JS -->\n";
128	116	}
129	117	}
130	118	}