Implemented send_with_timeout()
This commit is contained in:
ritt committed
1 parent
f66397adef
commit
21dc563c57
11 files changed
+592
-112
No files matched your search
@@ -216,7 +216,7 @@ install: $(EXECS)
|
||||
ifeq ($(OSTYPE),darwin)
|
||||
@$(INSTALL) -v -m 0644 elogd.plist /Library/LaunchDaemons/ch.psi.elogd.plist
|
||||
@echo The elogd service can now be started with
|
||||
@echo " launchctl load /Library/LaunchDaemons/ch.psi.elogd.plist"
|
||||
@echo " sudo launchctl load /Library/LaunchDaemons/ch.psi.elogd.plist"
|
||||
else
|
||||
@sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init
|
||||
@mkdir -p -m 0755 $(RCDIR)
|
||||
|
||||
+2
-12
@@ -1,26 +1,16 @@
|
||||
Checklist for new ELOG version
|
||||
==============================
|
||||
|
||||
On RS32:
|
||||
On Mac (MPC1865):
|
||||
|
||||
- Put all new options in doc/config.html
|
||||
- Increase version in elog-version.h
|
||||
- Do the same in doc/index.html and index_nd.html
|
||||
- Modify ChangeLog
|
||||
- Add release date to ChangeLog
|
||||
|
||||
On VPC6562-1:
|
||||
|
||||
- "svn update"
|
||||
- "make loc"
|
||||
- Translate new strings in eloglang.german
|
||||
- "make indent"
|
||||
- svn -m "Run indent" commit
|
||||
|
||||
On RS32:
|
||||
|
||||
- "svn update"
|
||||
- c:\elog> svn ci -m "Release x.x.x-y"
|
||||
- "git commit -a -m "Release x.x.x-y"
|
||||
|
||||
On VPC6562-1:
|
||||
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
Version 3.0.0, released December 23th, 2014
|
||||
===========================================
|
||||
|
||||
- Replaced insecure SSLv23 with TLSv1 method
|
||||
- Switched from SVN to GIT versioning
|
||||
- Implemented service under Mac OSC via launchd
|
||||
- Added LDAP support for authentication
|
||||
- Don’t overwrite certificated, themes and init scrip during ‘make install’
|
||||
- Create one logbook subdirectory pear year
|
||||
- Switched to CKEditor with Drag & Drop Upload (courtesy of Dario Milicic)
|
||||
|
||||
|
||||
Version 2.9.2, released April 27th 2012
|
||||
=======================================
|
||||
|
||||
|
||||
+32
-13
@@ -38,10 +38,7 @@
|
||||
<div class=Sub><i>How to set up and run your very own ELOG server</i></div>
|
||||
|
||||
<hr><a name="unix">
|
||||
<div class=section> Installing and running on UNIX </div>
|
||||
<p>
|
||||
<b>ELOG</b> is being developed and tested under Linux, and is being used on (Sparc) Solaris
|
||||
workstations. It should also compile and run on other UNIX flavours.
|
||||
<div class=section> Installing and running on Linux </div>
|
||||
<p>
|
||||
|
||||
<h3><hr><i>Installation from the RPM file</i>:</h3>
|
||||
@@ -162,6 +159,37 @@ described <a href="#config">below</a>.
|
||||
|
||||
<div class=section> Notes for various platforms </div>
|
||||
<p>
|
||||
<h3><i>Mac OS X</i>:</h3>
|
||||
<p>
|
||||
Under Mac OSX, <b>ELOG</b> must be compiled from the source code. The OSX command line tools (compiler & Co)
|
||||
must be available, which can be done thought he free Xcode package which can be obtained though the App Store.
|
||||
Once Xcode is installed, you can do a <code>xcode-select --install</code> to install the command line tools.
|
||||
After that, a simple <code>make</code> in in the elog directory does the job of compiling ELOG.
|
||||
If SSL support is needed (access via https://...), you have to install OpenSSL and turn on SSL support in the
|
||||
Makefile by setting <code>USE_SSL = 1</code>. You can install OpenSSL for example through the
|
||||
<a href="https://www.macports.org">MacPorts</a> project. After having installed MacPorts, you do a
|
||||
<code>sudo port install openssl</code>.<p>
|
||||
|
||||
After successful compilation, you do a <code>sudo make install</code> to install all required files under
|
||||
the installation directory, which is by default <code>/usr/local/</code>. A subdirectory <code>/usr/local/elog</code>
|
||||
is created which contains a simple example logbook. The ELOG server can now be started either manually with
|
||||
<p>
|
||||
<code>/usr/local/sbin/elogd</code>
|
||||
<p>
|
||||
or through the daemon servics with
|
||||
<p>
|
||||
<code>sudo launchctl load /Library/LaunchDaemons/ch.psi.elogd.plist</code>
|
||||
<p>
|
||||
To stop the service, use
|
||||
<p>
|
||||
<code>sudo launchctl unload /Library/LaunchDaemons/ch.psi.elogd.plist</code>
|
||||
<p>
|
||||
<hr>
|
||||
<h3><i>Debian</i>:</h3>
|
||||
<p>
|
||||
A Debian package is available under <a href="https://tracker.debian.org/pkg/elog">https://tracker.debian.org/pkg/elog</a>.
|
||||
|
||||
<hr>
|
||||
<h3><i>Solaris</i>:</h3>
|
||||
|
||||
<p><a href="mailto:huber@secaron.de">Martin Huber</a> reports that
|
||||
@@ -174,15 +202,6 @@ been problems with <b>ELOG</b>'s <I>keep-alive</I> feature. In such a case you n
|
||||
the "<B>-k</B>" flag to the <code><b>elogd</b></code> command line to turn keep-alives off.
|
||||
<p>
|
||||
|
||||
<h3><hr><i>Mac OS X</i>:</h3>
|
||||
|
||||
<p><a href="mailto:sak@essc.psu.edu">Sridhar Anandakrishnan</a> and
|
||||
<a href="mailto:roktas@emu.edu.tr">Recai Oktas</a> report that under Mac OS X there is a problem with
|
||||
the default stack size. The command <i><b>limit stacksize unlimited</b></i> (for tcsh) or
|
||||
<i><b>ulimit -s unlimited</b></i> (for bash) increases the stacksize and fixes this problem.
|
||||
Read the according <a href="http://midas.psi.ch/elogs/Forum/379">thread</a> in the forum.
|
||||
<p>
|
||||
|
||||
<h3><hr><i>FreeBSD</i>:</h3>
|
||||
|
||||
<p><a href="mailto:ottodavid@gmx.net">David Otto</a> maintains the
|
||||
|
||||
@@ -46,6 +46,11 @@
|
||||
body {
|
||||
font-family: Verdana,Arial,Helvetica,Sans-Serif;
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: Courier,Fixed,monospace;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
p {
|
||||
margin-left: 10px;
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@
|
||||
[<a class="nav" href="#links">Links</a>] * </div>
|
||||
<P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt@psi.ch">
|
||||
Stefan Ritt</a></P>
|
||||
<div class="version">Current version is : 2.9.2</div>
|
||||
<div class="version">Current version is : 3.0.0</div>
|
||||
<center>
|
||||
<a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
|
||||
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@
|
||||
[<a class="nav" href="#links">Links</a>] * </div>
|
||||
<P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt@psi.ch">
|
||||
Stefan Ritt</a></P>
|
||||
<div class="version">Current version is : 2.9.2</div>
|
||||
<div class="version">Current version is : 3.0.0</div>
|
||||
<center>
|
||||
<a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
|
||||
</center>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# German translation by stefan.ritt@psi.ch
|
||||
# A more recent version may be available at :
|
||||
# http://savannah.psi.ch/viewcvs/trunk/resources/eloglang.german?root=elog
|
||||
# A more recent version may be available at:
|
||||
# https://bitbucket.org/ritt/elog
|
||||
#
|
||||
|
||||
New = Neu
|
||||
@@ -476,4 +476,3 @@ CSV (";" separated) + Text = CSV (mit ";" getreent) + Text
|
||||
Entry can only be deleted %1.2lg hours after creation = Eintrag kann nur %1.2lg Stunden nach dem Anlegen gelöscht werden
|
||||
Drop attachments here... = Anhänge bitte hier ablegen...
|
||||
Insert Timestamp = Aktuelle Zeit einfügen
|
||||
|
||||
+461
-1
@@ -1 +1,461 @@
|
||||
#
# Slovak translation by Branislav Gardon<branislav.gardon@gmail.com>
#
New = Nový
Edit = Úprava
Delete = Zmazať
Reply = Odpovedať
Find = Hladať
Last day = Posledný den
Last 10 = Posledných 10
Config = Konfigurácia
Change password = Zmena hesla
Logout = Odhlásenie
Help = Pomoc
Back = Späť
Submit = Odovzdať
First = Prvý
Last = Posledný
Previous = Predchádzajúci
Next = Ďalší
Copy to = Kopírovať do
Move to = Presunúť do
Save = Uložiť
Cancel = Zrušiť
Wrong password = Nesprávne heslo
Please login = Prosím prihláste sa
Username = Prihlasovacie meno
Password = Heslo
Old password = Staré heslo
New password = Nové heslo
ELOG change password = ELOG zmena hesla
Several logbooks are defined on this host = Na tomto hoste je definovaných niekoľko denníkov
Please select the one to connect to = Zvoľte jedno k pripojeniu
Change password for user = Zmena hesla pre užívateľa
Logged in as = Prihlasený ako
Entry date = Dátum príspevku
with = s
This is the last entry = Toto je posledný príspevok
This is the first entry = Toto je prvý príspevok
Email sent to = Email odoslaný na
Email notification suppressed = Upozornenie emailom zakázané
please select = prosím zvoľte
Suppress Email notification = Zakázať upozornenie emailom
Resubmit as new entry = Potvrď ako nový záznam
Attachment = Príloha
Reply to this = Odpovedať na
In reply to = V odpovedi na
Fields marked with = Pole označené s
are required = sú vyžadované
Please check that it exists and elogd has write access = Prosím uistite sa, že existuje a elogd ma právo na zapisovanie
Error: Attribute <b>%s</b> not supplied = Chyba: Atribút <b>%s</b> nie je zásobený
Please go back and enter the <b>%s</b> field = Prosím choďte späť a zadajte <b>%s</b> pole
Please use your browser's back button to go back = Prosím použite tlačítko späť vášho prehliadača k návratu
ELOG find = ELOG nájsť
Find = Nájsť
Search = Hľadať
Reset Form = Nulovať formulár
Summary only = Iba zhrnutie
Show attachments = Ukáž prílohy
Printable output = Tlačový výstup
Sort in reverse order = Zoraď v opačnom poradí
Start date = Počiatočný dátum
End date = Koncový dátum
Year = Rok
Text = Text
Search all logbooks = Prehľadaj všetky denníky
Last %d days = Posledných %d dní
Last %d entries = Posledných %d záznamov
No entries found = Žiadne záznamy neboli nájdené
A new entry has been submitted on %s = Nový záznam bol potvrdený na %s
Logbook = Denník
Yes = Áno
No = Nie
Error deleting message: status = Chyba mazania správy: status
Error: Command "<b>%s</b>" not allowed = Chyba: Príkaz "<b>%s</b>" nie je povolený
Cannot open file <b>%s</b> = Nemôžem otvoriť súbor <b>%s</b>
Cannot write to <b>%s</b> = Nemôžem zapísať do <b>%s</b>
No SMTP host defined in [global] section of configuration file = Nie je definovaný žiadny SMTP host v sekci [global] konfiguračného súboru
Display threads = Zobraz vlákno
Logbook is empty = Denník je prázdny
Download = Stiahnúť
and all its replies = a všetky jeho odpovede
Message ID = ID správy
Not logged in = Neprihlásený
Login = Prihlásenie
Page %d of %d = Strana %d z %d
all entries = všetky záznamy
Login name = Prihlasovacie meno
Full name = Celé meno
ELOG user config = ELOG konfigurácia užívateľa
ELOG new user = ELOG nový užívateľ
Admin = Admin
Select user = Označ užívateľa
Remove user = Vymaž užívateľa
New user = Nový užívateľ
Retype new password = Zadaj nové heslo
New passwords do not match, please retype = Nové heslo sa nezhoduje, prosím zadaj znovu
Retype password = Zadaj znovu heslo
exists already = už existuje
Register as new user = Registruj sa ako nový užívateľ
A new ELOG user has been registered on %s = Nový ELOG užívateľ bol registrovaný na %s
Email = Email
User "%s" registered on logbook "%s" = Užívateľ "%s" registrovaný v denníku "%s"
User [%s] has been deleted = Užívateľ [%s ]bol zmazaný
Hit following URL to activate that account = Zadajte následujúcu URL k aktivácii tohto účtu
ELOG registration = ELOG registrácia
Your ELOG account has been activated on host = Váš ELOG účet bol aktivovaný na hoste
You can access it at = Možte pristupovať na
Are you sure to delete these messages? = Naozaj chcete zmazať túto správu?
Select = Označte
All entries = Všetky záznamy
Day = Deň
Week = Týždeň
Month = Mesiac
Show last = Ukáž posledný
Goto page = Choď na stránku
All = Všetko
Display = Zobraz
entries per page = položiek na stránku
Toggle all = Odobrať všetko
Selected entries = Označené záznamy
Collapse = Zbaliť
Expand = Rozbaliť
Full = Plné
Summary = Súhrn
Threaded = Vláknitý
Filters = Filtre
Mode = Mód
Options = Voľby
Error: start date after end date = Chyba: počiatočný dátum po konečný dátum
and all their replies = a všetky ich odpovede
Upload = Nahrať
Requested = Požadovaný
A new ELOG user wants to register on "%s" = Nový užívateľ sa chce regiLine truncated
|
||||
#
# Slovak translation by Branislav Gardon<branislav.gardon@gmail.com>
#
New = Nový
Edit = Úprava
Delete = Zmazať
Reply = Odpovedať
Find = Hladať
Last day = Posledný den
Last 10 = Posledných 10
Config = Konfigurácia
Change password = Zmena hesla
Logout = Odhlásenie
Help = Pomoc
Back = Späť
Submit = Odovzdať
First = Prvý
Last = Posledný
Previous = Predchádzajúci
Next = Ďalší
Copy to = Kopírovať do
Move to = Presunúť do
Save = Uložiť
Cancel = Zrušiť
Wrong password = Nesprávne heslo
Please login = Prosím prihláste sa
Username = Prihlasovacie meno
Password = Heslo
Old password = Staré heslo
New password = Nové heslo
ELOG change password = ELOG zmena hesla
Several logbooks are defined on this host = Na tomto hoste je definovaných niekoľko denníkov
Please select the one to connect to = Zvoľte jedno k pripojeniu
Change password for user = Zmena hesla pre užívateľa
Logged in as = Prihlasený ako
Entry date = Dátum príspevku
with = s
This is the last entry = Toto je posledný príspevok
This is the first entry = Toto je prvý príspevok
Email sent to = Email odoslaný na
Email notification suppressed = Upozornenie emailom zakázané
please select = prosím zvoľte
Suppress Email notification = Zakázať upozornenie emailom
Resubmit as new entry = Potvrď ako nový záznam
Attachment = Príloha
Reply to this = Odpovedať na
In reply to = V odpovedi na
Fields marked with = Pole označené s
are required = sú vyžadované
Please check that it exists and elogd has write access = Prosím uistite sa, že existuje a elogd ma právo na zapisovanie
Error: Attribute <b>%s</b> not supplied = Chyba: Atribút <b>%s</b> nie je zásobený
Please go back and enter the <b>%s</b> field = Prosím choďte späť a zadajte <b>%s</b> pole
Please use your browser's back button to go back = Prosím použite tlačítko späť vášho prehliadača k návratu
ELOG find = ELOG nájsť
Find = Nájsť
Search = Hľadať
Reset Form = Nulovať formulár
Summary only = Iba zhrnutie
Show attachments = Ukáž prílohy
Printable output = Tlačový výstup
Sort in reverse order = Zoraď v opačnom poradí
Start date = Počiatočný dátum
End date = Koncový dátum
Year = Rok
Text = Text
Search all logbooks = Prehľadaj všetky denníky
Last %d days = Posledných %d dní
Last %d entries = Posledných %d záznamov
No entries found = Žiadne záznamy neboli nájdené
A new entry has been submitted on %s = Nový záznam bol potvrdený na %s
Logbook = Denník
Yes = Áno
No = Nie
Error deleting message: status = Chyba mazania správy: status
Error: Command "<b>%s</b>" not allowed = Chyba: Príkaz "<b>%s</b>" nie je povolený
Cannot open file <b>%s</b> = Nemôžem otvoriť súbor <b>%s</b>
Cannot write to <b>%s</b> = Nemôžem zapísať do <b>%s</b>
No SMTP host defined in [global] section of configuration file = Nie je definovaný žiadny SMTP host v sekci [global] konfiguračného súboru
Display threads = Zobraz vlákno
Logbook is empty = Denník je prázdny
Download = Stiahnúť
and all its replies = a všetky jeho odpovede
Message ID = ID správy
Not logged in = Neprihlásený
Login = Prihlásenie
Page %d of %d = Strana %d z %d
all entries = všetky záznamy
Login name = Prihlasovacie meno
Full name = Celé meno
ELOG user config = ELOG konfigurácia užívateľa
ELOG new user = ELOG nový užívateľ
Admin = Admin
Select user = Označ užívateľa
Remove user = Vymaž užívateľa
New user = Nový užívateľ
Retype new password = Zadaj nové heslo
New passwords do not match, please retype = Nové heslo sa nezhoduje, prosím zadaj znovu
Retype password = Zadaj znovu heslo
exists already = už existuje
Register as new user = Registruj sa ako nový užívateľ
A new ELOG user has been registered on %s = Nový ELOG užívateľ bol registrovaný na %s
Email = Email
User "%s" registered on logbook "%s" = Užívateľ "%s" registrovaný v denníku "%s"
User [%s] has been deleted = Užívateľ [%s ]bol zmazaný
Hit following URL to activate that account = Zadajte následujúcu URL k aktivácii tohto účtu
ELOG registration = ELOG registrácia
Your ELOG account has been activated on host = Váš ELOG účet bol aktivovaný na hoste
You can access it at = Možte pristupovať na
Are you sure to delete these messages? = Naozaj chcete zmazať túto správu?
Select = Označte
All entries = Všetky záznamy
Day = Deň
Week = Týždeň
Month = Mesiac
Show last = Ukáž posledný
Goto page = Choď na stránku
All = Všetko
Display = Zobraz
entries per page = položiek na stránku
Toggle all = Odobrať všetko
Selected entries = Označené záznamy
Collapse = Zbaliť
Expand = Rozbaliť
Full = Plné
Summary = Súhrn
Threaded = Vláknitý
Filters = Filtre
Mode = Mód
Options = Voľby
Error: start date after end date = Chyba: počiatočný dátum po konečný dátum
and all their replies = a všetky ich odpovede
Upload = Nahrať
Requested = Požadovaný
A new ELOG user wants to register on "%s" = Nový užívateľ sa chce regiLine truncated
|
||||
#
|
||||
#---- please translate following items and then remove this comment ----#
|
||||
#
|
||||
Shell execution not enabled via -x flag =
|
||||
Cannot lookup server name =
|
||||
Cannot connect to server =
|
||||
Entry size too large for email notification =
|
||||
Change %s =
|
||||
%s wrote =
|
||||
Quote =
|
||||
Logged in as =
|
||||
Not logged in =
|
||||
Goto ELOG home page =
|
||||
ELOG error =
|
||||
Back =
|
||||
Please use your browser's back button to go back =
|
||||
Anonymous =
|
||||
Config =
|
||||
Change password =
|
||||
ELOG change password =
|
||||
Wrong password =
|
||||
New passwords do not match, please retype =
|
||||
Change password for user =
|
||||
Old password =
|
||||
New password =
|
||||
Retype new password =
|
||||
Submit =
|
||||
keep original values =
|
||||
Year =
|
||||
Pick a date =
|
||||
Insert current time =
|
||||
Entry is currently edited by =
|
||||
Edit =
|
||||
Entry is locked =
|
||||
Edit anyhow =
|
||||
Cancel =
|
||||
Maximum number of replies (%d) exceeded =
|
||||
Only user <b>%s</b> can edit this entry =
|
||||
Entry can only be edited %1.2lg hours after creation =
|
||||
user =
|
||||
on =
|
||||
Entry has been modified =
|
||||
Really submit this entry? =
|
||||
Please select at least one '%s' =
|
||||
Please select a '%s' =
|
||||
Please enter month for attribute '%s' =
|
||||
Please enter day for attribute '%s' =
|
||||
Please enter year for attribute '%s' =
|
||||
Please enter hour for attribute '%s' =
|
||||
Please enter minute for attribute '%s' =
|
||||
Please enter second for attribute '%s' =
|
||||
Please enter attribute '%s' =
|
||||
Please enter numeric value for '%s' =
|
||||
Please enter numeric value for year of attribute '%s' =
|
||||
Are you sure to abandon any entered text? =
|
||||
No attachment file specified =
|
||||
Submit modified ELOG entry? =
|
||||
Enter name of hyperlink =
|
||||
Enter URL of hyperlink =
|
||||
Enter heading level (1, 2 or 3) =
|
||||
Update =
|
||||
Preview =
|
||||
Fields marked with =
|
||||
are required =
|
||||
Entry time =
|
||||
please select =
|
||||
Add new option here =
|
||||
Toggle all =
|
||||
Add %s =
|
||||
Bold text CTRL+B =
|
||||
Italics text CTRL+I =
|
||||
Underlined text CTRL+U =
|
||||
Centered text =
|
||||
Insert hyperlink =
|
||||
Insert email =
|
||||
Insert image CTRL+M =
|
||||
Insert quote =
|
||||
Insert list CTRL+L =
|
||||
Insert table =
|
||||
Insert heading CTRL+H =
|
||||
Insert horizontal line =
|
||||
Insert anchor point =
|
||||
Insert code CTRL+O =
|
||||
Hide the smiley bar =
|
||||
Show the smiley bar =
|
||||
FONT =
|
||||
SIZE =
|
||||
COLOR =
|
||||
Insert current time/date =
|
||||
smiling =
|
||||
happy =
|
||||
winking =
|
||||
big grin =
|
||||
crying =
|
||||
cool =
|
||||
frowning =
|
||||
confused =
|
||||
astonished =
|
||||
mad =
|
||||
pleased =
|
||||
tongue =
|
||||
yawn =
|
||||
keep original text =
|
||||
Encoding =
|
||||
Suppress Email notification =
|
||||
Suppress shell execution =
|
||||
Resubmit as new entry =
|
||||
Attachment =
|
||||
Make smaller =
|
||||
Original size =
|
||||
Make larger =
|
||||
Rotate left =
|
||||
Rotate right =
|
||||
Delete attachment =
|
||||
Delete =
|
||||
Maximum number of attachments reached =
|
||||
Upload =
|
||||
Drop attachments here... =
|
||||
ELOG find =
|
||||
Search =
|
||||
Reset Form =
|
||||
Mode =
|
||||
Display full entries =
|
||||
Summary only =
|
||||
Summary =
|
||||
Display threads =
|
||||
Export to =
|
||||
CSV ("," separated) =
|
||||
CSV (";" separated) =
|
||||
CSV (";" separated) + Text =
|
||||
Options =
|
||||
Show attachments =
|
||||
Printable output =
|
||||
Sort in reverse order =
|
||||
Search all logbooks =
|
||||
Display =
|
||||
entries per page =
|
||||
Filters =
|
||||
regular expressions =
|
||||
Text fields are treated as %s =
|
||||
Entry date =
|
||||
Start =
|
||||
Show last =
|
||||
Day =
|
||||
3 Days =
|
||||
Week =
|
||||
Month =
|
||||
3 Months =
|
||||
6 Months =
|
||||
End =
|
||||
unspecified =
|
||||
Text =
|
||||
Search text also in attributes =
|
||||
Case sensitive =
|
||||
Admin =
|
||||
Save =
|
||||
Delete this logbook =
|
||||
Rename this logbook =
|
||||
Create new logbook =
|
||||
Cannot open file <b>%s</b> =
|
||||
Cannot write to <b>%s</b> =
|
||||
Syntax error in config file =
|
||||
Please enter "%s" =
|
||||
Login name =
|
||||
Full name =
|
||||
Please specify a valid email address =
|
||||
User name may not contain blanks =
|
||||
Empty password not allowed =
|
||||
Password may not contain blanks =
|
||||
exists already =
|
||||
Error accessing password file =
|
||||
No SMTP host defined in [global] section of configuration file =
|
||||
Account activation for ELOG logbook "%s" =
|
||||
Account activation for ELOG on host "%s" =
|
||||
Please click the URL below to activate following ELOG account =
|
||||
Logbook =
|
||||
Host =
|
||||
Email =
|
||||
Activation URL =
|
||||
Activate =
|
||||
Cannot send email notification to "%s" =
|
||||
ELOG registration =
|
||||
An email has been sent to <%s> =
|
||||
Use that email to activate your account =
|
||||
Registration request for ELOG logbook "%s" =
|
||||
Registration request for ELOG on host "%s" =
|
||||
A new ELOG user wants to register on "%s" =
|
||||
A new ELOG user has been registered on %s =
|
||||
Hit following URL to activate that account =
|
||||
No admin user has been defined in configuration file =
|
||||
Requested =
|
||||
Cannot write to file <b>%s</b> =
|
||||
ELOG user config =
|
||||
Really remove user %s? =
|
||||
Are you sure you want to deactivate your own account? =
|
||||
Select user =
|
||||
User [%s] has been deleted =
|
||||
Active =
|
||||
Subscribe to logbooks =
|
||||
enable automatic email notifications =
|
||||
Set all =
|
||||
Set none =
|
||||
Remove user =
|
||||
New user =
|
||||
Change config file =
|
||||
Invalid activation code =
|
||||
Error activating user =
|
||||
Your ELOG account has been activated =
|
||||
Your ELOG account has been activated on host =
|
||||
You can access it at =
|
||||
To subscribe to any logbook, click on 'Config' in that logbook =
|
||||
No Email address registered with user name <i>"%s"</i> =
|
||||
Password recovery for ELOG %s =
|
||||
This is an automatically generated account recovery email for host %s =
|
||||
Please click on following link to recover your account =
|
||||
ELOG password recovery =
|
||||
Email notification =
|
||||
Error sending Email via <i>"%s"</i> =
|
||||
User name "%s" not registered =
|
||||
Enter your user name or email address =
|
||||
Forgot =
|
||||
ELOG new user =
|
||||
name may not contain blanks =
|
||||
Password =
|
||||
Retype password =
|
||||
Entry can only be deleted %1.2lg hours after creation =
|
||||
No =
|
||||
Yes =
|
||||
Error deleting message: status =
|
||||
No entry selected for deletion =
|
||||
Only user <b>%s</b> can delete this entry =
|
||||
Are you sure to delete these messages? =
|
||||
and all their replies =
|
||||
Are you sure to delete this entry? =
|
||||
and all its replies =
|
||||
Are you sure to delete logbook "%s"? =
|
||||
Rename logbook =
|
||||
Enter new logbook name =
|
||||
Logbook name =
|
||||
Use existing logbook as template =
|
||||
none =
|
||||
ELOG CSV import =
|
||||
Import =
|
||||
Field separator =
|
||||
Auto detect =
|
||||
Comma =
|
||||
Semicolon =
|
||||
Derive attributes from CSV file =
|
||||
Do not ignore first line =
|
||||
Preview import =
|
||||
text =
|
||||
Column header '%s' must be present in CSV file =
|
||||
Fill text body =
|
||||
CSV filename =
|
||||
Please re-enter filename =
|
||||
ELOG XML import =
|
||||
Derive attributes from XML file =
|
||||
XML filename =
|
||||
CSV import preview of %s =
|
||||
CSV Import =
|
||||
Too many attributes in CSV file =
|
||||
Invalid date format =
|
||||
%d entries successfully imported =
|
||||
XML file does not contain %s element =
|
||||
XML import preview of %s =
|
||||
XML Import =
|
||||
Date =
|
||||
Cannot connect to remote server "%s" =
|
||||
Remote server is not an ELOG server =
|
||||
Incorrect remote ELOG server version %s =
|
||||
URL is redirected to: =
|
||||
Invalid HTTP header =
|
||||
No user name supplied to access remote logbook =
|
||||
Error accessing remote logbook =
|
||||
Cannot read entry from local logbook =
|
||||
Cannot connect to host %s, port %d =
|
||||
Download =
|
||||
Cannot receive "%s" =
|
||||
Received wrong entry id "%d" =
|
||||
Entry #%d is locked on remote server =
|
||||
Cannot save remote entry locally =
|
||||
Please login =
|
||||
No mirror server defined in configuration file =
|
||||
Synchronizing logbook %s with server "%s" =
|
||||
Remote config should be received =
|
||||
Configuration has been changed locally and remotely =
|
||||
Please merge manually to resolve conflict =
|
||||
Entry is locked on local server and therefore skipped =
|
||||
Error sending local entry =
|
||||
Local entry submitted =
|
||||
Local entry should be submitted =
|
||||
Error receiving message =
|
||||
Remote entry received =
|
||||
Remote entry should be received =
|
||||
local =
|
||||
remote =
|
||||
Entry has been changed locally and remotely =
|
||||
Please delete %s or %s entry to resolve conflict =
|
||||
Error sending local message =
|
||||
Local entry =
|
||||
%s should be deleted =
|
||||
Entry should be deleted locally =
|
||||
Entry deleted locally =
|
||||
Changed local entry ID to %d =
|
||||
Local entry ID should be changed to %d =
|
||||
Remote entry =
|
||||
Entry should be deleted remotely =
|
||||
Entry deleted remotely =
|
||||
Error deleting remote entry =
|
||||
Click here to delete %d entries =
|
||||
Click here to delete this entry =
|
||||
All entries identical =
|
||||
Synchronization =
|
||||
Entry =
|
||||
Reply =
|
||||
ID =
|
||||
Edit entry =
|
||||
Delete entry =
|
||||
Full =
|
||||
Threaded =
|
||||
Hide attachments =
|
||||
Collapse =
|
||||
Expand =
|
||||
Show only new entries =
|
||||
Show all entries =
|
||||
Select period =
|
||||
All entries =
|
||||
Last day =
|
||||
Last 3 Days =
|
||||
Last week =
|
||||
Last month =
|
||||
Last 3 Months =
|
||||
Last 6 Months =
|
||||
Last Year =
|
||||
Select %s =
|
||||
Last =
|
||||
Next =
|
||||
Enter text =
|
||||
Enter %s =
|
||||
Entries =
|
||||
Goto page =
|
||||
Previous =
|
||||
All =
|
||||
Selected entries =
|
||||
Copy to =
|
||||
Move to =
|
||||
Error: start date after end date =
|
||||
Error in regular expression "%s" =
|
||||
Message ID =
|
||||
Last %d days =
|
||||
Last %d hours =
|
||||
Last %d entries =
|
||||
all entries =
|
||||
Page %d of %d =
|
||||
Last x =
|
||||
Select =
|
||||
New entries since =
|
||||
Start date =
|
||||
End date =
|
||||
From =
|
||||
After =
|
||||
to =
|
||||
Before =
|
||||
up =
|
||||
down =
|
||||
Attachments =
|
||||
No entries found =
|
||||
An old ELOG entry has been updated =
|
||||
A new ELOG entry has been submitted =
|
||||
A old entry has been updated on %s =
|
||||
A new entry has been submitted on %s =
|
||||
recipients =
|
||||
No 'Attributes' option present in %s =
|
||||
Error: Attribute <b>%s</b> not supplied =
|
||||
Please go back and enter the <b>%s</b> field =
|
||||
Error: Attribute <b>%s</b> must be numeric =
|
||||
Error: Value <b>%s</b> not allowed for boolean attributes =
|
||||
Maximum number of attribute options exceeded =
|
||||
Please increase MAX_N_LIST in elogd.c and recompile =
|
||||
Error: Attribute option <b>%s</b> not existing =
|
||||
Date must be between 1970 and 2037 =
|
||||
This entry has in meantime been locked by %s =
|
||||
This entry has in meantime been modified by someone else =
|
||||
New entry cannot be written to directory "%s" =
|
||||
Please check that it exists and elogd has write access and disk is not full =
|
||||
Invalid mirror_id or entry_date =
|
||||
Please check that it exists and elogd has write access =
|
||||
Entry %s cannot be read from logbook "%s" =
|
||||
First =
|
||||
Invalid URL =
|
||||
First entry, Ctrl-Home =
|
||||
Previous entry, Ctrl-PgUp =
|
||||
Next entry, Ctrl-PgDn =
|
||||
Last entry, Ctrl-End =
|
||||
Logbook is empty =
|
||||
This entry has been deleted =
|
||||
with =
|
||||
This is the last entry =
|
||||
This is the first entry =
|
||||
Email notification suppressed =
|
||||
Email sent to =
|
||||
stop =
|
||||
In reply to =
|
||||
Reply to this =
|
||||
Show =
|
||||
Hide =
|
||||
Hide all =
|
||||
Show all =
|
||||
Cannot create thumbnail, please check ImageMagick installation =
|
||||
Login =
|
||||
Invalid user name or password =
|
||||
Username =
|
||||
Keep me logged in on this computer =
|
||||
for the next %d days =
|
||||
for the next %d minutes =
|
||||
for the next hour =
|
||||
for the next %d hours =
|
||||
or until I log out =
|
||||
Forgot password? =
|
||||
Register as new user =
|
||||
File system full, ELOG cannot continue to work =
|
||||
This logbook requires authentication =
|
||||
by =
|
||||
Several logbooks groups are defined on this host =
|
||||
Please select one to list the logbooks in that group =
|
||||
No logbook defined on this server =
|
||||
Several logbooks are defined on this host =
|
||||
Please select the one to connect to =
|
||||
Synchronize all logbooks =
|
||||
Last submission =
|
||||
Expand all =
|
||||
Your request has been forwarded to the administrator =
|
||||
You will be notified by email upon activation of your new account =
|
||||
Calendar =
|
||||
Previous Year =
|
||||
Next Year =
|
||||
Upload image =
|
||||
Please enter filename or URL =
|
||||
Maximum allowed file size is =
|
||||
Enter filename or URL =
|
||||
Image uploaded successfully =
|
||||
Insert Timestamp =
|
||||
Activation notice has been sent to %s =
|
||||
Your account has been activated =
|
||||
Please subscribe to logbooks if you want to receive automatic email notifications =
|
||||
New =
|
||||
Duplicate =
|
||||
List =
|
||||
Error: Command "<b>%s</b>" not allowed =
|
||||
Help =
|
||||
HelpELCode =
|
||||
Find =
|
||||
Last 10 =
|
||||
ELOG import =
|
||||
Please choose format to import: =
|
||||
Synchronize =
|
||||
Logout =
|
||||
Cannot retrieve file from URL "%s" =
|
||||
File not found at URL "%s" =
|
||||
Error: Content length (%d) larger than maximum content length (%d) =
|
||||
+74
-79
@@ -1768,6 +1768,36 @@ int setuser(char *str)
|
||||
|
||||
/*-------------------------------------------------------------------*/
|
||||
|
||||
int send_with_timeout(void *p, int sock, char *buf, int size)
|
||||
{
|
||||
int status;
|
||||
time_t start, now;
|
||||
|
||||
time(&start);
|
||||
|
||||
do {
|
||||
#ifdef HAVE_SSL
|
||||
SSL *ssl = (SSL *)p;
|
||||
if (ssl)
|
||||
status = SSL_write(ssl, buf, size);
|
||||
else
|
||||
#endif
|
||||
status = send(sock, buf, size, 0);
|
||||
|
||||
time(&now);
|
||||
|
||||
// abort after 10 seconds
|
||||
if (now > start+10)
|
||||
break;
|
||||
|
||||
// repeat if we were interrupted by alarm() signal
|
||||
} while (status == -1 && errno == EINTR);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------*/
|
||||
|
||||
int recv_string(int sock, char *buffer, int buffer_size, int millisec)
|
||||
{
|
||||
int i, n;
|
||||
@@ -2421,7 +2451,9 @@ int retrieve_url(LOGBOOK * lbs, const char *url, int ssl, char **buffer)
|
||||
fd_set readfds;
|
||||
struct timeval timeout;
|
||||
#ifdef HAVE_SSL
|
||||
static SSL *ssl_con;
|
||||
static SSL *ssl_con = NULL;
|
||||
#else
|
||||
static void *ssl_con = NULL;
|
||||
#endif
|
||||
static int sock, last_port;
|
||||
static char last_host[256];
|
||||
@@ -2491,13 +2523,8 @@ int retrieve_url(LOGBOOK * lbs, const char *url, int ssl, char **buffer)
|
||||
|
||||
strcat(str, "\r\n");
|
||||
|
||||
#ifdef HAVE_SSL
|
||||
if (ssl)
|
||||
SSL_write(ssl_con, str, strlen(str));
|
||||
else
|
||||
#endif
|
||||
send(sock, str, strlen(str), 0);
|
||||
|
||||
send_with_timeout(ssl_con, sock, (char *)str, strlen(str));
|
||||
|
||||
bufsize = TEXT_SIZE + 1000;
|
||||
*buffer = xmalloc(bufsize);
|
||||
memset(*buffer, 0, bufsize);
|
||||
@@ -6675,12 +6702,10 @@ void rsprintf(const char *format, ...)
|
||||
void flush_return_buffer()
|
||||
{
|
||||
#ifdef HAVE_SSL
|
||||
if (_ssl_flag) {
|
||||
SSL_write(_ssl_con, return_buffer, strlen_retbuf);
|
||||
} else
|
||||
send_with_timeout(_ssl_con, _sock, return_buffer, strlen_retbuf);
|
||||
#else
|
||||
send_with_timeout(NULL, _sock, return_buffer, strlen_retbuf);
|
||||
#endif
|
||||
send(_sock, return_buffer, strlen_retbuf, 0);
|
||||
|
||||
memset(return_buffer, 0, return_buffer_size);
|
||||
strlen_retbuf = 0;
|
||||
}
|
||||
@@ -15432,6 +15457,8 @@ int submit_message(LOGBOOK * lbs, char *host, int message_id, char *error_str)
|
||||
char *content, *p, boundary[80], request[10000], response[10000];
|
||||
#ifdef HAVE_SSL
|
||||
SSL *ssl_con = NULL;
|
||||
#else
|
||||
void *ssl_con = NULL;
|
||||
#endif
|
||||
|
||||
text = (char *) xmalloc(TEXT_SIZE);
|
||||
@@ -15593,29 +15620,19 @@ int submit_message(LOGBOOK * lbs, char *host, int message_id, char *error_str)
|
||||
|
||||
header_length = strlen(request);
|
||||
|
||||
send_with_timeout(ssl_con, sock, request, header_length);
|
||||
send_with_timeout(ssl_con, sock, content, content_length);
|
||||
|
||||
|
||||
#ifdef HAVE_SSL
|
||||
if (ssl) {
|
||||
/* send request */
|
||||
SSL_write(ssl_con, request, header_length);
|
||||
|
||||
/* send content */
|
||||
SSL_write(ssl_con, content, content_length);
|
||||
|
||||
if (ssl)
|
||||
/* receive response */
|
||||
i = SSL_read(ssl_con, response, 10000);
|
||||
|
||||
} else
|
||||
else
|
||||
#endif
|
||||
{
|
||||
/* send request */
|
||||
send(sock, request, header_length, 0);
|
||||
|
||||
/* send content */
|
||||
send_tcp(sock, content, content_length, 0);
|
||||
|
||||
/* receive response */
|
||||
i = recv(sock, response, 10000, 0);
|
||||
}
|
||||
|
||||
if (i < 0) {
|
||||
closesocket(sock);
|
||||
@@ -15825,6 +15842,8 @@ void submit_config(LOGBOOK * lbs, char *server, char *buffer, char *error_str)
|
||||
char *content, *p, boundary[80], request[10000], response[10000];
|
||||
#ifdef HAVE_SSL
|
||||
SSL *ssl_con = NULL;
|
||||
#else
|
||||
void *ssl_con = NULL;
|
||||
#endif
|
||||
|
||||
error_str[0] = 0;
|
||||
@@ -15895,29 +15914,18 @@ void submit_config(LOGBOOK * lbs, char *server, char *buffer, char *error_str)
|
||||
|
||||
header_length = strlen(request);
|
||||
|
||||
send_with_timeout(ssl_con, sock, request, header_length);
|
||||
send_with_timeout(ssl_con, sock, content, content_length);
|
||||
|
||||
|
||||
#ifdef HAVE_SSL
|
||||
if (ssl) {
|
||||
/* send request */
|
||||
SSL_write(ssl_con, request, header_length);
|
||||
|
||||
/* send content */
|
||||
SSL_write(ssl_con, content, content_length);
|
||||
|
||||
if (ssl)
|
||||
/* receive response */
|
||||
i = SSL_read(ssl_con, response, 10000);
|
||||
|
||||
} else
|
||||
else
|
||||
#endif
|
||||
{
|
||||
/* send request */
|
||||
send(sock, request, header_length, 0);
|
||||
|
||||
/* send content */
|
||||
send_tcp(sock, content, content_length, 0);
|
||||
|
||||
/* receive response */
|
||||
i = recv(sock, response, 10000, 0);
|
||||
}
|
||||
|
||||
if (i < 0) {
|
||||
closesocket(sock);
|
||||
@@ -28652,6 +28660,12 @@ void send_return(int _sock, const char *net_buffer)
|
||||
int length, header_length;
|
||||
char str[NAME_LENGTH];
|
||||
char *p;
|
||||
#ifndef HAVE_SSL
|
||||
void *ssl_con = NULL;
|
||||
#endif
|
||||
|
||||
if (!_ssl_flag)
|
||||
ssl_con = NULL;
|
||||
|
||||
if (return_length != -1) {
|
||||
if (return_length == 0)
|
||||
@@ -28681,18 +28695,10 @@ void send_return(int _sock, const char *net_buffer)
|
||||
header_length = sizeof(header_buffer) - 100;
|
||||
memcpy(header_buffer, return_buffer, header_length);
|
||||
sprintf(header_buffer + header_length, "\r\nContent-Length: %d\r\n\r\n", length);
|
||||
#ifdef HAVE_SSL
|
||||
if (_ssl_flag) {
|
||||
SSL_write(ssl_con, header_buffer, strlen(header_buffer));
|
||||
SSL_write(ssl_con, p + 4, length);
|
||||
} else {
|
||||
send(_sock, header_buffer, strlen(header_buffer), 0);
|
||||
send(_sock, p + 4, length, 0);
|
||||
}
|
||||
#else
|
||||
send(_sock, header_buffer, strlen(header_buffer), 0);
|
||||
send(_sock, p + 4, length, 0);
|
||||
#endif
|
||||
|
||||
send_with_timeout(ssl_con, _sock, header_buffer, strlen(header_buffer));
|
||||
send_with_timeout(ssl_con, _sock, p + 4, length);
|
||||
|
||||
if (get_verbose() < VERBOSE_DEBUG) {
|
||||
if (get_verbose() > 0)
|
||||
eprintf("Returned %d bytes\n", length);
|
||||
@@ -28727,27 +28733,14 @@ void send_return(int _sock, const char *net_buffer)
|
||||
memcpy(header_buffer, return_buffer, header_length);
|
||||
sprintf(header_buffer + header_length, "\r\nConnection: Close\r\n\r\n");
|
||||
}
|
||||
#ifdef HAVE_SSL
|
||||
if (_ssl_flag) {
|
||||
SSL_write(ssl_con, header_buffer, strlen(header_buffer));
|
||||
SSL_write(ssl_con, p + 4, length);
|
||||
} else {
|
||||
send(_sock, header_buffer, strlen(header_buffer), 0);
|
||||
send(_sock, p + 4, length, 0);
|
||||
}
|
||||
#else
|
||||
send(_sock, header_buffer, strlen(header_buffer), 0);
|
||||
send(_sock, p + 4, length, 0);
|
||||
#endif
|
||||
|
||||
send_with_timeout(ssl_con, _sock, header_buffer, strlen(header_buffer));
|
||||
send_with_timeout(ssl_con, _sock, p + 4, length);
|
||||
|
||||
} else {
|
||||
#ifdef HAVE_SSL
|
||||
if (_ssl_flag)
|
||||
SSL_write(ssl_con, return_buffer, return_length);
|
||||
else
|
||||
send(_sock, return_buffer, return_length, 0);
|
||||
#else
|
||||
send(_sock, return_buffer, return_length, 0);
|
||||
#endif
|
||||
|
||||
send_with_timeout(ssl_con, _sock, return_buffer, return_length);
|
||||
|
||||
}
|
||||
|
||||
if (get_verbose() < VERBOSE_DEBUG) {
|
||||
@@ -29327,7 +29320,9 @@ void server_loop(void)
|
||||
_ssl_con = NULL;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
} else
|
||||
_ssl_con = NULL;
|
||||
|
||||
#endif
|
||||
|
||||
/* find new entry in socket table */
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
HAVE_SSL,
|
||||
HAVE_SSL1,
|
||||
HAVE_KRB5,
|
||||
DEBUG,
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user