X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/ad3e6d4c050c69ede417a37a4c5a710f90d27349..v3.4-14-g970fb1d1b9:/login/edit.php

diff --git a/login/edit.php b/login/edit.php
index e38ebc1..4a2e6f4 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -20,22 +20,58 @@ $cols = [
 		'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',
 	],
 ];
 
 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']}/$col.$filetype";
+	$colpath = $user['dir'] . '/' . $colconf['filename'];
 	if (file_exists($colpath)) {
 		$colconf['value'] = $filetype != 'txt' ? '' :
 			file_get_contents($colpath);
@@ -59,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',