git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
login: support eol in text configuration files
[minimedit.git]
/
login
/
edit.php
diff --git
a/login/edit.php
b/login/edit.php
index 1d29b03d203fec26440e5213521ae6774aa7f3e9..e60cf59bb046414c705bf1df138817f456e44e95 100644
(file)
--- a/
login/edit.php
+++ b/
login/edit.php
@@
-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.";
}
@@
-173,9
+176,10
@@
foreach ($cols as $col => &$colconf) {
print "\t";
printf('<li><label for="%s">%s:</label>', $col, ucfirst($colconf['label']));
if (@$colconf['type'] == 'file' and isset($colconf['value'])) {
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 />',
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
)
);
}
);
}
@@
-203,7
+207,7
@@
foreach ($cols as $col => &$colconf) {
);
}
}
);
}
}
- else {
+ else
if (@$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']);
if (isset($cols[$col]['filter'])) {
list ($targetstr, $inputstr) = $cols[$col]['filter'];
$colconf['value'] = str_replace($targetstr, $inputstr, @$colconf['value']);
@@
-216,12
+220,7
@@
foreach ($cols as $col => &$colconf) {
'value' => htmlspecialchars(@$colconf['value']),
'placeholder' => "Niet ingesteld",
'readonly' => empty($colconf['target']),
'value' => htmlspecialchars(@$colconf['value']),
'placeholder' => "Niet ingesteld",
'readonly' => empty($colconf['target']),
- 'pattern' => @$colconf['pattern'] ?: FALSE,
- 'size' => @$colconf['size'] ?: FALSE,
- ];
- if (@$colconf['type'] == 'file') {
- $attrs['accept'] = "image/jpeg";
- }
+ ] + (@$colconf['attr'] ?: []);
print '<input';
foreach ($attrs as $attr => $attrval) {
print '<input';
foreach ($attrs as $attr => $attrval) {