nieuws: ignore missing page description in new articles

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 8979e6298d0d7c7d45a961264af9ce5a84182685..bca7a6745e7e9809e5b8c746818c5041933a54b9 100644 (file)
--- a/page.php
+++ b/page.php
@@ -8,6 +8,36 @@ function abort($body, $status = NULL) {
        exit;
 }
 
+function placeholder_include($name, $params = [])
+{
+       $path = stream_resolve_include_path("$name.php");
+       if (!file_exists($path)) {
+               return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+       }
+
+       ob_start();
+       $Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+       $Args = '';
+       $Place = $GLOBALS['Place'];
+       foreach ($params as $param) {
+               if ($set = strpos($param, '=')) {
+                       $Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
+               }
+               elseif (!empty($param)) {
+                       $Args .= '/'.$param;
+               }
+       }
+       try {
+               include "$name.php";
+               return ob_get_clean();
+       }
+       catch (Exception $e) {
+               return sprintf('<strong class="warn">%s</strong>',
+                       "fout in <em>$name</em>: {$e->getMessage()}"
+               );
+       }
+}
+
 function getoutput($blocks = [])
 {
        $doc = ob_get_clean();
@@ -22,38 +52,20 @@ function getoutput($blocks = [])
                }
        }
 
+       # keep either login or logout parts depending on user level
+       global $User;
+       $hideclass = empty($User) ? 'login' : 'logout';
+       $doc = preg_replace('{\s*<(p|li|span) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
+
        return preg_replace_callback(
-               '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
+               '{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
                function ($sub) use ($blocks) {
                        list ($placeholder, $name, $params) = $sub;
                        if (isset($blocks[$name])) {
                                $html = $blocks[$name];
                        }
-                       elseif (file_exists("$name.php")) {
-                               ob_start();
-                               $Page = $GLOBALS['Page'] . $GLOBALS['Args'];
-                               $Args = '';
-                               $Place = $GLOBALS['Place'];
-                               foreach (explode(' ', $params) as $param) {
-                                       if ($set = strpos($param, '=')) {
-                                               $Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
-                                       }
-                                       elseif (!empty($param)) {
-                                               $Args .= '/'.$param;
-                                       }
-                               }
-                               try {
-                                       include "$name.php";
-                                       $html = ob_get_clean();
-                               }
-                               catch (Exception $e) {
-                                       $html = sprintf('<strong class="warn">%s</strong>',
-                                               "fout in <em>$name</em>: {$e->getMessage()}"
-                                       );
-                               }
-                       }
                        else {
-                               $html = '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+                               $html = placeholder_include($name, explode(' ', $params));
                        }
                        return sprintf('<!--BLOCK:%s-->%s<!--/-->',
                                is_numeric($name) ? '' : $placeholder, # edit replacement