From c4aa5cdb5e90ad4b420e22772797d16980232a2b Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 15 Apr 2026 18:38:55 +0000
Subject: [PATCH] =Updating custom tables to utilize CustomTable.php

---
 inc/registry/CheckCustomTables.php | 1640 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 844 insertions(+), 796 deletions(-)

diff --git a/inc/registry/CheckCustomTables.php b/inc/registry/CheckCustomTables.php
index ed5166a..b04af0b 100644
--- a/inc/registry/CheckCustomTables.php
+++ b/inc/registry/CheckCustomTables.php
@@ -6,6 +6,7 @@
 }
 
 use Exception;
+use JVBase\registrar\Registrar;
 
 class CheckCustomTables
 {
@@ -35,7 +36,7 @@
 		//Fetch the constants manually, in case they're not defined yet?
 		$this->JVB_SITE = apply_filters('jvb_site', []);
 		$this->JVB_MEMBERSHIP = apply_filters('jvb_membership', []);
-		$this->JVB_CONTENT = apply_filters('jvb_content', []);
+		$this->JVB_CONTENT = apply_filters('jvb_content',  []);
 		$this->JVB_TAXONOMY = apply_filters('jvb_taxonomy', []);
 		$this->JVB_USER = apply_filters('jvb_user', []);
 
@@ -44,7 +45,6 @@
 		$this->userIDType = $this->getColumnType($this->userTable, 'ID');
 		$this->termIDType = $this->getColumnType($this->wpdb->terms, 'term_id');
 		$this->postIDType = $this->getColumnType($this->wpdb->posts, 'ID');
-		error_log("JVB FK Types: users.ID={$this->userIDType}, terms.term_id={$this->termIDType}, posts.ID={$this->postIDType}");
 	}
 
 	protected function getMultisiteUsersTable():string
@@ -104,7 +104,12 @@
 			error_log('JVB: Starting table creation process');
 			error_log('JVB: Memory usage at start: ' . memory_get_usage(true) / 1024 / 1024 . ' MB');
 
-			$tables = $calendar = $integrations = $karma = $stats = $invitable = $verifyEntry = $approval = $trackChanges = [];
+			$tables = $calendar = $integrations = $karma = $stats = $verifyEntry = $approval = $trackChanges = [];
+			$invitable = [
+				'roles' => [],
+				'terms' => []
+			];
+
 
 			// Basic tables (these worked fine)
 			try {
@@ -114,10 +119,9 @@
 //						$tables = array_merge($tables, $this->umamiTracking());
 //					}
 				}
-				if (array_key_exists('can_invite', $this->JVB_MEMBERSHIP) && is_array($this->JVB_MEMBERSHIP['can_invite'])) {
-					foreach ($this->JVB_MEMBERSHIP['can_invite'] as $role => $canInvite) {
-						$invitable[$role]['can_invite'] = $canInvite;
-					}
+				if (array_key_exists('can_invite', $this->JVB_MEMBERSHIP) &&
+					is_array($this->JVB_MEMBERSHIP['can_invite'])) {
+					$invitable['roles'] = $this->JVB_MEMBERSHIP['can_invite'];
 				}
 
 //				if (jvbCheck('social', $this->JVB_SITE) || jvbCheck('gmb', $this->JVB_SITE) || jvbCheck('square', $this->JVB_SITE) || jvbCheck('helcim', $this->JVB_SITE)) {
@@ -127,13 +131,13 @@
 				error_log("JVB: Error in notification section: " . $e->getMessage());
 			}
 
