X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/0fc1504852e9630502651eaa35c2c04ba777bda3..e82cf405761c0c188f5e675f47ada92bd641ab34:/login/edit.php

diff --git a/login/edit.php b/login/edit.php
index 6dfbfab..4002cb9 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -13,8 +13,15 @@ if (!empty($User['admin']) and $Page == 'login/edit' and $Args) {
 }
 
 $cols = [
-	'name'  => ['label' => 'volledige naam'],
-	'email' => ['label' => 'e-mailadres', 'type' => 'email'],
+	'name'  => [
+		'label' => 'volledige naam',
+		'explain' => "Alleen zichtbaar voor andere leden.",
+	],
+	'email' => [
+		'label' => 'e-mailadres',
+		'type' => 'email',
+		'explain' => "Voor contact van of met deze site. Wij zullen dit nooit vrij- of doorgeven.",
+	],
 	'avatar' => [
 		'label' => 'portretfoto',
 		'type' => 'file',
@@ -38,9 +45,27 @@ foreach ($cols as $col => &$colconf) {
 }
 
 $cols = [
-	'login' => ['label' => 'login', 'value' => $user['name'], 'target' => NULL],
+	'login' => [
+		'label' => 'login',
+		'value' => $user['name'],
+		'target' => NULL,
+		'pattern' => "[a-z0-9-]+",
+	],
 ] + $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'])) {
@@ -95,7 +120,7 @@ if ($_POST) {
 	if (!empty($_POST['newpass'])) {
 		require_once('login/pass.inc.php');
 		if ($error = passform($user, $_POST)) {
-			$colwarn['pass'] = $error;
+			$colwarn['newpass'] = $error;
 		}
 	}
 
@@ -109,10 +134,6 @@ if ($_POST) {
 
 ?>
 <form method="post" enctype="multipart/form-data">
-	<p>
-	Geef een e-mailadres op waarmee we u kunnen bereiken indien nodig.
-	Wij zullen dit adres nooit vrij- of doorgeven.
-	</p>
 	<ul class="grid">
 <?php
 foreach ($cols as $col => &$colconf) {
@@ -125,7 +146,17 @@ foreach ($cols as $col => &$colconf) {
 		);
 	}
 
-	{
+	if ($hide = @$colconf['hide'] and empty($_POST[$col])) {
+		printf('<a onclick="%s">Wijzigen</a><span id="%s" hidden>',
+			"document.getElementById('$hide').removeAttribute('hidden'); this.remove()",
+			$hide
+		);
+	}
+
+	if (isset($colconf['input'])) {
+		print $colconf['input'];
+	}
+	else {
 		$attrs = [
 			'type'        => @$colconf['type'] ?: 'text',
 			'name'        => $col,
@@ -133,6 +164,7 @@ foreach ($cols as $col => &$colconf) {
 			'value'       => htmlspecialchars(@$colconf['value']),
 			'placeholder' => "Niet ingesteld",
 			'readonly'    => empty($colconf['target']),
+			'pattern'     => @$colconf['pattern'] ?: FALSE,
 		];
 		if (@$colconf['type'] == 'file') {
 			$attrs['accept'] = "image/jpeg";
@@ -150,34 +182,18 @@ foreach ($cols as $col => &$colconf) {
 		}
 		print ' />';
 	}
-
-	if ($error = @$colwarn[$col]) {
-		print " <span class=warn>$error</span>\n";
+	if (!empty($colconf['explain'])) {
+		printf(' <span>(%s)</span>', $colconf['explain']);
 	}
-	print "</li>\n";
-}
 
-if (isset($user['pass'])) {
-?>
-	<li><label for="newpass">Wachtwoord:</label>
-<?php
-	if ($hide = empty($_POST['newpass'])) {
-?>
-		<a onclick="document.getElementById('pass').removeAttribute('hidden'); this.remove()">Wijzigen</a>
-<?php
+	if ($hide) {
+		print '</span>';
 	}
-?>
-		<span id="pass"<?php if ($hide) print ' hidden'; ?>>
-			<input type="password" name="oldpass" value="" placeholder="Huidig wachtwoord" />
-			<input type="password" name="newpass" value="" placeholder="Nieuw wachtwoord" />
-			<input type="password" name="passconf" value="" placeholder="Nogmaals" />
-<?php
-	if ($error = @$colwarn['pass']) {
+
+	if ($error = @$colwarn[$col]) {
 		print " <span class=warn>$error</span>\n";
 	}
-?>
-	</li>
-<?php
+	print "</li>\n";
 }
 ?>
 	</ul>