From 1888ccc749e367c424613800023c5e30adc247fa Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 8 Nov 2018 18:25:20 +0100
Subject: [PATCH] login/edit: generic setup of input attributes

---
 login/edit.inc.php | 9 +++++++--
 login/edit.php     | 7 +------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/login/edit.inc.php b/login/edit.inc.php
index b94fa7c..77bfc9b 100644
--- a/login/edit.inc.php
+++ b/login/edit.inc.php
@@ -4,8 +4,10 @@ $cols = [
 		'label' => 'login',
 		'value' => $user['name'],
 		'target' => NULL,
-		'pattern' => "[a-z0-9-]+",
-		'size' => 10,
+		'attr' => [
+			'pattern' => "[a-z0-9-]+",
+			'size' => 10,
+		],
 	],
 	'name'  => [
 		'label' => 'volledige naam',
@@ -24,6 +26,9 @@ $cols = [
 	'avatar' => [
 		'label' => 'portretfoto',
 		'type' => 'file',
+		'attr' => [
+			'accept' => "image/jpeg",
+		],
 		'filename' => 'avatar.jpg',
 	],
 	'tags' => [
diff --git a/login/edit.php b/login/edit.php
index 2b043cc..99afb13 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -217,12 +217,7 @@ foreach ($cols as $col => &$colconf) {
 			'value'       => htmlspecialchars(@$colconf['value']),
 			'placeholder' => "Niet ingesteld",
 			'readonly'    => empty($colconf['target']),
-			'pattern'     => @$colconf['pattern'] ?: FALSE,
-			'size'        => @$colconf['size'] ?: FALSE,
-		];
-		if (@$colconf['type'] == 'file') {
-			$attrs['accept'] = "image/jpeg";
-		}
+		] + (@$colconf['attr'] ?: []);
 
 		print '<input';
 		foreach ($attrs as $attr => $attrval) {
-- 
2.30.0