From 3baf3d2545ba6ece6b74a64c0def59bd0774cf54 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 10 Jun 2026 16:34:12 +0000
Subject: [PATCH] =Laid the groundwork for an improved DashboardManager.php setup. Have to put it aside so I can get the dang Northeh done though.
---
inc/registrar/Registrar.php | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 222 insertions(+), 17 deletions(-)
diff --git a/inc/registrar/Registrar.php b/inc/registrar/Registrar.php
index c4f0989..1ecadf3 100644
--- a/inc/registrar/Registrar.php
+++ b/inc/registrar/Registrar.php
@@ -14,6 +14,7 @@
use JVBase\registrar\config\Directory;
use JVBase\registrar\config\Feed;
use JVBase\registrar\config\Integration;
+use JVBase\registrar\config\Register;
use JVBase\registrar\config\Section;
use JVBase\registrar\config\SEO;
use JVBase\registrar\helpers\AddIntegrationFields;
@@ -49,6 +50,10 @@
public ?string $rewrite_taxonomy = null;
public bool $add_image_column = false;
+ public bool $prefix_post_type = false;
+ public string $prefix_with = 'by';
+
+ public bool $system = false;
protected static array $allFlags = [
//Shared Flags
@@ -56,9 +61,11 @@
//Post Flags
'hide_single', 'redirect_to_author', 'is_calendar', 'single_image', 'is_timeline', 'is_gallery', 'is_faq', 'is_glossary', 'rewrite_taxonomy', 'add_image_column',
//Taxonomy Flags
- 'is_content', 'is_ownable', 'verify_entry', 'track_changes', 'associate_user_content',
+ 'is_content', 'is_ownable', 'verify_entry', 'track_changes', 'associate_user_content', 'prefix_post_type',
//User Flags
- 'has_dashboard', 'can_register', 'can_create', 'keep_stats', 'can_favourite', 'member_verified', 'profile_link', 'manage_others'
+ 'has_dashboard', 'can_register', 'can_create', 'keep_stats', 'can_favourite', 'member_verified', 'profile_link', 'manage_others',
+ //System
+ 'system'
];
/**********************************************************************************************
SHARED FLAGS
@@ -206,6 +213,7 @@
protected Dashboard $dashboard;
protected Directory|false $directory;
protected Feed|false $feed;
+ protected Register|false $login;
// protected Management $management;
// protected Responses $responses;
protected ?SEO $seo = null;
@@ -236,6 +244,59 @@
add_filter('jvbDashboardPage', [$this, 'renderDashPage'], 10, 3);
}
+ public static function maybeExcludeSingles(array $IDs):array
+ {
+ self::ensureInstanced();
+
+ $features = ['hide_single', 'is_timeline'];
+ foreach ($features as $feature) {
+ foreach (self::withFeature($feature) as $instance) {
+ $instance = self::getInstance($instance);
+ $cache = Cache::for('tsf')->connect($instance->getType());
+ $cache->flush();
+
+ $exclude = $cache->remember(
+ $feature,
+ function () use ($instance, $feature) {
+ switch ($feature) {
+ case 'hide_single':
+ return $instance->excludeSingle();
+ case 'is_timeline':
+ return $instance->excludeTimeline();
+ default:
+ return [];
+ }
+ }
+ );
+
+ if (!empty($exclude)) {
+ $IDs = array_merge($IDs, $exclude);
+ }
+ }
+ }
+
+ return $IDs;
+ }
+ protected function excludeSingle():array
+ {
+ return get_posts([
+ 'post_type' => $this->based,
+ 'posts_per_page'=> -1,
+ 'fields' => 'ids',
+ 'post_status' => 'publish',
+ ]);
+ }
+ protected function excludeTimeline():array
+ {
+ return get_posts([
+ 'post_type' => $this->based,
+ 'posts_per_page'=> -1,
+ 'fields' => 'ids',
+ 'post_status' => 'publish',
+ 'post_parent__not_in' => [0], // Only get posts with a parent
+ ]);
+ }
+
protected function initRegistrar():void {
$this->registrar = match ($this->type) {
'post' => new Posts($this->slug, $this->singular, $this->plural),
@@ -409,8 +470,9 @@
{
return $this->integrationConfigs;
}
- public function hasIntegration(string $integration) {
- return in_array($integration, $this->integrationConfigs);
+ public function hasIntegration(string $integration):bool
+ {
+ return array_key_exists($integration, $this->integrationConfigs);
}
public function hasAnyIntegrations(array $integrations = []):bool
{
@@ -503,6 +565,29 @@
}
return $this;
}
+ public function unsetAll(array $flags):self
+ {
+ $flags = array_filter($flags, function($flag) {
+ return in_array($flag, static::$allFlags);
+ });
+ foreach ($flags as $flag) {
+ $this->$flag = false;
+ switch ($flag) {
+ case 'is_content':
+ remove_action('init', [$this, 'setupContent'], 20);
+ break;
+ case 'is_glossary':
+ $this->hide_single = false;
+ break;
+ }
+ }
+ return $this;
+ }
+ public function prefixWith(string $prefix):self
+ {
+ $this->prefix_with = sanitize_title($prefix);
+ return $this;
+ }
public function removeAll(array $flags):self
{
$flags = array_filter($flags, function($flag) {
@@ -522,8 +607,20 @@
}
return isset($this->$feature) && $this->$feature === true;
}
+
+ /**
+ * @deprecated use withFeature
+ * @param string $feature
+ * @param string|null $type
+ * @return array
+ */
public static function getFeatured(string $feature, ?string $type = null):array
{
+ return self::withFeature($feature, $type);
+ }
+
+ public static function withFeature(string $feature, ?string $type = null):array
+ {
self::ensureInstanced();
if (!in_array($feature, static::$allFlags)) {
@@ -532,16 +629,33 @@
}
return array_map(function($inst) { return $inst->slug; },array_filter(self::$instances, function ($inst) use ($feature, $type){
- if (!is_null($type) && $inst->type !== $type) {
+ if ((!is_null($type) && $inst->type !== $type) || $inst->system) {
return false;
}
return property_exists($inst, $feature) && isset($inst->$feature) && $inst->$feature === true;
}));
}
+ public static function withIntegration(string $integration, ?string $type = null):array
+ {
+ self::ensureInstanced();
+
+ if (!Site::has($integration)) {
+ error_log('[Registrar]::withIntegration Integration not available to fetch: '.$integration);
+ return [];
+ }
+
+ return array_map(function($inst) { return $inst->slug; },array_filter(self::$instances, function ($inst) use ($integration, $type){
+ if (!is_null($type) && $inst->type !== $type) {
+ return false;
+ }
+ return array_key_exists($integration, $this->integrationConfigs);
+ }));
+ }
+
public function config(string $config):mixed
{
- $allowed = ['breadcrumbs','calendar','dashboard','directory','feed','management','has_responses','seo','trackchanges','verification'];
+ $allowed = ['breadcrumbs','calendar','register','login','dashboard','directory','feed','management','has_responses','seo','trackchanges','verification'];
if (!in_array(strtolower($config), $allowed)) {
error_log('Invalid config requested from Registrar: '.$config);
return [];
@@ -550,6 +664,7 @@
'breadcrumbs' => $this->getBreadcrumbs(),
'dashboard' => $this->getDashboard(),
'directory' => $this->getDirectory(),
+ 'register','login' => $this->getLogin(),
'feed' => $this->getFeed(),
'management' => $this->getManagement(),
'has_responses' => $this->getResponses(),
@@ -558,10 +673,17 @@
'verification' => $this->getVerification()
};
}
+ protected function getLogin():Register|false
+ {
+ if (!isset($this->login)) {
+ $this->login = new Register();
+ }
+ return $this->login;
+ }
protected function getBreadcrumbs():Breadcrumbs
{
if (!isset($this->breadcrumbs)) {
- $this->breadcrumbs = new Breadcrumbs($this->slug, $this);
+ $this->breadcrumbs = new Breadcrumbs($this->slug);
}
return $this->breadcrumbs;
@@ -579,7 +701,7 @@
protected function getDashboard():Dashboard
{
if (!isset($this->dashboard)) {
- $this->dashboard = new Dashboard($this->plural, $this);
+ $this->dashboard = new Dashboard($this->plural);
}
return $this->dashboard;
@@ -612,9 +734,10 @@
public function getSections():array
{
$allSections = array_map(function($section) {
- return $section->getConfig;
+ return $section->getConfig();
}, $this->sections);
+
if (!empty($this->sectionOrder)) {
$allSections['order'] = $this->sectionOrder;
}
@@ -622,11 +745,40 @@
}
public function addSection(string $title):Section
{
- $section = new Section($title, $this);
- $this->sections[] = $section;
- return $section;
+ $slug = sanitize_title($title);
+ if (!array_key_exists($slug, $this->sections)) {
+ $section = new Section($title, $this);
+ $this->sections[$slug] = $section;
+ }
+
+ return $this->sections[$slug];
}
+ public static function maybeBuildSections():void
+ {
+ foreach (self::$instances as $inst) {
+ $inst->buildSections();
+ }
+ }
+ protected function buildSections():void
+ {
+ $fields = $this->getFields();
+ $sections = array_unique(array_values(array_map(function ($f) {
+ return array_key_exists('section', $f) && !is_null($f['section']) ? $f['section'] : 'main';
+ }, $fields)));
+
+ foreach ($sections as $s) {
+ $section = new Section($s, $this);
+ $section->setTitle(ucwords(implode(' ', explode('-', $s))));
+ $sectionFields = array_filter($fields, function ($f) use ($s) {
+ $tmp = array_key_exists('section', $f) && !is_null($f['section']) ? $f['section'] : 'main';
+ return $s === $tmp;
+ });
+ $section->setFields(array_keys($sectionFields));
+ $this->sections[$s] = $section;
+ }
+ }
+
public function setSectionOrder(array $sections):self
{
$allSections = array_map(function($section) {
@@ -674,7 +826,7 @@
$this->hideSingleHandler = new HideSingle($this->slug, $this);
}
if ($this->is_timeline) {
- $this->isTimelineHandler = new MakeTimelineType($this->slug, $this);
+ $this->isTimelineHandler = new MakeTimelineType($this->slug);
$this->registrar->hierarchical = true;
}
if ($this->is_calendar) {
@@ -702,6 +854,10 @@
}
}
+ if ($this->prefix_post_type) {
+ $this->addPostTypeRewrites();
+ }
+
if ($this->registrar) {
$this->registrar->register();
}
@@ -736,7 +892,7 @@
{
self::ensureInstanced();
$instances = ($type) ? array_filter(static::$instances, function($instance) use ($type) {
- return $instance->type === $type;
+ return $instance->type === $type && !$instance->system;
}) : static::$instances;
return array_keys($instances);
}
@@ -1007,8 +1163,8 @@
public static function ensureInstanced():void
{
if (empty(self::$instances)) {
- do_action('jvbDefineRegistrar');
- do_action('jvbDefineRegistrarFields');
+ do_action('jvb_define_registrar');
+ do_action('jvb_define_fields');
}
}
@@ -1043,7 +1199,7 @@
public static function getProfileTypes():array
{
- $hasProfiles = self::getFeatured('profile_link');
+ $hasProfiles = self::withFeature('profile_link');
if (empty($hasProfiles)) {
return [];
}
@@ -1079,4 +1235,53 @@
echo get_the_post_thumbnail($postID, 'tiny');
}
}
+
+ protected function addPostTypeRewrites():void
+ {
+ $for = $this->registrar->for;
+ foreach ($for as $type) {
+ $registrar = Registrar::getInstance($type);
+ if ($registrar) {
+ $base = $registrar->registrar->rewrite['slug']??$registrar->slug;
+
+ $prefix = empty($this->prefix_with) ? '' : '/'.$this->prefix_with;
+ $prefix = str_replace('//', '/', $prefix);
+
+ $slug = str_contains($this->slug, '_') ? str_replace('_','-', $this->slug) : $this->slug;
+ add_rewrite_rule(
+ $base.$prefix.'/'.$slug.'/([a-z0-9-]+)/?$',
+ 'index.php?post_type='.$registrar->getBased().'&'.$this->based.'=$matches[1]',
+ 'top'
+ );
+ add_rewrite_rule(
+ $base.$prefix.'/'.$slug.'/([a-z0-9-]+)/page/([0-9-]+)/?$',
+ 'index.php?post_type='.$registrar->getBased().'&'.$this->based.'=$matches[1]&paged=$matches[2]',
+ 'top'
+ );
+ }
+ }
+ }
+
+ public function getFeedFields():array
+ {
+ $config = $this->getConfig('feed');
+ $all = $this->getFields();
+ $img = $config['images']??['post_thumbnail'];
+ $f = $config['fields']??['post_title', 'post_date', 'post_excerpt'];
+
+ $f = array_filter($f, function($field) use ($img) {
+ return !in_array($field, $img);
+ });
+ $images = [];
+ $fields = [];
+
+ foreach($img as $i) {
+ $images[] = $all[$i];
+ }
+ foreach ($f as $x) {
+ $fields[] = $all[$x];
+ }
+
+ return [$images,$fields];
+ }
}
--
Gitblit v1.10.0