From 08a8551c3bf38ff1f4b36356cf58ef898530fe93 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Fri, 16 Feb 2007 15:43:52 +0000 Subject: [PATCH] Use 'use email from' only if no user email is available (as written in the documentation) SVN revision: 1789 --- src/elogd.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index 40fca81e..e6b6f1bb 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -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]; int i; - if (!getcfg(lbs->name, "Use Email from", str, sizeof(str))) { - if (isparam("full_name") && isparam("user_email")) { - strlcpy(email_from_name, getparam("full_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, ">", sizeof(email_from_name)); - strlcpy(email_from, getparam("user_email"), sizeof(email_from)); - } else { - sprintf(email_from_name, "ELog ", host_name); - sprintf(email_from, "ELog@%s", host_name); - } - } else { + if (isparam("full_name") && isparam("user_email")) { + strlcpy(email_from_name, getparam("full_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, ">", sizeof(email_from_name)); + strlcpy(email_from, getparam("user_email"), sizeof(email_from)); + } else if (getcfg(lbs->name, "Use Email from", str, sizeof(str))) { strlcpy(email_from, str, sizeof(email_from)); strlcpy(email_from_name, str, sizeof(email_from)); + } else { + sprintf(email_from_name, "ELog ", host_name); + sprintf(email_from, "ELog@%s", host_name); } if (attrib) {