page: prefer named template in parent directory

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 20f8244ac0684bd973df5e6bd9a924d5e9ad8695..1f86e5b2c63fbff6d08a42be713ffba1491d028b 100644 (file)
--- a/page.php
+++ b/page.php
@@ -11,7 +11,17 @@ function getoutput($blocks = [])
                        preg_replace('{<!--[^-]*-->}', '', $html)
                );
        }
-       return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+       $doc = ob_get_clean();
+       if (!empty($blocks['warn'])) {
+               $warn = '<p class="warn">[[warn]]</p>';
+               if ($offset = strpos($doc, '</h2>')) {
+                       $doc = substr_replace($doc, "\n\n".$warn, $offset + 5, 0);
+               }
+               else {
+                       $doc = $warn . "\n\n" . $doc;
+               }
+       }
+       return str_replace(array_keys($rep), array_values($rep), $doc);
 }
 
 # custom error handling
@@ -89,12 +99,12 @@ ob_start(); # inner html
 print '<div class="static">'."\n\n";
 
 $found = FALSE;
-if (file_exists("$Page$Args/index.html")) {
-       $found = include "./$Page$Args/index.html";
-}
-elseif (file_exists("$Page$Args.html")) {
+if (file_exists("$Page$Args.html")) {
        $found = include "./$Page$Args.html";
 }
+elseif (file_exists("$Page$Args/index.html")) {
+       $found = include "./$Page$Args/index.html";
+}
 elseif (!empty($User['admin'])) {
        $found = include (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
 }