X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/2e685fd177e593fd2e648fe85863854e6834aabb..20ead233cabc8fefcd86bd99f08dadc261669300:/nieuws.inc.php?ds=sidebyside
diff --git a/nieuws.inc.php b/nieuws.inc.php
index e5e1ffa..40432a9 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -78,16 +78,27 @@ class ArchiveArticle
{
$this->title;
$rest = fread($this->file, filesize($this->page));
- if ( preg_match('{\n
(]*>)
\s*\z}', $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,43 +113,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 ''."\n\n";
foreach (array_reverse($input) as $filename) {
$article = new ArchiveArticle($filename);
- print '- ';
+ 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 '';
+ print '
';
printf(
'
',
$article->link, $article->title, $article->date
);
print $article->body;
- print "\n\n";
+ print '
';
+ print "\n\n";
if (--$limit <= 0) break;
}
- print "
\n\n";
}
-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);
- printf('- %s %s
',
- $article->link, $article->safetitle, $article->date);
+ $html = $article->safetitle;
+ $dateparts = $article->dateparts;
+ if ($class) {
+ $dateparts[1] = 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";
}
print "
\n";
}