From dcc7e7d22e31dca92096ade41705819040ad8091 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Mon, 2 May 2005 10:06:33 +0000 Subject: [PATCH] Version 2.5.9-1 SVN revision: 1339 --- doc/ChangeLog | 28 ++++++++++++++++++++++++++++ doc/index.html | 2 +- eloglang.brazilian | 6 ++++++ eloglang.bulgarian | 6 ++++++ eloglang.danish | 6 ++++++ eloglang.dutch | 6 ++++++ eloglang.french | 10 ++++++++++ eloglang.german | 7 +++++++ eloglang.italian | 6 ++++++ eloglang.japanese | 6 ++++++ eloglang.spanish | 6 ++++++ src/elogd.c | 35 ++++++++++++++++++++--------------- 12 files changed, 108 insertions(+), 16 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 208c97b8..67cf836a 100755 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,31 @@ +Version 2.5.9, released May 2nd, 2005 +===================================== + +- Added str_escape from Emiliano Gabrielli +- Implemented 'case sensitive search' flag +- Applied patch from Emiliano to fix possible buffer overflow +- Fixed crashes with very long (revisions) attributes +- Fixed missing icons in top groups +- Fixed wrong year under IE with datetime attibutes +- Added SMTP error reporting +- Added 'set current time/date' funcitonality +- Use base64 encoding for email subject +- Adde 'Raw' mode for export +- Fixed bug with conditions and '&' +- Fixed crash on 'm*' regex search +- Redirect to source logbook for copy/move +- Open attachments in separate browser window +- Implemented drop-down boxes for copy/move also on individual entry page +- Implemented 'Duplicate' command +- Implemented datetime format +- Subsittute ' ' in attachment file names by '_' +- Changed is_ascii() to accept umlaute +- Implemented 'expand selection', defaulting to one +- Applied patch from Recai to give precedence to directories from the command line +- Fixed problem with '&' in href links +- Fixed problem with 'protect selection page' and invalid authentication +- Fixed bug with crashing elog on 'protect selection page' + Version 2.5.8, released March 21st, 2005 ======================================== diff --git a/doc/index.html b/doc/index.html index 2314a86d..24fdeb93 100755 --- a/doc/index.html +++ b/doc/index.html @@ -25,7 +25,7 @@  [Links]  * 

Home of the Electronic Logbook package by Stefan Ritt

-
Current version is : 2.5.8
+
Current version is : 2.5.9
  What is ELOG ?  