-			try {
-				if (array_key_exists('dashboard', $this->JVB_SITE) && $this->JVB_SITE['dashboard']) {
-					$tables = array_merge($tables, $this->queueTables(), $this->errorLogTables());
-				}
-			} catch (Exception $e) {
-				error_log("JVB: Error in dashboard section: " . $e->getMessage());
-			}
+//			try {
+//				if (array_key_exists('dashboard', $this->JVB_SITE) && $this->JVB_SITE['dashboard']) {
+//					$tables = array_merge($tables, $this->queueTables(), $this->errorLogTables());
+//				}
+//			} catch (Exception $e) {
+//				error_log("JVB: Error in dashboard section: " . $e->getMessage());
+//			}
 
 			try {
 				if (array_key_exists('referrals', $this->JVB_SITE) && $this->JVB_SITE['referrals']) {
@@ -144,7 +148,7 @@
 			}
 			// RE-ENABLE favourites tables
 			try {
-				if ($this->JVB_SITE['favourites']) {
+				if (array_key_exists('favourites', $this->JVB_SITE)) {
 					error_log('JVB: Creating favourites tables...');
 					$favouriteTables = $this->favouriteTables();
 					error_log('JVB: Favourites tables created: ' . count($favouriteTables));
@@ -209,9 +213,7 @@
 					$trackChanges[$type] = $config;
 				}
 				if (array_key_exists('invitable', $config) && $config['invitable']) {
-					foreach ($config['for_content'] as $content) {
-						$invitable[$content]['to_terms'][] = $type;
-					}
+					$invitable['terms'][] = $type;
 				}
 				if (array_key_exists('verify_entry', $config) && $config['verify_entry']) {
 					$verifyEntry[$type] = $config;
@@ -296,17 +298,19 @@
 
 			// RE-ENABLE other table types
 			try {
-				if (!empty($invitable)) {
-					error_log('JVB: Creating invitation tables...');
+				if (!empty($invitable['roles']) || !empty($invitable['terms'])) {
+					error_log('JVB: Creating invitation table...');
 					$invitationTables = $this->invitationTables($invitable);
-					error_log('JVB: Invitation tables created: ' . count($invitationTables));
+					error_log('JVB: Invitation table created: ' . count($invitationTables));
 					$tables = array_merge($tables, $invitationTables);
-					error_log('JVB: Memory after invitations: ' . memory_get_usage(true) / 1024 / 1024 . ' MB');
 				}
 			} catch (Exception $e) {
-				error_log("JVB: Error creating invitation tables: " . $e->getMessage());
+				error_log("JVB: Error creating invitation table: " . $e->getMessage());
 			}
 
+			// Store config for later use
+			update_option(BASE.'invitation_config', $invitable);
+
 			try {
 				if (!empty($approval)) {
 					error_log('JVB: Creating approval tables...');
@@ -368,154 +372,173 @@
 		}
 	}
 
-    public function createTables(array $tables)
-    {
-        $charset_collate = $this->wpdb->get_charset_collate();
-        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+	public function createTables(array $tables)
+	{
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
-        $errors = [];
-        $created = [];
+		// Match collation from existing WP tables for FK compatibility
+		$usersStatus = $this->wpdb->get_row("SHOW TABLE STATUS LIKE '{$this->wpdb->users}'");
+		$parentCollation = $usersStatus->Collation ?? 'utf8mb4_general_ci';
+		$charset_collate = "DEFAULT CHARACTER SET utf8mb4 COLLATE {$parentCollation}";
 
-        foreach ($tables as $name => $schema) {
-            $table_name = $this->prefix . BASE . $name;
-            $full_schema = "CREATE TABLE IF NOT EXISTS {$table_name} {$schema} {$charset_collate};";
+		error_log("JVB: Using charset_collate: " . $charset_collate);
 
-            // Clear any previous errors
-            $this->wpdb->flush();
+		$errors = [];
+		$created = [];
 
-            try {
-                $result = dbDelta($full_schema);
+		foreach ($tables as $name => $schema) {
+			$table_name = $this->prefix . BASE . $name;
 
-                // Check for SQL errors
-                if ($this->wpdb->last_error) {
-                    $error_msg = "SQL Error creating table {$table_name}: " . $this->wpdb->last_error;
-                    error_log($error_msg);
-                    error_log("Failed SQL Query: " . $full_schema);
-                    $errors[] = $error_msg;
+			// Skip if exists
+			if ($this->wpdb->get_var("SHOW TABLES LIKE '{$table_name}'")) {
+				$created[] = $table_name . ' (exists)';
+				continue;
+			}
 
-                    // Don't throw exception, just log and continue
-                    continue;
-                }
+			$full_schema = "CREATE TABLE IF NOT EXISTS {$table_name} {$schema} {$charset_collate}";
 
-                // Verify table was actually created
-                $table_exists = $this->wpdb->get_var("SHOW TABLES LIKE '{$table_name}'");
-                if ($table_exists) {
-                    $created[] = $table_name;
-                    error_log("Successfully created table: {$table_name}");
-                } else {
-                    $error_msg = "Table {$table_name} was not created (no error reported)";
-                    error_log($error_msg);
-                    error_log("Schema used: " . $full_schema);
-                    $errors[] = $error_msg;
-                }
+			$this->wpdb->flush();
 
-            } catch (Exception $e) {
-                $error_msg = "Exception creating table {$table_name}: " . $e->getMessage();
-                error_log($error_msg);
-                error_log("Exception SQL Query: " . $full_schema);
-                $errors[] = $error_msg;
-            }
-        }
+			// Use direct query - dbDelta mangles FK constraints
+			$hasForeignKey = stripos($schema, 'FOREIGN KEY') !== false;
 
-        // Log summary
-        if (!empty($created)) {
-            error_log("JVB Tables Created Successfully: " . implode(', ', $created));
-        }
+			if ($hasForeignKey) {
+				$result = $this->wpdb->query($full_schema);
+				$success = ($result !== false && !$this->wpdb->last_error);
+			} else {
+				dbDelta($full_schema . ';');
+				$success = !$this->wpdb->last_error;
+			}
 
-        if (!empty($errors)) {
-            error_log("JVB Table Creation Errors (" . count($errors) . " total):");
-            foreach ($errors as $error) {
-                error_log("  - " . $error);
-            }
+			if (!$success) {
+				$error_msg = "SQL Error creating table {$table_name}: " . $this->wpdb->last_error;
+				error_log($error_msg);
+				error_log("Failed SQL Query: " . $full_schema);
+				$errors[] = $error_msg;
+			} elseif ($this->wpdb->get_var("SHOW TABLES LIKE '{$table_name}'")) {
+				$created[] = $table_name;
+				error_log("Successfully created table: {$table_name}");
+			}
+		}
 
-            // Optionally store errors for admin display
-            update_option(BASE . 'table_creation_errors', $errors);
-        } else {
-            // Clear any previous errors
-            delete_option(BASE . 'table_creation_errors');
-        }
-    }
+		// Log summary
+		if (!empty($created)) {
+			error_log("JVB Tables Created Successfully: " . implode(', ', $created));
+		}
+
+		if (!empty($errors)) {
+			error_log("JVB Table Creation Errors (" . count($errors) . " total):");
+			foreach ($errors as $error) {
+				error_log("  - " . $error);
+			}
+			update_option(BASE . 'table_creation_errors', $errors);
+		} else {
+			delete_option(BASE . 'table_creation_errors');
+		}
+	}
 
     /******************************************************
      * Table Definitions
      *****************************************************/
+// MOVED TO Queue.php
+//    protected function queueTables():array
+//    {
+//
+//        return [
+//		'_operation_queue' => "(
+//            `id` VARCHAR(64) NOT NULL,
+//            `type` varchar(50) NOT NULL,
+//            `user_id` {$this->userIDType} NOT NULL,
+//
+//            `request_data` JSON NOT NULL CHECK (JSON_VALID(request_data)),
+//
+//            `total_items` int(11) NOT NULL DEFAULT 1,
+//            `processed_items` int(11) DEFAULT 0,
+//            `failed_items` JSON,
+//
+//            `priority` ENUM('high', 'normal', 'low') DEFAULT 'normal',
+//            `state` enum('pending', 'scheduled', 'processing', 'completed') DEFAULT 'pending',
+//            `outcome` enum('pending', 'success', 'partial', 'merged', 'failed', 'failed_permanent') DEFAULT 'pending',
+//
+//			`retries` int(11) DEFAULT 0,
+//            `last_error_hash` CHAR(32) DEFAULT NULL,
+//            `error_message` text,
+//
+//			`scheduled_at` datetime DEFAULT NULL,
+//            `started_at` datetime DEFAULT CURRENT_TIMESTAMP,
+//            `completed_at` datetime DEFAULT NULL,
+//
+//            `metadata` JSON DEFAULT NULL,
+//            `result` JSON,
+//            `dependencies` JSON,
+//            `merged_into` VARCHAR(64) DEFAULT NULL,
+//
+//            `user_dismissed` tinyint(1) DEFAULT 0,
+//            `created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+//    		`updated_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+//			PRIMARY KEY (`id`),
+//		   	KEY `idx_run_queue` (state, priority, scheduled_at),
+//			KEY `idx_user_ops` (user_id, state),
+//			KEY `idx_user_type_pending` (user_id, type, state),
+//			KEY `idx_completed_at` (completed_at),
+//			KEY `idx_processing_stuck` (`state`, `started_at`)
+//            )",
+//
+//		'stats__operation_queue' => "(
+//			`id` bigint unsigned AUTO_INCREMENT,
+//			`date` date NOT NULL,
+//			`type` varchar(50) NOT NULL,
+//
+//			`total_operations` int NOT NULL DEFAULT 0,
+//			`successful_operations` int NOT NULL DEFAULT 0,
+//			`partial_operations` int NOT NULL DEFAULT 0,
+//			`failed_operations` int NOT NULL DEFAULT 0,
+//			`failed_permanent_operations` int NOT NULL DEFAULT 0,
+//
+//			`total_items_processed` int NOT NULL DEFAULT 0,
+//
+//			`average_duration` float DEFAULT NULL,
+//			`max_duration` int DEFAULT NULL,
+//
+//			`peak_queue_size` int NOT NULL DEFAULT 0,
+//
+//			`peak_memory_usage` int DEFAULT NULL,
+//			`peak_cpu_usage` float DEFAULT NULL,
+//
+//			`created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+//			PRIMARY KEY (`id`),
+//			UNIQUE KEY (date, type),
+//			KEY `date_idx` (date),
+//			KEY `type_idx` (type)
+//        )"
+//        ];
+//    }
 
-    protected function queueTables():array
-    {
-
-        return [
-		'_operation_queue' => "(
-            `id` VARCHAR(64) NOT NULL,
-            `type` varchar(50) NOT NULL,
-            `user_id` {$this->userIDType} NOT NULL,
-            `request_data` JSON NOT NULL,
-            `count` int(11) NOT NULL DEFAULT 1,
-            `progress_count` int(11) DEFAULT 0,
-            `failed_items` JSON,
-            `priority` enum('low', 'normal', 'high') DEFAULT 'normal',
-            `status` enum('pending', 'scheduled', 'processing','failed', 'failed_permanent', 'completed', 'completed_with_errors') DEFAULT 'pending',
-            `metadata` JSON DEFAULT NULL,
-            `merge` enum('merge', 'append', 'replace') DEFAULT 'merge',
-            `scheduled_at` datetime DEFAULT CURRENT_TIMESTAMP,
-            `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-            `updated_at` datetime DEFAULT CURRENT_TIMESTAMP,
-            `started_at` datetime DEFAULT NULL,
-            `completed_at` datetime DEFAULT NULL,
-            `retries` int(11) DEFAULT 0,
-            `result` JSON,
-            `dependencies` JSON,
-            `error_message` text,
-            `user_dismissed` tinyint(1) DEFAULT 0,
-                PRIMARY KEY (`id`),
-                KEY `idx_status_priority` (`status`, `priority`),
-                KEY `idx_user_type` (`user_id`, `type`),
-                KEY `idx_created_at` (`created_at`),
-                KEY `idx_completed_at` (`completed_at`),
-                KEY `idx_user_status` (`user_id`, `status`),
-                KEY `idx_retries_status` (`retries`, `status`),
-                KEY `idx_user_status_created` (`user_id`, `status`, `created_at`),
-                KEY `idx_scheduled_processing` (`scheduled_at`, `status`)
-            )",
-		'stats__operation_queue' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `date` date NOT NULL,
-            `type` varchar(50) NOT NULL,
-            `total_operations` int NOT NULL DEFAULT 0,
-            `successful_operations` int NOT NULL DEFAULT 0,
-            `failed_operations` int NOT NULL DEFAULT 0,
-            `average_duration` float DEFAULT NULL,
-            `total_items_processed` int NOT NULL DEFAULT 0,
-            `peak_queue_size` int NOT NULL DEFAULT 0,
-            `peak_memory_usage` int DEFAULT NULL,
-            `peak_cpu_usage` float DEFAULT NULL,
-            `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            UNIQUE KEY (`date`, `type`),
-            KEY `date_idx` (`date`),
-            KEY `type_idx` (`type`)
-        )"
-        ];
-    }
-
-    protected function errorLogTables():array
-    {
-
-        return [
-            'error_log'=> "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `error_type` varchar(50) NOT NULL,
-            `component` varchar(50) NOT NULL,
-            `message` text NOT NULL,
-            `context` JSON,
-            `severity` varchar(20) NOT NULL,
-            `user_id` {$this->userIDType} NOT NULL,
-            `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            KEY `error_lookup` (`error_type`, `severity`, `created_at`),
-            KEY `component_errors` (`component`, `created_at`)
-        )"
-        ];
-    }
+//MOVED TO ErrorHandler.php
+//	protected function errorLogTables():array
+//	{
+//		return [
+//			'error_log'=> "(
+//				`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//				`error_type` varchar(50) NOT NULL,
+//				`component` varchar(100) NOT NULL,
+//				`method` varchar(100) DEFAULT NULL,
+//				`page_url` varchar(255) DEFAULT NULL,
+//				`message` text NOT NULL,
+//				`context` JSON,
+//				`severity` varchar(20) NOT NULL,
+//				`user_id` {$this->userIDType} DEFAULT NULL,
+//				`user_was_logged_in` tinyint(1) NOT NULL,
+//				`source` enum('frontend','backend') NOT NULL,
+//				`created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+//				PRIMARY KEY (`id`),
+//				KEY `created_at` (`created_at`),
+//				KEY `component_severity_date` (`component`, `severity`, `created_at`),
+//				KEY `error_type_date` (`error_type`, `created_at`),
+//				KEY `severity_date` (`severity`, `created_at`)
+//			)"
+//		];
+//	}
 
 	protected function userIntegrationsTable():array
 	{
@@ -537,445 +560,449 @@
 			)"
 		];
 	}
+//MOVED TO NotificationManger.php
+//    protected function notificationTables():array
+//    {
+//
+//        return [
+//            // Main notifications table
+//            'notifications' => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `owner_id` {$this->userIDType} NOT NULL,
+//            `action_user_id` {$this->userIDType} NOT NULL,
+//            `target_id` bigint(20) DEFAULT NULL,
+//            `target_type` varchar(30) DEFAULT NULL,
+//            `type` enum('new_favourite','new_artist','artist_approved','artist_invitation',
+//                  'new_term','term_approved','term_rejected','list_shared',
+//                  'system_message','shop_invitation') NOT NULL,
+//            `status` enum('unread','read','actioned','dismissed') NOT NULL DEFAULT 'unread',
+//            `priority` enum('low','normal','high') NOT NULL DEFAULT 'normal',
+//            `message` varchar(255) DEFAULT NULL,
+//            `context` JSON DEFAULT NULL,
+//            `requires_action` tinyint(1) NOT NULL DEFAULT 0,
+//            `action_taken` tinyint(1) NOT NULL DEFAULT 0,
+//            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//            `read_at` datetime DEFAULT NULL,
+//            `actioned_at` datetime DEFAULT NULL,
+//            `emailed_at` datetime DEFAULT NULL,
+//            `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            KEY `user_status` (`owner_id`, `status`),
+//            KEY `target_lookup` (`target_id`, `target_type`),
+//            KEY `unread_notifications` (`owner_id`, `status`, `created_at`),
+//            KEY `requires_action` (`owner_id`, `requires_action`, `action_taken`),
+//            KEY `acting_user_lookup` (`owner_id`, `action_user_id`, `type`, `status`, `created_at`),
+//            CONSTRAINT `{$this->base}notify_owner` FOREIGN KEY (`owner_id`)
+//            REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE,
+//            CONSTRAINT `{$this->base}action_id` FOREIGN KEY (`action_user_id`)
+//            REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//        )",
+//
+//
+//            'notifications_content' => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `user_id` {$this->userIDType} NOT NULL,
+//            `date` date NOT NULL,
+//            `frequency` enum('daily','weekly','monthly') NOT NULL,
+//            `tattoo_count` int unsigned NOT NULL DEFAULT 0,
+//            `artwork_count` int unsigned NOT NULL DEFAULT 0,
+//            `piercing_count` int unsigned NOT NULL DEFAULT 0,
+//            `event_count` int unsigned NOT NULL DEFAULT 0,
+//            `news_count` int unsigned NOT NULL DEFAULT 0,
+//            `offer_count` int unsigned NOT NULL DEFAULT 0,
+//            `total_items` int unsigned NOT NULL DEFAULT 0,
+//            `has_profile_update` tinyint(1) NOT NULL DEFAULT 0,
+//            `new_items` JSON DEFAULT NULL,
+//            `updated_items` JSON DEFAULT NULL,
+//            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//            `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            UNIQUE KEY `artist_date_frequency` (`user_id`, `date`, `frequency`),
+//            KEY `recent_content` (`date`, `frequency`),
+//            KEY `artist_frequency` (`user_id`, `frequency`),
+//            CONSTRAINT `{$this->base}content_artist` FOREIGN KEY (`user_id`)
+//            REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//        )",
+//
+//            'notifications_user_seen' => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `user_id` {$this->userIDType} NOT NULL,
+//            `content_notification_id` bigint(20) unsigned NOT NULL,
+//            `status` enum('unread','read','dismissed') NOT NULL DEFAULT 'unread',
+//            `read_at` datetime DEFAULT NULL,
+//            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            UNIQUE KEY `user_content_notif` (`user_id`, `content_notification_id`),
+//            KEY `user_status` (`user_id`, `status`),
+//            CONSTRAINT `{$this->base}user_content_user` FOREIGN KEY (`user_id`)
+//            REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE,
+//            CONSTRAINT `{$this->base}user_content_notification` FOREIGN KEY (`content_notification_id`)
+//            REFERENCES `{$this->prefixed}notifications_content` (`id`) ON DELETE CASCADE
+//        )",
+//
+//            // User notification preferences
+//            'notification_preferences' => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `user_id` {$this->userIDType} NOT NULL,
+//            `item_id` bigint(20) NOT NULL,
+//            `notification_type` varchar(50) NOT NULL,
+//            `frequency` enum('never','daily','weekly','monthly') DEFAULT 'never',
+//            `last_sent` datetime DEFAULT NULL,
+//            `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+//            `updated_at` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            UNIQUE KEY `user_type` (`user_id`, `item_id`),
+//            KEY `user_frequency` (`user_id`, `frequency`),
+//            KEY `frequency_lookup` (`frequency`, `last_sent`),
+//            CONSTRAINT `{$this->base}notification_pref_user` FOREIGN KEY (`user_id`)
+//                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//        )",
+//
+//            // Notification digest scheduling and tracking
+//            'notification_digests' => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `user_id` {$this->userIDType} NOT NULL,
+//            `frequency` enum('daily','weekly','monthly') NOT NULL,
+//            `scheduled_at` datetime NOT NULL,
+//            `sent_at` datetime DEFAULT NULL,
+//            `status` enum('pending','processing','sent','failed') DEFAULT 'pending',
+//            `notification_count` int unsigned DEFAULT 0,
+//            `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            KEY `scheduled_digests` (`frequency`, `scheduled_at`, `status`),
+//            KEY `user_digests` (`user_id`, `frequency`),
+//            CONSTRAINT `{$this->base}digest_user` FOREIGN KEY (`user_id`)
+//                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//        )",
+//
+//            // Analytics on notification interactions
+//            'stats__notifications' => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `notification_id` bigint(20) unsigned NOT NULL,
+//            `user_id` {$this->userIDType} NOT NULL,
+//            `action` varchar(30) NOT NULL,
+//            `action_source` enum('web','email','app') DEFAULT 'web',
+//            `action_details` JSON DEFAULT NULL,
+//            `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            KEY `notification_lookup` (`notification_id`),
+//            KEY `user_actions` (`user_id`, `action`),
+//            KEY `action_analysis` (`action`, `action_source`),
+//            CONSTRAINT `{$this->base}metrics_user` FOREIGN KEY (`user_id`)
+//                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE,
+//            CONSTRAINT `{$this->base}metrics_notification` FOREIGN KEY (`notification_id`)
+//                REFERENCES `{$this->prefixed}notifications` (`id`) ON DELETE CASCADE
+//        )"
+//        ];
+//    }
 
-    protected function notificationTables():array
-    {
-
-        return [
-            // Main notifications table
-            'notifications' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `owner_id` {$this->userIDType} NOT NULL,
-            `action_user_id` {$this->userIDType} NOT NULL,
-            `target_id` bigint(20) DEFAULT NULL,
-            `target_type` varchar(30) DEFAULT NULL,
-            `type` enum('new_favourite','new_artist','artist_approved','artist_invitation',
-                  'new_term','term_approved','term_rejected','list_shared',
-                  'system_message','shop_invitation') NOT NULL,
-            `status` enum('unread','read','actioned','dismissed') NOT NULL DEFAULT 'unread',
-            `priority` enum('low','normal','high') NOT NULL DEFAULT 'normal',
-            `message` varchar(255) DEFAULT NULL,
-            `context` JSON DEFAULT NULL,
-            `requires_action` tinyint(1) NOT NULL DEFAULT 0,
-            `action_taken` tinyint(1) NOT NULL DEFAULT 0,
-            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            `read_at` datetime DEFAULT NULL,
-            `actioned_at` datetime DEFAULT NULL,
-            `emailed_at` datetime DEFAULT NULL,
-            `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            KEY `user_status` (`owner_id`, `status`),
-            KEY `target_lookup` (`target_id`, `target_type`),
-            KEY `unread_notifications` (`owner_id`, `status`, `created_at`),
-            KEY `requires_action` (`owner_id`, `requires_action`, `action_taken`),
-            KEY `acting_user_lookup` (`owner_id`, `action_user_id`, `type`, `status`, `created_at`),
-            CONSTRAINT `{$this->base}notify_owner` FOREIGN KEY (`owner_id`)
-            REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE,
-            CONSTRAINT `{$this->base}action_id` FOREIGN KEY (`action_user_id`)
-            REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-        )",
+//MOVED TO ApprovalManager.php
+//    protected function approvalTables($types):array
+//    {
+//        $tables = [];
+//        $save = [];
+//
+//        foreach ($types as $type => $config) {
+//            $save[$type] = ($type === 'term') ? $config : 'user';
+//            $tables['approval_'.$type.'_requests'] = "(
+//                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//                `user_id` {$this->userIDType} NOT NULL,
+//                `status` enum('pending','approved','rejected','appealed','expired') DEFAULT 'pending',
+//                `required_approvals` int unsigned DEFAULT 3,
+//                `current_approvals` int unsigned DEFAULT 0,
+//                `current_rejections` int unsigned DEFAULT 0,
+//                `expires_at` datetime DEFAULT NULL,
+//                `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+//                `updated_at` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//                `approved_by` json DEFAULT NULL,
+//                `rejected_by` json DEFAULT NULL,
+//                `created_item` json DEFAULT NULL,
+//                PRIMARY KEY (`id`),
+//                KEY `status` (`status`),
+//                KEY `expiring_requests` (`status`, `expires_at`),
+//                CONSTRAINT `{$this->base}{$type}_approval_requester` FOREIGN KEY (`user_id`)
+//                    REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//            )";
+//            $tables['approval_'.$type.'_votes'] = "(
+//                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//                `request_id` bigint(20) unsigned NOT NULL,
+//                `user_id` {$this->userIDType} NOT NULL,
+//                `vote` enum('approve','reject','dismissed') NOT NULL,
+//                `notes` text DEFAULT NULL,
+//                `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+//                PRIMARY KEY (`id`),
+//                UNIQUE KEY `unique_vote` (`request_id`, `user_id`),
+//                KEY `user_votes` (`user_id`),
+//                CONSTRAINT `{$this->base}{$type}_user_approval_request` FOREIGN KEY (`request_id`)
+//                    REFERENCES `{$this->prefixed}approval_{$type}_requests` (`id`) ON DELETE CASCADE,
+//                CONSTRAINT `{$this->base}{$type}_user_approval_voter` FOREIGN KEY (`user_id`)
+//                    REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//            )";
+//        }
+//        if (!empty($save)) {
+//            update_option(BASE.'approvals_types', $save);
+//        }
+//        return $tables;
+//    }
 
 
-            'notifications_content' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `user_id` {$this->userIDType} NOT NULL,
-            `date` date NOT NULL,
-            `frequency` enum('daily','weekly','monthly') NOT NULL,
-            `tattoo_count` int unsigned NOT NULL DEFAULT 0,
-            `artwork_count` int unsigned NOT NULL DEFAULT 0,
-            `piercing_count` int unsigned NOT NULL DEFAULT 0,
-            `event_count` int unsigned NOT NULL DEFAULT 0,
-            `news_count` int unsigned NOT NULL DEFAULT 0,
-            `offer_count` int unsigned NOT NULL DEFAULT 0,
-            `total_items` int unsigned NOT NULL DEFAULT 0,
-            `has_profile_update` tinyint(1) NOT NULL DEFAULT 0,
-            `new_items` JSON DEFAULT NULL,
-            `updated_items` JSON DEFAULT NULL,
-            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            UNIQUE KEY `artist_date_frequency` (`user_id`, `date`, `frequency`),
-            KEY `recent_content` (`date`, `frequency`),
-            KEY `artist_frequency` (`user_id`, `frequency`),
-            CONSTRAINT `{$this->base}content_artist` FOREIGN KEY (`user_id`)
-            REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
-        )",
+//	protected function taxonomyRelationshipsTables():array
+//	{
+//		$tables = [
+//			'taxonomy_relationships' => "(
+//		`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//		`term_id` {$this->termIDType} NOT NULL,
+//		`related_term_id` {$this->termIDType} NOT NULL,
+//		`taxonomy` varchar(32) NOT NULL,
+//		`related_taxonomy` varchar(32) NOT NULL,
+//		`post_count` int(11) NOT NULL DEFAULT 0,
+//		`is_direct` tinyint(1) NOT NULL DEFAULT 1,
+//		`is_hierarchical` tinyint(1) NOT NULL DEFAULT 0,
+//		`last_updated` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//		PRIMARY KEY (`id`),
+//		KEY `term_id` (`term_id`),
+//		KEY `related_term_id` (`related_term_id`),
+//		KEY `taxonomy` (`taxonomy`),
+//		KEY `related_taxonomy` (`related_taxonomy`),
+//		UNIQUE KEY `term_relation` (`term_id`, `related_term_id`, `taxonomy`, `related_taxonomy`),
+//		CONSTRAINT `{$this->base}tax_rel_term_id` FOREIGN KEY (`term_id`)
+//			REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE CASCADE,
+//		CONSTRAINT `{$this->base}tax_rel_related_id` FOREIGN KEY (`related_term_id`)
+//			REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE CASCADE
+//	)"
+//		];
+//
+////		if ((array_key_exists('dashboard', $this->JVB_SITE) && $this->JVB_SITE['dashboard'] === true) || array_key_exists('use_feed_block', $this->JVB_SITE) && $this->JVB_SITE['use_feed_block']) {
+//			$tables['user_term_index'] = "(
+//		`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//		`user_id` {$this->userIDType} NOT NULL,
+//		`term_id` {$this->termIDType} NOT NULL,
+//		`taxonomy` varchar(32) NOT NULL,
+//		`post_count` int(11) NOT NULL DEFAULT 1,
+//		`is_parent` tinyint(1) NOT NULL DEFAULT 0,
+//		`last_used` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//		PRIMARY KEY (`id`),
+//		UNIQUE KEY `user_term` (`user_id`, `term_id`, `taxonomy`),
+//		KEY `user_taxonomy` (`user_id`, `taxonomy`),
+//		KEY `taxonomy` (`taxonomy`),
+//		CONSTRAINT `{$this->base}user_term_user_fk` FOREIGN KEY (`user_id`)
+//			REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE,
+//		CONSTRAINT `{$this->base}user_term_term_fk` FOREIGN KEY (`term_id`)
+//			REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE CASCADE
+//	)";
+////		}
+//
+//		return $tables;
+//	}
+//MOVED TO FavouritesManager.php
+//    protected function favouriteTables():array
+//    {
+//
+//        return [
+//            'favourites'    => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `user_id` {$this->userIDType} NOT NULL,
+//            `type` varchar(50) NOT NULL,
+//            `target_id` bigint(20) NOT NULL,
+//            `notes` text DEFAULT NULL,
+//            `date_added` datetime DEFAULT CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            UNIQUE KEY `unique_favourite` (`user_id`, `type`, `target_id`),
+//            KEY `user_type` (`user_id`, `type`),
+//            KEY `target_type` (`target_id`, `type`),
+//            CONSTRAINT `{$this->base}favourites_user` FOREIGN KEY (`user_id`)
+//                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//        )",
+//            'favourites_lists'  => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `user_id` {$this->userIDType} NOT NULL,
+//            `name` varchar(255) NOT NULL,
+//            `description` text,
+//            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//            `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            KEY `user_lists` (`user_id`),
+//            CONSTRAINT `{$this->base}list_user` FOREIGN KEY (`user_id`)
+//                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//        )",
+//            'favourites_list_items' => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `list_id` bigint(20) unsigned NOT NULL,
+//            `item_type` varchar(50) NOT NULL,
+//            `item_id` bigint(20) NOT NULL,
+//            `favourite_id` bigint(20) unsigned DEFAULT NULL,
+//            `added_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            UNIQUE KEY `unique_list_item` (`list_id`, `item_type`, `item_id`),
+//            KEY `list_items` (`list_id`),
+//            KEY `favourite_id` (`favourite_id`),
+//            CONSTRAINT `{$this->base}list_items` FOREIGN KEY (`list_id`)
+//                REFERENCES 	`{$this->prefixed}favourites_lists` (`id`) ON DELETE CASCADE,
+//            CONSTRAINT `{$this->base}list_favourite` FOREIGN KEY (`favourite_id`)
+//                REFERENCES `{$this->prefixed}favourites` (`id`) ON DELETE SET NULL
+//        )",
+//            'favourites_list_shares' => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `list_id` bigint(20) unsigned NOT NULL,
+//            `user_id` {$this->userIDType} NULL,
+//            `email` varchar(255) NOT NULL,
+//            `permission_type` enum('view', 'edit') NOT NULL DEFAULT 'view',
+//            `status` enum('pending', 'accepted', 'rejected', 'revoked') NOT NULL DEFAULT 'pending',
+//            `invitation_token` varchar(64) NULL,
+//            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//            `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            UNIQUE KEY `unique_share_user` (`list_id`, `user_id`, `status`),
+//            UNIQUE KEY `unique_share_email` (`list_id`, `email`, `status`),
+//            KEY `list_shares` (`list_id`),
+//            KEY `status_index` (`status`),
+//            CONSTRAINT `{$this->base}share_list` FOREIGN KEY (`list_id`)
+//                REFERENCES `{$this->prefixed}favourites_lists` (`id`) ON DELETE CASCADE,
+//            CONSTRAINT `{$this->base}share_user` FOREIGN KEY (`user_id`)
+//                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//        )",
+//            'favourites_list_stats'    => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `item_type` varchar(50) NOT NULL,
+//            `item_id` bigint(20) NOT NULL,
+//            `list_count` int NOT NULL DEFAULT 0,
+//            `last_added` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            UNIQUE KEY `unique_item_stat` (`item_type`, `item_id`),
+//            KEY `item_stats` (`item_type`, `item_id`)
+//        )",
+//        ];
+//    }
 
-            'notifications_user_seen' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `user_id` {$this->userIDType} NOT NULL,
-            `content_notification_id` bigint(20) unsigned NOT NULL,
-            `status` enum('unread','read','dismissed') NOT NULL DEFAULT 'unread',
-            `read_at` datetime DEFAULT NULL,
-            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            UNIQUE KEY `user_content_notif` (`user_id`, `content_notification_id`),
-            KEY `user_status` (`user_id`, `status`),
-            CONSTRAINT `{$this->base}user_content_user` FOREIGN KEY (`user_id`)
-            REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE,
-            CONSTRAINT `{$this->base}user_content_notification` FOREIGN KEY (`content_notification_id`)
-            REFERENCES `{$this->prefixed}notifications_content` (`id`) ON DELETE CASCADE
-        )",
+//MOVED TO ForumManager.php
+//    protected function newsRelationshipsTable():array
+//    {
+//        return [
+//            'news_relationships'    => "(
+//                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//                `shop_id` {$this->termIDType} NOT NULL,
+//                `user_id` {$this->userIDType} NOT NULL,
+//                `artist_id` {$this->postIDType} NOT NULL,
+//                `news_count` int(10) unsigned NOT NULL DEFAULT 0,
+//                `last_post_date` datetime DEFAULT NULL,
+//                `last_updated` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//                PRIMARY KEY (`id`),
+//                UNIQUE KEY `shop_user` (`shop_id`, `user_id`),
+//                KEY `shop_id` (`shop_id`),
+//                KEY `user_id` (`user_id`),
+//                KEY `artist_id` (`artist_id`),
+//            CONSTRAINT `{$this->base}nr_shop_news_shop` FOREIGN KEY (`shop_id`)
+//                REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE CASCADE,
+//            CONSTRAINT `{$this->base}nr_shop_news_user` FOREIGN KEY (`user_id`)
+//                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE,
+//            CONSTRAINT `{$this->base}nr_shop_news_artist` FOREIGN KEY (`artist_id`)
+//                REFERENCES `{$this->wpdb->posts}` (`ID`) ON DELETE SET NULL
+//        )"
+//        ];
+//    }
 
-            // User notification preferences
-            'notification_preferences' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `user_id` {$this->userIDType} NOT NULL,
-            `item_id` bigint(20) NOT NULL,
-            `notification_type` varchar(50) NOT NULL,
-            `frequency` enum('never','daily','weekly','monthly') DEFAULT 'never',
-            `last_sent` datetime DEFAULT NULL,
-            `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-            `updated_at` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            UNIQUE KEY `user_type` (`user_id`, `item_id`),
-            KEY `user_frequency` (`user_id`, `frequency`),
-            KEY `frequency_lookup` (`frequency`, `last_sent`),
-            CONSTRAINT `{$this->base}notification_pref_user` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-        )",
+//MOVED TO ResponseManager.php
+//    protected function responseTable():array
+//    {
+//        return [
+//            'responses' => "(
+//            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//            `item_id` {$this->postIDType} NOT NULL,
+//            `content` text NOT NULL,
+//            `user_id` {$this->userIDType} NOT NULL,
+//            `parent_id` bigint(20) unsigned DEFAULT NULL,
+//            `response` text NOT NULL,
+//            `status` enum('published','hidden','flagged','deleted') DEFAULT 'published',
+//            `is_user_deleted` tinyint(1) DEFAULT 0,
+//            `upvotes` int NOT NULL DEFAULT 0,
+//            `downvotes` int NOT NULL DEFAULT 0,
+//            `karma` int NOT NULL DEFAULT 0,
+//            `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
+//            `updated_at` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//            PRIMARY KEY (`id`),
+//            KEY `item_lookup` (`item_id`, `status`),
+//            KEY `user_comments` (`user_id`),
+//            KEY `parent_child` (`parent_id`),
+//            KEY `karma_order` (`karma`),
+//            CONSTRAINT `{$this->base}re_responses_news` FOREIGN KEY (`item_id`)
+//                REFERENCES `{$this->wpdb->posts}` (`ID`) ON DELETE CASCADE,
+//            CONSTRAINT `{$this->base}re_responses_parent` FOREIGN KEY (`parent_id`)
+//                REFERENCES `{$this->prefixed}responses` (`id`) ON DELETE SET NULL
+//        )",
+//            'karma_response' => "(
+//                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//                `item_id` bigint(20) NOT NULL,
+//                `user_id` {$this->userIDType} NOT NULL,
+//                `vote` enum('up','down') NOT NULL,
+//                `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//                PRIMARY KEY (`id`),
+//                UNIQUE KEY `user_post` (`user_id`,`item_id`),
+//                KEY `item_id` (`item_id`),
+//                KEY `user_id` (`user_id`),
+//            CONSTRAINT `{$this->base}_response_item_id` FOREIGN KEY (`item_id`)
+//                REFERENCES `{$this->prefixed}responses` (`id`) ON DELETE CASCADE,
+//            CONSTRAINT `{$this->base}_response_user_id` FOREIGN KEY (`user_id`)
+//                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//                )"
+//        ];
+//    }
 
-            // Notification digest scheduling and tracking
-            'notification_digests' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `user_id` {$this->userIDType} NOT NULL,
-            `frequency` enum('daily','weekly','monthly') NOT NULL,
-            `scheduled_at` datetime NOT NULL,
-            `sent_at` datetime DEFAULT NULL,
-            `status` enum('pending','processing','sent','failed') DEFAULT 'pending',
-            `notification_count` int unsigned DEFAULT 0,
-            `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            KEY `scheduled_digests` (`frequency`, `scheduled_at`, `status`),
-            KEY `user_digests` (`user_id`, `frequency`),
-            CONSTRAINT `{$this->base}digest_user` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-        )",
-
-            // Analytics on notification interactions
-            'stats__notifications' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `notification_id` bigint(20) unsigned NOT NULL,
-            `user_id` {$this->userIDType} NOT NULL,
-            `action` varchar(30) NOT NULL,
-            `action_source` enum('web','email','app') DEFAULT 'web',
-            `action_details` JSON DEFAULT NULL,
-            `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            KEY `notification_lookup` (`notification_id`),
-            KEY `user_actions` (`user_id`, `action`),
-            KEY `action_analysis` (`action`, `action_source`),
-            CONSTRAINT `{$this->base}metrics_user` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE,
-            CONSTRAINT `{$this->base}metrics_notification` FOREIGN KEY (`notification_id`)
-                REFERENCES {$this->prefixed}notifications (`id`) ON DELETE CASCADE
-        )"
-        ];
-    }
-
-    protected function approvalTables($types):array
-    {
-        $tables = [];
-        $save = [];
-
-        foreach ($types as $type => $config) {
-            $save[$type] = ($type === 'term') ? $config : 'user';
-            $tables['approval_'.$type.'_requests'] = "(
-                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-                `user_id` {$this->userIDType} NOT NULL,
-                `status` enum('pending','approved','rejected','appealed','expired') DEFAULT 'pending',
-                `required_approvals` int unsigned DEFAULT 3,
-                `current_approvals` int unsigned DEFAULT 0,
-                `current_rejections` int unsigned DEFAULT 0,
-                `expires_at` datetime DEFAULT NULL,
-                `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-                `updated_at` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                `approved_by` json DEFAULT NULL,
-                `rejected_by` json DEFAULT NULL,
-                `created_item` json DEFAULT NULL,
-                PRIMARY KEY (`id`),
-                KEY `status` (`status`),
-                KEY `expiring_requests` (`status`, `expires_at`),
-                CONSTRAINT `{$this->base}{$type}_approval_requester` FOREIGN KEY (`user_id`)
-                    REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-            )";
-            $tables['approval_'.$type.'_votes'] = "(
-                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-                `request_id` bigint(20) unsigned NOT NULL,
-                `user_id` {$this->userIDType} NOT NULL,
-                `vote` enum('approve','reject','dismissed') NOT NULL,
-                `notes` text DEFAULT NULL,
-                `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (`id`),
-                UNIQUE KEY `unique_vote` (`request_id`, `user_id`),
-                KEY `user_votes` (`user_id`),
-                CONSTRAINT `{$this->base}{$type}_user_approval_request` FOREIGN KEY (`request_id`)
-                    REFERENCES {$this->prefixed}approval_{$type}_requests (`id`) ON DELETE CASCADE,
-                CONSTRAINT `{$this->base}{$type}_user_approval_voter` FOREIGN KEY (`user_id`)
-                    REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-            )";
-        }
-        if (!empty($save)) {
-            update_option(BASE.'approvals_types', $save);
-        }
-        return $tables;
-    }
-
-
-	protected function taxonomyRelationshipsTables():array
-	{
-		$tables = [
-			'taxonomy_relationships' => "(
-		`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-		`term_id` {$this->termIDType} NOT NULL,
-		`related_term_id` {$this->termIDType} NOT NULL,
-		`taxonomy` varchar(32) NOT NULL,
-		`related_taxonomy` varchar(32) NOT NULL,
-		`post_count` int(11) NOT NULL DEFAULT 0,
-		`is_direct` tinyint(1) NOT NULL DEFAULT 1,
-		`is_hierarchical` tinyint(1) NOT NULL DEFAULT 0,
-		`last_updated` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-		PRIMARY KEY (`id`),
-		KEY `term_id` (`term_id`),
-		KEY `related_term_id` (`related_term_id`),
-		KEY `taxonomy` (`taxonomy`),
-		KEY `related_taxonomy` (`related_taxonomy`),
-		UNIQUE KEY `term_relation` (`term_id`, `related_term_id`, `taxonomy`, `related_taxonomy`),
-		CONSTRAINT `{$this->base}tax_rel_term_id` FOREIGN KEY (`term_id`)
-			REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE CASCADE,
-		CONSTRAINT `{$this->base}tax_rel_related_id` FOREIGN KEY (`related_term_id`)
-			REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE CASCADE
-	)"
-		];
-
-		if ((array_key_exists('dashboard', $this->JVB_SITE) && $this->JVB_SITE['dashboard'] === true) || array_key_exists('use_feed_block', $this->JVB_SITE) && $this->JVB_SITE['use_feed_block']) {
-			$tables['user_term_index'] = "(
-		`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-		`user_id` {$this->userIDType} NOT NULL,
-		`term_id` {$this->termIDType} NOT NULL,
-		`taxonomy` varchar(32) NOT NULL,
-		`post_count` int(11) NOT NULL DEFAULT 1,
-		`is_parent` tinyint(1) NOT NULL DEFAULT 0,
-		`last_used` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-		PRIMARY KEY (`id`),
-		UNIQUE KEY `user_term` (`user_id`, `term_id`, `taxonomy`),
-		KEY `user_taxonomy` (`user_id`, `taxonomy`),
-		KEY `taxonomy` (`taxonomy`),
-		CONSTRAINT `{$this->base}user_term_user_fk` FOREIGN KEY (`user_id`)
-			REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE,
-		CONSTRAINT `{$this->base}user_term_term_fk` FOREIGN KEY (`term_id`)
-			REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE CASCADE
-	)";
-		}
-
-		return $tables;
-	}
-
-    protected function favouriteTables():array
-    {
-
-        return [
-            'favourites'    => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `user_id` {$this->userIDType} NOT NULL,
-            `type` varchar(50) NOT NULL,
-            `target_id` bigint(20) NOT NULL,
-            `notes` text DEFAULT NULL,
-            `date_added` datetime DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            UNIQUE KEY `unique_favourite` (`user_id`, `type`, `target_id`),
-            KEY `user_type` (`user_id`, `type`),
-            KEY `target_type` (`target_id`, `type`),
-            CONSTRAINT `{$this->base}favourites_user` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-        )",
-            'favourites_lists'  => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `user_id` {$this->userIDType} NOT NULL,
-            `name` varchar(255) NOT NULL,
-            `description` text,
-            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            KEY `user_lists` (`user_id`),
-            CONSTRAINT `{$this->base}list_user` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-        )",
-            'favourites_list_items' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `list_id` bigint(20) unsigned NOT NULL,
-            `item_type` varchar(50) NOT NULL,
-            `item_id` bigint(20) NOT NULL,
-            `favourite_id` bigint(20) unsigned DEFAULT NULL,
-            `added_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            UNIQUE KEY `unique_list_item` (`list_id`, `item_type`, `item_id`),
-            KEY `list_items` (`list_id`),
-            KEY `favourite_id` (`favourite_id`),
-            CONSTRAINT `{$this->base}list_items` FOREIGN KEY (`list_id`)
-                REFERENCES {$this->prefixed}favourites_lists (`id`) ON DELETE CASCADE,
-            CONSTRAINT `{$this->base}list_favourite` FOREIGN KEY (`favourite_id`)
-                REFERENCES {$this->prefixed}favourites (`id`) ON DELETE SET NULL
-        )",
-            'favourites_list_shares' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `list_id` bigint(20) unsigned NOT NULL,
-            `user_id` {$this->userIDType} NOT NULL,
-            `email` varchar(255) NOT NULL,
-            `permission_type` enum('view', 'edit') NOT NULL DEFAULT 'view',
-            `status` enum('pending', 'accepted', 'rejected', 'revoked') NOT NULL DEFAULT 'pending',
-            `invitation_token` varchar(64) NULL,
-            `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            UNIQUE KEY `unique_share_user` (`list_id`, `user_id`, `status`),
-            UNIQUE KEY `unique_share_email` (`list_id`, `email`, `status`),
-            KEY `list_shares` (`list_id`),
-            KEY `status_index` (`status`),
-            CONSTRAINT `{$this->base}share_list` FOREIGN KEY (`list_id`)
-                REFERENCES {$this->prefixed}favourites_lists (`id`) ON DELETE CASCADE,
-            CONSTRAINT `{$this->base}share_user` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-        )",
-            'favourites_list_stats'    => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `item_type` varchar(50) NOT NULL,
-            `item_id` bigint(20) NOT NULL,
-            `list_count` int NOT NULL DEFAULT 0,
-            `last_added` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            UNIQUE KEY `unique_item_stat` (`item_type`, `item_id`),
-            KEY `item_stats` (`item_type`, `item_id`)
-        )",
-        ];
-    }
-
-    protected function newsRelationshipsTable():array
-    {
-        return [
-            'news_relationships'    => "(
-                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-                `shop_id` {$this->termIDType} NOT NULL,
-                `user_id` {$this->userIDType} NOT NULL,
-                `artist_id` {$this->postIDType} NOT NULL,
-                `news_count` int(10) unsigned NOT NULL DEFAULT 0,
-                `last_post_date` datetime DEFAULT NULL,
-                `last_updated` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (`id`),
-                UNIQUE KEY `shop_user` (`shop_id`, `user_id`),
-                KEY `shop_id` (`shop_id`),
-                KEY `user_id` (`user_id`),
-                KEY `artist_id` (`artist_id`),
-            CONSTRAINT `{$this->base}nr_shop_news_shop` FOREIGN KEY (`shop_id`)
-                REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE CASCADE,
-            CONSTRAINT `{$this->base}nr_shop_news_user` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE,
-            CONSTRAINT `{$this->base}nr_shop_news_artist` FOREIGN KEY (`artist_id`)
-                REFERENCES {$this->wpdb->posts} (`ID`) ON DELETE SET NULL
-        )"
-        ];
-    }
-
-    protected function responseTable():array
-    {
-        return [
-            'responses' => "(
-            `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-            `item_id` {$this->postIDType} NOT NULL,
-            `content` text NOT NULL,
-            `user_id` {$this->userIDType} NOT NULL,
-            `parent_id` bigint(20) unsigned DEFAULT NULL,
-            `response` text NOT NULL,
-            `status` enum('published','hidden','flagged','deleted') DEFAULT 'published',
-            `is_user_deleted` tinyint(1) DEFAULT 0,
-            `upvotes` int NOT NULL DEFAULT 0,
-            `downvotes` int NOT NULL DEFAULT 0,
-            `karma` int NOT NULL DEFAULT 0,
-            `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
-            `updated_at` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (`id`),
-            KEY `item_lookup` (`item_id`, `status`),
-            KEY `user_comments` (`user_id`),
-            KEY `parent_child` (`parent_id`),
-            KEY `karma_order` (`karma`),
-            CONSTRAINT `{$this->base}re_responses_news` FOREIGN KEY (`item_id`)
-                REFERENCES {$this->wpdb->posts} (`ID`) ON DELETE CASCADE,
-            CONSTRAINT `{$this->base}re_responses_parent` FOREIGN KEY (`parent_id`)
-                REFERENCES {$this->prefixed}responses (`id`) ON DELETE SET NULL
-        )",
-            'karma_response' => "(
-                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-                `item_id` bigint(20) NOT NULL,
-                `user_id` {$this->userIDType} NOT NULL,
-                `vote` enum('up','down') NOT NULL,
-                `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (`id`),
-                UNIQUE KEY `user_post` (`user_id`,`item_id`),
-                KEY `item_id` (`item_id`),
-                KEY `user_id` (`user_id`),
-            CONSTRAINT `{$this->base}_response_item_id` FOREIGN KEY (`item_id`)
-                REFERENCES {$this->prefixed}responses (`id`) ON DELETE CASCADE,
-            CONSTRAINT `{$this->base}_response_user_id` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-                )"
-        ];
-    }
-
-    protected function karmaTables(array $types):array
-    {
-        $tables = [];
-        foreach ($types as $type => $config) {
-            $t = false;
-            if (array_key_exists($type, $this->JVB_CONTENT)) {
-                $t = 'posts';
-            } elseif (array_key_exists($type, $this->JVB_TAXONOMY)) {
-                $t = 'terms';
-            } elseif (array_key_exists($type, $this->JVB_USER)) {
-                $t = 'users';
-            }
-
-            if (!$t) {
-                continue;
-            }
-
-            switch ($t) {
-                case 'posts':
-					$referenceType = $this->postIDType;
-                    $reference_table = $this->wpdb->posts;
-                    $reference_column = 'ID';
-                    break;
-                case 'terms':
-					$referenceType = $this->termIDType;
-                    $reference_table = $this->wpdb->terms;
-                    $reference_column = 'term_id';
-                    break;
-                case 'users':
-					$referenceType = $this->userIDType;
-                    $reference_table = $this->userTable;
-                    $reference_column = 'ID';
-                    break;
-            }
-
-            $tables['karma_'.$type] = "(
-                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-                `item_id` {$referenceType} NOT NULL,
-                `user_id` {$this->userIDType} NOT NULL,
-                `vote` enum('up','down') NOT NULL,
-                `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (`id`),
-                UNIQUE KEY `user_post` (`user_id`,`item_id`),
-                KEY `item_id` (`item_id`),
-                KEY `user_id` (`user_id`),
-                CONSTRAINT `{$this->base}kt_{$type}_item_id` FOREIGN KEY (`item_id`)
-                    REFERENCES {$reference_table} ({$reference_column}) ON DELETE CASCADE,
-                CONSTRAINT `{$this->base}kt_{$type}_user_id` FOREIGN KEY (`user_id`)
-                    REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-            )";
-
-        }
-
-        return $tables;
-    }
+	//MOVED TO KarmaManager.php
+//    protected function karmaTables(array $types):array
+//    {
+//        $tables = [];
+//        foreach ($types as $type => $config) {
+//            $t = false;
+//            if (array_key_exists($type, $this->JVB_CONTENT)) {
+//                $t = 'posts';
+//            } elseif (array_key_exists($type, $this->JVB_TAXONOMY)) {
+//                $t = 'terms';
+//            } elseif (array_key_exists($type, $this->JVB_USER)) {
+//                $t = 'users';
+//            }
+//
+//            if (!$t) {
+//                continue;
+//            }
+//
+//            switch ($t) {
+//                case 'posts':
+//					$referenceType = $this->postIDType;
+//                    $reference_table = $this->wpdb->posts;
+//                    $reference_column = 'ID';
+//                    break;
+//                case 'terms':
+//					$referenceType = $this->termIDType;
+//                    $reference_table = $this->wpdb->terms;
+//                    $reference_column = 'term_id';
+//                    break;
+//                case 'users':
+//					$referenceType = $this->userIDType;
+//                    $reference_table = $this->userTable;
+//                    $reference_column = 'ID';
+//                    break;
+//            }
+//
+//            $tables['karma_'.$type] = "(
+//                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//                `item_id` {$referenceType} NOT NULL,
+//                `user_id` {$this->userIDType} NOT NULL,
+//                `vote` enum('up','down') NOT NULL,
+//                `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+//                PRIMARY KEY (`id`),
+//                UNIQUE KEY `user_post` (`user_id`,`item_id`),
+//                KEY `item_id` (`item_id`),
+//                KEY `user_id` (`user_id`),
+//                CONSTRAINT `{$this->base}kt_{$type}_item_id` FOREIGN KEY (`item_id`)
+//                    REFERENCES `{$reference_table}` (`{$reference_column}`) ON DELETE CASCADE,
+//                CONSTRAINT `{$this->base}kt_{$type}_user_id` FOREIGN KEY (`user_id`)
+//                    REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//            )";
+//
+//        }
+//
+//        return $tables;
+//    }
 
     protected function calendarTables(array $types):array
     {
@@ -1046,13 +1073,13 @@
                 KEY `rsvp_events` (`rsvp_required`, `rsvp_deadline`),
 
                 CONSTRAINT `{$this->base}cal_{$type}_type` FOREIGN KEY (`event_type`)
-                    REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE CASCADE,
+                    REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE CASCADE,
                 CONSTRAINT `{$this->base}cal_{$type}_post` FOREIGN KEY (`post_id`)
-                    REFERENCES {$this->wpdb->posts} (`ID`) ON DELETE CASCADE,
+                    REFERENCES `{$this->wpdb->posts}` (`ID`) ON DELETE CASCADE,
                 CONSTRAINT `{$this->base}cal_{$type}_shop` FOREIGN KEY (`shop_id`)
-                    REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE SET NULL,
+                    REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE SET NULL,
                 CONSTRAINT `{$this->base}cal_{$type}_user` FOREIGN KEY (`user_id`)
-                    REFERENCES {$this->userTable} (`ID`) ON DELETE SET NULL
+                    REFERENCES `{$this->userTable}` (`ID`) ON DELETE SET NULL
             )";
 
             $tables['calendar_'.$type.'_participants'] = "(
