page: .private to restrict access to subdirectories

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 4944467684b1673e46060a2dba4094410c6c1634..730f0156935ed9b522e371e509e3860ffc6da103 100644 (file)
--- a/page.php
+++ b/page.php
@@ -2,13 +2,25 @@
 error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 
+function getoutput($blocks = [])
+{
+       $rep = [];
+       foreach ($blocks as $name => $html) {
+               $rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
+                       is_numeric($name) ? '' : "[[$name]]",
+                       preg_replace('{<!--[^-]*-->}', '', $html)
+               );
+       }
+       return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
+}
+
 function fail($error)
 {
        http_response_code(500);
        include_once 'page.inc.php';
        ob_start();
        require_once './500.html';
-       print str_replace('[[debug]]', $error, ob_get_clean());
+       print getoutput(['debug' => $error]);
 }
 set_exception_handler('fail');
 register_shutdown_function(function () {
@@ -27,6 +39,17 @@ $Args = '';
 $Page = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']);
 $Page = urldecode(trim($Page, '/')) ?: 'index';
 while (TRUE) {
+       if (file_exists("$Page/.private")) {
+               # access restriction
+               if (!isset($User)) {
+                       http_response_code(403);
+                       include_once 'page.inc.php';
+                       ob_start();
+                       require_once './403.html';
+                       exit;
+               }
+       }
+
        if (file_exists("$Page.php")) {
                break;
        }
@@ -52,6 +75,9 @@ if (file_exists("$Page$Args/index.html")) {
 elseif (file_exists("$Page$Args.html")) {
        $found = include "./$Page$Args.html";
 }
+elseif (isset($User) and $User['admin']) {
+       $found = require (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+}
 
 print "</div>\n\n";
 
@@ -67,15 +93,9 @@ include_once 'page.inc.php';
 
 if (!$found) {
        # no resulting output
-       if (isset($User) and $User['admin']) {
-               require './template.html';
-       }
-       else {
-               http_response_code(404);
-               ob_start();
-               require "./404.html";
-               $url = htmlspecialchars($_SERVER['REQUEST_URI']);
-               print str_replace('[[url]]', $url, ob_get_clean());
-       }
+       http_response_code(404);
+       ob_start();
+       require "./404.html";
+       print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
 }