From 9c21cabcaf45c6ec6ad17219542c4d4f74b8a17b Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Thu, 23 Dec 2010 10:45:10 +0000
Subject: [PATCH] Release 2.8.1-1

SVN revision: 2350
---
 doc/ChangeLog                   | 19 ++++++++++++++
 doc/index.html                  |  2 +-
 doc/index_nd.html               |  2 +-
 resources/eloglang.brazilian    |  1 +
 resources/eloglang.bulgarian    |  1 +
 resources/eloglang.czech        |  1 +
 resources/eloglang.danish       |  1 +
 resources/eloglang.dutch        |  1 +
 resources/eloglang.french       |  1 +
 resources/eloglang.german       |  2 ++
 resources/eloglang.italian      |  1 +
 resources/eloglang.japanese     |  1 +
 resources/eloglang.ru_CP1251    |  1 +
 resources/eloglang.spanish      |  1 +
 resources/eloglang.swedish      |  1 +
 resources/eloglang.turkish      |  1 +
 resources/eloglang.zh_CN-GB2312 |  1 +
 resources/eloglang.zh_CN-UTF8   |  1 +
 src/crypt.c                     | 12 ++++-----
 src/elog.c                      |  4 +--
 src/elogd.c                     | 45 +++++++++++++++++++--------------
 src/regex.c                     |  6 ++---
 22 files changed, 74 insertions(+), 32 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 30dfcedf..e08a3d23 100755
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,22 @@
+Version 2.8.1, released December 23th 2010
+==========================================
+
+- Fixed bug with regexec, thanks to Christian Richter
+- Fixed bug with $attachments in shell command
+- Fixed problem with hitting "submit" twice
+- Fixed submission_locked in <textarea>
+- Fixed bug with init script
+- Prevent form submission via <Enter> key, put focus on first input field
+- Implemented 'Thumbnail options'
+- Fixed crash with '%' in attribute and 'Preset on reply <attr> = Re: $sttr'
+- Added MIME-Version: 1.0
+- Fixed bug with name of textarea
+- Implemented 'List after submit'
+- Implemented 'Custom xxx form'
+- Add logbook dir to custom form
+- Implemented custom form
+- Fixed password conversion wiht several top groups
+
 Version 2.8.0, released August 2nd 2010
 =======================================
 
diff --git a/doc/index.html b/doc/index.html
index e5727a27..520c83a6 100755
--- a/doc/index.html
+++ b/doc/index.html
@@ -28,7 +28,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">Current version is : 2.8.0</div>
+      <div class="version">Current version is : 2.8.1</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>
       
diff --git a/doc/index_nd.html b/doc/index_nd.html
index 7b0cd847..56dda31d 100644
--- a/doc/index_nd.html
+++ b/doc/index_nd.html
@@ -28,7 +28,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">Current version is : 2.8.0</div>
+      <div class="version">Current version is : 2.8.1</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>
diff --git a/resources/eloglang.brazilian b/resources/eloglang.brazilian
index dc1a161f..263211d2 100755
--- a/resources/eloglang.brazilian
+++ b/resources/eloglang.brazilian
@@ -474,3 +474,4 @@ Only user <b>%s</b> can delete this entry =
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.bulgarian b/resources/eloglang.bulgarian
index 23aeb9d1..c975e95d 100755
--- a/resources/eloglang.bulgarian
+++ b/resources/eloglang.bulgarian
@@ -474,3 +474,4 @@ Only user <b>%s</b> can delete this entry =
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.czech b/resources/eloglang.czech
index 8f45821f..be74db9a 100644
--- a/resources/eloglang.czech
+++ b/resources/eloglang.czech
@@ -471,3 +471,4 @@ Only user <b>%s</b> can delete this entry =
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.danish b/resources/eloglang.danish
index 94a8a8aa..1db867e0 100755
--- a/resources/eloglang.danish
+++ b/resources/eloglang.danish
@@ -474,3 +474,4 @@ File system full, ELOG cannot continue to work = Filsystemet er l
 #
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.dutch b/resources/eloglang.dutch
index 5959a3ea..ae105966 100755
--- a/resources/eloglang.dutch
+++ b/resources/eloglang.dutch
@@ -473,3 +473,4 @@ Only user <b>%s</b> can delete this entry = Alleen gebruiker <b>%s</b> kan dit b
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.french b/resources/eloglang.french
index ac6cfe6c..7c4bc713 100755
--- a/resources/eloglang.french
+++ b/resources/eloglang.french
@@ -471,3 +471,4 @@ File system full, ELOG cannot continue to work = Le syst
 #
 3 Days = 3 jours
 Last 3 Days = Les 3 derniers jours
