login/edit: option to override tag labels

Sites can predefine elements of "values" with preferred label names instead
of fallback to file names.

diff --git a/login/edit.php b/login/edit.php
index e60cf59bb046414c705bf1df138817f456e44e95..88272e0c7917457592117fdb01e27a6e252d1ee6 100644 (file)
--- a/login/edit.php
+++ b/login/edit.php
@@ -41,8 +41,8 @@ foreach ($cols as $col => &$colconf) {
                        $tagname = pathinfo($tag, PATHINFO_BASENAME);
                        $target = "$tag/{$user['name']}";
                        $val = file_exists($target);
                        $tagname = pathinfo($tag, PATHINFO_BASENAME);
                        $target = "$tag/{$user['name']}";
                        $val = file_exists($target);

-                       $tagopt = &$colconf['values'][$tagname];
-                       $tagopt = ['value' => $val];
+                       $tagopt = &$colconf['values'][$tagname] ?: [];
+                       $tagopt['value'] = $val;

                        if (!is_writable($tag)) {
                                continue;  # locked tag directory
                        }
                        if (!is_writable($tag)) {
                                continue;  # locked tag directory
                        }


@@ -201,9 +201,9 @@ 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",
                                '<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',
                                isset($val['target']) ? '' : ' readonly',

-                               ucfirst($tag)
+                               @$val['label'] ?: ucfirst($tag)

                        );
                }
        }
                        );
                }
        }