X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/2e685fd177e593fd2e648fe85863854e6834aabb..a6e2e74ced2c2a0aa816b2002c5d7d037b45f436:/nieuws.inc.php?ds=inline
diff --git a/nieuws.inc.php b/nieuws.inc.php
index e5e1ffa..40313e4 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -78,7 +78,7 @@ class ArchiveArticle
{
$this->title;
$rest = fread($this->file, filesize($this->page));
- if ( preg_match('{\n
(]*>)
\s*\z}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+ if ( preg_match('{\n(]*>)
}', $rest, $img, PREG_OFFSET_CAPTURE) ) {
$this->img = $img[1][0];
return substr($rest, 0, $img[0][1]);
}
@@ -109,36 +109,47 @@ class ArchiveArticle
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;
}
- 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";
}