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

diff --git a/login/edit.php b/login/edit.php
index 4a2e6f4..88272e0 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -14,59 +14,42 @@ and !empty($Place['user']) and $Place['user'] !== $User['name']) {
 	];
 }
 
-$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',
-	],
-];
+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;
-			#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
-			}
+			$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
 			}
-			$tags[$tagname]['target'] = $target;
+			$tagopt['target'] = $target;
 		}
 	}
 
@@ -74,7 +57,7 @@ foreach ($cols as $col => &$colconf) {
 	$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
@@ -85,29 +68,6 @@ foreach ($cols as $col => &$colconf) {
 	$colconf['target'] = $colpath;  # editing allowed
 }
 
-$cols = [
-	'username' => [
-		'label' => 'login',
-		'value' => $user['name'],
-		'target' => NULL,
-		'pattern' => "[a-z0-9-]+",
-		'size' => 10,
-	],
-] + $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'])) {
@@ -162,6 +122,9 @@ if ($_POST) {
 			}
 			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.";
 		}
@@ -171,27 +134,19 @@ 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'])) {
@@ -214,12 +169,17 @@ if ($_POST) {
 	<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)
 		);
 	}
 
@@ -241,16 +201,16 @@ foreach ($cols as $col => &$colconf) {
 				'<input type="checkbox" name="%s" value="1" id="%s"%s%s />' .
 				'<label for="%2$s"> %s</label>',
 				"tags[$tag]", "tag-$tag",
-				$val['value'] ? ' checked' : '',
+				!empty($val['value']) ? ' checked' : '',
 				isset($val['target']) ? '' : ' readonly',
-				ucfirst($tag)
+				@$val['label'] ?: ucfirst($tag)
 			);
 		}
 	}
-	else {
+	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']);
+			$colconf['value'] = str_replace($targetstr, $inputstr, @$colconf['value']);
 		}
 
 		$attrs = [
@@ -260,12 +220,7 @@ foreach ($cols as $col => &$colconf) {
 			'value'       => htmlspecialchars(@$colconf['value']),
 			'placeholder' => "Niet ingesteld",
 			'readonly'    => empty($colconf['target']),
-			'pattern'     => @$colconf['pattern'] ?: FALSE,
-			'size'        => @$colconf['size'] ?: FALSE,
-		];
-		if (@$colconf['type'] == 'file') {
-			$attrs['accept'] = "image/jpeg";
-		}
+		] + (@$colconf['attr'] ?: []);
 
 		print '<input';
 		foreach ($attrs as $attr => $attrval) {