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

Set correct message_id for threaded display

Browse Source 
SVN revision: 1450
This commit is contained in:
Stefan Ritt 2005-07-26 07:03:41 +00:00
parent 50084b328d
commit fb32680f8a
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
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.721 2005/07/26 07:03:41 ritt
Set correct message_id for threaded display
Revision 1.720 2005/07/25 20:09:38 ritt Revision 1.720 2005/07/25 20:09:38 ritt
Made elog: links abolute for email notification Made elog: links abolute for email notification
@ -6974,17 +6977,18 @@ void compose_base_url(LOGBOOK * lbs, char *base_url, int size)
{ {
/* try to get URL from referer */ /* try to get URL from referer */
if (!getcfg("global", "URL", base_url, size)) { if (!getcfg("global", "URL", base_url, size)) {
if (referer[0]) if (referer[0] && stristr(referer, "https:"))
strcpy(base_url, referer); strcpy(base_url, "https://");
else { else
if (elog_tcp_port == 80) strcpy(base_url, "http://");
sprintf(base_url, "http://%s/", host_name);
else if (elog_tcp_port == 80)
sprintf(base_url, "http://%s:%d/", host_name, elog_tcp_port); sprintf(base_url+strlen(base_url), "%s/", host_name);
if (lbs) { else
strlcat(base_url, lbs->name_enc, size); sprintf(base_url+strlen(base_url), "%s:%d/", host_name, elog_tcp_port);
strlcat(base_url, "/", size); if (lbs) {
} strlcat(base_url, lbs->name_enc, size);
strlcat(base_url, "/", size);
} }
} else { } else {
if (base_url[strlen(base_url) - 1] != '/') if (base_url[strlen(base_url) - 1] != '/')
@ -20103,6 +20107,8 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
/*---- display message ID ----*/ /*---- display message ID ----*/
_current_message_id = message_id;
if (email) { if (email) {
rsprintf("<tr><td class=\"title1\">\n"); rsprintf("<tr><td class=\"title1\">\n");
if (strieq(command, "oldemail")) if (strieq(command, "oldemail"))