diff --git a/doc/ChangeLog b/doc/ChangeLog index 13fbf2b5..e0ef6cbd 100755 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,37 @@ +Version 2.7.7, released July 31st 2009 +====================================== + +- Upgraded FCKEdit to 2.6.4.1 +- Changed ELCode select box names not to collide with "size" attribute +- Better check for inline images +- Fixed crash with two logbooks using same subdir +- Completed list of forbidden attributes +- Fixed broken inline images in email notification +- Fixed problem with invalid encoding +- Fixed JavaScript check for required date_time attributes +- Implemented "Thumbnail size = 0" +- Reworked memory allocation in copy_to +- Implemented "Collapse to last" +- After a "Move to" the next thread head is displayed +- Use dedicated class for text and attachment titles in list display +- Allow "Submit" if "Edit" is in menu list +- Removed CR/LF from redirection to avoid XSS +- Fixed bug with RSS feed if logbook is empty +- Fixed problem with auto indices +- Fixed required attributes under a condition +- Fixed wrong file names on copy/move of old entries +- Replaced signal() calls by sigaction() calls to avoid Solaris problems, thanks to Paul T. Keener +- Include thumbnails in "move to" and "copy to" commands +- Implemented "Preserve IDs" +- Fixed inline image references when moving entries between logbooks +- Fixed NULL pointer at end of scipt_tags[] array +- Fixed crash with password recovery and bottom text +- Make password recovery working with protected selection pages +- Added Open XML MIME types +- Hide attachment column in lis display if "enable attachments = 0" +- Fixed bug with ROptions when one option is a substring of another +- Fixed cookie handling, thanks to Simon Patton + Version 2.7.6, released April 14th 2009 ======================================= diff --git a/doc/index.html b/doc/index.html index b325dfad..a4135a90 100755 --- a/doc/index.html +++ b/doc/index.html @@ -28,7 +28,7 @@  [Links]  * 

Home of the Electronic Logbook package by Stefan Ritt

-
Current version is : 2.7.6
+
Current version is : 2.7.7
certificate
diff --git a/doc/index_d.html b/doc/index_d.html index 08c46e97..e6a038b5 100644 --- a/doc/index_d.html +++ b/doc/index_d.html @@ -28,7 +28,7 @@  [Links]  * 

Home of the Electronic Logbook package by Stefan Ritt

