X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/d955f2d0837ca4c145546f56a8fe0d3a87f59052..ba8fa8b5c4d31cee564509441abab1580ed1fa76:/login/edit.php?ds=sidebyside
diff --git a/login/edit.php b/login/edit.php
index 894264b..31d4d20 100644
--- a/login/edit.php
+++ b/login/edit.php
@@ -74,22 +74,8 @@ if (file_exists($tagdir)) {
}
if ($tags) {
- $options = '';
- foreach ($tags as $tag => $val) {
- $options .= sprintf(
- "\n\t\t" .
- '' .
- ' %s',
- $tag,
- $val['value'] ? ' checked' : '',
- isset($val['target']) ? '' : ' readonly',
- ucfirst($tag)
- );
- }
-
$cols['tags'] = [
'label' => 'groepen',
- 'input' => $options,
'values' => $tags,
];
}
@@ -119,12 +105,42 @@ 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]['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 +148,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,6 +214,20 @@ 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" .
+ '' .
+ '' .
+ '',
+ "tags[$tag]", "tag-$tag",
+ $val['value'] ? ' checked' : '',
+ isset($val['target']) ? '' : ' readonly',
+ ucfirst($tag)
+ );
+ }
+ }
else {
$attrs = [
'type' => @$colconf['type'] ?: 'text',
@@ -247,6 +254,7 @@ foreach ($cols as $col => &$colconf) {
}
print ' />';
}
+
if (!empty($colconf['explain'])) {
printf(' (%s)', $colconf['explain']);
}