mirror of
https://gitea.psi.ch/ELOG/elog.git
synced 2026-09-08 17:13:56 +00:00
Release 2.7.6-1
SVN revision: 2191
This commit is contained in:
parent
ec19abb311
commit
cd6b160e89
@ -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 <attrib> <value>"
|
||||||
|
- 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
|
Version 2.7.5, released Sept. 22th 2008
|
||||||
=======================================
|
=======================================
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,7 @@
|
|||||||
[<a class="nav" href="#links">Links</a>] * </div>
|
[<a class="nav" href="#links">Links</a>] * </div>
|
||||||
<P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt@psi.ch">
|
<P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt@psi.ch">
|
||||||
Stefan Ritt</a></P>
|
Stefan Ritt</a></P>
|
||||||
<div class="version">Current version is : 2.7.5</div>
|
<div class="version">Current version is : 2.7.6</div>
|
||||||
<center>
|
<center>
|
||||||
<a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
|
<a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
|
||||||
</center>
|
</center>
|
||||||
|
|||||||
@ -28,7 +28,7 @@
|
|||||||
[<a class="nav" href="#links">Links</a>] * </div>
|
[<a class="nav" href="#links">Links</a>] * </div>
|
||||||
<P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt@psi.ch">
|
<P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt@psi.ch">
|
||||||
Stefan Ritt</a></P>
|
Stefan Ritt</a></P>
|
||||||
<div class="version">Current version is : 2.7.5</div>
|
<div class="version">Current version is : 2.7.6</div>
|
||||||
<center>
|
<center>
|
||||||
<a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
|
<a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
|
||||||
|
|
||||||
|
|||||||
@ -90,7 +90,6 @@ New passwords do not match, please retype = Nova senha n
|
|||||||
Old password = Senha anterior
|
Old password = Senha anterior
|
||||||
Retype new password = Digite novamente a nova senha
|
Retype new password = Digite novamente a nova senha
|
||||||
Maximum number of replies (%d) exceeded = Número máximo de repostas (%d) excedido
|
Maximum number of replies (%d) exceeded = Número máximo de repostas (%d) excedido
|
||||||
Only user <i>%s</i> can edit this entry = Somente o usuário <i>%s</i> pode editar essa entrada
|
|
||||||
Update = Atualizar
|
Update = Atualizar
|
||||||
Add %s = Adicionar %s
|
Add %s = Adicionar %s
|
||||||
Add new option here = Adicionar nova opção aqui
|
Add new option here = Adicionar nova opção aqui
|
||||||
@ -252,7 +251,6 @@ ELOG CSV import = Importe de CSV do ELOG
|
|||||||
Derive attributes from CSV file = Derivar atributos do arquivo de CSV
|
Derive attributes from CSV file = Derivar atributos do arquivo de CSV
|
||||||
Comma = Vírgula
|
Comma = Vírgula
|
||||||
Semicolon = Ponto e vírgula
|
Semicolon = Ponto e vírgula
|
||||||
Ignore first line = Ignorar a primeira linha
|
|
||||||
Preview import = Preview import
|
Preview import = Preview import
|
||||||
Too many attributes in CSV file = Muitos atributos no arquivo de CSV
|
Too many attributes in CSV file = Muitos atributos no arquivo de CSV
|
||||||
%d entries successfully imported = %d entradas importadas com sucesso
|
%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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -111,7 +111,6 @@ Pick a date =
|
|||||||
user = ïîòðåáèòåë
|
user = ïîòðåáèòåë
|
||||||
on = íà
|
on = íà
|
||||||
Maximum number of replies (%d) exceeded = Ìàêñèìàëíèÿò áðîé íà îòãîâîðè (%d) å ïðåâèøåí
|
Maximum number of replies (%d) exceeded = Ìàêñèìàëíèÿò áðîé íà îòãîâîðè (%d) å ïðåâèøåí
|
||||||
Only user <i>%s</i> can edit this entry = Само потребителят <i>%s</i> може да редактира този запис
|
|
||||||
Entry can only be edited %1.2lg hours after creation = Çàïèñúò ìîæå äà áúäå ðåäàêòèðàí ïîíå %1.2lg ÷àñà ñëåä ñúçäàâàíåòî
|
Entry can only be edited %1.2lg hours after creation = Çàïèñúò ìîæå äà áúäå ðåäàêòèðàí ïîíå %1.2lg ÷àñà ñëåä ñúçäàâàíåòî
|
||||||
Please select at least one '%s' = Ìîëÿ, èçáåðåòå ïîíå åäíî "%s"
|
Please select at least one '%s' = Ìîëÿ, èçáåðåòå ïîíå åäíî "%s"
|
||||||
Please select a '%s' = Ìîëÿ, èçáåðåòå "%s"
|
Please select a '%s' = Ìîëÿ, èçáåðåòå "%s"
|
||||||
@ -203,7 +202,6 @@ Auto detect =
|
|||||||
Comma = Çàïåòàÿ
|
Comma = Çàïåòàÿ
|
||||||
Semicolon = Òî÷êà è çàïåòàÿ
|
Semicolon = Òî÷êà è çàïåòàÿ
|
||||||
Derive attributes from CSV file = Èçâëè÷àíå íà àòðèáóòè îò CSV ôàéë
|
Derive attributes from CSV file = Èçâëè÷àíå íà àòðèáóòè îò CSV ôàéë
|
||||||
Ignore first line = Игнориране на първия ред
|
|
||||||
Preview import = Ïðåäâàðèòåëåí ïðåãëåä íà èìïîðòèðàíåòî
|
Preview import = Ïðåäâàðèòåëåí ïðåãëåä íà èìïîðòèðàíåòî
|
||||||
text = òåêñò
|
text = òåêñò
|
||||||
Column header '%s' must be present in CSV file = Çàãëàâíàòà êîëîíà "%s" òðÿáâà äà ïðèñúñòâà â CSV ôàéëà
|
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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -57,7 +57,6 @@ Please check that it exists and elogd has write access = Ujistěte se o existenc
|
|||||||
Error: Attribute <b>%s</b> not supplied = Chyba: Atribut <b>%s</b> není dodán
|
Error: Attribute <b>%s</b> not supplied = Chyba: Atribut <b>%s</b> není dodán
|
||||||
Please go back and enter the <b>%s</b> field = Jděte zpět a zadejte <b>%s</b> pole
|
Please go back and enter the <b>%s</b> field = Jděte zpět a zadejte <b>%s</b> pole
|
||||||
Please use your browser's back button to go back = Použijte tlačítka Zpět vašeho prohlížeče
|
Please use your browser's back button to go back = Použijte tlačítka Zpět vašeho prohlížeče
|
||||||
Only user <i>%s</i> can edit this entry = Pouze uživatel <i>%s</i> může měnit tuto položku
|
|
||||||
ELOG find = ELOG najít
|
ELOG find = ELOG najít
|
||||||
Find = Najít
|
Find = Najít
|
||||||
Search = Hledat
|
Search = Hledat
|
||||||
@ -83,7 +82,6 @@ Error: Command "<b>%s</b>" not allowed = Chyba: Příkaz "<b>%s</b>" není dovol
|
|||||||
Cannot open file <b>%s</b> = Soubor <b>%s</b> nelze otevřít
|
Cannot open file <b>%s</b> = Soubor <b>%s</b> nelze otevřít
|
||||||
Cannot write to <b>%s</b> = Do souboru <b>%s</b> nelze zapisovet
|
Cannot write to <b>%s</b> = Do souboru <b>%s</b> 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
|
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 <i>%s</i> can edit this entry = Pouze uživatel <i>%s</i> může měnit tuto položku
|
|
||||||
Display threads = Zobraz vlákno
|
Display threads = Zobraz vlákno
|
||||||
Logbook is empty = Logbook je prázdný
|
Logbook is empty = Logbook je prázdný
|
||||||
Download = Stáhnout
|
Download = Stáhnout
|
||||||
@ -252,7 +250,6 @@ CSV Import = CSV Import
|
|||||||
Derive attributes from CSV file = Odvoď atributy z CSV souboru
|
Derive attributes from CSV file = Odvoď atributy z CSV souboru
|
||||||
Comma = Ćárka
|
Comma = Ćárka
|
||||||
Semicolon = Středník
|
Semicolon = Středník
|
||||||
Ignore first line = Ignoruj první řádek
|
|
||||||
Preview import = Import náhledu
|
Preview import = Import náhledu
|
||||||
CSV import preview of %s = CSV Import náhledu z %s
|
CSV import preview of %s = CSV Import náhledu z %s
|
||||||
Too many attributes in CSV file = Příliš mnoho atributů v CSV souboru
|
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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -57,7 +57,6 @@ Please check that it exists and elogd has write access = Check venligst om det e
|
|||||||
Error: Attribute <b>%s</b> not supplied = Fejl: Attribut <b>%s</b> ikke udfyldt
|
Error: Attribute <b>%s</b> not supplied = Fejl: Attribut <b>%s</b> ikke udfyldt
|
||||||
Please go back and enter the <b>%s</b> field = Gå tilbage og udfyld <b>%s</b> feltet
|
Please go back and enter the <b>%s</b> field = Gå tilbage og udfyld <b>%s</b> feltet
|
||||||
Please use your browser's back button to go back = Brug tilbage knappen på din browser
|
Please use your browser's back button to go back = Brug tilbage knappen på din browser
|
||||||
Only user <i>%s</i> can edit this entry = Kun bruger <i>%s</i> kan ændre dette indlæg
|
|
||||||
ELOG find = ELOG søg
|
ELOG find = ELOG søg
|
||||||
Find = Find
|
Find = Find
|
||||||
Search = Søg
|
Search = Søg
|
||||||
@ -83,7 +82,6 @@ Error: Command "<b>%s</b>" not allowed = Fejl: kommando "<b>%s</b>" ikke tilladt
|
|||||||
Cannot open file <b>%s</b> =kan ikke åbne filen <b>%s</b>
|
Cannot open file <b>%s</b> =kan ikke åbne filen <b>%s</b>
|
||||||
Cannot write to <b>%s</b> = kan ikke skrive til <b>%s</b>
|
Cannot write to <b>%s</b> = kan ikke skrive til <b>%s</b>
|
||||||
No SMTP host defined in [global] section of configuration file = Ingen smtp host defineret i [global] sektionen af konfigurationen
|
No SMTP host defined in [global] section of configuration file = Ingen smtp host defineret i [global] sektionen af konfigurationen
|
||||||
Only user <i>%s</i> can edit this entry = Kun bruger <i>%s</i> kan ændre dette indlæg
|
|
||||||
Display threads = Vis tråde
|
Display threads = Vis tråde
|
||||||
Logbook is empty = Logbog er tom
|
Logbook is empty = Logbog er tom
|
||||||
Download = Hent
|
Download = Hent
|
||||||
@ -252,7 +250,6 @@ CSV Import = CSV Import
|
|||||||
Derive attributes from CSV file = Hent attributer fra CSV fil
|
Derive attributes from CSV file = Hent attributer fra CSV fil
|
||||||
Comma = Komma
|
Comma = Komma
|
||||||
Semicolon = Semikolon
|
Semicolon = Semikolon
|
||||||
Ignore first line = Ignorer første linie
|
|
||||||
Preview import = Gennemse Import
|
Preview import = Gennemse Import
|
||||||
CSV import preview of %s = CSV import gennemsyn af %s
|
CSV import preview of %s = CSV import gennemsyn af %s
|
||||||
Too many attributes in CSV file = For mange attributter i CSV fil
|
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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -58,7 +58,6 @@ Please check that it exists and elogd has write access = Controleer of het besta
|
|||||||
Error: Attribute <b>%s</b> not supplied = Fout: Attribuut <b>%s</b> niet ingevuld
|
Error: Attribute <b>%s</b> not supplied = Fout: Attribuut <b>%s</b> niet ingevuld
|
||||||
Please go back and enter the <b>%s</b> field = Ga terug en vul het veld <b>%s</b> in
|
Please go back and enter the <b>%s</b> field = Ga terug en vul het veld <b>%s</b> in
|
||||||
Please use your browser's back button to go back = Gebruik de terug-knop van je browser om terug te gaan
|
Please use your browser's back button to go back = Gebruik de terug-knop van je browser om terug te gaan
|
||||||
Only user <i>%s</i> can edit this entry = Alleen de gebruiker <i>%s</i> kan dit item wijzigen
|
|
||||||
ELOG find = ELOG zoeken
|
ELOG find = ELOG zoeken
|
||||||
Find = zoek
|
Find = zoek
|
||||||
Search = Zoeken
|
Search = Zoeken
|
||||||
@ -84,7 +83,6 @@ Error: Command "<b>%s</b>" not allowed = Fout: Commando "<b>%s</b>" niet toegest
|
|||||||
Cannot open file <b>%s</b> = Bestand <b>%s</b> kan niet worden geopend
|
Cannot open file <b>%s</b> = Bestand <b>%s</b> kan niet worden geopend
|
||||||
Cannot write to <b>%s</b> = Kan niet schrijven naar bestand <b>%s</b>
|
Cannot write to <b>%s</b> = Kan niet schrijven naar bestand <b>%s</b>
|
||||||
No SMTP host defined in [global] section of configuration file = Geen SMTP Host vermeld in [global] van het configuratiebestand
|
No SMTP host defined in [global] section of configuration file = Geen SMTP Host vermeld in [global] van het configuratiebestand
|
||||||
Only user <i>%s</i> can edit this entry = Alleen gebruiker <i>%s</i> kan dit bericht wijzigen
|
|
||||||
Display threads = Toon draden
|
Display threads = Toon draden
|
||||||
Logbook is empty = logboek is leeg
|
Logbook is empty = logboek is leeg
|
||||||
Download = Download
|
Download = Download
|
||||||
@ -253,7 +251,6 @@ CSV Import = CSV Import
|
|||||||
Derive attributes from CSV file = Haal attributen uit csv bestand
|
Derive attributes from CSV file = Haal attributen uit csv bestand
|
||||||
Comma = Komma
|
Comma = Komma
|
||||||
Semicolon = Punt Komma
|
Semicolon = Punt Komma
|
||||||
Ignore first line = Negeer eerste regel
|
|
||||||
Preview import = Import voorbeeld
|
Preview import = Import voorbeeld
|
||||||
ELOG CSV import = ELOG CSV import
|
ELOG CSV import = ELOG CSV import
|
||||||
Too many attributes in CSV file = Te veel attributen in CSV bestand
|
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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -56,7 +56,6 @@ Please check that it exists and elogd has write access = V
|
|||||||
Error: Attribute <b>%s</b> not supplied = Erreur : l'attribut <b>%s</b> n'est pas spécifié
|
Error: Attribute <b>%s</b> not supplied = Erreur : l'attribut <b>%s</b> n'est pas spécifié
|
||||||
Please go back and enter the <b>%s</b> field = Revenez en arrière et renseignez le champ <b>%s</b>
|
Please go back and enter the <b>%s</b> field = Revenez en arrière et renseignez le champ <b>%s</b>
|
||||||
Please use your browser's back button to go back = Utilisez le bouton "page précédente" de votre navigateur pour revenir en arrière
|
Please use your browser's back button to go back = Utilisez le bouton "page précédente" de votre navigateur pour revenir en arrière
|
||||||
Only user <i>%s</i> can edit this entry = Seulement l'utilisateur <i>%s</i> peut changer cetter entrée
|
|
||||||
ELOG find = Recherche ELOG
|
ELOG find = Recherche ELOG
|
||||||
Find = Chercher
|
Find = Chercher
|
||||||
Search = Lancer la recherche
|
Search = Lancer la recherche
|
||||||
@ -82,7 +81,6 @@ Error: Command "<b>%s</b>" not allowed = Erreur : commande "<b>%s</b>" non autor
|
|||||||
Cannot open file <b>%s</b> = Erreur d'ouverture du fichier <b>%s</b>
|
Cannot open file <b>%s</b> = Erreur d'ouverture du fichier <b>%s</b>
|
||||||
Cannot write to <b>%s</b> = Erreur d'écriture dans le fichier <b>%s</b>
|
Cannot write to <b>%s</b> = Erreur d'écriture dans le fichier <b>%s</b>
|
||||||
No SMTP host defined in [global] section of configuration file = Aucun serveur SMTP n'est défini dans la section [global] du fichier de configuration
|
No SMTP host defined in [global] section of configuration file = Aucun serveur SMTP n'est défini dans la section [global] du fichier de configuration
|
||||||
Only user <i>%s</i> can edit this entry = Seul l'utilisateur <i>%s</i> peut modifier cette entrée
|
|
||||||
Display threads = Afficher les fils de discussion
|
Display threads = Afficher les fils de discussion
|
||||||
Logbook is empty = Ce registre est vide
|
Logbook is empty = Ce registre est vide
|
||||||
Download = Télécharger
|
Download = Télécharger
|
||||||
@ -252,7 +250,6 @@ ELOG CSV import = Importation CSV ELOG
|
|||||||
Derive attributes from CSV file = Créer les attributs à partir du fichier CSV
|
Derive attributes from CSV file = Créer les attributs à partir du fichier CSV
|
||||||
Comma = virgule
|
Comma = virgule
|
||||||
Semicolon = point-virgule
|
Semicolon = point-virgule
|
||||||
Ignore first line = Ignorer la première ligne
|
|
||||||
Preview import = Aperçu avant importation
|
Preview import = Aperçu avant importation
|
||||||
Too many attributes in CSV file = Trop d'attributs dans le fichier CSV
|
Too many attributes in CSV file = Trop d'attributs dans le fichier CSV
|
||||||
%d entries successfully imported = %d entrées importées avec succès
|
%d entries successfully imported = %d entrées importées avec succès
|
||||||
@ -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
|
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 = Pièces jointes
|
Attachments = Pièces jointes
|
||||||
Error: Content length (%d) larger than maximum content length (%d) = Erreur : la taille du contenu (%d) est supérieure au maximum autorisé (%d)
|
Error: Content length (%d) larger than maximum content length (%d) = Erreur : la taille du contenu (%d) est supérieure au maximum autorisé (%d)
|
||||||
|
|
||||||
|
#
|
||||||
|
#---- please translate following items and then remove this comment ----#
|
||||||
|
#
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -57,7 +57,6 @@ Please check that it exists and elogd has write access = Bitte
|
|||||||
Error: Attribute <b>%s</b> not supplied = Fehler: Attribut <b>%s</b> nicht ausgefüllt
|
Error: Attribute <b>%s</b> not supplied = Fehler: Attribut <b>%s</b> nicht ausgefüllt
|
||||||
Please go back and enter the <b>%s</b> field = Bitte zurückgehen und das Feld <b>%s</b> ausfüllen
|
Please go back and enter the <b>%s</b> field = Bitte zurückgehen und das Feld <b>%s</b> ausfüllen
|
||||||
Please use your browser's back button to go back = Bitte die Zurück-Taste Ihres Browsers betätigen
|
Please use your browser's back button to go back = Bitte die Zurück-Taste Ihres Browsers betätigen
|
||||||
Only user <i>%s</i> can edit this entry = Dieser Eintrag kann nur von <i>%s</i> verändert werden
|
|
||||||
ELOG find = ELOG suchen
|
ELOG find = ELOG suchen
|
||||||
Find = Finden
|
Find = Finden
|
||||||
Search = Suchen
|
Search = Suchen
|
||||||
@ -83,7 +82,6 @@ Error: Command "<b>%s</b>" not allowed = Fehler: Befehl "<b>%s</b>" nicht erlaub
|
|||||||
Cannot open file <b>%s</b> = Datei <b>%s</b> kann nicht geöffnet werden
|
Cannot open file <b>%s</b> = Datei <b>%s</b> kann nicht geöffnet werden
|
||||||
Cannot write to <b>%s</b> = Datei <b>%s</b> kann nicht geschrieben werden
|
Cannot write to <b>%s</b> = Datei <b>%s</b> kann nicht geschrieben werden
|
||||||
No SMTP host defined in [global] section of configuration file = Kein SMTP Host im [global] Bereich der Konfigurationsdatei definiert
|
No SMTP host defined in [global] section of configuration file = Kein SMTP Host im [global] Bereich der Konfigurationsdatei definiert
|
||||||
Only user <i>%s</i> can edit this entry = Nur Benutzer <i>%s</i> kann diesen Eintrag ändern
|
|
||||||
Display threads = Antwortkette darstellen
|
Display threads = Antwortkette darstellen
|
||||||
Logbook is empty = Logbuch ist leer
|
Logbook is empty = Logbuch ist leer
|
||||||
Download = Herunterladen
|
Download = Herunterladen
|
||||||
@ -252,7 +250,6 @@ CSV Import = CSV Import
|
|||||||
Derive attributes from CSV file = Attribute aus CSV Datei übernehmen
|
Derive attributes from CSV file = Attribute aus CSV Datei übernehmen
|
||||||
Comma = Komma
|
Comma = Komma
|
||||||
Semicolon = Semikolon
|
Semicolon = Semikolon
|
||||||
Ignore first line = Erste Zeile ignorieren
|
|
||||||
Preview import = Import überprüfen
|
Preview import = Import überprüfen
|
||||||
CSV import preview of %s = CSV Import Überprüfung von %s
|
CSV import preview of %s = CSV Import Überprüfung von %s
|
||||||
Too many attributes in CSV file = Zu viele Attribute in CSV Datei
|
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
|
Please log on by clicking on following link and change your password = Bitte durck klicken auf den folgenden link anmelden und Kennwort ändern
|
||||||
Attachments = Anhänge
|
Attachments = Anhänge
|
||||||
Error: Content length (%d) larger than maximum content length (%d) = Fehler: Datengröße (%d) ist größer als maximal erlaubte Datengröße (%d)
|
Error: Content length (%d) larger than maximum content length (%d) = Fehler: Datengröße (%d) ist größer als maximal erlaubte Datengröße (%d)
|
||||||
|
Forbidden attribute: %s = Verbotenes Attribut: %s
|
||||||
|
ELOG error = ELOG Fehler
|
||||||
|
Only user <b>%s</b> can edit this entry = Nur Benutzer <b>%s</b> 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 = Ungültige URL
|
||||||
|
|||||||
@ -57,7 +57,6 @@ Please check that it exists and elogd has write access = Per favore controlla ch
|
|||||||
Error: Attribute <b>%s</b> not supplied = Errore: Attributo <b>%s</b> non fornito
|
Error: Attribute <b>%s</b> not supplied = Errore: Attributo <b>%s</b> non fornito
|
||||||
Please go back and enter the <b>%s</b> field = Per favore torna indietro ed inserisci il campo <b>%s</b>
|
Please go back and enter the <b>%s</b> field = Per favore torna indietro ed inserisci il campo <b>%s</b>
|
||||||
Please use your browser's back button to go back = Per favore usa il pulsante indietro del tuo browser
|
Please use your browser's back button to go back = Per favore usa il pulsante indietro del tuo browser
|
||||||
Only user <i>%s</i> can edit this entry = Solo l'utente <i>%s</i> può modificare questo elemento
|
|
||||||
ELOG find = ELOG Cerca
|
ELOG find = ELOG Cerca
|
||||||
Find = Trova
|
Find = Trova
|
||||||
Search = Cerca
|
Search = Cerca
|
||||||
@ -83,7 +82,6 @@ Error: Command "<b>%s</b>" not allowed = Errore: Comando "<b>%s</b>" non permess
|
|||||||
Cannot open file <b>%s</b> = Non posso aprire il file <b>%s</b>
|
Cannot open file <b>%s</b> = Non posso aprire il file <b>%s</b>
|
||||||
Cannot write to <b>%s</b> = Non posso scrivere su <b>%s</b>
|
Cannot write to <b>%s</b> = Non posso scrivere su <b>%s</b>
|
||||||
No SMTP host defined in [global] section of configuration file = Nessun server SMTP definito nella sezione [global] del file di configurazione
|
No SMTP host defined in [global] section of configuration file = Nessun server SMTP definito nella sezione [global] del file di configurazione
|
||||||
Only user <i>%s</i> can edit this entry = Solo l'utente <i>%s</i> può modificare questo elemento
|
|
||||||
Display threads = Mostra le discussioni
|
Display threads = Mostra le discussioni
|
||||||
Logbook is empty = Il registro è vuoto
|
Logbook is empty = Il registro è vuoto
|
||||||
Download = Scarica
|
Download = Scarica
|
||||||
@ -251,7 +249,6 @@ ELOG CSV import = Importa CVS ELOG
|
|||||||
Derive attributes from CSV file = Deduci gli attributi dal file CSV
|
Derive attributes from CSV file = Deduci gli attributi dal file CSV
|
||||||
Comma = Virgola
|
Comma = Virgola
|
||||||
Semicolon = Punto e virgola
|
Semicolon = Punto e virgola
|
||||||
Ignore first line = Ignora la prima linea
|
|
||||||
Preview import = Anteprima dell'importazione
|
Preview import = Anteprima dell'importazione
|
||||||
CSV import preview of %s = Anteprima dell'importazione CSV di %s
|
CSV import preview of %s = Anteprima dell'importazione CSV di %s
|
||||||
Too many attributes in CSV file = Troppi attributi nel file CSV
|
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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -22,7 +22,6 @@ Submit =
|
|||||||
user = ユーザー
|
user = ユーザー
|
||||||
on = オン
|
on = オン
|
||||||
Maximum number of replies (%d) exceeded = 最大返信可能数(%d)を超過しています
|
Maximum number of replies (%d) exceeded = 最大返信可能数(%d)を超過しています
|
||||||
Only user <i>%s</i> can edit this entry = ユーザー <i>%s</i> だけがこのエントリーを編集できます
|
|
||||||
Entry can only be edited %1.2lg hours after creation = 記事は投稿後 %1.2lg 時間だけ編集できます
|
Entry can only be edited %1.2lg hours after creation = 記事は投稿後 %1.2lg 時間だけ編集できます
|
||||||
Please select at least one '%s' = 最低ひとつの'%s'を選択してください
|
Please select at least one '%s' = 最低ひとつの'%s'を選択してください
|
||||||
Please select a '%s' = '%s'を選択してください
|
Please select a '%s' = '%s'を選択してください
|
||||||
@ -250,7 +249,6 @@ ELOG CSV import = ELOG
|
|||||||
Derive attributes from CSV file = CSVファイルから属性を取得する
|
Derive attributes from CSV file = CSVファイルから属性を取得する
|
||||||
Comma = コンマ
|
Comma = コンマ
|
||||||
Semicolon = セミコロン
|
Semicolon = セミコロン
|
||||||
Ignore first line = 最初の一行を無視
|
|
||||||
Preview import = インポートのプレビュー
|
Preview import = インポートのプレビュー
|
||||||
CSV import preview of %s = %sのCSVインポートプレビュー
|
CSV import preview of %s = %sのCSVインポートプレビュー
|
||||||
Too many attributes in CSV file = CSVファイルの属性が多すぎます
|
Too many attributes in CSV file = CSVファイルの属性が多すぎます
|
||||||
@ -462,3 +460,10 @@ Cannot create thumbnail, please check ImageMagick installation =
|
|||||||
Please log on by clicking on following link and change your password =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -110,7 +110,6 @@ Pick a date =
|
|||||||
user = ïîëüçîâàòåëü
|
user = ïîëüçîâàòåëü
|
||||||
on = íà
|
on = íà
|
||||||
Maximum number of replies (%d) exceeded = Äîñòèãíóòî ìàêñèìàëüíîå (%d) ÷èñëî êîììåíòàðèåâ
|
Maximum number of replies (%d) exceeded = Äîñòèãíóòî ìàêñèìàëüíîå (%d) ÷èñëî êîììåíòàðèåâ
|
||||||
Only user <i>%s</i> can edit this entry = Только пользователь <i>%s</i> может редактировать эту запись
|
|
||||||
Entry can only be edited %1.2lg hours after creation = Çàïèñü ìîæåò áûòü îòðåäàêòèðîâàíà òîëüêî ñïóñòÿ %1.2lg ÷àñà ïîñëå ñîçäàíèÿ
|
Entry can only be edited %1.2lg hours after creation = Çàïèñü ìîæåò áûòü îòðåäàêòèðîâàíà òîëüêî ñïóñòÿ %1.2lg ÷àñà ïîñëå ñîçäàíèÿ
|
||||||
Please select at least one '%s' = Ïîæàëóéñòà âûáåðèòå õîòÿ áû îäíó "%s"
|
Please select at least one '%s' = Ïîæàëóéñòà âûáåðèòå õîòÿ áû îäíó "%s"
|
||||||
Please select a '%s' = Ïîæàëóéñòà âûáåðèòå "%s"
|
Please select a '%s' = Ïîæàëóéñòà âûáåðèòå "%s"
|
||||||
@ -202,7 +201,6 @@ Auto detect =
|
|||||||
Comma = Çàïÿòàÿ
|
Comma = Çàïÿòàÿ
|
||||||
Semicolon = Òî÷êà ñ çàïÿòîé
|
Semicolon = Òî÷êà ñ çàïÿòîé
|
||||||
Derive attributes from CSV file = Èçâëå÷ü àòðèáóòû èç CSV ôàéëà
|
Derive attributes from CSV file = Èçâëå÷ü àòðèáóòû èç CSV ôàéëà
|
||||||
Ignore first line = Игнорировать первую строку
|
|
||||||
Preview import = Ïðåäâàðèòåëüíûé ïðîñìîòð èìïîðòà
|
Preview import = Ïðåäâàðèòåëüíûé ïðîñìîòð èìïîðòà
|
||||||
text = òåêñò
|
text = òåêñò
|
||||||
Column header '%s' must be present in CSV file = Çàãîëîâîê '%s' äîëæåí ñóùåñòâîâàòü â CSV ôàéëå
|
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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -90,7 +90,6 @@ New passwords do not match, please retype = Las claves no coinciden, por favor r
|
|||||||
Old password = Clave anterior
|
Old password = Clave anterior
|
||||||
Retype new password = Reescriba nueva clave
|
Retype new password = Reescriba nueva clave
|
||||||
Maximum number of replies (%d) exceeded = Numero maximo de respuestas (%d) excedido
|
Maximum number of replies (%d) exceeded = Numero maximo de respuestas (%d) excedido
|
||||||
Only user <i>%s</i> can edit this entry = Solo el usuario <i>%s</i> puede editar esta entrada
|
|
||||||
Update = Actualizar
|
Update = Actualizar
|
||||||
Add %s = Agregar %s
|
Add %s = Agregar %s
|
||||||
Add new option here = Agregar nueva opcion aqui
|
Add new option here = Agregar nueva opcion aqui
|
||||||
@ -245,7 +244,6 @@ Field separator = Separador de campos
|
|||||||
Comma = Coma
|
Comma = Coma
|
||||||
Semicolon = Punto y coma
|
Semicolon = Punto y coma
|
||||||
Derive attributes from CSV file = Derivar atributos del archivo CSV
|
Derive attributes from CSV file = Derivar atributos del archivo CSV
|
||||||
Ignore first line = Ignorar la primera linea
|
|
||||||
Preview import = Vista previa de importacion
|
Preview import = Vista previa de importacion
|
||||||
CSV filename = Archivo CVS
|
CSV filename = Archivo CVS
|
||||||
CSV import preview of %s = Vista previa de importacion CSV %s
|
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
|
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
|
Attachments = Adjuntos
|
||||||
Error: Content length (%d) larger than maximum content length (%d) = Error: La longitud del contenido (%d) es mayor que la permitida (%d)
|
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 <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -222,7 +222,6 @@ CSV Import = CSV Import
|
|||||||
Derive attributes from CSV file = Skapa attributen från CSV filen
|
Derive attributes from CSV file = Skapa attributen från CSV filen
|
||||||
Comma = Komma
|
Comma = Komma
|
||||||
Semicolon = Semikolon
|
Semicolon = Semikolon
|
||||||
Ignore first line = Ignorera den första raden
|
|
||||||
Preview import = Förhandsgranska import
|
Preview import = Förhandsgranska import
|
||||||
Too many attributes in CSV file = För många attribut i CSV filen
|
Too many attributes in CSV file = För många attribut i CSV filen
|
||||||
%d entries successfully imported = %d poster har importerats
|
%d entries successfully imported = %d poster har importerats
|
||||||
@ -349,7 +348,6 @@ Anonymous = Anonym
|
|||||||
Change %s = Ändra %s
|
Change %s = Ändra %s
|
||||||
%s wrote = %s skrev
|
%s wrote = %s skrev
|
||||||
Maximum number of replies (%d) exceeded = Det maximala antalet svar (%d) har överskridits
|
Maximum number of replies (%d) exceeded = Det maximala antalet svar (%d) har överskridits
|
||||||
Only user <i>%s</i> can edit this entry = Endast användare <i>%s</i> kan editera denna post
|
|
||||||
Please select at least one '%s' = Välj minst en '%s'
|
Please select at least one '%s' = Välj minst en '%s'
|
||||||
Please select a '%s' = Välj en '%s'
|
Please select a '%s' = Välj en '%s'
|
||||||
Please enter month for attribute '%s' = Ange månad för attribut '%s'
|
Please enter month for attribute '%s' = Ange månad för 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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -60,7 +60,6 @@ Please check that it exists and elogd has write access = L
|
|||||||
Error: Attribute <b>%s</b> not supplied = Hata: <b>%s</b> özellikleri mevcut deðil
|
Error: Attribute <b>%s</b> not supplied = Hata: <b>%s</b> özellikleri mevcut deðil
|
||||||
Please go back and enter the <b>%s</b> field = Lütfen geri gidin ve <b>%s</b> alanýna girin
|
Please go back and enter the <b>%s</b> field = Lütfen geri gidin ve <b>%s</b> alanýna girin
|
||||||
Please use your browser's back button to go back = Lütfen tarayýcýnýzýn geri tuþunu, geri gitmek için kullanýn
|
Please use your browser's back button to go back = Lütfen tarayýcýnýzýn geri tuþunu, geri gitmek için kullanýn
|
||||||
Only user <i>%s</i> can edit this entry = Bu kaydı yalnızca <i>%s</i> kullanıcısı düzenleyebilir
|
|
||||||
ELOG find = ELOG bul
|
ELOG find = ELOG bul
|
||||||
Find = Bul
|
Find = Bul
|
||||||
Search = Ara
|
Search = Ara
|
||||||
@ -86,7 +85,6 @@ Error: Command "<b>%s</b>" not allowed = Hata: "<b>%s</b>" komutu kabul edilmedi
|
|||||||
Cannot open file <b>%s</b> = <b>%s</b> dosyasý açýlamýyor
|
Cannot open file <b>%s</b> = <b>%s</b> dosyasý açýlamýyor
|
||||||
Cannot write to <b>%s</b> = <b>%s</b>'a yazýlamýyor
|
Cannot write to <b>%s</b> = <b>%s</b>'a yazýlamýyor
|
||||||
No SMTP host defined in [global] section of configuration file = Ayar dosyasýnýn [global] bölümünde SMTP host tanýmý yok
|
No SMTP host defined in [global] section of configuration file = Ayar dosyasýnýn [global] bölümünde SMTP host tanýmý yok
|
||||||
Only user <i>%s</i> can edit this entry = Bu girdiyi yalnızca <i>%s</i> kullanıcısı düzenleyebilir
|
|
||||||
Display threads = Ýlmekleri göster
|
Display threads = Ýlmekleri göster
|
||||||
Logbook is empty = Kayýt defteri boþ
|
Logbook is empty = Kayýt defteri boþ
|
||||||
Download = Ýndir
|
Download = Ýndir
|
||||||
@ -255,7 +253,6 @@ CSV Import = CSV i
|
|||||||
Derive attributes from CSV file = CSV dosyasýndan özelliði al
|
Derive attributes from CSV file = CSV dosyasýndan özelliði al
|
||||||
Comma = Virgül
|
Comma = Virgül
|
||||||
Semicolon = Noktalý virgül
|
Semicolon = Noktalý virgül
|
||||||
Ignore first line = İlk satırı göz ardı et
|
|
||||||
Preview import = Ýçeri aktarma önizleme
|
Preview import = Ýçeri aktarma önizleme
|
||||||
CSV import preview of %s = %s'nin CSV aktarýmýnýn önizlemesi
|
CSV import preview of %s = %s'nin CSV aktarýmýnýn önizlemesi
|
||||||
Too many attributes in CSV file = CSV dosyasý içerisinde çok fazla özellik
|
Too many attributes in CSV file = CSV dosyasý içerisinde ç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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -58,7 +58,6 @@ Please check that it exists and elogd has write access =
|
|||||||
Error: Attribute <b>%s</b> not supplied = 错误:没有提供 <b>%s</b> 属性
|
Error: Attribute <b>%s</b> not supplied = 错误:没有提供 <b>%s</b> 属性
|
||||||
Please go back and enter the <b>%s</b> field = 请返回并填写 <b>%s</b> 内容
|
Please go back and enter the <b>%s</b> field = 请返回并填写 <b>%s</b> 内容
|
||||||
Please use your browser's back button to go back = 请使用你浏览器的返回按钮返回
|
Please use your browser's back button to go back = 请使用你浏览器的返回按钮返回
|
||||||
Only user <i>%s</i> can edit this entry = 只有用户 <i>%s</i> 可以修改该记录
|
|
||||||
ELOG find = ELOG 查找
|
ELOG find = ELOG 查找
|
||||||
Find = 查找
|
Find = 查找
|
||||||
Search = 搜索
|
Search = 搜索
|
||||||
@ -84,7 +83,6 @@ Error: Command "<b>%s</b>" not allowed =
|
|||||||
Cannot open file <b>%s</b> = 无法打开文件 <b>%s</b>
|
Cannot open file <b>%s</b> = 无法打开文件 <b>%s</b>
|
||||||
Cannot write to <b>%s</b> = 无法写入文件 <b>%s</b>
|
Cannot write to <b>%s</b> = 无法写入文件 <b>%s</b>
|
||||||
No SMTP host defined in [global] section of configuration file = 配置文件的 [global] 区域中没有定义 SMTP 主机
|
No SMTP host defined in [global] section of configuration file = 配置文件的 [global] 区域中没有定义 SMTP 主机
|
||||||
Only user <i>%s</i> can edit this entry = 只有用户 <i>%s</i> 可以编辑该记录
|
|
||||||
Display threads = 显示主题
|
Display threads = 显示主题
|
||||||
Logbook is empty = 记录本无内容
|
Logbook is empty = 记录本无内容
|
||||||
Download = 下载
|
Download = 下载
|
||||||
@ -252,7 +250,6 @@ ELOG CSV import =
|
|||||||
Derive attributes from CSV file = 从 CSV 文件中获取属性
|
Derive attributes from CSV file = 从 CSV 文件中获取属性
|
||||||
Comma = 逗号
|
Comma = 逗号
|
||||||
Semicolon = 分号
|
Semicolon = 分号
|
||||||
Ignore first line = 忽略第一行
|
|
||||||
Preview import = 输入预览
|
Preview import = 输入预览
|
||||||
CSV import preview of %s = %s 的 CSV 输入预览
|
CSV import preview of %s = %s 的 CSV 输入预览
|
||||||
Too many attributes in CSV file = 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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -58,7 +58,6 @@ Please check that it exists and elogd has write access = 请检查它是否存
|
|||||||
Error: Attribute <b>%s</b> not supplied = 错误:没有提供 <b>%s</b> 属性
|
Error: Attribute <b>%s</b> not supplied = 错误:没有提供 <b>%s</b> 属性
|
||||||
Please go back and enter the <b>%s</b> field = 请返回并填写 <b>%s</b> 内容
|
Please go back and enter the <b>%s</b> field = 请返回并填写 <b>%s</b> 内容
|
||||||
Please use your browser's back button to go back = 请使用你浏览器的返回按钮返回
|
Please use your browser's back button to go back = 请使用你浏览器的返回按钮返回
|
||||||
Only user <i>%s</i> can edit this entry = 只有用户 <i>%s</i> 可以修改该记录
|
|
||||||
ELOG find = ELOG 查找
|
ELOG find = ELOG 查找
|
||||||
Find = 查找
|
Find = 查找
|
||||||
Search = 搜索
|
Search = 搜索
|
||||||
@ -84,7 +83,6 @@ Error: Command "<b>%s</b>" not allowed = 错误:命令 "<b>%s</b>" 被禁止
|
|||||||
Cannot open file <b>%s</b> = 无法打开文件 <b>%s</b>
|
Cannot open file <b>%s</b> = 无法打开文件 <b>%s</b>
|
||||||
Cannot write to <b>%s</b> = 无法写入文件 <b>%s</b>
|
Cannot write to <b>%s</b> = 无法写入文件 <b>%s</b>
|
||||||
No SMTP host defined in [global] section of configuration file = 配置文件的 [global] 区域中没有定义 SMTP 主机
|
No SMTP host defined in [global] section of configuration file = 配置文件的 [global] 区域中没有定义 SMTP 主机
|
||||||
Only user <i>%s</i> can edit this entry = 只有用户 <i>%s</i> 可以编辑该记录
|
|
||||||
Display threads = 显示主题
|
Display threads = 显示主题
|
||||||
Logbook is empty = 记录本无内容
|
Logbook is empty = 记录本无内容
|
||||||
Download = 下载
|
Download = 下载
|
||||||
@ -252,7 +250,6 @@ ELOG CSV import = 导入 ELOG CSV
|
|||||||
Derive attributes from CSV file = 从 CSV 文件中获取属性
|
Derive attributes from CSV file = 从 CSV 文件中获取属性
|
||||||
Comma = 逗号
|
Comma = 逗号
|
||||||
Semicolon = 分号
|
Semicolon = 分号
|
||||||
Ignore first line = 忽略第一行
|
|
||||||
Preview import = 输入预览
|
Preview import = 输入预览
|
||||||
CSV import preview of %s = %s 的 CSV 输入预览
|
CSV import preview of %s = %s 的 CSV 输入预览
|
||||||
Too many attributes in CSV file = 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 =
|
Please log on by clicking on following link and change your password =
|
||||||
Attachments =
|
Attachments =
|
||||||
Error: Content length (%d) larger than maximum content length (%d) =
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
Forbidden attribute: %s =
|
||||||
|
ELOG error =
|
||||||
|
Only user <b>%s</b> can edit this entry =
|
||||||
|
Export to =
|
||||||
|
Do not ignore first line =
|
||||||
|
Last %d hours =
|
||||||
|
Invalid URL =
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
\********************************************************************/
|
\********************************************************************/
|
||||||
|
|
||||||
#define VERSION "2.7.5"
|
#define VERSION "2.7.6"
|
||||||
char svn_revision[] = "$Id$";
|
char svn_revision[] = "$Id$";
|
||||||
|
|
||||||
/* ELOG identification */
|
/* ELOG identification */
|
||||||
|
|||||||
98
src/elogd.c
98
src/elogd.c
@ -9,7 +9,7 @@
|
|||||||
\********************************************************************/
|
\********************************************************************/
|
||||||
|
|
||||||
/* Version of ELOG */
|
/* Version of ELOG */
|
||||||
#define VERSION "2.7.5"
|
#define VERSION "2.7.6"
|
||||||
char svn_revision[] = "$Id$";
|
char svn_revision[] = "$Id$";
|
||||||
|
|
||||||
/* ELOG identification */
|
/* ELOG identification */
|
||||||
@ -4646,9 +4646,8 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, char *date, char attr_n
|
|||||||
p += 41;
|
p += 41;
|
||||||
old_text = xmalloc(size + 1);
|
old_text = xmalloc(size + 1);
|
||||||
strlcpy(old_text, p, size);
|
strlcpy(old_text, p, size);
|
||||||
if (old_text[strlen(old_text)-1] == '\n' ||
|
if (old_text[strlen(old_text) - 1] == '\n' || old_text[strlen(old_text) - 1] == '\r')
|
||||||
old_text[strlen(old_text)-1] == '\r')
|
old_text[strlen(old_text) - 1] = 0;
|
||||||
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",
|
char *script_tags[] = { "onerror", "onabort", "onchange", "onclick", "ondblclick", "onfocus", "onkeydown",
|
||||||
"onkeyup", "onload", "onmousedonw", "onmousemove", "onmouseover", "onmouseup",
|
"onkeyup", "onload", "onmousedonw", "onmousemove", "onmouseover", "onmouseup",
|
||||||
"onreset", "onselect", "onsubmit", "onunload", "javascript"};
|
"onreset", "onselect", "onsubmit", "onunload", "javascript"
|
||||||
|
};
|
||||||
|
|
||||||
int is_script(char *s)
|
int is_script(char *s)
|
||||||
{
|
{
|
||||||
@ -5523,11 +5523,8 @@ int line_break(char *str, char *encoding)
|
|||||||
if (strieq(encoding, "plain") || strieq(encoding, "ELCode")) {
|
if (strieq(encoding, "plain") || strieq(encoding, "ELCode")) {
|
||||||
return str[0] == '\n';
|
return str[0] == '\n';
|
||||||
}
|
}
|
||||||
|
|
||||||
// HTML encoding
|
// HTML encoding
|
||||||
if (strncmp(str, "</p>", 4) == 0 ||
|
if (strncmp(str, "</p>", 4) == 0 || strncmp(str, "<br>", 4) == 0 || strncmp(str, "<br />", 4) == 0)
|
||||||
strncmp(str, "<br>", 4) == 0 ||
|
|
||||||
strncmp(str, "<br />", 4) == 0)
|
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@ -5661,7 +5658,7 @@ void rsputs(const char *str)
|
|||||||
if (strlen_retbuf + (int) strlen(str) + 1 >= return_buffer_size) {
|
if (strlen_retbuf + (int) strlen(str) + 1 >= return_buffer_size) {
|
||||||
return_buffer = xrealloc(return_buffer, return_buffer_size + (int) strlen(str) + 100000);
|
return_buffer = xrealloc(return_buffer, return_buffer_size + (int) strlen(str) + 100000);
|
||||||
memset(return_buffer + return_buffer_size, 0, (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);
|
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] == '\\') {
|
if (i > 0 && str[i - 1] == '\\') {
|
||||||
|
|
||||||
j--;
|
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);
|
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...
|
||||||
substituted = TRUE;
|
substituted = TRUE;
|
||||||
@ -7100,8 +7097,7 @@ int scan_attributes(char *logbook)
|
|||||||
strieq(attr_list[i], "encoding") ||
|
strieq(attr_list[i], "encoding") ||
|
||||||
strieq(attr_list[i], "reply to") ||
|
strieq(attr_list[i], "reply to") ||
|
||||||
strieq(attr_list[i], "locked by") ||
|
strieq(attr_list[i], "locked by") ||
|
||||||
strieq(attr_list[i], "in reply to") ||
|
strieq(attr_list[i], "in reply to") || strieq(attr_list[i], "attachment")) {
|
||||||
strieq(attr_list[i], "attachment")) {
|
|
||||||
sprintf(str, loc("Forbidden attribute: %s"), attr_list[i]);
|
sprintf(str, loc("Forbidden attribute: %s"), attr_list[i]);
|
||||||
show_error(str);
|
show_error(str);
|
||||||
return -1;
|
return -1;
|
||||||
@ -11455,8 +11451,8 @@ void show_find_form(LOGBOOK * lbs)
|
|||||||
{
|
{
|
||||||
int i, j, year, month, day, flag;
|
int i, j, year, month, day, flag;
|
||||||
char str[NAME_LENGTH], mode[NAME_LENGTH], comment[NAME_LENGTH], option[NAME_LENGTH], login_name[256],
|
char str[NAME_LENGTH], mode[NAME_LENGTH], comment[NAME_LENGTH], option[NAME_LENGTH], login_name[256],
|
||||||
full_name[256], user_email[256], enc_attr[NAME_LENGTH], whole_attr[NAME_LENGTH],
|
full_name[256], user_email[256], enc_attr[NAME_LENGTH], whole_attr[NAME_LENGTH],
|
||||||
attrib[MAX_N_ATTR][NAME_LENGTH];
|
attrib[MAX_N_ATTR][NAME_LENGTH];
|
||||||
|
|
||||||
/*---- header ----*/
|
/*---- header ----*/
|
||||||
|
|
||||||
@ -11734,7 +11730,7 @@ void show_find_form(LOGBOOK * lbs)
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
rsprintf("<input type=\"text\" size=\"30\" maxlength=\"80\" name=\"%s\" value=\"%s\">\n",
|
rsprintf("<input type=\"text\" size=\"30\" maxlength=\"80\" name=\"%s\" value=\"%s\">\n",
|
||||||
attr_list[i], attrib[i]);
|
attr_list[i], attrib[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@ -11823,7 +11819,8 @@ void show_find_form(LOGBOOK * lbs)
|
|||||||
strencode2(enc_attr, attrib[i], sizeof(enc_attr));
|
strencode2(enc_attr, attrib[i], sizeof(enc_attr));
|
||||||
|
|
||||||
sprintf(whole_attr, "^%s$", str);
|
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("<option selected value=\"^%s$\">%s\n", str, str);
|
rsprintf("<option selected value=\"^%s$\">%s\n", str, str);
|
||||||
else
|
else
|
||||||
rsprintf("<option value=\"^%s$\">%s\n", str, str);
|
rsprintf("<option value=\"^%s$\">%s\n", str, str);
|
||||||
@ -14082,7 +14079,7 @@ void csv_import(LOGBOOK * lbs, const char *csv, const char *csvfile)
|
|||||||
BOOL first, in_quotes, filltext;
|
BOOL first, in_quotes, filltext;
|
||||||
time_t ltime;
|
time_t ltime;
|
||||||
|
|
||||||
list = xmalloc((MAX_N_ATTR+2) * NAME_LENGTH);
|
list = xmalloc((MAX_N_ATTR + 2) * NAME_LENGTH);
|
||||||
line = xmalloc(10000);
|
line = xmalloc(10000);
|
||||||
|
|
||||||
first = TRUE;
|
first = TRUE;
|
||||||
@ -14300,7 +14297,7 @@ void csv_import(LOGBOOK * lbs, const char *csv, const char *csvfile)
|
|||||||
} else {
|
} else {
|
||||||
|
|
||||||
/* get date and check it */
|
/* get date and check it */
|
||||||
strlcpy(date, list + datecol*NAME_LENGTH, sizeof(date));
|
strlcpy(date, list + datecol * NAME_LENGTH, sizeof(date));
|
||||||
ltime = date_to_ltime(date);
|
ltime = date_to_ltime(date);
|
||||||
if (ltime <= 0) {
|
if (ltime <= 0) {
|
||||||
/* try other date formats */
|
/* try other date formats */
|
||||||
@ -17222,7 +17219,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, int exp
|
|||||||
if (expand == 2) {
|
if (expand == 2) {
|
||||||
for (i = i_line = line_len = 0; i < (int) sizeof(str) - 1; i++, line_len++) {
|
for (i = i_line = line_len = 0; i < (int) sizeof(str) - 1; i++, line_len++) {
|
||||||
str[i] = text[i];
|
str[i] = text[i];
|
||||||
if (line_break(text+i, encoding)) {
|
if (line_break(text + i, encoding)) {
|
||||||
i_line++;
|
i_line++;
|
||||||
line_len = 0;
|
line_len = 0;
|
||||||
} else
|
} else
|
||||||
@ -17270,7 +17267,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, int exp
|
|||||||
max_line_len = n_line >= 10 ? 140 : 40;
|
max_line_len = n_line >= 10 ? 140 : 40;
|
||||||
for (i = i_line = line_len = 0; i < (int) sizeof(str) - 1; line_len++, i++) {
|
for (i = i_line = line_len = 0; i < (int) sizeof(str) - 1; line_len++, i++) {
|
||||||
str[i] = text[i];
|
str[i] = text[i];
|
||||||
if (line_break(text+i, encoding)) {
|
if (line_break(text + i, encoding)) {
|
||||||
i_line++;
|
i_line++;
|
||||||
line_len = 0;
|
line_len = 0;
|
||||||
} else
|
} else
|
||||||
@ -18665,7 +18662,7 @@ time_t convert_datetime(char *date_string)
|
|||||||
|
|
||||||
if (!strchr(p, ' '))
|
if (!strchr(p, ' '))
|
||||||
return 0;
|
return 0;
|
||||||
p = strchr(p, ' ')+1;
|
p = strchr(p, ' ') + 1;
|
||||||
|
|
||||||
strlcpy(str, p, sizeof(str));
|
strlcpy(str, p, sizeof(str));
|
||||||
p = strtok(str, ":");
|
p = strtok(str, ":");
|
||||||
@ -19296,9 +19293,9 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
|
|||||||
/*---- apply start/end date cut ----*/
|
/*---- apply start/end date cut ----*/
|
||||||
|
|
||||||
if (past_n > 0)
|
if (past_n > 0)
|
||||||
ltime_start = now - 3600 * 24 * past_n; // past n days
|
ltime_start = now - 3600 * 24 * past_n; // past n days
|
||||||
else if (past_n < 0)
|
else if (past_n < 0)
|
||||||
ltime_start = now + 3600 * past_n; // past n hours
|
ltime_start = now + 3600 * past_n; // past n hours
|
||||||
|
|
||||||
if (last_n && last_n < n_msg) {
|
if (last_n && last_n < n_msg) {
|
||||||
for (i = n_msg - last_n - 1; i >= 0; i--)
|
for (i = n_msg - last_n - 1; i >= 0; i--)
|
||||||
@ -19496,9 +19493,9 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
|
|||||||
searched = TRUE;
|
searched = TRUE;
|
||||||
|
|
||||||
strlcpy(str, getparam(attr_list[i]), sizeof(str));
|
strlcpy(str, getparam(attr_list[i]), sizeof(str));
|
||||||
if (str[0] == '^' && str[strlen(str)-1] == '$') {
|
if (str[0] == '^' && str[strlen(str) - 1] == '$') {
|
||||||
str[strlen(str)-1] = 0;
|
str[strlen(str) - 1] = 0;
|
||||||
strlcpy(comment, str+1, NAME_LENGTH);
|
strlcpy(comment, str + 1, NAME_LENGTH);
|
||||||
} else
|
} else
|
||||||
strlcpy(comment, str, NAME_LENGTH);
|
strlcpy(comment, str, NAME_LENGTH);
|
||||||
strlcpy(str, comment, sizeof(str));
|
strlcpy(str, comment, sizeof(str));
|
||||||
@ -20163,9 +20160,9 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
|
|||||||
|
|
||||||
if (comment[0] == 0) {
|
if (comment[0] == 0) {
|
||||||
strlcpy(str, getparam(iattr), sizeof(str));
|
strlcpy(str, getparam(iattr), sizeof(str));
|
||||||
if (str[0] == '^' && str[strlen(str)-1] == '$') {
|
if (str[0] == '^' && str[strlen(str) - 1] == '$') {
|
||||||
str[strlen(str)-1] = 0;
|
str[strlen(str) - 1] = 0;
|
||||||
strlcpy(comment, str+1, NAME_LENGTH);
|
strlcpy(comment, str + 1, NAME_LENGTH);
|
||||||
} else
|
} else
|
||||||
strlcpy(comment, str, NAME_LENGTH);
|
strlcpy(comment, str, NAME_LENGTH);
|
||||||
strlcpy(str, comment, sizeof(str));
|
strlcpy(str, comment, sizeof(str));
|
||||||
@ -20188,9 +20185,9 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
|
|||||||
|
|
||||||
if (comment[0] == 0) {
|
if (comment[0] == 0) {
|
||||||
strlcpy(str, getparam(attr_list[i]), sizeof(str));
|
strlcpy(str, getparam(attr_list[i]), sizeof(str));
|
||||||
if (str[0] == '^' && str[strlen(str)-1] == '$') {
|
if (str[0] == '^' && str[strlen(str) - 1] == '$') {
|
||||||
str[strlen(str)-1] = 0;
|
str[strlen(str) - 1] = 0;
|
||||||
strlcpy(comment, str+1, NAME_LENGTH);
|
strlcpy(comment, str + 1, NAME_LENGTH);
|
||||||
} else
|
} else
|
||||||
strlcpy(comment, str, NAME_LENGTH);
|
strlcpy(comment, str, NAME_LENGTH);
|
||||||
strlcpy(str, comment, sizeof(str));
|
strlcpy(str, comment, sizeof(str));
|
||||||
@ -22358,16 +22355,16 @@ void submit_elog(LOGBOOK * lbs)
|
|||||||
/* convert any '|' to ',', remove duplicate email to's */
|
/* convert any '|' to ',', remove duplicate email to's */
|
||||||
n = strbreak(rcpt_to, (void *) rcpt_list, MAX_N_EMAIL, ",|", TRUE);
|
n = strbreak(rcpt_to, (void *) rcpt_list, MAX_N_EMAIL, ",|", TRUE);
|
||||||
strbreak(mail_to, (void *) mail_list, MAX_N_EMAIL, ",|", TRUE);
|
strbreak(mail_to, (void *) mail_list, MAX_N_EMAIL, ",|", TRUE);
|
||||||
for (i = 0; i < n-1 ; i++) {
|
for (i = 0; i < n - 1; i++) {
|
||||||
for (j = i + 1; j < n ; j++) {
|
for (j = i + 1; j < n; j++) {
|
||||||
if (rcpt_list[i * NAME_LENGTH] && rcpt_list[j * NAME_LENGTH] &&
|
if (rcpt_list[i * NAME_LENGTH] && rcpt_list[j * NAME_LENGTH] &&
|
||||||
strstr(&rcpt_list[i * NAME_LENGTH], &rcpt_list[j * NAME_LENGTH])) {
|
strstr(&rcpt_list[i * NAME_LENGTH], &rcpt_list[j * NAME_LENGTH])) {
|
||||||
for (k = j; k < n-1 ; k++) {
|
for (k = j; k < n - 1; k++) {
|
||||||
memcpy(&rcpt_list[k * NAME_LENGTH], &rcpt_list[(k + 1) * NAME_LENGTH], NAME_LENGTH);
|
memcpy(&rcpt_list[k * NAME_LENGTH], &rcpt_list[(k + 1) * NAME_LENGTH], NAME_LENGTH);
|
||||||
memcpy(&mail_list[k * NAME_LENGTH], &mail_list[(k + 1) * NAME_LENGTH], NAME_LENGTH);
|
memcpy(&mail_list[k * NAME_LENGTH], &mail_list[(k + 1) * NAME_LENGTH], NAME_LENGTH);
|
||||||
}
|
}
|
||||||
memset(&rcpt_list[k*NAME_LENGTH], 0, NAME_LENGTH);
|
memset(&rcpt_list[k * NAME_LENGTH], 0, NAME_LENGTH);
|
||||||
memset(&mail_list[k*NAME_LENGTH], 0, NAME_LENGTH);
|
memset(&mail_list[k * NAME_LENGTH], 0, NAME_LENGTH);
|
||||||
j = j - 1;
|
j = j - 1;
|
||||||
n = n - 1;
|
n = n - 1;
|
||||||
break;
|
break;
|
||||||
@ -22376,7 +22373,7 @@ void submit_elog(LOGBOOK * lbs)
|
|||||||
}
|
}
|
||||||
rcpt_to[0] = 0;
|
rcpt_to[0] = 0;
|
||||||
mail_to[0] = 0;
|
mail_to[0] = 0;
|
||||||
for (i = 0; i < n ; i++) {
|
for (i = 0; i < n; i++) {
|
||||||
|
|
||||||
if ((int) strlen(rcpt_to) + (int) strlen(&rcpt_list[i * NAME_LENGTH]) + 5 >= rcpt_to_size) {
|
if ((int) strlen(rcpt_to) + (int) strlen(&rcpt_list[i * NAME_LENGTH]) + 5 >= rcpt_to_size) {
|
||||||
rcpt_to_size += 256;
|
rcpt_to_size += 256;
|
||||||
@ -22390,7 +22387,7 @@ void submit_elog(LOGBOOK * lbs)
|
|||||||
}
|
}
|
||||||
strcat(mail_to, &mail_list[i * NAME_LENGTH]);
|
strcat(mail_to, &mail_list[i * NAME_LENGTH]);
|
||||||
|
|
||||||
if (i < MAX_N_EMAIL-1 && rcpt_list[(i + 1) * NAME_LENGTH]) {
|
if (i < MAX_N_EMAIL - 1 && rcpt_list[(i + 1) * NAME_LENGTH]) {
|
||||||
strcat(rcpt_to, ",");
|
strcat(rcpt_to, ",");
|
||||||
strcat(mail_to, ",\r\n\t");
|
strcat(mail_to, ",\r\n\t");
|
||||||
}
|
}
|
||||||
@ -26692,8 +26689,7 @@ int process_http_request(const char *request, int i_conn)
|
|||||||
struct tm *ts;
|
struct tm *ts;
|
||||||
|
|
||||||
const char *cookie_list[] =
|
const char *cookie_list[] =
|
||||||
|
{ "upwd", "unm", "elmode", "urem", "wpwd", "apwd", "uname", "upassword", "elattach", "hsm", NULL };
|
||||||
{"upwd", "unm", "elmode", "urem", "wpwd", "apwd", "uname", "upassword", "elattach", "hsm", NULL};
|
|
||||||
|
|
||||||
if (!strchr(request, '\r'))
|
if (!strchr(request, '\r'))
|
||||||
return 0;
|
return 0;
|
||||||
@ -26730,8 +26726,8 @@ int process_http_request(const char *request, int i_conn)
|
|||||||
if (str[i] == '=') {
|
if (str[i] == '=') {
|
||||||
str[i] = 0;
|
str[i] = 0;
|
||||||
p += i + 1;
|
p += i + 1;
|
||||||
for (i = 0; *p && *p != ';' && *p != '\r' && *p != '\n' ; )
|
for (i = 0; *p && *p != ';' && *p != '\r' && *p != '\n';)
|
||||||
if (i < (int) sizeof(cookie)-1)
|
if (i < (int) sizeof(cookie) - 1)
|
||||||
cookie[i++] = *p++;
|
cookie[i++] = *p++;
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
@ -26744,8 +26740,8 @@ int process_http_request(const char *request, int i_conn)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* store cookie as parameter */
|
/* store cookie as parameter */
|
||||||
for(i=0; cookie_list[i]; i++) {
|
for (i = 0; cookie_list[i]; i++) {
|
||||||
if(strcmp(cookie_list[i], str) == 0) {
|
if (strcmp(cookie_list[i], str) == 0) {
|
||||||
setparam(str, cookie);
|
setparam(str, cookie);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -27272,7 +27268,7 @@ void send_return(int _sock, const char *net_buffer)
|
|||||||
|
|
||||||
if ((keep_alive && strstr(return_buffer, "Content-Length") == NULL) || strstr(return_buffer,
|
if ((keep_alive && strstr(return_buffer, "Content-Length") == NULL) || strstr(return_buffer,
|
||||||
"Content-Length") >
|
"Content-Length") >
|
||||||
strstr(return_buffer, "\r\n\r\n")) {
|
strstr(return_buffer, "\r\n\r\n")) {
|
||||||
|
|
||||||
/*---- add content-length ----*/
|
/*---- add content-length ----*/
|
||||||
|
|
||||||
@ -27329,7 +27325,6 @@ void send_return(int _sock, const char *net_buffer)
|
|||||||
memcpy(header_buffer, return_buffer, header_length);
|
memcpy(header_buffer, return_buffer, header_length);
|
||||||
sprintf(header_buffer + header_length, "\r\nConnection: Close\r\n\r\n");
|
sprintf(header_buffer + header_length, "\r\nConnection: Close\r\n\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_SSL
|
#ifdef HAVE_SSL
|
||||||
if (_ssl_flag) {
|
if (_ssl_flag) {
|
||||||
SSL_write(ssl_con, header_buffer, strlen(header_buffer));
|
SSL_write(ssl_con, header_buffer, strlen(header_buffer));
|
||||||
@ -28079,8 +28074,7 @@ void server_loop(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strncmp(net_buffer, "POST", 4) == 0 &&
|
if (strncmp(net_buffer, "POST", 4) == 0 && len < header_length + content_length) {
|
||||||
len < header_length + content_length) {
|
|
||||||
if (verbose)
|
if (verbose)
|
||||||
eprintf("Incomplete POST request\n");
|
eprintf("Incomplete POST request\n");
|
||||||
keep_alive = FALSE;
|
keep_alive = FALSE;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user