auth: support unhashed passwords

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 6623c8b39c2281de2038d4dc6ae7e43df58992db..20f8244ac0684bd973df5e6bd9a924d5e9ad8695 100644 (file)
--- a/page.php
+++ b/page.php
@@ -56,12 +56,12 @@ $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) {
        if (file_exists("$Page/.private")) {
                # access restriction
-               if (!isset($User)) {
+               if (empty($User)) {
                        http_response_code(303);
                        $target = urlencode($_SERVER['REQUEST_URI']);
                        header("Location: /login?goto=$target");
@@ -95,7 +95,7 @@ if (file_exists("$Page$Args/index.html")) {
 elseif (file_exists("$Page$Args.html")) {
        $found = include "./$Page$Args.html";
 }
-elseif (isset($User) and $User['admin']) {
+elseif (!empty($User['admin'])) {
        $found = include (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
 }