X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/bd940f48a9b1c6fb45aef4860d3f23b8094d5ba4..3819e4c2e9c2114e95d556bcc083ba835f36c6a2:/article.inc.php?ds=sidebyside diff --git a/article.inc.php b/article.inc.php index 93bbe3b..093852f 100644 --- a/article.inc.php +++ b/article.inc.php @@ -1,29 +1,16 @@ 0 ? $monthname[intval($parts[1])] : '', $parts[0], - count($parts) > 5 ? "$parts[3]:$parts[4]" : '', - ])); -} - class ArchiveArticle { public $raw, $title, $body; # file contents public $meta = []; # head metadata properties + public $place = []; # template variables replaced in render() + public $api = FALSE; # requested programming interface function __construct($path) { - $this->page = preg_replace('{^\.(?:/|$)}', '', $path); - $this->link = preg_replace('{(?:(?:/|^)index)?\.html$}', '', $this->page); - $this->raw($this->page); + $this->file = preg_replace('{^\.(?:/|$)}', '', $path); + $this->link = preg_replace('{(?:(?:/|^)index)?\.html$}', '', $this->file); + $this->raw($this->file); } function raw($page) @@ -46,6 +33,8 @@ class ArchiveArticle if (preg_match('{
[[warn]]
'; + if ($offset = strpos($doc, '')) { + $doc = substr_replace($doc, "\n\n".$warn, $offset + 5, 0); + } + else { + $doc = $warn . "\n\n" . $doc; + } + } + + # keep either login or logout parts depending on user level + global $User; + $userexists = $User && property_exists($User, 'login') && $User->login; + if (! ($userexists and !empty($this->editable)) ) { + # remove matching elements until first corresponding closing tag + $hideclass = $userexists ? 'logout' : 'login'; + $tagmatch = '<([a-z]+) class="'.$hideclass.'"[^>]*>'; + $doc = preg_replace("{\s*{$tagmatch}.*?\\1>}s", '', $doc); + } + + return preg_replace_callback( + '{ \[\[ ([^] ]+) ([^]]*) \]\] }x', + function ($sub) { + list ($placeholder, $name, $params) = $sub; + $html = $this->place[$name] ?? + $this->widget($name, $params); + if (empty($html) or $html[0] != '<') { + $html = "$html"; + } + $attr = sprintf(' data-dyn="%s"', is_numeric($name) ? '' : $name.$params); + # contents with identifier in first tag + return preg_replace( '/(?=>)/', $attr, $html, 1); + }, + $doc ); } } class PageSearch { + public $handlers = []; + function __construct($path = '.') { $this->iterator = new RecursiveCallbackFilterIterator( @@ -177,6 +261,11 @@ class PageSearch # skip hidden files and directories return FALSE; } + if (file_exists($current->getFilename() . '/index.php')) { + # contents better provided by handler code + $this->handlers[ $current->getPathname() ] = $current; + return FALSE; + } if ($current->isLink()) { # ignore symlinks, original contents only return FALSE; @@ -194,12 +283,12 @@ class PageSearch function files() { # order alphabetically by link - $dir = iterator_to_array(new RecursiveIteratorIterator($this->iterator)); - array_walk($dir, function (&$row, $name) { - # prepare values for sorting (directory index first) - $row = preg_replace('{/index\.html$}', '', $name); - }); - asort($dir); + $dir = []; + foreach (new RecursiveIteratorIterator($this->iterator) as $name) { + $article = new ArchiveArticle($name); + $dir[$article->link] = $article; + } + ksort($dir); return $dir; } }