nieuws: list items in article containers

[minimedit.git] / nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index e2985692018e3db8055a5d596082cefd7a2bc307..1565c63af25994371a3367cb4ad177d52c79f6d4 100644 (file)
--- 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,24 +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) {
-                       printf('<img src="/%s" class="left" />', $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)
@@ -135,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";
 }