New strings for translation

SVN revision: 2378
This commit is contained in:
Stefan Ritt 2011-01-21 13:58:39 +00:00
parent 827de5f960
commit 043fe4d3c1
19 changed files with 500 additions and 350 deletions

View File

@ -1,3 +1,17 @@
Version 2.9.0, released Januar xxxx
==========================================
- Implemented Kerberos authentication
- Implemented "Propagate attributes = ..."
- fixed bug with importing CSV containing a text body
- fixed preview of import data
- added confirmation for "Back" button
- Added vcxproj files
- Fixed bug with "B" attribute and quick filter
- Made two logoobks with same subdir work (again)
- Implemented mirroring through SSL
- Fixed bug with moving attachments with thumbnails
Version 2.8.1, released December 23th 2010
==========================================

View File

@ -29,10 +29,7 @@ Wrong password = Senha incorreta
Please login = Por favor, identifique-se
Username = Usuário
Password = Senha
ELOG password = Senha do ELOG
ELOG change password = Mudar a senha do ELOG
Please enter password to obtain write access = Por favor, digite a senha para obter acesso para escrita
Please enter password to obtain administration access = Por favor, digite a senha para obter acesso administrativo
Several logbooks are defined on this host = Há diversos logbooks definidos neste servidor
Please select the one to connect to = Por favor, escolha a qual deles você deseja conectar-se
Change password for user = Mudar a senha do usuário
@ -112,8 +109,6 @@ exists already = j
Your ELOG account has been activated = Sua conta do ELOG foi ativada
Your ELOG account has been activated on host = Sua conta do ELOG foi ativada no host
You can access it at = Voce pode acessa-lo em
Registration request on logbook "%s" = Requisição de registro no logbook "%s"
Registration request on host "%s" = Requisição de registro no host "%s"
A new ELOG user wants to register on "%s" = Um novo usuário do ELOG deseja registrar-se em "%s"
User "%s" registered on logbook "%s" = Usuário "%s" registrado no logbook "%s"
User "%s" registered on host "%s" = Usuário "%s" registrado no host "%s"
@ -129,9 +124,7 @@ Remove user = Remover usu
New user = Novo usuário
No Email address registered with user name <i>"%s"</i> = Não há endereço de email registrado com esse nome de usuário <i>"%s"</i>
Password recovery for ELOG %s = Recuperação de senha para ELOG %s
A new password has been created for you on host %s = Uma nova senha foi criada para voce no host %s
ELOG password recovery = Recuperação de senha do ELOG
A new password for user <i>"%s"</i> has been sent to %s = Uma nova senha para o usuário <i>"%s"</i> foi enviada para %s
Error sending Email via <i>"%s"</i> = Erro no envio de email via <i>"%s"</i>
Email address <i>"%s"</i> not registered = Endereço de email <i>"%s"</i> não registrado
User name <i>"%s"</i> not registered = Nome de usuário <i>"5s"</i> não registrado
@ -176,8 +169,6 @@ Email = Email
Change password = Modificar a senha
No entry selected for deletion = Não há entrada selecionada para remover
Cannot read entry from local logbook = Não é possível ler a entrada do logbook local
Cannot create socket = Não é possível criar o socket
Cannot resolve host name "%s" = Não é possível resolver o nome do host "%s"
Cannot connect to host %s, port %d = Não é possível conectar no host %s, port %d
Cannot receive "%s" = Não é possível receber "%s"
Received wrong entry id "%d" = Recebido ID errado da entrada "%d"
@ -460,7 +451,6 @@ Rotate left =
Rotate right =
Delete attachment =
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) =
ELOG error =
@ -475,3 +465,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -157,8 +157,6 @@ No SMTP host defined in [global] section of configuration file =
Your ELOG account has been activated = Âàøèÿò ELOG àêàóíò å àêòèâèðàí
Your ELOG account has been activated on host = Âàøèÿò ELOG àêàóíò å àêòèâèðàí íà õîñò
You can access it at = Ìîæåòå äà âëåçåòå ïðåç
Registration request on logbook "%s" = Çàÿâêà çà ðåãèñòðàöèÿ â äíåâíèêà "%s"
Registration request on host "%s" = Çàÿâêà çà ðåãèñòðàöèÿ â õîñòà "%s"
A new ELOG user wants to register on "%s" = Íîâ ïîòðåáèòåë íà ELOG æåëàå äà ñå ðåãèñòðèðà â "%s"
User "%s" registered on logbook "%s" = Ïîòðåáèòåëÿò "%s" å ðåãèñòðèðàí â äíåâíèêà "%s"
User "%s" registered on host "%s" = Ïîòðåáèòåëÿò "%s" å ðåãèñòðèðàí â õîñòà "%s"
@ -171,9 +169,7 @@ Change password =
Change config file = Ïðîìÿíà íà ôàéë ñ íàñòðîéêè
No Email address registered with user name <i>"%s"</i> = Íå å ðåãèñòðèðàí åë.àäðåñ êúì ïîòðåáèòåëÿ <i>"%s"</i>
Password recovery for ELOG %s = Âúçñòàíîâÿâàíå íà ïàðîëà íà ELOG %s
A new password has been created for you on host %s = Ñúçäàäåíà å íîâà ïàðîëà çà âàñ íà õîñòà %s
Email notification = Óâåäîìÿâàíå ÷ðåç åë.ïîùà
A new password for user <i>"%s"</i> has been sent to %s = Ïðàòåíà å íîâà ïàðîëà çà ïîòðåáèòåëÿ <i>"%s"</i> äî %s
Error sending Email via <i>"%s"</i> = Ãðåøêà ïðè èçïðàùàíå íà åë.ïîùà ïðåç <i>"%s"</i>
Email address <i>"%s"</i> not registered = Åë.àäðåñ <i>"%s"</i> íå å ðåãèñòðèðàí
User name <i>"%s"</i> not registered = Ïîòðåáèòåëñêîòî èìå <i>"%s"</i> íå å ðåãèñòðèðàíî
@ -218,8 +214,6 @@ Invalid HTTP header =
No user name supplied to access remote logbook = Íå å ïðåäîñòàâåíî ïîòðåáèòåëñêî èìå çà äîñòúï äî îòäàëå÷åíèÿ äíåâíèê
Error accessing remote logbook = Ãðåøêà ïðè äîñòúï äî îòäàëå÷åí äíåâíèê
Cannot read entry from local logbook = Íåâúçìîæíîñò çà ïðî÷èòàíå íà çàïèñ îò ëîêàëåí äíåâíèê
Cannot create socket = Íåâúçìîæíîñò çà ñúçäàâàíå íà ñîêåò
Cannot resolve host name "%s" = Íåâúçìîæíîñò çà ðàçðåøàâàíå íà èìåòî íà õîñò "%s"
Cannot connect to host %s, port %d = Íåâúçìîæíîñò çà ñâúðçâàíå êúì õîñò %s, ïîðò %d
Cannot receive "%s" = Íåâúçìîæíîñò çà ïîëó÷àâàíå íà "%s"
Received wrong entry id "%d" = Ïîëó÷åí å ãðåøåí èäåíòèôèêàòîð íà çàïèñ "%d"
@ -300,9 +294,6 @@ Show =
Hide = Ñêðèâàíå
Hide all = Ñêðèâàíå íà âñè÷êî
Show all = Ïîêàçâàíå íà âñè÷êî
ELOG password = ELOG ïàðîëà
Please enter password to obtain write access = Ìîëÿ, âúâåäåòå ïàðîëà, çà äà ïîëó÷èòå äîñòúï çà çàïèñ
Please enter password to obtain administration access = Ìîëÿ, âúâåäåòå ïàðîëà, çà äà ïîëó÷èòå àäìèíèñòðàòèâåí äîñòúï
Several logbooks groups are defined on this host = Íÿêîëêî ãðóïè îò äíåâíèöè ñà îïðåäåëåíè â òîçè õîñò
Please select one to list the logbooks in that group = Ìîëÿ, èçáåðåòå åäíà, çà äà âèäèòå äíåâíèöèòå â íåÿ
No logbook defined on this server = Íå ñà îïðåäåëåíè äíåâíèöè â òîçè ñúðâúð
@ -460,7 +451,6 @@ Rotate left =
Rotate right =
Delete attachment =
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) =
ELOG error =
@ -475,3 +465,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -31,10 +31,7 @@ Username = Přihlašovací jméno
Password = Heslo
Old password = Staré heslo
New password = Nové heslo
ELOG password = ELOG heslo
ELOG change password = ELOG změna hesla
Please enter password to obtain write access = Zadejte heslo k právu zápisu
Please enter password to obtain administration access = Zadejte heslo pro administrátorský přístup
Several logbooks are defined on this host = Na tomto serveru je definováno několik logbooků
Please select the one to connect to = Zvolte jeden k připojení
Change password for user = Změna hesla uživatele
@ -137,7 +134,6 @@ Error: start date after end date = Chyba: počáteční datum a konečné datum
and all their replies = a všechny jejich odpovědi
Upload = Odeslat
Requested = Požadovaný
Registration request on logbook "%s" = Požadavek registrace na logbook "%s"
A new ELOG user wants to register on "%s" = Nový uživatel se chce registrovat na "%s"
Search text also in attributes = Hledej text také v atributech
Date = Date
@ -147,11 +143,8 @@ Email address <i>"%s"</i> not registered = Adresa Emailu <i>"%s"</i> není regis
ELOG password recovery = ELOG obnova hesla
No Email address registered with user name <i>"%s"</i> = Žádná Emailová adresa není registrována s uživatelským jménem <i>"%s"</i>
Error sending Email via <i>"%s"</i> = Chybné zasílání Emailu přes <i>"%s"</i>
A new password for user <i>"%s"</i> has been sent to %s = Nové heslo pro uživatele <i>"%s"</i> bylo zasláno na %s
Forgot = Zapomeň
User "%s" registered on host "%s" = Uživatel "%s" registrován na počítači "%s"
Registration request on host "%s" = Požadavek registrace na počítači "%s"
A new password has been created for you on host %s = Nové heslo bylo vytvořeno na počítači %s
Enter your user name or email address = Zadejte vaše uživatelské jméno nebo Emailovou adresu
Password recovery for ELOG %s = Obnova hesla pro ELOG %s
Host = Počítač
@ -180,8 +173,6 @@ Entry can only be edited %1.2lg hours after creation = Položky mohou být měn
Display full entries = Položky zobraz plně
No entry selected for deletion = Pro mazání nejsou vybrány žádné položky
Cannot read entry from local logbook = Nelze číst žádné položky z lokálního logbooku
Cannot create socket = Nelze vytvořit zásuvku
Cannot resolve host name "%s" = Nelze najít jméno počítače "%s"
Cannot connect to host %s, port %d = Nelze se připojit k uzlu %s, port %d
Cannot receive "%s" = Nelze přijmout "%s"
Received wrong entry id "%d" = Přijata chybná položka ID "%d"
@ -457,7 +448,6 @@ Rotate left =
Rotate right =
Delete attachment =
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) =
ELOG error =
@ -472,3 +462,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -33,10 +33,7 @@ Username = Bruger Navn
Password = Kendeord
Old password = Gamle kendeord
New password = Nyt kendeord
ELOG password = ELOG kendeord
ELOG change password = Ændre ELOG kendeord
Please enter password to obtain write access = Skriv kendeord for at opnå skriveadgang
Please enter password to obtain administration access = Skriv kendeord for at opnå admin adgang
Several logbooks are defined on this host = Flere logbøger er defineret på denne host
Please select the one to connect to = Vælg hvilken du vil have adgang til
Change password for user = Ændr kendeord til bruger
@ -138,7 +135,6 @@ Error: start date after end date = Fejl: Start Dato efter Slut Dato
and all their replies = Og alle deres svar
Upload = Overfør til server
Requested = Rekvirer
Registration request on logbook "%s" = Anmodning om registrering på logbog "%s"
A new ELOG user wants to register on "%s" = Ny Bruger Ønsker At Registrere på "%s" logbogen
Search text also in attributes = Søg også text i attributerne
Date = Dato
@ -148,11 +144,8 @@ Email address <i>"%s"</i> not registered = Email Adresse <i>"%s"</i> ikke regist
ELOG password recovery = Gendan ELOG kendeord
No Email address registered with user name <i>"%s"</i> = Bruger "</i> har ikke registreret mail adresse
Error sending Email via <i>"%s"</i> = Fejl ved afsendelse af e mail via <i>"%s"</i>
A new password for user <i>"%s"</i> has been sent to %s = Et nyt kendeord til Bruger <i>"%s"</i> er sendt til %s
Forgot = Glemt
User "%s" registered on host "%s" = Bruger "%s" på host "%s" registreret
Registration request on host "%s" = Andmodning om registrering på host "%s"
A new password has been created for you on host %s = Et nyt kendeord er genereret på %s
Enter your user name or email address = Skriv venligst Bruger navn eller e mail adresse
Password recovery for ELOG %s = Genskab kendeord for ELOG %s
Host = Host
@ -181,8 +174,6 @@ Entry can only be edited %1.2lg hours after creation = Indl
Display full entries = Vis alt
No entry selected for deletion = Intet indlæg markeret til sletning
Cannot read entry from local logbook = Kan ikke læse fra lokal logbog
Cannot create socket = Kan ikke oprette socket
Cannot resolve host name "%s" = Host "%s" kan ikke opløses
Cannot connect to host %s, port %d = Kan ikke forbinde til %s, Port %d
Cannot receive "%s" = Kan ikke modtage "%s"
Received wrong entry id "%d" = Modtog forkert ID "%d"
@ -455,7 +446,6 @@ Rotate left = Rot
Rotate right = Rotér til højre
Delete attachment = Slet vedhæftning
Cannot create thumbnail, please check ImageMagick installation = Kan ikke danne oversigtsbilleder, kontroller at ImageMagick er korrekt installeret
Please log on by clicking on following link and change your password = Log venligst på ved at trykke på følgende link og ændr dit kodeord
Attachments = Vedhæftninger
Error: Content length (%d) larger than maximum content length (%d) = Fejl: Længde af indhold (%d) er større end maksimalt tilladt (%d)
ELOG error = ELOG fejl
@ -475,3 +465,22 @@ File system full, ELOG cannot continue to work = Filsystemet er l
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -32,10 +32,7 @@ Username = Gebruikersnaam
Password = &nbsp;&nbsp;&nbsp;&nbsp;Wachtwoord
Old password = &nbsp;Oude wachtwoord
New password = Nieuw wachtwoord
ELOG password = ELOG wachtwoord
ELOG change password = ELOG wachtwoord wijzigen
Please enter password to obtain write access = Geef wachtwoord om schrijfrechten te verkrijgen
Please enter password to obtain administration access = Geef wachtwoord voor administratie rechten
Several logbooks are defined on this host = Meerdere logboeken aanwezig op deze machine
Please select the one to connect to = Selecteer er een om aan te melden
Change password for user = Wachtwoord wijzigen voor gebruiker
@ -138,7 +135,6 @@ Error: start date after end date = Fout: Begindatum begint na de einddatum
and all their replies = en alle antwoorden
Upload = Upload
Requested = Verzocht
Registration request on logbook "%s" = Registratie verzoek voor Logboek "%s"
A new ELOG user wants to register on "%s" = Een nieuwe Elog gebruiker wil zich registreren voor "%s"
Search text also in attributes = Zoek ook in attributen
Date = Datum
@ -148,11 +144,8 @@ Email address <i>"%s"</i> not registered = E-mailadres <i>"%s"</i> is niet gereg
ELOG password recovery = ELOG Wachtwoord Herstel
No Email address registered with user name <i>"%s"</i> = Voor gebruiker <i>"%s"</i> is geen e-mail adres geregistreerd
Error sending Email via <i>"%s"</i> = Fout bij het versturen van e-mail via <i>"%s"</i>
A new password for user <i>"%s"</i> has been sent to %s = Een nieuw wachtwoord voor gebruiker <i>"%s"</i> is verstuurd naar %s
Forgot = vergeten
User "%s" registered on host "%s" = Gebruiker "%s" is op computer "%s" geregistreerd
Registration request on host "%s" = Registratieverzoek op computer "%s"
A new password has been created for you on host %s = Een nieuw wachtwoord is aangemaakt op %s
Enter your user name or email address = Geef je gebruikersnaam of je email adres op
Password recovery for ELOG %s = Wachtwoord Herstel voor ELOG %s
Host = Computer
@ -181,8 +174,6 @@ Entry can only be edited %1.2lg hours after creation = Bericht kan alleen binnen
Display full entries = Toon volledige berichten
No entry selected for deletion = Geen bericht geselecteerd om te wissen
Cannot read entry from local logbook = Kan niet van het lokale logboek lezen
Cannot create socket = Kan geen socket maken
Cannot resolve host name "%s" = Kan hostnaam "%s" niet opzoeken
Cannot connect to host %s, port %d = Kan geen verbinding maken met %s, poort %d
Cannot receive "%s" = Kan "%s" niet ontvangen
Received wrong entry id "%d" = Verkeerd bericht met id "%d" ontvangen
@ -455,7 +446,6 @@ Rotate left = Links draaien
Rotate right = Rechts draaien
Delete attachment = Verwijder bijlage
Cannot create thumbnail, please check ImageMagick installation = Kan geen voorbeeld maken, controleer de ImageMagick installatie
Please log on by clicking on following link and change your password = Klik op de link om je aan te melden en je wachtwoord te wijzigen
Attachments = Bijlagen
Error: Content length (%d) larger than maximum content length (%d) = Fout: Berichtgrootte (%d) is groter dan de maximum grootte (%d)
ELOG error = ELOG fout
@ -474,3 +464,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -30,10 +30,7 @@ Wrong password = Mot de passe incorrect
Please login = Connexion
Username = Utilisateur
Password = Mot de passe
ELOG password = mot de passe ELOG
ELOG change password = Changer le mot de passe ELOG
Please enter password to obtain write access = Entrez le mot de passe pour l'accès en écriture
Please enter password to obtain administration access = Entrez le mot de passe pour l'accès administrateur
Several logbooks are defined on this host = Il y a plusieurs registres sur ce serveur
Please select the one to connect to = Choisissez celui auquel vous souhaitez vous connecter
Change password for user = Changer le mot de passe de l'utilisateur
@ -136,7 +133,6 @@ Error: start date after end date = Erreur : la date de d
and all their replies = et toutes leurs réponses
Upload = Envoyer
Requested = Demandé
Registration request on logbook "%s" = Demande d'inscription pour le registre "%s"
A new ELOG user wants to register on "%s" = Un nouvel utilisateur ELOG souhaite s'inscrire à "%s"
Search text also in attributes = Rechercher également le texte dans les attributs
Date = Date
@ -145,11 +141,8 @@ Forgot password? = Mot de passe oubli
Email address <i>"%s"</i> not registered = L'adresse mél. <i>"%s"</i> n'est pas enregistrée sur ce serveur
ELOG password recovery = Récupération de mot de passe ELOG
No Email address registered with user name <i>"%s"</i> = Il n'y a pas d'adresse mél. enregistrée pour le nom d'utilisateur <i>"%s"</i>
A new password for user <i>"%s"</i> has been sent to %s = Un nouveau mot de passe pour le nom d'utilisateur <i>"%s"</i> a été envoyé à l'adresse %s
Forgot = Oublié
User "%s" registered on host "%s" = Utilisateur "%s" enregistré sur l'ordinateur "%s"
Registration request on host "%s" = Demande d'enregistrement sur l'ordinateur "%s"
A new password has been created for you on host %s = Un nouveau mot de passe a été créé pour vous sur l'ordinateur %s
Enter your user name or email address = Indiquez votre nom d'utilisateur ou votre adresse mél.
Password recovery for ELOG %s = Récupération de mot de passe sur ELOG %s
Host = Ordinateur
@ -180,8 +173,6 @@ Entry can only be edited %1.2lg hours after creation = Cette entr
Display full entries = Afficher les entrées complètes
No entry selected for deletion = Aucune entrée n'est sélectionnée pour supprssion
Cannot read entry from local logbook = Impossible de lire l'entrée depuis le registre local
Cannot create socket = Impossible de créer un "socket"
Cannot resolve host name "%s" = Impossible de résoudre le nom de l'hôte "%s"
Cannot connect to host %s, port %d = Impossible de se connecter à l'hôte %s sur le port %d
Cannot receive "%s" = Impossible de recevoir "%s"
Received wrong entry id "%d" = L'identifiant de l'entrée reçue est erronné (%d)
@ -453,7 +444,6 @@ Rotate left = Rotation
Rotate right = Rotation à droite
Delete attachment = Supprimer la pièce jointe
Cannot create thumbnail, please check ImageMagick installation = Impossible de créer l'aperçu, merci de vérifier l'installation de ImageMagick
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
Error: Content length (%d) larger than maximum content length (%d) = Erreur : la taille du contenu (%d) est supérieure au maximum autorisé (%d)
ELOG error = erreur ELOG
@ -468,3 +458,26 @@ File system full, ELOG cannot continue to work = Le syst
3 Days = 3 jours
Last 3 Days = Les 3 derniers jours
Really submit this entry? = Voulez-vous vraiment soumettre cette entrée ?
#
#---- please translate following items and then remove this comment ----#
#
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -31,10 +31,7 @@ Username = Benutzername
Password = Kennwort
Old password = Altes Kennwort
New password = Neues Kennwort
ELOG password = ELOG Kennwort
ELOG change password = ELOG Kennwort ändern
Please enter password to obtain write access = Bitte Kennwort eingeben für Schreibzugriff
Please enter password to obtain administration access = Bitte Kennwort eingeben für Administrationszugriff
Several logbooks are defined on this host = Mehrere Logbücher sind auf diesem Computer eingerichtet
Please select the one to connect to = Bitte wählen Sie eines aus
Change password for user = Kennwort ändern für Benutzer
@ -137,7 +134,6 @@ Error: start date after end date = Fehler: Anfangsdatum nach Enddatum
and all their replies = und alle Antworten
Upload = Hochladen
Requested = Erfordert
Registration request on logbook "%s" = Registrierungsanforderung für Logbuch "%s"
A new ELOG user wants to register on "%s" = Ein neuer Benutzer möchte sich auf "%s" registrieren
Search text also in attributes = Text auch in Attributen suchen
Date = Datum
@ -147,11 +143,8 @@ Email address <i>"%s"</i> not registered = Email-Adresse <i>"%s"</i> nicht regis
ELOG password recovery = ELOG Kennwort-Wiederherstellung
No Email address registered with user name <i>"%s"</i> = Für Benutzername <i>"%s"</i> wurde keine Email-Adresse registriert
Error sending Email via <i>"%s"</i> = Fehler beim Versenden der Email über <i>"%s"</i>
A new password for user <i>"%s"</i> has been sent to %s = Ein neues Kennwort für Benutzer <i>"%s"</i> wurde an %s gesendet
Forgot = vergessen
User "%s" registered on host "%s" = Benutzer "%s" auf Computer "%s" registriert
Registration request on host "%s" = Registrierungsanforderung auf Computer "%s"
A new password has been created for you on host %s = Ein neues Kennwort wurde auf dem Computer %s registriert
Enter your user name or email address = Bitte Benutzernamen oder Email-Adresse eingeben
Password recovery for ELOG %s = Kennwort-Wiederherstellung für ELOG %s
Host = Computer
@ -180,8 +173,6 @@ Entry can only be edited %1.2lg hours after creation = Eintrag kann nur %1.2lg S
Display full entries = Gesamte Einträge darstellen
No entry selected for deletion = Kein Eintrag zum Löschen ausgewählt
Cannot read entry from local logbook = Kann Eintrag nicht aus lokalem Logbuch lesen
Cannot create socket = Socket kann nicht erzeugt werden
Cannot resolve host name "%s" = Computer Name "%s" kann nicht gefunden werden
Cannot connect to host %s, port %d = Kann zum Computer %s, Port %d nicht verbinden
Cannot receive "%s" = Kann "%s" nicht empfangen
Received wrong entry id "%d" = Falscher Eintrag mit ID "%d" empfangen
@ -452,7 +443,6 @@ Rotate left = Links rotieren
Rotate right = Rechts rotieren
Delete attachment = Anhang löschen
Cannot create thumbnail, please check ImageMagick installation = Kann Vorschau nicht erstellen, bitte ImageMagick Installation überprüfen
Please log on by clicking on following link and change your password = Bitte durch Klicken auf den folgenden Link anmelden und Kennwort ändern
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)
ELOG error = ELOG Fehler
@ -467,3 +457,22 @@ File system full, ELOG cannot continue to work = Dateisystem voll, ELOG kann nic
3 Days = 3 Tage
Last 3 Days = Letzte 3 Tage
Really submit this entry? = Diesen Entrag wirklich abschicken?
Are you sure to abandon any entered text? = Den veränderten Text wirklich aufgeben?
Account activation for ELOG logbook "%s" = Zugangsaktivierung für das ELOG Logbuch "%s"
Account activation for ELOG on host "%s" = Zugangsaktivierung für ELOG auf dem Computer "%s"
Please click the URL below to activate following ELOG account = Bitte auf den Link klicken, um folgenden ELOG Zugang zu aktivieren
Activation URL = Aktivierungs-URL
An email has been sent to &lt;%s&gt; = Eine Email wurde an &lt;%s&gt; gesendet
Use that email to activate your account = Bitte diese Email benutzen, um den Zugang zu aktivieren
Registration request for ELOG logbook "%s" = Registrierungsanfrage für das ELOG Logbuch "%s"
Registration request for ELOG on host "%s" = Registrierungsanfrage für ELOG auf dem Computer "%s"
Are you sure you want to deactivate your own account? = Sind sie sicher, dass sie ihren Zugang stillegen möchten?
Active = Aktiv
Invalid activation code = Ungültiger Aktivierungscode
Error activating user = Fehle bei der Aktivierung des Benutzers
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook = Benutzer "%s" hat keinen Zugang zu diesem Logbuch
Your account has been activated = Ihr Zugang wurde aktiviert
Please subscribe to logbooks if you want to receive automatic email notifications = Bitte abbonieren Sie Logbüher, um automatisch Email-Benachrichtigungen zu bekommen
This is an automatically generated account recovery email for host %s = Dies ist eine automatisch generierte Email für die Rücksetzung des Zugangs auf dem Computer %s
Please click on following link to recover your account = Bitte klicken Sie auf folgenden Link, um Ihren Zugang zurückzusetzen

