X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/3027600c279ef2be4098028e3c7736a637539e97..943688a66694cc3d97188c7b789207aa3ee8bfc2:/login/edit.php

diff --git a/login/edit.php b/login/edit.php
index 4e52506..88272e0 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -4,29 +4,60 @@ 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,
 	];
 }
 
-$cols = [
-	'name'  => ['label' => 'volledige naam'],
-	'email' => ['label' => 'e-mailadres', 'type' => 'email'],
-	'avatar' => [
-		'label' => 'portretfoto',
-		'type' => 'file',
-	],
-];
+require_once('edit.inc.php');
 
 foreach ($cols as $col => &$colconf) {
+	if (isset($colconf['visible'])) {
+		if ($colconf['visible'] == 'admin' and empty($User['admin'])) {
+			$colconf['visible'] = FALSE;
+			continue;
+		}
+	}
+	else {
+		$colconf['visible'] = TRUE;
+	}
+
+	if (!isset($colconf['filename'])) {
+		continue;  # exceptional storage
+	}
+
+	if (isset($colconf['values'])) {
+		if (!file_exists($colconf['filename'])) {
+			$colconf['visible'] = FALSE;
+			continue;
+		}
+		$tags = [];
+		foreach (glob($colconf['filename'] . '/*') as $tag) {
+			$tagname = pathinfo($tag, PATHINFO_BASENAME);
+			$target = "$tag/{$user['name']}";
+			$val = file_exists($target);
+			$tagopt = &$colconf['values'][$tagname] ?: [];
+			$tagopt['value'] = $val;
+			if (!is_writable($tag)) {
+				continue;  # locked tag directory
+			}
+			if ($val and !is_writable($target)) {
+				continue;  # existing file locked
+			}
+			$tagopt['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);
+			rtrim(file_get_contents($colpath));
 	}
 	if (file_exists($user['dir']) and !is_writable($user['dir'])) {
 		continue;  # locked parent directory
@@ -37,10 +68,6 @@ foreach ($cols as $col => &$colconf) {
 	$colconf['target'] = $colpath;  # editing allowed
 }
 
-$cols = [
-	'login' => ['label' => 'login', 'value' => $user['name'], 'target' => NULL],
-] + $cols;
-
 $colwarn = [];
 if ($_POST) {
 	if (!file_exists($user['dir']) and !@mkdir($user['dir'])) {
@@ -52,14 +79,52 @@ 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 (@$cols[$col]['type'] != 'file') {
+			$val .= "\n"; # eol in text files
+		}
 		if (file_put_contents($cols[$col]['target'], $val) === FALSE) {
 			$colwarn[$col] = "Fout bij opslaan.";
 		}
@@ -69,33 +134,25 @@ if ($_POST) {
 		if (!isset($cols[$col]) and @$cols[$col]['type'] == 'file') {
 			continue; # unknown
 		}
-		switch ($val['error']) {
-		case UPLOAD_ERR_OK:
-			break;
-		case UPLOAD_ERR_NO_FILE:
-			continue 2; # current
-		default:
-			$colwarn[$col] = "Afbeelding niet goed ontvangen.";
-			continue 2;
-		}
 		if (empty($cols[$col]['target'])) {
 			$colwarn[$col] = "Kan niet worden aangepast.";
 			continue;
 		}
-		if (!@move_uploaded_file($val['tmp_name'], $cols[$col]['target'])) {
-			$colwarn[$col] = "Fout bij opslaan.";
+		try {
+			require_once('upload.inc.php');
+			$target = userupload($val, NULL, $cols[$col]['target']);
+			if (!$target) continue;
+			$cols[$col]['value'] = '';
 		}
-		foreach (@glob('thumb/*/') as $thumbres) {
-			# attempt to remove old derivations
-			@unlink($thumbres.'/'.$cols[$col]['target']);
+		catch (Exception $e) {
+			$colwarn[$col] = ucfirst($e->getMessage()).'.';
 		}
-		$cols[$col]['value'] = '';
 	}
 
 	if (!empty($_POST['newpass'])) {
 		require_once('login/pass.inc.php');
 		if ($error = passform($user, $_POST)) {
-			$colwarn['pass'] = $error;
+			$colwarn['newpass'] = $error;
 		}
 	}
 
@@ -109,61 +166,87 @@ 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) {
+	if (!$colconf['visible']) {
+		continue;
+	}
+
 	print "\t";
 	printf('<li><label for="%s">%s:</label>', $col, ucfirst($colconf['label']));
 	if (@$colconf['type'] == 'file' and isset($colconf['value'])) {
+		$target = $user['dir'] . '/' . $colconf['filename'];
 		printf('<a href="/%s"><img src="/thumb/%s/%s?%s" /></a><br />',
-			$colconf['target'],
-			200, $colconf['target'], filemtime($colconf['target'])
+			$target,
+			200, $target, filemtime($target)
+		);
+	}
+
+	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 "<input";
-	if (empty($colconf['target'])) print ' readonly';
-	printf(' type="%s" name="%s" id="%2$s" value="%s"',
-		@$colconf['type'] ?: 'text',
-		$col,
-		htmlspecialchars(@$colconf['value'])
-	);
-	if (@$colconf['type'] == 'file') {
-		printf(' accept="%s"', 'image/jpeg');
+
+	if (isset($colconf['input'])) {
+		print $colconf['input'];
 	}
-	print ' placeholder="Niet ingesteld"';
-	print " />";
+	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",
+				!empty($val['value']) ? ' checked' : '',
+				isset($val['target']) ? '' : ' readonly',
+				@$val['label'] ?: ucfirst($tag)
+			);
+		}
+	}
+	elseif (@$colconf['type'] !== 'file' or isset($colconf['target'])) {
+		if (isset($cols[$col]['filter'])) {
+			list ($targetstr, $inputstr) = $cols[$col]['filter'];
+			$colconf['value'] = str_replace($targetstr, $inputstr, @$colconf['value']);
+		}
 
-	if ($error = @$colwarn[$col]) {
-		print " <span class=warn>$error</span>\n";
+		$attrs = [
+			'type'        => @$colconf['type'] ?: 'text',
+			'name'        => $col,
+			'id'          => $col,
+			'value'       => htmlspecialchars(@$colconf['value']),
+			'placeholder' => "Niet ingesteld",
+			'readonly'    => empty($colconf['target']),
+		] + (@$colconf['attr'] ?: []);
+
+		print '<input';
+		foreach ($attrs as $attr => $attrval) {
+			if ($attrval === FALSE) {
+				continue;
+			}
+			print ' ' . $attr;
+			if ($attrval !== TRUE) {
+				printf('="%s"', $attrval);
+			}
+		}
+		print ' />';
 	}
-	print "</li>\n";
-}
 
-if (isset($user['pass'])) {
-?>
-	<li><label for="newpass">Wachtwoord:</label>
-<?php
-	if ($hide = empty($_POST['newpass'])) {
-?>
-		<a onclick="document.getElementById('pass').removeAttribute('hidden'); this.remove()">Wijzigen</a>
-<?php
+	if (!empty($colconf['explain'])) {
+		printf(' <span>(%s)</span>', $colconf['explain']);
 	}
-?>
-		<span id="pass"<?php if ($hide) print ' hidden'; ?>>
-			<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 ($hide) {
+		print '</span>';
+	}
+
+	if ($error = @$colwarn[$col]) {
 		print " <span class=warn>$error</span>\n";
 	}
-?>
-	</li>
-<?php
+	print "</li>\n";
 }
 ?>
 	</ul>