=Extra JVB() calls replaced, minor tweaks

Jake Vanderwerf

2026-08-26 ccf5e61a075c35d24befc175994b5cb8957ca322

 inc/blocks/FormBlock.php

@@ -1,6 +1,7 @@
<?php
namespace JVBase\blocks;

use JVBase\integrations\services\Cloudflare;
use JVBase\managers\Cache;
use JVBase\meta\Form;
use JVBase\base\Site;
@@ -33,11 +34,9 @@

   public function __construct()
   {
      $this->cache = Cache::for('forms', WEEK_IN_SECONDS);
      $this->cache = Cache::for('forms', null, WEEK_IN_SECONDS);

      if (JVB_TESTING) {
         $this->cache->flush();
      }

      // Initialize forms from filter
      $this->forms = $this->registerForms();
      $this->form_contact = apply_filters('jvb_form_contact', '');
@@ -63,7 +62,7 @@

      // Enqueue Turnstile if needed
      if (Site::hasIntegration('cloudflare')) {
         $cloudflare = JVB()->connect('cloudflare');
         $cloudflare = Cloudflare::getInstance();
         if ($cloudflare->isSetUp()) {
            $cloudflare->enqueueTurnstileScripts();
         }
@@ -131,9 +130,8 @@
         return '<div class="jvb-form-error">No valid form type selected. Please edit this block and select a form type.</div>';
      }

      $cache_key = $this->cache->generateKey($block);
      return $this->cache->remember(
         $cache_key,
         $block,
         function() use ($form_type, $block) {
            return $this->renderForm($form_type, $block);
         }
@@ -409,7 +407,7 @@
         return;
      }

      $cloudflare = JVB()->connect('cloudflare');
      $cloudflare = Cloudflare::getInstance();
      if ($cloudflare->isSetUp()) {
         $cloudflare->renderTurnstile();
      }