Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 'use email from' only if no user email is available (as written in the documentation)

Browse Source 
SVN revision: 1789
This commit is contained in:
Stefan Ritt 2007-02-16 15:43:52 +00:00
parent 7f26328677
commit 08a8551c3b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/elogd.c
View File

@ -3386,20 +3386,18 @@ void retrieve_email_from(LOGBOOK * lbs, char *ret, char *ret_name, char attrib[M
char slist[MAX_N_ATTR + 10][NAME_LENGTH], svalue[MAX_N_ATTR + 10][NAME_LENGTH]; char slist[MAX_N_ATTR + 10][NAME_LENGTH], svalue[MAX_N_ATTR + 10][NAME_LENGTH];
int i; int i;
if (!getcfg(lbs->name, "Use Email from", str, sizeof(str))) { if (isparam("full_name") && isparam("user_email")) {
if (isparam("full_name") && isparam("user_email")) { strlcpy(email_from_name, getparam("full_name"), sizeof(email_from_name));
strlcpy(email_from_name, getparam("full_name"), sizeof(email_from_name)); strlcat(email_from_name, " <", sizeof(email_from_name));
strlcat(email_from_name, " <", sizeof(email_from_name)); strlcat(email_from_name, getparam("user_email"), sizeof(email_from_name));
strlcat(email_from_name, getparam("user_email"), sizeof(email_from_name)); strlcat(email_from_name, ">", sizeof(email_from_name));
strlcat(email_from_name, ">", sizeof(email_from_name)); strlcpy(email_from, getparam("user_email"), sizeof(email_from));
strlcpy(email_from, getparam("user_email"), sizeof(email_from)); } else if (getcfg(lbs->name, "Use Email from", str, sizeof(str))) {
} else {
sprintf(email_from_name, "ELog <ELog@%s>", host_name);
sprintf(email_from, "ELog@%s", host_name);
}
} else {
strlcpy(email_from, str, sizeof(email_from)); strlcpy(email_from, str, sizeof(email_from));
strlcpy(email_from_name, str, sizeof(email_from)); strlcpy(email_from_name, str, sizeof(email_from));
} else {
sprintf(email_from_name, "ELog <ELog@%s>", host_name);
sprintf(email_from, "ELog@%s", host_name);
} }
if (attrib) { if (attrib) {