From 681f9b3b30f07f7e98011fac433fac3e3e93f002 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 5 May 2018 18:24:04 +0200
Subject: [PATCH] login: replace page controllers by placeholders

---
 login/admin.html        | 3 +++
 login/admin/index.php   | 6 ------
 login/commits.html      | 2 ++
 login/commits/index.php | 2 --
 login/index.html        | 2 +-
 login/index.php         | 2 +-
 login/setmail.php       | 2 ++
 login/visits.html       | 2 ++
 login/visits/index.php  | 2 --
 9 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 login/commits/index.php
 delete mode 100644 login/visits/index.php

diff --git a/login/admin.html b/login/admin.html
index 2c4d9ec..c07a25e 100644
--- a/login/admin.html
+++ b/login/admin.html
@@ -6,3 +6,6 @@ Pagina's zijn aan te passen met de link <em>Wijzig</em> rechtsbovenin.
 Wijzigingen zijn direct zichtbaar, en worden periodiek bijgehouden:
 </p>
 
+<h3>Laatste aanpassingen</h3>
+
+[[login/commits pagesize=10]]
diff --git a/login/admin/index.php b/login/admin/index.php
index ee6b39f..08fe36e 100644
--- a/login/admin/index.php
+++ b/login/admin/index.php
@@ -8,9 +8,3 @@ if (empty($User['admin'])) {
 <?php
 	return;
 }
-?>
-<h3>Laatste aanpassingen</h3>
-
-<?php
-$_GET['pagesize'] = 10;
-include_once 'login/commits.php';
diff --git a/login/commits.html b/login/commits.html
index c1d69b6..7d56809 100644
--- a/login/commits.html
+++ b/login/commits.html
@@ -1,2 +1,4 @@
 <h2>Aanpassingen</h2>
 
+[[login/commits pagesize=10]]
+
diff --git a/login/commits/index.php b/login/commits/index.php
deleted file mode 100644
index 75ff7a5..0000000
--- a/login/commits/index.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-include 'login/commits.php';
diff --git a/login/index.html b/login/index.html
index e2fe85e..a94f522 100644
--- a/login/index.html
+++ b/login/index.html
@@ -2,6 +2,6 @@
 
 <p>Ingelogd als <em>[[user]]</em>.</p>
 
-<?php include('login/setmail.php'); ?>
+[[login/setmail]]
 
 <p class="nav"><a href="?logout">Uitloggen</a></p>
diff --git a/login/index.php b/login/index.php
index 40fcb61..a966cfa 100644
--- a/login/index.php
+++ b/login/index.php
@@ -49,5 +49,5 @@ if (isset($_GET['goto'])) {
 
 if (empty($Args) and !empty($User['admin'])) {
 	include_once 'login/admin.html';
-	include_once 'login/admin/index.php';
 }
+
diff --git a/login/setmail.php b/login/setmail.php
index e95c3bd..7ebe7b9 100644
--- a/login/setmail.php
+++ b/login/setmail.php
@@ -1,4 +1,6 @@
 <?php
+global $User;
+
 if ($_POST and isset($_POST['email'])) {
 	if ($error = setmailform($_POST)) {
 		print "<p class=warn>$error</p>\n\n";
diff --git a/login/visits.html b/login/visits.html
index e772122..081f3c8 100644
--- a/login/visits.html
+++ b/login/visits.html
@@ -1 +1,3 @@
 <h2>Recente gebruikers</h2>
+
+[[login/visits]]
diff --git a/login/visits/index.php b/login/visits/index.php
deleted file mode 100644
index 6678661..0000000
--- a/login/visits/index.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-include 'login/visits.php';
-- 
2.30.0