X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/41a0a7314f1ded16e05af79d0d7f3b945b799486..e82cf405761c0c188f5e675f47ada92bd641ab34:/login/edit.php

diff --git a/login/edit.php b/login/edit.php
index ba7e785..4002cb9 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -1,29 +1,41 @@
 <?php
 global $User;
-if (empty($User)) {
+if (empty($user = &$User)) {
 	return;
 }
 
-$userdir = $User['dir'];
 if (!empty($User['admin']) and $Page == 'login/edit' and $Args) {
-	$user = ltrim($Args, '/');
-	$userdir = "profile/$user";
-	if (!is_writable($userdir)) {
-		print "<p class=warn>Het is niet mogelijk om de gebruiker <em>$user</em> aan te passen.</p>\n\n";
-		return;
-	}
+	$username = strtolower(ltrim($Args, '/'));
+	$user = [
+		'dir' => "profile/$username",
+		'name' => $username,
+	];
 }
 
 $cols = [
-	'email' => ['label' => 'e-mailadres', 'type' => 'email'],
+	'name'  => [
+		'label' => 'volledige naam',
+		'explain' => "Alleen zichtbaar voor andere leden.",
+	],
+	'email' => [
+		'label' => 'e-mailadres',
+		'type' => 'email',
+		'explain' => "Voor contact van of met deze site. Wij zullen dit nooit vrij- of doorgeven.",
+	],
+	'avatar' => [
+		'label' => 'portretfoto',
+		'type' => 'file',
+	],
 ];
 
 foreach ($cols as $col => &$colconf) {
-	$colpath = "$userdir/$col.txt";
+	$filetype = @$colconf['type'] == 'file' ? 'jpg' : 'txt';
+	$colpath = "{$user['dir']}/$col.$filetype";
 	if (file_exists($colpath)) {
-		$colconf['value'] = file_get_contents($colpath);
+		$colconf['value'] = $filetype != 'txt' ? '' :
+			file_get_contents($colpath);
 	}
-	if (!is_writable($userdir)) {
+	if (file_exists($user['dir']) and !is_writable($user['dir'])) {
 		continue;  # locked parent directory
 	}
 	if (isset($colconf['value']) and !is_writable($colpath)) {
@@ -32,8 +44,35 @@ foreach ($cols as $col => &$colconf) {
 	$colconf['target'] = $colpath;  # editing allowed
 }
 
+$cols = [
+	'login' => [
+		'label' => 'login',
+		'value' => $user['name'],
+		'target' => NULL,
+		'pattern' => "[a-z0-9-]+",
+	],
+] + $cols;
+
+if (isset($user['pass'])) {
+	$cols['newpass'] = [
+		'label' => 'wachtwoord',
+		'input' => <<<'EOT'
+			<input type="password" name="oldpass" value="" placeholder="Huidig wachtwoord" />
+			<input type="password" id="newpass" name="newpass" value="" placeholder="Nieuw wachtwoord" />
+			<input type="password" name="passconf" value="" placeholder="Nogmaals" />
+EOT
+		,
+		'hide'  => 'pass',
+	];
+}
+
 $colwarn = [];
 if ($_POST) {
+	if (!file_exists($user['dir']) and !@mkdir($user['dir'])) {
+		print "<p class=warn>Fout bij het aanmaken van gebruikersprofiel voor <em>{$user['name']}</em>.</p>\n\n";
+		return;
+	}
+
 	foreach ($_POST as $col => $val) {
 		if (!isset($cols[$col])) {
 			continue; # unknown
@@ -46,11 +85,45 @@ if ($_POST) {
 			$colwarn[$col] = "Kan niet worden aangepast.";
 			continue;
 		}
-		if (!file_put_contents($cols[$col]['target'], $val)) {
+		if (file_put_contents($cols[$col]['target'], $val) === FALSE) {
 			$colwarn[$col] = "Fout bij opslaan.";
 		}
 	}
 
+	foreach ($_FILES as $col => $val) {
+		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.";
+		}
+		foreach (@glob('thumb/*/') as $thumbres) {
+			# attempt to remove old derivations
+			@unlink($thumbres.'/'.$cols[$col]['target']);
+		}
+		$cols[$col]['value'] = '';
+	}
+
+	if (!empty($_POST['newpass'])) {
+		require_once('login/pass.inc.php');
+		if ($error = passform($user, $_POST)) {
+			$colwarn['newpass'] = $error;
+		}
+	}
+
 	if ($colwarn) {
 		print "<p class=warn>Instellingen zijn niet (volledig) opgeslagen. Probeer het later nog eens.</p>\n\n";
 	}
@@ -60,29 +133,69 @@ if ($_POST) {
 }
 
 ?>
-<form method="post" class="inline">
-	<p>
-	Geef een e-mailadres op waarmee we u kunnen bereiken indien nodig.
-	Wij zullen dit adres nooit vrij- of doorgeven.
-	</p>
-	<p>
+<form method="post" enctype="multipart/form-data">
+	<ul class="grid">
 <?php
 foreach ($cols as $col => &$colconf) {
-	print "\t<input";
-	if (empty($colconf['target'])) print ' readonly';
-	printf(' type="%s" name="%s" id="%1$s" value="%s"',
-		@$colconf['type'] ?: 'text',
-		$col,
-		htmlspecialchars(@$colconf['value'])
-	);
-	print ' placeholder="Geen '.$colconf['label'].' ingesteld"';
-	print " />\n";
+	print "\t";
+	printf('<li><label for="%s">%s:</label>', $col, ucfirst($colconf['label']));
+	if (@$colconf['type'] == 'file' and isset($colconf['value'])) {
+		printf('<a href="/%s"><img src="/thumb/%s/%s?%s" /></a><br />',
+			$colconf['target'],
+			200, $colconf['target'], filemtime($colconf['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
+		);
+	}
+
+	if (isset($colconf['input'])) {
+		print $colconf['input'];
+	}
+	else {
+		$attrs = [
+			'type'        => @$colconf['type'] ?: 'text',
+			'name'        => $col,
+			'id'          => $col,
+			'value'       => htmlspecialchars(@$colconf['value']),
+			'placeholder' => "Niet ingesteld",
+			'readonly'    => empty($colconf['target']),
+			'pattern'     => @$colconf['pattern'] ?: FALSE,
+		];
+		if (@$colconf['type'] == 'file') {
+			$attrs['accept'] = "image/jpeg";
+		}
+
+		print '<input';
+		foreach ($attrs as $attr => $attrval) {
+			if ($attrval === FALSE) {
+				continue;
+			}
+			print ' ' . $attr;
+			if ($attrval !== TRUE) {
+				printf('="%s"', $attrval);
+			}
+		}
+		print ' />';
+	}
+	if (!empty($colconf['explain'])) {
+		printf(' <span>(%s)</span>', $colconf['explain']);
+	}
+
+	if ($hide) {
+		print '</span>';
+	}
 
 	if ($error = @$colwarn[$col]) {
-		print "<span class=warn>$error</span>\n";
+		print " <span class=warn>$error</span>\n";
 	}
+	print "</li>\n";
 }
 ?>
-	<input type="submit" value="Opslaan" />
-	</p>
+	</ul>
+	<p><input type="submit" value="Opslaan" /></p>
 </form>