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

Show HTML logbook comment properly

Browse Source 
SVN revision: 1481
This commit is contained in:
Stefan Ritt 2005-09-06 07:15:43 +00:00
parent c27ddd9702
commit db8d2dacf0
1 changed files with 15 additions and 4 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.746 2005/09/06 07:15:43 ritt
Show HTML logbook comment properly
Revision 1.745 2005/08/06 19:14:04 ritt Revision 1.745 2005/08/06 19:14:04 ritt
Fixed bug in stristr() Fixed bug in stristr()
@ -7931,7 +7934,7 @@ void show_standard_title(char *logbook, char *text, int printable)
/* build reference to first logbook in group */ /* build reference to first logbook in group */
comment[0] = 0; comment[0] = 0;
if (pnode->member[i]->member == NULL) { if (pnode->member[i]->member == NULL) {
getcfg(ref, "Comment", comment, sizeof(comment)); getcfg(pnode->member[i]->name, "Comment", comment, sizeof(comment));
strlcpy(ref, str, sizeof(ref)); // current node is logbook strlcpy(ref, str, sizeof(ref)); // current node is logbook
} else { } else {
flb = pnode->member[i]->member[0]; // current node is group flb = pnode->member[i]->member[0]; // current node is group
@ -7970,7 +7973,7 @@ void show_standard_title(char *logbook, char *text, int printable)
rsputs3(comment); rsputs3(comment);
rsprintf("\">"); rsprintf("\">");
} else } else
rsprintf("<a href=\"../%s/\">", ref, comment); rsprintf("<a href=\"../%s/\">", ref);
strlcpy(str, pnode->member[i]->name, sizeof(str)); strlcpy(str, pnode->member[i]->name, sizeof(str));
@ -8008,7 +8011,12 @@ void show_standard_title(char *logbook, char *text, int printable)
strcpy(str, logbook); strcpy(str, logbook);
rsprintf("&nbsp;&nbsp;"); rsprintf("&nbsp;&nbsp;");
rsputs3(str);
if (is_html(str))
rsputs(str);
else
rsputs3(str);
rsputs3(text); rsputs3(text);
rsprintf("&nbsp;</td>\n"); rsprintf("&nbsp;</td>\n");
@ -21661,7 +21669,10 @@ void show_logbook_node(LBLIST plb, LBLIST pparent, int level, int btop)
str[0] = 0; str[0] = 0;
getcfg(lb_list[index].name, "Comment", str, sizeof(str)); getcfg(lb_list[index].name, "Comment", str, sizeof(str));
rsprintf("<span class=\"selcomment\">"); rsprintf("<span class=\"selcomment\">");
rsputs3(str); if (is_html(str))
rsputs(str);
else
rsputs3(str);
rsprintf("</span></td>\n"); rsprintf("</span></td>\n");
rsprintf("<td nowrap class=\"selentries\">"); rsprintf("<td nowrap class=\"selentries\">");
rsprintf("%d", *lb_list[index].n_el_index); rsprintf("%d", *lb_list[index].n_el_index);