+Really submit this entry? = 
diff --git a/resources/eloglang.german b/resources/eloglang.german
index ac6b0f04..a6534913 100755
--- a/resources/eloglang.german
+++ b/resources/eloglang.german
@@ -466,3 +466,5 @@ Only user <b>%s</b> can delete this entry = Nur der Benutzer <b>%s</b> kann dies
 File system full, ELOG cannot continue to work = Dateisystem voll, ELOG kann nicht weiterarbeiten
 3 Days = 3 Tage
 Last 3 Days = Letzte 3 Tage
+Really submit this entry? = Diesen Entrag wirklich abschicken?
+
diff --git a/resources/eloglang.italian b/resources/eloglang.italian
index c4a3a511..6260c389 100755
--- a/resources/eloglang.italian
+++ b/resources/eloglang.italian
@@ -469,3 +469,4 @@ Only user <b>%s</b> can delete this entry =
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.japanese b/resources/eloglang.japanese
index 8bb6ec73..29522312 100755
--- a/resources/eloglang.japanese
+++ b/resources/eloglang.japanese
@@ -470,3 +470,4 @@ Only user <b>%s</b> can delete this entry =
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.ru_CP1251 b/resources/eloglang.ru_CP1251
index 79a388dd..2912eaf9 100644
--- a/resources/eloglang.ru_CP1251
+++ b/resources/eloglang.ru_CP1251
@@ -475,3 +475,4 @@ Only user <b>%s</b> can delete this entry =
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.spanish b/resources/eloglang.spanish
index 386f57ce..4b5b8fcc 100755
--- a/resources/eloglang.spanish
+++ b/resources/eloglang.spanish
@@ -476,3 +476,4 @@ Only user <b>%s</b> can delete this entry = S
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.swedish b/resources/eloglang.swedish
index 8d5182c2..336b12d4 100644
--- a/resources/eloglang.swedish
+++ b/resources/eloglang.swedish
@@ -473,3 +473,4 @@ File system full, ELOG cannot continue to work = Filsystemet fullt, ELOG kan int
 #
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.turkish b/resources/eloglang.turkish
index 1ba493c5..72139000 100755
--- a/resources/eloglang.turkish
+++ b/resources/eloglang.turkish
@@ -473,3 +473,4 @@ Only user <b>%s</b> can delete this entry =
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.zh_CN-GB2312 b/resources/eloglang.zh_CN-GB2312
index 4df91a7c..0e8b4dc9 100644
--- a/resources/eloglang.zh_CN-GB2312
+++ b/resources/eloglang.zh_CN-GB2312
@@ -472,3 +472,4 @@ Only user <b>%s</b> can delete this entry =
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/resources/eloglang.zh_CN-UTF8 b/resources/eloglang.zh_CN-UTF8
index 54660d48..63bea100 100644
--- a/resources/eloglang.zh_CN-UTF8
+++ b/resources/eloglang.zh_CN-UTF8
@@ -472,3 +472,4 @@ Only user <b>%s</b> can delete this entry =
 File system full, ELOG cannot continue to work = 
 3 Days = 
 Last 3 Days = 
+Really submit this entry? = 
diff --git a/src/crypt.c b/src/crypt.c
index e73b6d8b..229a009f 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -29,7 +29,7 @@ typedef unsigned int uint32_t;
 #define MAX(x,y) ((x)>(y)?(x):(y))
 #define MIN(x,y) ((x)<(y)?(x):(y))
 #endif
