From aaa476ce6d0a8723725bcce2c388fdea5c1e98e1 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 11 Jul 2017 17:30:57 +0200
Subject: [PATCH] login: replace page editability var by admin status

Code cleanup, same results.
---
 auth.inc.php | 15 ++++++---------
 edit.php     |  2 +-
 foot.inc.php |  6 +++---
 login.php    |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/auth.inc.php b/auth.inc.php
index 6a5d1d2..ecd29b5 100755
--- a/auth.inc.php
+++ b/auth.inc.php
@@ -1,8 +1,7 @@
 <?php
-global $User, $editable;
-$User = FALSE;
+global $User, $Admin;
 
-function Auth() {
+call_user_func(function () {
 	if (isset($_SERVER['PHP_AUTH_USER'])) {
 		$authinfo = [ $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] ];
 	}
@@ -29,10 +28,8 @@ function Auth() {
 	$salt = substr($usertest, 0, 2);
 	if (crypt($authpass, $salt) != $usertest) return;
 
-	$GLOBALS['User'] = $authname;
-}
-
-Auth();
-
-$editable = !empty($User) && $User != 'lid';
+	global $User, $Admin;
+	$User = $authname;
+	$Admin = !empty($User) && $User != 'lid' ? $User : FALSE;
+});
 
diff --git a/edit.php b/edit.php
index 9532e42..3774bfc 100755
--- a/edit.php
+++ b/edit.php
@@ -6,7 +6,7 @@ function abort($status, $body) {
 }
 
 require 'auth.inc.php';
-if (!$editable)
+if (!$Admin)
 	abort('401 unauthorised', "geen beheersrechten");
 
 if (!$_POST)
diff --git a/foot.inc.php b/foot.inc.php
index e1ea486..e61346a 100755
--- a/foot.inc.php
+++ b/foot.inc.php
@@ -3,15 +3,15 @@
 <?php
 define('N', "\n");
 
-global $User, $editable;
+global $User, $Admin;
 
 $curfile = ltrim($_SERVER['SCRIPT_NAME'], '/');
 if (is_executable(__DIR__ . '/' . $curfile)) {
 	// dynamic code is +x
-	$editable = FALSE;
+	$Admin = FALSE;
 }
 
-if ($editable) {
+if ($Admin) {
 	$edit = preg_match('/[?]edit$/', $_SERVER['REQUEST_URI']);
 
 	if ($edit) {
diff --git a/login.php b/login.php
index c83534c..eb09f8a 100644
--- a/login.php
+++ b/login.php
@@ -1,7 +1,7 @@
 <?php
 require 'auth.inc.php';
 
-if (!$editable) {
+if (!$Admin) {
 	require 'logout.php';
 	exit;
 }
-- 
2.30.0