From 11c30da0ff491c29301ec1a42e7873d556364c74 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 3 Sep 2018 21:38:07 +0200
Subject: [PATCH] page: separate function to run placeholder includes

---
 nieuws/index.php |  2 +-
 page.php         | 55 +++++++++++++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/nieuws/index.php b/nieuws/index.php
index cdb3892..b4191ce 100644
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -13,7 +13,7 @@ if ($page and !is_numeric($page)) {
 		$Place['image'] = "https://lijtweg.nl/".$article->thumb('600x');
 	}
 	if ($replyform) {
-		include 'nieuws/replies.php';
+		print placeholder_include('nieuws/replies');
 	}
 	return 1;
 }
diff --git a/page.php b/page.php
index 8979e62..dd629fd 100644
--- a/page.php
+++ b/page.php
@@ -8,6 +8,36 @@ function abort($body, $status = NULL) {
 	exit;
 }
 
+function placeholder_include($name, $params = [])
+{
+	$path = "$name.php";
+	if (!file_exists($path)) {
+		return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+	}
+
+	ob_start();
+	$Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+	$Args = '';
+	$Place = $GLOBALS['Place'];
+	foreach ($params as $param) {
+		if ($set = strpos($param, '=')) {
+			$Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
+		}
+		elseif (!empty($param)) {
+			$Args .= '/'.$param;
+		}
+	}
+	try {
+		include "$name.php";
+		return ob_get_clean();
+	}
+	catch (Exception $e) {
+		return sprintf('<strong class="warn">%s</strong>',
+			"fout in <em>$name</em>: {$e->getMessage()}"
+		);
+	}
+}
+
 function getoutput($blocks = [])
 {
 	$doc = ob_get_clean();
@@ -29,31 +59,8 @@ function getoutput($blocks = [])
 			if (isset($blocks[$name])) {
 				$html = $blocks[$name];
 			}
-			elseif (file_exists("$name.php")) {
-				ob_start();
-				$Page = $GLOBALS['Page'] . $GLOBALS['Args'];
-				$Args = '';
-				$Place = $GLOBALS['Place'];
-				foreach (explode(' ', $params) as $param) {
-					if ($set = strpos($param, '=')) {
-						$Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
-					}
-					elseif (!empty($param)) {
-						$Args .= '/'.$param;
-					}
-				}
-				try {
-					include "$name.php";
-					$html = ob_get_clean();
-				}
-				catch (Exception $e) {
-					$html = sprintf('<strong class="warn">%s</strong>',
-						"fout in <em>$name</em>: {$e->getMessage()}"
-					);
-				}
-			}
 			else {
-				$html = '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+				$html = placeholder_include($name, explode(' ', $params));
 			}
 			return sprintf('<!--BLOCK:%s-->%s<!--/-->',
 				is_numeric($name) ? '' : $placeholder, # edit replacement
-- 
2.30.0