login/edit: generic multi-values declaration

[minimedit.git] / login / edit.php

diff --git a/login/edit.php b/login/edit.php
index 46e2447e34e5e5bfc63634a3e01e86130dc9b4bf..4a2e6f4665c39d429d08a8fea4203ee401878150 100644 (file)
--- a/login/edit.php
+++ b/login/edit.php
@@ -4,7 +4,8 @@ if (empty($user = &$User)) {
        return;
 }
 
-if (!empty($User['admin']) and !empty($Place['user'])) {
+if (!empty($User['admin'])
+and !empty($Place['user']) and $Place['user'] !== $User['name']) {
        $username = strtolower($Place['user']);
        unset($user);
        $user = [
@@ -19,22 +20,58 @@ $cols = [
                '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',
        ],
 ];
 
 foreach ($cols as $col => &$colconf) {
+       if (!isset($colconf['filename'])) {
+               continue;  # exceptional storage
+       }
+
+       if (isset($colconf['values'])) {
+               if (!file_exists($colconf['filename'])) {
+                       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
+                       }
+                       if (!is_writable($tag)) {
+                               continue;  # locked tag directory
+                       }
+                       if ($val and !is_writable($target)) {
+                               continue;  # existing file locked
+                       }
+                       $tags[$tagname]['target'] = $target;
+               }
+       }
+
        $filetype = @$colconf['type'] == 'file' ? 'jpg' : 'txt';
-       $colpath = "{$user['dir']}/$col.$filetype";
+       $colpath = $user['dir'] . '/' . $colconf['filename'];
        if (file_exists($colpath)) {
                $colconf['value'] = $filetype != 'txt' ? '' :
                        file_get_contents($colpath);
@@ -58,34 +95,6 @@ $cols = [
        ],
 ] + $cols;
 
-$tagdir = 'profile/.tags';
-if (file_exists($tagdir)) {
-       $tags = [];
-       foreach (glob("$tagdir/*") 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
-               }
-               if (!is_writable($tag)) {
-                       continue;  # locked tag directory
-               }
-               if ($val and !is_writable($target)) {
-                       continue;  # existing file locked
-               }
-               $tags[$tagname]['target'] = $target;
-       }
-
-       if ($tags) {
-               $cols['tags'] = [
-                       'label' => 'groepen',
-                       'values' => $tags,
-               ];
-       }
-}
-
 if (isset($user['pass'])) {
        $cols['newpass'] = [
                'label' => 'wachtwoord',