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

diff --git a/login/edit.php b/login/edit.php
index 894264b..4a2e6f4 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -4,8 +4,10 @@ if (empty($user = &$User)) {
 	return;
 }
 
-if (!empty($User['admin']) and $Page == 'login/edit' and $Args) {
-	$username = strtolower(ltrim($Args, '/'));
+if (!empty($User['admin'])
+and !empty($Place['user']) and $Place['user'] !== $User['name']) {
+	$username = strtolower($Place['user']);
+	unset($user);
 	$user = [
 		'dir' => "profile/$username",
 		'name' => $username,
@@ -16,21 +18,60 @@ $cols = [
 	'name'  => [
 		'label' => 'volledige naam',
 		'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);
@@ -45,56 +86,15 @@ foreach ($cols as $col => &$colconf) {
 }
 
 $cols = [
-	'login' => [
+	'username' => [
 		'label' => 'login',
 		'value' => $user['name'],
 		'target' => NULL,
 		'pattern' => "[a-z0-9-]+",
+		'size' => 10,
 	],
 ] + $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) {
-		$options = '';
-		foreach ($tags as $tag => $val) {
-			$options .= sprintf(
-				"\n\t\t" .
-				'<input type="hidden" name="tags[%1$s]" value="" />' .
-				'<input type="checkbox" name="tags[%s]" value="1"%s%s /> %s',
-				$tag,
-				$val['value'] ? ' checked' : '',
-				isset($val['target']) ? '' : ' readonly',
-				ucfirst($tag)
-			);
-		}
-
-		$cols['tags'] = [
-			'label' => 'groepen',
-			'input' => $options,
-			'values' => $tags,
-		];
-	}
-}
-
 if (isset($user['pass'])) {
 	$cols['newpass'] = [
 		'label' => 'wachtwoord',
@@ -119,12 +119,47 @@ if ($_POST) {
 		if (!isset($cols[$col])) {
 			continue; # unknown
 		}
+		if (isset($cols[$col]['values'])) {
+			$optwarn = [];
+			foreach ($val as $optcol => $optval) {
+				$option = &$cols[$col]['values'][$optcol];
+				if (!isset($option['target'])) {
+					$optok = FALSE;  # forbidden
+				}
+				if ($option['value'] === !empty($optval)) {
+					continue;  # unaltered
+				}
+				elseif (empty($optval)) {
+					$optok = @unlink($option['target']);
+				}
+				else {
+					# link option target to current user dir
+					$optok = @symlink("../../{$user['name']}", $option['target']);
+				}
+				$option['value'] = $optval;  # update form value
+				if (!$optok) {
+					$optwarn[$optcol] = TRUE;
+				}
+			}
+			if ($optwarn) {
+				$colwarn[$col] = "Wijziging niet opgeslagen voor "
+					. implode(', ', array_keys($optwarn));
+			}
+			continue;
+		}
+
+		if (isset($cols[$col]['filter'])) {
+			list ($targetstr, $inputstr) = $cols[$col]['filter'];
+			$val = str_replace($inputstr, $targetstr, $val);
+		}
 		if (isset($cols[$col]['value']) and $cols[$col]['value'] === $val) {
 			continue; # unaltered
 		}
 		$cols[$col]['value'] = $val;  # update form value
 		if (empty($cols[$col]['target'])) {
-			$colwarn[$col] = "Kan niet worden aangepast.";
+			if (empty($cols[$col]['input'])) {
+				$colwarn[$col] = "Kan niet worden aangepast.";
+			}
 			continue;
 		}
 		if (file_put_contents($cols[$col]['target'], $val) === FALSE) {
@@ -132,29 +167,6 @@ if ($_POST) {
 		}
 	}
 
-	if (isset($cols['tags']) and !empty($_POST['tags'])) {
-		$tagok = [];
-		foreach ($_POST['tags'] as $col => $val) {
-			$tag = $cols['tags']['values'][$col];
-			if (!isset($tag['target'])) {
-				$tagok[$col] = 'forbidden';
-			}
-			if ($tag['value'] === !empty($val)) {
-				$tagok[$col] = NULL;  # unaltered
-			}
-			elseif (empty($val)) {
-				$tagok[$col] = !@unlink($tag['target']);
-			}
-			else {
-				$tagok[$col] = !@symlink("../../{$user['name']}", $tag['target']);
-			}
-		}
-		if ($tagok = array_filter($tagok)) {
-			$colwarn['tags'] = "Wijziging niet opgeslagen voor "
-				. implode(', ', array_keys($tagok));
-		}
-	}
-
 	foreach ($_FILES as $col => $val) {
 		if (!isset($cols[$col]) and @$cols[$col]['type'] == 'file') {
 			continue; # unknown
@@ -221,7 +233,26 @@ foreach ($cols as $col => &$colconf) {
 	if (isset($colconf['input'])) {
 		print $colconf['input'];
 	}
+	elseif (isset($colconf['values'])) {
+		foreach ($colconf['values'] as $tag => $val) {
+			printf(
+				"\n\t\t" .
+				'<input type="hidden" name="%1$s" value="" />' .
+				'<input type="checkbox" name="%s" value="1" id="%s"%s%s />' .
+				'<label for="%2$s"> %s</label>',
+				"tags[$tag]", "tag-$tag",
+				$val['value'] ? ' checked' : '',
+				isset($val['target']) ? '' : ' readonly',
+				ucfirst($tag)
+			);
+		}
+	}
 	else {
+		if (isset($cols[$col]['filter'])) {
+			list ($targetstr, $inputstr) = $cols[$col]['filter'];
+			$colconf['value'] = str_replace($targetstr, $inputstr, $colconf['value']);
+		}
+
 		$attrs = [
 			'type'        => @$colconf['type'] ?: 'text',
 			'name'        => $col,
@@ -230,6 +261,7 @@ foreach ($cols as $col => &$colconf) {
 			'placeholder' => "Niet ingesteld",
 			'readonly'    => empty($colconf['target']),
 			'pattern'     => @$colconf['pattern'] ?: FALSE,
+			'size'        => @$colconf['size'] ?: FALSE,
 		];
 		if (@$colconf['type'] == 'file') {
 			$attrs['accept'] = "image/jpeg";
@@ -247,6 +279,7 @@ foreach ($cols as $col => &$colconf) {
 		}
 		print ' />';
 	}
+
 	if (!empty($colconf['explain'])) {
 		printf(' <span>(%s)</span>', $colconf['explain']);
 	}