X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/3080864c4cd697bd083f9fd0315f0ffababd593d..81b908af157b8580cca92046dd4ad8772c61e4fb:/nieuws.inc.php
diff --git a/nieuws.inc.php b/nieuws.inc.php
index a925a91..40432a9 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,67 +40,132 @@ class ArchiveArticle
function safetitle()
{
- return strip_tags($this->title);
+ return trim(strip_tags($this->title));
+ }
+
+ function name()
+ {
+ return $this->safetitle ?: $this->link;
+ }
+
+ function last()
+ {
+ return filemtime($this->page);
+ }
+
+ function lastiso()
+ {
+ return date(DATE_ATOM, $this->last);
+ }
+
+ function dateparts()
+ {
+ preg_match('< / (\d{4}) [/-] (\d{2}) (?:- (\d{2}) )? - >x', $this->page, $ymd);
+ return $ymd;
+ }
+
+ function dateiso()
+ {
+ return implode('-', $this->dateparts());
}
function date()
{
- if (!preg_match('(\d{4})/(\d{2})-(\d{2})->', $this->page, $parts)) return;
- return showdate($parts);
+ return showdate($this->dateparts);
}
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/[^/]*)?}', '/\.groot(?=\.\w+$)/'], ["thumb/$size", ''], + $this->image + ); } } function shownews($input, $limit = 1000) { if (!is_array($input)) $input = glob("$input/*.html"); - print '