← All changes | Inc/Core/Blocks.php +40 -62 1.0.12 → 3.1.14 View file →

		@@ -1,12 +1,12 @@
1	1	<?php
2	2	/**
3	3	* @package FireBox
4		- * @version 1.0.12 Free
	4	+ * @version 3.1.14 Free
5	5	*
6	6	* @author FirePlugins <[email protected]>
7	7	* @link https://www.fireplugins.com
8		- * @copyright Copyright © 2022 FirePlugins All Rights Reserved
	8	+ * @copyright Copyright © 2026 FirePlugins All Rights Reserved
9	9	* @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html> or later
10	10	*/
11	11
12	12	namespace FireBox\Core;
		@@ -19,15 +19,10 @@
19	19	class Blocks
20	20	{
21	21	public function __construct()
22	22	{
23		- if (!function_exists('register_block_type'))
24		- {
25		- return;
26		- }
	23	+ add_action('enqueue_block_assets', [$this, 'blocks_assets']);
27	24
28		- add_action('enqueue_block_editor_assets', [$this, 'blocks_assets']);
29		-
30	25	// Register categories
31	26	add_filter('block_categories_all', [$this, 'register_categories'], 10, 2);
32	27
33	28	$this->register_blocks();
		@@ -43,31 +38,17 @@
43	38	* @return array
44	39	*/
45	40	public function register_categories($categories, $context)
46	41	{
47		- // Add FireBox category
48		- $categories = array_merge(
	42	+ return array_merge(
49	43	$categories,
50		- array(
51		- array(
52		- 'slug' => 'firebox',
53		- 'title' => firebox()->_('FB_PLUGIN_NAME')
54		- ),
55		- )
	44	+ [
	45	+ [
	46	+ 'slug' => 'firebox',
	47	+ 'title' => 'FireBox'
	48	+ ]
	49	+ ]
56	50	);
57		-
58		- // Add FirePlugins category
59		- $categories = array_merge(
60		- $categories,
61		- array(
62		- array(
63		- 'slug' => 'fireplugins',
64		- 'title' => fpframework()->_('FPF_NAME')
65		- ),
66		- )
67		- );
68		-
69		- return $categories;
70	51	}
71	52
72	53	/**
73	54	* Initialize all blocks
		@@ -76,13 +57,21 @@
76	57	*/
77	58	public function register_blocks()
78	59	{
79	60	$ds = DIRECTORY_SEPARATOR;
80		-
	61	+
81	62	$base_dir = implode($ds, [__DIR__, 'Blocks']);
82		-
83		- $files = array_diff(scandir($base_dir), ['.', '..', 'index.php', 'Block.php']);
84		-
	63	+
	64	+ $cache_key = 'firebox_block_files';
	65	+ $files = wp_cache_get($cache_key, 'firebox');
	66	+
	67	+ if ($files === false)
	68	+ {
	69	+ $files = array_diff(scandir($base_dir), ['.', '..', '.DS_Store', 'index.php', 'Block.php']);
	70	+
	71	+ wp_cache_set($cache_key, $files, 'firebox', HOUR_IN_SECONDS);
	72	+ }
	73	+
85	74	$namespace = '\FireBox\Core\Blocks\\';
86	75
87	76	foreach ($files as $item)
88	77	{
		@@ -87,39 +76,24 @@
87	76	foreach ($files as $item)
88	77	{
89	78	// Check if this is a single file and load it
90	79	$file = implode($ds, [$base_dir, $item]);
91		- if (is_file($file))
	80	+
	81	+ if (!is_file($file))
92	82	{
93		- $this->registerBlock($namespace . rtrim($item, '.php'));
94		- continue;
95		- }
96		-
97		- // If that's not a file, we assume it is a directory of files
98		- $blocks = array_diff(scandir($file), ['.', '..', 'index.php']);
	83	+ continue;
	84	+ }
99	85
100		- foreach ($blocks as $key => $block_name)
101		- {
102		- $class = $namespace . $item . '\\' . rtrim($block_name, '.php');
103		- $this->registerBlock($class);
104		- }
	86	+ $class_name = preg_replace('/.php$/', '', $item);
	87	+
	88	+ $class = $namespace . $class_name;
	89	+
	90	+ $block = new $class();
	91	+ $block->register();
105	92	}
106	93	}
107	94
108	95	/**
109		- * Registers the block.
110		- *
111		- * @param string $class
112		- *
113		- * @return void
114		- */
115		- private function registerBlock($class)
116		- {
117		- $block = new $class();
118		- $block->register();
119		- }
120		-
121		- /**
122	96	* Blocks assets.
123	97	*
124	98	* - Extends functionality of the button/image blocks by allowing to trigger a popup.
125	99	* It also allows us to set custom CSS Classes to these blocks without triggering a popup.
		@@ -125,14 +99,18 @@
125	99	* It also allows us to set custom CSS Classes to these blocks without triggering a popup.
126	100	*/
127	101	public function blocks_assets()
128	102	{
129		- wp_register_script(
	103	+ if (!is_admin())
	104	+ {
	105	+ return;
	106	+ }
	107	+
	108	+ wp_enqueue_script(
130	109	'fb-blocks-extend',
131		- FBOX_MEDIA_ADMIN_URL . 'js/fb_blocks_extend.js',
132		- ['wp-i18n', 'wp-blocks', 'wp-editor', 'wp-components', 'wp-api-fetch'],
	110	+ FBOX_MEDIA_ADMIN_URL . 'js/blocks/fb_blocks_extend.js',
	111	+ ['wp-i18n', 'wp-blocks', 'wp-editor', 'wp-components', 'wp-api-fetch', 'lodash'],
133	112	FBOX_VERSION,
134	113	true
135	114	);
136		- wp_enqueue_script('fb-blocks-extend');
137	115	}
138	116	}