=EmailManager.php refactor, Turnstile properly integrated with form submiss...

Jake Vanderwerf

2025-12-23 25be5747a6e462a3d09fc6607b3639b79e4d9374

 JVBase.php

@@ -2,17 +2,23 @@
namespace JVBase;

use JVBase\integrations\BlueSky;
use JVBase\managers\EmailManager;
use JVBase\managers\ErrorHandler;
use JVBase\managers\LoginManager;
use JVBase\managers\MagicLinkManager;
use JVBase\managers\OperationQueue;
use JVBase\managers\DashboardManager;
use JVBase\managers\ReferralManager;
use JVBase\managers\RoleManager;
use JVBase\managers\SchemaManager;
//use JVBase\managers\SchemaManager;
use JVBase\managers\SEO\SchemaOutputManager;
use JVBase\managers\SEO\SEOAdminPage;
use JVBase\managers\AdminPages;
use JVBase\managers\NotificationManager;
use JVBase\managers\UserTermsManager;
use JVBase\rest\routes\FeedRoutes;
use JVBase\rest\routes\FavouritesRoutes;
use JVBase\rest\routes\IntegrationsSquareRoutes;
use JVBase\rest\routes\NotificationsRoutes;
use JVBase\rest\routes\ContentRoutes;
use JVBase\rest\routes\TermRoutes;
@@ -20,9 +26,11 @@
use JVBase\rest\routes\BioRoutes;
use JVBase\rest\routes\SettingsRoutes;
use JVBase\rest\routes\ShopRoutes;
use JVBase\rest\routes\SEORoutes;
use JVBase\rest\routes\QueueRoutes;
use JVBase\rest\routes\ErrorRoutes;
use JVBase\rest\routes\FormRoutes;
use JVBase\rest\routes\LoginRoutes;
use JVBase\rest\routes\NewsRoutes;
use JVBase\rest\routes\ReferralRoutes;
use JVBase\rest\routes\MagicLinkRoutes;
@@ -59,6 +67,7 @@
      'gmb' => 'JVBase\integrations\GoogleMyBusiness',
      'cloudflare' => 'JVBase\integrations\Cloudflare',
      'umami' => 'JVBase\integrations\Umami',
      'postmark' => 'JVBase\integrations\PostMark',
   ];

    public static function getInstance():JVB
@@ -78,16 +87,27 @@
//            'dash'          => new DashboardManager(),
            'roles'         => new RoleManager(),
//            'forms'         => new FormManager(),
            'schema'        => new SchemaManager(),
            'schema'        => new SchemaOutputManager(),
            'admin'         => new AdminPages(),
         'seoAdmin'     => new SEOAdminPage(),
//       'uploads'      => new UploadManager(),
         'userTerms'    => new UserTermsManager(),
         'email'        => new EmailManager(),
        ];

      add_action('wp_footer', [$this, 'additionalActions']);
      $this->routes = [
         'login'        => new LoginRoutes(),
         'integrations' => new IntegrationsRoutes(),
         'seo'          => new SEORoutes(),
         'queue'        => new QueueRoutes(),
         'settings'     => new SettingsRoutes(),
         'upload'       => new UploadRoutes(),
         'forms'        => new FormRoutes()
      ];

      if (Features::forSite()->has('magicLink')) {
         $this->routes['magicLink'] = new MagicLinkRoutes();
         $this->managers['magicLink'] = new MagicLinkManager();
      }
      if (Features::forSite()->has('referrals')) {
         $this->managers['referral'] = new ReferralManager();
@@ -98,24 +118,23 @@
         $this->managers['dash'] = new DashboardManager();
      }

        $this->routes = [
         'integrations' => new IntegrationsRoutes(),
      ];
        if (jvbSiteUsesFeedBlock()) {
      if (Features::hasIntegration('square')){
         $this->routes['square'] = new IntegrationsSquareRoutes();
      }

        if (Features::forSite()->has('feed_block')) {
            $this->routes['feed'] = new FeedRoutes();
        }
        if (jvbSiteHasNotifications()) {
         $this->managers['notifications'] = new NotificationManager();
            $this->routes['notifications'] = new NotificationsRoutes();
        }
        if (jvbSiteUsesFeedBlock() || jvbSiteHasDashboard()) {
        if (Features::forSite()->has('feed_block') || jvbSiteHasDashboard()) {
            $this->routes['term'] = new TermRoutes();
        }


        if (jvbSiteHasDashboard()) {
            $this->routes['upload'] = new UploadRoutes();
            $this->routes['settings']= new SettingsRoutes();
            $this->routes['queue']  = new QueueRoutes();
            $this->routes['error']  = new ErrorRoutes();
            $this->routes['admin']  = new AdminRoutes();
            $this->routes['content']= new ContentRoutes();
@@ -123,7 +142,6 @@
            $this->routes['shop']   = new ShopRoutes();
            $this->routes['options']= new OptionsRoutes();
        }
      $this->routes['forms']= new FormRoutes();

        if (jvbSiteHasFavourites()) {
            $this->routes['favourites'] = new FavouritesRoutes();
@@ -148,6 +166,8 @@
        }

      $this->setupIntegrations();

      add_action('wp_footer', [$this, 'additionalActions']);
//        $this->managers['notifications'] = new NotificationManager();
        // Register activation hook
        register_activation_hook(JVB_DIR . '/jvb.php', [$this, 'activate']);
@@ -216,10 +236,14 @@
    {
        return $this->managers['admin'];
    }
   public function seoAdmin()
   {
      return $this->managers['seoAdmin'];
   }

    public function getFields($type):array
    {
        $content = JVB_CONTENT[$type]??JVB_TAXONOMY[$type]??JVB_USER[$type]??null;
        $content = JVB_CONTENT[$type]??JVB_TAXONOMY[$type]??JVB_USER[$type]??[];
        return $content['fields']??[];
    }
    public function getContent($type):mixed
@@ -253,7 +277,6 @@

    public function activate():void
    {
        error_log('Activate!');
        // Activate roles - will be properly initialized after post types are registered
        $this->roles()->activate();
    }
@@ -263,13 +286,26 @@
      $this->routes[$slug] = $class;
   }

   public function referrals():ReferralManager
   public function email():EmailManager
   {
      return $this->managers['referral'];
      return $this->managers['email'];
   }

   public function referrals():ReferralManager|false
   {
      return $this->managers['referral']??false;
   }

   public function magicLink():MagicLinkManager|false
   {
      return $this->managers['magicLink']??false;
   }

   public function additionalActions():void
   {
      if (LoginManager::isLogin()) {
         return;
      }
      $extras = apply_filters('jvbAdditionalActions', []);
      $extras = array_filter($extras, function ($extra) {
         return is_array($extra) && array_key_exists('button', $extra) && array_key_exists('content', $extra);