From a58a2e7ca4700d3e23341fde767060a4c2c704a3 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 30 Aug 2026 21:04:37 +0000
Subject: [PATCH] =Minor tweaks to MenuBlock.php

---
 activate.php |   62 +++++++++---------------------
 1 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/activate.php b/activate.php
index 12625f6..f792f57 100644
--- a/activate.php
+++ b/activate.php
@@ -1,17 +1,11 @@
 <?php
 
-use JVBase\integrations\Umami;
 use JVBase\managers\Cache;
 use JVBase\managers\CustomTable;
-use JVBase\managers\DirectoryManager;
-use JVBase\managers\ErrorHandler;
-use JVBase\managers\InvitationsManager;
-use JVBase\managers\queue\Queue;
-use JVBase\managers\ReferralManager;
-use JVBase\managers\RoleManager;
-use JVBase\managers\SEO\SEOAdminPage;
+use JVBase\base\Site;
+use JVBase\managers\Referrals;
+use JVBase\managers\Roles;
 use JVBase\registrar\Registrar;
-use JVBase\utility\Features;
 
 if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
@@ -33,34 +27,27 @@
     do_action(BASE.'activation');
 	error_log('Action done!');
 	error_log('Checking custom tables...');
-	Queue::defineTables();
 	CustomTable::ensureTables();
+
+
 //    (new JVBase\registry\CheckCustomTables())->maybeCreateTables();
 	error_log('Tables created!');
 
     // Store schema version
-    update_option('jvb_db_version', '1.0.0');
+    update_option(BASE.'db_version', '1.0.0');
 	error_log('Starting schedules...');
     jvbSchedules();
 	error_log('Schedules done!');
-	error_log('checking Admin capabilities...');
 
-	jvb_register_do_once('admin_caps', 'jvbAddAdminCaps');
+	Roles::activate();
 
-	error_log('Admin caps done!');
-	error_log('Removing unneeded roles...');
-    remove_role('contributor');
-    remove_role('author');
-    remove_role('editor');
-	error_log('Roles removed!');
-	error_log('New Roles done!');
 	jvbRegisterAdminPages();
-	if (array_key_exists('integrations', JVB_SITE) && array_key_exists('umami', JVB_SITE['integrations']) && JVB_SITE['integrations']['umami']=== true) {
-		error_log('Adding Umami tables');
-		Umami::createTables();
-	}
+//	if (array_key_exists('integrations', JVB_SITE) && array_key_exists('umami', JVB_SITE['integrations']) && JVB_SITE['integrations']['umami']=== true) {
+//		error_log('Adding Umami tables');
+//		Umami::createTables();
+//	}
 
-//	if (Features::forSite()->has('is_directory')) {
+//	if (Site::has('is_directory')) {
 //		error_log('Activating DirectoryManager');
 //		jvb_register_do_once('buildDirectory', ['JVBase\managers\DirectoryManager', 'activate']);
 //	}
@@ -69,12 +56,12 @@
 
 function jvbAddAdminCaps()
 {
-	$roleManager = new RoleManager();
+	$roleManager = new Roles();
 
 
 	$role = get_role('administrator');
 	$users = get_users(['role' => 'administrator']);
-    foreach (array_merge(Registrar::getRegistered('post'), Registrar::getFeatured('is_content')) as $slug) {
+    foreach (array_merge(Registrar::getRegistered('post'), Registrar::withFeature('is_content')) as $slug) {
 		error_log('Adding administrative roles to '.$slug);
 		$plural = $roleManager->getContentPlural($slug);
 		$capabilities = [
@@ -91,7 +78,7 @@
 		];
 
 		foreach ($capabilities as $cap) {
-			$role->add_cap($cap, true);
+			$role->add_cap($cap);
 		}
 
 		foreach ($users as $user) {
@@ -112,10 +99,10 @@
 		return;
 	}
 
-	$roleManager = new RoleManager();
+	$roleManager = new Roles();
 	$users = get_users(['role' => 'administrator']);
 
-	foreach (array_merge(Registrar::getRegistered('post'), Registrar::getFeatured('is_content', 'term')) as $slug) {
+	foreach (array_merge(Registrar::getRegistered('post'), Registrar::withFeature('is_content', 'term')) as $slug) {
 
 		foreach ($users as $user) {
 			// These methods should check if post type exists before adding caps
@@ -257,17 +244,6 @@
     }
 }
 
-// Optional: Add upgrade routine
-function jvbMaybeUpgrade():void
-{
-    $current_version = get_option('jvb_db_version', '0');
-    if (version_compare($current_version, '1.0.0', '<')) {
-        jvbActivatePlugin();
-    }
-}
-add_action('plugins_loaded', 'jvbMaybeUpgrade');
-
-
 add_action('jvb_daily_reset', 'jvbDailyResetAction');
 function jvbDailyResetAction(): void
 {
@@ -278,8 +254,8 @@
 
 function jvbRegisterAdminPages():void
 {
-	if (Features::forSite()->has('referrals')){
-		ReferralManager::addSubpage();
+	if (Site::has('referrals')){
+		Referrals::addSubpage();
 	}
 //	SEOAdminPage::addSubpage();
 }

--
Gitblit v1.10.0