X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/56252c8d2e764a9c6dacb35e61a730b54ac97723..d955f2d0837ca4c145546f56a8fe0d3a87f59052:/login/edit.php diff --git a/login/edit.php b/login/edit.php index f99c999..894264b 100644 --- a/login/edit.php +++ b/login/edit.php @@ -1,21 +1,41 @@ "profile/$username", + 'name' => $username, + ]; +} $cols = [ - 'email' => ['label' => 'e-mailadres', 'type' => 'email'], + 'name' => [ + 'label' => 'volledige naam', + 'explain' => "Alleen zichtbaar voor andere leden.", + ], + 'email' => [ + 'label' => 'e-mailadres', + 'type' => 'email', + 'explain' => "Voor contact van of met deze site. Wij zullen dit nooit vrij- of doorgeven.", + ], + 'avatar' => [ + 'label' => 'portretfoto', + 'type' => 'file', + ], ]; foreach ($cols as $col => &$colconf) { - $colpath = "$userdir/$col.txt"; + $filetype = @$colconf['type'] == 'file' ? 'jpg' : 'txt'; + $colpath = "{$user['dir']}/$col.$filetype"; if (file_exists($colpath)) { - $colconf['value'] = file_get_contents($colpath); + $colconf['value'] = $filetype != 'txt' ? '' : + file_get_contents($colpath); } - if (!is_writable($userdir)) { + if (file_exists($user['dir']) and !is_writable($user['dir'])) { continue; # locked parent directory } if (isset($colconf['value']) and !is_writable($colpath)) { @@ -24,8 +44,77 @@ foreach ($cols as $col => &$colconf) { $colconf['target'] = $colpath; # editing allowed } +$cols = [ + 'login' => [ + 'label' => 'login', + 'value' => $user['name'], + 'target' => NULL, + 'pattern' => "[a-z0-9-]+", + ], +] + $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) { + $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, + ]; + } +} + +if (isset($user['pass'])) { + $cols['newpass'] = [ + 'label' => 'wachtwoord', + 'input' => <<<'EOT' + + + +EOT + , + 'hide' => 'pass', + ]; +} + $colwarn = []; if ($_POST) { + if (!file_exists($user['dir']) and !@mkdir($user['dir'])) { + print "

Fout bij het aanmaken van gebruikersprofiel voor {$user['name']}.

\n\n"; + return; + } + foreach ($_POST as $col => $val) { if (!isset($cols[$col])) { continue; # unknown @@ -38,11 +127,68 @@ if ($_POST) { $colwarn[$col] = "Kan niet worden aangepast."; continue; } - if (!file_put_contents($cols[$col]['target'], $val)) { + if (file_put_contents($cols[$col]['target'], $val) === FALSE) { $colwarn[$col] = "Fout bij opslaan."; } } + 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 + } + switch ($val['error']) { + case UPLOAD_ERR_OK: + break; + case UPLOAD_ERR_NO_FILE: + continue 2; # current + default: + $colwarn[$col] = "Afbeelding niet goed ontvangen."; + continue 2; + } + if (empty($cols[$col]['target'])) { + $colwarn[$col] = "Kan niet worden aangepast."; + continue; + } + if (!@move_uploaded_file($val['tmp_name'], $cols[$col]['target'])) { + $colwarn[$col] = "Fout bij opslaan."; + } + foreach (@glob('thumb/*/') as $thumbres) { + # attempt to remove old derivations + @unlink($thumbres.'/'.$cols[$col]['target']); + } + $cols[$col]['value'] = ''; + } + + if (!empty($_POST['newpass'])) { + require_once('login/pass.inc.php'); + if ($error = passform($user, $_POST)) { + $colwarn['newpass'] = $error; + } + } + if ($colwarn) { print "

Instellingen zijn niet (volledig) opgeslagen. Probeer het later nog eens.

\n\n"; } @@ -52,29 +198,69 @@ if ($_POST) { } ?> -
-

- Geef een e-mailadres op waarmee we u kunnen bereiken indien nodig. - Wij zullen dit adres nooit vrij- of doorgeven. -

-

+ +

+