From 24c849a03cdcbf857596f9449e887a4278d4ac54 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 25 Apr 2018 00:27:40 +0200
Subject: [PATCH] login: move admin pages into /login

Permissions should be checked per page, and can make more distinctions than
boolean admin.  Also one dir less to symlink.
---
 login.php                            | 4 ++--
 admin/index.html => login/admin.html | 0
 admin.php => login/admin.php         | 2 +-
 {admin => login}/commits.html        | 0
 {admin => login}/commits.php         | 2 +-
 login/index.html                     | 2 +-
 {admin => login}/pass.html           | 0
 {admin => login}/pass.php            | 0
 {admin => login}/setmail.php         | 0
 {admin => login}/visits.html         | 0
 {admin => login}/visits.php          | 0
 11 files changed, 5 insertions(+), 5 deletions(-)
 rename admin/index.html => login/admin.html (100%)
 rename admin.php => login/admin.php (87%)
 rename {admin => login}/commits.html (100%)
 rename {admin => login}/commits.php (94%)
 rename {admin => login}/pass.html (100%)
 rename {admin => login}/pass.php (100%)
 rename {admin => login}/setmail.php (100%)
 rename {admin => login}/visits.html (100%)
 rename {admin => login}/visits.php (100%)

diff --git a/login.php b/login.php
index 801ba1f..626281a 100644
--- a/login.php
+++ b/login.php
@@ -37,6 +37,6 @@ $part = [
 print getoutput($part);
 
 if (empty($Args) and !empty($User['admin'])) {
-	include_once 'admin/index.html';
-	include_once 'admin.php';
+	include_once 'login/admin.html';
+	include_once 'login/admin.php';
 }
diff --git a/admin/index.html b/login/admin.html
similarity index 100%
rename from admin/index.html
rename to login/admin.html
diff --git a/admin.php b/login/admin.php
similarity index 87%
rename from admin.php
rename to login/admin.php
index e73f5b5..ee6b39f 100644
--- a/admin.php
+++ b/login/admin.php
@@ -13,4 +13,4 @@ if (empty($User['admin'])) {
 
 <?php
 $_GET['pagesize'] = 10;
-include_once 'admin/commits.php';
+include_once 'login/commits.php';
diff --git a/admin/commits.html b/login/commits.html
similarity index 100%
rename from admin/commits.html
rename to login/commits.html
diff --git a/admin/commits.php b/login/commits.php
similarity index 94%
rename from admin/commits.php
rename to login/commits.php
index 2543d79..c411f47 100644
--- a/admin/commits.php
+++ b/login/commits.php
@@ -25,7 +25,7 @@ if ( $log = popen($gitcmd, 'r') ) {
 	print "</ul>\n\n";
 	pclose($log);
 
-	$navbase = $Page == 'admin/commits' ? '?' : '/admin/commits?';
+	$navbase = $Page == 'login/commits' ? '?' : '/login/commits?';
 	$nav = [];
 	$nav[] = sprintf('Pagina %d', ceil($offset / $pagesize) + 1);
 	if ($lines >= $pagesize) {
diff --git a/login/index.html b/login/index.html
index 662b3cc..e2fe85e 100644
--- a/login/index.html
+++ b/login/index.html
@@ -2,6 +2,6 @@
 
 <p>Ingelogd als <em>[[user]]</em>.</p>
 
-<?php include('admin/setmail.php'); ?>
+<?php include('login/setmail.php'); ?>
 
 <p class="nav"><a href="?logout">Uitloggen</a></p>
diff --git a/admin/pass.html b/login/pass.html
similarity index 100%
rename from admin/pass.html
rename to login/pass.html
diff --git a/admin/pass.php b/login/pass.php
similarity index 100%
rename from admin/pass.php
rename to login/pass.php
diff --git a/admin/setmail.php b/login/setmail.php
similarity index 100%
rename from admin/setmail.php
rename to login/setmail.php
diff --git a/admin/visits.html b/login/visits.html
similarity index 100%
rename from admin/visits.html
rename to login/visits.html
diff --git a/admin/visits.php b/login/visits.php
similarity index 100%
rename from admin/visits.php
rename to login/visits.php
-- 
2.30.0