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/managers/SEO/BreadcrumbManager.php | 79 ++++++++++++++++++++++++++-------------
1 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/inc/managers/SEO/BreadcrumbManager.php b/inc/managers/SEO/BreadcrumbManager.php
index 5f7f0c6..41f82ac 100644
--- a/inc/managers/SEO/BreadcrumbManager.php
+++ b/inc/managers/SEO/BreadcrumbManager.php
@@ -25,10 +25,10 @@
private function __construct()
{
$this->cache = Cache::for('breadcrumbs', MONTH_IN_SECONDS)->connect('post')->connect('taxonomy')->connect('user');
- $this->cache->flush();
if (JVB_TESTING) {
$this->cache->flush();
}
+ $this->cache->flush();
}
public static function getInstance(): self
@@ -50,17 +50,23 @@
return [];
}
+
switch (true) {
+
case is_singular():
$key = get_queried_object_id();
break;
+ case is_tax():
+ $obj = get_queried_object();
+ $key = $obj->taxonomy;
+ break;
case is_post_type_archive():
$obj = get_queried_object();
$key = $obj->name;
break;
- case is_tax():
+ case is_home():
$obj = get_queried_object();
- $key = $obj->taxonomy;
+ $key = $obj->post_type;
break;
default:
$key = 'home';
@@ -93,7 +99,7 @@
$obj = get_queried_object();
if (is_tax()) {
$crumbs = $this->addTaxonomyCrumbs($crumbs, $obj);
- } elseif (is_singular()) {
+ } elseif (is_singular() || is_home()) {
$crumbs = $this->addArchiveCrumbs($crumbs, $obj);
$hierarchy = $this->addSingularCrumbs($crumbs, $obj);
$crumbs = $crumbs + $hierarchy;
@@ -117,10 +123,20 @@
$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)),
- ];
+ if($contentRegistrar && $contentRegistrar->hasFeature('show_directory')) {
+ $directory = JVB()->directories();
+ if ($directory && !empty($directory->directories($content)??[])){
+ $crumbs[] = [
+ 'name' => $directory->directories($content)['title'],
+ 'url' =>$directory->directories($content)['url']
+ ];
+ }
+ } else {
+ $crumbs[] = [
+ 'name' => $contentRegistrar->getConfig('breadcrumbs')['title']??$contentRegistrar->getPlural(),
+ 'url' => get_post_type_archive_link(jvbCheckBase($content)),
+ ];
+ }
// $crumbs[] = [
// 'name' => 'By ' . $registrar->getSingular(),
// 'url' => false,
@@ -130,12 +146,12 @@
// Add directory if exists
- if ($registrar && $registrar->hasFeature('directory')) {
+ if ($registrar && $registrar->hasFeature('show_directory')) {
$directory = JVB()->directories();
- if ($directory && !empty($directory->directories($tax))) {
+ if ($directory && !empty($directory->directories($tax)??[])) {
$crumbs[] = [
- 'name' => $directory['title'],
- 'url' => $directory['url']
+ 'name' => $directory->directories($tax)['title'],
+ 'url' =>$directory->directories($tax)['url']
];
}
}
@@ -157,16 +173,6 @@
$crumbConfig = $registrar->getConfig('breadcrumbs');
}
- if($registrar && $registrar->hasFeature('show_directory')) {
- $directory = JVB()->directories();
- if ($directory && !empty($directory->directories($content)??[])){
- $crumbs[] = [
- 'name' => $directory->directories($content)['title'],
- 'url' =>$directory->directories($content)['url']
- ];
- }
- }
-
// Handle directory posts specially
if (JVB()->directories() && JVB()->directories()->isDirectory()) {
$pos = jvbGetDirectoryInfo();
@@ -201,20 +207,39 @@
*/
private function addArchiveCrumbs(array $crumbs, object $obj): array
{
+ if (is_singular('page') || is_home()) {
+ return $crumbs;
+ }
$type = is_singular() ? $obj->post_type : $obj->name;
$name = jvbNoBase($type);
$registrar = Registrar::getInstance($name);
- if (Site::has('is_directory') && $name === 'directory') {
+
+ if($registrar && $registrar->hasFeature('show_directory') && JVB()->directories()) {
+ $directory = JVB()->directories();
+
+ if ($directory && !empty($directory->directories($name)??[])){
+ $crumbs[] = [
+ 'name' => $directory->directories($name)['title'],
+ 'url' =>$directory->directories($name)['url']
+ ];
+ }
+ } elseif (Site::has('is_directory') && $name === 'directory') {
+
$crumbs[] = [
'name' => JVB()->directories()->referAs(true),
'url' => get_post_type_archive_link($type)
];
- } elseif (is_post_type_archive() && $registrar && $registrar->hasFeature('show_directory')) {
-
+ } elseif ($registrar) {
$crumbs[] = [
- 'name' => $registrar->getConfig('breadcrumbs')['title'] ?? $registrar->getPlural(),
- 'url' => get_post_type_archive_link($type)
+ 'name' => $registrar->getConfig('breadcrumbs')['title'] ?? $registrar->getPlural(),
+ 'url' => get_post_type_archive_link($type)
+ ];
+ } else {
+ $postTypeObject = get_post_type_object($type);
+ $crumbs[] = [
+ 'name' => $postTypeObject->label,
+ 'url' => get_post_type_archive_link($type)
];
}
--
Gitblit v1.10.0