From 9f672be1f7bb5f8462374ca4732d095d4f24685b Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 29 Mar 2026 23:11:13 +0000
Subject: [PATCH] =minor fixes upon uploading to server
---
inc/managers/SEO/BreadcrumbManager.php | 103 ++++++++++++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 46 deletions(-)
diff --git a/inc/managers/SEO/BreadcrumbManager.php b/inc/managers/SEO/BreadcrumbManager.php
index 0a23c5c..8d3288e 100644
--- a/inc/managers/SEO/BreadcrumbManager.php
+++ b/inc/managers/SEO/BreadcrumbManager.php
@@ -1,7 +1,8 @@
<?php
namespace JVBase\managers\SEO;
-use JVBase\managers\CacheManager;
+use JVBase\managers\Cache;
+use JVBase\registrar\Registrar;
use JVBase\utility\Features;
use WP_Post;
use WP_Term;
@@ -18,14 +19,15 @@
*/
class BreadcrumbManager
{
- private CacheManager $cache;
+ private Cache $cache;
private static ?self $instance = null;
private function __construct()
{
- $this->cache = CacheManager::for('breadcrumbs', MONTH_IN_SECONDS)->connectTo('all');
+ $this->cache = Cache::for('breadcrumbs', MONTH_IN_SECONDS)->connect('post')->connect('taxonomy')->connect('user');
+ $this->cache->flush();
if (JVB_TESTING) {
- $this->cache->clear();
+ $this->cache->flush();
}
}
@@ -65,16 +67,13 @@
break;
}
- $crumbs = $this->cache->get($key);
- if ($crumbs !== false) {
- return $crumbs;
- }
-
- $crumbs = $this->buildCrumbs();
- $crumbs = apply_filters('jvbBreadcrumbs',$crumbs);
- $this->cache->set($key, $crumbs);
-
- return $crumbs;
+ return $this->cache->remember(
+ $key,
+ function() {
+ $crumbs = $this->buildCrumbs();
+ return apply_filters('jvbBreadcrumbs',$crumbs);
+ }
+ );
}
/**
@@ -86,7 +85,7 @@
// Always start with home
$crumbs[] = [
- 'name' => 'Home',
+ 'name' => get_bloginfo('name'),
'icon' => jvbIcon('house'),
'url' => get_home_url(),
];
@@ -111,23 +110,27 @@
private function addTaxonomyCrumbs(array $crumbs, WP_Term $term): array
{
$tax = jvbNoBase($term->taxonomy);
- $config = Features::getConfig($tax, 'term');
-
+ $registrar = Registrar::getInstance($tax);
// Add parent content archive if taxonomy is for single content type
- if (count($config['for_content']) === 1) {
- $contentConfig = JVB_CONTENT[$config['for_content'][0]];
- $crumbs[] = [
- 'name' => $contentConfig['breadcrumb'] ?? $contentConfig['plural'],
- 'url' => get_post_type_archive_link(jvbCheckBase($config['for_content'][0])),
- ];
- $crumbs[] = [
- 'name' => 'By ' . $config['singular'],
- 'url' => false,
- ];
+ if ($registrar) {
+ if (count($registrar->registrar->for) === 1){
+ $content = is_array($registrar->registrar->for) ? $registrar->registrar->for[0] : $registrar->registrar->for;
+ $contentRegistrar = Registrar::getInstance($content);
+
+ $crumbs[] = [
+ 'name' => $contentRegistrar->getConfig('breadcrumbs')['title']??$contentRegistrar->getPlural(),
+ 'url' => get_post_type_archive_link(jvbCheckBase($content)),
+ ];
+ $crumbs[] = [
+ 'name' => 'By ' . $registrar->getSingular(),
+ 'url' => false,
+ ];
+ }
}
+
// Add directory if exists
- if (Features::forTaxonomy($tax)->has('directory')) {
+ if ($registrar && $registrar->hasFeature('directory')) {
$directory = JVB()->directories()?->directories($tax);
$crumbs[] = [
'name' => $directory['title'],
@@ -146,8 +149,12 @@
{
// Add directory if exists
$content = jvbNoBase($post->post_type);
- if(Features::forContent($content)->has('show_directory')) {
- $directory = JVB()->directories()->getDirectoryList()[$content]??[];
+ $registrar = Registrar::getInstance($content);
+ if ($registrar){
+ $crumbConfig = $registrar->getConfig('breadcrumbs');
+ }
+ if($registrar && $registrar->hasFeature('show_directory')) {
+ $directory = JVB()->directories()?->directories($content)??[];
if (!empty($directory)) {
$crumbs[] = [
'name' => $directory['title'],
@@ -157,7 +164,7 @@
}
// Handle directory posts specially
- if (JVB()->directories()->isDirectory()) {
+ if (JVB()->directories() && JVB()->directories()->isDirectory()) {
$pos = jvbGetDirectoryInfo();
if (!empty($pos)) {
// Special case for map
@@ -174,9 +181,9 @@
];
}
} else {
- $name = jvbNoBase($post->post_type);
- if (Features::forContent($name)->has('addCrumb')) {
- $this->addTaxToCrumbs($crumbs, JVB_CONTENT[$name]['addCrumb']);
+
+ if ($registrar && !empty($crumbConfig['addCrumb'])) {
+ $crumbs = $this->addTaxToCrumbs($crumbs, $crumbConfig['addCrumb']);
}
// Add post hierarchy
$crumbs = array_merge($crumbs, $this->buildPostHierarchy($post));
@@ -193,14 +200,16 @@
$type = is_singular() ? $obj->post_type : $obj->name;
$name = jvbNoBase($type);
+ $registrar = Registrar::getInstance($name);
if (Features::forSite()->has('is_directory') && $name === 'directory') {
$crumbs[] = [
'name' => JVB()->directories()->referAs(true),
'url' => get_post_type_archive_link($type)
];
- } elseif ((is_post_type_archive() || !Features::forContent($name)->has('show_directory')) && array_key_exists($name, JVB_CONTENT)) {
+ } elseif (is_post_type_archive() && $registrar && $registrar->hasFeature('show_directory')) {
+
$crumbs[] = [
- 'name' => JVB_CONTENT[$name]['breadcrumb'] ?? JVB_CONTENT[$name]['plural'],
+ 'name' => $registrar->getConfig('breadcrumb')['title'] ?? $registrar->getPlural(),
'url' => get_post_type_archive_link($type)
];
}
@@ -215,7 +224,7 @@
{
$url = get_term_link($term->term_id);
array_unshift($crumbs, [
- 'name' => $term->name,
+ 'name' => html_entity_decode($term->name),
'url' => $url,
'id' => $term->term_id,
]);
@@ -320,17 +329,19 @@
$items = [];
$position = 1;
+ global $wp;
+ $current = home_url( add_query_arg( $_GET, $wp->request ) );
foreach ($crumbs as $crumb) {
// Schema requires a URL
if ($crumb['url'] === false) {
- $crumb['url'] = get_permalink();
+ $crumb['url'] = $current;
}
$items[] = [
- '@type' => 'ListItem',
- 'position' => $position,
- 'name' => $crumb['name'],
- 'item' => $crumb['url'],
+ '@type' => 'ListItem',
+ '@id' => $crumb['url'],
+ 'position' => $position,
+ 'name' => $crumb['name'],
];
$position++;
@@ -338,7 +349,7 @@
return [
'@type' => 'BreadcrumbList',
- '@id' => get_permalink() . '/#breadcrumbs',
+ '@id' => $current . '/#breadcrumbs',
'itemListElement' => $items
];
}
@@ -349,9 +360,9 @@
public function invalidateCache(?int $objectId = null): void
{
if ($objectId) {
- $this->cache->delete($objectId);
+ $this->cache->forget($objectId);
} else {
- $this->cache->clear();
+ $this->cache->flush();
}
}
@@ -374,7 +385,7 @@
}
}
$crumbs[] = [
- 'name' => $term->name,
+ 'name' => html_entity_decode($term->name),
'url' => get_term_link($term, $taxonomy)
];
}
--
Gitblit v1.10.0