diff --git a/NT/elogd.vcproj b/NT/elogd.vcproj index b3b1fd7e..257d2f72 100755 --- a/NT/elogd.vcproj +++ b/NT/elogd.vcproj @@ -99,7 +99,8 @@ ProgramDataBaseFileName=".\Release/" BrowseInformation="1" WarningLevel="3" - SuppressStartupBanner="TRUE"/> + SuppressStartupBanner="TRUE" + DebugInformationFormat="3"/> = 0" +- Fixed bug with quick filters and attributes with blanks +- Show only subscribe options for logbooks which email notification turned on +- Made quick filter improvements work with subtext +- Improved quick filters without all the buttons +- Fixed signed/unsiged bug +- Exclude UTF-8 characters > 128 from substitution in XML export +- Use charset from config file for XML export +- Added debug output for shell execution +- Applied additional patch from Ulf Harnhammar +- Increased tooltip size to 10kChar + Version 2.6.3, released Nov. 28th, 2006 ======================================= diff --git a/doc/index.html b/doc/index.html index 7508b34e..9f87b6ed 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.3
+
Current version is : 2.6.4
  What is ELOG ?  
diff --git a/resources/eloglang.brazilian b/resources/eloglang.brazilian index d85dc3ae..e24643fd 100755 --- a/resources/eloglang.brazilian +++ b/resources/eloglang.brazilian @@ -416,3 +416,11 @@ Anonymous = An Activation notice has been sent to %s = Your request has been forwarded to the administrator = You will be notified by email upon activation of your new account = +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.bulgarian b/resources/eloglang.bulgarian index 9662f82e..8bd5af25 100755 --- a/resources/eloglang.bulgarian +++ b/resources/eloglang.bulgarian @@ -416,3 +416,11 @@ Anonymous = Activation notice has been sent to %s = Your request has been forwarded to the administrator = You will be notified by email upon activation of your new account = +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.czech b/resources/eloglang.czech index d8aa438c..b3c199b8 100644 --- a/resources/eloglang.czech +++ b/resources/eloglang.czech @@ -131,7 +131,6 @@ Display = Zobraz entries per page = položek na stránku Toggle all = Odeber vše Selected entries = Označené položky -Enable email notifications = Povol oznámení příchodu Emailu A old entry has been updated on %s = Položka %s byla obnovena Collapse = Sbalit Expand = Rozbalit @@ -411,3 +410,15 @@ Activation notice has been sent to %s = Oznámení o aktivaci bylo zasláno na % Your request has been forwarded to the administrator = Váš požadavek byl odeslán na administrátora You will be notified by email upon activation of your new account = O aktivaci vašeho nového účtu budete informován emailem + +# +#---- please translate following items and then remove this comment ----# +# +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.danish b/resources/eloglang.danish index 46647a41..d03f6da0 100755 --- a/resources/eloglang.danish +++ b/resources/eloglang.danish @@ -414,3 +414,11 @@ Anonymous = Activation notice has been sent to %s = Your request has been forwarded to the administrator = You will be notified by email upon activation of your new account = +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.dutch b/resources/eloglang.dutch index 1ff354ea..383b1280 100755 --- a/resources/eloglang.dutch +++ b/resources/eloglang.dutch @@ -132,7 +132,6 @@ Display = Toon entries per page = berichten per pagina Toggle all = Toon alles Selected entries = Geselecteerde berichten -Enable email notifications=Automatisch e-mail aankondiging A old entry has been updated on %s = Een ouder bericht is op %s gewijzigd Collapse = Samenvatten Expand = Uitbreiden @@ -413,3 +412,15 @@ Anonymous = Anoniem Activation notice has been sent to %s = Activeringsbericht is gestuurd naar %s Your request has been forwarded to the administrator = Uw verzoek is doorgestuurd naar de beheerder You will be notified by email upon activation of your new account = U krijgt via email een bericht als uw account is geactiveerd. + +# +#---- please translate following items and then remove this comment ----# +# +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.french b/resources/eloglang.french index 11513d81..7600aaa9 100755 --- a/resources/eloglang.french +++ b/resources/eloglang.french @@ -410,3 +410,15 @@ Anonymous = Anonyme Activation notice has been sent to %s = L'avis d'activation a t envoy %s Your request has been forwarded to the administrator = Votre demande a t transmise l'administrateur You will be notified by email upon activation of your new account = Vous serez averti(e) par courriel de l'activation de votre nouveau compte + +# +#---- please translate following items and then remove this comment ----# +# +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.german b/resources/eloglang.german index be627216..9c676152 100755 --- a/resources/eloglang.german +++ b/resources/eloglang.german @@ -409,3 +409,11 @@ Anonymous = Anonym Activation notice has been sent to %s = Aktivierungsbenachrichtigung wurde an %s geschickt Your request has been forwarded to the administrator = Der Antrag wurde an den Administrator geschickt You will be notified by email upon activation of your new account = Sie werden benachrichtigt, wenn Ihr Benutzerkonto aktiviert wurde +Select period = Zeitraum auswhlen +Last week = Letzte Woche +Last month = Letzter Monat +Last 3 Months = Letzte 3 Monate +Last 6 Months = Letzte 6 Monate +Last Year = Letztes Jahr +Enter %s = %s eingeben +Select %s = %s auswhlen diff --git a/resources/eloglang.italian b/resources/eloglang.italian index 62ecd943..a0bd3fc4 100755 --- a/resources/eloglang.italian +++ b/resources/eloglang.italian @@ -412,3 +412,11 @@ Anonymous = Activation notice has been sent to %s = Your request has been forwarded to the administrator = You will be notified by email upon activation of your new account = +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.japanese b/resources/eloglang.japanese index 470b2c7e..e8265282 100755 --- a/resources/eloglang.japanese +++ b/resources/eloglang.japanese @@ -412,3 +412,11 @@ Anonymous = Activation notice has been sent to %s = Your request has been forwarded to the administrator = You will be notified by email upon activation of your new account = +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish index 284dd375..175bfbed 100755 --- a/resources/eloglang.spanish +++ b/resources/eloglang.spanish @@ -411,3 +411,15 @@ Activation notice has been sent to %s = Notificacion de activacion enviada a %s Your request has been forwarded to the administrator = Su solicitud fue enviada al administrador You will be notified by email upon activation of your new account = Sera notificado por email cuando su cuenta sea activada + +# +#---- please translate following items and then remove this comment ----# +# +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.swedish b/resources/eloglang.swedish index 1dc59f12..f4d5b934 100644 --- a/resources/eloglang.swedish +++ b/resources/eloglang.swedish @@ -409,3 +409,15 @@ Entry %s cannot be read from logbook "%s" = Posten %s kan inte l Your request has been forwarded to the administrator = Din registrering har vidarebefordrats till ELOG administratren You will be notified by email upon activation of your new account = Du kommer att f en bekrftelse per email nr ditt nya anvndarkonto r aktiverat Error: Command "%s" not allowed = Kommandot "%s" r inte tilltet + +# +#---- please translate following items and then remove this comment ----# +# +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.turkish b/resources/eloglang.turkish index a0683cc2..2877eaaf 100755 --- a/resources/eloglang.turkish +++ b/resources/eloglang.turkish @@ -416,3 +416,11 @@ Anonymous = Activation notice has been sent to %s = Your request has been forwarded to the administrator = You will be notified by email upon activation of your new account = +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.zh_CN-GB2312 b/resources/eloglang.zh_CN-GB2312 index a491a895..627f404a 100644 --- a/resources/eloglang.zh_CN-GB2312 +++ b/resources/eloglang.zh_CN-GB2312 @@ -411,3 +411,15 @@ Activation notice has been sent to %s = Your request has been forwarded to the administrator = Ѿ͸Ա You will be notified by email upon activation of your new account = ʺż󽫻õʼ֪ͨ + +# +#---- please translate following items and then remove this comment ----# +# +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/resources/eloglang.zh_CN-UTF8 b/resources/eloglang.zh_CN-UTF8 index 02b0a58f..21cb184c 100644 --- a/resources/eloglang.zh_CN-UTF8 +++ b/resources/eloglang.zh_CN-UTF8 @@ -411,3 +411,15 @@ Activation notice has been sent to %s = 激活通知已经送达 %s Your request has been forwarded to the administrator = 您的请求已经发送给管理员 You will be notified by email upon activation of your new account = 您在新帐号激活后将会得到电子邮件通知 + +# +#---- please translate following items and then remove this comment ----# +# +Select period = +Last week = +Last month = +Last 3 Months = +Last 6 Months = +Last Year = +Enter %s = +Select %s = diff --git a/src/elogd.c b/src/elogd.c index 1d001b77..23408cc7 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -10,7 +10,7 @@ \********************************************************************/ /* Version of ELOG */ -#define VERSION "2.6.3" +#define VERSION "2.6.4" char svn_revision[] = "$Id$"; /* ELOG identification */ @@ -5714,8 +5714,7 @@ char *email_quote_table = void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str) { - int i, j, k, l, m, elcode_disabled, elcode_disabled1, escape_char, ordered_list, - substituted; + int i, j, k, l, m, elcode_disabled, elcode_disabled1, escape_char, ordered_list, substituted; char *p, *pd, link[1000], link_text[1000], tmp[1000], attrib[1000], hattrib[1000], value[1000], subst[1000], base_url[256], param[256], *lstr; @@ -6026,12 +6025,12 @@ void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str) j += strlen(link); i += strlen(pattern_list[l].pattern) - 1; // 1 gets added in for loop... } - } // !elcode_disabled && !elcode_disabled1 + } // !elcode_disabled && !elcode_disabled1 else if (!elcode_disabled) { - + substituted = TRUE; - + /* simple substitution */ strcpy(link, pattern_list[l].subst); if (strstr(link, "%s")) { @@ -6045,7 +6044,7 @@ 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... } if (stristr(pattern_list[l].pattern, "[code]")) @@ -6911,7 +6910,7 @@ void show_plain_header(int size, char *file_name) void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head, BOOL rss_feed, char *cookie, int absolute_link) { - int i, n; + int i, n; char css[1000], str[1000], media[1000]; char css_list[MAX_N_LIST][NAME_LENGTH]; @@ -6939,15 +6938,15 @@ void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head, strlcat(css, "default.css", sizeof(css)); if (strchr(css, ',')) { - n = strbreak(css, css_list, MAX_N_LIST, ","); - for (i=0 ; i\n", str, media); - } + n = strbreak(css, css_list, MAX_N_LIST, ","); + for (i = 0; i < n; i++) { + strlcpy(str, css_list[i], sizeof(str)); + if (strchr(str, '&')) { + strlcpy(media, strchr(str, '&') + 1, sizeof(media)); + *strchr(str, '&') = 0; + rsprintf("\n", str, media); } + } } else rsprintf("\n", css); rsprintf("\n"); @@ -12000,8 +11999,7 @@ void show_config_page(LOGBOOK * lbs) if (!isparam("unm") || check_login_user(&lb_list[i], getparam("unm"))) { /* check if emails are enabled for this logbook */ - if (!getcfg(lb_list[i].name, "Suppress email to users", str, sizeof(str)) || - atoi(str) == 0) { + if (!getcfg(lb_list[i].name, "Suppress email to users", str, sizeof(str)) || atoi(str) == 0) { if (email_notify[i]) rsprintf("\n", i, i); else @@ -16374,7 +16372,8 @@ void show_page_filters(LOGBOOK * lbs, int n_msg, int page_n, BOOL mode_commands, if (strieq(list[index], loc("Date"))) { i = isparam("last") ? atoi(getparam("last")) : 0; - rsprintf("\n", + loc("Select period")); rsprintf("