View File

@ -31,10 +31,7 @@ Username = Nome utente
Password = Password
Old password = Vecchia password
New password = Nuova password
ELOG password = ELOG password
ELOG change password = ELOG cambia password
Please enter password to obtain write access = Per favore inserisci la password per ottenere l'accesso in scrittura
Please enter password to obtain administration access = Per favore inserisci la password per ottenere l'accesso in amministrazione
Several logbooks are defined on this host = Su questo server sono presenti diversi registri
Please select the one to connect to = Per favore seleziona quello a cui connetterti
Change password for user = Cambia la password dell'utente
@ -137,7 +134,6 @@ Error: start date after end date = Errore: la data iniziale
and all their replies = e tutte le loro risposte
Upload = Carica
Requested = Richiesto
Registration request on logbook "%s" = Richiesta di registrazione nel registro "%s"
A new ELOG user wants to register on "%s" = Un nuovo utente ELOG vuole registrarsi su "%s"
Search text also in attributes = Ricerca il testo anche negli attributi
Date = Data
@ -147,11 +143,8 @@ Email address <i>"%s"</i> not registered = Indirizzo e-mail <i>"%s"</i> non regi
ELOG password recovery = ELOG ripristino password
No Email address registered with user name <i>"%s"</i> = Nessun indirizzo e-mail registrato con il nome utente <i>"%s"</i>
Error sending Email via <i>"%s"</i> = Errore nell'nvio della e-mail con <i>"%s"</i>
A new password for user <i>"%s"</i> has been sent to %s = Una nuova password per l'utente <i>"%s"</i> è stata inviata a %s
Forgot = Dimenticata
User "%s" registered on host "%s" = Utente "%s" registrato sul server "%s"
Registration request on host "%s" = Richiesta di registrazione sul server "%s"
A new password has been created for you on host %s = Ti è stata creata una nuova password sul server %s
Enter your user name or email address = Inserisci il tuo nome utente o l'indirizzo e-mail
Password recovery for ELOG %s = Ripristino password per ELOG %s
Host = Server
@ -179,8 +172,6 @@ Entry can only be edited %1.2lg hours after creation = L'elemento pu
Display full entries = Mostra gli elementi completi
No entry selected for deletion = Nessun elemento selezionato per la cancellazione
Cannot read entry from local logbook = Non posso leggere l'elemento dal registro
Cannot create socket = Non posso creare un socket
Cannot resolve host name "%s" = Non riesco a trovare l'indirizzo del computer "%s"
Cannot connect to host %s, port %d = Non posso connettermi al computer %s, porta %d
Cannot receive "%s" = Non posso ricevere "%s"
Received wrong entry id "%d" = Ho ricevuto l'id "%d" dell'elemento errato
@ -455,7 +446,6 @@ Rotate left =
Rotate right =
Delete attachment =
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) =
ELOG error =
@ -470,3 +460,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -76,8 +76,6 @@ exists already =
Your ELOG account has been activated = ELOGアカウントが有効になりました
Your ELOG account has been activated on host = ELOGアカウントが有効になりました.ホスト名
You can access it at = 次の場所でアクセスできます
Registration request on logbook "%s" = ログブック"%s"への登録要求
Registration request on host "%s" = ホスト"%s"への登録要求
A new ELOG user wants to register on "%s" = 新規ELOGユーザーからの"%s"への登録要求があります
User "%s" registered on logbook "%s" = ユーザー"%s"がログブック"%s"に登録されました
User "%s" registered on host "%s" = ユーザー"%s"がホスト"%s"に登録されました
@ -96,9 +94,7 @@ Remove user =
New user = 新規ユーザー
No Email address registered with user name <i>"%s"</i> = ユーザー<i>"%s"</i>には電子メールが登録されていません
Password recovery for ELOG %s = ELOG %s に対するパスワードを復旧
A new password has been created for you on host %s = ホスト %s 上に新しいパスワードが発行されました
ELOG password recovery = ELOGパスワードの復旧
A new password for user <i>"%s"</i> has been sent to %s = ユーザー <i>"%s"</i> に対するパスワードが %s に送付されました
Error sending Email via <i>"%s"</i> = <i>"%s"</i> から電子メールを送る際にエラーが発生しました
Email address <i>"%s"</i> not registered = 電子メールアドレス <i>"%s"</i>は登録されていません
User name <i>"%s"</i> not registered = ユーザー名 <i>"%s"</i>は登録されていません
@ -121,8 +117,6 @@ Error accessing remote logbook =
Invalid HTTP header = HTTPヘッダーが正しくありません
No user name supplied to access remote logbook = リモートログブックにアクセスするためのユーザー名が必要です
Cannot read entry from local logbook = ローカルログブックの記事を読めません
Cannot create socket = ソケットを生成できません
Cannot resolve host name "%s" = ホスト名 "%s"が見つかりません
Cannot connect to host %s, port %d = ホスト %s のポート %d に接続できません
Cannot receive "%s" = "%s"を受け取ることができません
Received wrong entry id "%d" = 不正なエントリ番号 "%d"です
@ -193,9 +187,6 @@ Email sent to =
Message ID = 記事ID
In reply to = 返信記事中で
Reply to this = この記事に返信する
ELOG password = ELOGパスワード
Please enter password to obtain write access = 書き込み権限を取得するためにパスワードを入力してください
Please enter password to obtain administration access = 管理者権限を取得するためにパスワードを入力してください
Login = ログイン
Please login = ログインしてください
Username = ユーザー名
@ -456,7 +447,6 @@ Rotate left =
Rotate right =
Delete attachment =
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) =
ELOG error =
@ -471,3 +461,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -156,8 +156,6 @@ No SMTP host defined in [global] section of configuration file =
Your ELOG account has been activated = Ваш аккаунт был активирован
Your ELOG account has been activated on host = Ваш аккаунт был активирован на хосте
You can access it at = Вы можете получить к нему доступ по
Registration request on logbook "%s" = Çàïðîñ ðåãèñòðàöèè â æóðíàëå "%s"
Registration request on host "%s" = Çàïðîñ ðåãèñòðàöèè íà õîñòå "%s"
A new ELOG user wants to register on "%s" = Новый пользователь желает зарегистрироваться в "%s"
User "%s" registered on logbook "%s" = Пользователь "%s" зарегистрирован в журнале "%s"
User "%s" registered on host "%s" = Пользователь "%s" зарегистрирован на хосте "%s"
@ -170,9 +168,7 @@ Change password =
Change config file = Изменить файл настроек
No Email address registered with user name <i>"%s"</i> = Отсутствует запись адреса электронной почты для пользователя <i>"%s"</i>
Password recovery for ELOG %s = Восстановление пароля для %s
A new password has been created for you on host %s = Íîâûé ïàðîëü áûë ñîçäàí äëÿ Âàñ íà õîñòå %s
Email notification = Уведомление почтой
A new password for user <i>"%s"</i> has been sent to %s = Íîâûé ïàðîëü ïîëüçîâàòåëÿ <i>"%s"</i> îòïðàâëåí íà %s
Error sending Email via <i>"%s"</i> = Ошибка отправки письма через <i>"%s"</i>
Email address <i>"%s"</i> not registered = Адрес Е-Почты <i>"%s"</i> не зарегистрирован
User name <i>"%s"</i> not registered = Пользователь <i>"%s"</i> не зарегистрирован
@ -217,8 +213,6 @@ Invalid HTTP header =
No user name supplied to access remote logbook = Не указано имя пользователя для доступа к удаленному журналу
Error accessing remote logbook = Ошибка доступа к удаленному журналу
Cannot read entry from local logbook = Невозможно прочитать запись из удаленного журнала
Cannot create socket = Íåâîçìîæíî ñîçäàòü ñîêåò
Cannot resolve host name "%s" = Íå óäàåòñÿ ðàçðåøèòü èìÿ óçëà "%s"
Cannot connect to host %s, port %d = Невозможно соединиться с хостом %s, порт %d
Cannot receive "%s" = Невозможно принять "%s"
Received wrong entry id "%d" = Получен некорретный идентификатор записи "%d"
@ -299,9 +293,6 @@ Show =
Hide = Скрыть
Hide all = Скрыть все
Show all = Показать все
ELOG password = Ïàðîëü
Please enter password to obtain write access = Ââåäèòå ïàðîëü äëÿ äîñòóïà íà çàïèñü
Please enter password to obtain administration access = Ââåäèòå ïàðîëü äëÿ àäìèíèñòðàòèâíîãî äîñòóïà
Several logbooks groups are defined on this host = Несколько групп журналов активированы на этом хосте
Please select one to list the logbooks in that group = Выберите одну чтобы иметь доступ к журналам в этой группе
No logbook defined on this server = На этом сервере не существует журналов
@ -461,7 +452,6 @@ Rotate left =
Rotate right =
Delete attachment =
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) =
ELOG error =
@ -476,3 +466,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -29,10 +29,7 @@ Wrong password = Clave incorrecta
Please login = Por favor ingrese
Username = Usuario
Password = Clave
ELOG password = Clave de ELOG
ELOG change password = Cambio de clave de ELOG
Please enter password to obtain write access = Por favor ingrese la clave para tener permiso de escritura
Please enter password to obtain administration access = Por favor ingrese la clave para tener acceso de administracion
Several logbooks are defined on this host = Hay varios logbooks definidos en este servidor
Please select the one to connect to = Por favor elija uno para conectarse
Change password for user = Cambiar clave para el usuario
@ -112,8 +109,6 @@ exists already = ya existe
Your ELOG account has been activated = Su cuenta de ELOG ha sido activada
Your ELOG account has been activated on host = Su cuenta de ELOG ha sido activada en el host
You can access it at = Puede accederla en
Registration request on logbook "%s" = Pedido de registracion en el logbook "%s"
Registration request on host "%s" = Pedido de registracion en el host "%s"
A new ELOG user wants to register on "%s" = Un nuevo usuario de ELOG quiere registrarse en "%s"
User "%s" registered on logbook "%s" = Usuario "%s" registrado en el logbook "%s"
User "%s" registered on host "%s" = Usuario "%s" registrado en el host "%s"
@ -129,9 +124,7 @@ Remove user = Eliminar usuario
New user = Nuevo usuario
No Email address registered with user name <i>"%s"</i> = No se encuentra registrado un usuario con direccion de email <i>"%s"</i>
Password recovery for ELOG %s = Recuperacion de clave para ELOG %s
A new password has been created for you on host %s = Una nueva clave ha sido generada para usted en el host %s
ELOG password recovery = Recuperacion de clave ELOG
A new password for user <i>"%s"</i> has been sent to %s = Una nueva clave para el usuario <i>"%s"</i> ha sido enviada a %s
Error sending Email via <i>"%s"</i> = Error al enviar email via <i>"%s"</i>
Email address <i>"%s"</i> not registered = La direccion de email <i>"%s"</i> no esta registrada
User name <i>"%s"</i> not registered = El usuario <i>"%s"</i> no esta registrado
@ -176,8 +169,6 @@ Email = Email
Change password = Cambiar clave
No entry selected for deletion = No se eligio entrada para borrar
Cannot read entry from local logbook = No se puede leer la entrada del logbook local
Cannot create socket = No se puede crear socket
Cannot resolve host name "%s" = No se puede resolver el host "%s"
Cannot connect to host %s, port %d = No se puede conectar al host %s, puerto %d
Cannot receive "%s" = No se puede recibir "%s"
Received wrong entry id "%d" = Se recibio un id de entrada erroneo "%d"
@ -454,7 +445,6 @@ Rotate left = Girar a la izquierda
Rotate right = Girar a la derecha
Delete attachment = Borrar adjunto
Cannot create thumbnail, please check ImageMagick installation = No se puede crear thumbnail, por favor verifique la instalacion de ImageMagick
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)
ELOG error = error de ELOG
@ -477,3 +467,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -33,10 +33,7 @@ Username = Anv
Password = Lösenord
Old password = Nuvarande lösenord
New password = Nytt lösenord
ELOG password = ELOG lösenord
ELOG change password = Ändra ELOG lösenord
Please enter password to obtain write access = Ange lösenord för att erhålla skrivrättighet
Please enter password to obtain administration access = Ange lösenord för att erhålla administratörsrättighet
Several logbooks are defined on this host = Flera loggböcker är definerade på denna server
Please select the one to connect to = Välj vilken du vill öppna
Change password for user = Ändra lösenord för användare
@ -130,7 +127,6 @@ Error: start date after end date = Fel: Begynnelsedatum senare
and all their replies = och alla deras svar
Upload = Skicka till server
Requested = Begärd
Registration request on logbook "%s" = Anmodan om registrering i loggbok "%s"
A new ELOG user wants to register on "%s" = En ny användare vill bli registrerad i loggboken "%s"
Search text also in attributes = Sök text också i attributen
Date = Datum
@ -140,10 +136,8 @@ Email address <i>"%s"</i> not registered = E-post adress <i>"%s"</i>
ELOG password recovery = Återskapande av ELOG lösenord
No Email address registered with user name <i>"%s"</i> = Ingen e-post adress registrerad för användare <i>"%s"</i>
Error sending Email via <i>"%s"</i> = Fel vid sändingen av e-post via <i>"%s"</i>
A new password for user <i>"%s"</i> has been sent to %s = Ett nytt lösenord har sänts till användare <i>"%s"</i>
Forgot = Glömt
User "%s" registered on host "%s" = Användare "%s" på server "%s" registrerad
Registration request on host "%s" = Andmodan om registrering på server "%s"
Enter your user name or email address = Ange användarnamn eller e-post adress
Host = Host
Your ELOG account has been activated = Ditt ELOG konto är aktiverat
@ -166,8 +160,6 @@ Entry can only be edited %1.2lg hours after creation = Poster kan
Display full entries = Visa all information
No entry selected for deletion = Ingen post har markerets för borttagning
Cannot read entry from local logbook = Kan inte läsa från den lokala loggboken
Cannot create socket = Kan inte skapa socket
Cannot resolve host name "%s" = Host "%s" kan inte namnupplösas
Cannot receive "%s" = Kan inte ta emot "%s"
Received wrong entry id "%d" = Mottog fel ID "%d"
Entry #%d is locked on remote server = Post #%d är låst vid den fjärranslutna servern
@ -369,7 +361,6 @@ Really remove user %s? = Vill du verkligen ta bort anv
Activation notice has been sent to %s = Aktiveringsmeddelande har skickats till %s
User [%s] has been deleted = Användare [%s] har tagits bort
Password recovery for ELOG %s = Återskapande av lösenord för ELOG %s
A new password has been created for you on host %s = Ett nytt lösenord har skapats till dig på server %s
Column header '%s' must be present in CSV file = Kolumnhuvud '%s' måste finnas i CSV filen
CSV import preview of %s = Förhandsgranskning av CSV import gällande %s
Incorrect remote ELOG server version %s = Fel fjärransluten ELOG server version %s
@ -455,7 +446,6 @@ Rotate left = Rotera v
Rotate right = Rotera höger
Delete attachment = Radera bilaga
Cannot create thumbnail, please check ImageMagick installation = Kan inte skapa thumbnail, kontrollera installationen av ImageMagick
Please log on by clicking on following link and change your password = Logga in genom att klicka på följande länk och byt ditt lösenord
Attachments = Bilagor
Error: Content length (%d) larger than maximum content length (%d) = Fel: Innehållet (%d) är större än max tillåtet (%d)
ELOG error = ELOG fel
@ -474,3 +464,22 @@ File system full, ELOG cannot continue to work = Filsystemet fullt, ELOG kan int
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -34,10 +34,7 @@ Username = Kullan
Password = Parola
Old password = Eski parola
New password = Yeni parola
ELOG password = ELOG parola
ELOG change password = ELOG parolasýný deðiþtir
Please enter password to obtain write access = Lütfen yazma eriþimi için parola girin
Please enter password to obtain administration access = Lütfen yönetici eriþimi için parola girin
Several logbooks are defined on this host = Bu makinede bir çok kayýt defteri tanýmlanmýþ
Please select the one to connect to = Lütfen baðlanmak için bunlardan birisini seçin
Change password for user = Kullanýcý için parolayý deðiþtir
@ -140,7 +137,6 @@ Error: start date after end date = Hata:
and all their replies = ve onlarýn cevaplarý
Upload = Yükle
Requested = Ýstenmiþ
Registration request on logbook "%s" = "%s" kayýt defterinde kayýt isteði
A new ELOG user wants to register on "%s" = Yeni ELOG kullanýcýsý "%s"'na kayýt olmak istiyor
Search text also in attributes = Metni özellikler içinde de ara
Date = Tarih
@ -150,11 +146,8 @@ Email address <i>"%s"</i> not registered = <i>"%s"</i> e-posta adresi kay
ELOG password recovery = ELOG parola yenileme
No Email address registered with user name <i>"%s"</i> = <i>"%s"</i> kullanýcý ismine herhangi bir e-posta adresi kayýtlý deðil
Error sending Email via <i>"%s"</i> = <i>"%s"</i> ile e-posta gönderirken hata
A new password for user <i>"%s"</i> has been sent to %s = <i>"%s"</i> kullanýcýsý için yeni parola %s'ye gönderildi
Forgot = Unutuldu
User "%s" registered on host "%s" = "%s" kullanýcýsý "%s" makinesinde kayýtlý
Registration request on host "%s" = "%s" makinesinde kayýt baþvurusu
A new password has been created for you on host %s = %s makinesinde, sizin için yeni parola yaratýldý
Enter your user name or email address = Kullanýcý adý veya e-posta adresi girin
Password recovery for ELOG %s = ELOG %s için parola yenileme
Host = Makine (Host)
@ -183,8 +176,6 @@ Entry can only be edited %1.2lg hours after creation = Girdi yarat
Display full entries = Tüm girdileri göster
No entry selected for deletion = Silme için girdi seçilmedi
Cannot read entry from local logbook = Yerel kayýt defterinden girdi okunamýyor
Cannot create socket = Soket yaratýlamýyor
Cannot resolve host name "%s" = "%s" makine adýný çözümleyemiyor
Cannot connect to host %s, port %d = %s makinesi, %d portuna baðlanýlamýyor
Cannot receive "%s" = "%s" alýnamýyor
Received wrong entry id "%d" = Yanlýþ girdi "%d" id'si alýndý
@ -459,7 +450,6 @@ Rotate left =
Rotate right =
Delete attachment =
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) =
ELOG error =
@ -474,3 +464,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -32,10 +32,7 @@ Username =
Password = 密码
Old password = 旧密码
New password = 亲密码
ELOG password = ELOG 密码
ELOG change password = 修改 ELOG 密码
Please enter password to obtain write access = 请输入密码以获得修改权限
Please enter password to obtain administration access = 请输入密码以获得管理权限
Several logbooks are defined on this host = 该主机设置多个记录本
Please select the one to connect to = 请选择要打开的记录本
Change password for user = 修改用户密码
@ -138,7 +135,6 @@ Error: start date after end date =
and all their replies = 和它们所有的回复
Upload = 上载
Requested = 请求的
Registration request on logbook "%s" = 记录本 "%s" 里的注册请求
A new ELOG user wants to register on "%s" = 新的 ELOG 用户希望注册到 "%s"
Search text also in attributes = 同时搜索属性中的文本
Date = 日期
@ -148,11 +144,8 @@ Email address <i>"%s"</i> not registered =
ELOG password recovery = ELOG 密码恢复
No Email address registered with user name <i>"%s"</i> = 用户 <i>"%s"</i> 没有提供电子邮件地址
Error sending Email via <i>"%s"</i> = 无法通过 <i>"%s"</i> 发送电子邮件
A new password for user <i>"%s"</i> has been sent to %s = 用户 <i>"%s"</i> 的新密码已经发送到 %s
Forgot = 忘记
User "%s" registered on host "%s" = 用户 "%s" 注册到机器 "%s"
Registration request on host "%s" = 注册请求来自机器 "%s"
A new password has been created for you on host %s = 已经为你在机器 %s 上创建了一个新的密码
Enter your user name or email address = 编辑你的用户名或者电子邮件地址
Password recovery for ELOG %s = ELOG %s 的密码恢复
Host = 主机
@ -180,8 +173,6 @@ Entry can only be edited %1.2lg hours after creation =
Display full entries = 显示全部记录内容
No entry selected for deletion = 没有选择要删除的记录
Cannot read entry from local logbook = 无法从本地记录本中读取记录
Cannot create socket = 无法创建端口
Cannot resolve host name "%s" = 无法解析主机名 "%s"
Cannot connect to host %s, port %d = 无法连接到主机 %s 端口 %d
Cannot receive "%s" = 无法接收 "%s"
Received wrong entry id "%d" = 收到错误的记录 ID 号 "%d"
@ -458,7 +449,6 @@ Rotate left =
Rotate right =
Delete attachment =
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) =
ELOG error =
@ -473,3 +463,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -32,10 +32,7 @@ Username = 用户
Password = 密码
Old password = 旧密码
New password = 亲密码
ELOG password = ELOG 密码
ELOG change password = 修改 ELOG 密码
Please enter password to obtain write access = 请输入密码以获得修改权限
Please enter password to obtain administration access = 请输入密码以获得管理权限
Several logbooks are defined on this host = 该主机设置多个记录本
Please select the one to connect to = 请选择要打开的记录本
Change password for user = 修改用户密码
@ -138,7 +135,6 @@ Error: start date after end date = 错误:开始日期在结束日期之后
and all their replies = 和它们所有的回复
Upload = 上载
Requested = 请求的
Registration request on logbook "%s" = 记录本 "%s" 里的注册请求
A new ELOG user wants to register on "%s" = 新的 ELOG 用户希望注册到 "%s"
Search text also in attributes = 同时搜索属性中的文本
Date = 日期
@ -148,11 +144,8 @@ Email address <i>"%s"</i> not registered = 电子邮件地址 <i>"%s"</i> 没有
ELOG password recovery = ELOG 密码恢复
No Email address registered with user name <i>"%s"</i> = 用户 <i>"%s"</i> 没有提供电子邮件地址
Error sending Email via <i>"%s"</i> = 无法通过 <i>"%s"</i> 发送电子邮件
A new password for user <i>"%s"</i> has been sent to %s = 用户 <i>"%s"</i> 的新密码已经发送到 %s
Forgot = 忘记
User "%s" registered on host "%s" = 用户 "%s" 注册到机器 "%s"
Registration request on host "%s" = 注册请求来自机器 "%s"
A new password has been created for you on host %s = 已经为你在机器 %s 上创建了一个新的密码
Enter your user name or email address = 编辑你的用户名或者电子邮件地址
Password recovery for ELOG %s = ELOG %s 的密码恢复
Host = 主机
@ -180,8 +173,6 @@ Entry can only be edited %1.2lg hours after creation = 记录只能在被创建
Display full entries = 显示全部记录内容
No entry selected for deletion = 没有选择要删除的记录
Cannot read entry from local logbook = 无法从本地记录本中读取记录
Cannot create socket = 无法创建端口
Cannot resolve host name "%s" = 无法解析主机名 "%s"
Cannot connect to host %s, port %d = 无法连接到主机 %s 端口 %d
Cannot receive "%s" = 无法接收 "%s"
Received wrong entry id "%d" = 收到错误的记录 ID 号 "%d"
@ -458,7 +449,6 @@ Rotate left =
Rotate right =
Delete attachment =
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) =
ELOG error =
@ -473,3 +463,22 @@ File system full, ELOG cannot continue to work =
3 Days =
Last 3 Days =
Really submit this entry? =
Are you sure to abandon any entered text? =
Account activation for ELOG logbook "%s" =
Account activation for ELOG on host "%s" =
Please click the URL below to activate following ELOG account =
Activation URL =
An email has been sent to &lt;%s&gt; =
Use that email to activate your account =
Registration request for ELOG logbook "%s" =
Registration request for ELOG on host "%s" =
Are you sure you want to deactivate your own account? =
Active =
Invalid activation code =
Error activating user =
A password recovery email for user <i>"%s"</i> has been sent to %s =
User "%s" has no access to this logbook =
Your account has been activated =
Please subscribe to logbooks if you want to receive automatic email notifications =
This is an automatically generated account recovery email for host %s =
Please click on following link to recover your account =

