git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
login: move logged in message to static contents
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index e8023ffab10c21a273f3fa015c4e3ee35f90469b..20f8244ac0684bd973df5e6bd9a924d5e9ad8695 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-14,31
+14,62
@@
function getoutput($blocks = [])
return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
}
return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
}
+# custom error handling
+
+define('DOCROOT', getcwd().'/');
+
function fail($error)
{
http_response_code(500);
include_once 'page.inc.php';
ob_start();
function fail($error)
{
http_response_code(500);
include_once 'page.inc.php';
ob_start();
- require_once
'./
500.html';
+ require_once
DOCROOT.'
500.html';
print getoutput(['debug' => $error]);
}
print getoutput(['debug' => $error]);
}
+
set_exception_handler('fail');
set_exception_handler('fail');
+
+define('E_FATAL', E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR);
+
+set_error_handler(function ($level, $error, $file, $line) {
+ if ($level & E_FATAL) {
+ fail($error);
+ return;
+ }
+ return FALSE;
+});
+
register_shutdown_function(function () {
# display failure page for fatal exceptions
$error = error_get_last();
register_shutdown_function(function () {
# display failure page for fatal exceptions
$error = error_get_last();
- if (!($error['type'] &
(E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR)
)) return;
+ if (!($error['type'] &
E_FATAL
)) return;
fail("Fatal: $error[message] in $error[file]:$error[line]");
});
fail("Fatal: $error[message] in $error[file]:$error[line]");
});
+error_reporting(error_reporting() & ~E_FATAL);
+
+# user login and control
+
include_once 'auth.inc.php';
$Edit = isset($_GET['edit']);
# distinguish subpage Args from topmost Page script
$Args = '';
include_once 'auth.inc.php';
$Edit = isset($_GET['edit']);
# distinguish subpage Args from topmost Page script
$Args = '';
-$Page = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']);
+$Page = preg_replace('/\?.*/', '',
@$_SERVER['PATH_INFO'] ?:
$_SERVER['REQUEST_URI']);
$Page = urldecode(trim($Page, '/')) ?: 'index';
while (TRUE) {
$Page = urldecode(trim($Page, '/')) ?: 'index';
while (TRUE) {
+ if (file_exists("$Page/.private")) {
+ # access restriction
+ if (empty($User)) {
+ http_response_code(303);
+ $target = urlencode($_SERVER['REQUEST_URI']);
+ header("Location: /login?goto=$target");
+ exit;
+ }
+ $PageAccess = $Page;
+ }
+
if (file_exists("$Page.php")) {
break;
}
if (file_exists("$Page.php")) {
break;
}
@@
-64,8
+95,8
@@
if (file_exists("$Page$Args/index.html")) {
elseif (file_exists("$Page$Args.html")) {
$found = include "./$Page$Args.html";
}
elseif (file_exists("$Page$Args.html")) {
$found = include "./$Page$Args.html";
}
-elseif (
isset($User) and $User['admin']
) {
- $found =
requir
e (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+elseif (
!empty($User['admin'])
) {
+ $found =
includ
e (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
}
print "</div>\n\n";
}
print "</div>\n\n";
@@
-84,7
+115,7
@@
if (!$found) {
# no resulting output
http_response_code(404);
ob_start();
# no resulting output
http_response_code(404);
ob_start();
- require "./404.html";
+
@
require "./404.html";
print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
}
print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
}