diff --git a/eloglang.brazilian b/eloglang.brazilian index 0fc89f17..05beb9ec 100755 --- a/eloglang.brazilian +++ b/eloglang.brazilian @@ -353,3 +353,9 @@ Subscribe to logbooks = enable automatic email notifications = Set all = Set none = +Set current time = +Please enter hour for attribute '%s' = +Please enter minute for attribute '%s' = +Please enter second for attribute '%s' = +No admin user has been defined in configuration file = +Duplicate = diff --git a/eloglang.bulgarian b/eloglang.bulgarian index c3783dbc..3332d878 100755 --- a/eloglang.bulgarian +++ b/eloglang.bulgarian @@ -353,3 +353,9 @@ Subscribe to logbooks = enable automatic email notifications = Set all = Set none = +Set current time = +Please enter hour for attribute '%s' = +Please enter minute for attribute '%s' = +Please enter second for attribute '%s' = +No admin user has been defined in configuration file = +Duplicate = diff --git a/eloglang.danish b/eloglang.danish index 0f4aeadd..a851f92b 100755 --- a/eloglang.danish +++ b/eloglang.danish @@ -353,3 +353,9 @@ Subscribe to logbooks = enable automatic email notifications = Set all = Set none = +Set current time = +Please enter hour for attribute '%s' = +Please enter minute for attribute '%s' = +Please enter second for attribute '%s' = +No admin user has been defined in configuration file = +Duplicate = diff --git a/eloglang.dutch b/eloglang.dutch index 1d4db070..d6102a46 100755 --- a/eloglang.dutch +++ b/eloglang.dutch @@ -356,3 +356,9 @@ Subscribe to logbooks = enable automatic email notifications = Set all = Set none = +Set current time = +Please enter hour for attribute '%s' = +Please enter minute for attribute '%s' = +Please enter second for attribute '%s' = +No admin user has been defined in configuration file = +Duplicate = diff --git a/eloglang.french b/eloglang.french index a5bcf1a2..16e8988b 100755 --- a/eloglang.french +++ b/eloglang.french @@ -349,3 +349,13 @@ Subscribe to logbooks = S'abonner aux registres enable automatic email notifications = activer les notifications par mél. Set all = Activer tout Set none = Désactiver tout + +# +#---- please translate following items and then remove this comment ----# +# +Set current time = +Please enter hour for attribute '%s' = +Please enter minute for attribute '%s' = +Please enter second for attribute '%s' = +No admin user has been defined in configuration file = +Duplicate = diff --git a/eloglang.german b/eloglang.german index df4dd40b..9adf2699 100755 --- a/eloglang.german +++ b/eloglang.german @@ -348,3 +348,10 @@ Subscribe to logbooks = Logb enable automatic email notifications = Automatische Email Benachrichtigung ermöglichen Set all = Alle ermöglichen Set none = Keinen ermöglichen +Set current time = Aktuelle Zeit setzen +Please enter hour for attribute '%s' = Bitte Stunde eingeben für Attribut '%s' +Please enter minute for attribute '%s' = Bitte Minute eingeben für Attribut '%s' +Please enter second for attribute '%s' = Bitte Sekunde eingeben für Attribut '%s' +No admin user has been defined in configuration file = In der Konfigurationsdatei ist kein Benutzer mit Administrationsrechten eingetragen +Duplicate = Duplizieren + diff --git a/eloglang.italian b/eloglang.italian index 2fbeca3e..88dbb543 100755 --- a/eloglang.italian +++ b/eloglang.italian @@ -352,3 +352,9 @@ Subscribe to logbooks = enable automatic email notifications = Set all = Set none = +Set current time = +Please enter hour for attribute '%s' = +Please enter minute for attribute '%s' = +Please enter second for attribute '%s' = +No admin user has been defined in configuration file = +Duplicate = diff --git a/eloglang.japanese b/eloglang.japanese index 55794088..02cafc4a 100755 --- a/eloglang.japanese +++ b/eloglang.japanese @@ -351,3 +351,9 @@ Subscribe to logbooks = enable automatic email notifications = Set all = Set none = +Set current time = +Please enter hour for attribute '%s' = +Please enter minute for attribute '%s' = +Please enter second for attribute '%s' = +No admin user has been defined in configuration file = +Duplicate = diff --git a/eloglang.spanish b/eloglang.spanish index 6828395a..1afbbfe6 100755 --- a/eloglang.spanish +++ b/eloglang.spanish @@ -349,3 +349,9 @@ Subscribe to logbooks = enable automatic email notifications = Set all = Set none = +Set current time = +Please enter hour for attribute '%s' = +Please enter minute for attribute '%s' = +Please enter second for attribute '%s' = +No admin user has been defined in configuration file = +Duplicate = diff --git a/src/elogd.c b/src/elogd.c index 5397a34b..5ae1f098 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.641 2005/05/02 10:06:33 ritt + Version 2.5.9-1 + Revision 1.640 2005/04/29 20:26:12 ritt Added str_escape from Emiliano Gabrielli @@ -1035,7 +1038,7 @@ \********************************************************************/ /* Version of ELOG */ -#define VERSION "2.5.8-6" +#define VERSION "2.5.9-1" char cvs_revision[] = "$Id$"; /* ELOG identification */ @@ -1910,7 +1913,7 @@ void strsubst(char *string, int size, char name[][NAME_LENGTH], char value[][NAM /* subsitute "$name" with value corresponding to name */ { int i, j; - char tmp[2*NAME_LENGTH], str[2*NAME_LENGTH], uattr[2*NAME_LENGTH], *ps, *pt, *p; + char tmp[2 * NAME_LENGTH], str[2 * NAME_LENGTH], uattr[2 * NAME_LENGTH], *ps, *pt, *p; pt = tmp; ps = string; @@ -1940,7 +1943,7 @@ void strsubst(char *string, int size, char name[][NAME_LENGTH], char value[][NAM /* copy value */ if (i < n) { - strlcpy(pt, value[i], sizeof(tmp)-((int)pt-(int)tmp)); + strlcpy(pt, value[i], sizeof(tmp) - ((int) pt - (int) tmp)); pt += strlen(pt); ps = p + strlen(uattr); } else { @@ -1950,7 +1953,7 @@ void strsubst(char *string, int size, char name[][NAME_LENGTH], char value[][NAM } /* copy remainder */ - strlcpy(pt, ps, sizeof(tmp)-((int)pt-(int)tmp)); + strlcpy(pt, ps, sizeof(tmp) - ((int) pt - (int) tmp)); /* return result */ strlcpy(string, tmp, size); @@ -8016,7 +8019,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL int i, j, n, index, aindex, size, width, height, fh, length, input_size, input_maxlen, format_flags[MAX_N_ATTR], year, month, day, hour, min, sec, n_attr, n_disp_attr, attr_index[MAX_N_ATTR]; - char str[2*NAME_LENGTH], preset[2*NAME_LENGTH], *p, *pend, star[80], comment[10000], reply_string[256], + char str[2 * NAME_LENGTH], preset[2 * NAME_LENGTH], *p, *pend, star[80], comment[10000], reply_string[256], list[MAX_N_ATTR][NAME_LENGTH], file_name[256], *buffer, format[256], date[80], attrib[MAX_N_ATTR][NAME_LENGTH], *text, orig_tag[80], reply_tag[MAX_REPLY_TO * 10], att[MAX_ATTACHMENTS][256], encoding[80], slist[MAX_N_ATTR + 10][NAME_LENGTH], @@ -8323,10 +8326,10 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL strsubst(preset, sizeof(preset), slist, svalue, i); if (strlen(preset) > NAME_LENGTH - 100) { - if (strstr(preset+100, "
")) { - strlcpy(str, strstr(preset+100, "
"), sizeof(str)); + if (strstr(preset + 100, "
")) { + strlcpy(str, strstr(preset + 100, "
"), sizeof(str)); } else - strlcpy(str, preset+100, sizeof(str)); + strlcpy(str, preset + 100, sizeof(str)); strcpy(preset, "..."); strlcat(preset, str, sizeof(str)); @@ -9642,7 +9645,7 @@ void show_find_form(LOGBOOK * lbs) rsprintf("\n"); rsprintf("\n"); rsprintf("\n", loc("Search text also in attributes")); - + if (getcfg(lbs->name, "Case sensitive search", str, sizeof(str)) && atoi(str)) rsprintf("\n"); else @@ -14022,7 +14025,8 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, add_subst_time(lbs, (char (*)[NAME_LENGTH]) slist, (char (*)[NAME_LENGTH]) svalue, "entry time", date, &j); - strsubst(display, sizeof(display), (char (*)[NAME_LENGTH]) slist, (char (*)[NAME_LENGTH]) svalue, j); + strsubst(display, sizeof(display), (char (*)[NAME_LENGTH]) slist, + (char (*)[NAME_LENGTH]) svalue, j); } else sprintf(display, "%d", message_id); @@ -16000,7 +16004,8 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf add_subst_time(lbs, (char (*)[NAME_LENGTH]) slist, (char (*)[NAME_LENGTH]) svalue, "entry time", date, &j); - strsubst(str, sizeof(str), (char (*)[NAME_LENGTH]) slist, (char (*)[NAME_LENGTH]) svalue, j); + strsubst(str, sizeof(str), (char (*)[NAME_LENGTH]) slist, (char (*)[NAME_LENGTH]) svalue, + j); setparam(attr_list[i], str); } @@ -18237,7 +18242,7 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command) int size, i, j, n, n_log, status, fh, length, message_error, index, n_hidden, message_id, orig_message_id, format_flags[MAX_N_ATTR], att_hide[MAX_ATTACHMENTS], n_attachments, n_lines; - char str[2*NAME_LENGTH], ref[256], file_enc[256], thumb_name[256], attrib[MAX_N_ATTR][NAME_LENGTH]; + char str[2 * NAME_LENGTH], ref[256], file_enc[256], thumb_name[256], attrib[MAX_N_ATTR][NAME_LENGTH]; char date[80], text[TEXT_SIZE], menu_str[1000], cmd[256], cmd_enc[256], orig_tag[80], reply_tag[MAX_REPLY_TO * 10], display[NAME_LENGTH], attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], @@ -18853,7 +18858,8 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command) add_subst_time(lbs, (char (*)[NAME_LENGTH]) slist, (char (*)[NAME_LENGTH]) svalue, "entry time", date, &j); - strsubst(display, sizeof(display), (char (*)[NAME_LENGTH]) slist, (char (*)[NAME_LENGTH]) svalue, j); + strsubst(display, sizeof(display), (char (*)[NAME_LENGTH]) slist, + (char (*)[NAME_LENGTH]) svalue, j); } else strcpy(display, attrib[i]); @@ -20505,8 +20511,7 @@ void interprete(char *lbook, char *path) /* deliver icons without password */ if (chkext(path, ".gif") || chkext(path, ".jpg") || - chkext(path, ".png") || chkext(path, ".ico") || - chkext(path, ".htm") || chkext(path, ".css")) { + chkext(path, ".png") || chkext(path, ".ico") || chkext(path, ".htm") || chkext(path, ".css")) { /* check if file in resource directory */ strlcpy(str, resource_dir, sizeof(str)); strlcat(str, path, sizeof(str));