From 6c1705bd7fc4faa3db056d503afee041083ad754 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 10 Jul 2018 23:36:41 +0200
Subject: [PATCH] login/edit: separate columns declaration

Move configuration unchanged into edit.inc.php to allow site customisation.
---
 login/edit.inc.php | 47 +++++++++++++++++++++++++++++++++++++++++++
 login/edit.php     | 50 +---------------------------------------------
 2 files changed, 48 insertions(+), 49 deletions(-)
 create mode 100644 login/edit.inc.php

diff --git a/login/edit.inc.php b/login/edit.inc.php
new file mode 100644
index 0000000..86b35b2
--- /dev/null
+++ b/login/edit.inc.php
@@ -0,0 +1,47 @@
+<?php
+$cols = [
+	'username' => [
+		'label' => 'login',
+		'value' => $user['name'],
+		'target' => NULL,
+		'pattern' => "[a-z0-9-]+",
+		'size' => 10,
+	],
+	'name'  => [
+		'label' => 'volledige naam',
+		'explain' => "Alleen zichtbaar voor andere leden.",
+		'filter' => ["\n", '; '],
+		'size' => 30,
+		'filename' => 'name.txt',
+	],
+	'email' => [
+		'label' => 'e-mailadres',
+		'type' => 'email',
+		'explain' => "Voor contact van of met deze site. Wij zullen dit nooit vrij- of doorgeven.",
+		'size' => 30,
+		'filename' => 'email.txt',
+	],
+	'avatar' => [
+		'label' => 'portretfoto',
+		'type' => 'file',
+		'filename' => 'avatar.jpg',
+	],
+	'tags' => [
+		'label' => 'groepen',
+		'filename' => 'profile/.tags',
+		'values' => [],
+	],
+];
+
+if (isset($user['pass'])) {
+	$cols['newpass'] = [
+		'label' => 'wachtwoord',
+		'input' => <<<'EOT'
+			<input type="password" name="oldpass" value="" placeholder="Huidig wachtwoord" />
+			<input type="password" id="newpass" name="newpass" value="" placeholder="Nieuw wachtwoord" />
+			<input type="password" name="passconf" value="" placeholder="Nogmaals" />
+EOT
+		,
+		'hide'  => 'pass',
+	];
+}
diff --git a/login/edit.php b/login/edit.php
index 4a2e6f4..15b0a2a 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -14,32 +14,7 @@ and !empty($Place['user']) and $Place['user'] !== $User['name']) {
 	];
 }
 
-$cols = [
-	'name'  => [
-		'label' => 'volledige naam',
-		'explain' => "Alleen zichtbaar voor andere leden.",
-		'filter' => ["\n", '; '],
-		'size' => 30,
-		'filename' => 'name.txt',
-	],
-	'email' => [
-		'label' => 'e-mailadres',
-		'type' => 'email',
-		'explain' => "Voor contact van of met deze site. Wij zullen dit nooit vrij- of doorgeven.",
-		'size' => 30,
-		'filename' => 'email.txt',
-	],
-	'avatar' => [
-		'label' => 'portretfoto',
-		'type' => 'file',
-		'filename' => 'avatar.jpg',
-	],
-	'tags' => [
-		'label' => 'groepen',
-		'values' => [],
-		'filename' => 'profile/.tags',
-	],
-];
+require_once('edit.inc.php');
 
 foreach ($cols as $col => &$colconf) {
 	if (!isset($colconf['filename'])) {
@@ -85,29 +60,6 @@ foreach ($cols as $col => &$colconf) {
 	$colconf['target'] = $colpath;  # editing allowed
 }
 
-$cols = [
-	'username' => [
-		'label' => 'login',
-		'value' => $user['name'],
-		'target' => NULL,
-		'pattern' => "[a-z0-9-]+",
-		'size' => 10,
-	],
-] + $cols;
-
-if (isset($user['pass'])) {
-	$cols['newpass'] = [
-		'label' => 'wachtwoord',
-		'input' => <<<'EOT'
-			<input type="password" name="oldpass" value="" placeholder="Huidig wachtwoord" />
-			<input type="password" id="newpass" name="newpass" value="" placeholder="Nieuw wachtwoord" />
-			<input type="password" name="passconf" value="" placeholder="Nogmaals" />
-EOT
-		,
-		'hide'  => 'pass',
-	];
-}
-
 $colwarn = [];
 if ($_POST) {
 	if (!file_exists($user['dir']) and !@mkdir($user['dir'])) {
-- 
2.30.0