From 3d25ad7de4fdbb3eba2cde2a62422e6be5d79a0a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 25 Aug 2026 22:57:22 +0000
Subject: [PATCH] =It's been a minute. I went through the Routes and associated Managers and ensured they played together well. Reworked the Cache.php, and I think I caught all the references. Moving away from JVBase() root class, to individuall classes that are Instanced. Double checked for the ABSPATH check in every file, and added index.php to every directory that didn't already have it. Also still working on the MenuBlock to work with WooCommerce for now for Northeh
---
JVBase.php | 331 ++++++++++---------------------------------------------
1 files changed, 60 insertions(+), 271 deletions(-)
diff --git a/JVBase.php b/JVBase.php
index e6fe838..ebbcbc5 100644
--- a/JVBase.php
+++ b/JVBase.php
@@ -1,40 +1,43 @@
<?php
namespace JVBase;
-use JVBase\integrations\BlueSky;
-use JVBase\managers\ErrorHandler;
-use JVBase\managers\OperationQueue;
-use JVBase\managers\DashboardManager;
-use JVBase\managers\ReferralManager;
-use JVBase\managers\RoleManager;
-use JVBase\managers\SchemaManager;
-use JVBase\managers\AdminPages;
+use JVBase\admin\SEOAdmin;
+use JVBase\base\SchemaHelper;
+use JVBase\base\Site;
+use JVBase\blocks\CustomBlocks;
+use JVBase\managers\Approvals;
+use JVBase\managers\DirectoryManager;
+use JVBase\managers\Favourites;
+use JVBase\managers\InvitationsManager;
+use JVBase\managers\Login;
use JVBase\managers\NotificationManager;
+use JVBase\managers\queue\Queue;
+use JVBase\managers\Referrals;
+use JVBase\managers\SEO\render\SchemaOutput;
+use JVBase\managers\TaxonomyRelationships;
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\registrar\Registrar;
+use JVBase\rest\routes\AdminRoutes;
+use JVBase\rest\routes\ApprovalRoutes;
use JVBase\rest\routes\ContentRoutes;
+use JVBase\rest\routes\ContentTermsRoutes;
+use JVBase\rest\routes\ErrorRoutes;
+use JVBase\rest\routes\FavouritesRoutes;
+use JVBase\rest\routes\FeedRoutes;
+use JVBase\rest\routes\FormRoutes;
+use JVBase\rest\routes\Invitations;
+use JVBase\rest\routes\LoginRoutes;
+use JVBase\rest\routes\NewsRoutes;
+use JVBase\rest\routes\NotificationsRoutes;
+use JVBase\rest\routes\OptionsRoutes;
+use JVBase\rest\routes\ReferralRoutes;
+use JVBase\rest\routes\ResponseRoutes;
+use JVBase\rest\routes\SEORoutes;
+use JVBase\rest\routes\SettingsRoutes;
use JVBase\rest\routes\TermRoutes;
use JVBase\rest\routes\UploadRoutes;
-use JVBase\rest\routes\BioRoutes;
-use JVBase\rest\routes\SettingsRoutes;
-use JVBase\rest\routes\ShopRoutes;
-use JVBase\rest\routes\QueueRoutes;
-use JVBase\rest\routes\ErrorRoutes;
-use JVBase\rest\routes\FormRoutes;
-use JVBase\rest\routes\NewsRoutes;
-use JVBase\rest\routes\ReferralRoutes;
-use JVBase\rest\routes\MagicLinkRoutes;
-use JVBase\rest\routes\ResponseRoutes;
-use JVBase\rest\routes\OptionsRoutes;
use JVBase\rest\routes\VoteRoutes;
-use JVBase\rest\routes\Invitations;
-use JVBase\rest\routes\ApprovalRoutes;
-use JVBase\rest\routes\AdminRoutes;
-use JVBase\rest\routes\IntegrationsRoutes;
-use JVBase\utility\Features;
+use UserRoutes;
if (!defined('ABSPATH')) {
exit;
@@ -42,265 +45,51 @@
class JVB
{
- protected static JVB|null $instance = null;
- protected array $managers = [];
- protected array $content = [];
- protected array $taxonomies = [];
- protected array $integrations = [];
- protected array $blocks = [];
- protected array $routes = [];
-
- protected array $serviceMap = [
- 'maps' => 'JVBase\integrations\GoogleMaps',
- 'square' => 'JVBase\integrations\Square',
- 'facebook' => 'JVBase\integrations\Facebook',
- 'helcim' => 'JVBase\integrations\Helcim',
- 'instagram' => 'JVBase\integrations\Instagram',
- 'bluesky' => 'JVBase\integrations\BlueSky',
- 'gmb' => 'JVBase\integrations\GoogleMyBusiness',
- 'cloudflare' => 'JVBase\integrations\Cloudflare',
- 'umami' => 'JVBase\integrations\Umami',
- ];
-
- public static function getInstance():JVB
- {
- if (self::$instance === null) {
- self::$instance = new self();
- }
- return self::$instance;
- }
+ protected static JVB|null $instance = null;
+ protected array $managers = [];
+ protected array $content = [];
+ protected array $taxonomies = [];
+ protected array $blocks = [];
+ protected array $routes = [];
+ protected CustomBlocks $customBlocks;
- public function __construct()
- {
- $this->managers = [
- 'errors' => new ErrorHandler(),
- 'queue' => new OperationQueue(),
-// 'dash' => new DashboardManager(),
- 'roles' => new RoleManager(),
-// 'forms' => new FormManager(),
- 'schema' => new SchemaManager(),
- 'admin' => new AdminPages(),
-// 'uploads' => new UploadManager(),
- 'userTerms' => new UserTermsManager(),
- ];
-
- if (Features::forSite()->has('magicLink')) {
- $this->routes['magicLink'] = new MagicLinkRoutes();
- }
- if (Features::forSite()->has('referrals')) {
- $this->managers['referral'] = new ReferralManager();
- $this->routes['referral'] = new ReferralRoutes();
- }
-
- if (Features::forSite()->has('dashboard')) {
- $this->managers['dash'] = new DashboardManager();
- }
-
- if (Features::hasIntegration('square')){
- $this->routes['square'] = new IntegrationsSquareRoutes();
- }
-
- $this->routes = [
- 'integrations' => new IntegrationsRoutes(),
- ];
- if (jvbSiteUsesFeedBlock()) {
- $this->routes['feed'] = new FeedRoutes();
- }
- if (jvbSiteHasNotifications()) {
- $this->managers['notifications'] = new NotificationManager();
- $this->routes['notifications'] = new NotificationsRoutes();
- }
- if (jvbSiteUsesFeedBlock() || 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();
- $this->routes['bio'] = new BioRoutes();
- $this->routes['shop'] = new ShopRoutes();
- $this->routes['options']= new OptionsRoutes();
- }
- $this->routes['forms']= new FormRoutes();
-
- if (jvbSiteHasFavourites()) {
- $this->routes['favourites'] = new FavouritesRoutes();
- }
-
- if (Features::forMembership()->has('forum')) {
- $this->routes['news'] = new NewsRoutes();
- }
- if (Features::anyContentHas('response') || Features::anyTaxonomyHas('response') || Features::anyUserHas('response')) {
- $this->routes['comments'] = new ResponseRoutes();
- }
- if (Features::anyContentHas('karma') || Features::anyTaxonomyHas('karma') || Features::anyUserHas('karma')) {
- $this->routes['vote'] = new VoteRoutes();
- }
- if (Features::anyContentHas('karma') || Features::anyTaxonomyHas('karma') || Features::anyUserHas('karma')
- || Features::forMembership()->has('member_verified') ||
- Features::forMembership()->has('term_approval')) {
- $this->routes['approvals'] = new ApprovalRoutes();
- }
- if (Features::forMembership()->has('can_invite')) {
- $this->routes['invites'] = new Invitations();
- }
-
- $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']);
- }
-
-
- protected function setupIntegrations():void
+ public static function getInstance(): JVB
{
- if (array_key_exists('integrations', JVB_SITE)){
- foreach (JVB_SITE['integrations'] as $service => $use){
- if (!$use) {
- continue;
- }
- if (array_key_exists($service, $this->serviceMap)) {
- $this->integrations[$service] = new $this->serviceMap[$service]();
- }
-
- }
+ if (self::$instance === null) {
+ self::$instance = new self();
}
+ return self::$instance;
}
- public function registeredContent():array
- {
- return array_merge(array_keys($this->content), array_keys($this->taxonomies));
- }
- public function dashboard()
- {
- return $this->managers['dash'];
- }
- public function error()
- {
- return $this->managers['errors'];
- }
- public function file()
- {
- return $this->managers['file'];
- }
- public function cache()
- {
- return $this->managers['cache'];
- }
- public function queue()
- {
- return $this->managers['queue'];
- }
-// public function forms()
-// {
-// return $this->managers['forms'];
-// }
- public function notification()
- {
- return $this->managers['notifications'];
- }
- public function routes($route):mixed
- {
- if (array_key_exists($route, $this->routes)) {
- return $this->routes[$route];
- }
- return false;
- }
- public function roles()
- {
- return $this->managers['roles'];
- }
- public function admin()
- {
- return $this->managers['admin'];
- }
- public function getFields($type):array
- {
- $content = JVB_CONTENT[$type]??JVB_TAXONOMY[$type]??JVB_USER[$type]??null;
- return $content['fields']??[];
- }
- public function getContent($type):mixed
- {
- return $this->content[$type]??$this->taxonomies[$type]??$this->blocks[$type]??null;
- }
-
- public function connect(string $service, ?int $userID = null):mixed
+ private function __construct()
{
- if ($userID) {
- if (!$this->userCanConnect($service, $userID)){
- return null;
- }
+ }
- if (!array_key_exists($service, $this->integrations)) {
- return null;
- }
- return new $this->serviceMap[$service]($userID);
+ public function routes($route): mixed
+ {
+ if (array_key_exists($route, $this->routes)) {
+ return $this->routes[$route];
}
- return (array_key_exists($service, $this->integrations)) ? $this->integrations[$service] : null;
+ return false;
}
- public function userCanConnect(string $service, int $userID):bool
+
+
+ public function getFields($type): array
{
- $allowed = JVB_USER[jvbUserRole($userID)]['integrations'] ?? [];
- return user_can($userID, 'manage_options') || in_array($service, $allowed);
- }
- public function getAvailableServices(bool $keys = true):array {
-
- return ($keys) ? array_keys($this->integrations) : $this->integrations;
+ return Registrar::getFieldsFor($type)??[];
}
- public function activate():void
- {
- error_log('Activate!');
- // Activate roles - will be properly initialized after post types are registered
- $this->roles()->activate();
- }
-
- public function addRoute($slug, $class):void
+ /**
+ * @deprecated Should use the Registrar::getInstance
+ * @param $type
+ * @return mixed
+ */
+ public function getContent($type): mixed
{
- $this->routes[$slug] = $class;
+ return $this->content[$type] ?? $this->taxonomies[$type] ?? $this->blocks[$type] ?? null;
}
- public function referrals():ReferralManager
- {
- return $this->managers['referral'];
- }
-
- public function additionalActions():void
- {
- $extras = apply_filters('jvbAdditionalActions', []);
- $extras = array_filter($extras, function ($extra) {
- return is_array($extra) && array_key_exists('button', $extra) && array_key_exists('content', $extra);
- });
- if (empty ($extras)) {
- return;
- }
- $buttons = array_map(function ($extra) {
- return $extra['button'];
- }, $extras);
- $contents = array_map(function($extra) {
- return $extra['content'];
- }, $extras);
-
- if (!empty ($buttons)) {
- ?>
- <section class="additional-actions">
- <div class="buttons col">
- <?= implode($buttons); ?>
- </div>
- <div class="actions">
- <?= implode($contents); ?>
- </div>
- </section>
- <?php
- }
- }
}
--
Gitblit v1.10.0