nieuws/feed: include domain part in article link

[minimedit.git] / nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index e2985692018e3db8055a5d596082cefd7a2bc307..34b565a1358b656df7072c20d8d1ef222a31e50f 100644 (file)
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -9,8 +9,8 @@ function showdate($parts)
 {
        global $monthname;
        return implode(' ', array_filter([
-               intval(@$parts[3]), $parts[2] > 0 ? $monthname[intval($parts[2])] : '', $parts[1],
-               count($parts) > 6 ? "$parts[4]:$parts[5]" : '',
+               intval(@$parts[2]), $parts[1] > 0 ? $monthname[intval($parts[1])] : '', $parts[0],
+               count($parts) > 5 ? "$parts[3]:$parts[4]" : '',
        ]));
 }
 
@@ -61,12 +61,13 @@ class ArchiveArticle
        function dateparts()
        {
                preg_match('< / (\d{4}) [/-] (\d{2}) (?:- (\d{2}) )? - >x', $this->page, $ymd);
+               array_shift($ymd);
                return $ymd;
        }
 
        function dateiso()
        {
-               return implode('-', $this->dateparts());
+               return implode('-', $this->dateparts()) . 'T12:00:00+02:00';
        }
 
        function date()
@@ -78,16 +79,27 @@ 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) ) {
-                       $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;
        }
 
+       function teaser()
+       {
+               if (preg_match('{<p>(.*?)</p>}s', $this->body, $bodyp)) {
+                       return $bodyp[1];
+               }
+       }
+
        function img()
        {
+               $this->img = NULL;
                $this->body;
                return $this->img;
        }
@@ -102,41 +114,59 @@ class ArchiveArticle
        function thumb($size = '300x')
        {
                if (!$this->image or $this->image[0] !== '/') return;
-               return preg_replace('{^(?:/thumb/[^/]*)?}', "thumb/$size", $this->image);
+               return preg_replace(
+                       ['{^(?:/thumb/[^/]*)?}', '/\.groot(?=\.\w+$)/'], ["thumb/$size", ''],
+                       $this->image
+               );
        }
 }
 
 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);
+                       $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 '<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)
+function printtoc($input, $class = FALSE)
 {
        if (!is_array($input)) $input = glob("$input/*.html");
-       print '<ul>';
+       print '<ul';
+       if ($class) printf(' class="%s"', $class);
+       print '>';
        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;
+               $dateparts = $article->dateparts;
+               if ($class) {
+                       $dateparts[0] = NULL;  # omit year
+               }
+               $html .= sprintf(' <small class="date">%s</small>', showdate($dateparts));
+               if ($class == 'gallery' and $article->img) {
+                       $html = "<div>$html</div>";
+                       $html = sprintf('<img src="%s" />', $article->thumb(200)) . $html;
+               }
+               $html = sprintf('<a href="/%s">%s</a>', $article->link, $html);
+               print "<li><article>$html</article></li>\n";
        }
        print "</ul>\n";
 }