return;
}
-if (!empty($User['admin']) and $Page == 'login/edit' and $Args) {
- $username = strtolower(ltrim($Args, '/'));
+if (!empty($User['admin'])
+and !empty($Place['user']) and $Place['user'] !== $User['name']) {
+ $username = strtolower($Place['user']);
+ unset($user);
$user = [
'dir' => "profile/$username",
'name' => $username,
];
}
-$cols = [
- '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',
- ],
-];
+require_once('edit.inc.php');
foreach ($cols as $col => &$colconf) {
+ if (isset($colconf['visible'])) {
+ if ($colconf['visible'] == 'admin' and empty($User['admin'])) {
+ $colconf['visible'] = FALSE;
+ continue;
+ }
+ }
+ else {
+ $colconf['visible'] = TRUE;
+ }
+
+ if (!isset($colconf['filename'])) {
+ continue; # exceptional storage
+ }
+
+ if (isset($colconf['values'])) {
+ if (!file_exists($colconf['filename'])) {
+ $colconf['visible'] = FALSE;
+ continue;
+ }
+ $tags = [];
+ foreach (glob($colconf['filename'] . '/*') as $tag) {
+ $tagname = pathinfo($tag, PATHINFO_BASENAME);
+ $target = "$tag/{$user['name']}";
+ $val = file_exists($target);
+ $tagopt = &$colconf['values'][$tagname] ?: [];
+ $tagopt['value'] = $val;
+ if (!is_writable($tag)) {
+ continue; # locked tag directory
+ }
+ if ($val and !is_writable($target)) {
+ continue; # existing file locked
+ }
+ $tagopt['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);
+ rtrim(file_get_contents($colpath));
}
if (file_exists($user['dir']) and !is_writable($user['dir'])) {
continue; # locked parent directory
$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) {
- $cols['tags'] = [
- 'label' => 'groepen',
- 'values' => $tags,
- ];
- }
-}
-
-if (isset($user['pass'])) {
- $cols['newpass'] = [
- 'label' => 'wachtwoord',
- 'input' => <<<'EOT'
- <input type="password" name="oldpass" value="" placeholder="Huidig wachtwoord" />
- <input type="password" id="newpass" name="newpass" value="" placeholder="Nieuw wachtwoord" />
- <input type="password" name="passconf" value="" placeholder="Nogmaals" />
-EOT
- ,
- 'hide' => 'pass',
- ];
-}
-
$colwarn = [];
if ($_POST) {
if (!file_exists($user['dir']) and !@mkdir($user['dir'])) {
}
continue;
}
+
+ if (isset($cols[$col]['filter'])) {
+ list ($targetstr, $inputstr) = $cols[$col]['filter'];
+ $val = str_replace($inputstr, $targetstr, $val);
+ }
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 (@$cols[$col]['type'] != 'file') {
+ $val .= "\n"; # eol in text files
+ }
if (file_put_contents($cols[$col]['target'], $val) === FALSE) {
$colwarn[$col] = "Fout bij opslaan.";
}
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.";
+ try {
+ require_once('upload.inc.php');
+ $target = userupload($val, NULL, $cols[$col]['target']);
+ if (!$target) continue;
+ $cols[$col]['value'] = '';
}
- foreach (@glob('thumb/*/') as $thumbres) {
- # attempt to remove old derivations
- @unlink($thumbres.'/'.$cols[$col]['target']);
+ catch (Exception $e) {
+ $colwarn[$col] = ucfirst($e->getMessage()).'.';
}
- $cols[$col]['value'] = '';
}
if (!empty($_POST['newpass'])) {
<ul class="grid">
<?php
foreach ($cols as $col => &$colconf) {
+ if (!$colconf['visible']) {
+ continue;
+ }
+
print "\t";
printf('<li><label for="%s">%s:</label>', $col, ucfirst($colconf['label']));
if (@$colconf['type'] == 'file' and isset($colconf['value'])) {
+ $target = $user['dir'] . '/' . $colconf['filename'];
printf('<a href="/%s"><img src="/thumb/%s/%s?%s" /></a><br />',
- $colconf['target'],
- 200, $colconf['target'], filemtime($colconf['target'])
+ $target,
+ 200, $target, filemtime($target)
);
}
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' : '',
+ '<input type="hidden" name="%1$s" value="" />' .
+ '<input type="checkbox" name="%s" value="1" id="%s"%s%s />' .
+ '<label for="%2$s"> %s</label>',
+ "tags[$tag]", "tag-$tag",
+ !empty($val['value']) ? ' checked' : '',
isset($val['target']) ? '' : ' readonly',
- ucfirst($tag)
+ @$val['label'] ?: ucfirst($tag)
);
}
}
- else {
+ elseif (@$colconf['type'] !== 'file' or isset($colconf['target'])) {
+ if (isset($cols[$col]['filter'])) {
+ list ($targetstr, $inputstr) = $cols[$col]['filter'];
+ $colconf['value'] = str_replace($targetstr, $inputstr, @$colconf['value']);
+ }
+
$attrs = [
'type' => @$colconf['type'] ?: 'text',
'name' => $col,
'value' => htmlspecialchars(@$colconf['value']),
'placeholder' => "Niet ingesteld",
'readonly' => empty($colconf['target']),
- 'pattern' => @$colconf['pattern'] ?: FALSE,
- ];
- if (@$colconf['type'] == 'file') {
- $attrs['accept'] = "image/jpeg";
- }
+ ] + (@$colconf['attr'] ?: []);
print '<input';
foreach ($attrs as $attr => $attrval) {
git.shiar.nl / minimedit.git / blobdiff