Changeset 3464235

Timestamp:

02/18/2026 10:55:20 AM (3 days ago)

Author:

gkanters

Message:

Remove unwanted caching artefacts

Location:

ai-translate/trunk

Files:

• README.md (modified) (1 diff)
• includes/class-ai-ob.php (modified) (1 diff)

ai-translate/trunk/README.md

@@ -191 +191 @@
 - Fix issue with language switcher in some specific themes.
 - All enabled and detectable languages added to Wordpress sitemap (/wp-sitemap.xml) 
+- Adviced models on top per API provider.
 - Code base refactoring. Improve performance and security, thighening code.
 - Better detect usable models from OpenAI.  

ai-translate/trunk/includes/class-ai-ob.php

@@ -52 +52 @@
         } elseif (!$should_show_admin_bar && $has_admin_bar) {
             // Regular user should NOT see admin bar but it's in cached content
-            // Remove admin bar completely
-            $html = preg_replace(
-                '/<div[^>]*id=["\']wpadminbar["\'][^>]*>.*?<\/div>/s',
-                '',
-                $html
-            );
+            // Remove admin bar robustly via DOM (regex breaks on nested toolbar markup).
+            $doc = new \DOMDocument();
+            $internalErrors = libxml_use_internal_errors(true);
+            $htmlToLoad = AI_DOM::ensureUtf8((string) $html);
+            $doc->loadHTML('<?xml encoding="utf-8" ?>' . $htmlToLoad, LIBXML_HTML_NODEFDTD);
+            libxml_clear_errors();
+            libxml_use_internal_errors($internalErrors);
+
+            $xpath = new \DOMXPath($doc);
+            $adminNodes = $xpath->query('//*[@id="wpadminbar" or @id="wp-toolbar"]');
+            if ($adminNodes !== false) {
+                foreach ($adminNodes as $adminNode) {
+                    if ($adminNode->parentNode) {
+                        $adminNode->parentNode->removeChild($adminNode);
+                    }
+                }
+            }
+
+            // Remove inline adminbar style blocks from old cached variants.
+            $styleNodes = $xpath->query('//style');
+            if ($styleNodes !== false) {
+                foreach ($styleNodes as $styleNode) {
+                    $styleText = strtolower((string) $styleNode->textContent);
+                    if (strpos($styleText, '#wpadminbar') !== false ||
+                        strpos($styleText, 'body{margin-top:32px') !== false ||
+                        strpos($styleText, 'body {margin-top:32px') !== false) {
+                        if ($styleNode->parentNode) {
+                            $styleNode->parentNode->removeChild($styleNode);
+                        }
+                    }
+                }
+            }
+
+            // Also remove body/html "admin-bar" class to avoid layout offsets.
+            $bodyNodes = $xpath->query('//body');
+            if ($bodyNodes !== false) {
+                foreach ($bodyNodes as $bodyNode) {
+                    if ($bodyNode instanceof \DOMElement) {
+                        $classAttr = trim((string) $bodyNode->getAttribute('class'));
+                        if ($classAttr !== '') {
+                            $classes = preg_split('/\s+/', $classAttr);
+                            if (is_array($classes)) {
+                                $classes = array_values(array_filter($classes, function ($className) {
+                                    return $className !== 'admin-bar';
+                                }));
+                                if (!empty($classes)) {
+                                    $bodyNode->setAttribute('class', implode(' ', $classes));
+                                } else {
+                                    $bodyNode->removeAttribute('class');
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            $htmlNodes = $xpath->query('//html');
+            if ($htmlNodes !== false) {
+                foreach ($htmlNodes as $htmlNode) {
+                    if ($htmlNode instanceof \DOMElement) {
+                        $classAttr = trim((string) $htmlNode->getAttribute('class'));
+                        if ($classAttr !== '') {
+                            $classes = preg_split('/\s+/', $classAttr);
+                            if (is_array($classes)) {
+                                $classes = array_values(array_filter($classes, function ($className) {
+                                    return $className !== 'admin-bar';
+                                }));
+                                if (!empty($classes)) {
+                                    $htmlNode->setAttribute('class', implode(' ', $classes));
+                                } else {
+                                    $htmlNode->removeAttribute('class');
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            $html = $doc->saveHTML();
+            $html = preg_replace('/<\?xml[^?]*\?>\s*/i', '', $html);
         }