From 235ce5716edc2f7cbe80fdccf26eac7269587839 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 08 Jun 2026 04:38:18 +0000
Subject: [PATCH] =FavouritesManager.php and FavouritesRoutes.php fixes. Moving all logic to FavouritesManager.php. Still some left to do
---
inc/registrar/Registrar.php | 114 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 16 deletions(-)
diff --git a/inc/registrar/Registrar.php b/inc/registrar/Registrar.php
index 88668ec..8b4b57f 100644
--- a/inc/registrar/Registrar.php
+++ b/inc/registrar/Registrar.php
@@ -52,6 +52,8 @@
public bool $prefix_post_type = false;
public string $prefix_with = 'by';
+ public bool $system = false;
+
protected static array $allFlags = [
//Shared Flags
'favouritable', 'karma', 'show_feed', 'show_directory', 'approve_new', 'has_responses', 'invitable',
@@ -60,7 +62,9 @@
//Taxonomy Flags
'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
@@ -244,7 +248,7 @@
$features = ['hide_single', 'is_timeline'];
foreach ($features as $feature) {
- foreach (self::getFeatured($feature) as $instance) {
+ foreach (self::withFeature($feature) as $instance) {
$instance = self::getInstance($instance);
$cache = Cache::for('tsf')->connect($instance->getType());
$cache->flush();
@@ -464,8 +468,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
{
@@ -558,6 +563,24 @@
}
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);
@@ -582,8 +605,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)) {
@@ -592,13 +627,30 @@
}
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'];
@@ -621,7 +673,7 @@
protected function getBreadcrumbs():Breadcrumbs
{
if (!isset($this->breadcrumbs)) {
- $this->breadcrumbs = new Breadcrumbs($this->slug, $this);
+ $this->breadcrumbs = new Breadcrumbs($this->slug);
}
return $this->breadcrumbs;
@@ -639,7 +691,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;
@@ -672,9 +724,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;
}
@@ -682,11 +735,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) {
@@ -734,7 +816,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) {
@@ -800,7 +882,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);
}
@@ -1071,8 +1153,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');
}
}
@@ -1107,7 +1189,7 @@
public static function getProfileTypes():array
{
- $hasProfiles = self::getFeatured('profile_link');
+ $hasProfiles = self::withFeature('profile_link');
if (empty($hasProfiles)) {
return [];
}
--
Gitblit v1.10.0