From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 17 Oct 2019 00:05:09 +0000 (+0200)
Subject: page: include partial templates from *.inc.html
X-Git-Tag: v4.1~25
X-Git-Url: http://git.shiar.net/minimedit.git/commitdiff_plain/6c50820df359e22fd0aa9da49c11708aa50f8253

page: include partial templates from *.inc.html

Rename system files to be distinguishable from public pages.
---

diff --git a/403.html b/403.inc.html
similarity index 100%
rename from 403.html
rename to 403.inc.html
diff --git a/404.html b/404.inc.html
similarity index 100%
rename from 404.html
rename to 404.inc.html
diff --git a/500.html b/500.inc.html
similarity index 100%
rename from 500.html
rename to 500.inc.html
diff --git a/article.inc.php b/article.inc.php
index a39b897..6fcb640 100644
--- a/article.inc.php
+++ b/article.inc.php
@@ -159,7 +159,7 @@ class PageSearch
 				}
 				# match **/*.html
 				return $current->isDir()
-					|| preg_match('/\.html$/', $current->getFilename());
+					|| preg_match('/(?<!\.inc)\.html$/', $current->getFilename());
 			}
 		);
 	}
diff --git a/foto/template.html b/foto/template.inc.html
similarity index 100%
rename from foto/template.html
rename to foto/template.inc.html
diff --git a/page.inc.php b/page.inc.php
index c93fcbc..577f1e0 100644
--- a/page.inc.php
+++ b/page.inc.php
@@ -5,7 +5,7 @@ include_once 'head.inc.php';
 
 print "<header>\n";
 ob_start();
-include 'menu.html';
+include 'menu.inc.html';
 ob_start();
 if ($User) {
 	print '<div class="login"><p>';
@@ -40,7 +40,7 @@ print $body;
 
 register_shutdown_function(function () {
 	print '<footer>';
-	@include 'footer.html';
+	@include 'footer.inc.html';
 	print "</footer>\n";
 
 	global $User;
diff --git a/page.php b/page.php
index c2c4282..10e90fa 100644
--- a/page.php
+++ b/page.php
@@ -86,7 +86,7 @@ function fail($error)
 	http_response_code(500);
 	include_once 'page.inc.php';
 	ob_start();
-	require_once '500.html';
+	require_once '500.inc.html';
 	print getoutput(['debug' => $error]);
 }
 
@@ -160,7 +160,7 @@ elseif (file_exists("$Page$Args/index.html")) {
 	$staticpage = "$Page$Args/index.html";
 }
 elseif ($User and $User->admin('edit')) {
-	$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
+	$staticpage = (file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
 }
 
 # load static contents
@@ -198,7 +198,7 @@ $Place += [
 if (!$found) {
 	# no resulting output
 	http_response_code(404);
-	@require '404.html';
+	@require '404.inc.html';
 }
 
 include_once 'page.inc.php';
diff --git a/template.html b/template.inc.html
similarity index 100%
rename from template.html
rename to template.inc.html