X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/628a39772933c58908f2ec68cc05b027e939b207..20ead233cabc8fefcd86bd99f08dadc261669300:/nieuws.inc.php?ds=sidebyside
diff --git a/nieuws.inc.php b/nieuws.inc.php
index 6d84d1a..40432a9 100644
--- 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
(]*>)
}', $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;
}
@@ -95,6 +98,7 @@ class ArchiveArticle
function img()
{
+ $this->img = NULL;
$this->body;
return $this->img;
}
@@ -109,7 +113,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
+ );
}
}
@@ -120,9 +127,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(