page: prepare static output before dynamic code

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 9acacc2a949a87cf39e23079615ecb71d8125e66..cb201f2f46fe32516fbdd61611a84fe0ce9cc0d2 100644 (file)
--- a/page.php
+++ b/page.php
@@ -28,44 +28,39 @@ while (TRUE) {
        }
 }
 
-# execute dynamic code
+# load static contents
 
-$prepend = $append = '';
-if ($Page) {
-       require "./$Page.php";
-       if (ob_get_level() > 1) $append  = ob_get_clean();
-       if (ob_get_level() > 0) $prepend = ob_get_clean();
+ob_start(); # page body
+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")) {
+       $found = include "./$Page$Args.html";
 }
 
-# prepare static contents
+print "</div>\n\n";
 
-include_once 'page.inc.php'; # global html
+# execute dynamic code
 
-if (file_exists("$Page$Args/index.html")) {
-       $Args .= '/index';
+if ($Page) {
+       $found |= require "./$Page.php";
 }
 
-if (!$Page and !file_exists("$Page$Args.html")) {
-       # include not found
-       $Args = '';
+# global html
+
+include_once 'page.inc.php';
+
+if (!$found) {
+       # no resulting output
        if (isset($User) and $User['admin']) {
-               $Page = 'template';
+               require './template.html';
        }
        else {
-               $Page = '404';
-               require "./$Page.php";
+               require "./404.php";
        }
 }
 
-# output prepared html
-
-print $prepend;
-
-print '<div class="static">'."\n\n";
-if (file_exists("$Page$Args.html")) {
-include "./$Page$Args.html"; # static contents
-}
-print "</div>\n\n";
-
-print $append;
-