diff --git a/src/elog-version.h b/src/elog-version.h index d177ef87..7c9041fa 100644 --- a/src/elog-version.h +++ b/src/elog-version.h @@ -26,7 +26,7 @@ \********************************************************************/ /* Version of ELOG */ -#define VERSION "3.1.0" +#define VERSION "3.1.1" /* ELOG identification */ static const char ELOGID[] = "elogd " VERSION " built " __DATE__ ", " __TIME__; diff --git a/src/elogd.c b/src/elogd.c index 85f71488..454540f4 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -8323,7 +8323,7 @@ void show_error(char *error) rsprintf("\n"); rsprintf("\n"); rsprintf("%s\n", loc("ELOG error")); - rsprintf("\n"); + rsprintf("\n"); rsprintf("\n"); rsprintf("
\n"); @@ -9472,7 +9472,7 @@ void compare_attributes(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][N int check_drafts(LOGBOOK * lbs) { time_t now; - char draft[256], title[256], datetime[256]; + char str[1000], draft[256], title[256], datetime[256], attrib[MAX_N_ATTR][NAME_LENGTH]; int i, n_draft, *draft_id = NULL; /* if we got here already and user clicked "Create new entry", ignore is set and we skip this */ @@ -9482,10 +9482,10 @@ int check_drafts(LOGBOOK * lbs) time(&now); /* check if any recent draft */ for (i=n_draft=0 ; i<*(lbs->n_el_index) ; i++) - if (lbs->el_index[i].file_time > now-3600*24) { - el_retrieve(lbs, lbs->el_index[i].message_id, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, draft); - if (draft[0]) { + if (lbs->el_index[i].file_time > now-3600*24*7) { // only one week to reduce seek time + el_retrieve(lbs, lbs->el_index[i].message_id, NULL, attr_list, attrib, lbs->n_attr, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, draft); + if (draft[0] && is_author(lbs, attrib, draft)) { if (n_draft == 0) draft_id = (int *)xmalloc(sizeof(int)); else @@ -9515,7 +9515,8 @@ int check_drafts(LOGBOOK * lbs) NULL, NULL, draft); rsprintf(""); - rsprintf("Draft entry created on %s\n", datetime); + sprintf(str, loc("Draft entry created on %s by %s"), datetime, draft); + rsprintf("%s\n", str); rsprintf(""); rsprintf("", loc("Edit"), draft_id[i]); @@ -26014,6 +26015,8 @@ void show_login_page(LOGBOOK * lbs, char *redir, int fail) rsprintf(""); + rsprintf("\n", loc("Please login")); + if (fail == 1) { strlcpy(str, loc("Invalid user name or password"), sizeof(str)); rsprintf("\n", str); @@ -26024,8 +26027,6 @@ void show_login_page(LOGBOOK * lbs, char *redir, int fail) rsprintf("\n", str); } - rsprintf("\n", loc("Please login")); - rsprintf("
%s
%s!
%s!
%s
\n"); rsprintf("\n"); rsprintf("\n", loc("Username")); @@ -27351,7 +27352,7 @@ void interprete(char *lbook, char *path) /* if password file given, check session ID */ if (getcfg(lbs->name, "Password file", str, sizeof(str))) { /* get current CSS */ - strlcpy(css, "default.css", sizeof(css)); + strlcpy(css, "elog.css", sizeof(css)); if (lbs != NULL && getcfg(lbs->name, "CSS", str, sizeof(str))) strlcpy(css, str, sizeof(css)); else if (lbs == NULL && getcfg("global", "CSS", str, sizeof(str)))