git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
foto: common override of navigation root title
[minimedit.git]
/
login
/
edit.php
diff --git
a/login/edit.php
b/login/edit.php
index 99afb13a62b745cfe08068c340815aa480cb1ff4..88272e0c7917457592117fdb01e27a6e252d1ee6 100644
(file)
--- 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);
$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
}
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' ? '' :
$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
}
if (file_exists($user['dir']) and !is_writable($user['dir'])) {
continue; # locked parent directory
@@
-122,6
+122,9
@@
if ($_POST) {
}
continue;
}
}
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 (file_put_contents($cols[$col]['target'], $val) === FALSE) {
$colwarn[$col] = "Fout bij opslaan.";
}
@@
-198,9
+201,9
@@
foreach ($cols as $col => &$colconf) {
'<input type="checkbox" name="%s" value="1" id="%s"%s%s />' .
'<label for="%2$s"> %s</label>',
"tags[$tag]", "tag-$tag",
'<input type="checkbox" name="%s" value="1" id="%s"%s%s />' .
'<label for="%2$s"> %s</label>',
"tags[$tag]", "tag-$tag",
-
$val['value']
? ' checked' : '',
+
!empty($val['value'])
? ' checked' : '',
isset($val['target']) ? '' : ' readonly',
isset($val['target']) ? '' : ' readonly',
- ucfirst($tag)
+
@$val['label'] ?:
ucfirst($tag)
);
}
}
);
}
}