nieuws: inline code to format article overviews

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 070742643481a29ad0a818a6173841e690b7fdfd..894efc003cc2671014e5115b2012870a4c55da2e 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
@@ -101,6 +113,7 @@ error_reporting(error_reporting() & ~E_FATAL);
 
 # user login and control
 
+$User = NULL;
 include_once 'auth.inc.php';
 $Edit = isset($_GET['edit']);
 
@@ -137,7 +150,7 @@ $staticpage = NULL;
 if (file_exists("$Page$Args.html")) {
        $staticpage = "$Page$Args.html";
        if (is_link($staticpage)) {
-               $target = readlink($staticpage);
+               $target = preg_replace('/\.html$/', '', readlink($staticpage));
                header("HTTP/1.1 302 Shorthand");
                header("Location: $target");
                exit;
@@ -146,7 +159,7 @@ if (file_exists("$Page$Args.html")) {
 elseif (file_exists("$Page$Args/index.html")) {
        $staticpage = "$Page$Args/index.html";
 }
-elseif (!empty($User['admin'])) {
+elseif ($User and $User->admin) {
        $staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
 }
 
@@ -172,7 +185,7 @@ if ($Page) {
 }
 
 $Place += [
-       'user'  => empty($User) ? '' : $User['name'],
+       'user'  => $User ? $User->login : '',
        'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];