Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-12 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Substitutions now also work with 'preset test'

Browse Source 
SVN revision: 816
This commit is contained in:
Stefan Ritt 2004-03-08 09:41:23 +00:00
parent 2a6c16519c
commit 59b3d93290
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.283 2004/03/08 09:41:23 midas
Substitutions now also work with 'preset test'
Revision 1.282 2004/03/08 08:59:06 midas Revision 1.282 2004/03/08 08:59:06 midas
Evaluage 'pre/append on edit/reply' even for empty entries Evaluage 'pre/append on edit/reply' even for empty entries
@ -6935,7 +6938,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf(str); rsprintf(str);
} }
} }
} else { } else if (breply) {
if (!getcfg_cond(lbs->name, condition, "Quote on reply", str) if (!getcfg_cond(lbs->name, condition, "Quote on reply", str)
|| atoi(str) > 0) { || atoi(str) > 0) {
if (getcfg_cond(lbs->name, condition, "Prepend on reply", str)) { if (getcfg_cond(lbs->name, condition, "Prepend on reply", str)) {
@ -7019,8 +7022,13 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
close(fh); close(fh);
rsputs(buffer); rsputs(buffer);
free(buffer); free(buffer);
} else } else {
j = build_subst_list(lbs, slist, svalue, attrib, TRUE);
strsubst(str, slist, svalue, j);
while (strstr(str, "\\n"))
memcpy(strstr(str, "\\n"), "\r\n", 2);
rsputs(str); rsputs(str);
}
} }
rsprintf("</textarea><br>\n"); rsprintf("</textarea><br>\n");