Version 2.5.4

SVN revision: 1015
This commit is contained in:
2004-08-04 10:39:39 +00:00
parent b0dc01ee30
commit 28d9ef8376
11 changed files with 399 additions and 49 deletions
+42
View File
@@ -1,3 +1,45 @@
Version 2.5.4, released August 4th, 2004
================================--======
- Implemented cloning to set-up a mirror server
- Fixed problem with 'preset text' under conditional attributes
- Added JavaScript code onunload() if locking is used, to avoid
stale locks
- Made substituions work correctly with date attributes
- Implemented deletion of logbooks through web interface
- Implemented renaming of logbooks through web interface
- Fixed email notification problem if URL does not contain a trailing '/'
- Redirect login screen if URL does not match the one in the config file
- Extract and use 'X-Forwarded-Host:'
- Do a el_index_logbooks on HUP signal under Unix
- Added $utcdate
- Fixed problem of password change when using crypt()
- Admin user has to supply own old password on password change
- Omit 'preset text' on edit of entries
- Added error display if max. number of attribute options gets exceeded
- Implemented 'show top groups' flag
- Fixed problem that admin user of top group could change global section
- Added 'fix text' flag
- Fixed problem with options list containing several quotation marks
- Implemented synchronizing during cloning
- Don't evaluate 'preset xxx' on replies
- Implemented 'preset on reply'
- Implemented 'tooltip <attribute>'
- Use 'format <attrib> = 1' also in entry form
- Implemented 'max content length'
- Advanced message handling implemnted by Recai Oktas, usage of syslog
under Unix and Event Log under Windows
- Added size parameter to getcfg() to avoid buffer overflows
- Fixed bugs with https:// in URL
- Supply full path to elogd.cfg when running elogd as windows service
- entry deletion during synchronization now uses confirmation
- Fixed problem that attachments could not be deleted
- Fixed wrong date on date attributes on edit/reply if attribute is fixed
- Increased possible size of 'welcome title' to 10000 chars
- Made p<attribute>=value work again
- Fixed problem with {..} in attributes
Version 2.5.3, released June 7th, 2004
======================================
+83 -48
View File
@@ -693,6 +693,14 @@ after its creation. This can be useful if one wants to ensure that old entries
cannot be modified. Hours can also be fractional, like 0.5 for 30 min.
<p>
<li><b><code>Max content length = &lt;bytes&gt;</code></b>
<br>
This option restricts the size of attachments. When very large (>100MB) attachments
are uploaded, the elogd server can be busy with this upload for a longer time and
not respond to other requests during that time. To avoid this, the maximum size
of attachments can be restricted. The server will then refuse to accept larger
attachments. The default is 10485760 (= 10 MB).<p>
</UL>
<a name="attrib"><hr>
@@ -1747,9 +1755,34 @@ ELOG server calculates a MD5 checksum for each message, which gets exchanged dur
Only when the MD5 checksum differs, entries are transferred.
<p>
To set-up mirroring, start with two elogd servers on two machines (for testing purpose that also
works on one machine with two elogd servers running on different ports). First, make sure that
the elogd.cfg files are identical (except the port setting if you run two servers on the same
To set-up mirroring, install two elogd servers on two machines (for testing purpose that also
works on one machine with two elogd servers running on different ports). This can be done in
two ways:
<OL>
<LI><b>Automatic configuration</b><p>
A complete elog server can be transferred to a secondary server using the <code><b>clone</b></code>
command. Assume the existing server resides at <code><b>http://master.your.domain/</b></code>,
and you want to mirror this server to a new location at <code><b>http://slave.your.domain/</b></code>.
You do that by installing the elog package at the slave machine, and then executing on the slave:<p>
<pre>elogd -C http://master.your.domain</pre><p>
This command tells elogd to retrieve the configuration file, and optionally all logbook entries
and password files from the master machine. Note that both servers must be version 2.5.4 or later.
In case of trouble, you can turn on verbose messaging:<p>
<pre>elogd -v -C http://master.your.domain</pre><p>
which could give some hints. If a logbook on the master server uses restricted access, you have
to specify the admin user name and password. After everything has been transferred, you can start
elogd in the normal way.
<LI><b>Manual configuration</b><p>
First, copy the elogd.cfg file from the master to the slave server. Make sure that
the files are identical (except the port setting if you run two servers on the same
machine). Then, add the following configuration options. They should be put
into the [global] section of the cofiguration file:<p>
@@ -1765,56 +1798,13 @@ A typical statement looks like:<br><br>
The URL should not contain any logbook name, this gets added automatically. The second
example contains a subdirectory, which is typically used if the elogd daemon runs
under an Apache proxy. If this statement is present in the configuration file, a new
menu option <b><code>"Synchronize"</code></b> appears on the elog page. Clicking on
this menu options starts the synchronization:<br><br>
<img src="sync.gif"><br><br>
On the left side one sees the entry ID's. Entries which are equal locally and remotely
are not displayed. Here are the rules for synchronization:<br><br>
<UL>
<LI> If an entry has been modified locally but not remotely, it is submitted to the remote
server.
<LI> If an entry has been modified remotely but not locally, it is retrieved from the
remote server and saved locally.
<LI> If an entry has been modified remotely and locally since the last synchronization,
an error is shown that the entries are conflicting. In that case one has to merge
the entries manually and delete it on one side.
<LI> If an entry has been deleted locally, it is deleted remotely.
<LI> If an entry has been deleted remotely, it is deleted locally.
<LI> If a new entry exists locally, it is submitted.
<LI> If a new entry exists remotely, it is retrieved from the remote server and
saved locally.
<LI> If new entries exist locally and remotely having the same entry ID, the local
entries are changed to have higher entry IDs, then the remote ones are retrieved. Care
should be taken if external links (such as <b><code>elog:123</code></b>) to the
local entries are used, since they will point afterwards to the wrong entry.
</UL><br><br>
By starting the synchronization on one elogd server, this server becomes the client
and the other one becomes the server. This means that the local server actively compares
the local and the remote messages, and updates one or the other if necessary.
The other (remote) server does not need to have any mirror option in its configuration
file, since the local server simulates a web browser to send and retrieve messages to
the remote server. It is however allowed that the remote server also contains some
mirror settings in the configuration file, this way the synchronization can be
started from both servers.<p>
under an Apache proxy.<p>
<li><b><code>Mirror config = 0 | 1</code></b><br><br>
Normally, only the logbook entries are mirrored. One can also mirror the contents
of the elogd.cfg configuration file for individual logbooks. This can be turned on
by setting this option to <b><code>1</code></b>. Default is <b><code>1</code></b>.
by setting this option to <b><code>1</code></b>. Default is <b><code>0</code></b>.
Only the individual logbook section is mirrored, not the [global] section. Settings
which are specific to one server, for example the <b><code>URL = </code></b> statement,
should then be kept in the [global] section, so that they are not mirrored between
@@ -1866,7 +1856,52 @@ During synchronization, entries are compared and necessary transfers are display
but not executed. Default is <b><code>0</code></b>.
</UL>
</OL><p>
If the statement <b><code>Mirror server</b></code> is present in the configuration file, a new
menu option <b><code>"Synchronize"</code></b> appears on the elog page. Clicking on
this menu options starts the synchronization:<br><br>
<img src="sync.gif"><br><br>
On the left side one sees the entry ID's. Entries which are equal locally and remotely
are not displayed. Here are the rules for synchronization:<br><br>
<UL>
<LI> If an entry has been modified locally but not remotely, it is submitted to the remote
server.
<LI> If an entry has been modified remotely but not locally, it is retrieved from the
remote server and saved locally.
<LI> If an entry has been modified remotely and locally since the last synchronization,
an error is shown that the entries are conflicting. In that case one has to merge
the entries manually and delete it on one side.
<LI> If an entry has been deleted locally, it is deleted remotely.
<LI> If an entry has been deleted remotely, it is deleted locally.
<LI> If a new entry exists locally, it is submitted.
<LI> If a new entry exists remotely, it is retrieved from the remote server and
saved locally.
<LI> If new entries exist locally and remotely having the same entry ID, the local
entries are changed to have higher entry IDs, then the remote ones are retrieved. Care
should be taken if external links (such as <b><code>elog:123</code></b>) to the
local entries are used, since they will point afterwards to the wrong entry.
</UL><p>
By starting the synchronization on one elogd server, this server becomes the client
and the other one becomes the server. This means that the local server actively compares
the local and the remote messages, and updates one or the other if necessary.
The other (remote) server does not need to have any mirror option in its configuration
file, since the local server simulates a web browser to send and retrieve messages to
the remote server. It is however allowed that the remote server also contains some
mirror settings in the configuration file, this way the synchronization can be
started from both servers.<p>
<HR>
+1 -1
View File
@@ -32,7 +32,7 @@
&nbsp;[<a class=nav href="#links">Links</a>]&nbsp;
*&nbsp;</div>
<P class=Sub>Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt&#64;psi.ch">Stefan Ritt</a></P>
<div class=version>&nbsp; Current version is : 2.5.3 &nbsp;</div>
<div class=version>&nbsp; Current version is : 2.5.4 &nbsp;</div>
<hr><a name="whatis">
<div class=section>&nbsp; What is ELOG ? &nbsp;</div>
+33
View File
@@ -300,3 +300,36 @@ Fill text body =
Please re-enter filename =
Last x =
Activate =
Entry has been modified =
No attachment file specified =
Submit modified ELOG entry? =
Delete this logbook =
Rename this logbook =
Create new logbook =
Syntax error in config file =
Email notification =
Are you sure to delete logbook "%s"? =
Logbook "%s" exists already, please choose different name =
Rename logbook =
Enter new logbook name =
Logbook name =
Use existing logbook as template =
none =
URL is redirected to: =
Remote config should be received =
Local entry should be submitted =
Remote entry should be received =
Local entry =
%s should be deleted =
Entry should be deleted locally =
Local entry ID should be changed to %d =
Remote entry =
Entry should be deleted remotely =
Click here to delete %s entries =
Click here to delete this entry =
Maximum number of attribute options exceeded =
Please increase MAX_N_LIST in elogd.c and recompile =
You can "steal" the lock by editing this entry =
Several logbooks groups are defined on this host =
Please select one to list the logbooks in that group =
No logbook defined on this server =
+33
View File
@@ -300,3 +300,36 @@ Please re-enter filename =
New =
Last x =
Activate =
Entry has been modified =
No attachment file specified =
Submit modified ELOG entry? =
Delete this logbook =
Rename this logbook =
Create new logbook =
Syntax error in config file =
Email notification =
Are you sure to delete logbook "%s"? =
Logbook "%s" exists already, please choose different name =
Rename logbook =
Enter new logbook name =
Logbook name =
Use existing logbook as template =
none =
URL is redirected to: =
Remote config should be received =
Local entry should be submitted =
Remote entry should be received =
Local entry =
%s should be deleted =
Entry should be deleted locally =
Local entry ID should be changed to %d =
Remote entry =
Entry should be deleted remotely =
Click here to delete %s entries =
Click here to delete this entry =
Maximum number of attribute options exceeded =
Please increase MAX_N_LIST in elogd.c and recompile =
You can "steal" the lock by editing this entry =
Several logbooks groups are defined on this host =
Please select one to list the logbooks in that group =
No logbook defined on this server =
+37
View File
@@ -299,3 +299,40 @@ Please re-enter filename = Geef bestandsnaam opnieuw op
Last x = Laatste x
text =tekst
Activate = Activeer
#
#---- please translate following items and then remove this comment ----#
#
Entry has been modified =
No attachment file specified =
Submit modified ELOG entry? =
Delete this logbook =
Rename this logbook =
Create new logbook =
Syntax error in config file =
Email notification =
Are you sure to delete logbook "%s"? =
Logbook "%s" exists already, please choose different name =
Rename logbook =
Enter new logbook name =
Logbook name =
Use existing logbook as template =
none =
URL is redirected to: =
Remote config should be received =
Local entry should be submitted =
Remote entry should be received =
Local entry =
%s should be deleted =
Entry should be deleted locally =
Local entry ID should be changed to %d =
Remote entry =
Entry should be deleted remotely =
Click here to delete %s entries =
Click here to delete this entry =
Maximum number of attribute options exceeded =
Please increase MAX_N_LIST in elogd.c and recompile =
You can "steal" the lock by editing this entry =
Several logbooks groups are defined on this host =
Please select one to list the logbooks in that group =
No logbook defined on this server =
+37
View File
@@ -296,3 +296,40 @@ Fill text body = Remplir le champ texte
Please re-enter filename = Veuillez re-saisir le nom du fichier
Last x = x derniers
Activate = Activer
#
#---- please translate following items and then remove this comment ----#
#
Entry has been modified =
No attachment file specified =
Submit modified ELOG entry? =
Delete this logbook =
Rename this logbook =
Create new logbook =
Syntax error in config file =
Email notification =
Are you sure to delete logbook "%s"? =
Logbook "%s" exists already, please choose different name =
Rename logbook =
Enter new logbook name =
Logbook name =
Use existing logbook as template =
none =
URL is redirected to: =
Remote config should be received =
Local entry should be submitted =
Remote entry should be received =
Local entry =
%s should be deleted =
Entry should be deleted locally =
Local entry ID should be changed to %d =
Remote entry =
Entry should be deleted remotely =
Click here to delete %s entries =
Click here to delete this entry =
Maximum number of attribute options exceeded =
Please increase MAX_N_LIST in elogd.c and recompile =
You can "steal" the lock by editing this entry =
Several logbooks groups are defined on this host =
Please select one to list the logbooks in that group =
No logbook defined on this server =
+34
View File
@@ -295,3 +295,37 @@ Fill text body = Haupttext importieren
Please re-enter filename = Bitte Dateinamen erneut eingeben
Last x = Letzte x
Activate = Aktivieren
Entry has been modified = Eintrag wurde verändert
No attachment file specified = Es wurde kein Anhang angegeben
Submit modified ELOG entry? = Geänderter Eintrag abschicken?
Delete this logbook = Dieses Logbuch löschen
Rename this logbook = Dieses Logbuch umbenennen
Create new logbook = Neues Logbuch anlegen
Syntax error in config file = Syntax-Fehler in Konfigurationsdatei
Email notification = Email Benachrichtigung
Are you sure to delete logbook "%s"? = Logbuch "%s" wirklich löschen?
Logbook "%s" exists already, please choose different name = Logbuch "%s" existiert bereits, bitte anderen Namen wählen
Rename logbook = Logbuch umbenennen
Enter new logbook name = Bitte neuen Logbuchnamen eingeben
Logbook name = Logbuchname
Use existing logbook as template = Vorhandenes Logbuch als Vorlage benutzen
none = keines
URL is redirected to: = URL wird umgeleitet zu:
Remote config should be received = Fremde Konfiguration sollte empfangen werden
Local entry should be submitted = Lokaler Eintrag sollte gesendet werden
Remote entry should be received = Fremder Eintrag sollte empfangen werden
Local entry = Lokaler Eintrag
%s should be deleted = %s sollte gelöscht werden
Entry should be deleted locally = Eintrag sollte lokal gelöscht werden
Local entry ID should be changed to %d = ID von lokalem Eintrag sollte zu %d geändert werden
Remote entry = Fremder Eintrag
Entry should be deleted remotely = Fremder Eintrag sollte gelöscht werden
Click here to delete %s entries = Hier klicken um %s Einträge zu löschen
Click here to delete this entry = Hier klicken um diesen Eintrag zu löschen
Maximum number of attribute options exceeded = Maximal Anzal von Attributen wurde überschritten
Please increase MAX_N_LIST in elogd.c and recompile = Bitte MAX_N_LIST in elogd.c erhöhen und neu kompilieren
You can "steal" the lock by editing this entry = Diese Sperre kann "gestohlen" werden durch bearbeiten dieses Eintrags
Several logbooks groups are defined on this host = Mehrere Logbuch-Gruppen sind auf diesem Computer eingerichtet
Please select one to list the logbooks in that group = Bitte eine auswählen, um die Logbücher in dieser Gruppe anzuzeigen
No logbook defined on this server = Auf diesem Computer ist kein Logbuch eingerichtet
+33
View File
@@ -299,3 +299,36 @@ Fill text body =
Please re-enter filename =
Last x =
Activate =
Entry has been modified =
No attachment file specified =
Submit modified ELOG entry? =
Delete this logbook =
Rename this logbook =
Create new logbook =
Syntax error in config file =
Email notification =
Are you sure to delete logbook "%s"? =
Logbook "%s" exists already, please choose different name =
Rename logbook =
Enter new logbook name =
Logbook name =
Use existing logbook as template =
none =
URL is redirected to: =
Remote config should be received =
Local entry should be submitted =
Remote entry should be received =
Local entry =
%s should be deleted =
Entry should be deleted locally =
Local entry ID should be changed to %d =
Remote entry =
Entry should be deleted remotely =
Click here to delete %s entries =
Click here to delete this entry =
Maximum number of attribute options exceeded =
Please increase MAX_N_LIST in elogd.c and recompile =
You can "steal" the lock by editing this entry =
Several logbooks groups are defined on this host =
Please select one to list the logbooks in that group =
No logbook defined on this server =
+33
View File
@@ -298,3 +298,36 @@ Fill text body =
Please re-enter filename =
Last x =
Activate =
Entry has been modified =
No attachment file specified =
Submit modified ELOG entry? =
Delete this logbook =
Rename this logbook =
Create new logbook =
Syntax error in config file =
Email notification =
Are you sure to delete logbook "%s"? =
Logbook "%s" exists already, please choose different name =
Rename logbook =
Enter new logbook name =
Logbook name =
Use existing logbook as template =
none =
URL is redirected to: =
Remote config should be received =
Local entry should be submitted =
Remote entry should be received =
Local entry =
%s should be deleted =
Entry should be deleted locally =
Local entry ID should be changed to %d =
Remote entry =
Entry should be deleted remotely =
Click here to delete %s entries =
Click here to delete this entry =
Maximum number of attribute options exceeded =
Please increase MAX_N_LIST in elogd.c and recompile =
You can "steal" the lock by editing this entry =
Several logbooks groups are defined on this host =
Please select one to list the logbooks in that group =
No logbook defined on this server =
+33
View File
@@ -296,3 +296,36 @@ Fill text body =
Please re-enter filename =
Last x =
Activate =
Entry has been modified =
No attachment file specified =
Submit modified ELOG entry? =
Delete this logbook =
Rename this logbook =
Create new logbook =
Syntax error in config file =
Email notification =
Are you sure to delete logbook "%s"? =
Logbook "%s" exists already, please choose different name =
Rename logbook =
Enter new logbook name =
Logbook name =
Use existing logbook as template =
none =
URL is redirected to: =
Remote config should be received =
Local entry should be submitted =
Remote entry should be received =
Local entry =
%s should be deleted =
Entry should be deleted locally =
Local entry ID should be changed to %d =
Remote entry =
Entry should be deleted remotely =
Click here to delete %s entries =
Click here to delete this entry =
Maximum number of attribute options exceeded =
Please increase MAX_N_LIST in elogd.c and recompile =
You can "steal" the lock by editing this entry =
Several logbooks groups are defined on this host =
Please select one to list the logbooks in that group =
No logbook defined on this server =