@@ -1064,9 +1091,9 @@
                 PRIMARY KEY (`id`),
                 UNIQUE KEY `event_user` (`event_id`, `user_id`),
                 CONSTRAINT `{$this->base}cal_{$type}_participant_event` FOREIGN KEY (`event_id`)
-                    REFERENCES {$this->prefixed}calendar_{$type} (`id`) ON DELETE CASCADE,
+                    REFERENCES `{$this->prefixed}calendar_{$type}` (`id`) ON DELETE CASCADE,
                 CONSTRAINT `{$this->base}cal_{$type}_participant_user` FOREIGN KEY (`user_id`)
-                    REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
+                    REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
             )";
 
             $tables['calendar_'.$type.'_recurrence_exceptions'] = "(
@@ -1112,9 +1139,9 @@
             KEY `user_idx` (`user_id`),
             KEY `owner_idx` (`owner_id`),
             CONSTRAINT `{$this->base}umami_user_id_link` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE,
+                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE,
             CONSTRAINT `{$this->base}umami_owner_id_link` FOREIGN KEY (`owner_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
+                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
         )",
             'stats_performance' => "(
             `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
@@ -1132,217 +1159,238 @@
             PRIMARY KEY (`id`),
             KEY `user_date_idx` (`user_id`, `date`),
             CONSTRAINT `{$this->base}performance_user_id_link` FOREIGN KEY (`user_id`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
+                REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
         )"
         ];
     }
 
