← All changes | classes/core.php +62 -24 0.3.2 → 0.4.0 View file →

		@@ -12,8 +12,9 @@
12	12	public $is_rest = false;
13	13	public $is_cli = false;
14	14	public $site_url = null;
15	15	public $mwcode = null;
	16	+ public $licenser = null;
16	17
17	18	private $option_name = 'mwcode_options';
18	19
19	20	public function __construct() {
		@@ -19,9 +20,9 @@
19	20	public function __construct() {
20	21	global $mwcode;
21	22
22	23	$this->site_url = get_site_url();
23		- $this->is_rest = MeowCommon_Helpers::is_rest();
	24	+ $this->is_rest = MeowKit_MWCODE_Helpers::is_rest();
24	25	$this->is_cli = defined( 'WP_CLI' ) && WP_CLI;
25	26
26	27	// Snippets
27	28	$snippet = new Meow_MWCODE_Modules_Snippet( $this );
		@@ -37,8 +38,13 @@
37	38	add_action( 'plugins_loaded', array( $this, 'init' ) );
38	39	}
39	40
40	41	function init() {
	42	+ // Initialize the licenser for Pro version
	43	+ if ( class_exists( 'MeowKitPro_MWCODE_Licenser' ) ) {
	44	+ $this->licenser = new MeowKitPro_MWCODE_Licenser( MWCODE_PREFIX, MWCODE_ENTRY, MWCODE_DOMAIN, MWCODE_ITEM_ID, MWCODE_VERSION );
	45	+ }
	46	+
41	47	// Part of the core, settings and stuff
42	48	$this->admin = new Meow_MWCODE_Admin( $this );
43	49
44	50	// Only for REST
		@@ -83,14 +89,17 @@
83	89	return [
84	90	//Safemode
85	91	"safe_mode_status" => "on", // on, off, whitelist
86	92	"safe_mode_whitelist" => [],
	93	+ //"disallow_block_php" => true, // Do not allow PHP code to be execute through Blocks "code" parameter
	94	+ "code_blocks" => false,
	95	+ "code_blocks_whitelist" => [], // Whitelist for code blocks, if empty, all code blocks are allowed
87	96
88	97	//LOGS
89	98	"server_debug_mode" => false,
90	99
91	100	//UI
92		- "ui_show_preview" => true,
	101	+ "ui_show_preview" => false,
93	102
94	103	//AI
95	104	"ai_suggestions" => false,
96	105	"ai_engine_status"=> false,
		@@ -101,8 +110,11 @@
101	110	"api_token" => md5( time() . rand() ),
102	111
103	112	//MCP
104	113	"mcp_support" => false,
	114	+
	115	+ //MAINTENANCE
	116	+ "clean_uninstall" => false,
105	117	];
106	118	}
107	119
108	120	function get_all_options( ) {
		@@ -116,19 +128,15 @@
116	128	return $options;
117	129	}
118	130
119	131	function update_options( $options ) {
120		- $current_options = get_option($this->option_name);
121	132
122		- if ($current_options === $options) {
123		- // $this->log('💾 The options are already the expected value.');
124		- } else {
125		- if ( !update_option( $this->option_name, $options, false ) ) {
126		- $this->log( '💾 There was an issue updating the options.' );
127		- }
	133	+ $options = $this->sanitize_options( $options );
	134	+
	135	+ if ( !update_option( $this->option_name, $options, false ) ) {
	136	+ $this->log( '💾 There was an issue updating the options.' );
128	137	}
129		-
130		- $options = $this->sanitize_options( $options );
	138	+
131	139	return $options;
132	140	}
133	141
134	142	function update_option( $option, $value ) {
		@@ -171,12 +179,8 @@
171	179	// Note: We don't disable MCP support here anymore
172	180	// It will be checked at runtime in the MCP class
173	181	}
174	182
175		- if ( $options_modified ) {
176		- update_option( $this->option_name, $options, false );
177		- }
178		-
179	183	return $options;
180	184	}
181	185
182	186	private function updateAIEngineStatus( &$options ) {
		@@ -276,10 +280,10 @@
276	280	$value = array_map( 'trim', $value );
277	281	}
278	282
279	283	if ( $type === 'array' ) {
280		- $value = json_encode( $value );
281		- $value = str_replace( '\\', '', $value );
	284	+ // Convert to PHP array format instead of JSON
	285	+ $value = var_export( $value, true );
282	286	}
283	287
284	288	return [ $name, $value ];
285	289	}
		@@ -432,13 +436,14 @@
