X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/58445e7f5d88512e4b558fc1b9658e9ce49e273a..ce951ad9579fd96a7ba185f6d7cbd99bd37b9ec4:/nieuws.inc.php?ds=sidebyside
diff --git a/nieuws.inc.php b/nieuws.inc.php
index 1565c63..34b565a 100644
--- 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
(]*>)
}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
- $this->img = $img[1][0];
+ if ( preg_match('{
+ \n (?: < (?: p | figure [^>]* ) >\s* )+ (]*>) | \n
+ }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('{(.*?)
}s', $this->body, $bodyp)) {
+ return $bodyp[1];
+ }
+ }
+
function img()
{
+ $this->img = NULL;
$this->body;
return $this->img;
}
@@ -102,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
+ );
}
}
@@ -113,9 +128,11 @@ function shownews($input, $limit = 1000)
$article = new ArchiveArticle($filename);
print '';
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('', $article->thumb, $imgattr);
}
print '';
printf(
@@ -130,14 +147,24 @@ function shownews($input, $limit = 1000)
}
}
-function printtoc($input)
+function printtoc($input, $class = FALSE)
{
if (!is_array($input)) $input = glob("$input/*.html");
- print '
';
+ print '';
foreach (array_reverse($input) as $page) {
$article = new ArchiveArticle($page);
$html = $article->safetitle;
- $html .= sprintf(' %s', $article->date);
+ $dateparts = $article->dateparts;
+ if ($class) {
+ $dateparts[0] = NULL; # omit year
+ }
+ $html .= sprintf(' %s', showdate($dateparts));
+ if ($class == 'gallery' and $article->img) {
+ $html = "$html
";
+ $html = sprintf('', $article->thumb(200)) . $html;
+ }
$html = sprintf('%s', $article->link, $html);
print "- $html
\n";
}