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

'Use email from' has priority over user email address

Browse Source 
SVN revision: 1073
This commit is contained in:
Stefan Ritt 2004-09-14 22:12:47 +00:00
parent 31e7e8fed9
commit 78b5cdd3e6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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.469 2004/09/14 22:12:47 midas
'Use email from' has priority over user email address
Revision 1.468 2004/09/10 14:06:42 midas Revision 1.468 2004/09/10 14:06:42 midas
Fixed bug with select return status Fixed bug with select return status
@ -3176,10 +3179,12 @@ void retrieve_email_from(LOGBOOK * lbs, char *ret)
{ {
char str[256]; char str[256];
if (isparam("user_email") && *getparam("user_email")) if (!getcfg(lbs->name, "Use Email from", str, sizeof(str))) {
strcpy(str, getparam("user_email")); if (isparam("user_email") && *getparam("user_email"))
else if (!getcfg(lbs->name, "Use Email from", str, sizeof(str))) strcpy(str, getparam("user_email"));
sprintf(str, "ELog@%s", host_name); else
sprintf(str, "ELog@%s", host_name);
}
strcpy(ret, str); strcpy(ret, str);
} }