page: replace placeholders dynamically

Instead of substituting known variables, search contents for placeholders
for identical results but allowing for additional options.

diff --git a/page.php b/page.php
index 76a99b5b8aa5ede7689faa37d1e0f68b895b816e..c6eee87fbacef892ca0b21df79a97fd203de0b1c 100644 (file)
--- a/page.php
+++ b/page.php
@@ -10,14 +10,8 @@ function abort($body, $status = NULL) {
 
 function getoutput($blocks = [])
 {
-       $rep = [];
-       foreach ($blocks as $name => $html) {
-               $rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
-                       is_numeric($name) ? '' : "[[$name]]",
-                       preg_replace('{<!--[^-]*-->}', '', $html)
-               );
-       }
        $doc = ob_get_clean();
+
        if (!empty($blocks['warn'])) {
                $warn = '<p class="warn">[[warn]]</p>';
                if ($offset = strpos($doc, '</h2>')) {
@@ -27,7 +21,19 @@ function getoutput($blocks = [])
                        $doc = $warn . "\n\n" . $doc;
                }
        }
-       return str_replace(array_keys($rep), array_values($rep), $doc);
+
+       return preg_replace_callback(
+               '< \[\[ ([^]]*) \]\] >x',
+               function ($sub) use ($blocks) {
+                       list ($placeholder, $name) = $sub;
+                       $html = $blocks[$name];
+                       return sprintf('<!--BLOCK:%s-->%s<!--/-->',
+                               is_numeric($name) ? '' : $placeholder, # edit replacement
+                               preg_replace('{<!--[^-]*-->}', '', $html) # contents
+                       );
+               },
+               $doc
+       );
 }
 
 # custom error handling