-
Current version is : 2.7.6
+
Current version is : 2.7.7
certificate diff --git a/resources/eloglang.brazilian b/resources/eloglang.brazilian index 407a44ca..b50c68c2 100755 --- a/resources/eloglang.brazilian +++ b/resources/eloglang.brazilian @@ -139,7 +139,6 @@ Enter your user name or email address = Entre com o nome do usu Forgot = Esquecido ELOG new user = Novo usurio do ELOG Retype password = Digite novamente a senha -Only user %s can delete this entry = Apenas o usurio %s pode remover essa entrada Are you sure to delete these messages? = Voce tem certeza de que deseja apagar essa mensagem ? and all their replies = e todas suas repostas Synchronization = Sincronizao @@ -464,10 +463,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.bulgarian b/resources/eloglang.bulgarian index c0c0bf1b..9880c27c 100755 --- a/resources/eloglang.bulgarian +++ b/resources/eloglang.bulgarian @@ -183,7 +183,6 @@ No = Yes = Error deleting message: status = : No entry selected for deletion = -Only user %s can delete this entry = %s Are you sure to delete these messages? = , ? and all their replies = Are you sure to delete this entry? = , ? @@ -464,10 +463,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.czech b/resources/eloglang.czech index acce647c..bf03dd3b 100644 --- a/resources/eloglang.czech +++ b/resources/eloglang.czech @@ -139,7 +139,6 @@ Upload = Odeslat Requested = Požadovaný Registration request on logbook "%s" = Požadavek registrace na logbook "%s" A new ELOG user wants to register on "%s" = Nový uživatel se chce registrovat na "%s" -Only user %s can delete this entry = Pouze uživatel %s může mazat tuto položku Search text also in attributes = Hledej text také v atributech Date = Date ID = ID @@ -461,10 +460,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.danish b/resources/eloglang.danish index eeb052ac..b5e0fad8 100755 --- a/resources/eloglang.danish +++ b/resources/eloglang.danish @@ -139,7 +139,6 @@ Upload = L Requested = Rekvirer Registration request on logbook "%s" = Anmodning om registrering p logbog "%s" A new ELOG user wants to register on "%s" = Ny Bruger nsker At Registrere p "%s" logbogen -Only user %s can delete this entry = Kun Bruger %s kan slette dette indlg Search text also in attributes = Sg ogs text i attributerne Date = Dato ID = ID @@ -461,10 +460,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.dutch b/resources/eloglang.dutch index bce8a3f9..e60f1b1e 100755 --- a/resources/eloglang.dutch +++ b/resources/eloglang.dutch @@ -140,7 +140,6 @@ Upload = Upload Requested = Verzocht Registration request on logbook "%s" = Registratie verzoek voor Logboek "%s" A new ELOG user wants to register on "%s" = Een nieuwe Elog gebruiker wil zich registreren voor "%s" -Only user %s can delete this entry = Alleen gebruiker %s kan dit bericht wissen Search text also in attributes = Zoek ook in attributen Date = Datum ID = ID @@ -464,10 +463,11 @@ Cannot create thumbnail, please check ImageMagick installation = Kan geen voorbe Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.french b/resources/eloglang.french index 103cce26..6a9d54fb 100755 --- a/resources/eloglang.french +++ b/resources/eloglang.french @@ -138,7 +138,6 @@ Upload = Envoyer Requested = Demand Registration request on logbook "%s" = Demande d'inscription pour le registre "%s" A new ELOG user wants to register on "%s" = Un nouvel utilisateur ELOG souhaite s'inscrire "%s" -Only user %s can delete this entry = Seul l'utilisateur %s peut supprimer cette entre Search text also in attributes = Rechercher galement le texte dans les attributs Date = Date ID = ID @@ -461,10 +460,11 @@ Error: Content length (%d) larger than maximum content length (%d) = Erreur : la # #---- please translate following items and then remove this comment ----# # -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.german b/resources/eloglang.german index 878526f5..9ee6228c 100755 --- a/resources/eloglang.german +++ b/resources/eloglang.german @@ -139,7 +139,6 @@ Upload = Hochladen Requested = Erfordert Registration request on logbook "%s" = Registrierungsanforderung fr Logbuch "%s" A new ELOG user wants to register on "%s" = Ein neuer Benutzer mchte sich auf "%s" registrieren -Only user %s can delete this entry = Dieser Eintrag kann nur von %s gelscht werden Search text also in attributes = Text auch in Attributen suchen Date = Datum ID = ID @@ -456,10 +455,11 @@ Cannot create thumbnail, please check ImageMagick installation = Kann Vorschau n Please log on by clicking on following link and change your password = Bitte durck klicken auf den folgenden link anmelden und Kennwort ndern Attachments = Anhnge Error: Content length (%d) larger than maximum content length (%d) = Fehler: Datengre (%d) ist grer als maximal erlaubte Datengre (%d) -Forbidden attribute: %s = Verbotenes Attribut: %s ELOG error = ELOG Fehler Only user %s can edit this entry = Nur Benutzer %s kann diesen Eintrag ndern Export to = Exportieren nach Do not ignore first line = Erste Zeile nicht ignorieren Last %d hours = Letzte %d Stunden Invalid URL = Ungltige URL +Attribute "%s" is not allowed in config file = Das Attribut "%s" ist in der Konfigurationsdatei nicht erlaubt +Only user %s can delete this entry = Nur der Benutzer %s kann diesen Entrag lschen diff --git a/resources/eloglang.italian b/resources/eloglang.italian index bf50b659..05388fc5 100755 --- a/resources/eloglang.italian +++ b/resources/eloglang.italian @@ -139,7 +139,6 @@ Upload = Carica Requested = Richiesto Registration request on logbook "%s" = Richiesta di registrazione nel registro "%s" A new ELOG user wants to register on "%s" = Un nuovo utente ELOG vuole registrarsi su "%s" -Only user %s can delete this entry = Solo l'utente %s pu cancellare questo elemento Search text also in attributes = Ricerca il testo anche negli attributi Date = Data ID = ID @@ -459,10 +458,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.japanese b/resources/eloglang.japanese index 533b7a5f..71e4f61a 100755 --- a/resources/eloglang.japanese +++ b/resources/eloglang.japanese @@ -111,7 +111,6 @@ No = Yes = ͂ Error deleting message: status = L폜ɃG[܂ No entry selected for deletion = 폜LIĂ܂ -Only user %s can delete this entry = [U[ %s̋L폜ł܂ Are you sure to delete these messages? = ̋L폜Ă낵łH and all their replies = ԐML폜܂B낵łH and all its replies = ԐML폜܂B낵łH @@ -460,10 +459,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.ru_CP1251 b/resources/eloglang.ru_CP1251 index 6bc4ea55..a11945e1 100644 --- a/resources/eloglang.ru_CP1251 +++ b/resources/eloglang.ru_CP1251 @@ -182,7 +182,6 @@ No = Yes = Error deleting message: status = : No entry selected for deletion = -Only user %s can delete this entry = %s Are you sure to delete these messages? = , ? and all their replies = Are you sure to delete this entry? = , ? @@ -465,10 +464,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish index 1abbb2cd..afc2aa2f 100755 --- a/resources/eloglang.spanish +++ b/resources/eloglang.spanish @@ -139,7 +139,6 @@ Enter your user name or email address = Ingrese su nombre de usuario o direccion Forgot = Olvidar ELOG new user = Nuevo usuario de ELOG Retype password = Reescriba la clave -Only user %s can delete this entry = Solamente el usuario %s puede borrar esta entrada Are you sure to delete these messages? = Esta seguro de borrar estos mensajes? and all their replies = y todas sus respuestas Synchronization = Sincronizacion @@ -462,10 +461,11 @@ Error: Content length (%d) larger than maximum content length (%d) = Error: La l # #---- please translate following items and then remove this comment ----# # -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.swedish b/resources/eloglang.swedish index 93bda8a9..84aaccfa 100644 --- a/resources/eloglang.swedish +++ b/resources/eloglang.swedish @@ -370,7 +370,6 @@ Activation notice has been sent to %s = Aktiveringsmeddelande har skickats till User [%s] has been deleted = Anvndare [%s] har tagits bort Password recovery for ELOG %s = terskapande av lsenord fr ELOG %s A new password has been created for you on host %s = Ett nytt lsenord har skapats till dig p server %s -Only user %s can delete this entry = Endast anvndare %s kan ta bort denna post Column header '%s' must be present in CSV file = Kolumnhuvud '%s' mste finnas i CSV filen CSV import preview of %s = Frhandsgranskning av CSV import gllande %s Incorrect remote ELOG server version %s = Fel fjrransluten ELOG server version %s @@ -468,10 +467,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.turkish b/resources/eloglang.turkish index 15f137ae..08e6c2d3 100755 --- a/resources/eloglang.turkish +++ b/resources/eloglang.turkish @@ -142,7 +142,6 @@ Upload = Y Requested = stenmi Registration request on logbook "%s" = "%s" kayt defterinde kayt istei A new ELOG user wants to register on "%s" = Yeni ELOG kullancs "%s"'na kayt olmak istiyor -Only user %s can delete this entry = Yalnzca %s kullancs bu girdiyi silebilir Search text also in attributes = Metni zellikler iinde de ara Date = Tarih ID = ID @@ -463,10 +462,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.zh_CN-GB2312 b/resources/eloglang.zh_CN-GB2312 index fc892664..79dcf192 100644 --- a/resources/eloglang.zh_CN-GB2312 +++ b/resources/eloglang.zh_CN-GB2312 @@ -140,7 +140,6 @@ Upload = Requested = Registration request on logbook "%s" = ¼ "%s" ע A new ELOG user wants to register on "%s" = µ ELOG ûϣעᵽ "%s" -Only user %s can delete this entry = ֻû %s ɾ˼¼ Search text also in attributes = ͬʱеı Date = ID = ID @@ -462,10 +461,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/resources/eloglang.zh_CN-UTF8 b/resources/eloglang.zh_CN-UTF8 index 0ed91058..747b0fdb 100644 --- a/resources/eloglang.zh_CN-UTF8 +++ b/resources/eloglang.zh_CN-UTF8 @@ -140,7 +140,6 @@ Upload = 上载 Requested = 请求的 Registration request on logbook "%s" = 记录本 "%s" 里的注册请求 A new ELOG user wants to register on "%s" = 新的 ELOG 用户希望注册到 "%s" -Only user %s can delete this entry = 只有用户 %s 可以删除此记录 Search text also in attributes = 同时搜索属性中的文本 Date = 日期 ID = ID @@ -462,10 +461,11 @@ Cannot create thumbnail, please check ImageMagick installation = Please log on by clicking on following link and change your password = Attachments = Error: Content length (%d) larger than maximum content length (%d) = -Forbidden attribute: %s = ELOG error = Only user %s can edit this entry = Export to = Do not ignore first line = Last %d hours = Invalid URL = +Attribute "%s" is not allowed in config file = +Only user %s can delete this entry = diff --git a/scripts/fckeditor.zip b/scripts/fckeditor.zip index 55149cf3..aa5589d1 100644 Binary files a/scripts/fckeditor.zip and b/scripts/fckeditor.zip differ diff --git a/src/elog.c b/src/elog.c index 76501ca7..c60bfa00 100755 --- a/src/elog.c +++ b/src/elog.c @@ -9,7 +9,7 @@ \********************************************************************/ -#define VERSION "2.7.6" +#define VERSION "2.7.7" char svn_revision[] = "$Id$"; /* ELOG identification */ diff --git a/src/elogd.c b/src/elogd.c index be575c53..a0c0092e 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -9,7 +9,7 @@ \********************************************************************/ /* Version of ELOG */ -#define VERSION "2.7.6" +#define VERSION "2.7.7" char svn_revision[] = "$Id$"; /* ELOG identification */ @@ -3462,10 +3462,10 @@ void retrieve_domain(char *ret, int size) strlcpy(ret, "tmp.org", size); if (getcfg("global", "SMTP host", smtp_host, sizeof(smtp_host))) { if (strchr(smtp_host, '.')) - strlcpy(ret, strchr(smtp_host, '.')+1, size); + strlcpy(ret, strchr(smtp_host, '.') + 1, size); } } - + /*-------------------------------------------------------------------*/ void retrieve_email_from(LOGBOOK * lbs, char *ret, char *ret_name, char attrib[MAX_N_ATTR][NAME_LENGTH]) @@ -3563,7 +3563,7 @@ void el_decode(char *message, char *key, char *result, int size) if (strncmp(pc, key, strlen(key)) == 0) { pc += strlen(key); - for(i=0 ; *pc != '\n' && *pc != '\r' && i"}, + {":))", "\"Happy\""}, {":-))", "\"Happy\""}, - {":)", "\"Smile\""}, - {":-)", "\"Smile\""}, - {":(", "\"Frown\""}, - {":-(", "\"Frown\""}, - {";)", "\"Wink\""}, - {";-)", "\"Wink\""}, - {":d", "\"Big"}, - {"?-)", "\"Confused\""}, - {";(", "\"Crying\""}, - {";-(", "\"Crying\""}, - {":]", "\"Pleased\""}, - {":-]", "\"Pleased\""}, - {":o", "\"Yawn\""}, - {":-o", "\"Yawn\""}, - {"8-)", "\"Cool\""}, - {"8o", "\"Astonished\""}, - {"x-(", "\"Mad\""}, - {":p", "\"Tongue\""}, - {":-p", "\"Tongue\""}, - + {":)", "\"Smile\""}, + {":-)", "\"Smile\""}, + {":(", "\"Frown\""}, + {":-(", "\"Frown\""}, + {";)", "\"Wink\""}, + {";-)", "\"Wink\""}, + {":d", "\"Big"}, + {"?-)", "\"Confused\""}, + {";(", "\"Crying\""}, + {";-(", "\"Crying\""}, + {":]", "\"Pleased\""}, + {":-]", "\"Pleased\""}, + {":o", "\"Yawn\""}, + {":-o", "\"Yawn\""}, + {"8-)", "\"Cool\""}, + {"8o", "\"Astonished\""}, + {"x-(", "\"Mad\""}, + {":p", "\"Tongue\""}, + {":-p", "\"Tongue\""}, + /* formatting */ - {"[b]", ""}, - {"[/b]", ""}, - {"[u]", ""}, - {"[/u]", ""}, - {"[i]", ""}, - {"[/i]", ""}, + {"[b]", ""}, + {"[/b]", ""}, + {"[u]", ""}, + {"[/u]", ""}, + {"[i]", ""}, + {"[/i]", ""}, {"[center]", "
"}, - {"[/center]", "
"}, - {"[color=", ""}, - {"[/color]", ""}, + {"[/center]", "
"}, + {"[color=", ""}, + {"[/color]", ""}, {"[size=", ""}, - {"[/size]", ""}, - {"[font=", ""}, - {"[/font]", ""}, - {"\r\n[code]", "
"}, 
+   {"[/size]", ""},
+   {"[font=", ""},
+   {"[/font]", ""},
+   {"\r\n[code]", "
"},
    {"[code]", "
"},
-   {"[/code]\r\n", "
"}, 
-   {"[/code]", "
"}, 
-   {"\r\n[code1]", "
"}, 
-   {"[code1]", "
"}, 
-   {"[/code1]\r\n","
"},
+   {"[/code]\r\n", "
"},
+   {"[/code]", "
"}, + {"\r\n[code1]", "
"},
+   {"[code1]", "
"},
+   {"[/code1]\r\n", "
"},
    {"[/code1]", "
"}, - + /* lists */ - {"[list]\r", "