View File

@ -26,7 +26,8 @@ extern LOGBOOK *lb_list;
#ifdef HAVE_KRB5
int auth_verify_password_krb5(LOGBOOK *lbs, const char *user, const char *password, char *error_str, int error_size)
int auth_verify_password_krb5(LOGBOOK * lbs, const char *user, const char *password, char *error_str,
int error_size)
{
char *princ_name, str[256], realm[256];
krb5_error_code error;
@ -64,16 +65,14 @@ int auth_verify_password_krb5(LOGBOOK *lbs, const char *user, const char *passwo
memset(&options, 0, sizeof(options));
krb5_get_init_creds_opt_init(&options);
memset(&creds, 0, sizeof(creds));
error = krb5_get_init_creds_password(context, &creds, princ,
(char *)password, NULL,
NULL, 0, NULL, &options);
error = krb5_get_init_creds_password(context, &creds, princ,
(char *) password, NULL, NULL, 0, NULL, &options);
krb5_free_cred_contents(context, &creds);
krb5_get_init_creds_opt_free(context, &options);
krb5_free_context(context);
if (error && error != KRB5KDC_ERR_PREAUTH_FAILED &&
error != KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN) {
if (error && error != KRB5KDC_ERR_PREAUTH_FAILED && error != KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN) {
strlcpy(error_str, "<b>Kerberos error:</b><br>", error_size);
strlcat(error_str, krb5_get_error_message(context, error), error_size);
strlcat(error_str, ".<br>Please check your Kerberos configuration.", error_size);
@ -86,7 +85,8 @@ int auth_verify_password_krb5(LOGBOOK *lbs, const char *user, const char *passwo
return TRUE;
}
int auth_change_password_krb5(LOGBOOK *lbs, const char *user, const char *old_pwd, const char *new_pwd, char *error_str, int error_size)
int auth_change_password_krb5(LOGBOOK * lbs, const char *user, const char *old_pwd, const char *new_pwd,
char *error_str, int error_size)
{
char *princ_name, str[256], realm[256];
int result_code, n;
@ -124,9 +124,8 @@ int auth_change_password_krb5(LOGBOOK *lbs, const char *user, const char *old_pw
krb5_get_init_creds_opt_set_proxiable(&options, FALSE);
memset(&creds, 0, sizeof(creds));
error = krb5_get_init_creds_password(context, &creds, princ,
(char *)old_pwd, NULL,
NULL, 0, "kadmin/changepw", &options);
error = krb5_get_init_creds_password(context, &creds, princ,
(char *) old_pwd, NULL, NULL, 0, "kadmin/changepw", &options);
if (error) {
strlcpy(error_str, "<b>Kerberos error:</b><br>", error_size);
strlcat(error_str, krb5_get_error_message(context, error), error_size);
@ -134,10 +133,8 @@ int auth_change_password_krb5(LOGBOOK *lbs, const char *user, const char *old_pw
return FALSE;
}
error = krb5_set_password(context, &creds, (char *)new_pwd, princ,
&result_code,
&result_code_string,
&result_string);
error = krb5_set_password(context, &creds, (char *) new_pwd, princ,
&result_code, &result_code_string, &result_string);
if (error) {
strlcpy(error_str, "<b>Kerberos error:</b><br>", error_size);
strlcat(error_str, krb5_get_error_message(context, error), error_size);
@ -148,7 +145,7 @@ int auth_change_password_krb5(LOGBOOK *lbs, const char *user, const char *old_pw
if (result_code > 0) {
if (result_code_string.length > 0) {
strlcpy(error_str, result_code_string.data, error_size);
if ((int)result_code_string.length < error_size)
if ((int) result_code_string.length < error_size)
error_str[result_code_string.length] = 0;
}
if (result_string.length > 0) {
@ -175,17 +172,19 @@ int auth_change_password_krb5(LOGBOOK *lbs, const char *user, const char *old_pw
/*---- local password file routines --------------------------------*/
int auth_verify_password_file(LOGBOOK *lbs, const char *user, const char *password, char *error_str, int error_size)
int auth_verify_password_file(LOGBOOK * lbs, const char *user, const char *password, char *error_str,
int error_size)
{
char upwd[256], enc_pwd[256];
get_user_line(lbs, (char*)user, upwd, NULL, NULL, NULL, NULL, NULL);
get_user_line(lbs, (char *) user, upwd, NULL, NULL, NULL, NULL, NULL);
do_crypt(password, enc_pwd, sizeof(enc_pwd));
return strcmp(enc_pwd, upwd) == 0;
}
int auth_change_password_file(LOGBOOK *lbs, const char *user, const char *old_pwd, const char *new_pwd, char *error_str, int error_size)
int auth_change_password_file(LOGBOOK * lbs, const char *user, const char *old_pwd, const char *new_pwd,
char *error_str, int error_size)
{
char str[256], file_name[256], enc_pwd[256];
PMXML_NODE node;
@ -212,7 +211,8 @@ int auth_change_password_file(LOGBOOK *lbs, const char *user, const char *old_pw
/*---- common function entry points --------------------------------*/
int auth_verify_password(LOGBOOK *lbs, const char *user, const char *password, char *error_str, int error_size)
int auth_verify_password(LOGBOOK * lbs, const char *user, const char *password, char *error_str,
int error_size)
{
char str[256];
BOOL verified;
@ -234,7 +234,8 @@ int auth_verify_password(LOGBOOK *lbs, const char *user, const char *password, c
return verified;
}
int auth_change_password(LOGBOOK *lbs, const char *user, const char *old_pwd, const char *new_pwd, char *error_str, int error_size)
int auth_change_password(LOGBOOK * lbs, const char *user, const char *old_pwd, const char *new_pwd,
char *error_str, int error_size)
{
int status;
char str[256];

View File

@ -365,7 +365,7 @@ int ssl_connect(int sock, SSL ** ssl_con)
char request[100000], response[100000], *content;
INT retrieve_elog(char *host, int port, char *subdir, int ssl, char *experiment,
char *uname, char *upwd, int message_id,
char *uname, char *upwd, int message_id,
char attrib_name[MAX_N_ATTR][NAME_LENGTH], char attrib[MAX_N_ATTR][NAME_LENGTH], char *text)
/********************************************************************\
@ -1219,7 +1219,7 @@ int main(int argc, char *argv[])
}
/* now submit message */
submit_elog(host_name, port, ssl, subdir, logbook,
submit_elog(host_name, port, ssl, subdir, logbook,
uname, upwd, reply, quote_on_reply, edit, suppress, encoding, attr_name, attrib, n_attr, text,
attachment, buffer, att_size);

View File

@ -70,6 +70,7 @@ char category_list[MAX_N_LIST][NAME_LENGTH] = { "General", "Other",
};
char author_list[MAX_N_LIST][NAME_LENGTH] = { "" };
char attr_list[MAX_N_ATTR][NAME_LENGTH];
char attr_options[MAX_N_ATTR][MAX_N_LIST][NAME_LENGTH];
int attr_flags[MAX_N_ATTR];
@ -285,7 +286,7 @@ void set_verbose(int v)
}
/* workaround for some gcc versions bug for "%c" format (see strftime(3) */
size_t my_strftime(char *s, size_t max, const char *fmt, const struct tm * tm)
size_t my_strftime(char *s, size_t max, const char *fmt, const struct tm *tm)
{
return strftime(s, max, fmt, tm);
}
@ -1775,7 +1776,7 @@ int recv_string(int sock, char *buffer, int buffer_size, int millisec)
SESSION_ID *_sid = NULL;
int _n_sid;
int sid_new(LOGBOOK *lbs, const char *user, const char *host, char *sid)
int sid_new(LOGBOOK * lbs, const char *user, const char *host, char *sid)
{
double exp;
time_t now;
@ -1785,7 +1786,7 @@ int sid_new(LOGBOOK *lbs, const char *user, const char *host, char *sid)
time(&now);
if (_sid == NULL) {
_sid = (SESSION_ID *)malloc(sizeof(SESSION_ID));
_sid = (SESSION_ID *) malloc(sizeof(SESSION_ID));
_n_sid = 1;
new_i = 0;
} else {
@ -1800,18 +1801,18 @@ int sid_new(LOGBOOK *lbs, const char *user, const char *host, char *sid)
if (atof(str) > 0)
exp = atof(str);
if (exp < 24)
exp = 24; /* one day minimum for dangling edit pages */
exp = 24; /* one day minimum for dangling edit pages */
/* search for expired sid */
for (i=0 ; i<_n_sid ; i++) {
if (_sid[i].time + exp*3600 < now) {
for (i = 0; i < _n_sid; i++) {
if (_sid[i].time + exp * 3600 < now) {
new_i = i;
break;
}
}
if (i==_n_sid) {
_sid = (SESSION_ID *)realloc(_sid, sizeof(SESSION_ID)*(_n_sid+1));
if (i == _n_sid) {
_sid = (SESSION_ID *) realloc(_sid, sizeof(SESSION_ID) * (_n_sid + 1));
new_i = _n_sid;
_n_sid++;
}
@ -1819,8 +1820,8 @@ int sid_new(LOGBOOK *lbs, const char *user, const char *host, char *sid)
strlcpy(_sid[new_i].user_name, user, sizeof(_sid[0].user_name));
strlcpy(_sid[new_i].host_ip, host, sizeof(_sid[0].host_ip));
for (i=0 ; i<4 ; i++)
sprintf(sid+i*4, "%04X", rand() % 0x10000);
for (i = 0; i < 4; i++)
sprintf(sid + i * 4, "%04X", rand() % 0x10000);
sid[16] = 0;
strlcpy(_sid[new_i].session_id, sid, sizeof(_sid[0].session_id));
_sid[new_i].time = now;
@ -1839,12 +1840,11 @@ int sid_check(char *sid, char *user_name)
return FALSE;
time(&now);
for (i=0 ; i<_n_sid ; i++) {
if (strcmp(_sid[i].host_ip, (char *) inet_ntoa(rem_addr)) == 0 &&
strcmp(_sid[i].session_id, sid) == 0) {
strcpy(user_name, _sid[i].user_name);
_sid[i].time = now;
return TRUE;
for (i = 0; i < _n_sid; i++) {
if (strcmp(_sid[i].host_ip, (char *) inet_ntoa(rem_addr)) == 0 && strcmp(_sid[i].session_id, sid) == 0) {
strcpy(user_name, _sid[i].user_name);
_sid[i].time = now;
return TRUE;
}
}
@ -1860,10 +1860,10 @@ int sid_remove(char *sid)
if (sid == NULL)
return FALSE;
for (i=0 ; i<_n_sid ; i++) {
for (i = 0; i < _n_sid; i++) {
if (strcmp(_sid[i].session_id, sid) == 0) {
memset(&_sid[i], 0, sizeof(SESSION_ID));
return TRUE;
memset(&_sid[i], 0, sizeof(SESSION_ID));
return TRUE;
}
}
@ -2383,7 +2383,7 @@ void split_url(const char *url, char *host, int *port, char *subdir, char *param
/*-------------------------------------------------------------------*/
int retrieve_url(LOGBOOK *lbs, const char *url, int ssl, char **buffer)
int retrieve_url(LOGBOOK * lbs, const char *url, int ssl, char **buffer)
{
char str[1000], unm[256], upwd[256], host[256], subdir[256], param[256];
int port, bufsize;
@ -2448,7 +2448,7 @@ int retrieve_url(LOGBOOK *lbs, const char *url, int ssl, char **buffer)
strlcpy(upwd, getparam("upwd"), sizeof(upwd));
else
get_user_line(lbs, getparam("unm"), upwd, NULL, NULL, NULL, NULL, NULL);
sprintf(str + strlen(str), "Cookie: unm=%s; upwd=%s\r\n", unm, upwd);
}
@ -2490,7 +2490,6 @@ int retrieve_url(LOGBOOK *lbs, const char *url, int ssl, char **buffer)
*buffer = NULL;
return -1;
}
#ifdef HAVE_SSL
if (ssl)
i = SSL_read(ssl_con, *buffer + n, bufsize - n);
@ -2506,7 +2505,7 @@ int retrieve_url(LOGBOOK *lbs, const char *url, int ssl, char **buffer)
if (n >= bufsize) {
/* increase buffer size */
bufsize += 10000;
*buffer = (char *)xrealloc(*buffer, bufsize);
*buffer = (char *) xrealloc(*buffer, bufsize);
if (*buffer == NULL) {
closesocket(sock);
return -1;
@ -3370,8 +3369,8 @@ void retrieve_domain(char *ret, int size)
void retrieve_email_from(LOGBOOK * lbs, char *ret, char *ret_name, char attrib[MAX_N_ATTR][NAME_LENGTH])
{
char email_from[256], email_from_name[256], str[256], *p, login_name[256],
slist[MAX_N_ATTR + 10][NAME_LENGTH], svalue[MAX_N_ATTR + 10][NAME_LENGTH],
full_name[256], user_email[256];
slist[MAX_N_ATTR + 10][NAME_LENGTH], svalue[MAX_N_ATTR + 10][NAME_LENGTH],
full_name[256], user_email[256];
int i;
if (getcfg(lbs->name, "Use Email from", str, sizeof(str))) {
@ -3985,7 +3984,7 @@ int el_index_logbooks()
lb_list[n].el_index = NULL;
/* check if other logbook uses the same directory */
for (j=0 ; j<n ; j++)
for (j = 0; j < n; j++)
if (strcmp(lb_list[j].data_dir, lb_list[n].data_dir) == 0) {
if (is_verbose())
eprintf("Logbook \"%s\" uses same directory as logbook \"%s\"\n", logbook, lb_list[j].name);
@ -4813,7 +4812,7 @@ void remove_reference(LOGBOOK * lbs, int message_id, int remove_id, BOOL reply_t
/* retrieve original message */
size = TEXT_SIZE + 1000;
message = (char *)xmalloc(size);
message = (char *) xmalloc(size);
status = el_retrieve(lbs, message_id, date, attr_list, attr, lbs->n_attr, message, &size, in_reply_to,
reply_to, att, enc, lock);
if (status != EL_SUCCESS)
@ -5068,12 +5067,12 @@ int el_correct_links(LOGBOOK * lbs, int old_id, int new_id)
char list[MAX_N_ATTR][NAME_LENGTH], list1[MAX_N_ATTR][NAME_LENGTH];
char *att_file;
attrib = (char *)xmalloc(MAX_N_ATTR * NAME_LENGTH);
text = (char *)xmalloc(TEXT_SIZE);
att_file = (char *)xmalloc(MAX_ATTACHMENTS * 256);
attrib = (char *) xmalloc(MAX_N_ATTR * NAME_LENGTH);
text = (char *) xmalloc(TEXT_SIZE);
att_file = (char *) xmalloc(MAX_ATTACHMENTS * 256);
el_retrieve(lbs, new_id, date, attr_list, (char (*)[1500]) attrib, lbs->n_attr, NULL, 0, in_reply_to, reply_to,
(char (*)[256]) att_file, encoding, locked_by);
el_retrieve(lbs, new_id, date, attr_list, (char (*)[1500]) attrib, lbs->n_attr, NULL, 0, in_reply_to,
reply_to, (char (*)[256]) att_file, encoding, locked_by);
/* go through in_reply_to list */
n = strbreak(in_reply_to, list, MAX_N_ATTR, ",", FALSE);
@ -5095,12 +5094,12 @@ int el_correct_links(LOGBOOK * lbs, int old_id, int new_id)
strcat(reply_to, ", ");
}
el_submit(lbs, atoi(list[i]), TRUE, date, attr_list, (char (*)[1500]) attrib, lbs->n_attr, text, in_reply_to,
reply_to, encoding, (char (*)[256]) att_file, TRUE, locked_by);
el_submit(lbs, atoi(list[i]), TRUE, date, attr_list, (char (*)[1500]) attrib, lbs->n_attr, text,
in_reply_to, reply_to, encoding, (char (*)[256]) att_file, TRUE, locked_by);
}
el_retrieve(lbs, new_id, date, attr_list, (char (*)[1500]) attrib, lbs->n_attr, NULL, 0, in_reply_to, reply_to,
(char (*)[256]) att_file, encoding, locked_by);
el_retrieve(lbs, new_id, date, attr_list, (char (*)[1500]) attrib, lbs->n_attr, NULL, 0, in_reply_to,
reply_to, (char (*)[256]) att_file, encoding, locked_by);
/* go through reply_to list */
n = strbreak(reply_to, list, MAX_N_ATTR, ",", FALSE);
@ -5122,8 +5121,8 @@ int el_correct_links(LOGBOOK * lbs, int old_id, int new_id)
strcat(in_reply_to, ", ");
}
el_submit(lbs, atoi(list[i]), TRUE, date, attr_list, (char (*)[1500]) attrib, lbs->n_attr, text, in_reply_to,
reply_to, encoding, (char (*)[256]) att_file, TRUE, locked_by);
el_submit(lbs, atoi(list[i]), TRUE, date, attr_list, (char (*)[1500]) attrib, lbs->n_attr, text,
in_reply_to, reply_to, encoding, (char (*)[256]) att_file, TRUE, locked_by);
}
xfree(text);
@ -6440,9 +6439,9 @@ void flush_return_buffer()
#ifdef HAVE_SSL
if (_ssl_flag) {
SSL_write(_ssl_con, return_buffer, strlen_retbuf);
} else
} else
#endif
send(_sock, return_buffer, strlen_retbuf, 0);
send(_sock, return_buffer, strlen_retbuf, 0);
memset(return_buffer, 0, return_buffer_size);
strlen_retbuf = 0;
@ -7633,7 +7632,7 @@ void add_logbook_to_group(LOGBOOK * lbs, char *new_name)
/*------------------------------------------------------------------*/
void show_standard_title(LOGBOOK *lbs, char *text, int printable)
void show_standard_title(LOGBOOK * lbs, char *text, int printable)
{
char str[256], ref[256], sclass[32], comment[256], full_name[256], url[256], logbook[256];
int i, j, level;
@ -8046,7 +8045,7 @@ void set_sid_cookie(LOGBOOK * lbs, char *sid)
/* set "remember me" cookie on login */
if (isparam("remember"))
set_cookie(lbs, "urem", "1", global, "8760"); /* one year = 24*365 */
set_cookie(lbs, "urem", "1", global, "8760"); /* one year = 24*365 */
else
set_cookie(lbs, "urem", "0", global, "8760");
@ -8506,8 +8505,7 @@ BOOL get_password_file(LOGBOOK * lbs, char *file_name, int size)
void show_change_pwd_page(LOGBOOK * lbs)
{
char str[256], config[256], old_pwd[256], new_pwd[256], new_pwd2[256], user[256],
auth[32], error_str[256];
char str[256], config[256], old_pwd[256], new_pwd[256], new_pwd2[256], user[256], auth[32], error_str[256];
int wrong_pwd;
getcfg(lbs->name, "Authentication", auth, sizeof(auth));
@ -8563,7 +8561,8 @@ void show_change_pwd_page(LOGBOOK * lbs)
/* replace password */
error_str[0] = 0;
if (!wrong_pwd)
wrong_pwd = (auth_change_password(lbs, user, old_pwd, new_pwd, error_str, sizeof(error_str)) == 0);
wrong_pwd =
(auth_change_password(lbs, user, old_pwd, new_pwd, error_str, sizeof(error_str)) == 0);
if (!wrong_pwd && isparam("unm") && strcmp(user, getparam("unm")) == 0) {
redirect(lbs, "");
@ -8609,8 +8608,7 @@ void show_change_pwd_page(LOGBOOK * lbs)
loc("New passwords do not match, please retype"));
if (wrong_pwd == 3)
rsprintf("<tr><td colspan=2 class=\"dlgerror\">%s!</td></tr>\n",
error_str);
rsprintf("<tr><td colspan=2 class=\"dlgerror\">%s!</td></tr>\n", error_str);
rsprintf("<tr><td colspan=2 class=\"dlgtitle\">\n");
@ -8621,7 +8619,7 @@ void show_change_pwd_page(LOGBOOK * lbs)
/* do not ask for old pwasword if admin changes other user's password */
if (isparam("unm")) {
if (!is_admin_user(lbs->name, getparam("unm")) || stricmp(getparam("unm"), user) == 0) {
if (isparam("oldpwd") && !(wrong_pwd == 1)) // hidden password for password recovery
if (isparam("oldpwd") && !(wrong_pwd == 1)) // hidden password for password recovery
rsprintf("<input type=hidden name=oldpwd value=\"%s\"", getparam("oldpwd"));
else {
rsprintf("<tr><td align=right class=\"dlgform\">%s:\n", loc("Old password"));
@ -9496,7 +9494,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
/* check for locking */
if (message_id && bedit && !breedit && !bupload) {
if (getcfg(lbs->name, "Use Lock", str, sizeof(str)) && atoi(str) == 1) {
if (isparam("unm"))
if (isparam("unm"))
get_full_name(lbs, getparam("unm"), str);
else
strlcpy(str, loc("user"), sizeof(str));
@ -9968,8 +9966,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
loc("Submit"));
rsprintf("<input type=\"submit\" name=\"cmd\" value=\"%s\" onClick=\"return chkform();\">\n",
loc("Preview"));
rsprintf("<input type=\"submit\" name=\"cmd\" value=\"%s\" onClick=\"return go_back();\">\n",
loc("Back"));
rsprintf("<input type=\"submit\" name=\"cmd\" value=\"%s\" onClick=\"return go_back();\">\n", loc("Back"));
rsprintf("</span></td></tr>\n\n");
/*---- entry form ----*/
@ -11481,8 +11478,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
loc("Submit"));
rsprintf("<input type=\"submit\" name=\"cmd\" value=\"%s\" onClick=\"return chkform();\">\n",
loc("Preview"));
rsprintf("<input type=\"submit\" name=\"cmd\" value=\"%s\" onClick=\"return go_back();\">\n",
loc("Back"));
rsprintf("<input type=\"submit\" name=\"cmd\" value=\"%s\" onClick=\"return go_back();\">\n", loc("Back"));
rsprintf("</span></td></tr>\n\n");
rsprintf("</table><!-- show_standard_title -->\n");
@ -12533,7 +12529,7 @@ int create_logbook(LOGBOOK * oldlbs, char *logbook, char *templ)
length = lseek(fh, 0, SEEK_END);
lseek(fh, 0, SEEK_SET);
bufsize = 2 * (2 * length + 1);
buf = (char *)xmalloc(bufsize);
buf = (char *) xmalloc(bufsize);
read(fh, buf, length);
buf[length] = 0;
templ_length = 0;
@ -12620,7 +12616,7 @@ int save_config(char *buffer, char *error)
return 0;
}
buf = (char *)xmalloc(strlen(buffer) * 2);
buf = (char *) xmalloc(strlen(buffer) * 2);
strlcpy(buf, buffer, strlen(buffer) * 2);
adjust_crlf(buf, strlen(buffer) * 2);
@ -12688,7 +12684,7 @@ int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user)
return 0;
}
/* check for blank password if not external authentication*/
/* check for blank password if not external authentication */
if (isparam("newpwd")) {
strlcpy(str, getparam("newpwd"), sizeof(str));
if (str[0] == 0) {
@ -12775,9 +12771,9 @@ int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user)
mxml_add_node(node, "last_activity", "0");
if (isparam("new_user_email"))
mxml_add_node(node, "email", getparam("new_user_email"));
if (!first_user && (self_register == 3 || self_register == 4)) {
code = rand() + (rand() << 16);
code = rand() + (rand() << 16);
sprintf(str, "%d", code);
mxml_add_node(node, "inactive", str);
} else
@ -12818,7 +12814,8 @@ int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user)
mxml_write_tree(file_name, lbs->pwd_xml_tree);
/* if requested, send notification email to user or admin user */
if (new_user && !first_user && (self_register == 2 || self_register == 3 || self_register == 4) && !isparam("admin")) {
if (new_user && !first_user && (self_register == 2 || self_register == 3 || self_register == 4)
&& !isparam("admin")) {
if (!getcfg("global", "SMTP host", smtp_host, sizeof(smtp_host))) {
show_error(loc("No SMTP host defined in [global] section of configuration file"));
return 0;
@ -12873,39 +12870,35 @@ int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user)
mail_text[0] = 0;
compose_email_header(lbs, subject, mail_from_name, email_addr,
NULL, mail_text, sizeof(mail_text), 1, 0, NULL, 0, 0);
sprintf(mail_text + strlen(mail_text), "\r\n%s:\r\n\r\n", loc("Please click the URL below to activate following ELOG account"));
sprintf(mail_text + strlen(mail_text), "\r\n%s:\r\n\r\n",
loc("Please click the URL below to activate following ELOG account"));
if (lbs)
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Logbook"),
lbs->name);
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Logbook"), lbs->name);
else
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Host"),
host_name);
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Host"), host_name);
if (isparam("new_user_name"))
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Login name"),
getparam("new_user_name"));
getparam("new_user_name"));
if (isparam("new_full_name"))
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Full name"),
getparam("new_full_name"));
getparam("new_full_name"));
if (isparam("new_user_email"))
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Email"),
getparam("new_user_email"));
getparam("new_user_email"));
sprintf(mail_text + strlen(mail_text), "\r\n%s:\r\n",
loc("Activation URL"));
sprintf(mail_text + strlen(mail_text), "\r\n%s:\r\n", loc("Activation URL"));
sprintf(mail_text + strlen(mail_text), "\r\nURL : %s", url);
if (isparam("new_user_name"))
sprintf(mail_text + strlen(mail_text), "?cmd=%s",
loc("Activate"));
sprintf(mail_text + strlen(mail_text), "?cmd=%s", loc("Activate"));
sprintf(mail_text + strlen(mail_text), "&code=%d&unm=%s\r\n", code, getparam("new_user_name"));
if (sendmail(lbs, smtp_host, mail_from, email_addr, mail_text, error, sizeof(error)) == -1) {
sprintf(str, loc("Cannot send email notification to \"%s\""),
getparam("new_user_email"));
sprintf(str, loc("Cannot send email notification to \"%s\""), getparam("new_user_email"));
strlcat(str, " : ", sizeof(str));
strlcat(str, error, sizeof(str));
strencode2(str2, str, sizeof(str2));
@ -12944,10 +12937,10 @@ int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user)
if (isparam("new_user_name")) {
if (lbs)
sprintf(subject, loc("User \"%s\" registered on logbook \"%s\""),
getparam("new_user_name"), lbs->name);
getparam("new_user_name"), lbs->name);
else
sprintf(subject, loc("User \"%s\" registered on host \"%s\""),
getparam("new_user_name"), host_name);
getparam("new_user_name"), host_name);
}
sprintf(str, loc("A new ELOG user has been registered on %s"), host_name);
@ -12960,42 +12953,42 @@ int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user)
if (lbs)
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Logbook"),
lbs->name);
lbs->name);
else
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Host"),
host_name);
host_name);
if (isparam("new_user_name"))
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Login name"),
getparam("new_user_name"));
getparam("new_user_name"));
if (isparam("new_full_name"))
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Full name"),
getparam("new_full_name"));
getparam("new_full_name"));
if (isparam("new_user_email"))
sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", loc("Email"),
getparam("new_user_email"));
getparam("new_user_email"));
if (self_register == 3) {
sprintf(mail_text + strlen(mail_text), "\r\n%s:\r\n",
loc("Hit following URL to activate that account"));
loc("Hit following URL to activate that account"));
sprintf(mail_text + strlen(mail_text), "\r\nURL : %s", url);
if (isparam("new_user_name"))
sprintf(mail_text + strlen(mail_text), "?cmd=%s&new_user_name=%s",
loc("Activate"), getparam("new_user_name"));
loc("Activate"), getparam("new_user_name"));
sprintf(mail_text + strlen(mail_text), "&code=%d&unm=%s\r\n", code, pl);
} else {
if (isparam("new_user_name"))
sprintf(mail_text + strlen(mail_text),
"\r\n%s URL : %s?cmd=Config&cfg_user=%s&unm=%s\r\n", loc("Logbook"),
url, getparam("new_user_name"), pl);
"\r\n%s URL : %s?cmd=Config&cfg_user=%s&unm=%s\r\n", loc("Logbook"),
url, getparam("new_user_name"), pl);
}
if (sendmail(lbs, smtp_host, mail_from, email_addr, mail_text, error, sizeof(error)) == -1) {
sprintf(str, loc("Cannot send email notification to \"%s\""),
getparam("new_user_email"));
getparam("new_user_email"));
strlcat(str, " : ", sizeof(str));
strlcat(str, error, sizeof(str));
strencode2(str2, str, sizeof(str2));
@ -13076,8 +13069,7 @@ int ascii_compare2(const void *s1, const void *s2)
void show_config_page(LOGBOOK * lbs)
{
char str[256], user[80], password[80], full_name[80], user_email[80], logbook[256],
auth[32], **user_list;
char str[256], user[80], password[80], full_name[80], user_email[80], logbook[256], auth[32], **user_list;
int i, n, inactive;
BOOL email_notify[1000];
@ -13119,7 +13111,7 @@ void show_config_page(LOGBOOK * lbs)
show_standard_title(lbs, "", 0);
/*---- activation notice ----*/
if (isparam("notice")) {
rsprintf("<tr><td class=\"notifymsg\" colspan=2>\n");
rsprintf(getparam("notice"));
@ -13155,9 +13147,9 @@ void show_config_page(LOGBOOK * lbs)
}
/* allocate list of users and populate it */
user_list = (char **)xcalloc(sizeof(char *), n);
user_list = (char **) xcalloc(sizeof(char *), n);
for (i = 0; i < n; i++)
user_list[i] = (char *)xcalloc(NAME_LENGTH, 1);
user_list[i] = (char *) xcalloc(NAME_LENGTH, 1);
for (i = 0; i < n; i++)
enum_user_line(lbs, i, user_list[i], NAME_LENGTH);
@ -13194,12 +13186,15 @@ void show_config_page(LOGBOOK * lbs)
if (is_admin_user(logbook, getparam("unm"))) {
rsprintf("<tr><td nowrap width=\"15%%\">%s:</td>\n", loc("Active"));
if (stricmp(user, getparam("unm")) == 0)
rsprintf("<td><input type=checkbox name=active value=1 %s onClick=\"return chkdeact(this);\"></td></tr>\n", inactive ? "" : "checked");
rsprintf
("<td><input type=checkbox name=active value=1 %s onClick=\"return chkdeact(this);\"></td></tr>\n",
inactive ? "" : "checked");
else
rsprintf("<td><input type=checkbox name=active value=1 %s></td></tr>\n", inactive ? "" : "checked");
} else {
rsprintf("<tr><td nowrap width=\"10%%\">%s:</td>\n", loc("Active"));
rsprintf("<td><input type=checkbox name=active value=1 readonly %s></td></tr>\n", inactive ? "" : "checked");
rsprintf("<td><input type=checkbox name=active value=1 readonly %s></td></tr>\n",
inactive ? "" : "checked");
}
rsprintf("<tr><td nowrap width=\"15%%\">%s:</td>\n", loc("Login name"));
@ -13311,11 +13306,11 @@ void show_config_page(LOGBOOK * lbs)
/*------------------------------------------------------------------*/
int activate_user(LOGBOOK *lbs, char *user_name, int code)
int activate_user(LOGBOOK * lbs, char *user_name, int code)
{
int status, inactive, self_register;
char str[256], str2[256], smtp_host[256], url[256], mail_text[2000],
error[256], mail_from_name[256], mail_from[256], user_email[256], logbook[256];
char str[256], str2[256], smtp_host[256], url[256], mail_text[2000],
error[256], mail_from_name[256], mail_from[256], user_email[256], logbook[256];
if (lbs == NULL)
strlcpy(logbook, "global", sizeof(logbook));
@ -13378,8 +13373,7 @@ int activate_user(LOGBOOK *lbs, char *user_name, int code)
mail_text[0] = 0;
compose_email_header(lbs, loc("Your ELOG account has been activated"), mail_from_name,
user_email, NULL, mail_text, sizeof(mail_text), 1, 0, NULL,
0, 0);
user_email, NULL, mail_text, sizeof(mail_text), 1, 0, NULL, 0, 0);
strlcat(mail_text, "\r\n", sizeof(mail_text));
strlcat(mail_text, loc("Your ELOG account has been activated on host"), sizeof(mail_text));
@ -13388,10 +13382,9 @@ int activate_user(LOGBOOK *lbs, char *user_name, int code)
sprintf(url + strlen(url), "?unm=%s", user_name);
sprintf(mail_text + strlen(mail_text), "%s %s.\r\n\r\n", loc("You can access it at"), url);
sprintf(mail_text + strlen(mail_text), "%s.\r\n",
loc("To subscribe to any logbook, click on 'Config' in that logbook"));
loc("To subscribe to any logbook, click on 'Config' in that logbook"));
if (sendmail(lbs, smtp_host, mail_from, user_email, mail_text, error,
sizeof(error)) == -1) {
if (sendmail(lbs, smtp_host, mail_from, user_email, mail_text, error, sizeof(error)) == -1) {
sprintf(str, loc("Cannot send email notification to \"%s\""), user_email);
strlcat(str, " : ", sizeof(str));
strlcat(str, error, sizeof(str));
@ -13487,10 +13480,10 @@ void show_forgot_pwd_page(LOGBOOK * lbs)
sizeof(mail_text), 1, 0, NULL, 0, 0);
strlcat(mail_text, "\r\n", sizeof(mail_text));
sprintf(mail_text + strlen(mail_text), loc("This is an automatically generated password recovery email for host %s"),
http_host);
sprintf(mail_text + strlen(mail_text),
loc("This is an automatically generated account recovery email for host %s"), http_host);
strlcat(mail_text, ".\r\n", sizeof(mail_text));
strlcat(mail_text, loc("Please click on following link to reset your password"),
strlcat(mail_text, loc("Please click on following link to recover your account"),
sizeof(mail_text));
strlcat(mail_text, ":\r\n\r\n", sizeof(mail_text));
strlcat(mail_text, url, sizeof(mail_text));
@ -13510,8 +13503,8 @@ void show_forgot_pwd_page(LOGBOOK * lbs)
rsprintf("</td></tr>\n");
rsprintf("<tr><td align=center class=\"dlgform\">\n");
rsprintf(loc("A password recovery email for user <i>\"%s\"</i> has been sent to %s"), full_name,
user_email);
rsprintf(loc("A password recovery email for user <i>\"%s\"</i> has been sent to %s"),
full_name, user_email);
rsprintf("</td></tr></table>\n");
show_bottom_text(lbs);
rsprintf("</body></html>\n");
@ -13540,7 +13533,8 @@ void show_forgot_pwd_page(LOGBOOK * lbs)
getcfg(lbs->name, "Authentication", str, sizeof(str));
if (stristr(str, "Kerberos")) {
show_error("This installation of ELOG uses site authentification\nwhere password recovery is not possible");
show_error
("This installation of ELOG uses site authentification\nwhere password recovery is not possible");
return;
}
@ -14046,7 +14040,7 @@ int show_download_page(LOGBOOK * lbs, char *path)
if (size + 1 >= return_buffer_size - (int) strlen(return_buffer)) {
delta = size - (return_buffer_size - strlen(return_buffer)) + 1000;
return_buffer = (char *)xrealloc(return_buffer, return_buffer_size + delta);
return_buffer = (char *) xrealloc(return_buffer, return_buffer_size + delta);
memset(return_buffer + return_buffer_size, 0, delta);
return_buffer_size += delta;
}
@ -14082,7 +14076,7 @@ int download_config()
if (size + 1 >= return_buffer_size - (int) strlen(return_buffer)) {
delta = size - (return_buffer_size - strlen(return_buffer)) + 1000;
return_buffer = (char *)xrealloc(return_buffer, return_buffer_size + delta);
return_buffer = (char *) xrealloc(return_buffer, return_buffer_size + delta);
memset(return_buffer + return_buffer_size, 0, delta);
return_buffer_size += delta;
}
@ -14275,8 +14269,8 @@ void csv_import(LOGBOOK * lbs, const char *csv, const char *csvfile)
BOOL first, in_quotes, filltext;
time_t ltime;
list = (char *)xmalloc((MAX_N_ATTR + 2) * NAME_LENGTH);
line = (char *)xmalloc(10000);
list = (char *) xmalloc((MAX_N_ATTR + 2) * NAME_LENGTH);
line = (char *) xmalloc(10000);
first = TRUE;
in_quotes = FALSE;
@ -14630,7 +14624,7 @@ void xml_import(LOGBOOK * lbs, const char *xml, const char *xmlfile)
rsprintf("<tr><td><table class=\"listframe\" width=\"100%%\" cellspacing=0>");
}
list = (char *)xmalloc(MAX_N_ATTR * NAME_LENGTH);
list = (char *) xmalloc(MAX_N_ATTR * NAME_LENGTH);
/* derive attributes from XML file */
if (isparam("head")) {
@ -15007,9 +15001,9 @@ int retrieve_remote_md5(LOGBOOK * lbs, char *host, MD5_INDEX ** md5_index, char
p += 4;
if (n == 0)
*md5_index = (MD5_INDEX*)xmalloc(sizeof(MD5_INDEX));
*md5_index = (MD5_INDEX *) xmalloc(sizeof(MD5_INDEX));
else
*md5_index = (MD5_INDEX*)xrealloc(*md5_index, (n + 1) * sizeof(MD5_INDEX));
*md5_index = (MD5_INDEX *) xrealloc(*md5_index, (n + 1) * sizeof(MD5_INDEX));
(*md5_index)[n].message_id = id;
@ -15085,10 +15079,10 @@ int submit_message(LOGBOOK * lbs, char *host, int message_id, char *error_str)
attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], *buffer;
char *content, *p, boundary[80], request[10000], response[10000];
#ifdef HAVE_SSL
SSL *ssl_con;
SSL *ssl_con;
#endif
text = (char *)xmalloc(TEXT_SIZE);
text = (char *) xmalloc(TEXT_SIZE);
error_str[0] = 0;
/* get message with attribute list devied from database */
@ -15138,7 +15132,7 @@ int submit_message(LOGBOOK * lbs, char *host, int message_id, char *error_str)
content_length += size;
}
content = (char *)xmalloc(content_length);
content = (char *) xmalloc(content_length);
/* compose content */
sprintf(boundary, "---------------------------%04X%04X%04X", rand(), rand(), rand());
@ -15197,7 +15191,7 @@ int submit_message(LOGBOOK * lbs, char *host, int message_id, char *error_str)
lseek(fh, 0, SEEK_END);
size = TELL(fh);
lseek(fh, 0, SEEK_SET);
buffer = (char *)xmalloc(size);
buffer = (char *) xmalloc(size);
read(fh, buffer, size);
close(fh);
@ -15256,7 +15250,7 @@ int submit_message(LOGBOOK * lbs, char *host, int message_id, char *error_str)
} else
#endif
{
{
/* send request */
send(sock, request, header_length, 0);
@ -15496,7 +15490,7 @@ void submit_config(LOGBOOK * lbs, char *server, char *buffer, char *error_str)
#endif
content_length = 100000;
content = (char *)xmalloc(content_length);
content = (char *) xmalloc(content_length);
/* compose content */
sprintf(boundary, "---------------------------%04X%04X%04X", rand(), rand(), rand());
@ -15558,7 +15552,7 @@ void submit_config(LOGBOOK * lbs, char *server, char *buffer, char *error_str)
} else
#endif
{
{
/* send request */
send(sock, request, header_length, 0);
@ -15667,7 +15661,8 @@ void receive_config(LOGBOOK * lbs, char *server, char *error_str)
puts(buffer);
xfree(buffer);
*strchr(str, '?') = 0;
sprintf(error_str, "Received invalid response from elogd server at http%s://%s", ssl ? "s" : "", str);
sprintf(error_str, "Received invalid response from elogd server at http%s://%s", ssl ? "s" : "",
str);
xfree(buffer);
return;
}
@ -15686,7 +15681,8 @@ void receive_config(LOGBOOK * lbs, char *server, char *error_str)
puts(buffer);
xfree(buffer);
*strchr(str, '?') = 0;
sprintf(error_str, "Received invalid response from elogd server at http%s://%s", ssl ? "s" : "", str);
sprintf(error_str, "Received invalid response from elogd server at http%s://%s", ssl ? "s" : "",
str);
return;
}
@ -15733,7 +15729,7 @@ int adjust_config(char *url)
/* read previous contents */
length = lseek(fh, 0, SEEK_END);
lseek(fh, 0, SEEK_SET);
buf = (char *)xmalloc(2 * length + 1000);
buf = (char *) xmalloc(2 * length + 1000);
read(fh, buf, length);
buf[length] = 0;
@ -15906,7 +15902,7 @@ void receive_pwdfile(LOGBOOK * lbs, char *server, char *error_str)
return;
}
buf = (char *)xmalloc(2 * strlen(p));
buf = (char *) xmalloc(2 * strlen(p));
strlcpy(buf, p, 2 * strlen(p));
adjust_crlf(buf, 2 * strlen(p));
@ -16013,9 +16009,9 @@ int load_md5(LOGBOOK * lbs, char *server, MD5_INDEX ** md5_index)
break;
if (i == 0)
*md5_index = (MD5_INDEX*)xcalloc(sizeof(MD5_INDEX), 1);
*md5_index = (MD5_INDEX *) xcalloc(sizeof(MD5_INDEX), 1);
else
*md5_index = (MD5_INDEX*)xrealloc(*md5_index, sizeof(MD5_INDEX) * (i + 1));
*md5_index = (MD5_INDEX *) xrealloc(*md5_index, sizeof(MD5_INDEX) * (i + 1));
p = str + 2;
@ -16919,8 +16915,8 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, int exp
struct tm *pts;
time_t ltime;
slist = (char *)xmalloc((MAX_N_ATTR + 10) * NAME_LENGTH);
svalue = (char *)xmalloc((MAX_N_ATTR + 10) * NAME_LENGTH);
slist = (char *) xmalloc((MAX_N_ATTR + 10) * NAME_LENGTH);
svalue = (char *) xmalloc((MAX_N_ATTR + 10) * NAME_LENGTH);
_current_message_id = message_id;
ref[0] = 0;
@ -17738,14 +17734,14 @@ void display_reply(LOGBOOK * lbs, int message_id, int printable, int expand, int
char *date, *text, *in_reply_to, *reply_to, *encoding, *attachment, *locked_by, *attrib, *p;
int status, size;
text = (char *)xmalloc(TEXT_SIZE);
attachment = (char *)xmalloc(MAX_PATH_LENGTH * MAX_ATTACHMENTS);
attrib = (char *)xmalloc(MAX_N_ATTR * NAME_LENGTH);
date = (char *)xmalloc(80);
in_reply_to = (char *)xmalloc(80);
reply_to = (char *)xmalloc(256);
encoding = (char *)xmalloc(80);
locked_by = (char *)xmalloc(256);
text = (char *) xmalloc(TEXT_SIZE);
attachment = (char *) xmalloc(MAX_PATH_LENGTH * MAX_ATTACHMENTS);
attrib = (char *) xmalloc(MAX_N_ATTR * NAME_LENGTH);
date = (char *) xmalloc(80);
in_reply_to = (char *) xmalloc(80);
reply_to = (char *) xmalloc(256);
encoding = (char *) xmalloc(80);
locked_by = (char *) xmalloc(256);
if (locked_by == NULL)
return;
@ -17768,9 +17764,9 @@ void display_reply(LOGBOOK * lbs, int message_id, int printable, int expand, int
}
display_line(lbs, message_id, 0, "threaded", expand, level, printable, n_line, FALSE, FALSE, date,
in_reply_to, reply_to, n_attr_disp, disp_attr, NULL, (char (*)[1500]) attrib, lbs->n_attr, text,
show_text, (char (*)[256]) attachment, encoding, 0, NULL, locked_by, highlight, &re_buf[0],
highlight_mid, absolute_link);
in_reply_to, reply_to, n_attr_disp, disp_attr, NULL, (char (*)[1500]) attrib, lbs->n_attr,
text, show_text, (char (*)[256]) attachment, encoding, 0, NULL, locked_by, highlight,
&re_buf[0], highlight_mid, absolute_link);
if (reply_to[0]) {
p = reply_to;
@ -17831,7 +17827,7 @@ char *param_in_str(char *str, char *param)
p = stristr(p, param);
/* if parameter not followed by '=', skip it */
if (*(p+strlen(param)) != '=') {
if (*(p + strlen(param)) != '=') {
p += strlen(param);
continue;
}
@ -17901,7 +17897,7 @@ BOOL subst_param(char *str, int size, char *param, char *value)
strlcpy(p1 + strlen(value), p2, size - (p1 + strlen(value) - str));
} else {
/* new value is longer than old one */
s = (char *)xmalloc(size);
s = (char *) xmalloc(size);
strlcpy(s, p2, size);
strlcpy(p1, value, size - (p1 - str));
strlcat(p1, s, size - (p1 + strlen(value) - str));
@ -18313,7 +18309,7 @@ void show_page_filters(LOGBOOK * lbs, int n_msg, int page_n, BOOL mode_commands,
size = TELL(fileno(f));
fseek(f, 0, SEEK_SET);
buf = (char *)xmalloc(size + 1);
buf = (char *) xmalloc(size + 1);
fread(buf, 1, size, f);
buf[size] = 0;
fclose(f);
@ -19022,7 +19018,7 @@ void show_rss_feed(LOGBOOK * lbs)
if (getcfg(lbs->name, "RSS Entries", str, sizeof(str)))
n = atoi(str);
text = (char *)xmalloc(TEXT_SIZE);
text = (char *) xmalloc(TEXT_SIZE);
message_id = el_search_message(lbs, EL_LAST, 0, FALSE);
for (index = 0; index < n && message_id; index++) {
rsprintf("<item>\n");
@ -19165,7 +19161,7 @@ time_t search_last_reply(LOGBOOK * lbs, int *message_id)
char *list;
time_t lt, last;
list = (char *)xmalloc(MAX_REPLY_TO * NAME_LENGTH);
list = (char *) xmalloc(MAX_REPLY_TO * NAME_LENGTH);
el_retrieve(lbs, *message_id, date, NULL, NULL, 0, NULL, 0, NULL, reply_to, NULL, NULL, NULL);
lt = date_to_ltime(date);
@ -19345,10 +19341,10 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
return;
}
slist = (char *)xmalloc((MAX_N_ATTR + 10) * NAME_LENGTH);
svalue = (char *)xmalloc((MAX_N_ATTR + 10) * NAME_LENGTH);
gattr = (char *)xmalloc(MAX_N_ATTR * NAME_LENGTH);
list = (char *)xmalloc(10000);
slist = (char *) xmalloc((MAX_N_ATTR + 10) * NAME_LENGTH);
svalue = (char *) xmalloc((MAX_N_ATTR + 10) * NAME_LENGTH);
gattr = (char *) xmalloc(MAX_N_ATTR * NAME_LENGTH);
list = (char *) xmalloc(10000);
printable = isparam("Printable") ? atoi(getparam("Printable")) : 0;
@ -19533,7 +19529,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
n_msg = *lbs->n_el_index;
}
msg_list = (MSG_LIST*)xmalloc(sizeof(MSG_LIST) * n_msg);
msg_list = (MSG_LIST *) xmalloc(sizeof(MSG_LIST) * n_msg);
lbs_cur = lbs;
numeric = TRUE;
@ -19653,8 +19649,8 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
if (getcfg(lbs->name, "Sort Attributes", list, 10000))
filtering = TRUE;
text = (char *)xmalloc(TEXT_SIZE);
text1 = (char *)xmalloc(TEXT_SIZE);
text = (char *) xmalloc(TEXT_SIZE);
text1 = (char *) xmalloc(TEXT_SIZE);
/* prepare for regex search */
memset(re_buf, 0, sizeof(re_buf));
@ -20289,7 +20285,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
size = TELL(fileno(f));
fseek(f, 0, SEEK_SET);
buf = (char *)xmalloc(size + 1);
buf = (char *) xmalloc(size + 1);
fread(buf, 1, size, f);
buf[size] = 0;
fclose(f);
@ -21006,7 +21002,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
/*------------------------------------------------------------------*/
int find_thread_head(LOGBOOK *lbs, int message_id)
int find_thread_head(LOGBOOK * lbs, int message_id)
{
int i;
@ -21031,7 +21027,7 @@ void show_elog_thread(LOGBOOK * lbs, int message_id, int absolute_links, int hig
disp_attr[MAX_N_ATTR + 4][NAME_LENGTH];
char *p;
text = (char *)xmalloc(TEXT_SIZE);
text = (char *) xmalloc(TEXT_SIZE);
/* retrieve message */
size = TEXT_SIZE;
@ -21971,18 +21967,18 @@ int set_attributes(LOGBOOK * lbs, char attributes[][NAME_LENGTH], int n)
int propagate_attrib(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LENGTH])
{
int n, i, j, status;
char str[NAME_LENGTH], att_file[MAX_ATTACHMENTS][256], attr[MAX_N_ATTR][NAME_LENGTH],
list[MAX_N_ATTR][NAME_LENGTH], reply_to[MAX_REPLY_TO * 10];
char str[NAME_LENGTH], att_file[MAX_ATTACHMENTS][256], attr[MAX_N_ATTR][NAME_LENGTH],
list[MAX_N_ATTR][NAME_LENGTH], reply_to[MAX_REPLY_TO * 10];
status = el_retrieve(lbs, message_id, NULL, attr_list, (char (*)[NAME_LENGTH])attr, lbs->n_attr,
status = el_retrieve(lbs, message_id, NULL, attr_list, (char (*)[NAME_LENGTH]) attr, lbs->n_attr,
NULL, NULL, NULL, reply_to, att_file, NULL, NULL);
if (status != EL_SUCCESS)
return status;
getcfg(lbs->name, "Propagate attributes", str, sizeof(str));
n = strbreak(str, list, MAX_N_ATTR, ",", FALSE);
for (i=0 ; i<n ; i++) {
for (j=0 ; j<lbs->n_attr ; j++)
for (i = 0; i < n; i++) {
for (j = 0; j < lbs->n_attr; j++)
if (stricmp(attr_list[j], list[i]) == 0) {
strlcpy(attr[j], attrib[j], NAME_LENGTH);
break;
@ -21990,7 +21986,7 @@ int propagate_attrib(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NAME
}
message_id = el_submit(lbs, message_id, TRUE, "<keep>", attr_list, attrib, lbs->n_attr, "<keep>",
"<keep>", "<keep>", "<keep>", att_file, TRUE, NULL);
"<keep>", "<keep>", "<keep>", att_file, TRUE, NULL);
if (message_id < 0)
return 0;
@ -22631,14 +22627,14 @@ void submit_elog(LOGBOOK * lbs)
/* check for mail submissions */
mail_param[0] = 0;
mail_to = (char *)xmalloc(256);
mail_to = (char *) xmalloc(256);
mail_to[0] = 0;
mail_to_size = 256;
rcpt_to = (char *)xmalloc(256);
rcpt_to = (char *) xmalloc(256);
rcpt_to[0] = 0;
rcpt_to_size = 256;
mail_list = (char *)xmalloc(MAX_N_EMAIL * NAME_LENGTH);
rcpt_list = (char *)xmalloc(MAX_N_EMAIL * NAME_LENGTH);
mail_list = (char *) xmalloc(MAX_N_EMAIL * NAME_LENGTH);
rcpt_list = (char *) xmalloc(MAX_N_EMAIL * NAME_LENGTH);
if (suppress == 1 || suppress == 3) {
if (suppress == 1)
@ -24855,7 +24851,7 @@ int get_user_line(LOGBOOK * lbs, char *user, char *password, char *full_name, ch
/*------------------------------------------------------------------*/
int get_full_name(LOGBOOK *lbs, char *uname, char *full_name)
int get_full_name(LOGBOOK * lbs, char *uname, char *full_name)
{
return get_user_line(lbs, uname, NULL, full_name, NULL, NULL, NULL, NULL);
}
@ -25209,7 +25205,7 @@ BOOL is_admin_user_global(char *user)
/*------------------------------------------------------------------*/
void show_login_page(LOGBOOK *lbs, char *redir, int fail)
void show_login_page(LOGBOOK * lbs, char *redir, int fail)
{
char str[256], str2[256];
int show_forgot_link, show_self_register;
@ -25325,7 +25321,7 @@ BOOL check_login(LOGBOOK * lbs, char *sid)
int status, inactive, skip_sid_check;
/* show new user screen if password file is empty */
if (!enum_user_line(lbs, 0, str, sizeof(str))) {
if (!enum_user_line(lbs, 0, str, sizeof(str))) {
if (isparam("new_user_name"))
return TRUE;
show_new_user_page(lbs, NULL);
@ -25672,7 +25668,7 @@ void show_selection_page(void)
/* if selection page protected, check password */
if (getcfg("global", "password file", str, sizeof(str)) && getcfg("global", "protect selection page", str,
sizeof(str)) && atoi(str) == 1)
sizeof(str)) && atoi(str) == 1)
if (!check_login(NULL, getparam("sid")))
return;
@ -26098,8 +26094,8 @@ void interprete(char *lbook, char *path)
int status, i, j, n, index, lb_index, message_id;
char list[1000], section[256], str[NAME_LENGTH], str1[NAME_LENGTH], str2[NAME_LENGTH],
edit_id[80], file_name[256], command[256], enc_path[256], dec_path[256], uname[80],
full_name[256], user_email[256], logbook[256], logbook_enc[256], *experiment,
group[256], css[256], *pfile, attachment[MAX_PATH_LENGTH], str3[NAME_LENGTH],
full_name[256], user_email[256], logbook[256], logbook_enc[256], *experiment,
group[256], css[256], *pfile, attachment[MAX_PATH_LENGTH], str3[NAME_LENGTH],
thumb_name[256], sid[32], error_str[256];
LOGBOOK *lbs;
FILE *f;
@ -26189,7 +26185,7 @@ void interprete(char *lbook, char *path)
if (!activate_user(NULL, getparam("new_user_name"), atoi(getparam("code"))))
return;
setparam("cfg_user", getparam("new_user_name"));
get_user_line(NULL, getparam("new_user_name"), NULL, full_name, user_email, NULL, NULL, NULL);
sprintf(str, "%s <b>&lt;%s&gt;</b>", full_name, user_email);
@ -26425,7 +26421,7 @@ void interprete(char *lbook, char *path)
/* redirect to config page */
sprintf(str, "?cmd=%s&notice=%s. %s", loc("Config"), loc("Your account has been activated"),
loc("Please subscribe to logbooks if you want to receive automatic email notifications"));
loc("Please subscribe to logbooks if you want to receive automatic email notifications"));
setparam("redir", str);
/* set SID cookie */
@ -27017,7 +27013,7 @@ void interprete(char *lbook, char *path)
if (!activate_user(lbs, getparam("new_user_name"), atoi(getparam("code"))))
return;
setparam("cfg_user", getparam("new_user_name"));
get_user_line(lbs, getparam("new_user_name"), NULL, full_name, user_email, NULL, NULL, NULL);
sprintf(str, "%s <b>&lt;%s&gt;</b>", full_name, user_email);
@ -27111,7 +27107,7 @@ void interprete(char *lbook, char *path)
setparam("redir", str);
}
set_sid_cookie(lbs, "");
sid_remove(getparam("sid"));
sid_remove(getparam("sid"));
return;
}
@ -27473,7 +27469,8 @@ int process_http_request(const char *request, int i_conn)
struct tm *ts;
const char *cookie_list[] =
{ "upwd", "unm", "ufnm", "elmode", "urem", "wpwd", "apwd", "uname", "upassword", "elattach", "hsm", "sid",
{ "upwd", "unm", "ufnm", "elmode", "urem", "wpwd", "apwd", "uname", "upassword", "elattach", "hsm",
"sid",
NULL
};
@ -27930,7 +27927,7 @@ int process_http_request(const char *request, int i_conn)
for (i = 0; *p && *p != '/' && *p != '?'; p++);
while (*p && *p == '/')
p++;
if (strncmp(p, "editor/", 7) == 0) // fix for image request inside FCKeditor
if (strncmp(p, "editor/", 7) == 0) // fix for image request inside FCKeditor
p += 7;
/* decode command and return answer */
decode_get(logbook, p);
@ -29472,8 +29469,7 @@ int run_service(void)
int main(int argc, char *argv[])
{
int i, j, n, fh, tcp_port_cl, silent, sync_flag;
char smtp_pwd[80], str[256], logbook[256], clone_url[256],
error_str[256], file_name[256];
char smtp_pwd[80], str[256], logbook[256], clone_url[256], error_str[256], file_name[256];
time_t now;
struct tm *tms;
struct stat finfo;