From ccf5e61a075c35d24befc175994b5cb8957ca322 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 26 Aug 2026 21:45:53 +0000
Subject: [PATCH] =Extra JVB() calls replaced, minor tweaks
---
inc/managers/_setup.php | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/inc/managers/_setup.php b/inc/managers/_setup.php
index 84d8218..e297b3f 100644
--- a/inc/managers/_setup.php
+++ b/inc/managers/_setup.php
@@ -1,24 +1,26 @@
<?php
-use JVBase\managers\ApprovalManager;
+use JVBase\managers\Approvals;
use JVBase\managers\Cache;
use JVBase\managers\IconsManager;
use JVBase\registrar\Registrar;
use JVBase\base\Site;
-
+if (!defined('ABSPATH')) {
+ exit;
+}
require(JVB_DIR . '/inc/managers/ScriptLoader.php');
+require(JVB_DIR . '/inc/managers/Errors.php');
require(JVB_DIR . '/inc/managers/CustomTable.php');
//require(JVB_DIR . '/inc/managers/CacheManager.php');
require(JVB_DIR . '/inc/managers/Cache.php');
-class_alias('JVBase\managers\Cache', 'JVBase\managers\CacheManager');
require(JVB_DIR . '/inc/managers/IconsManager.php');
-add_action('init', 'jvbInit', 1); // Priority 1 - very early
-function jvbInit(): void
+add_action('jvbloaded', 'jvbManagers'); // Priority 1 - very early
+function jvbManagers(): void
{
- Cache::registerHooks();
+// Cache::registerHooks();
// Initialize base sources (this registers hooks and includes defaults)
IconsManager::for();
IconsManager::for('forms');
@@ -28,8 +30,8 @@
IconsManager::for('dash');
}
- if (Site::has('magicLink')) {
- require(JVB_DIR . '/inc/managers/MagicLinkManager.php');
+ if (Site::has('magic_link')) {
+ require(JVB_DIR . '/inc/managers/MagicLinks.php');
}
if (Site::hasAny(['dashboard', 'feed_block'])) {
@@ -37,6 +39,8 @@
}
if (Site::has('dashboard')) {
+// require(JVB_DIR . '/inc/managers/DashboardManager.php');
+ require(JVB_DIR . '/inc/managers/Dashboard\_setup.php');
require(JVB_DIR . '/inc/managers/CRUDManager.php');
require(JVB_DIR . '/inc/managers/UploadManager.php');
}
@@ -49,8 +53,8 @@
require(JVB_DIR . '/inc/managers/UserTermsManager.php');
}
- if (!empty(Registrar::getFeatured('approve_new'))) {
- require(JVB_DIR . '/inc/managers/ApprovalManager.php');
+ if (!empty(Registrar::withFeature('approve_new'))) {
+ require(JVB_DIR . '/inc/managers/Approvals.php');
}
@@ -63,7 +67,7 @@
require(JVB_DIR . '/inc/managers/Notifications/Preferences.php');
require(JVB_DIR . '/inc/managers/NotificationManager.php');
}
- if ($membership->has('forum') && !empty(Registrar::getFeatured('is_content', 'term'))) {
+ if ($membership->has('forum') && !empty(Registrar::withFeature('is_content', 'term'))) {
require(JVB_DIR . '/inc/managers/NewsRelationships.php');
}
if ($membership->has('invitable')) {
@@ -75,18 +79,15 @@
require(JVB_DIR . '/inc/managers/DirectoryManager.php');
}
- if (Site::has('dashboard')) {
- require(JVB_DIR . '/inc/managers/DashboardManager.php');
- }
-
if (Site::has('referrals')) {
- require(JVB_DIR . '/inc/managers/ReferralManager.php');
+ require(JVB_DIR . '/inc/managers/Referrals.php');
}
- if (!empty(Registrar::getFeatured('karma'))) {
+ if (!empty(Registrar::withFeature('karma'))) {
require(JVB_DIR . '/inc/managers/KarmaManager.php');
}
- if (Site::has('favourites') && !empty(Registrar::getFeatured('favouritable'))) {
+// if (Site::has('favourites') && !empty(Registrar::withFeature('favouritable'))) {
+ if (Site::has('favourites')) {
require(JVB_DIR . '/inc/managers/FavouritesManager.php');
}
}
@@ -95,10 +96,10 @@
function jvb_load_karma():void
{
}
-require(JVB_DIR . '/inc/managers/ErrorHandler.php');
+
require(JVB_DIR . '/inc/managers/queue/_setup.php');
-require(JVB_DIR . '/inc/managers/EmailManager.php');
-require(JVB_DIR . '/inc/managers/LoginManager.php');
+require(JVB_DIR . '/inc/managers/Emails.php');
+require(JVB_DIR . '/inc/managers/Login.php');
//require(JVB_DIR . '/inc/managers/SchemaManager.php');
@@ -107,4 +108,4 @@
require(JVB_DIR . '/inc/managers/ImageGenerator.php');
require(JVB_DIR . '/inc/managers/AdminPages.php');
-require(JVB_DIR . '/inc/managers/RoleManager.php');
+require(JVB_DIR . '/inc/managers/Roles.php');
--
Gitblit v1.10.0