← All changes | Libs/adminify-framework/classes/setup.class.php +11 -21 4.2.21 → 4.1.10 View file →

		@@ -177,9 +177,9 @@
177	177
178	178	// Setup taxonomy option framework
179	179	$params = array();
180	180	if ( class_exists( 'ADMINIFY_Taxonomy_Options' ) && ! empty( self::$args['taxonomy_options'] ) ) {
181		- $taxonomy = ( isset( $_GET['taxonomy'] ) ) ? sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only check, no state change.
	181	+ $taxonomy = ( isset( $_GET['taxonomy'] ) ) ? sanitize_text_field( wp_unslash( $_GET['taxonomy'] ) ) : '';
182	182	foreach ( self::$args['taxonomy_options'] as $key => $value ) {
183	183	if ( ! empty( self::$args['sections'][$key] ) && ! isset( self::$inited[$key] ) ) {
184	184
185	185	$params['args'] = $value;
		@@ -577,19 +577,14 @@
577	577	// Wp color picker
578	578	wp_enqueue_style( 'wp-color-picker' );
579	579	wp_enqueue_script( 'wp-color-picker' );
580	580
581		- // Font awesome 4 and 5 loader. The font files live in the main plugin's
582		- // assets/ directory, not inside the framework, so resolve the base URL
583		- // from there to avoid a 404 on the framework-relative path.
584		- $adminify_fa_base = defined( 'PXLBSADMINIFY_ASSETS' )
585		- ? PXLBSADMINIFY_ASSETS . 'vendors/fontawesome/'
586		- : self::include_plugin_url( 'assets/vendors/fontawesome/' );
	581	+ // Font awesome 4 and 5 loader
587	582	if ( apply_filters( 'adminify_fa4', false ) ) {
588		- wp_enqueue_style( 'adminify-fa', $adminify_fa_base . 'fa4/css/font-awesome.min.css', array(), '4.7.0', 'all' );
	583	+ wp_enqueue_style( 'adminify-fa', 'https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css', array(), '4.7.0', 'all' );
589	584	} else {
590		- wp_enqueue_style( 'adminify-fa5', $adminify_fa_base . 'fa5/css/all.min.css', array(), '5.15.4', 'all' );
591		- wp_enqueue_style( 'adminify-fa5-v4-shims', $adminify_fa_base . 'fa5/css/v4-shims.min.css', array(), '5.15.4', 'all' );
	585	+ wp_enqueue_style( 'adminify-fa5', 'https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/all.min.css', array(), '5.15.5', 'all' );
	586	+ wp_enqueue_style( 'adminify-fa5-v4-shims', 'https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/v4-shims.min.css', array(), '5.15.5', 'all' );
592	587	}
593	588
594	589	// Check for developer mode
595	590	$min = ( self::$premium && SCRIPT_DEBUG ) ? '' : '.min';
		@@ -610,9 +605,8 @@
610	605	wp_localize_script( 'adminify', 'adminify_vars', array(
611	606	'color_palette' => apply_filters( 'adminify_color_palette', array() ),
612	607	'i18n' => array(
613	608	'confirm' => esc_html__( 'Are you sure?', 'adminify' ),
614		- /* translators: %s: minimum number of characters required to trigger a search. */
615	609	'typing_text' => esc_html__( 'Please enter %s or more characters', 'adminify' ),
616	610	'searching_text' => esc_html__( 'Searching...', 'adminify' ),
617	611	'no_results_text' => esc_html__( 'No results found.', 'adminify' ),
618	612	),
		@@ -663,9 +657,9 @@
663	657	}
664	658
665	659	$query['display'] = 'swap';
666	660
667		- wp_enqueue_style( 'adminify-google-web-fonts', esc_url( add_query_arg( $query, '//fonts.googleapis.com/css' ) ), array(), PXLBSADMINIFY_VER );
	661	+ wp_enqueue_style( 'adminify-google-web-fonts', esc_url( add_query_arg( $query, '//fonts.googleapis.com/css' ) ), array(), null );
668	662
669	663	}
670	664
671	665	if ( ! empty( self::$webfonts['async'] ) ) {
		@@ -675,9 +669,9 @@
675	669	foreach ( self::$webfonts['async'] as $family => $styles ) {
676	670	$fonts[] = $family . ( ( ! empty( $styles ) ) ? ':'. implode( ',', $styles ) : '' );
677	671	}
678	672
679		- wp_enqueue_script( 'adminify-google-web-fonts', self::include_plugin_url( 'assets/js/webfont.js' ), array(), self::$version, false );
	673	+ wp_enqueue_script( 'adminify-google-web-fonts', esc_url( '//ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js' ), array(), null );
680	674
681	675	wp_localize_script( 'adminify-google-web-fonts', 'WebFontConfig', array( 'google' => array( 'families' => $fonts ) ) );
682	676
683	677	}
		@@ -700,9 +694,9 @@
700	694	// Add custom css to front page
701	695	public static function add_custom_css() {
702	696
703	697	if ( ! empty( self::$css ) ) {
704		- echo '<style type="text/css">'. wp_strip_all_tags( self::$css ) .'</style>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- wp_strip_all_tags() removes all markup; CSS-only content cannot break out of the <style> block.
	698	+ echo '<style type="text/css">'. wp_strip_all_tags( self::$css ) .'</style>';
705	699	}
706	700
707	701	}
708	702
		@@ -760,17 +754,16 @@
760	754
761	755	}
762	756
763	757	// These attributes has been sanitized above.
764		- ob_start();
765		- echo '<div class="adminify-field adminify-field-'. esc_attr( $field_type . $is_pseudo . $class . $visible ) .'"'. $depend .'>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- value pre-escaped where built.
	758	+ echo '<div class="adminify-field adminify-field-'. $field_type . $is_pseudo . $class . $visible .'"'. $depend .'>';
766	759
767	760	if ( ! empty( $field_type ) ) {
768	761
769	762	if ( ! empty( $field['title'] ) ) {
770	763	echo '<div class="adminify-title">';
771		- echo '<h4>'. wp_kses_post( $field['title'] ) .'</h4>';
772		- echo ( ! empty( $field['subtitle'] ) ) ? '<div class="adminify-subtitle-text">'. wp_kses_post( $field['subtitle'] ) .'</div>' : '';
	764	+ echo '<h4>'. $field['title'] .'</h4>';
	765	+ echo ( ! empty( $field['subtitle'] ) ) ? '<div class="adminify-subtitle-text">'. $field['subtitle'] .'</div>' : '';
773	766	echo '</div>';
774	767	}
775	768
776	769	echo ( ! empty( $field['title'] ) ) ? '<div class="adminify-fieldset">' : '';
		@@ -793,11 +786,8 @@
793	786
794	787	echo ( ! empty( $field['title'] ) ) ? '</div>' : '';
795	788	echo '<div class="clear"></div>';
796	789	echo '</div>';
797		-
798		- $html = ob_get_clean();
799		- echo apply_filters( 'pxlbsadminify_render_field_html', $html, $field ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- value pre-escaped where built.
800	790
801	791	}
802	792
803	793	}