login: replace page controllers by placeholders

diff --git a/login/admin.html b/login/admin.html
index 2c4d9ec3fa16e75ca0422a7aac6f4668cf12ccef..c07a25e3b72f61f658bf17393d94d36df29c9632 100644 (file)
--- 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 ee6b39feff2c019b6f87f1c49795ddfee8db50e9..08fe36edcb1551218b8377366ac796cfd1877a5a 100644 (file)
--- 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 c1d69b6f60f377b92cd56b6c79261f91fd354dba..7d56809c57179867d7fb28136124bb8e81b0994a 100644 (file)
--- 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 (file)
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 e2fe85e5fd2a0bdd180435e7021c4948a8fe54ff..a94f522c4bfd8fb025a12f96c014fa33d33da11c 100644 (file)
--- 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 40fcb6138caca20b3765a6a57306551e57971b65..a966cfa78cc89788ff51e41e4f38b3de3ff6fdca 100644 (file)
--- 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 e95c3bdf5bb57e5faeedc1fef84c4b7874bd3159..7ebe7b907ad2875a7653de76b6984347e99123ae 100644 (file)
--- 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 e772122bc3f8c6329b63df9f71dcd1e7780c9789..081f3c8e16027699ab9d73538e18a66b0ee27f03 100644 (file)
--- 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 (file)
index 6678661..0000000
--- a/login/visits/index.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-include 'login/visits.php';