From 9bbeea742424837fb58207d88e10dbca0b2cae04 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 03 May 2026 22:04:17 +0000
Subject: [PATCH] =SEO Field registration and formatting
---
inc/blocks/CustomBlocks.php | 140 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 71 deletions(-)
diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index f83b57d..c68cdb5 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -3,7 +3,8 @@
use DateTime;
use DOMDocument;
-use JVBase\managers\CacheManager;
+use JVBase\managers\Cache;
+use JVBase\managers\SEO\BreadcrumbManager;
use WP_Block;
use WP_Query;
@@ -13,11 +14,12 @@
class CustomBlocks
{
- protected CacheManager $cache;
+ protected Cache $cache;
public function __construct()
{
- $this->cache = CacheManager::for('blocks', WEEK_IN_SECONDS);
- add_filter('render_block', [$this, 'render'], 999, 3);
+ $this->cache = Cache::for('blocks', WEEK_IN_SECONDS);
+ $this->cache->connect('post')->connect('taxonomy');
+ add_filter('render_block', [$this, 'render'], 900, 2);
add_action('init', [$this, 'registerBlockStyles']);
}
@@ -63,7 +65,7 @@
);
}
- public function render(string $content, array $block, WP_Block $instance)
+ public function render(string $content, array $block)
{
$blockName = $this->sanitizeBlockName($block);
$method = 'render_'.$blockName;
@@ -72,16 +74,16 @@
if (function_exists($function)) {
return $function($block, $content);
// return $this->cache->remember(
-// $block,
+// get_the_ID(),
// function () use ($function, $block, $content) {
// return $function($block, $content);
// }
// );
} else if (method_exists($this, $method)) {
return $this->$method($block, $content);
-
+//
// return $this->cache->remember(
-// $block,
+// get_the_ID(),
// function () use ($method, $block, $content) {
// return $this->$method($block, $content);
// }
@@ -343,7 +345,7 @@
'</h'.$level.'>';
}
- public function render_core_list(array $block):string
+ public function render_core_list(array $block, string $content):string
{
$tag = (array_key_exists('ordered', $block['attrs'])) ? 'ol' : 'ul';
return '<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.$this->innerBlocks($block).'</'.$tag.'>';
@@ -397,7 +399,7 @@
if ($cite !== '') {
$content = $this->stripTagContents('cite', $content);
}
- $content = apply_filters('the_content', $content);
+ $content = jvb_filter_content( $content);
return '<blockquote'.$this->getClassesAndStyles($block['attrs'], ['pull']).'>'.
$content.
@@ -489,7 +491,7 @@
aria-expanded="false">'.
jvbIcon('list', ['title'=>'Toggle Menu']).
jvbIcon('x', ['title'=>'Toggle Menu']).
- '</button>';
+ '</button>';
$class = ($toggle === '') ?
$this->getClassesAndStyles($block['attrs'], ['mobile']) :
$this->getClassesAndStyles($block['attrs']);
@@ -497,6 +499,7 @@
'<nav><ul>'.jvbNotificationMenu().jvbHelpMenu().'</ul></nav>' :
'';
+
//Allows to add custom items to a menu, based on the menu name
$helpmenu = apply_filters('jvbMenuExtraAfter', $helpmenu, get_the_title($ID));
$main = trim(apply_filters('jvbMenuExtra', $this->innerBlocks($block), get_the_title($ID), $block));
@@ -612,13 +615,19 @@
'main';
if ($content == '') {
- global $post;
+ if(is_singular()) {
+ global $post;
- $block['innerBlocks'] = parse_blocks($post->post_content);
- return $this->innerBlocks($block);
+ $block['innerBlocks'] = parse_blocks($post->post_content);
+ $result = $this->innerBlocks($block);
+ }else {
+ $result = '';
+ }
} else {
- return $this->inside($block, $tag, $content);
+ $result = $this->inside($block, $tag, $content);
}
+
+ return apply_filters('jvb_post_content_output', $result, $block);
}
//core_post_date
public function render_core_post_date(array $block):string
@@ -632,14 +641,14 @@
global $post;
$ID = get_post_thumbnail_id($post->ID);
$aOpen = $aClose = '';
- if(!is_single($ID)) {
+ if(!is_single($post->ID)) {
$aOpen = '<a href="'.get_the_permalink($post->ID).'">';
$aClose = '</a>';
}
- return $aOpen.'<figure'.$this->getClassesAndStyles($block['attrs']).'>'.
+ return '<figure'.$this->getClassesAndStyles($block['attrs']).'>'.$aOpen.
apply_filters('jvbCoreFeaturedImage', $this->image($ID), $post->post_type).
- '</figure>'.$aClose;
+ $aClose.'</figure>';
}
//core_post_navigation_link
//core_post_template
@@ -654,7 +663,7 @@
$out .= '<li>'.$block['attrs']['prefix'].'</li>';
}
foreach($terms as $term) {
- $out .= '<li><a href="'.get_term_link($term).'" rel="tag">'.$term->name.'</a></li>';
+ $out .= '<li><a href="'.get_term_link($term).'" rel="tag">'.html_entity_decode($term->name).'</a></li>';
}
if (array_key_exists('suffix', $block['attrs'])) {
$out .= '<li>'.$block['attrs']['suffix'].'</li>';
@@ -811,6 +820,7 @@
if (($isHeaderTemplate || $isFooterTemplate)) {
+ $innerContent = $content;
$tag = $isHeaderTemplate ?: $isFooterTemplate ?: 'div';
@@ -829,7 +839,7 @@
jvbIcon('sun-dim', ['title'=> 'Light Mode']).
jvbIcon('moon', ['title'=>'Dark Mode']).
'</span></label>' : '';
- $breadcrumbs = jvbBuildBreadcrumbs();
+ $breadcrumbs = BreadcrumbManager::getInstance()->renderNavigation();
$afterHeader = apply_filters('jvbBelowHeader', $afterHeader);
if ($afterHeader !== '') {
@@ -844,17 +854,12 @@
}
$footerText = jvbRandomFooterText();
}
-// jvbDump($beforeHeader,'beforeHeader');
-// jvbDump('<'.$tag.$this->getClassesAndStyles($block['attrs']).'>','tag');
-// jvbDump($themeSwitch,'themeSwitch');
-// jvbDump($this->inside($block, $tag, $content),'inside');
-// jvbDump($footerText,'footerText');
-// jvbDump($afterHeader, 'afterheader');
-// jvbDump($breadcrumbs, 'breadcrumbs');
- return $beforeHeader.'<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.
+ $content = $beforeHeader.'<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.
$themeSwitch .
- $this->inside($block, $tag, $content) .
+ $this->inside($block, false, $innerContent).
+// $this->innerBlocks($block).
+// $innerContent.
$footerText.'</'.$tag.'>'.$afterHeader.$breadcrumbs;
}
@@ -922,51 +927,46 @@
{
$content = '';
foreach ($block['innerBlocks'] as $b) {
- $method = 'render_'.$this->sanitizeBlockName($b);
- $function = BASE.$method;
-
- $content .= $before;
- if (function_exists($function)) {
- $content .= $function($b, '');
- } else if (method_exists($this, $method)) {
- $content .= $this->$method($b, '');
- } else {
- $content .= render_block($b);
- }
- $content .= $after;
+ $content .= $this->render('', $b);
}
return $content;
}
- public function inside(array $block, mixed $tag = false, mixed $o = false):string
- {
- if (!$o) {
- $o = trim($block['innerHTML']);
- }
- if (!$tag) {
- //check to see if there was one dynamically set first
- $tag = (array_key_exists('tagName', $block['attrs'])) ? $block['attrs']['tagName'] : '';
- $tag = ($tag == '') ? str_replace('<', '', strtok($o, '>')) : '';
- $tag = (str_contains($tag, ' class')) ? strtok($tag, ' class') : $tag;
- $tag = trim($tag);
- }
- if (!str_starts_with($o, '<'.$tag)) {
+ public function inside(array $block, mixed $tag = false, mixed $o = false): string
+ {
+ if (!$o) {
+ $o = trim($block['innerHTML']);
+ }
+
+ $dom = new \DOMDocument();
+
+ @$dom->loadHTML('<?xml encoding="utf-8"?>' . $o, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+
+ // Find the real outermost element
+ $root = null;
+ foreach ($dom->childNodes as $node) {
+ if ($node->nodeType === XML_ELEMENT_NODE) {
+ $root = $node;
+ break;
+ }
+ }
+
+ if (!$root) {
return $o;
}
- $len = strlen('</'.$tag.'>');
+ // Only enforce tag match if explicitly provided
+ if ($tag && strtolower($root->nodeName) !== strtolower($tag)) {
+ return $o;
+ }
- return substr_replace(
- str_replace(
- strtok($o, '>').'>',
- ' ',
- $o
- ),
- '',
- -$len,
- $len
- );
- }
+ $inner = '';
+ foreach ($root->childNodes as $child) {
+ $inner .= $dom->saveHTML($child);
+ }
+
+ return trim($inner);
+ }
/**
* Extract content from a specific nested element
@@ -1165,11 +1165,9 @@
$classes[] = $class;
}
}
- $classes = array_filter($classes, function ($class) {
- return $class!=='' && !str_starts_with($class, 'wp');
- });
-
- return $classes;
+ return array_filter($classes, function ($class) {
+ return $class!=='' && !str_starts_with($class, 'wp');
+ });
}
protected function getClass(string $key, string|bool|array|int $value, array $attrs):string|array
{
--
Gitblit v1.10.0