Fix: User role settings are not applied to all editors

Author: t-hamano

classes/class-block-editor.php

@@ -13,6 +13,12 @@ class BlockEditor {
 	 * Constructor
 	 */
 	function __construct() {
+		// Abort the process if the editor isn't allowed to use this extension.
+		$options = Settings::get_options();
+		if ( ! $options['permissionBlockEditor'] ) {
+			return;
+		}
+
 		// Enqueue block editor scripts
 		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_editor_scripts' ) );
 
@@ -32,10 +38,8 @@ function __construct() {
 	public function enqueue_editor_scripts() {
 		$asset_file = include( CHBE_PATH . '/build/block-editor.asset.php' );
 
-		// Abort the process if permission is disabled.
-		$options = Settings::get_options();
-
-		if ( ! $options['permissionBlockEditor'] || ! Settings::is_allowed_user() ) {
+		// Abort the process if the user role isn't allowed to use this extension.
+		if ( ! Settings::is_allowed_user() ) {
 			return;
 		}
 
@@ -64,10 +68,8 @@ public function enqueue_editor_scripts() {
 	 * Enqueue block editor styles
 	 */
 	public function enqueue_editor_styles() {
-		// Abort the process if permission is disabled.
-		$options = Settings::get_options();
-
-		if ( ! $options['permissionBlockEditor'] || ! Settings::is_allowed_user() ) {
+		// Abort the process if the user role permission is disabled.
+		if ( ! Settings::is_allowed_user() ) {
 			return;
 		}
 

classes/class-classic-editor.php

@@ -13,7 +13,7 @@ class ClassicEditor {
 	 * Constructor
 	 */
 	public function __construct() {
-		// Abort the process if permission is disabled.
+		// Abort the process if the editor isn't allowed to use this extenson.
 		$options = Settings::get_options();
 		if ( ! $options['permissionClassicEditor'] ) {
 			return;
@@ -42,14 +42,19 @@ public function admin_enqueue_scripts( $hook_suffix ) {
 			return;
 		}
 
-		// Abort the process if block editor is enabled.
+		// Abort the process if the block editor is enabled.
 		if ( ! function_exists( 'get_current_screen' ) ) {
 			return;
 		}
 		if ( get_current_screen()->is_block_editor ) {
 			return;
 		}
 
+		// Abort the process if the user role isn't allowed to use this extension.
+		if ( ! Settings::is_allowed_user() ) {
+			return;
+		}
+
 		wp_enqueue_style(
 			CHBE_NAMESPACE,
 			CHBE_URL . '/build/style-classic-editor.css',
@@ -106,6 +111,11 @@ public function media_buttons( $editor_id ) {
 			return;
 		}
 
+		// Abort the process if the user role isn't allowed to use this extension.
+		if ( ! Settings::is_allowed_user() ) {
+			return;
+		}
+
 		printf(
 			'<button type="button" class="button chbe-replace-indent" id="chbe-replace-indent-button">' . Settings::ICON . ' %s' . '</button>',
 			__( 'Change Indentation', 'custom-html-block-extension' )
@@ -116,7 +126,7 @@ public function media_buttons( $editor_id ) {
 	 * Add dialog
 	 */
 	public function admin_footer() {
-		// Abort the process if block editor is enabled.
+		// Abort the process if the block editor is enabled.
 		if ( ! function_exists( 'get_current_screen' ) ) {
 			return;
 		}
@@ -129,6 +139,11 @@ public function admin_footer() {
 			return;
 		}
 
+		// Abort the process if the user role isn't allowed to use this extension.
+		if ( ! Settings::is_allowed_user() ) {
+			return;
+		}
+
 		$settings = Settings::get_editor_settings();
 		// phpcs:disable Generic.ControlStructures.InlineControlStructure
 		?>

classes/class-theme-plugin-editor.php

@@ -13,7 +13,7 @@ class ThemePluginEditor {
 	 * Constructor
 	 */
 	public function __construct() {
-		// Abort the process if permission is disabled.
+		// Abort the process if the editor isn't allowed to use this extenson.
 		$options = Settings::get_options();
 		if ( ! $options['permissionThemePluginEditor'] ) {
 			return;
@@ -32,6 +32,11 @@ public function admin_enqueue_scripts( $hook_suffix ) {
 			return;
 		}
 
+		// Abort the process if the user role isn't allowed to use this extension.
+		if ( ! Settings::is_allowed_user() ) {
+			return;
+		}
+
 		// Correspondence between the file extension and the language specified in the Monaco Editor
 		$map_to_lang = array(
 			'css'  => 'css',