nieuws: prefer full names of comment authors

[minimedit.git] / nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index 0e3c877890020c13ab8c7a300c100a05d1fa6471..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,7 +79,9 @@ class ArchiveArticle
        {
                $this->title;
                $rest = fread($this->file, filesize($this->page));
-               if ( preg_match('{\n<p>(<img [^>]*>)</p>|\n<hr />}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+               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];
                        }
@@ -111,7 +114,10 @@ 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
+               );
        }
 }
 
@@ -152,7 +158,7 @@ function printtoc($input, $class = FALSE)
                $html = $article->safetitle;
                $dateparts = $article->dateparts;
                if ($class) {
-                       $dateparts[1] = NULL;  # omit year
+                       $dateparts[0] = NULL;  # omit year
                }
                $html .= sprintf(' <small class="date">%s</small>', showdate($dateparts));
                if ($class == 'gallery' and $article->img) {