432	436	if ( $index < count( $params['args'] ) - 1 ) {
433	437	$params['code'] .= ', ';
434	438	}
435	439	}
	440	+
436	441	$params['code'] .= ");\necho print_r(\$mwcode_result, true);";
437	442
438	443	$error = null;
439	444	$output = null;
440		-
	445	+
441	446	try {
442	447	ob_start();
443	448	eval( $params['code'] );
444	449	$output = ob_get_clean();
		@@ -580,14 +585,17 @@
580	585
581	586	$blocked = false;
582	587	$page = isset( $_GET["page"] ) ? sanitize_text_field( $_GET["page"] ) : null;
583	588
584		- // Block on settings page for safety
	589	+
585	590	if ( $page === 'mwcode_settings' ) {
586		- $blocked = true;
	591	+ // If we blocks global snippets like nonce_life filter, we would block the settings page so let's remove the block for this page
	592	+
	593	+ $blocked = false;
	594	+ //$blocked = true;
587	595	}
588	596	// Block REST requests that aren't whitelisted
589		- elseif ( MeowCommon_Helpers::is_rest() && !Meow_MWCODE_Core::is_white_listed_rest() ) {
	597	+ elseif ( MeowKit_MWCODE_Helpers::is_rest() && !Meow_MWCODE_Core::is_white_listed_rest() ) {
590	598	$blocked = true;
591	599	}
592	600
593	601	if ( empty( $this->snippet ) ) {
		@@ -648,13 +656,38 @@
648	656
649	657	$id = $atts['id'];
650	658	$target = $atts['target'];
651	659	$code = $atts['code'];
652		-
	660	+ $current_post = get_post();
	661	+
	662	+ $no_js = defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML;
	663	+ $allow_php = $this->get_option( 'code_blocks', false );
	664	+ $allow_php_whitelist = $this->get_option( 'code_blocks_whitelist', [] );
	665	+
653	666	// If the ID is null, it means it comes from a Guttenberg block
654	667	$is_block = empty( $id ) && !empty( $code );
655		- if( $is_block ){
656	668
	669	+ if( $is_block ) {
	670	+
	671	+ if( $target !== 'js' && $target !== 'php' ) {
	672	+ return '<b>Code Engine:</b> Please provide a valid target (js or php).';
	673	+ }
	674	+
	675	+ if ( $no_js && $target === 'js' ) {
	676	+ return '<b>Code Engine:</b> Code Block JS are disabled because unfiltered HTML is not allowed on your server.';
	677	+ }
	678	+
	679	+ if ( $target === 'php' ) {
	680	+
	681	+ if ( !$allow_php ) {
	682	+ return '<b>Code Engine:</b> Code Block PHP are disabled. If you are an administrator, you can enable it in the settings, this is not recommended. Please use a Content Snippet ( PHP ) instead.';
	683	+ }
	684	+
	685	+ if ( !empty( $allow_php_whitelist ) && !in_array( $current_post->ID, $allow_php_whitelist ) ) {
	686	+ return '<b>Code Engine:</b> Code Block PHP are disabled for this post. If you are an administrator, you can enable it in the settings, this is not recommended. Please use a Content Snippet ( PHP ) instead.';
	687	+ }
	688	+ }
	689	+
657	690	// Because the code from Blocks are sanitized, we need to replace the &quot; with "
658	691	$code = str_replace( '&quot;', '"', $code );
659	692
660	693	if ( $target === 'js' ) {
		@@ -667,8 +700,9 @@
667	700
668	701	return $output;
669	702	}
670	703
	704	+ // If not a block, we get the snippet by ID
671	705	// If the ID is not null, it means it comes from a shortcode
672	706	if ( empty( $id ) && empty( $code ) ) {
673	707	return '<b>Code Engine:</b> Please provide a snippet ID.';
674	708	}
		@@ -680,12 +714,16 @@
680	714	}
681	715
682	716	//Check if the snippet scope is either content_php or content_js
683	717	$is_content_php = $snippet['scope'] === 'content_php';
684		- $is_content_js = $snippet['scope'] === 'content_js';
	718	+ $is_content_js = $snippet['scope'] === 'content_js';
685	719
686	720	if ( !$is_content_php && !$is_content_js ) {
687	721	return '<b>Code Engine:</b> The snippet is not a content snippet.';
	722	+ }
	723	+
	724	+ if( $no_js && $is_content_js ) {
	725	+ return '<b>Code Engine:</b> Code Engine JS snippets are disabled because unfiltered HTML is not allowed on your server.';
688	726	}
689	727
690	728	//Check if the snippet is active
691	729	if ( !$snippet['active'] ) {