nieuws: ignore missing page description in new articles

[minimedit.git] / nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index 6d84d1ac54b5930a19f2f26af75dcc13a96d6c14..1a68993f42bcd2387ad5e14257d5059c149d41f6 100644 (file)
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -78,11 +78,14 @@ class ArchiveArticle
        {
                $this->title;
                $rest = fread($this->file, filesize($this->page));
-               if ( preg_match('{\n<p>(<img [^>]*>)</p>}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
-                       $this->img = $img[1][0];
+               if ( preg_match('{
+                       \n (?: < (?: p | figure [^>]* ) >\s* )+ (<img\ [^>]*>) | \n <hr\ />
+               }x', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+                       if (isset($img[1])) {
+                               $this->img = $img[1][0];
+                       }
                        return substr($rest, 0, $img[0][1]);
                }
-               $this->img = NULL;
                return $rest;
        }
 
@@ -95,6 +98,7 @@ class ArchiveArticle
 
        function img()
        {
+               $this->img = NULL;
                $this->body;
                return $this->img;
        }
@@ -120,9 +124,11 @@ function shownews($input, $limit = 1000)
                $article = new ArchiveArticle($filename);
                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;
+                       $imgattr = ' class="left"';
+                       if (preg_match('{ (\s alt="[^"]+") }x', $article->img, $img)) {
+                               $imgattr .= $img[0];  # preserve alt value
+                       }
+                       printf('<img src="/%s"%s />', $article->thumb, $imgattr);
                }
                print '<div>';
                printf(