diff --git a/src/elogd.c b/src/elogd.c index 21b8e535..2d2a160a 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.715 2005/07/23 16:30:42 ritt + Fixed {n} display with ROptions + Revision 1.714 2005/07/23 16:22:14 ritt Added condition evaluation in list display @@ -9791,17 +9794,21 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL rsprintf("\n"); for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; i++) { - if (strstr(attrib[index], attr_options[index][i])) + strlcpy(str, attr_options[index][i], sizeof(str)); + if (strchr(str, '{')) + *strchr(str, '{') = 0; + + if (strstr(attrib[index], attr_options[index][i]) + || strieq(str, attrib[index])) rsprintf ("\n"); if (format_flags[index] & AFF_MULTI_LINE)
\n", - attr_options[index][i], ua, attr_options[index][i]); + str, ua, str); else rsprintf ("\n", - attr_options[index][i], ua, attr_options[index][i]); + str, ua, str); - rsprintf("\n", - attr_options[index][i], attr_options[index][i]); + rsprintf("\n", str, str); rsprintf("