nieuws: ArchiveArticle class to access news pages

Similar to User in auth.inc.php.

diff --git a/nieuws.inc.php b/nieuws.inc.php
index 524109d7fb7c2220e7e626e873eb32ad0c0bbbd7..a925a9139d331c2b24c65e7d022c384d6969fd1c 100644 (file)
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -14,46 +14,59 @@ function showdate($parts)
        ]));
 }
 
        ]));
 }
 

-function shownewsdate($url)
+class ArchiveArticle

 {
 {

-       if (!preg_match('</(\d{4})/(\d{2})-(\d{2})->', $url, $parts)) return;
-       return showdate($parts);
-}
+       function __construct($path)
+       {
+               $this->page = $path;
+               $this->link = preg_replace('/\.html$/', '', $path);
+       }

 
 

-function shownewsimage($url)
-{
-       foreach (['jpg', 'png'] as $ext) {
-               if (file_exists("$url.$ext")) {
-                       return "$url.$ext";
-               }
+       function __get($col)
+       {
+               return $this->$col = $this->$col();  # run method and cache

        }
        }

-}

 
 

-function shownewsarticle($url, $link = TRUE, $title = NULL)
-{
-       $html = ob_get_clean();
-       $date = shownewsdate($url);
-       ob_start();
-       print $title ?: '\1';
-       print '[[1]]';
+       function file()
+       {
+               return fopen($this->page, 'r');
+       }
+
+       function title()
+       {
+               return preg_replace('{<h2>(.*)</h2>\s*}', '\1', fgets($this->file));
+       }
+
+       function safetitle()
+       {
+               return strip_tags($this->title);
+       }
+
+       function date()
+       {
+               if (!preg_match('</(\d{4})/(\d{2})-(\d{2})->', $this->page, $parts)) return;
+               return showdate($parts);
+       }

 
 

-       $title = sprintf(
-               $link ? '<h3><a href="/%2$s">%s</a></h3>' : '<h2>%s</h2>',
-               getoutput([1 => ' <small class="date">'.$date.'</small>']),
-               $url
-       );
+       function body()
+       {
+               return fread($this->file, filesize($this->page));
+       }

 
 

-       if (!$link and $image = shownewsimage($url)) {
-               global $Place;
-               $Place['image'] = "https://lijtweg.nl/thumb/600x/".$image;
-               ob_start();
-               print '[[1]]';
-               $html .= getoutput([
-                       1 => sprintf("\n".'<p><img src="%s" /></p>', "/thumb/640x/".$image),
-               ]);
+       function image()
+       {
+               foreach (['jpg', 'png'] as $ext) {
+                       if (file_exists("{$this->link}.$ext")) {
+                               return "{$this->link}.$ext";
+                       }
+               }

        }
 
        }
 

-       return preg_replace('{<h2>(.*?)</h2>}', $title, $html);
+       function thumb($size = '300x')
+       {
+               if ($this->image)
+               return "thumb/$size/{$this->image}";
+       }

 }
 
 function shownews($input, $limit = 1000)
 }
 
 function shownews($input, $limit = 1000)


@@ -61,15 +74,17 @@ function shownews($input, $limit = 1000)
        if (!is_array($input)) $input = glob("$input/*.html");
        print '<ul class="left">'."\n\n";
        foreach (array_reverse($input) as $filename) {
        if (!is_array($input)) $input = glob("$input/*.html");
        print '<ul class="left">'."\n\n";
        foreach (array_reverse($input) as $filename) {

-               $url = preg_replace('/\.html$/', '', $filename);
+               $article = new ArchiveArticle($filename);

                print '<li>';
                print '<li>';

-               if ($image = shownewsimage($url)) {
-                       printf('<img src="%s" class="left" />', "/thumb/300x/".$image);
+               if ($article->thumb) {
+                       printf('<img src="/%s" class="left" />', $article->thumb);

                }
                print '<article>';
                }
                print '<article>';

-               ob_start();
-               include $filename;
-               print shownewsarticle($url);
+               printf(
+                       '<h3><a href="/%s">%s <small class="date">%s</small></a></h3>',
+                       $article->link, $article->title, $article->date
+               );
+               print $article->body;

                print "</article></li>\n\n";
 
                if (--$limit <= 0) break;
                print "</article></li>\n\n";
 
                if (--$limit <= 0) break;


@@ -82,11 +97,9 @@ function printtoc($input)
        if (!is_array($input)) $input = glob("$input/*.html");
        print '<ul>';
        foreach (array_reverse($input) as $page) {
        if (!is_array($input)) $input = glob("$input/*.html");
        print '<ul>';
        foreach (array_reverse($input) as $page) {

-               $title = fgets(fopen($page, 'r'));
-               $title = strip_tags($title);
-               $linkurl = preg_replace('/\.html$/', '', $page);
+               $article = new ArchiveArticle($page);

                printf('<li><a href="/%s">%s <small class="date">%s</small></a></li>',
                printf('<li><a href="/%s">%s <small class="date">%s</small></a></li>',

-                       $linkurl, $title, shownewsdate($linkurl));
+                       $article->link, $article->safetitle, $article->date);

        }
        print "</ul>\n";
 }
        }
        print "</ul>\n";
 }

diff --git a/nieuws/index.php b/nieuws/index.php
index 374b9b0db8168399128b3f776a811daabe7c57db..8a613c2591f57531c594bd28a13ebd2f6d69712e 100644 (file)
--- a/nieuws/index.php
+++ b/nieuws/index.php
@@ -6,7 +6,13 @@ $replyform = $Page == 'melding' && !empty($User);
 
 if ($page and !is_numeric($page)) {
        $edit = !empty($User['admin']) ? htmlspecialchars(@$_GET['edit']) : NULL;
 
 if ($page and !is_numeric($page)) {
        $edit = !empty($User['admin']) ? htmlspecialchars(@$_GET['edit']) : NULL;

-       print shownewsarticle($Page.$Args, FALSE, $edit);
+       $article = new ArchiveArticle("$Page$Args.html");
+       $Place[1] = ' <small class="date">'.$article->date.'</small>';
+       print preg_replace('{(?<=<h2>)(.*?)(?=</h2>)}', ($edit ?: '\1').' [[1]]', ob_get_clean());
+       if ($article->image) {
+               $Place['image'] = "https://lijtweg.nl/".$article->thumb('600x');
+               printf('<p><img src="/%s" /></p>'."\n", $article->thumb('640x'));
+       }

 
        if ($replyform) {
                print '<h3>Reacties</h3>'."\n";
 
        if ($replyform) {
                print '<h3>Reacties</h3>'."\n";