Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-25 01:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with wrong date/time formatting in RSS feeds

Browse Source
This commit is contained in:
Stefan Ritt 2015-06-09 13:21:16 +02:00
parent 3b3b3307fa
commit 8b90ae88a3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/elogd.c
View File

@ -8717,7 +8717,7 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_
for (; i < lbs->n_attr; i++) { for (; i < lbs->n_attr; i++) {
strcpy(list[i], attr_list[i]); strcpy(list[i], attr_list[i]);
if (attrib) { if (attrib) {
if ((attr_flags[i] & (AF_DATE | AF_DATETIME)) && format_date) { if ((attr_flags[i] & AF_DATE) && format_date) {
t = (time_t) atoi(attrib[i]); t = (time_t) atoi(attrib[i]);
ts = localtime(&t); ts = localtime(&t);
@ -8727,6 +8727,16 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_
my_strftime(value[i], NAME_LENGTH, format, ts); my_strftime(value[i], NAME_LENGTH, format, ts);
} else if ((attr_flags[i] & AF_DATETIME) && format_date) {
t = (time_t) atoi(attrib[i]);
ts = localtime(&t);
assert(ts);
if (!getcfg(lbs->name, "Time format", format, sizeof(format)))
strcpy(format, DEFAULT_TIME_FORMAT);
my_strftime(value[i], NAME_LENGTH, format, ts);
} else } else
strcpy(value[i], attrib[i]); strcpy(value[i], attrib[i]);
} else } else
@ -23227,7 +23237,7 @@ void submit_elog(LOGBOOK * lbs)
sprintf(str, "EDIT multiple entries"); sprintf(str, "EDIT multiple entries");
else if (bdraft) else if (bdraft)
sprintf(str, "DRAFT entry #%d", message_id); sprintf(str, "DRAFT entry #%d", message_id);
else if (bedit) else if (bedit && !resubmit_orig)
sprintf(str, "EDIT entry #%d", message_id); sprintf(str, "EDIT entry #%d", message_id);
else else
sprintf(str, "NEW entry #%d", message_id); sprintf(str, "NEW entry #%d", message_id);
@ -23482,6 +23492,8 @@ void submit_elog(LOGBOOK * lbs)
old_mail = bedit; old_mail = bedit;
if (isparam("new_entry")) if (isparam("new_entry"))
old_mail = 0; old_mail = 0;
if (resubmit_orig)
old_mail = 0;
if (compose_email(lbs, rcpt_to, mail_to, message_id, attrib, mail_param, old_mail, att_file, if (compose_email(lbs, rcpt_to, mail_to, message_id, attrib, mail_param, old_mail, att_file,
isparam("encoding") ? getparam("encoding") : "plain", atoi(in_reply_to)) == 0) { isparam("encoding") ? getparam("encoding") : "plain", atoi(in_reply_to)) == 0) {