From 4f682308adfb5a5f9920ed0a6b510fd6c6f4441e Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Thu, 25 Oct 2007 19:23:56 +0000 Subject: [PATCH] Release 2.7.0-1 SVN revision: 1953 --- doc/ChangeLog | 32 +++ doc/index.html | 2 +- resources/eloglang.brazilian | 2 +- resources/eloglang.bulgarian | 2 +- resources/eloglang.czech | 2 +- resources/eloglang.danish | 2 +- resources/eloglang.dutch | 2 +- resources/eloglang.french | 2 +- resources/eloglang.german | 4 +- resources/eloglang.italian | 2 +- resources/eloglang.japanese | 2 +- resources/eloglang.spanish | 2 +- resources/eloglang.swedish | 2 +- resources/eloglang.turkish | 2 +- resources/eloglang.zh_CN-GB2312 | 2 +- resources/eloglang.zh_CN-UTF8 | 2 +- src/elog.c | 3 +- src/elogd.c | 392 +++++++++++++++++--------------- 18 files changed, 261 insertions(+), 198 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 6e3c5a26..95c072b7 100755 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,35 @@ +Version 2.7.0, released Oct. 25th, 2007 +======================================= + +- Incorporated FCKedit HTML editor into ELOG +- Fixed bug with nonworking 'date' quick filter +- Fixed bug with quick filters and boolean attributes +- Implemented display of upload time/date +- Added $text to substitutions in execute +- Allow '-' in attributes together with required attributes (JS problem) +- Made insertion of smileys/pictures work with 'use lock = 1'. +- Added importing of dates in CSV and XML files +- Do not show any subscription on self registration, added note in notification to click on 'config' to subscribe +- Fixed XSS vulnerability with subtext +- Added '-v1' verbose option +- Do not substitute '|' if not inside a table +- Fixed problem with HTML encoding getting unchecked on reload +- Replaced seteuid/setegid by setreuid/setregid for HP-UX compatibility +- Implemented forward/backward navigation with Ctrl-PgUp/PgDn/Home/End +- Applied patch from Peter Rienstra for HP-UX 64 +- Display three radio buttons in find form for boolean attributes +- Made quick filter work with boolean attributes +- Added code for resizing edit box +- Implemented multi-edit +- Fixed bug with MOptions under conditions and upload +- Fixed bug that only one page got displayed if 'printable output' was selected in find page +- Added 'keep original entry ID' for XML import +- Implemented xml import +- Implemented anchors in ELCode +- Implemented [line] tag +- Added check to prohibit submission of an entry which has been 'stolen' by someone else. +- Fixed wrong links after synchronization of individual logbooks + Version 2.6.5, released Apr. 13th, 2007 ======================================= diff --git a/doc/index.html b/doc/index.html index 619560d9..e81fd5fa 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.6.5
+
Current version is : 2.7.0
  What is ELOG ?  
