From 48721c85ebcfa973ee81719d2467ca80e4253dc9 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 01 May 2026 17:30:03 +0000
Subject: [PATCH] =Edmonton Ink hard test begins! Real testing of the managers and reset routes will commence. So far, just ensuring our classes are all loaded correctly: Site() and its sub-classes Membership, Login, etc. Care should be taken to load conditionally on 'init', as we finish defining most settings by 'plugins_loaded' at priority 5
---
inc/blocks/CustomBlocks.php | 95 ++++++++++++++++++++++-------------------------
1 files changed, 44 insertions(+), 51 deletions(-)
diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index f0c0f9d..c68cdb5 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -4,6 +4,7 @@
use DateTime;
use DOMDocument;
use JVBase\managers\Cache;
+use JVBase\managers\SEO\BreadcrumbManager;
use WP_Block;
use WP_Query;
@@ -18,7 +19,7 @@
{
$this->cache = Cache::for('blocks', WEEK_IN_SECONDS);
$this->cache->connect('post')->connect('taxonomy');
- add_filter('render_block', [$this, 'render'], 900, 3);
+ add_filter('render_block', [$this, 'render'], 900, 2);
add_action('init', [$this, 'registerBlockStyles']);
}
@@ -64,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;
@@ -344,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.'>';
@@ -490,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']);
@@ -498,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));
@@ -818,6 +820,7 @@
if (($isHeaderTemplate || $isFooterTemplate)) {
+ $innerContent = $content;
$tag = $isHeaderTemplate ?: $isFooterTemplate ?: 'div';
@@ -836,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 !== '') {
@@ -851,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;
}
@@ -929,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
--
Gitblit v1.10.0