| ID |
Date |
Icon |
Author |
Author Email |
Category |
OS |
ELOG Version |
Subject |
|
67546
|
Thu Jul 4 15:27:13 2013 |
 | Andreas Luedeke | andreas.luedeke@psi.ch | Bug fix | All | 2.9.2-2481 | Re: Export entries to XLS or CSV? |
| Jim Tinlin wrote: |
|
| Stefan Ritt wrote: |
|
| Andreas Luedeke wrote: |
|
Yes, you're right: the text field is only exported in XML and Raw mode.
It is questionable how EXCEL should cope with HTML or ELCode output from the text fields.
But I admit that this would be a useful feature for logbooks that only use plain text entries. And it is simple to implement.
I've attached a patch to elogd.c from elog-2.9.2-2081 that adds a third CVS mode 'CSV (";" separated) + Text'.
(This string has not yet been added to the localization.)
As far as I've tested it works fine to import the text to OpenOffice and EXCEL, even with multiple text lines and HTML code in the text.
Of course the spreadsheet programs just display the HTML source.
Stefan, do you think this should be added to the official branch?
 ⇄
Detect language » English
⇄
Detect language » English
|
Hi Jim, can you confirm that this works for you? If so, I'm willing to incorporate the patch into the distribution.
|
Has this been added yet?
I don't have the means to create an executable for Windows, if someone does I can give it a try...it sounds/looks like it will work.
Thanks!
|
Hi Jim, I've incorporated the patch to our production server about a week ago.
I've agreed with Stefan that he'll add it, when it proved to run stable for a while.
Until now it appears to work fine. I think Stefan will add it to the distribution soon.
But I won't touch any Windows systems, you'll need to wait for someone else to compile it for you.
Maybe some skilled Windows user want to give it a try: i've attached the changes in the elogd.c file from v2.9.2-2481,
the modified file can be currently downloaded from http://people.web.psi.ch/luedeke/public/tmp/elogd.c
⇄
Detect language » English
Andreas
⇄
Detect language » English
⇄
Detect language » English
⇄
Detect language » English
|
| Attachment 1: elog-2.9.2-2481_cvs3patch.diff
|
11597c11597
< rsprintf("<tr><td class=\"form1\"><table><tr><td valign=\"top\" class=\"form1\">\n");
---
> rsprintf("<tr><td class=\"form1\">\n");
11599c11599
< rsprintf("<b>%s:</b>
", loc("Mode"));
---
> rsprintf("<b>%s:</b> ", loc("Mode"));
11609c11609
< rsprintf("<label for=\"full\">%s </label>
\n", loc("Display full entries"));
---
> rsprintf("<label for=\"full\">%s </label>\n", loc("Display full entries"));
11615c11615
< rsprintf("<label for=\"summary\">%s </label>
\n", loc("Summary only"));
---
> rsprintf("<label for=\"summary\">%s </label>\n", loc("Summary only"));
11622c11622
< rsprintf("<label for=\"summary\">%s </label>
\n", loc("Summary"));
---
> rsprintf("<label for=\"summary\">%s </label>\n", loc("Summary"));
11631c11631
< rsprintf("</td><td valign=\"top\" class=\"form1\"><b>%s:</b>
", loc("Export to"));
---
> rsprintf("<b>%s:</b> ", loc("Export to"));
11637c11637
< rsprintf("<label for=\"CSV1\">%s </label>
\n", loc("CSV (\",\" separated)"));
---
> rsprintf("<label for=\"CSV1\">%s </label>\n", loc("CSV (\",\" separated)"));
11643,11649c11643
< rsprintf("<label for=\"CSV2\">%s </label>
\n", loc("CSV (\";\" separated)"));
<
< if (strieq(mode, "CSV3"))
< rsprintf("<input type=radio id=\"CSV3\" name=\"mode\" value=\"CSV3\" checked>");
< else
< rsprintf("<input type=radio id=\"CSV3\" name=\"mode\" value=\"CSV3\">");
< rsprintf("<label for=\"CSV3\">%s </label>
\n", loc("CSV (\";\" separated) + Text"));
---
> rsprintf("<label for=\"CSV2\">%s </label>\n", loc("CSV (\";\" separated)"));
11655c11649
< rsprintf("<label for=\"XML\">XML </label>
\n");
---
> rsprintf("<label for=\"XML\">XML </label>\n");
11661c11655
< rsprintf("<label for=\"Raw\">Raw </label>
\n");
---
> rsprintf("<label for=\"Raw\">Raw </label>\n");
11663c11657
< rsprintf("</td>\n");
---
> rsprintf("</td></tr>\n");
11665c11659
< rsprintf("<td valign=\"top\" class=\"form2\"><b>%s:</b>
", loc("Options"));
---
> rsprintf("<tr><td class=\"form2\"><b>%s:</b>
", loc("Options"));
11707c11701
< rsprintf("</td></tr></table></td></tr>\n");
---
> rsprintf("</td></tr>\n");
19535c19529
< csv = strieq(mode, "CSV1") || strieq(mode, "CSV2") || strieq(mode, "CSV3");
---
> csv = strieq(mode, "CSV1") || strieq(mode, "CSV2");
20266,20268c20260
< } else {
< if (strieq(mode, "CSV3"))
< rsprintf(";\"Text\"");
---
> } else
20270d20261
< }
20973,20987c20964
< } else {
< if (strlen(text)>0 && strieq(mode, "CSV3")) {
< rsprintf(";");
< strlcpy(str, text, sizeof(str));
< rsputs("\"");
< pt1 = str;
< while ((pt2 = strchr(pt1, '"')) != NULL) {
< *pt2 = 0;
< rsputs(pt1);
< rsputs("\"\"");
< pt1 = pt2 + 1;
< }
< rsputs(pt1);
< rsputs("\"");
< }
---
> } else
20989d20965
< }
|
|
67667
|
Fri Feb 21 13:25:55 2014 |
| Stefan Ritt | stefan.ritt@psi.ch | Bug fix | All | 2.9.2-2481 | Re: Export entries to XLS or CSV? |
| Andreas Luedeke wrote: |
|
| Jim Tinlin wrote: |
|
| Stefan Ritt wrote: |
|
| Andreas Luedeke wrote: |
|
Yes, you're right: the text field is only exported in XML and Raw mode.
It is questionable how EXCEL should cope with HTML or ELCode output from the text fields.
But I admit that this would be a useful feature for logbooks that only use plain text entries. And it is simple to implement.
I've attached a patch to elogd.c from elog-2.9.2-2081 that adds a third CVS mode 'CSV (";" separated) + Text'.
(This string has not yet been added to the localization.)
As far as I've tested it works fine to import the text to OpenOffice and EXCEL, even with multiple text lines and HTML code in the text.
Of course the spreadsheet programs just display the HTML source.
Stefan, do you think this should be added to the official branch?
⇄
Detect language » English
⇄
Detect language » English
|
Hi Jim, can you confirm that this works for you? If so, I'm willing to incorporate the patch into the distribution.
|
Has this been added yet?
I don't have the means to create an executable for Windows, if someone does I can give it a try...it sounds/looks like it will work.
Thanks!
|
Hi Jim, I've incorporated the patch to our production server about a week ago.
I've agreed with Stefan that he'll add it, when it proved to run stable for a while.
Until now it appears to work fine. I think Stefan will add it to the distribution soon.
But I won't touch any Windows systems, you'll need to wait for someone else to compile it for you.
Maybe some skilled Windows user want to give it a try: i've attached the changes in the elogd.c file from v2.9.2-2481,
the modified file can be currently downloaded from http://people.web.psi.ch/luedeke/public/tmp/elogd.c
⇄
Detect language » English
Andreas
⇄
Detect language » English
⇄
Detect language » English
⇄
Detect language » English
|
This patch is now officially in the GIT repository. |
|
67709
|
Fri Oct 24 12:51:00 2014 |
 | Stefan Ritt | stefan.ritt@psi.ch | Bug fix | All | ALL | POODLE vulnerability | IMPORTANT SECURITY ANNOUNCEMENT
Recently the POODLE vulnerability has been announced: http://en.wikipedia.org/wiki/POODLE
ELOG is prone to this vulnerability if it runs directly the SSL protocol and can be accessed from the internet. If ELOG runs behind an Apache proxy, and the Apache server has been correctly configured (disabled the SSLv23 protocols), ELOG is safe as well.
To fix this vulnerability, ELOG needs to be recompiled after the attached patch has been applied. This prohibits ELOG to fallback to the insecure SSLv2 & v3 protocols and only use the safe TLSv1 protocol.
If you do not know how to recompile ELOG, please do not run ELOG directly accessible from the internet until the next binary release has been published.
/Stefan Ritt |
| Attachment 1: elogd.patch
|
diff --git a/src/elogd.c b/src/elogd.c
index fac34f8..13c619f 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -2342,7 +2342,7 @@ int ssl_connect(int sock, SSL ** ssl_con)
SSL_library_init();
SSL_load_error_strings();
- meth = (SSL_METHOD *) SSLv23_method();
+ meth = (SSL_METHOD *) TLSv1_method();
ctx = SSL_CTX_new(meth);
*ssl_con = SSL_new(ctx);
@@ -28902,7 +28902,7 @@ SSL_CTX *init_ssl(void)
SSL_library_init();
SSL_load_error_strings();
- meth = (SSL_METHOD *) SSLv23_method();
+ meth = (SSL_METHOD *) TLSv1_method();
ctx = SSL_CTX_new(meth);
if (getcfg("global", "SSL Passphrase", pwd, sizeof(pwd))) {
|
|
67884
|
Wed May 6 15:13:11 2015 |
| Christof Hanke | hanke@rzg.mpg.de | Bug fix | All | 3.1.0 | parse a correctly the username in save_user_config when using Webserver authentication | Hi Stefan,
When we use Webserver authentication, we have the correct username already in the variable http_user.
The old way of copying this http_user to "user" is wrong since we don't use the size of http_user.
Instead, just encode the http_user variable directly.
See attached patch against git HEAD.
Christof
|
| Attachment 1: parse_http_user_correctly.patch
|
diff --git a/src/elogd.c b/src/elogd.c
index 601639c..de4734b 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -13142,12 +13142,13 @@ int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user)
/* if we outsourced the authentication, use external username */
getcfg(lbs->name, "Authentication", str, sizeof(str));
- if ( stristr(str, "Webserver")) {
- strlcpy(user, http_user, sizeof(user));
- }
/* do not allow HTML in user name */
- strencode2(user_enc, user, sizeof(user_enc));
+ if ( stristr(str, "Webserver")) {
+ strencode2(user_enc, http_user, sizeof(user_enc));
+ } else {
+ strencode2(user_enc, user, sizeof(user_enc));
+ }
/* check for user name */
if (!isparam("new_user_name") || *getparam("new_user_name") == 0) {
|
|
67976
|
Tue Jun 9 15:44:49 2015 |
| Stefan Ritt | stefan.ritt@psi.ch | Bug fix | All | 3.1.0 | Re: parse a correctly the username in save_user_config when using Webserver authentication | Hi Christof,
thanks for the patch, I merged it into the current HEAD.
/Stefan
| Christof Hanke wrote: |
|
Hi Stefan,
When we use Webserver authentication, we have the correct username already in the variable http_user.
The old way of copying this http_user to "user" is wrong since we don't use the size of http_user.
Instead, just encode the http_user variable directly.
See attached patch against git HEAD.
Christof
|
|
|
68102
|
Fri Aug 28 21:01:42 2015 |
 | Daniel Sajdyk | daniel.sajdyk@gmail.com | Bug fix | Windows | V3.1.1-3f311c5 | Draft saved is treated as an entry edit | Hello.
In Elog i have attribute called "Zmieniano" (eng. changed) which should store how many times entry was edited. If entry was not edited it should have only preset value "oryginalny wpis" (eng. oryginal entry), but when I edit it, it should have also date, time, and person who make edit (this is made by "Subst on Edit Zmieniano = $Zmieniano<br>- Zmiana $date przez $long_name z $remote_host)".
From version V3.1.1-3f311c5 I have problem with that.
When I add entry, and entry is auto saved, then auto save is shown in the attribute "Zmieniano" (eng. changed) as an next edit, which I dont want. Entry from attached screenshot was not edited, but in "Zmieniano" (eng. changed) attributes it has two values:
- Oryginalny wpis (eng. oryginal entry),
- Zmiana 27.08.2015, 10:52 przez Daniel Sajdyk z serwerownia.sr.lez (eng. Changed 27.08.2015.... )
The second value is autosave time.
Is this a bug?
Regards
Daniel.
|
| Attachment 1: entry.png
|
|
|
68103
|
Mon Aug 31 09:38:38 2015 |
| Andreas Luedeke | andreas.luedeke@psi.ch | Bug fix | Windows | V3.1.1-3f311c5 | Re: Draft saved is treated as an entry edit | Hi Daniel,
this is an undesired side effect of a new feature. I wouldn't call it a bug ;-)
There is no straight forward way for elog to distinguish between a "Submit" and an automatic save. Therefore the "... on edit = ..." kicks in when an entry is saved automatically.
I guess Stefan can figure out a workaround, but for the moment I would sugest that you just switch off the auto save feature -- if you want to keep your save history:
Save drafts = 0
Cheers
Andreas
Daniel Sajdyk wrote:Save drafts = 0 |
|
Hello.
In Elog i have attribute called "Zmieniano" (eng. changed) which should store how many times entry was edited. If entry was not edited it should have only preset value "oryginalny wpis" (eng. oryginal entry), but when I edit it, it should have also date, time, and person who make edit (this is made by "Subst on Edit Zmieniano = $Zmieniano<br>- Zmiana $date przez $long_name z $remote_host)".
From version V3.1.1-3f311c5 I have problem with that.
When I add entry, and entry is auto saved, then auto save is shown in the attribute "Zmieniano" (eng. changed) as an next edit, which I dont want. Entry from attached screenshot was not edited, but in "Zmieniano" (eng. changed) attributes it has two values:
- Oryginalny wpis (eng. oryginal entry),
- Zmiana 27.08.2015, 10:52 przez Daniel Sajdyk z serwerownia.sr.lez (eng. Changed 27.08.2015.... )
The second value is autosave time.
Is this a bug?
Regards
Daniel.
|
|
|
68104
|
Mon Aug 31 13:12:09 2015 |
| Daniel Sajdyk | daniel.sajdyk@gmail.com | Bug fix | Windows | V3.1.1-3f311c5 | Re: Draft saved is treated as an entry edit | Hi Andreas and thank you very much for explanation ;)
So, we'll have to wait for new version which will correct this.
Cheers
Daniel.
| Andreas Luedeke wrote: |
|
Hi Daniel,
this is an undesired side effect of a new feature. I wouldn't call it a bug ;-)
There is no straight forward way for elog to distinguish between a "Submit" and an automatic save. Therefore the "... on edit = ..." kicks in when an entry is saved automatically.
I guess Stefan can figure out a workaround, but for the moment I would sugest that you just switch off the auto save feature -- if you want to keep your save history:
Save drafts = 0
Cheers
Andreas
Daniel Sajdyk wrote:Save drafts = 0 |
|
Hello.
In Elog i have attribute called "Zmieniano" (eng. changed) which should store how many times entry was edited. If entry was not edited it should have only preset value "oryginalny wpis" (eng. oryginal entry), but when I edit it, it should have also date, time, and person who make edit (this is made by "Subst on Edit Zmieniano = $Zmieniano<br>- Zmiana $date przez $long_name z $remote_host)".
From version V3.1.1-3f311c5 I have problem with that.
When I add entry, and entry is auto saved, then auto save is shown in the attribute "Zmieniano" (eng. changed) as an next edit, which I dont want. Entry from attached screenshot was not edited, but in "Zmieniano" (eng. changed) attributes it has two values:
- Oryginalny wpis (eng. oryginal entry),
- Zmiana 27.08.2015, 10:52 przez Daniel Sajdyk z serwerownia.sr.lez (eng. Changed 27.08.2015.... )
The second value is autosave time.
Is this a bug?
Regards
Daniel.
|
|
|
|