login/edit: generate checkbox input after post handling

Generic handling of "values" attribute so form output can be updated.

diff --git a/login/edit.php b/login/edit.php
index 894264b336ac3cc638a5d8a6ab85b61838e8f8ab..56451b50303fe2633c8630bdafecc5f2c7c6c177 100644 (file)
--- 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" .
-                               '<input type="hidden" name="tags[%1$s]" value="" />' .
-                               '<input type="checkbox" name="tags[%s]" value="1"%s%s /> %s',
-                               $tag,
-                               $val['value'] ? ' checked' : '',
-                               isset($val['target']) ? '' : ' readonly',
-                               ucfirst($tag)
-                       );
-               }
-
                $cols['tags'] = [
                        'label' => 'groepen',
-                       'input' => $options,
                        'values' => $tags,
                ];
        }
@@ -119,6 +105,34 @@ 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
                }
@@ -132,29 +146,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 +212,19 @@ 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" .
+                               '<input type="hidden" name="tags[%1$s]" value="" />' .
+                               '<input type="checkbox" name="tags[%s]" value="1"%s%s /> %s',
+                               $tag,
+                               $val['value'] ? ' checked' : '',
+                               isset($val['target']) ? '' : ' readonly',
+                               ucfirst($tag)
+                       );
+               }
+       }
        else {
                $attrs = [
                        'type'        => @$colconf['type'] ?: 'text',
@@ -247,6 +251,7 @@ foreach ($cols as $col => &$colconf) {
                }
                print ' />';
        }
+
        if (!empty($colconf['explain'])) {
                printf(' <span>(%s)</span>', $colconf['explain']);
        }