mirror of
https://gitea.psi.ch/ELOG/elog.git
synced 2026-09-12 19:33:03 +00:00
Release 2.7.4
SVN revision: 2111
This commit is contained in:
parent
949c9a1057
commit
fa411b75ed
2
Makefile
2
Makefile
@ -22,7 +22,7 @@ SDESTDIR = $(ROOT)$(PREFIX)/sbin
|
|||||||
RCDIR = $(ROOT)/etc/rc.d/init.d
|
RCDIR = $(ROOT)/etc/rc.d/init.d
|
||||||
|
|
||||||
# flag for SSL support
|
# flag for SSL support
|
||||||
#USE_SSL = 1
|
USE_SSL = 1
|
||||||
|
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,27 @@
|
|||||||
|
Version 2.7.4, released June 9th, 2008
|
||||||
|
======================================
|
||||||
|
|
||||||
|
- Fixed 'next day' in quick filter with 'date' attributes not showing up correctly
|
||||||
|
- Fixed 'preview attachments' with images
|
||||||
|
- Made '$entry date' subsitutions work with datetime attributes
|
||||||
|
- Replaced 'install -D' by 'mkdir -p' (flag not recognized on some systems)
|
||||||
|
- Implemented conditional attributes in find form
|
||||||
|
- Fixed 'preset text' under condition with top groups
|
||||||
|
- Show localized date on edit form
|
||||||
|
- Added SSL libs for elog
|
||||||
|
- Show nuber of attachments in summary view if >5
|
||||||
|
- Stealing of lock now works in other languages
|
||||||
|
- Display attachment icon with "thread display"
|
||||||
|
- Implemented attachment icons in summary/threaded list
|
||||||
|
- Implemented 'style <attribute> <value> = ...'
|
||||||
|
- Added -%d argument for all conversions
|
||||||
|
- Fixed problem with auto index and missing attribute
|
||||||
|
- Added timezone for CYGWIN
|
||||||
|
- Calculate index for automatically incremented preset attributes by searching all old messages for the highest used index
|
||||||
|
- Fixed display of inline images and truncated ASCII attachments in list mode
|
||||||
|
- Made 'ID' work for quick filter
|
||||||
|
- Implemented 'attachment lines'
|
||||||
|
|
||||||
Version 2.7.3, released Feb. 22th, 2008
|
Version 2.7.3, released Feb. 22th, 2008
|
||||||
=======================================
|
=======================================
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,7 @@
|
|||||||
[<a class="nav" href="#links">Links</a>] * </div>
|
[<a class="nav" href="#links">Links</a>] * </div>
|
||||||
<P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt@psi.ch">
|
<P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt@psi.ch">
|
||||||
Stefan Ritt</a></P>
|
Stefan Ritt</a></P>
|
||||||
<div class="version">Current version is : 2.7.3</div>
|
<div class="version">Current version is : 2.7.4</div>
|
||||||
<center>
|
<center>
|
||||||
<a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
|
<a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
|
||||||
</center>
|
</center>
|
||||||
|
|||||||
@ -464,3 +464,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -464,3 +464,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -462,3 +462,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -462,3 +462,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -461,3 +461,10 @@ Rotate right = Rechts draaien
|
|||||||
Delete attachment = Verwijder bijlage
|
Delete attachment = Verwijder bijlage
|
||||||
Cannot create thumbnail, please check ImageMagick installation = Kan geen voorbeeld maken, controleer de ImageMagick installatie
|
Cannot create thumbnail, please check ImageMagick installation = Kan geen voorbeeld maken, controleer de ImageMagick installatie
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
#---- please translate following items and then remove this comment ----#
|
||||||
|
#
|
||||||
|
Please log on by clicking on following link and change your password =
|
||||||
|
Attachments =
|
||||||
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
|||||||
@ -462,3 +462,6 @@ Rotate left = Rotation
|
|||||||
Rotate right = Rotation à droite
|
Rotate right = Rotation à droite
|
||||||
Delete attachment = Supprimer la pièce jointe
|
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
|
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 =
|
||||||
|
Attachments =
|
||||||
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
|||||||
@ -457,3 +457,6 @@ Rotate left = Links rotieren
|
|||||||
Rotate right = Rechts rotieren
|
Rotate right = Rechts rotieren
|
||||||
Delete attachment = Anhang löschen
|
Delete attachment = Anhang löschen
|
||||||
Cannot create thumbnail, please check ImageMagick installation = Kann Vorschau nicht erstellen, bitte ImageMagick Installation überprüfen
|
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 durck 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)
|
||||||
|
|||||||
@ -460,3 +460,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -460,3 +460,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -465,3 +465,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -458,3 +458,10 @@ Rotate left = Girar a la izquierda
|
|||||||
Rotate right = Girar a la derecha
|
Rotate right = Girar a la derecha
|
||||||
Delete attachment = Borrar adjunto
|
Delete attachment = Borrar adjunto
|
||||||
Cannot create thumbnail, please check ImageMagick installation = No se puede crear thumbnail, por favor verifique la instalacion de ImageMagick
|
Cannot create thumbnail, please check ImageMagick installation = No se puede crear thumbnail, por favor verifique la instalacion de ImageMagick
|
||||||
|
|
||||||
|
#
|
||||||
|
#---- please translate following items and then remove this comment ----#
|
||||||
|
#
|
||||||
|
Please log on by clicking on following link and change your password =
|
||||||
|
Attachments =
|
||||||
|
Error: Content length (%d) larger than maximum content length (%d) =
|
||||||
|
|||||||
@ -468,3 +468,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -464,3 +464,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -463,3 +463,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
@ -463,3 +463,6 @@ Rotate left =
|
|||||||
Rotate right =
|
Rotate right =
|
||||||
Delete attachment =
|
Delete attachment =
|
||||||
Cannot create thumbnail, please check ImageMagick installation =
|
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) =
|
||||||
|
|||||||
26
src/elog.c
26
src/elog.c
@ -326,7 +326,7 @@ int elog_connect(char *host, int port)
|
|||||||
/*------------------------------------------------------------------*/
|
/*------------------------------------------------------------------*/
|
||||||
|
|
||||||
#ifdef HAVE_SSL
|
#ifdef HAVE_SSL
|
||||||
int ssl_connect(int sock, SSL **ssl_con)
|
int ssl_connect(int sock, SSL ** ssl_con)
|
||||||
{
|
{
|
||||||
SSL_METHOD *meth;
|
SSL_METHOD *meth;
|
||||||
SSL_CTX *ctx;
|
SSL_CTX *ctx;
|
||||||
@ -383,7 +383,7 @@ INT retrieve_elog(char *host, int port, char *subdir, int ssl, char *experiment,
|
|||||||
SSL *ssl_con;
|
SSL *ssl_con;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (ssl) /* avoid compiler warning */
|
if (ssl) /* avoid compiler warning */
|
||||||
sock = 0;
|
sock = 0;
|
||||||
|
|
||||||
sock = elog_connect(host, port);
|
sock = elog_connect(host, port);
|
||||||
@ -449,7 +449,7 @@ INT retrieve_elog(char *host, int port, char *subdir, int ssl, char *experiment,
|
|||||||
SSL_write(ssl_con, request, strlen(request));
|
SSL_write(ssl_con, request, strlen(request));
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
send(sock, request, strlen(request), 0);
|
send(sock, request, strlen(request), 0);
|
||||||
if (verbose) {
|
if (verbose) {
|
||||||
printf("Request sent to host:\n");
|
printf("Request sent to host:\n");
|
||||||
puts(request);
|
puts(request);
|
||||||
@ -459,10 +459,10 @@ INT retrieve_elog(char *host, int port, char *subdir, int ssl, char *experiment,
|
|||||||
memset(response, 0, sizeof(response));
|
memset(response, 0, sizeof(response));
|
||||||
#ifdef HAVE_SSL
|
#ifdef HAVE_SSL
|
||||||
if (ssl)
|
if (ssl)
|
||||||
i = SSL_read(ssl_con, response, sizeof(response)-1);
|
i = SSL_read(ssl_con, response, sizeof(response) - 1);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
i = recv(sock, response, sizeof(response)-1, 0);
|
i = recv(sock, response, sizeof(response) - 1, 0);
|
||||||
if (i < 0) {
|
if (i < 0) {
|
||||||
perror("Cannot receive response");
|
perror("Cannot receive response");
|
||||||
return -1;
|
return -1;
|
||||||
@ -472,10 +472,10 @@ INT retrieve_elog(char *host, int port, char *subdir, int ssl, char *experiment,
|
|||||||
while (i > 0) {
|
while (i > 0) {
|
||||||
#ifdef HAVE_SSL
|
#ifdef HAVE_SSL
|
||||||
if (ssl)
|
if (ssl)
|
||||||
i = SSL_read(ssl_con, response + n, sizeof(response)-1-n);
|
i = SSL_read(ssl_con, response + n, sizeof(response) - 1 - n);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
i = recv(sock, response + n, sizeof(response)-1-n, 0);
|
i = recv(sock, response + n, sizeof(response) - 1 - n, 0);
|
||||||
if (i > 0)
|
if (i > 0)
|
||||||
n += i;
|
n += i;
|
||||||
}
|
}
|
||||||
@ -899,7 +899,7 @@ INT submit_elog(char *host, int port, int ssl, char *subdir, char *experiment,
|
|||||||
SSL_write(ssl_con, request, header_length);
|
SSL_write(ssl_con, request, header_length);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
send(sock, request, header_length, 0);
|
send(sock, request, header_length, 0);
|
||||||
if (verbose) {
|
if (verbose) {
|
||||||
printf("Request sent to host:\n");
|
printf("Request sent to host:\n");
|
||||||
puts(request);
|
puts(request);
|
||||||
@ -911,7 +911,7 @@ INT submit_elog(char *host, int port, int ssl, char *subdir, char *experiment,
|
|||||||
SSL_write(ssl_con, content, content_length);
|
SSL_write(ssl_con, content, content_length);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
send(sock, content, content_length, 0);
|
send(sock, content, content_length, 0);
|
||||||
if (verbose) {
|
if (verbose) {
|
||||||
printf("Content sent to host:\n");
|
printf("Content sent to host:\n");
|
||||||
puts(content);
|
puts(content);
|
||||||
@ -921,10 +921,10 @@ INT submit_elog(char *host, int port, int ssl, char *subdir, char *experiment,
|
|||||||
memset(response, 0, sizeof(response));
|
memset(response, 0, sizeof(response));
|
||||||
#ifdef HAVE_SSL
|
#ifdef HAVE_SSL
|
||||||
if (ssl)
|
if (ssl)
|
||||||
i = SSL_read(ssl_con, response, sizeof(response)-1);
|
i = SSL_read(ssl_con, response, sizeof(response) - 1);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
i = recv(sock, response, sizeof(response)-1, 0);
|
i = recv(sock, response, sizeof(response) - 1, 0);
|
||||||
if (i < 0) {
|
if (i < 0) {
|
||||||
perror("Cannot receive response");
|
perror("Cannot receive response");
|
||||||
return -1;
|
return -1;
|
||||||
@ -935,10 +935,10 @@ INT submit_elog(char *host, int port, int ssl, char *subdir, char *experiment,
|
|||||||
while (i > 0) {
|
while (i > 0) {
|
||||||
#ifdef HAVE_SSL
|
#ifdef HAVE_SSL
|
||||||
if (ssl)
|
if (ssl)
|
||||||
i = SSL_read(ssl_con, response + n, sizeof(response)-1-n);
|
i = SSL_read(ssl_con, response + n, sizeof(response) - 1 - n);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
i = recv(sock, response + n, sizeof(response)-1-n, 0);
|
i = recv(sock, response + n, sizeof(response) - 1 - n, 0);
|
||||||
if (i > 0)
|
if (i > 0)
|
||||||
n += i;
|
n += i;
|
||||||
}
|
}
|
||||||
|
|||||||
3044
src/elogd.c
3044
src/elogd.c
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user