X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/862d91755026431efbf621e3da7107f26ba221ed..b153d8fc29f423b3cc67ca9dbcab874ab9ab0464:/login/edit.php

diff --git a/login/edit.php b/login/edit.php
index ad9dbda..2b043cc 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -17,31 +17,39 @@ and !empty($Place['user']) and $Place['user'] !== $User['name']) {
 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;
 		}
 	}
 
@@ -158,12 +166,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)
 		);
 	}
 
@@ -191,10 +204,10 @@ foreach ($cols as $col => &$colconf) {
 			);
 		}
 	}
-	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 = [