X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/a6b8af793a309f090387e14d6c69b95dfc8e76d4..1079aa7d6a839379e09d185e712d1ba1613686fd:/login/edit.php

diff --git a/login/edit.php b/login/edit.php
index be27f9c..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'])) {
@@ -85,13 +110,17 @@ if ($_POST) {
 		if (!@move_uploaded_file($val['tmp_name'], $cols[$col]['target'])) {
 			$colwarn[$col] = "Fout bij opslaan.";
 		}
+		foreach (@glob('thumb/*/') as $thumbres) {
+			# attempt to remove old derivations
+			@unlink($thumbres.'/'.$cols[$col]['target']);
+		}
 		$cols[$col]['value'] = '';
 	}
 
 	if (!empty($_POST['newpass'])) {
 		require_once('login/pass.inc.php');
 		if ($error = passform($user, $_POST)) {
-			$colwarn['pass'] = $error;
+			$colwarn['newpass'] = $error;
 		}
 	}
 
@@ -105,59 +134,68 @@ 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) {
 	print "\t";
-	printf('<label for="%s">%s:</label> ', $col, ucfirst($colconf['label']));
+	printf('<li><label for="%s">%s:</label>', $col, ucfirst($colconf['label']));
 	if (@$colconf['type'] == 'file' and isset($colconf['value'])) {
-		printf('<a href="/%s"><img src="/thumb/%s/%s" /></a><br />',
+		printf('<a href="/%s"><img src="/thumb/%s/%s?%s" /></a><br />',
 			$colconf['target'],
-			200, $colconf['target']
+			200, $colconf['target'], filemtime($colconf['target'])
 		);
 	}
-	print "<input";
-	if (empty($colconf['target'])) print ' readonly';
-	printf(' type="%s" name="%s" id="%1$s" value="%s"',
-		@$colconf['type'] ?: 'text',
-		$col,
-		htmlspecialchars(@$colconf['value'])
-	);
-	if (@$colconf['type'] == 'file') {
-		printf(' accept="%s"', 'image/jpeg');
+
+	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
+		);
 	}
-	print ' placeholder="Niet ingesteld"';
-	print " />";
 
-	if ($error = @$colwarn[$col]) {
-		print " <span class=warn>$error</span>\n";
+	if (isset($colconf['input'])) {
+		print $colconf['input'];
 	}
-	print "<br />\n";
-}
+	else {
+		$attrs = [
+			'type'        => @$colconf['type'] ?: 'text',
+			'name'        => $col,
+			'id'          => $col,
+			'value'       => htmlspecialchars(@$colconf['value']),
+			'placeholder' => "Niet ingesteld",
+			'readonly'    => empty($colconf['target']),
+			'pattern'     => @$colconf['pattern'] ?: FALSE,
+		];
+		if (@$colconf['type'] == 'file') {
+			$attrs['accept'] = "image/jpeg";
+		}
 
-if (isset($user['pass'])) {
-	if ($hide = empty($_POST['newpass'])) {
-?>
-	<p><a onclick="document.getElementById('pass').removeAttribute('hidden'); this.remove()">Wachtwoord wijzigen</a></p>
-<?php
+		print '<input';
+		foreach ($attrs as $attr => $attrval) {
+			if ($attrval === FALSE) {
+				continue;
+			}
+			print ' ' . $attr;
+			if ($attrval !== TRUE) {
+				printf('="%s"', $attrval);
+			}
+		}
+		print ' />';
 	}
-?>
-	<div id="pass"<?php if ($hide) print ' hidden'; ?>>
-		<label for="newpass">Wachtwoord:</label>
-		<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 (!empty($colconf['explain'])) {
+		printf(' <span>(%s)</span>', $colconf['explain']);
+	}
+
+	if ($hide) {
+		print '</span>';
+	}
+
+	if ($error = @$colwarn[$col]) {
 		print " <span class=warn>$error</span>\n";
 	}
-?>
-	</div>
-<?php
+	print "</li>\n";
 }
 ?>
-	<input type="submit" value="Opslaan" />
+	</ul>
+	<p><input type="submit" value="Opslaan" /></p>
 </form>