X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/2e685fd177e593fd2e648fe85863854e6834aabb..58445e7f5d88512e4b558fc1b9658e9ce49e273a:/nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index e5e1ffa..1565c63 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -78,7 +78,7 @@ class ArchiveArticle
 	{
 		$this->title;
 		$rest = fread($this->file, filesize($this->page));
-		if ( preg_match('{\n<p>(<img [^>]*>)</p>\s*\z}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+		if ( preg_match('{\n<p>(<img [^>]*>)</p>}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
 			$this->img = $img[1][0];
 			return substr($rest, 0, $img[0][1]);
 		}
@@ -109,26 +109,25 @@ class ArchiveArticle
 function shownews($input, $limit = 1000)
 {
 	if (!is_array($input)) $input = glob("$input/*.html");
-	print '<ul class="left">'."\n\n";
 	foreach (array_reverse($input) as $filename) {
 		$article = new ArchiveArticle($filename);
-		print '<li>';
+		print '<article class="left">';
 		if ($article->thumb) {
 			$img = preg_replace('{(?<= \b src="/) [^"]* }x', $article->thumb, $article->img);
 			$img = preg_replace('{(?= />$)}', ' class="left"', $img);
 			print $img;
 		}
-		print '<article>';
+		print '<div>';
 		printf(
 			'<h3><a href="/%s">%s <small class="date">%s</small></a></h3>',
 			$article->link, $article->title, $article->date
 		);
 		print $article->body;
-		print "</article></li>\n\n";
+		print '</div>';
+		print "</article>\n\n";
 
 		if (--$limit <= 0) break;
 	}
-	print "</ul>\n\n";
 }
 
 function printtoc($input)
@@ -137,8 +136,10 @@ function printtoc($input)
 	print '<ul>';
 	foreach (array_reverse($input) as $page) {
 		$article = new ArchiveArticle($page);
-		printf('<li><a href="/%s">%s <small class="date">%s</small></a></li>',
-			$article->link, $article->safetitle, $article->date);
+		$html = $article->safetitle;
+		$html .= sprintf(' <small class="date">%s</small>', $article->date);
+		$html = sprintf('<a href="/%s">%s</a>', $article->link, $html);
+		print "<li><article>$html</article></li>\n";
 	}
 	print "</ul>\n";
 }