git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
page: maintain all placeholder includes in widget/
[minimedit.git]
/
article.inc.php
diff --git
a/article.inc.php
b/article.inc.php
index c6f3be9680d34b5d331cbf1c52c0c2f342add3d1..336511e87069e59174a80c73d84898562dabe431 100644
(file)
--- a/
article.inc.php
+++ b/
article.inc.php
@@
-16,10
+16,17
@@
function showdate($parts)
class ArchiveArticle
{
class ArchiveArticle
{
+ public $raw, $preface, $title, $body;
+
function __construct($path)
{
$this->page = $path;
$this->link = preg_replace('{(?:/index)?\.html$}', '', $path);
function __construct($path)
{
$this->page = $path;
$this->link = preg_replace('{(?:/index)?\.html$}', '', $path);
+ if (file_exists($this->page)) {
+ $this->raw = file_get_contents($this->page);
+ @list ($this->preface, $this->title, $this->body) =
+ preg_split('{<h2>(.*?)</h2>\s*}', $this->raw, 2, PREG_SPLIT_DELIM_CAPTURE);
+ }
}
function __get($col)
}
function __get($col)
@@
-27,22
+34,10
@@
class ArchiveArticle
return $this->$col = $this->$col(); # run method and cache
}
return $this->$col = $this->$col(); # run method and cache
}
- function file()
- {
- if (!file_exists($this->page)) return;
- return fopen($this->page, 'r');
- }
-
- function title()
- {
- return preg_replace('{<h2>(.*)</h2>\s*}', '\1', fgets($this->file));
- }
-
function safetitle()
{
return trim(strip_tags($this->title));
}
function safetitle()
{
return trim(strip_tags($this->title));
}
-
function name()
{
return $this->safetitle ?: $this->link;
function name()
{
return $this->safetitle ?: $this->link;
@@
-52,7
+47,6
@@
class ArchiveArticle
{
return filemtime($this->page);
}
{
return filemtime($this->page);
}
-
function lastiso()
{
return date(DATE_ATOM, $this->last);
function lastiso()
{
return date(DATE_ATOM, $this->last);
@@
-64,35
+58,31
@@
class ArchiveArticle
array_shift($ymd);
return $ymd;
}
array_shift($ymd);
return $ymd;
}
-
function dateiso()
{
return implode('-', $this->dateparts()) . 'T12:00:00+02:00';
}
function dateiso()
{
return implode('-', $this->dateparts()) . 'T12:00:00+02:00';
}
-
function date()
{
return showdate($this->dateparts);
}
function date()
{
return showdate($this->dateparts);
}
- function
bod
y()
+ function
stor
y()
{
{
- $this->title;
- $rest = fread($this->file, filesize($this->page));
if ( preg_match('{
\n (?: < (?: p | figure [^>]* ) >\s* )+ (<img\ [^>]*>) | \n <hr\ />
if ( preg_match('{
\n (?: < (?: p | figure [^>]* ) >\s* )+ (<img\ [^>]*>) | \n <hr\ />
- }x', $rest, $img, PREG_OFFSET_CAPTURE) ) {
+ }x', $this->body, $img, PREG_OFFSET_CAPTURE) ) {
+ # strip part after matching divider (image)
if (isset($img[1])) {
$this->img = $img[1][0];
}
if (isset($img[1])) {
$this->img = $img[1][0];
}
- return substr($
rest
, 0, $img[0][1]);
+ return substr($
this->body
, 0, $img[0][1]);
}
}
- return $
rest
;
+ return $
this->body
;
}
}
-
function teaser()
{
function teaser()
{
- if (preg_match('{<p>(.*?)</p>}s', $this->
bod
y, $bodyp)) {
+ if (preg_match('{<p>(.*?)</p>}s', $this->
stor
y, $bodyp)) {
return $bodyp[1];
}
}
return $bodyp[1];
}
}
@@
-100,17
+90,15
@@
class ArchiveArticle
function img()
{
$this->img = NULL;
function img()
{
$this->img = NULL;
- $this->
bod
y;
+ $this->
stor
y;
return $this->img;
}
return $this->img;
}
-
function image()
{
if ( preg_match('/\bsrc="([^"]*)"/', $this->img, $src) ) {
return $src[1];
}
}
function image()
{
if ( preg_match('/\bsrc="([^"]*)"/', $this->img, $src) ) {
return $src[1];
}
}
-
function thumb($size = '300x')
{
if (!$this->image or $this->image[0] !== '/') return;
function thumb($size = '300x')
{
if (!$this->image or $this->image[0] !== '/') return;