From 2127b1bdd73ecd2423e443992da4b442f5a3c1a3 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 04 Feb 2026 21:19:25 +0000
Subject: [PATCH] =Major overhaul of MetaManager.php -> Meta.php and RestRouteManager.php -> Rest.php. Seems to work for JakeVan

---
 inc/blocks/FormBlock.php |   87 +++++++++++++++++++++++--------------------
 1 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/inc/blocks/FormBlock.php b/inc/blocks/FormBlock.php
index 369ce77..216857d 100644
--- a/inc/blocks/FormBlock.php
+++ b/inc/blocks/FormBlock.php
@@ -1,11 +1,9 @@
 <?php
 namespace JVBase\blocks;
 
-use JVBase\managers\CacheManager;
-use JVBase\meta\MetaManager;
-use JVBase\managers\CloudflareTurnstile;
-use Exception;
-use WP_Block;
+use JVBase\managers\Cache;
+use JVBase\meta\Form;
+use JVBase\utility\Features;
 
 if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
@@ -18,8 +16,8 @@
  */
 class FormBlock
 {
-	protected static FormBlock|null $instance = null;
-	protected CacheManager $cache;
+	protected static ?FormBlock $instance = null;
+	protected Cache $cache;
 	protected array $forms;
 	protected string $form_contact;
 
@@ -35,24 +33,46 @@
 
 	public function __construct()
 	{
-		$this->cache = new CacheManager('form_blocks', HOUR_IN_SECONDS);
-
+		$this->cache = Cache::for('forms', WEEK_IN_SECONDS);
 		// Initialize forms from filter
 		$this->forms = $this->registerForms();
 		$this->form_contact = apply_filters('jvb_form_contact', '');
-
+		
 		// Hook into the CustomBlocks render system
 		add_filter('jvb_render_block_jvb_forms', [$this, 'render'], 10, 2);
 
 		// Register forms data for the block editor
 		add_action('enqueue_block_editor_assets', [$this, 'localizeFormsData']);
 		add_action('init', [$this, 'registerBlock']);
+		add_filter('render_block', [$this, 'maybeEnqueueScripts'], 10, 2);
+	}
+
+	/**
+	 * Enqueue scripts when rendering form block
+	 */
+	public function maybeEnqueueScripts(string $block_content, array $block): string
+	{
+		// Only process our form blocks
+		if ($block['blockName'] !== 'jvb/forms') {
+			return $block_content;
+		}
+
+		// Enqueue Turnstile if needed
+		if (Features::forSite()->hasIntegration('cloudflare')) {
+			$cloudflare = JVB()->connect('cloudflare');
+			if ($cloudflare->isSetUp()) {
+				$cloudflare->enqueueTurnstileScripts();
+			}
+		}
+
+		return $block_content;
 	}
 
 	public function registerBlock()
 	{
 		register_block_type($this->path, [
-			'render_callback'	=> [$this, 'render']
+			'render_callback'	=> [$this, 'render'],
+        	'style' => 'jvb-icons-forms',
 		]);
 	}
 
@@ -93,9 +113,7 @@
 			'sections' => []
 		];
 
-		$config = array_merge($defaults, $config);
-
-		return $config;
+		return array_merge($defaults, $config);
 	}
 
 	/**
@@ -110,16 +128,12 @@
 		}
 
 		$cache_key = $this->cache->generateKey($block);
-		$cached = $this->cache->get($cache_key);
-		$cached = false;
-		if ($cached) {
-			return $cached;
-		}
-
-		$rendered = $this->renderForm($form_type, $block);
-
-		$this->cache->set($cache_key, $rendered);
-		return $rendered;
+		return $this->cache->remember(
+			$cache_key,
+			function() use ($form_type, $block) {
+				return $this->renderForm($form_type, $block);
+			}
+		);
 	}
 
 	/**
@@ -164,7 +178,6 @@
 		$this->renderTurnstile();
 		$this->renderFormEnd($type, $form_id);
 		echo '</div>';
-
 		return ob_get_clean();
 	}
 
@@ -262,8 +275,8 @@
 			}
 		}
 
-		echo '<form id="' . esc_attr($form_id) . '" data-form-id="'.esc_attr($type).'" data-save="form" data-noautosave>';
-		wp_nonce_field('jvb_form_' . $type);
+		echo '<form id="' . esc_attr($form_id) . '" data-form-id="'.esc_attr($type).'" data-save="form">';
+//		wp_nonce_field('jvb_form_' . $type);
 	}
 
 	/**
@@ -277,25 +290,24 @@
 			return;
 		}
 
-		// Create MetaManager instance for form rendering
-		$meta = new MetaManager();
-
 		// If sections are defined, render in sections
 		if (!empty($form_config['sections'])) {
-			$this->renderSections($type, $meta);
+			$this->renderSections($type);
 		} else {
 			echo jvbFormStatus();
 			// Render fields directly
 			foreach ($form_config['fields'] as $field_name => $field_config) {
-				$meta->render('form', $field_name, $field_config);
+				echo Form::render($field_name, null, $field_config);
 			}
+			$submit_text = $form_config['submit'] ?? 'Submit';
+			echo '<button type="submit" class="button primary">' . esc_html($submit_text) . '</button>';
 		}
 	}
 
 	/**
 	 * Render form sections
 	 */
-	protected function renderSections(string $type, MetaManager $meta): void
+	protected function renderSections(string $type): void
 	{
 		$form_config = $this->forms[$type];
 		$sections = $form_config['sections'];
@@ -350,7 +362,7 @@
 			});
 
 			foreach ($section_fields as $field_name => $field_config) {
-				$meta->render('form', $field_name, $field_config);
+				echo Form::render($field_name, null, $field_config);
 			}
 
 			// Add step navigation buttons
@@ -389,7 +401,7 @@
 	 */
 	protected function renderTurnstile(): void
 	{
-		if (!jvbSiteUsesCloudflare()) {
+		if (!Features::hasIntegration('cloudflare')) {
 			return;
 		}
 
@@ -435,11 +447,6 @@
 			];
 		}
 
-		error_log('Form Localization: '.print_r([
-			'formTypes' => $form_types,
-			'availableForms' => $this->forms,
-			'nonce'			=> wp_create_nonce('jvbForm')
-		], true));
 		wp_localize_script('jvb-forms-editor-script', 'jvbFormsData', [
 			'formTypes' => $form_types,
 			'availableForms' => $this->forms,

--
Gitblit v1.10.0