X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/fa30f71a6ab727c90e0b600582f9944dfaa1ca89..58445e7f5d88512e4b558fc1b9658e9ce49e273a:/nieuws.inc.php
diff --git a/nieuws.inc.php b/nieuws.inc.php
index 35ae092..1565c63 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -9,7 +9,7 @@ function showdate($parts)
{
global $monthname;
return implode(' ', array_filter([
- intval($parts[3]), $parts[2] > 0 ? $monthname[intval($parts[2])] : '', $parts[1],
+ intval(@$parts[3]), $parts[2] > 0 ? $monthname[intval($parts[2])] : '', $parts[1],
count($parts) > 6 ? "$parts[4]:$parts[5]" : '',
]));
}
@@ -60,7 +60,7 @@ class ArchiveArticle
function dateparts()
{
- preg_match('(\d{4})[/-](\d{2})-(\d{2})->', $this->page, $ymd);
+ preg_match('< / (\d{4}) [/-] (\d{2}) (?:- (\d{2}) )? - >x', $this->page, $ymd);
return $ymd;
}
@@ -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,24 +109,25 @@ 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) {
- printf('
', $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)
@@ -135,8 +136,10 @@ function printtoc($input)
print '';
foreach (array_reverse($input) as $page) {
$article = new ArchiveArticle($page);
- printf('- %s %s
',
- $article->link, $article->safetitle, $article->date);
+ $html = $article->safetitle;
+ $html .= sprintf(' %s', $article->date);
+ $html = sprintf('%s', $article->link, $html);
+ print "- $html
\n";
}
print "
\n";
}