-    protected function invitationTables($types)
-    {
-
-        $tables = [];
-		foreach ($types as $role => $config) {
-			$definitions = "(
-                `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-                `name` varchar(255) NOT NULL,
-                `email` varchar(255) NOT NULL,
-                `invitation_token` varchar(64) NOT NULL,
-                `status` enum('pending', 'accepted', 'rejected', 'expired','revoked') DEFAULT 'pending',
-                `inviters` JSON NOT NULL,";
-			foreach($config['to_terms']??[] as $term) {
-				$definitions .= "`to_{$term}` {$this->termIDType} DEFAULT NULL,";
-			}
-			$definitions .= "`new_user_id` bigint(20) NOT NULL,
-                `expires_at` datetime NOT NULL,
-                `accepted_at` datetime DEFAULT NULL,
-                `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (`id`),
-                UNIQUE KEY `unique_email` (`email`),
-                KEY `token_lookup` (`invitation_token`),
-                KEY `status_expiry` (`status`, `expires_at`),
-                KEY `name_status` (`name`, `status`)
-            )";
-			foreach($config['to_terms']??[] as $term) {
-				$definitions .= "CONSTRAINT `{$this->base}_{$term}_link` FOREIGN KEY (`to_{$term}`)
-                REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE CASCADE";
-			}
-
-			$tables['invitations_'.$role] = $definitions;
+	/*protected function invitationTables(array $config): array
+	{
+		if (empty($config['roles']) && empty($config['terms'])) {
+			return [];
 		}
 
-        return $tables;
-    }
+		$definitions = "(
+        `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+        `name` varchar(255) NOT NULL,
+        `email` varchar(255) NOT NULL,
+        `invitation_token` varchar(255) NOT NULL,
+        `invited_role` varchar(50) NOT NULL COMMENT 'Role being invited to',
+        `status` enum('pending','accepted','rejected','expired','revoked') DEFAULT 'pending',
+        `inviters` JSON NOT NULL COMMENT 'Array of {user_id, invited_at}',
+        `new_user_id` {$this->userIDType} DEFAULT NULL,
+        `expires_at` datetime NOT NULL,
+        `accepted_at` datetime DEFAULT NULL,
+        `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+        ";
 
-    protected function trackChangesTables($types)
-    {
-        $tables = [];
-        foreach ($types as $type => $config) {
-            $contents = $config['for_content'];
-            foreach ($contents as $content) {
-                $tables['history_'.$content.'_'.$type] = "(
-                    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-                    `user_id` {$this->userIDType} NOT NULL,
-                    `content_id` bigint(20) NOT NULL,
-                    `term_id` {$this->termIDType} NOT NULL,
-                    `role` varchar(50) DEFAULT 'artist',
-                    `is_primary` tinyint(1) DEFAULT 0,
-                    `start_date` date DEFAULT NULL,
-                    `end_date` date DEFAULT NULL,
-                    `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
-                    PRIMARY KEY (`id`),
-                    UNIQUE KEY `content_term` (`content_id`, `term_id`),
-                    KEY content_role (`term_id`, `role`),
-                    CONSTRAINT `{$this->base}{$content}_{$type}_history_user` FOREIGN KEY (`user_id`)
-                        REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE,
-                    CONSTRAINT `{$this->base}{$content}_{$type}_history_term` FOREIGN KEY (`term_id`)
-                        REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE CASCADE
-                )";
-            }
-        }
+		// Add term columns for all invitable taxonomies
+		foreach ($config['terms'] ?? [] as $taxonomy) {
+			$definitions .= "`to_{$taxonomy}` {$this->termIDType} DEFAULT NULL,";
+		}
 
-        return $tables;
-    }
-    protected function requestEntryTables($types)
-    {
-        $tables = [];
-        foreach ($types as $type => $config) {
-            $contents = $config['for_content'];
-            foreach ($contents as $content) {
-                $tables[$content.'_'.$type.'_requests'] = "(
-                    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-                    `user_id` {$this->userIDType} NOT NULL,
-                    `content_id` bigint(20) NOT NULL,
-                    `term_id` {$this->termIDType} NOT NULL,
-                    `managers` json DEFAULT NULL,
-                    `status` ENUM('requested', 'rejected', 'accepted') DEFAULT 'requested',
-                    `dismissed` smallint(1) unsigned DEFAULT NULL,
-                    `created_date` timestamp DEFAULT CURRENT_TIMESTAMP,
-                    `updated_date` timestamp DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                    `notes` text DEFAULT NULL,
-                    PRIMARY KEY (`id`),
-                    UNIQUE KEY `{$this->base}content_term` (`content_id`, `term_id`),
-                    CONSTRAINT `{$this->base}{$content}_{$type}_request_user` FOREIGN KEY (`user_id`)
-                        REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE,
-                    CONSTRAINT `{$this->base}{$content}_{$type}_request_term` FOREIGN KEY (`term_id`)
-                        REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE CASCADE
-                )";
-            }
-        }
+		$definitions .= "PRIMARY KEY (`id`),
+        UNIQUE KEY `unique_email_role` (`email`, `invited_role`),
+        KEY `token_lookup` (`invitation_token`),
+        KEY `status_expiry` (`status`, `expires_at`),
+        KEY `role_status` (`invited_role`, `status`),
+        KEY `email_status` (`email`, `status`),
+        ";
 
-        return $tables;
-    }
+		// Add foreign key constraints for terms
+		$constraints = [];
+		foreach ($config['terms'] ?? [] as $taxonomy) {
+			$constraints[] = "CONSTRAINT `{$this->base}invitations_{$taxonomy}_fk`
+            FOREIGN KEY (`to_{$taxonomy}`)
+            REFERENCES `{$this->wpdb->terms}` (`term_id`)
+            ON DELETE SET NULL";
+		}
 
+		// Add user foreign key
+		$constraints[] = "CONSTRAINT `{$this->base}invitations_user_fk`
+        FOREIGN KEY (`new_user_id`)
+        REFERENCES `{$this->userTable}` (`ID`)
+        ON DELETE SET NULL";
 
+		$definitions .= implode(',', $constraints);
+		$definitions .= ")";
+
+		return ['invitations' => $definitions];
+	}*/
+
+	//MOVED TO MakeTrackChanges.php
+//    protected function trackChangesTables($types)
+//    {
+//        $tables = [];
+//        foreach ($types as $type => $config) {
+//            $contents = $config['for_content'];
+//            foreach ($contents as $content) {
+//                $tables['history_'.$content.'_'.$type] = "(
+//                    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//                    `user_id` {$this->userIDType} NOT NULL,
+//                    `content_id` bigint(20) NOT NULL,
+//                    `term_id` {$this->termIDType} NOT NULL,
+//                    `role` varchar(50) DEFAULT 'artist',
+//                    `is_primary` tinyint(1) DEFAULT 0,
+//                    `start_date` date DEFAULT NULL,
+//                    `end_date` date DEFAULT NULL,
+//                    `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+//                    PRIMARY KEY (`id`),
+//                    UNIQUE KEY `content_term` (`content_id`, `term_id`),
+//                    KEY content_role (`term_id`, `role`),
+//                    CONSTRAINT `{$this->base}{$content}_{$type}_history_user` FOREIGN KEY (`user_id`)
+//                        REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE,
+//                    CONSTRAINT `{$this->base}{$content}_{$type}_history_term` FOREIGN KEY (`term_id`)
+//                        REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE CASCADE
+//                )";
+//            }
+//        }
+//
+//        return $tables;
+//    }
+
+//MOVED TO VerifyEntryManager.php
+//    protected function requestEntryTables($types)
+//    {
+//        $tables = [];
+//        foreach ($types as $type => $config) {
+//            $contents = $config['for_content'];
+//            foreach ($contents as $content) {
+//                $tables[$content.'_'.$type.'_requests'] = "(
+//                    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//                    `user_id` {$this->userIDType} NOT NULL,
+//                    `content_id` bigint(20) NOT NULL,
+//                    `term_id` {$this->termIDType} NOT NULL,
+//                    `managers` json DEFAULT NULL,
+//                    `status` ENUM('requested', 'rejected', 'accepted') DEFAULT 'requested',
+//                    `dismissed` smallint(1) unsigned DEFAULT NULL,
+//                    `created_date` timestamp DEFAULT CURRENT_TIMESTAMP,
+//                    `updated_date` timestamp DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+//                    `notes` text DEFAULT NULL,
+//                    PRIMARY KEY (`id`),
+//                    UNIQUE KEY `{$this->base}content_term` (`content_id`, `term_id`),
+//                    CONSTRAINT `{$this->base}{$content}_{$type}_request_user` FOREIGN KEY (`user_id`)
+//                        REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE,
+//                    CONSTRAINT `{$this->base}{$content}_{$type}_request_term` FOREIGN KEY (`term_id`)
+//                        REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE CASCADE
+//                )";
+//            }
+//        }
+//
+//        return $tables;
+//    }
+
+// MOVED TO ReferralManager.php
 	/**
 	 * Create referral tracking tables
 	 *
 	 * Call this from the main table creation method in CheckCustomTables.php:
 	 * $tables = array_merge($tables, $this->referralTables());
 	 */
-	protected function referralTables(): array
-	{
-		// Create tables in dependency order
-		// First: referrals (depends only on wp_users)
-		$mainTable['referrals'] = "(
-	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-	`referrer_id` {$this->userIDType} NOT NULL,
-	`referee_id` {$this->userIDType} NOT NULL,
-	`referee_name` varchar(255) NOT NULL,
-	`referee_email` varchar(255) NOT NULL,
-	`referee_phone` varchar(50) DEFAULT NULL,
-	`referral_code` varchar(50) NOT NULL,
-	`status` enum('pending', 'consulted', 'treated', 'cancelled') DEFAULT 'pending',
-	`referred_at` datetime NOT NULL,
-	`consulted_at` datetime DEFAULT NULL,
-	`treated_at` datetime DEFAULT NULL,
-	`treatment_count` int DEFAULT 0,
-	`notes` text DEFAULT NULL,
-	PRIMARY KEY (`id`),
-	UNIQUE KEY `referee_unique` (`referee_id`),
-	KEY `referrer_idx` (`referrer_id`),
-	KEY `status_idx` (`status`),
-	KEY `code_idx` (`referral_code`),
-	KEY `date_idx` (`referred_at`),
-	KEY `consult_idx` (`consulted_at`),
-	CONSTRAINT `{$this->base}referral_referrer_fk` FOREIGN KEY (`referrer_id`)
-		REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE,
-	CONSTRAINT `{$this->base}referral_referee_fk` FOREIGN KEY (`referee_id`)
-		REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-)";
-
-		// Create the main referrals table first
-		$this->createTables($mainTable);
-
-		// Now create dependent tables
-		$dependentTables = [];
-
-		// Second: jane_clients (depends only on wp_users)
-		$dependentTables['jane_clients'] = "(
-	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-	`patient_guid` varchar(50) NOT NULL,
-	`user_id` {$this->userIDType} NOT NULL,
-	`first_name` varchar(100) NOT NULL,
-	`last_name` varchar(100) NOT NULL,
-	`email` varchar(255) NOT NULL,
-	`imported_at` datetime DEFAULT CURRENT_TIMESTAMP,
-	`updated_at` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-	PRIMARY KEY (`id`),
-	UNIQUE KEY `patient_guid_unique` (`patient_guid`),
-	KEY `user_idx` (`user_id`),
-	KEY `email_idx` (`email`),
-	CONSTRAINT `{$this->base}jane_client_user_fk` FOREIGN KEY (`user_id`)
-		REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-)";
-
-		// Third: referral_treatments (depends on referrals AND wp_users)
-		$dependentTables['referral_treatments'] = "(
-	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-	`referral_id` bigint(20) unsigned NOT NULL,
-	`user_id` {$this->userIDType} NOT NULL,
-	`treatment_type` varchar(100) NOT NULL COMMENT 'Tier 1-6, Brows, etc',
-	`treatment_date` datetime NOT NULL,
-	`invoice_number` varchar(50) DEFAULT NULL,
-	`amount` decimal(10,2) DEFAULT NULL,
-	`status` enum('completed', 'no_show', 'cancelled') DEFAULT 'completed',
-	`imported_at` datetime DEFAULT CURRENT_TIMESTAMP,
-	PRIMARY KEY (`id`),
-	KEY `referral_idx` (`referral_id`),
-	KEY `user_idx` (`user_id`),
-	KEY `date_idx` (`treatment_date`),
-	KEY `type_idx` (`treatment_type`),
-	CONSTRAINT `{$this->base}treatment_referral_fk` FOREIGN KEY (`referral_id`)
-		REFERENCES {$this->prefixed}referrals (`id`) ON DELETE CASCADE,
-	CONSTRAINT `{$this->base}treatment_user_fk` FOREIGN KEY (`user_id`)
-		REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-)";
-
-		// Fourth: referral_rewards (depends on referrals AND wp_users)
-		$dependentTables['referral_rewards'] = "(
-	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-	`referral_id` bigint(20) unsigned NOT NULL,
-	`user_id` {$this->userIDType} NOT NULL,
-	`reward_type` enum('referrer', 'referee') NOT NULL,
-	`amount` decimal(10,2) NOT NULL,
-	`reward_calculation` varchar(20) DEFAULT NULL COMMENT 'percentage or fixed',
-	`status` enum('available', 'redeemed', 'expired', 'cancelled') DEFAULT 'available',
-	`created_at` datetime NOT NULL,
-	`redeemed_at` datetime DEFAULT NULL,
-	`expires_at` datetime DEFAULT NULL,
-	`notes` text DEFAULT NULL,
-	PRIMARY KEY (`id`),
-	KEY `referral_idx` (`referral_id`),
-	KEY `user_idx` (`user_id`),
-	KEY `status_idx` (`status`),
-	KEY `type_idx` (`reward_type`),
-	CONSTRAINT `{$this->base}reward_referral_fk` FOREIGN KEY (`referral_id`)
-		REFERENCES {$this->prefixed}referrals (`id`) ON DELETE CASCADE,
-	CONSTRAINT `{$this->base}reward_user_fk` FOREIGN KEY (`user_id`)
-		REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE
-)";
-
-		return $dependentTables;
-	}
+//	protected function referralTables(): array
+//	{
+//		// Create tables in dependency order
+//		// First: referrals (depends only on wp_users)
+//		$mainTable['referrals'] = "(
+//	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//	`referrer_id` {$this->userIDType} NOT NULL,
+//	`referee_id` {$this->userIDType} NOT NULL,
+//	`referee_name` varchar(255) NOT NULL,
+//	`referee_email` varchar(255) NOT NULL,
+//	`referee_phone` varchar(50) DEFAULT NULL,
+//	`referral_code` varchar(50) NOT NULL,
+//	`status` enum('pending', 'consulted', 'treated', 'cancelled') DEFAULT 'pending',
+//	`referred_at` datetime NOT NULL,
+//	`consulted_at` datetime DEFAULT NULL,
+//	`treated_at` datetime DEFAULT NULL,
+//	`treatment_count` int DEFAULT 0,
+//	`notes` text DEFAULT NULL,
+//	PRIMARY KEY (`id`),
+//	UNIQUE KEY `referee_unique` (`referee_id`, `referral_code`),
+//	KEY `referrer_idx` (`referrer_id`),
+//	KEY `status_idx` (`status`),
+//	KEY `code_idx` (`referral_code`),
+//	KEY `date_idx` (`referred_at`),
+//	KEY `consult_idx` (`consulted_at`),
+//	CONSTRAINT `{$this->base}referral_referrer_fk` FOREIGN KEY (`referrer_id`)
+//		REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE,
+//	CONSTRAINT `{$this->base}referral_referee_fk` FOREIGN KEY (`referee_id`)
+//		REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//)";
+//
+//		// Create the main referrals table first
+//		$this->createTables($mainTable);
+//
+//		// Now create dependent tables
+//		$dependentTables = [];
+//
+//		// Second: jane_clients (depends only on wp_users)
+//		$dependentTables['jane_clients'] = "(
+//	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//	`patient_guid` varchar(50) NOT NULL,
+//	`user_id` {$this->userIDType} NOT NULL,
+//	`first_name` varchar(100) NOT NULL,
+//	`last_name` varchar(100) NOT NULL,
+//	`email` varchar(255) NOT NULL,
+//	`imported_at` datetime DEFAULT CURRENT_TIMESTAMP,
+//	`updated_at` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+//	PRIMARY KEY (`id`),
+//	UNIQUE KEY `patient_guid_unique` (`patient_guid`),
+//	KEY `user_idx` (`user_id`),
+//	KEY `email_idx` (`email`),
+//	CONSTRAINT `{$this->base}jane_client_user_fk` FOREIGN KEY (`user_id`)
+//		REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//)";
+//
+//		// Third: referral_treatments (depends on referrals AND wp_users)
+//		$dependentTables['referral_treatments'] = "(
+//	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//	`referral_id` bigint(20) unsigned NOT NULL,
+//	`user_id` {$this->userIDType} NOT NULL,
+//	`treatment_type` varchar(100) NOT NULL COMMENT 'Tier 1-6, Brows, etc',
+//	`treatment_date` datetime NOT NULL,
+//	`invoice_number` varchar(50) DEFAULT NULL,
+//	`amount` decimal(10,2) DEFAULT NULL,
+//	`status` enum('completed', 'no_show', 'cancelled') DEFAULT 'completed',
+//	`imported_at` datetime DEFAULT CURRENT_TIMESTAMP,
+//	PRIMARY KEY (`id`),
+//	KEY `referral_idx` (`referral_id`),
+//	KEY `user_idx` (`user_id`),
+//	KEY `date_idx` (`treatment_date`),
+//	KEY `type_idx` (`treatment_type`),
+//	CONSTRAINT `{$this->base}treatment_referral_fk` FOREIGN KEY (`referral_id`)
+//		REFERENCES `{$this->prefixed}referrals` (`id`) ON DELETE CASCADE,
+//	CONSTRAINT `{$this->base}treatment_user_fk` FOREIGN KEY (`user_id`)
+//		REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//)";
+//
+//		// Fourth: referral_rewards (depends on referrals AND wp_users)
+//		$dependentTables['referral_rewards'] = "(
+//	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+//	`referral_id` bigint(20) unsigned NOT NULL,
+//	`user_id` {$this->userIDType} NOT NULL,
+//	`reward_type` enum('referrer', 'referee') NOT NULL,
+//	`amount` decimal(10,2) NOT NULL,
+//	`reward_calculation` varchar(20) DEFAULT NULL COMMENT 'percentage or fixed',
+//	`status` enum('available', 'redeemed', 'expired', 'cancelled') DEFAULT 'available',
+//	`created_at` datetime NOT NULL,
+//	`redeemed_at` datetime DEFAULT NULL,
+//	`expires_at` datetime DEFAULT NULL,
+//	`notes` text DEFAULT NULL,
+//	PRIMARY KEY (`id`),
+//	KEY `referral_idx` (`referral_id`),
+//	KEY `user_idx` (`user_id`),
+//	KEY `status_idx` (`status`),
+//	KEY `type_idx` (`reward_type`),
+//	CONSTRAINT `{$this->base}reward_referral_fk` FOREIGN KEY (`referral_id`)
+//		REFERENCES `{$this->prefixed}referrals` (`id`) ON DELETE CASCADE,
+//	CONSTRAINT `{$this->base}reward_user_fk` FOREIGN KEY (`user_id`)
+//		REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE
+//)";
+//
+//		return $dependentTables;
+//	}
 
     /*******************************************************************************************
      * These methods help create a content-type taxonomy, like the tattoo shops in edmonton.ink
@@ -1460,13 +1508,13 @@
 
 			if ($type === 'taxonomy') {
 				$constraints[] = "CONSTRAINT `{$constraintName}` FOREIGN KEY (`{$fieldName}`)
-                REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE SET NULL";
+                REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE SET NULL";
 			} elseif ($type === 'user') {
 				$constraints[] = "CONSTRAINT `{$constraintName}` FOREIGN KEY (`{$fieldName}`)
-                REFERENCES {$this->userTable} (`ID`) ON DELETE SET NULL";
+                REFERENCES `{$this->userTable}` (`ID`) ON DELETE SET NULL";
 			} elseif ($type === 'image' || $type === 'file') {
 				$constraints[] = "CONSTRAINT `{$constraintName}` FOREIGN KEY (`{$fieldName}`)
-                REFERENCES {$this->wpdb->posts} (`ID`) ON DELETE SET NULL";
+                REFERENCES `{$this->wpdb->posts}` (`ID`) ON DELETE SET NULL";
 			}
 		}
 
@@ -1480,7 +1528,7 @@
 		}
 
 		try {
-			$contentFields = jvbGetFields($type);
+			$contentFields = Registrar::getFieldsFor($type);
 
 			if (!$contentFields || empty($contentFields)) {
 				return;
@@ -1563,7 +1611,7 @@
 				["PRIMARY KEY (`term_id`)"],
 				$indexes,
 				$constraints,
-				["CONSTRAINT `{$base}_{$type}_term` FOREIGN KEY (`term_id`) REFERENCES {$this->wpdb->terms} (`term_id`) ON DELETE CASCADE"]
+				["CONSTRAINT `{$base}_{$type}_term` FOREIGN KEY (`term_id`) REFERENCES `{$this->wpdb->terms}` (`term_id`) ON DELETE CASCADE"]
 			);
 			$sql = "(\n    " . implode(",\n    ", $allDefinitions) . "\n)";
 			error_log("JVB: Creating content table for type: {$type}");
@@ -1727,7 +1775,7 @@
 
         $constraints = [
             "CONSTRAINT `{$this->base}_{$userType}_stats_user` FOREIGN KEY (`user_id`)
-         REFERENCES {$this->userTable} (`ID`) ON DELETE CASCADE"
+         REFERENCES `{$this->userTable}` (`ID`) ON DELETE CASCADE"
         ];
 
         $allDefinitions = array_merge($columns, $indexes, $constraints);

--
Gitblit v1.10.0