From 93c26075445bdd20313128d157c78e3fd8981585 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Thu, 1 Dec 2022 00:41:34 +0100
Subject: [PATCH] use anonymous function

---
 _prepend.php | 31 ++++++++++++++++++-
 _public.php  | 84 +++++++++-------------------------------------------
 2 files changed, 44 insertions(+), 71 deletions(-)

diff --git a/_prepend.php b/_prepend.php
index a6ddde9..74aeb29 100644
--- a/_prepend.php
+++ b/_prepend.php
@@ -45,5 +45,34 @@ dcCore::app()->url->register(
     'epccss',
     'epc.css',
     '^epc\.css',
-    ['publicEnhancePostContent', 'css']
+    function($args)
+    {
+        $css     = [];
+        $filters = libEPC::getFilters();
+
+        foreach ($filters as $id => $filter) {
+            if ('' == $filter->class || '' == $filter->style) {
+                continue;
+            }
+
+            $res = '';
+            foreach ($filter->class as $k => $class) {
+                $styles = $filter->style;
+                $style  = html::escapeHTML(trim($styles[$k]));
+                if ('' != $style) {
+                    $res .= $class . ' {' . $style . '} ';
+                }
+            }
+
+            if (!empty($res)) {
+                $css[] = '/* CSS for enhancePostContent ' . $id . " */ \n" . $res . "\n";
+            }
+        }
+
+        header('Content-Type: text/css; charset=UTF-8');
+
+        echo implode("\n", $css);
+
+        exit;
+    }
 );
diff --git a/_public.php b/_public.php
index 839055c..fd4420d 100644
--- a/_public.php
+++ b/_public.php
@@ -18,78 +18,22 @@ require __DIR__ . '/_widgets.php';
 
 dcCore::app()->blog->settings->addNamespace('enhancePostContent');
 
-if (dcCore::app()->blog->settings->enhancePostContent->enhancePostContent_active) {
-    dcCore::app()->addBehavior(
-        'publicHeadContentV2',
-        ['publicEnhancePostContent', 'publicHeadContent']
-    );
-    dcCore::app()->addBehavior(
-        'publicBeforeContentFilterV2',
-        ['publicEnhancePostContent', 'publicContentFilter']
-    );
+if (!dcCore::app()->blog->settings->enhancePostContent->enhancePostContent_active) {
+    return null;
 }
 
-/**
- * @ingroup DC_PLUGIN_ENHANCEPOSTCONTENT
- * @brief Filter posts content - public methods.
- * @since 2.6
- */
-class publicEnhancePostContent
-{
-    /**
-     * Add filters CSS to page header
-     */
-    public static function publicHeadContent()
-    {
-        echo dcUtils::cssLoad(dcCore::app()->blog->url . dcCore::app()->url->getURLFor('epccss'));
-    }
+// Add filters CSS to page header
+dcCore::app()->addBehavior('publicHeadContent', function() {
+    echo dcUtils::cssLoad(dcCore::app()->blog->url . dcCore::app()->url->getURLFor('epccss'));
+});
+// Filter template blocks content
+dcCore::app()->addBehavior('publicBeforeContentFilterV2', function($tag, $args) {
+    $filters = libEPC::getFilters();
 
-    public static function css($args)
-    {
-        $css     = [];
-        $filters = libEPC::getFilters();
-
-        foreach ($filters as $id => $filter) {
-            if ('' == $filter->class || '' == $filter->style) {
-                continue;
-            }
-
-            $res = '';
-            foreach ($filter->class as $k => $class) {
-                $styles = $filter->style;
-                $style  = html::escapeHTML(trim($styles[$k]));
-                if ('' != $style) {
-                    $res .= $class . ' {' . $style . '} ';
-                }
-            }
-
-            if (!empty($res)) {
-                $css[] = '/* CSS for enhancePostContent ' . $id . " */ \n" . $res . "\n";
-            }
+    foreach ($filters as $id => $filter) {
+        if (!libEPC::testContext($tag, $args, $filter)) {
+            continue;
         }
-
-        header('Content-Type: text/css; charset=UTF-8');
-
-        echo implode("\n", $css);
-
-        exit;
+        $filter->publicContent($tag, $args);
     }
-
-    /**
-     * Filter template blocks content
-     *
-     * @param  string $tag  Tempalte block name
-     * @param  array  $args Tempalte Block arguments
-     */
-    public static function publicContentFilter($tag, $args)
-    {
-        $filters = libEPC::getFilters();
-
-        foreach ($filters as $id => $filter) {
-            if (!libEPC::testContext($tag, $args, $filter)) {
-                continue;
-            }
-            $filter->publicContent($tag, $args);
-        }
-    }
-}
+});