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/registrar/Registrar.php | 157 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 137 insertions(+), 20 deletions(-)
diff --git a/inc/registrar/Registrar.php b/inc/registrar/Registrar.php
index a69a13f..727e3b3 100644
--- a/inc/registrar/Registrar.php
+++ b/inc/registrar/Registrar.php
@@ -1,9 +1,12 @@
<?php
namespace JVBase\registrar;
+use JVBase\forms\TaxonomySelector;
+use JVBase\inc\registrar\helpers\HideSingle;
use JVBase\managers\Cache;
use JVBase\managers\CRUD;
use JVBase\managers\IconsManager;
+use JVBase\managers\KarmaManager;
use JVBase\meta\Meta;
use JVBase\registrar\config\Breadcrumbs;
use JVBase\registrar\config\Dashboard;
@@ -14,9 +17,11 @@
use JVBase\registrar\config\SEO;
use JVBase\registrar\helpers\AddIntegrationFields;
use JVBase\registrar\helpers\MakeCalendarType;
+use JVBase\registrar\helpers\MakeTimelineType;
use JVBase\registrar\helpers\MakeTrackChanges;
use JVBase\registrar\helpers\MakeVerification;
use JVBase\utility\Features;
+use WP_Post;
use WP_Query;
if (!defined('ABSPATH')) {
@@ -41,11 +46,13 @@
protected int|false $page = false;
+ public ?string $rewrite_taxonomy = null;
+
protected static array $allFlags = [
//Shared Flags
'favouritable', 'karma', 'show_feed', 'show_directory', 'approve_new', 'has_responses', 'invitable',
//Post Flags
- 'hide_single', 'redirect_to_author', 'is_calendar', 'single_image', 'is_timeline', 'is_gallery',
+ 'hide_single', 'redirect_to_author', 'is_calendar', 'single_image', 'is_timeline', 'is_gallery', 'is_faq', 'is_glossary', 'rewrite_taxonomy',
//Taxonomy Flags
'is_content', 'is_ownable', 'verify_entry', 'track_changes', 'associate_user_content',
//User Flags
@@ -62,6 +69,7 @@
* @var bool Whether to setup karma for this content
*/
protected bool $karma = false;
+ protected ?KarmaManager $karmaManager = null;
/**
* @var bool Whether this should be available in the feed block
*/
@@ -90,6 +98,7 @@
* @var bool Whether single items of this content should be hidden
*/
protected bool $hide_single = false;
+ protected ?HideSingle $hideSingleHandler = null;
/**
* @var bool Whether single items should just go to the author's page
@@ -98,11 +107,21 @@
/**
* @var bool Whether to make this a calendar type (example: events)
*/
- protected bool $is_calendar;
+ protected bool $is_calendar = false;
+ protected ?MakeCalendarType $isCalendarHandler = null;
/**
* @var bool Whether this is a before/after post type
*/
protected bool $is_timeline = false;
+ protected ?MakeTimelineType $isTimelineHandler = null;
+ /**
+ * @var bool Whether this is a defined term post type
+ */
+ protected bool $is_glossary = false;
+ /**
+ * @var bool Whether this is a faq post type
+ */
+ protected bool $is_faq = false;
/**
* @var bool Whether the uploader can group images prior to upload
*/
@@ -113,7 +132,7 @@
/**
* @var bool For taxonomy types only. Treats the taxonomy as a content (ie: tattoo shops))
*/
- protected bool $is_content;
+ protected bool $is_content = false;
/**
* @var bool Whether this taxonomy can be owned/managed by specific people only
*/
@@ -122,10 +141,12 @@
* @var bool Whether users/content need to request the owner for admission
*/
protected bool $verify_entry;
+ protected ?MakeVerification $verifyEntryHandler = null;
/**
* @var bool Whether we should track post movements from term to term (ie. artists in tattoo shops)
*/
protected bool $track_changes;
+ protected ?MakeTrackChanges $trackChangesHandler = null;
/**
* @var bool Whether any content by members in this taxonomy should show up in this taxonomy
@@ -158,7 +179,7 @@
/**
* @var bool Whether to generate a profile for this user role
*/
- protected bool $profile_link;
+ public bool $profile_link;
/**
* @var array|string
*/
@@ -274,8 +295,16 @@
return $this;
}
$this->args = $args;
+
foreach ($args as $property => $value) {
- $this->registrar->$property = $value;
+ if (property_exists($this->registrar, $property)) {
+ $this->registrar->$property = $value;
+ }
+
+ if (property_exists($this, $property)) {
+ $this->$property = $value;
+ }
+
}
if (isset($this->icon) && !str_contains($this->icon, 'dashicons')){
$this->registrar->menu_icon = IconsManager::for()->getCSSIcon($this->icon);
@@ -390,6 +419,30 @@
return $this->based;
}
+ public function setGlossary(bool $set):self
+ {
+ $this->is_glossary = $set;
+// if ($set) {
+// $this->timeline = new MakeTimelineType($this->slug, $this);
+// }
+ return $this;
+ }
+ public function isGlossary():bool
+ {
+ return $this->is_glossary;
+ }
+ public function setFaq(bool $set):self
+ {
+ $this->is_faq = $set;
+// if ($set) {
+// $this->timeline = new MakeTimelineType($this->slug, $this);
+// }
+ return $this;
+ }
+ public function isFaq():bool
+ {
+ return $this->is_faq;
+ }
public function setTimeline(bool $set):self
{
$this->is_timeline = $set;
@@ -422,6 +475,9 @@
case 'is_content':
add_action('init', [$this, 'setupContent'], 20);
break;
+ case 'is_glossary':
+ $this->hide_single = true;
+ break;
}
}
return $this;
@@ -447,13 +503,18 @@
}
public static function getFeatured(string $feature, ?string $type = null):array
{
+ self::ensureInstanced();
+
if (!in_array($feature, static::$allFlags)) {
error_log('Feature requested not found: '.$feature);
return [];
}
return array_map(function($inst) { return $inst->slug; },array_filter(self::$instances, function ($inst) use ($feature, $type){
- return isset($inst->$feature) && $inst->$feature === true && (is_null($type) || $inst->type === $type);
+ if (!is_null($type) && $inst->type !== $type) {
+ return false;
+ }
+ return property_exists($inst, $feature) && isset($inst->$feature) && $inst->$feature === true;
}));
}
@@ -478,12 +539,15 @@
}
protected function getBreadcrumbs():Breadcrumbs
{
- $this->breadcrumbs = new Breadcrumbs($this->slug, $this);
+ if (!isset($this->breadcrumbs)) {
+ $this->breadcrumbs = new Breadcrumbs($this->slug, $this);
+ }
+
return $this->breadcrumbs;
}
protected function getCalendar():MakeCalendarType|false
{
- if ($this->is_calendar){
+ if ($this->is_calendar && !isset($this->calendar)){
$this->calendar = new MakeCalendarType($this->slug, $this);
} else {
$this->calendar = false;
@@ -493,26 +557,25 @@
protected function getDashboard():Dashboard
{
- $this->dashboard = new Dashboard($this->plural, $this);
+ if (!isset($this->dashboard)) {
+ $this->dashboard = new Dashboard($this->plural, $this);
+ }
+
return $this->dashboard;
}
protected function getDirectory():Directory|false
{
- if ($this->show_directory) {
- $this->directory = new Directory($this->singular, $this);
- } else {
- $this->directory = false;
+ if (!isset($this->directory)) {
+ $this->directory = new Directory($this->singular);
}
return $this->directory;
}
protected function getFeed():Feed|false
{
- if ($this->show_feed) {
- $this->feed = new Feed($this->slug, $this);
- } else {
- $this->feed = false;
+ if (!isset($this->feed)) {
+ $this->feed = new Feed($this->slug);
}
return $this->feed;
}
@@ -520,7 +583,7 @@
public function getSEO():SEO
{
if (!isset($this->seo)){
- $this->seo = new SEO($this->slug, $this);
+ $this->seo = new SEO($this->slug);
}
return $this->seo;
}
@@ -585,13 +648,48 @@
public function register():void
{
- if ($this->registrar) {
- $this->registrar->register();
+ if ($this->type === 'post') {
+ if ($this->hide_single) {
+ $this->hideSingleHandler = new HideSingle($this->slug, $this);
+ }
+ if ($this->is_timeline) {
+ $this->isTimelineHandler = new MakeTimelineType($this->slug, $this);
+ $this->registrar->hierarchical = true;
+ }
+ if ($this->is_calendar) {
+ $this->isCalendarHandler = new MakeCalendarType($this->slug, $this);
+ }
+
+ if (!is_null($this->rewrite_taxonomy)) {
+ $this->registrar->addTaxonomyRewrite($this->rewrite_taxonomy);
+ }
+
+ if ($this->registrar) {
+ $this->registrar->register();
+ }
+ } elseif ($this->type === 'term') {
+ if ($this->is_content) {
+ if ($this->verify_entry) {
+ $this->verifyEntryHandler = new MakeVerification();
+ }
+ if ($this->track_changes) {
+ $this->trackChangesHandler = new MakeTrackChanges($this->slug);
+ }
+ }
+
+ if ($this->registrar) {
+ $this->registrar->register();
+ }
}
+ if ($this->karma) {
+ $this->karmaManager = KarmaManager::for($this->slug);
+ }
}
public static function getInstance(string $slug):Registrar|false
{
+ self::ensureInstanced();
+
$slug = jvbNoBase($slug);
if (array_key_exists($slug, static::$instances)) {
return static::$instances[$slug];
@@ -601,6 +699,7 @@
public static function getFieldsFor(string $slug):array
{
+ self::ensureInstanced();
if (!array_key_exists($slug, static::$instances)) {
return [];
}
@@ -610,6 +709,7 @@
public static function getRegistered(?string $type = null):array
{
+ self::ensureInstanced();
$instances = ($type) ? array_filter(static::$instances, function($instance) use ($type) {
return $instance->type === $type;
}) : static::$instances;
@@ -618,6 +718,7 @@
public static function getLabels():array
{
+ self::ensureInstanced();
return array_map(function ($instance) {
return ['singular' => $instance->getSingular(),
'plural' => $instance->getPlural()];
@@ -797,4 +898,20 @@
error_log('Built the '.$this->slug.' page content.');
return $content . $out;
}
+
+ public static function ensureInstanced():void
+ {
+ if (empty(self::$instances)) {
+ do_action('jvbDefineRegistrar');
+ do_action('jvbDefineRegistrarFields');
+ }
+ }
+
+ /*****************************************************************
+ * FLAGGED FEATURES
+ *****************************************************************/
+
+
+
+
}
--
Gitblit v1.10.0