diff --git a/resources/eloglang.brazilian b/resources/eloglang.brazilian index 38ee30e5..86f40373 100755 --- a/resources/eloglang.brazilian +++ b/resources/eloglang.brazilian @@ -439,7 +439,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -455,3 +454,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.bulgarian b/resources/eloglang.bulgarian index eca52398..febe757e 100755 --- a/resources/eloglang.bulgarian +++ b/resources/eloglang.bulgarian @@ -439,7 +439,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -455,3 +454,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.czech b/resources/eloglang.czech index e4fce4cd..265005f0 100644 --- a/resources/eloglang.czech +++ b/resources/eloglang.czech @@ -437,7 +437,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -453,3 +452,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.danish b/resources/eloglang.danish index 207f994b..de8c3fb9 100755 --- a/resources/eloglang.danish +++ b/resources/eloglang.danish @@ -437,7 +437,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -453,3 +452,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.dutch b/resources/eloglang.dutch index a5af7c5f..4ef5fdca 100755 --- a/resources/eloglang.dutch +++ b/resources/eloglang.dutch @@ -439,7 +439,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -455,3 +454,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.french b/resources/eloglang.french index 96d61191..c94039bf 100755 --- a/resources/eloglang.french +++ b/resources/eloglang.french @@ -437,7 +437,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -453,3 +452,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.german b/resources/eloglang.german index c7515d61..26c6b27b 100755 --- a/resources/eloglang.german +++ b/resources/eloglang.german @@ -432,7 +432,6 @@ unspecified = unspezifiziert To subscribe to any logbook, click on 'Config' in that logbook = Um ein Logbuch zu abbonieren, auf 'Konfigurieren' in diesem Logbuch klicken ELOG XML import = ELOG XML Import Derive attributes from XML file = Attribute aus XML Datei importieren -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = Ursprüngliche ID des Eintrags behalten (kann existierende Einträge überschreiben, ist aber notwendig wenn importierte Einträge Antwortketten enthalten) XML filename = XML Dateiname Invalid date format = Ungültiges Datumsformat XML file does not contain %s element = XML Date beinhaltet kein %s Element @@ -447,4 +446,5 @@ Previous entry, Ctrl-PgUp = Vorheriger Eintrag, Strg-BildHoch Next entry, Ctrl-PgDn = Nächster Eintrag, Strg-BildRunter Last entry, Ctrl-End = Letzter Eintrag, Strg-Ende ELOG import = ELOG Import -Please choose format to import: = Bitte Importformat auswählen +Please choose format to import: = Bitte Importformat auswählen : +Enter text = Text eingeben diff --git a/resources/eloglang.italian b/resources/eloglang.italian index 73c3fa60..68ca9bc9 100755 --- a/resources/eloglang.italian +++ b/resources/eloglang.italian @@ -435,7 +435,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -451,3 +450,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.japanese b/resources/eloglang.japanese index b62ccead..710661dc 100755 --- a/resources/eloglang.japanese +++ b/resources/eloglang.japanese @@ -435,7 +435,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -451,3 +450,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish index 22951076..4ba24f84 100755 --- a/resources/eloglang.spanish +++ b/resources/eloglang.spanish @@ -437,7 +437,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -453,3 +452,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.swedish b/resources/eloglang.swedish index b2546a57..5a948b17 100644 --- a/resources/eloglang.swedish +++ b/resources/eloglang.swedish @@ -436,7 +436,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -452,3 +451,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.turkish b/resources/eloglang.turkish index c4b834fe..58ae239e 100755 --- a/resources/eloglang.turkish +++ b/resources/eloglang.turkish @@ -439,7 +439,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -455,3 +454,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.zh_CN-GB2312 b/resources/eloglang.zh_CN-GB2312 index 70c7719f..990a5579 100644 --- a/resources/eloglang.zh_CN-GB2312 +++ b/resources/eloglang.zh_CN-GB2312 @@ -438,7 +438,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -454,3 +453,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/resources/eloglang.zh_CN-UTF8 b/resources/eloglang.zh_CN-UTF8 index 4363b51e..54c74081 100644 --- a/resources/eloglang.zh_CN-UTF8 +++ b/resources/eloglang.zh_CN-UTF8 @@ -438,7 +438,6 @@ unspecified = To subscribe to any logbook, click on 'Config' in that logbook = ELOG XML import = Derive attributes from XML file = -Keep original entry IDs (may overwrite existing entries, but is required if imported entries contain replies) = XML filename = Invalid date format = XML file does not contain %s element = @@ -454,3 +453,4 @@ Next entry, Ctrl-PgDn = Last entry, Ctrl-End = ELOG import = Please choose format to import: = +Enter text = diff --git a/src/elog.c b/src/elog.c index 8bfe180c..b7378c4a 100755 --- a/src/elog.c +++ b/src/elog.c @@ -612,8 +612,7 @@ INT submit_elog(char *host, int port, char *subdir, char *experiment, /* copy attributes */ for (i = 0; i < MAX_N_ATTR && old_attrib_name[i][0]; i++) { - if (equal_ustring(old_attrib_name[i], "Reply to") || - equal_ustring(old_attrib_name[i], "Date")) { + if (equal_ustring(old_attrib_name[i], "Reply to") || equal_ustring(old_attrib_name[i], "Date")) { attrib_name[i][0] = 0; attrib[i][0] = 0; } else { diff --git a/src/elogd.c b/src/elogd.c index f1517c42..c1311eab 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -10,7 +10,7 @@ \********************************************************************/ /* Version of ELOG */ -#define VERSION "2.6.5" +#define VERSION "2.7.0" char svn_revision[] = "$Id$"; /* ELOG identification */ @@ -570,7 +570,7 @@ int my_read(int fh, void *buffer, unsigned int bytes) int i, n = 0; do { - i = read(fh, (char *)buffer + n, bytes - n); + i = read(fh, (char *) buffer + n, bytes - n); /* don't return if an alarm signal was cought */ if (i == -1 && errno == EINTR) @@ -4556,9 +4556,8 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, { int n, i, j, size, fh, index, tail_size, orig_size, delta, reply_id; char file_name[256], dir[256], str[NAME_LENGTH], date1[256], - attrib[MAX_N_ATTR][NAME_LENGTH], reply_to1[MAX_REPLY_TO * 10], - in_reply_to1[MAX_REPLY_TO * 10], encoding1[80], - *message, *p, *old_text, *buffer; + attrib[MAX_N_ATTR][NAME_LENGTH], reply_to1[MAX_REPLY_TO * 10], + in_reply_to1[MAX_REPLY_TO * 10], encoding1[80], *message, *p, *old_text, *buffer; char attachment_all[64 * MAX_ATTACHMENTS]; time_t ltime; @@ -4572,7 +4571,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, strlcpy(in_reply_to1, in_reply_to, sizeof(in_reply_to1)); strlcpy(encoding1, encoding, sizeof(encoding1)); strlcpy(date1, date, sizeof(date1)); - + /* generate new file name YYMMDD.log in data directory */ strcpy(dir, lbs->data_dir); @@ -4633,7 +4632,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, p = strstr(message, "========================================\r"); if (p) { p += 41; - old_text = xmalloc(size+1); + old_text = xmalloc(size + 1); strlcpy(old_text, p, size); } } @@ -4759,7 +4758,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, sprintf(message + strlen(message), "Locked by: %s\n", locked_by); sprintf(message + strlen(message), "========================================\n"); - + if (strieq(text, "") && old_text) strlcat(message, old_text, TEXT_SIZE + 100); else @@ -6163,7 +6162,7 @@ void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str) strcpy(return_buffer + j, subst); j += strlen(subst); i += strlen(pattern_list[l].pattern) - 1; // 1 gets added in for loop... - + } else if (strncmp(pattern_list[l].pattern, "|", 1) == 0) { if (inside_table) { @@ -6179,11 +6178,11 @@ void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str) strcpy(return_buffer + j, link); j += strlen(link); - i += strlen(pattern_list[l].pattern) - 1; // 1 gets added in for loop... + i += strlen(pattern_list[l].pattern) - 1; // 1 gets added in for loop... } else { strcpy(return_buffer + j, pattern_list[l].pattern); j += strlen(pattern_list[l].pattern); - i += strlen(pattern_list[l].pattern) - 1; // 1 gets added in for loop... + i += strlen(pattern_list[l].pattern) - 1; // 1 gets added in for loop... } } else { @@ -7091,9 +7090,9 @@ void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head, rsprintf("\n"); /* this code would be for XML files... - rsprintf("\n"); - rsprintf("\n"); - */ + rsprintf("\n"); + rsprintf("\n"); + */ /* page title */ rsprintf("\n"); @@ -7133,7 +7132,7 @@ void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head, rsprintf("title=\"ELOG %s\" ", lbs->name); rsprintf("href=\"elog.rdf\" />\n"); } - + if (close_head) rsprintf("\n"); } @@ -7143,7 +7142,7 @@ void show_standard_header(LOGBOOK * lbs, BOOL expires, char *title, char *path, { if (script) { show_html_header(lbs, expires, title, FALSE, rss_feed, cookie, FALSE); - + rsprintf("