From 970fb1d1b99f99327dc5217c7dc074fe2e614579 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 10 Jul 2018 23:58:20 +0200
Subject: [PATCH] login/edit: generic multi-values declaration

Move tags setup code into common loop so placement can be configured.
---
 login/edit.php | 58 ++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/login/edit.php b/login/edit.php
index e174b06..4a2e6f4 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -34,12 +34,42 @@ $cols = [
 		'type' => 'file',
 		'filename' => 'avatar.jpg',
 	],
+	'tags' => [
+		'label' => 'groepen',
+		'values' => [],
+		'filename' => 'profile/.tags',
+	],
 ];
 
 foreach ($cols as $col => &$colconf) {
 	if (!isset($colconf['filename'])) {
 		continue;  # exceptional storage
 	}
+
+	if (isset($colconf['values'])) {
+		if (!file_exists($colconf['filename'])) {
+			continue;
+			#TODO: drop key
+		}
+		$tags = [];
+		foreach (glob($colconf['filename'] . '/*') as $tag) {
+			$tagname = pathinfo($tag, PATHINFO_BASENAME);
+			$target = "$tag/{$user['name']}";
+			$val = file_exists($target);
+			$tags[$tagname] = ['value' => $val];
+			if (empty($User['admin'])) {
+				continue;  # forbidden
+			}
+			if (!is_writable($tag)) {
+				continue;  # locked tag directory
+			}
+			if ($val and !is_writable($target)) {
+				continue;  # existing file locked
+			}
+			$tags[$tagname]['target'] = $target;
+		}
+	}
+
 	$filetype = @$colconf['type'] == 'file' ? 'jpg' : 'txt';
 	$colpath = $user['dir'] . '/' . $colconf['filename'];
 	if (file_exists($colpath)) {
@@ -65,34 +95,6 @@ $cols = [
 	],
 ] + $cols;
 
-$tagdir = 'profile/.tags';
-if (file_exists($tagdir)) {
-	$tags = [];
-	foreach (glob("$tagdir/*") as $tag) {
-		$tagname = pathinfo($tag, PATHINFO_BASENAME);
-		$target = "$tag/{$user['name']}";
-		$val = file_exists($target);
-		$tags[$tagname] = ['value' => $val];
-		if (empty($User['admin'])) {
-			continue;  # forbidden
-		}
-		if (!is_writable($tag)) {
-			continue;  # locked tag directory
-		}
-		if ($val and !is_writable($target)) {
-			continue;  # existing file locked
-		}
-		$tags[$tagname]['target'] = $target;
-	}
-
-	if ($tags) {
-		$cols['tags'] = [
-			'label' => 'groepen',
-			'values' => $tags,
-		];
-	}
-}
-
 if (isset($user['pass'])) {
 	$cols['newpass'] = [
 		'label' => 'wachtwoord',
-- 
2.30.0