From cd6b160e899760b55e40de72176e9ad286cdeebe Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Tue, 14 Apr 2009 08:13:44 +0000 Subject: [PATCH] Release 2.7.6-1 SVN revision: 2191 --- doc/ChangeLog | 44 +++++++++++ doc/index.html | 2 +- doc/index_d.html | 2 +- resources/eloglang.brazilian | 9 ++- resources/eloglang.bulgarian | 9 ++- resources/eloglang.czech | 10 ++- resources/eloglang.danish | 10 ++- resources/eloglang.dutch | 10 ++- resources/eloglang.french | 14 +++- resources/eloglang.german | 10 ++- resources/eloglang.italian | 10 ++- resources/eloglang.japanese | 9 ++- resources/eloglang.ru_CP1251 | 9 ++- resources/eloglang.spanish | 13 +++- resources/eloglang.swedish | 9 ++- resources/eloglang.turkish | 10 ++- resources/eloglang.zh_CN-GB2312 | 10 ++- resources/eloglang.zh_CN-UTF8 | 10 ++- src/elog.c | 2 +- src/elogd.c | 130 +++++++++++++++----------------- 20 files changed, 222 insertions(+), 110 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 081cd24a..13fbf2b5 100755 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,47 @@ +Version 2.7.6, released April 14th 2009 +======================================= + +- Fixed broken images for Safari +- Fixed crash with bottom text on protected selection page +- Fixed error message when 'Show text = 0' +- Fixed problem with emtpy email address +- Fixed XSS vulnerability based on 'img onerror=' +- Return 404 in case of error +- Implemented 'Hide comments' +- Fixed case for escaped ELCode tags +- Fixed bug in cookie handling +- Fixed broken display with 'preview attachments = 0' +- Fixed problem with missing boundary in POST request +- Fixed crash with incomplete attachments +- Show errer of forbidden attributes are used +- Fixed crash when HTTP is missing in header, implemented more consistent keep-alive handling +- Fixed bug with empty cookies +- Show "Last day" if "Last x" is in the menu list +- Made CSV import of dates working +- Only store allowed cookies +- Added "<>" around email address for "MAIL FROM:" +- Allow attribute substitution on 'execute delete' +- Implemented "tooltip " +- Fixed return buffer overflow with very long entries +- Fixed problem with locked date/time attributes and re-edit of pages +- Fixed problem with numeric attributes and multi edit +- Fixed problem with EPS previews in list display +- Removed '/' from url_encode again, use url_slash_encode to fix redirection problem with quick filter and attributes containing '/' +- Changed '####' tag generation from 'Preset <>' to 'Subst <>' in order to avoid double entries +- Include "MIME-Version" always in email header +- Added 'export to:' on find page +- Fixed buffer overflow with very long cookies +- Fixed quick filter redirect problem with attributes containing '/' +- Made select/edit work with date/time attributes +- Changed parameter to make things more obvious +- Fixed crash with very long entries +- Attributes stay now in find page with conditional attributes +- Made 'Hide' work with 'Show attachments = 0' +- Fixed wrong cookies which caused problems with Chrome +- Fixed crash with invalid URL +- Fixed bug with conditional attributes on find page +- Added function to determine line breaks in HTML code + Version 2.7.5, released Sept. 22th 2008 ======================================= diff --git a/doc/index.html b/doc/index.html index 543755f2..b325dfad 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.5
+
Current version is : 2.7.6
certificate
diff --git a/doc/index_d.html b/doc/index_d.html index 8582e4c6..08c46e97 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.5
+
Current version is : 2.7.6
certificate diff --git a/resources/eloglang.brazilian b/resources/eloglang.brazilian index 7b2934ce..407a44ca 100755 --- a/resources/eloglang.brazilian +++ b/resources/eloglang.brazilian @@ -90,7 +90,6 @@ New passwords do not match, please retype = Nova senha n Old password = Senha anterior Retype new password = Digite novamente a nova senha Maximum number of replies (%d) exceeded = Nmero mximo de repostas (%d) excedido -Only user %s can edit this entry = Somente o usurio %s pode editar essa entrada Update = Atualizar Add %s = Adicionar %s Add new option here = Adicionar nova opo aqui @@ -252,7 +251,6 @@ ELOG CSV import = Importe de CSV do ELOG Derive attributes from CSV file = Derivar atributos do arquivo de CSV Comma = Vrgula Semicolon = Ponto e vrgula -Ignore first line = Ignorar a primeira linha Preview import = Preview import Too many attributes in CSV file = Muitos atributos no arquivo de CSV %d entries successfully imported = %d entradas importadas com sucesso @@ -466,3 +464,10 @@ 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 = diff --git a/resources/eloglang.bulgarian b/resources/eloglang.bulgarian index c859805e..c0c0bf1b 100755 --- a/resources/eloglang.bulgarian +++ b/resources/eloglang.bulgarian @@ -111,7 +111,6 @@ Pick a date = user = on = Maximum number of replies (%d) exceeded = (%d) -Only user %s can edit this entry = %s Entry can only be edited %1.2lg hours after creation = %1.2lg Please select at least one '%s' = , "%s" Please select a '%s' = , "%s" @@ -203,7 +202,6 @@ Auto detect = Comma = Semicolon = Derive attributes from CSV file = CSV -Ignore first line = Preview import = text = Column header '%s' must be present in CSV file = "%s" CSV @@ -466,3 +464,10 @@ 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 = diff --git a/resources/eloglang.czech b/resources/eloglang.czech index ee5ec78b..acce647c 100644 --- a/resources/eloglang.czech +++ b/resources/eloglang.czech @@ -57,7 +57,6 @@ Please check that it exists and elogd has write access = Ujistěte se o existenc Error: Attribute %s not supplied = Chyba: Atribut %s není dodán Please go back and enter the %s field = Jděte zpět a zadejte %s pole Please use your browser's back button to go back = Použijte tlačítka Zpět vašeho prohlížeče -Only user %s can edit this entry = Pouze uživatel %s může měnit tuto položku ELOG find = ELOG najít Find = Najít Search = Hledat @@ -83,7 +82,6 @@ Error: Command "%s" not allowed = Chyba: Příkaz "%s" není dovol Cannot open file %s = Soubor %s nelze otevřít Cannot write to %s = Do souboru %s nelze zapisovet No SMTP host defined in [global] section of configuration file = Není definován žádný SMTP Host v sekci [global] konfiguračního souboru -Only user %s can edit this entry = Pouze uživatel %s může měnit tuto položku Display threads = Zobraz vlákno Logbook is empty = Logbook je prázdný Download = Stáhnout @@ -252,7 +250,6 @@ CSV Import = CSV Import Derive attributes from CSV file = Odvoď atributy z CSV souboru Comma = Ćárka Semicolon = Středník -Ignore first line = Ignoruj první řádek Preview import = Import náhledu CSV import preview of %s = CSV Import náhledu z %s Too many attributes in CSV file = Příliš mnoho atributů v CSV souboru @@ -464,3 +461,10 @@ 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 = diff --git a/resources/eloglang.danish b/resources/eloglang.danish index c83dc9f5..eeb052ac 100755 --- a/resources/eloglang.danish +++ b/resources/eloglang.danish @@ -57,7 +57,6 @@ Please check that it exists and elogd has write access = Check venligst om det e Error: Attribute %s not supplied = Fejl: Attribut %s ikke udfyldt Please go back and enter the %s field = G tilbage og udfyld %s feltet Please use your browser's back button to go back = Brug tilbage knappen p din browser -Only user %s can edit this entry = Kun bruger %s kan ndre dette indlg ELOG find = ELOG sg Find = Find Search = Sg @@ -83,7 +82,6 @@ Error: Command "%s" not allowed = Fejl: kommando "%s" ikke tilladt Cannot open file %s =kan ikke bne filen %s Cannot write to %s = kan ikke skrive til %s No SMTP host defined in [global] section of configuration file = Ingen smtp host defineret i [global] sektionen af konfigurationen -Only user %s can edit this entry = Kun bruger %s kan ndre dette indlg Display threads = Vis trde Logbook is empty = Logbog er tom Download = Hent @@ -252,7 +250,6 @@ CSV Import = CSV Import Derive attributes from CSV file = Hent attributer fra CSV fil Comma = Komma Semicolon = Semikolon -Ignore first line = Ignorer frste linie Preview import = Gennemse Import CSV import preview of %s = CSV import gennemsyn af %s Too many attributes in CSV file = For mange attributter i CSV fil @@ -464,3 +461,10 @@ 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 = diff --git a/resources/eloglang.dutch b/resources/eloglang.dutch index c361d994..bce8a3f9 100755 --- a/resources/eloglang.dutch +++ b/resources/eloglang.dutch @@ -58,7 +58,6 @@ Please check that it exists and elogd has write access = Controleer of het besta Error: Attribute %s not supplied = Fout: Attribuut %s niet ingevuld Please go back and enter the %s field = Ga terug en vul het veld %s in Please use your browser's back button to go back = Gebruik de terug-knop van je browser om terug te gaan -Only user %s can edit this entry = Alleen de gebruiker %s kan dit item wijzigen ELOG find = ELOG zoeken Find = zoek Search = Zoeken @@ -84,7 +83,6 @@ Error: Command "%s" not allowed = Fout: Commando "%s" niet toegest Cannot open file %s = Bestand %s kan niet worden geopend Cannot write to %s = Kan niet schrijven naar bestand %s No SMTP host defined in [global] section of configuration file = Geen SMTP Host vermeld in [global] van het configuratiebestand -Only user %s can edit this entry = Alleen gebruiker %s kan dit bericht wijzigen Display threads = Toon draden Logbook is empty = logboek is leeg Download = Download @@ -253,7 +251,6 @@ CSV Import = CSV Import Derive attributes from CSV file = Haal attributen uit csv bestand Comma = Komma Semicolon = Punt Komma -Ignore first line = Negeer eerste regel Preview import = Import voorbeeld ELOG CSV import = ELOG CSV import Too many attributes in CSV file = Te veel attributen in CSV bestand @@ -467,3 +464,10 @@ 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 = diff --git a/resources/eloglang.french b/resources/eloglang.french index 474371f8..103cce26 100755 --- a/resources/eloglang.french +++ b/resources/eloglang.french @@ -56,7 +56,6 @@ Please check that it exists and elogd has write access = V Error: Attribute %s not supplied = Erreur : l'attribut %s n'est pas spcifi Please go back and enter the %s field = Revenez en arrire et renseignez le champ %s Please use your browser's back button to go back = Utilisez le bouton "page prcdente" de votre navigateur pour revenir en arrire -Only user %s can edit this entry = Seulement l'utilisateur %s peut changer cetter entre ELOG find = Recherche ELOG Find = Chercher Search = Lancer la recherche @@ -82,7 +81,6 @@ Error: Command "%s" not allowed = Erreur : commande "%s" non autor Cannot open file %s = Erreur d'ouverture du fichier %s Cannot write to %s = Erreur d'criture dans le fichier %s No SMTP host defined in [global] section of configuration file = Aucun serveur SMTP n'est dfini dans la section [global] du fichier de configuration -Only user %s can edit this entry = Seul l'utilisateur %s peut modifier cette entre Display threads = Afficher les fils de discussion Logbook is empty = Ce registre est vide Download = Tlcharger @@ -252,7 +250,6 @@ ELOG CSV import = Importation CSV ELOG Derive attributes from CSV file = Crer les attributs partir du fichier CSV Comma = virgule Semicolon = point-virgule -Ignore first line = Ignorer la premire ligne Preview import = Aperu avant importation Too many attributes in CSV file = Trop d'attributs dans le fichier CSV %d entries successfully imported = %d entres importes avec succs @@ -460,3 +457,14 @@ Cannot create thumbnail, please check ImageMagick installation = Impossible de c Please log on by clicking on following link and change your password = Merci de vous connecter en cliquant sur le lien suivant et de changer votre mot de passe Attachments = Pices jointes Error: Content length (%d) larger than maximum content length (%d) = Erreur : la taille du contenu (%d) est suprieure au maximum autoris (%d) + +# +#---- 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 = diff --git a/resources/eloglang.german b/resources/eloglang.german index 50d98d36..878526f5 100755 --- a/resources/eloglang.german +++ b/resources/eloglang.german @@ -57,7 +57,6 @@ Please check that it exists and elogd has write access = Bitte Error: Attribute %s not supplied = Fehler: Attribut %s nicht ausgefllt Please go back and enter the %s field = Bitte zurckgehen und das Feld %s ausfllen Please use your browser's back button to go back = Bitte die Zurck-Taste Ihres Browsers bettigen -Only user %s can edit this entry = Dieser Eintrag kann nur von %s verndert werden ELOG find = ELOG suchen Find = Finden Search = Suchen @@ -83,7 +82,6 @@ Error: Command "%s" not allowed = Fehler: Befehl "%s" nicht erlaub Cannot open file %s = Datei %s kann nicht geffnet werden Cannot write to %s = Datei %s kann nicht geschrieben werden No SMTP host defined in [global] section of configuration file = Kein SMTP Host im [global] Bereich der Konfigurationsdatei definiert -Only user %s can edit this entry = Nur Benutzer %s kann diesen Eintrag ndern Display threads = Antwortkette darstellen Logbook is empty = Logbuch ist leer Download = Herunterladen @@ -252,7 +250,6 @@ CSV Import = CSV Import Derive attributes from CSV file = Attribute aus CSV Datei bernehmen Comma = Komma Semicolon = Semikolon -Ignore first line = Erste Zeile ignorieren Preview import = Import berprfen CSV import preview of %s = CSV Import berprfung von %s Too many attributes in CSV file = Zu viele Attribute in CSV Datei @@ -459,3 +456,10 @@ 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 diff --git a/resources/eloglang.italian b/resources/eloglang.italian index 1425fb3c..bf50b659 100755 --- a/resources/eloglang.italian +++ b/resources/eloglang.italian @@ -57,7 +57,6 @@ Please check that it exists and elogd has write access = Per favore controlla ch Error: Attribute %s not supplied = Errore: Attributo %s non fornito Please go back and enter the %s field = Per favore torna indietro ed inserisci il campo %s Please use your browser's back button to go back = Per favore usa il pulsante indietro del tuo browser -Only user %s can edit this entry = Solo l'utente %s pu modificare questo elemento ELOG find = ELOG Cerca Find = Trova Search = Cerca @@ -83,7 +82,6 @@ Error: Command "%s" not allowed = Errore: Comando "%s" non permess Cannot open file %s = Non posso aprire il file %s Cannot write to %s = Non posso scrivere su %s No SMTP host defined in [global] section of configuration file = Nessun server SMTP definito nella sezione [global] del file di configurazione -Only user %s can edit this entry = Solo l'utente %s pu modificare questo elemento Display threads = Mostra le discussioni Logbook is empty = Il registro vuoto Download = Scarica @@ -251,7 +249,6 @@ ELOG CSV import = Importa CVS ELOG Derive attributes from CSV file = Deduci gli attributi dal file CSV Comma = Virgola Semicolon = Punto e virgola -Ignore first line = Ignora la prima linea Preview import = Anteprima dell'importazione CSV import preview of %s = Anteprima dell'importazione CSV di %s Too many attributes in CSV file = Troppi attributi nel file CSV @@ -462,3 +459,10 @@ 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 = diff --git a/resources/eloglang.japanese b/resources/eloglang.japanese index fec5d5a9..533b7a5f 100755 --- a/resources/eloglang.japanese +++ b/resources/eloglang.japanese @@ -22,7 +22,6 @@ Submit = user = [U[ on = I Maximum number of replies (%d) exceeded = őԐM”\i%dj𒴉߂Ă܂ -Only user %s can edit this entry = [U[@%s@̃Gg[ҏWł܂ Entry can only be edited %1.2lg hours after creation = L͓e@%1.2lg@ԂҏWł܂ Please select at least one '%s' = ŒЂƂ‚'%s'IĂ Please select a '%s' = '%s'IĂ @@ -250,7 +249,6 @@ ELOG CSV import = ELOG Derive attributes from CSV file = CSVt@C瑮擾 Comma = R} Semicolon = Z~R -Ignore first line = ŏ̈s𖳎 Preview import = C|[g̃vr[ CSV import preview of %s = %sCSVC|[gvr[ Too many attributes in CSV file = CSVt@C̑܂ @@ -462,3 +460,10 @@ 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 = diff --git a/resources/eloglang.ru_CP1251 b/resources/eloglang.ru_CP1251 index 46d0b56e..6bc4ea55 100644 --- a/resources/eloglang.ru_CP1251 +++ b/resources/eloglang.ru_CP1251 @@ -110,7 +110,6 @@ Pick a date = user = on = Maximum number of replies (%d) exceeded = (%d) -Only user %s can edit this entry = %s Entry can only be edited %1.2lg hours after creation = %1.2lg Please select at least one '%s' = "%s" Please select a '%s' = "%s" @@ -202,7 +201,6 @@ Auto detect = Comma = Semicolon = Derive attributes from CSV file = CSV -Ignore first line = Preview import = text = Column header '%s' must be present in CSV file = '%s' CSV @@ -467,3 +465,10 @@ 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 = diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish index 2f9eccb9..1abbb2cd 100755 --- a/resources/eloglang.spanish +++ b/resources/eloglang.spanish @@ -90,7 +90,6 @@ New passwords do not match, please retype = Las claves no coinciden, por favor r Old password = Clave anterior Retype new password = Reescriba nueva clave Maximum number of replies (%d) exceeded = Numero maximo de respuestas (%d) excedido -Only user %s can edit this entry = Solo el usuario %s puede editar esta entrada Update = Actualizar Add %s = Agregar %s Add new option here = Agregar nueva opcion aqui @@ -245,7 +244,6 @@ Field separator = Separador de campos Comma = Coma Semicolon = Punto y coma Derive attributes from CSV file = Derivar atributos del archivo CSV -Ignore first line = Ignorar la primera linea Preview import = Vista previa de importacion CSV filename = Archivo CVS CSV import preview of %s = Vista previa de importacion CSV %s @@ -460,3 +458,14 @@ Cannot create thumbnail, please check ImageMagick installation = No se puede cre Please log on by clicking on following link and change your password = Por favor ingrese haciendo click en el siguiente link y cambie su clave Attachments = Adjuntos Error: Content length (%d) larger than maximum content length (%d) = Error: La longitud del contenido (%d) es mayor que la permitida (%d) + +# +#---- 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 = diff --git a/resources/eloglang.swedish b/resources/eloglang.swedish index f2fe94e6..93bda8a9 100644 --- a/resources/eloglang.swedish +++ b/resources/eloglang.swedish @@ -222,7 +222,6 @@ CSV Import = CSV Import Derive attributes from CSV file = Skapa attributen frn CSV filen Comma = Komma Semicolon = Semikolon -Ignore first line = Ignorera den frsta raden Preview import = Frhandsgranska import Too many attributes in CSV file = Fr mnga attribut i CSV filen %d entries successfully imported = %d poster har importerats @@ -349,7 +348,6 @@ Anonymous = Anonym Change %s = ndra %s %s wrote = %s skrev Maximum number of replies (%d) exceeded = Det maximala antalet svar (%d) har verskridits -Only user %s can edit this entry = Endast anvndare %s kan editera denna post Please select at least one '%s' = Vlj minst en '%s' Please select a '%s' = Vlj en '%s' Please enter month for attribute '%s' = Ange mnad fr attribut '%s' @@ -470,3 +468,10 @@ 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 = diff --git a/resources/eloglang.turkish b/resources/eloglang.turkish index 5ad7ae97..15f137ae 100755 --- a/resources/eloglang.turkish +++ b/resources/eloglang.turkish @@ -60,7 +60,6 @@ Please check that it exists and elogd has write access = L Error: Attribute %s not supplied = Hata: %s zellikleri mevcut deil Please go back and enter the %s field = Ltfen geri gidin ve %s alanna girin Please use your browser's back button to go back = Ltfen taraycnzn geri tuunu, geri gitmek iin kullann -Only user %s can edit this entry = Bu kayd yalnzca %s kullancs dzenleyebilir ELOG find = ELOG bul Find = Bul Search = Ara @@ -86,7 +85,6 @@ Error: Command "%s" not allowed = Hata: "%s" komutu kabul edilmedi Cannot open file %s = %s dosyas alamyor Cannot write to %s = %s'a yazlamyor No SMTP host defined in [global] section of configuration file = Ayar dosyasnn [global] blmnde SMTP host tanm yok -Only user %s can edit this entry = Bu girdiyi yalnzca %s kullancs dzenleyebilir Display threads = lmekleri gster Logbook is empty = Kayt defteri bo Download = ndir @@ -255,7 +253,6 @@ CSV Import = CSV i Derive attributes from CSV file = CSV dosyasndan zellii al Comma = Virgl Semicolon = Noktal virgl -Ignore first line = lk satr gz ard et Preview import = eri aktarma nizleme CSV import preview of %s = %s'nin CSV aktarmnn nizlemesi Too many attributes in CSV file = CSV dosyas ierisinde ok fazla zellik @@ -466,3 +463,10 @@ 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 = diff --git a/resources/eloglang.zh_CN-GB2312 b/resources/eloglang.zh_CN-GB2312 index 5895c99c..fc892664 100644 --- a/resources/eloglang.zh_CN-GB2312 +++ b/resources/eloglang.zh_CN-GB2312 @@ -58,7 +58,6 @@ Please check that it exists and elogd has write access = Error: Attribute %s not supplied = ûṩ %s Please go back and enter the %s field = 뷵زд %s Please use your browser's back button to go back = ʹķذť -Only user %s can edit this entry = ֻû %s ޸ĸü¼ ELOG find = ELOG Find = Search = @@ -84,7 +83,6 @@ Error: Command "%s" not allowed = Cannot open file %s = ޷ļ %s Cannot write to %s = ޷дļ %s No SMTP host defined in [global] section of configuration file = ļ [global] ûж SMTP -Only user %s can edit this entry = ֻû %s Ա༭ü¼ Display threads = ʾ Logbook is empty = ¼ Download = @@ -252,7 +250,6 @@ ELOG CSV import = Derive attributes from CSV file = CSV ļлȡ Comma = Semicolon = ֺ -Ignore first line = Եһ Preview import = Ԥ CSV import preview of %s = %s CSV Ԥ Too many attributes in CSV file = CSV ļ̫ @@ -465,3 +462,10 @@ 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 = diff --git a/resources/eloglang.zh_CN-UTF8 b/resources/eloglang.zh_CN-UTF8 index 403f869e..0ed91058 100644 --- a/resources/eloglang.zh_CN-UTF8 +++ b/resources/eloglang.zh_CN-UTF8 @@ -58,7 +58,6 @@ Please check that it exists and elogd has write access = 请检查它是否存 Error: Attribute %s not supplied = 错误：没有提供 %s 属性 Please go back and enter the %s field = 请返回并填写 %s 内容 Please use your browser's back button to go back = 请使用你浏览器的返回按钮返回 -Only user %s can edit this entry = 只有用户 %s 可以修改该记录 ELOG find = ELOG 查找 Find = 查找 Search = 搜索 @@ -84,7 +83,6 @@ Error: Command "%s" not allowed = 错误：命令 "%s" 被禁止 Cannot open file %s = 无法打开文件 %s Cannot write to %s = 无法写入文件 %s No SMTP host defined in [global] section of configuration file = 配置文件的 [global] 区域中没有定义 SMTP 主机 -Only user %s can edit this entry = 只有用户 %s 可以编辑该记录 Display threads = 显示主题 Logbook is empty = 记录本无内容 Download = 下载 @@ -252,7 +250,6 @@ ELOG CSV import = 导入 ELOG CSV Derive attributes from CSV file = 从 CSV 文件中获取属性 Comma = 逗号 Semicolon = 分号 -Ignore first line = 忽略第一行 Preview import = 输入预览 CSV import preview of %s = %s 的 CSV 输入预览 Too many attributes in CSV file = CSV 文件中有太多的属性 @@ -465,3 +462,10 @@ 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 = diff --git a/src/elog.c b/src/elog.c index 10da1ed2..8ae1b2a2 100755 --- a/src/elog.c +++ b/src/elog.c @@ -9,7 +9,7 @@ \********************************************************************/ -#define VERSION "2.7.5" +#define VERSION "2.7.6" char svn_revision[] = "$Id$"; /* ELOG identification */ diff --git a/src/elogd.c b/src/elogd.c index 7b0970ce..f9133fd1 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -9,7 +9,7 @@ \********************************************************************/ /* Version of ELOG */ -#define VERSION "2.7.5" +#define VERSION "2.7.6" char svn_revision[] = "$Id$"; /* ELOG identification */ @@ -4646,9 +4646,8 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, char *date, char attr_n p += 41; old_text = xmalloc(size + 1); strlcpy(old_text, p, size); - if (old_text[strlen(old_text)-1] == '\n' || - old_text[strlen(old_text)-1] == '\r') - old_text[strlen(old_text)-1] = 0; + if (old_text[strlen(old_text) - 1] == '\n' || old_text[strlen(old_text) - 1] == '\r') + old_text[strlen(old_text) - 1] = 0; } } @@ -5397,8 +5396,9 @@ int is_html(char *s) /*------------------------------------------------------------------*/ char *script_tags[] = { "onerror", "onabort", "onchange", "onclick", "ondblclick", "onfocus", "onkeydown", - "onkeyup", "onload", "onmousedonw", "onmousemove", "onmouseover", "onmouseup", - "onreset", "onselect", "onsubmit", "onunload", "javascript"}; + "onkeyup", "onload", "onmousedonw", "onmousemove", "onmouseover", "onmouseup", + "onreset", "onselect", "onsubmit", "onunload", "javascript" +}; int is_script(char *s) { @@ -5523,11 +5523,8 @@ int line_break(char *str, char *encoding) if (strieq(encoding, "plain") || strieq(encoding, "ELCode")) { return str[0] == '\n'; } - // HTML encoding - if (strncmp(str, "

