X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/1888ccc749e367c424613800023c5e30adc247fa..f46f7a3b080b947af711ab35601c26f6423cbe8b:/login/edit.php?ds=inline
diff --git a/login/edit.php b/login/edit.php
index 99afb13..88272e0 100644
--- 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);
- $tagopt = &$colconf['values'][$tagname];
- $tagopt = ['value' => $val];
+ $tagopt = &$colconf['values'][$tagname] ?: [];
+ $tagopt['value'] = $val;
if (!is_writable($tag)) {
continue; # locked tag directory
}
@@ -57,7 +57,7 @@ foreach ($cols as $col => &$colconf) {
$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
@@ -122,6 +122,9 @@ if ($_POST) {
}
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.";
}
@@ -198,9 +201,9 @@ foreach ($cols as $col => &$colconf) {
'' .
'',
"tags[$tag]", "tag-$tag",
- $val['value'] ? ' checked' : '',
+ !empty($val['value']) ? ' checked' : '',
isset($val['target']) ? '' : ' readonly',
- ucfirst($tag)
+ @$val['label'] ?: ucfirst($tag)
);
}
}