X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/2cdc2cb95e16975c4d210f8cebcc8b04a43b79ad..c0f916285fa69edb97a6c8311f567b90b3959ed3:/nieuws.inc.php
diff --git a/nieuws.inc.php b/nieuws.inc.php
index c5dfa23..1a68993 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]" : '',
]));
}
@@ -19,7 +19,7 @@ class ArchiveArticle
function __construct($path)
{
$this->page = $path;
- $this->link = preg_replace('/\.html$/', '', $path);
+ $this->link = preg_replace('{(?:/index)?\.html$}', '', $path);
}
function __get($col)
@@ -29,6 +29,7 @@ class ArchiveArticle
function file()
{
+ if (!file_exists($this->page)) return;
return fopen($this->page, 'r');
}
@@ -39,7 +40,12 @@ class ArchiveArticle
function safetitle()
{
- return strip_tags($this->title);
+ return trim(strip_tags($this->title));
+ }
+
+ function name()
+ {
+ return $this->safetitle ?: $this->link;
}
function last()
@@ -54,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;
}
@@ -70,56 +76,93 @@ class ArchiveArticle
function body()
{
- return fread($this->file, filesize($this->page));
+ $this->title;
+ $rest = fread($this->file, filesize($this->page));
+ if ( preg_match('{
+ \n (?: < (?: p | figure [^>]* ) >\s* )+ (]*>) | \n
(.*?)
}s', $this->body, $bodyp)) { + return $bodyp[1]; + } + } + + function img() + { + $this->img = NULL; + $this->body; + return $this->img; } function image() { - foreach (['jpg', 'png'] as $ext) { - if (file_exists("{$this->link}.$ext")) { - return "{$this->link}.$ext"; - } + if ( preg_match('/\bsrc="([^"]*)"/', $this->img, $src) ) { + return $src[1]; } } function thumb($size = '300x') { - if ($this->image) - return "thumb/$size/{$this->image}"; + if (!$this->image or $this->image[0] !== '/') return; + return preg_replace('{^(?:/thumb/[^/]*)?}', "thumb/$size", $this->image); } } function shownews($input, $limit = 1000) { if (!is_array($input)) $input = glob("$input/*.html"); - print '