X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/63a9e4ae1c297d714f8d172da0f2152439f262ea..v3.7-15-g1888ccc749:/login/edit.php diff --git a/login/edit.php b/login/edit.php index 759eba5..99afb13 100644 --- a/login/edit.php +++ b/login/edit.php @@ -4,33 +4,57 @@ if (empty($user = &$User)) { 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); @@ -44,58 +68,6 @@ 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']}"; - $tags[$tagname] = file_exists($tagname); - } - - if ($tags) { - $options = ''; - foreach ($tags as $tag => $val) { - $options .= sprintf( - "\n\t\t" . - '' . - ' %s', - $tag, - $val ? ' checked' : '', - ' readonly', - ucfirst($tag) - ); - } - - $cols['tags'] = [ - 'label' => 'groepen', - 'input' => $options, - ]; - } -} - -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'])) { @@ -107,12 +79,47 @@ 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]['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 (file_put_contents($cols[$col]['target'], $val) === FALSE) { @@ -124,27 +131,19 @@ if ($_POST) { 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'])) { @@ -167,12 +166,17 @@ if ($_POST) {