Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-10 18:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with date attributes and 'subst on edit'

Browse Source 
SVN revision: 879
This commit is contained in:
Stefan Ritt 2004-05-21 13:02:51 +00:00
parent 95bcd5a98a
commit bb8f96e3f1
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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.328 2004/05/21 13:02:51 midas
Fixed bug with date attributes and 'subst on edit'
Revision 1.327 2004/05/19 20:27:50 midas Revision 1.327 2004/05/19 20:27:50 midas
Added <hr> and <br> to be recognized as HTML in attributes Added <hr> and <br> to be recognized as HTML in attributes
@ -6665,7 +6668,10 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
if (getcfg(lbs->name, str, preset)) { if (getcfg(lbs->name, str, preset)) {
/* check if already second reply */ /* check if already second reply */
if (orig_tag[0] == 0) { if (orig_tag[0] == 0) {
i = build_subst_list(lbs, slist, svalue, attrib, TRUE);
/* do not format date for date attributes */
i = build_subst_list(lbs, slist, svalue, attrib,
(attr_flags[index] & AF_DATE) == 0);
sprintf(str, "%d", message_id); sprintf(str, "%d", message_id);
add_subst_list(slist, svalue, "message id", str, &i); add_subst_list(slist, svalue, "message id", str, &i);
add_subst_time(lbs, slist, svalue, "entry time", date, &i); add_subst_time(lbs, slist, svalue, "entry time", date, &i);
@ -6681,7 +6687,11 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
for (index = 0; index < lbs->n_attr; index++) { for (index = 0; index < lbs->n_attr; index++) {
sprintf(str, "Subst on edit %s", attr_list[index]); sprintf(str, "Subst on edit %s", attr_list[index]);
if (getcfg(lbs->name, str, preset)) { if (getcfg(lbs->name, str, preset)) {
i = build_subst_list(lbs, slist, svalue, attrib, TRUE);
/* do not format date for date attributes */
i = build_subst_list(lbs, slist, svalue, attrib,
(attr_flags[index] & AF_DATE) == 0);
sprintf(str, "%d", message_id); sprintf(str, "%d", message_id);
add_subst_list(slist, svalue, "message id", str, &i); add_subst_list(slist, svalue, "message id", str, &i);
add_subst_time(lbs, slist, svalue, "entry time", date, &i); add_subst_time(lbs, slist, svalue, "entry time", date, &i);
@ -8737,7 +8747,10 @@ void show_new_user_page(LOGBOOK * lbs)
{ {
/*---- header ----*/ /*---- header ----*/
show_standard_header(lbs, TRUE, loc("ELOG new user"), ""); show_html_header(NULL, TRUE, loc("ELOG new user"), TRUE);
rsprintf("<body><center><p><p>\n");
show_top_text(lbs);
rsprintf("<form name=form1 method=\"GET\" action=\"\">\n\n");
/*---- title ----*/ /*---- title ----*/