", 4) == 0 || - strncmp(str, "
", 4) == 0 || - strncmp(str, "
", 4) == 0) + if (strncmp(str, "

", 4) == 0 || strncmp(str, "
", 4) == 0 || strncmp(str, "
", 4) == 0) return 1; return 0; @@ -5661,7 +5658,7 @@ void rsputs(const char *str) if (strlen_retbuf + (int) strlen(str) + 1 >= return_buffer_size) { return_buffer = xrealloc(return_buffer, return_buffer_size + (int) strlen(str) + 100000); memset(return_buffer + return_buffer_size, 0, (int) strlen(str) + 100000); - return_buffer_size += (int) strlen(str)+100000; + return_buffer_size += (int) strlen(str) + 100000; } strcpy(return_buffer + strlen_retbuf, str); @@ -6160,7 +6157,7 @@ void rsputs_elcode(LOGBOOK * lbs, BOOL email_notify, const char *str) if (i > 0 && str[i - 1] == '\\') { j--; - strncpy(return_buffer + j, str+i, strlen(pattern_list[l].pattern)); + strncpy(return_buffer + j, str + i, strlen(pattern_list[l].pattern)); j += strlen(pattern_list[l].pattern); i += strlen(pattern_list[l].pattern) - 1; // 1 gets added in for loop... substituted = TRUE; @@ -7095,13 +7092,12 @@ int scan_attributes(char *logbook) /* check for forbidden attributes */ for (i = 0; i < n; i++) { - if (strieq(attr_list[i], "text") || - strieq(attr_list[i], "date") || - strieq(attr_list[i], "encoding") || - strieq(attr_list[i], "reply to") || - strieq(attr_list[i], "locked by") || - strieq(attr_list[i], "in reply to") || - strieq(attr_list[i], "attachment")) { + if (strieq(attr_list[i], "text") || + strieq(attr_list[i], "date") || + strieq(attr_list[i], "encoding") || + strieq(attr_list[i], "reply to") || + strieq(attr_list[i], "locked by") || + strieq(attr_list[i], "in reply to") || strieq(attr_list[i], "attachment")) { sprintf(str, loc("Forbidden attribute: %s"), attr_list[i]); show_error(str); return -1; @@ -8878,7 +8874,7 @@ void show_time_selector(int hour, int min, int sec, char *index) int i; rsprintf("\n", - attr_list[i], attrib[i]); + rsprintf("\n", + attr_list[i], attrib[i]); } } else { @@ -11798,10 +11794,10 @@ void show_find_form(LOGBOOK * lbs) sprintf(str, "%s_%d", attr_list[i], j); if (isparam(str)) - rsprintf("\n", + rsprintf("\n", str, str, attr_options[i][j]); else - rsprintf("\n", + rsprintf("\n", str, str, attr_options[i][j]); rsprintf("\n", str, attr_options[i][j]); @@ -11823,7 +11819,8 @@ void show_find_form(LOGBOOK * lbs) strencode2(enc_attr, attrib[i], sizeof(enc_attr)); sprintf(whole_attr, "^%s$", str); - if (strieq(attr_options[i][j], attrib[i]) || strieq(str, enc_attr) || strieq(whole_attr, enc_attr)) + if (strieq(attr_options[i][j], attrib[i]) || strieq(str, enc_attr) + || strieq(whole_attr, enc_attr)) rsprintf("