X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/3080864c4cd697bd083f9fd0315f0ffababd593d..v3.8-15-g628a397729:/nieuws/index.php

diff --git a/nieuws/index.php b/nieuws/index.php
index 8a613c2..71048d5 100644
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -4,72 +4,53 @@ include 'nieuws.inc.php';
 $replyform = $Page == 'melding' && !empty($User);
 @list ($year, $page) = explode('/', trim($Args, '/'));
 
+if (!empty($User['admin'])) {
+	print '<script src="/nieuws/edit.js"></script>'."\n";
+}
+
 if ($page and !is_numeric($page)) {
 	$edit = !empty($User['admin']) ? htmlspecialchars(@$_GET['edit']) : NULL;
 	$article = new ArchiveArticle("$Page$Args.html");
+	$Place['title'] = $edit ?: $article->title;
+	$Place['description'] = $article->teaser;
 	$Place[1] = ' <small class="date">'.$article->date.'</small>';
 	print preg_replace('{(?<=<h2>)(.*?)(?=</h2>)}', ($edit ?: '\1').' [[1]]', ob_get_clean());
-	if ($article->image) {
-		$Place['image'] = "https://lijtweg.nl/".$article->thumb('600x');
-		printf('<p><img src="/%s" /></p>'."\n", $article->thumb('640x'));
+	if ($article->file and $article->image) {
+		$Place['image'] = "/".$article->thumb('600x');
 	}
-
-	if ($replyform) {
-		print '<h3>Reacties</h3>'."\n";
-		$pagelink = $Page.$Args;
-
-		if ($_POST) {
-			try {
-				@mkdir($pagelink);
-				$target = $pagelink.'/'.date('YmdHis').':'.$User['name'].'.txt';
-				$written = file_put_contents($target, $_POST['reply']);
-				if ($written === FALSE) {
-					throw new Exception('Fout bij opslaan');
-				}
-				$_POST['reply'] = NULL;
-			}
-			catch (Exception $e) {
-				print '<p class=warn>Antwoord niet opgeslagen.</p>'."\n\n";
-			}
+	if (!empty($User['admin'])) {
+		$taglist = [];
+		foreach (glob("$Page/.tags/*") as $tagpath) {
+			$tagname = pathinfo($tagpath, PATHINFO_BASENAME);
+			$tagvalue = file_exists("$tagpath/$year-$page.html");
+			$tagtarget = is_writable($tagpath);
+			$taglist[] = sprintf(
+				'<input type="checkbox" name="%s" value="%s" id="%s"%s%s />' .
+				'<label for="%3$s"> %s</label>',
+				"tags[$tagname]", $tagname, "tag-$tagname",
+				$tagvalue ? ' checked' : '',
+				' disabled',
+				ucfirst($tagname)
+			);
 		}
-
-		print '<ul class="replies">';
-
-		foreach (glob("$pagelink/*.txt") as $reply) {
-			preg_match('</(\d{2,14}) : ([^:]*) [^/]* \.txt$>x', $reply, $replymeta);
-			if (!$replymeta) continue;
-			$replydate = str_split($replymeta[1], 2);
-			$replydate[1] = $replydate[0] . $replydate[1];
-			print '<li>';
-			printf('<strong>%s</strong> <small class=date>%s</small>',
-				$replymeta[2], showdate($replydate)
+		if ($taglist) {
+			printf('<p class="tags"><strong>Tags:</strong> %s</p>'."\n",
+				implode("\n\t", $taglist)
 			);
-			$replydata = file_get_contents($reply);
-			printf('<p>%s</p>', nl2br(htmlspecialchars($replydata)));
-			print "</li>\n";
 		}
-
-		print '<li>';
-		print '<form method="post" action="">';
-		printf('<textarea id="%s" name="%1$s" cols=60 rows=3 placeholder="%s">%s</textarea>'."\n",
-			'reply',
-			"Bericht van {$User['name']}",
-			''
-		);
-		print '<input type="submit" value="Plaatsen" />'."\n";
-		print "</form></li>\n";
-
-		print "</ul>\n\n";
 	}
-
+	if ($replyform) {
+		print placeholder_include('nieuws/replies');
+	}
 	return 1;
 }
 
 if ($year) {
 	ob_clean();
+	$match = $Page;
 	$title = "Nieuws";
 	if (is_numeric($year) and $year > 999) {
-		$match = "$Page/$year/";
+		$match .= "/$year";
 		if (is_numeric($page)) {
 			$title .= ' '.$monthname[intval($page)];
 			$match .= sprintf('%02d-', $page);
@@ -77,44 +58,15 @@ if ($year) {
 		$title .= ' '.$year;
 	}
 	elseif ($year === '19') {
-		$match = "$Page/19??/";
+		$match .= "/19??";
 		$title .= " vóór 2000";
 	}
+	elseif (file_exists("$Page/.tags/$year")) {
+		$match .= "/.tags/$year";
+		$title .= " met $year";
+	}
 
 	print "<h2>$title</h2>\n\n";
-	shownews(glob($match.'*.html'));
+	print placeholder_include('nieuws', [$match]);
 	return 1;
 }
-
-print '<div id="news">'."\n\n";
-
-foreach (array_reverse(glob("$Page/2???")) as $page) {
-	$year = basename($page, '.html');
-	printf('<h3><a href="/%s">%s</a></h3>'."\n", $page, $year);
-	printtoc($page);
-}
-
-if ($pages = glob("$Page/19??/*.html")) {
-	printf('<h3><a href="/%s">%s</a></h3>'."\n", "$Page/19", 'Eerder');
-	printtoc($pages);
-}
-
-print "</div>\n\n";
-
-if ($replyform) {
-	print "<h3>Melding rapporteren</h3>\n";
-	$_REQUEST['subject'] = 'melding';
-	require 'contact.php';
-?>
-<form method="post">
-<p>
-	<textarea name="body" cols=60 rows=4></textarea>
-	<input type="submit" value="Versturen" />
-</p>
-</form>
-<?php
-}
-
-if (!empty($User['admin'])) {
-	print '<script src="/nieuws/edit.js"></script>'."\n";
-}