-      
+
 /* Structure to save state of computation between the single steps.  */
 struct sha256_ctx {
    uint32_t H[8];
@@ -41,10 +41,10 @@ struct sha256_ctx {
 
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-# define SWAP(n) \
+#define SWAP(n) \
     (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
 #else
-# define SWAP(n) (n)
+#define SWAP(n) (n)
 #endif
 
 
@@ -252,9 +252,9 @@ static void sha256_process_bytes(const void *buffer, size_t len, struct sha256_c
 /* To check alignment gcc has an appropriate operator.  Other
    compilers don't.  */
 #if __GNUC__ >= 2
-# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint32_t) != 0)
+#define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint32_t) != 0)
 #else
-# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint32_t) != 0)
+#define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint32_t) != 0)
 #endif
       if (UNALIGNED_P(buffer))
          while (len > 64) {
@@ -422,7 +422,7 @@ static char *sha256_crypt_r(const char *key, const char *salt, char *buffer, int
    for (cnt = key_len; cnt >= 32; cnt -= 32) {
       memcpy(cp, temp_result, 32);
       cp += 32;
-   } 
+   }
    memcpy(cp, temp_result, cnt);
 
    /* Start computation of S byte sequence.  */
diff --git a/src/elog.c b/src/elog.c
index 7bc6f312..1b174f60 100755
--- a/src/elog.c
+++ b/src/elog.c
@@ -9,7 +9,7 @@
 
 \********************************************************************/
 
-#define VERSION "2.8.0"
+#define VERSION "2.8.1"
 char svn_revision[] = "$Id$";
 
 /* ELOG identification */
@@ -348,7 +348,7 @@ int ssl_connect(int sock, SSL ** ssl_con)
    SSL_library_init();
    SSL_load_error_strings();
 
-   meth = (SSL_METHOD *)SSLv23_method();
+   meth = (SSL_METHOD *) SSLv23_method();
    ctx = SSL_CTX_new(meth);
 
    *ssl_con = SSL_new(ctx);
diff --git a/src/elogd.c b/src/elogd.c
index 334f503a..ccacb3de 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -9,7 +9,7 @@
  \********************************************************************/
 
 /* Version of ELOG */
-#define VERSION "2.8.0"
+#define VERSION "2.8.1"
 char svn_revision[] = "$Id$";
 
 /* ELOG identification */
@@ -741,7 +741,7 @@ char *xstrdup(const char *string)
 
 /* Have vasprintf? (seems that only libc6 based Linux has this) */
 #ifdef __linux__
-#  define HAVE_VASPRintF
+#define HAVE_VASPRintF
 #endif
 
 #ifndef HAVE_VASPRintF
@@ -847,11 +847,11 @@ int xvasprintf(char **ptr, const char *format, va_list ap)
 #ifdef va_copy
    va_copy(save, ap);
 #else
-# ifdef __va_copy
+#ifdef __va_copy
    __va_copy(save, ap);
-# else
+#else
    save = ap;
-# endif
+#endif
 #endif
 
    n = vasprintf(ptr, format, save);
@@ -2149,14 +2149,16 @@ void compose_email_header(LOGBOOK * lbs, char *subject, char *from, char *to, ch
 
       sprintf(multipart_boundary, "------------%04X%04X%04X", rand(), rand(), rand());
       snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1,
-               "MIME-Version: 1.0\r\nContent-Type: multipart/alternative;\r\n boundary=\"%s\"\r\n\r\n", multipart_boundary);
+               "MIME-Version: 1.0\r\nContent-Type: multipart/alternative;\r\n boundary=\"%s\"\r\n\r\n",
+               multipart_boundary);
 
       strlcat(mail_text, "This is a multi-part message in MIME format.\r\n", size);
    } else {
       if (n_attachments) {
          sprintf(multipart_boundary, "------------%04X%04X%04X", rand(), rand(), rand());
          snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1,
-                  "MIME-Version: 1.0\r\nContent-Type: multipart/mixed;\r\n boundary=\"%s\"\r\n\r\n", multipart_boundary);
+                  "MIME-Version: 1.0\r\nContent-Type: multipart/mixed;\r\n boundary=\"%s\"\r\n\r\n",
+                  multipart_boundary);
 
          strlcat(mail_text, "This is a multi-part message in MIME format.\r\n", size);
       } else {
@@ -8619,7 +8621,8 @@ BOOL change_pwd(LOGBOOK * lbs, char *user, char *pwd)
 
 void show_change_pwd_page(LOGBOOK * lbs)
 {
-   char str[256], config[256], old_pwd[256], new_pwd[256], new_pwd2[256], act_pwd[256], user[256], full_user[256];
+   char str[256], config[256], old_pwd[256], new_pwd[256], new_pwd2[256], act_pwd[256], user[256],
+       full_user[256];
    int wrong_pwd;
 
    old_pwd[0] = new_pwd[0] = new_pwd2[0] = 0;
@@ -9202,7 +9205,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
 
    /* check for custom form for new entries */
    if (!bedit && getcfg(lbs->name, "Custom new form", str, sizeof(str))) {
-            /* check if file starts with an absolute directory */
+      /* check if file starts with an absolute directory */
       if (str[0] == DIR_SEPARATOR || str[1] == ':')
          strcpy(file_name, str);
       else {
@@ -9215,7 +9218,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
 
    /* check for custom form for editing an entry */
    if (bedit && getcfg(lbs->name, "Custom edit form", str, sizeof(str))) {
-            /* check if file starts with an absolute directory */
+      /* check if file starts with an absolute directory */
       if (str[0] == DIR_SEPARATOR || str[1] == ':')
          strcpy(file_name, str);
       else {
@@ -21255,7 +21258,8 @@ void format_email_html(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NA
    if (attachments_present) {
       sprintf(multipart_boundary_related, "------------%04X%04X%04X", rand(), rand(), rand());
       snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1,
-               "MIME-Version: 1.0\r\nContent-Type: multipart/related;\r\n boundary=\"%s\"\r\n\r\n", multipart_boundary_related);
+               "MIME-Version: 1.0\r\nContent-Type: multipart/related;\r\n boundary=\"%s\"\r\n\r\n",
+               multipart_boundary_related);
       strlcat(mail_text, "--", size);
       strlcat(mail_text, multipart_boundary_related, size);
       strlcat(mail_text, "\r\n", size);
@@ -21446,7 +21450,8 @@ void format_email_html2(LOGBOOK * lbs, int message_id, char att_file[MAX_ATTACHM
    if (attachments_present) {
       sprintf(multipart_boundary_related, "------------%04X%04X%04X", rand(), rand(), rand());
       snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1,
-               "MIME-Version: 1.0\r\nContent-Type: multipart/related;\r\n boundary=\"%s\"\r\n\r\n", multipart_boundary_related);
+               "MIME-Version: 1.0\r\nContent-Type: multipart/related;\r\n boundary=\"%s\"\r\n\r\n",
+               multipart_boundary_related);
       strlcat(mail_text, "--", size);
       strlcat(mail_text, multipart_boundary_related, size);
       strlcat(mail_text, "\r\n", size);
@@ -23298,7 +23303,7 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
 
    /* check for custom form to display entry */
    if (getcfg(lbs->name, "Custom display form", str, sizeof(str))) {
-            /* check if file starts with an absolute directory */
+      /* check if file starts with an absolute directory */
       if (str[0] == DIR_SEPARATOR || str[1] == ':')
          strcpy(file_name, str);
       else {
@@ -25271,10 +25276,10 @@ void show_logbook_node(LBLIST plb, LBLIST pparent, int level, int btop)
          if (getcfg(lb_list[index].name, "Read password", str, sizeof(str)) || (getcfg(lb_list[index].name,
                                                                                        "Password file", str,
                                                                                        sizeof(str))
-                                                                                && !getcfg(lb_list[index].
-                                                                                           name,
-                                                                                           "Guest menu commands",
-                                                                                           str, sizeof(str))))
+                                                                                &&
+                                                                                !getcfg(lb_list[index].name,
+                                                                                        "Guest menu commands",
+                                                                                        str, sizeof(str))))
             rsprintf("&nbsp;&nbsp;<img src=\"lock.png\" alt=\"%s\" title=\"%s\">",
                      loc("This logbook requires authentication"),
                      loc("This logbook requires authentication"));
@@ -27193,7 +27198,9 @@ int process_http_request(const char *request, int i_conn)
    struct tm *ts;
 
    const char *cookie_list[] =
-       { "upwd", "unm", "ufnm", "elmode", "urem", "wpwd", "apwd", "uname", "upassword", "elattach", "hsm", NULL };
+       { "upwd", "unm", "ufnm", "elmode", "urem", "wpwd", "apwd", "uname", "upassword", "elattach", "hsm",
+      NULL
+   };
 
    if (!strchr(request, '\r'))
       return 0;
@@ -28007,7 +28014,7 @@ SSL_CTX *init_ssl(void)
    SSL_library_init();
    SSL_load_error_strings();
 
-   meth = (SSL_METHOD *)SSLv23_method();
+   meth = (SSL_METHOD *) SSLv23_method();
    ctx = SSL_CTX_new(meth);
 
    if (getcfg("global", "SSL Passphrase", pwd, sizeof(pwd))) {
diff --git a/src/regex.c b/src/regex.c
index 91fb0aab..3f10998e 100755
--- a/src/regex.c
+++ b/src/regex.c
@@ -4553,7 +4553,7 @@ int cflags;
    } else
       preg->newline_anchor = 0;
 
-   preg->no_sub = !!(cflags & REG_NOSUB);
+   preg->no_sub = ! !(cflags & REG_NOSUB);
 
    /* POSIX says a null character in the pattern terminates it, so we 
       can use strlen here in compiling the pattern.  */
@@ -4597,8 +4597,8 @@ int eflags;
 
    private_preg = *preg;
 
-   private_preg.not_bol = !!(eflags & REG_NOTBOL);
-   private_preg.not_eol = !!(eflags & REG_NOTEOL);
+   private_preg.not_bol = ! !(eflags & REG_NOTBOL);
+   private_preg.not_eol = ! !(eflags & REG_NOTEOL);
 
    /* The user has told us exactly how many registers to return
       information about, via `nmatch'.  We have to pass that on to the