X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/f065f4739ae477d8877805463017f2e7b15e2db5..1900f80a9ab5fe401d6901b8e17ee82131b1170d:/article.inc.php

diff --git a/article.inc.php b/article.inc.php
index c630898..2104ef9 100644
--- a/article.inc.php
+++ b/article.inc.php
@@ -1,23 +1,9 @@
 <?php
-global $monthname;
-$monthname = ['?',
-	'januari', 'februari', 'maart', 'april', 'mei', 'juni',
-	'juli', 'augustus', 'september', 'oktober', 'november', 'december',
-];
-
-function showdate($parts)
-{
-	global $monthname;
-	return implode(' ', array_filter([
-		intval(@$parts[2]), $parts[1] > 0 ? $monthname[intval($parts[1])] : '', $parts[0],
-		count($parts) > 5 ? "$parts[3]:$parts[4]" : '',
-	]));
-}
-
 class ArchiveArticle
 {
 	public $raw, $title, $body; # file contents
 	public $meta = [];  # head metadata properties
+	public $place = []; # template variables replaced in render()
 
 	function __construct($path)
 	{
@@ -113,10 +99,6 @@ class ArchiveArticle
 	{
 		return implode('-', $this->dateparts()) . 'T12:00:00+02:00';
 	}
-	function date()
-	{
-		return showdate($this->dateparts);
-	}
 
 	function story()
 	{
@@ -184,10 +166,9 @@ class ArchiveArticle
 		$Page = clone $this;
 		$Page->handler = $Page->handler . $Page->path; // .= with explicit getter
 		$Page->path = '';
-		$Place = $GLOBALS['Place'];
 		foreach ($params as $param) {
 			if ($set = strpos($param, '=')) {
-				$Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
+				$Page->place[ substr($param, 0, $set) ] = substr($param, $set + 1);
 			}
 			elseif (!empty($param)) {
 				$Page->path .= '/'.$param;
@@ -205,11 +186,11 @@ class ArchiveArticle
 		}
 	}
 
-	function render($blocks = [])
+	function render()
 	{
-		$doc = ob_get_clean();
+		$doc = $this->raw;
 
-		if (!empty($blocks['warn'])) {
+		if (!empty($this->place['warn'])) {
 			$warn = '<p class="warn">[[warn]]</p>';
 			if ($offset = strpos($doc, '</h2>')) {
 				$doc = substr_replace($doc, "\n\n".$warn, $offset + 5, 0);
@@ -226,9 +207,9 @@ class ArchiveArticle
 
 		return preg_replace_callback(
 			'{ \[\[ ([^] ]+) ([^]]*) \]\] }x',
-			function ($sub) use ($blocks) {
+			function ($sub) {
 				list ($placeholder, $name, $params) = $sub;
-				$html = $blocks[$name] ??
+				$html = $this->place[$name] ??
 					$this->widget($name, explode(' ', $params));
 				if (empty($html) or $html[0] != '<') {
 					$html = "<span>$html</span>";