Version 2.5.7-1

SVN revision: 1201

build.bat

@@ -5,6 +5,9 @@ rem Build ELOG distribution
 set version=%1
 
 cd nt
+nmake -f elog.mak CFG="elog - Win32 Release" clean
+nmake -f elogd.mak CFG="elogd - Win32 Release" clean
+nmake -f elconv.mak CFG="elconv - Win32 Release" clean
 nmake -f elog.mak CFG="elog - Win32 Release"
 nmake -f elogd.mak CFG="elogd - Win32 Release"
 nmake -f elconv.mak CFG="elconv - Win32 Release"

doc/ChangeLog

@@ -1,3 +1,22 @@
+Version 2.5.7, released Februar 14th, 2005
+==========================================
+
+- Fixed buffer overflow which was already exploited to obtain
+  shell access
+- Fixed security bug which allowed to download a config file
+  containing a write password without supplying this password
+  first
+- Solved bug with 'fixed' ROptions attributes
+- Added missing 'alt' tags to images
+- Use admin user email in 'from' field if nothing else is availabe
+- 'Preset attribute' now also works with conditional attributes
+- Fixed wrong '%S' instead of '%s' in charset
+- Do not display .EPS files inline as ASCII files
+- Fixed problem with conditional attributes in French
+- Removed superfloous 'mailto:' in substitution
+- Added highlighting for search results in attributes
+- Fixed bug yielding in wrong search results
+
 Version 2.5.6, released Januar 25th, 2005
 =========================================
 

doc/index.html

@@ -25,7 +25,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@psi.ch">
             Stefan Ritt</a></P>
-      <div class="version">Current version is : 2.5.6</div>
+      <div class="version">Current version is : 2.5.7</div>
       <hr>
       <a name="whatis">
          <div class="section">&nbsp; What is ELOG ? &nbsp;</div>

elog.nsi

@@ -96,7 +96,7 @@ Section "ELOG system (required)" SecSystem
     MessageBox MB_YESNO|MB_ICONQUESTION "Would you like to overwrite your existing theme files?" IDNO themesNotOverwrite
   themesNotExist:
     File themes\default\*.css
-    File themes\default\*.gif
+    File themes\default\*.png
     File themes\default\*.ico
     File themes\default\*.png
     SetOutPath $INSTDIR\themes\default\icons

eloglang.brazilian

@@ -343,3 +343,8 @@ Text fields may contain regular expressions =
 Case sensitive = 
 List = 
 Date must be between 1970 and 2037 = 
+up = 
+down = 
+stop = 
+Entry = 
+name may not contain blanks = 

eloglang.bulgarian

@@ -343,3 +343,8 @@ Attachment file <b>"%s"</b> empty or not found =
 #
 #---- please translate following items and then remove this comment ----#
 #
+up = 
+down = 
+stop = 
+Entry = 
+name may not contain blanks = 

eloglang.danish

@@ -343,3 +343,8 @@ Text fields may contain regular expressions =
 Case sensitive = 
 List = 
 Date must be between 1970 and 2037 = 
+up = 
+down = 
+stop = 
+Entry = 
+name may not contain blanks = 

eloglang.dutch

@@ -346,3 +346,8 @@ Date must be between 1970 and 2037 = Datum moet tussen 1970 en 2037 liggen
 #
 #---- please translate following items and then remove this comment ----#
 #
+up = 
+down = 
+stop = 
+Entry = 
+name may not contain blanks = 

eloglang.french

@@ -339,3 +339,12 @@ Case sensitive = Tient compte de la casse
 List = Liste
 From = De
 Date must be between 1970 and 2037 = La date doit être comprise entre 1970 et 2037
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+up = 
+down = 
+stop = 
+Entry = 
+name may not contain blanks = 

eloglang.german

@@ -338,3 +338,8 @@ Text fields may contain regular expressions = Texteingabefelder k
 Case sensitive = Großschrteibung beachten
 List = Liste
 Date must be between 1970 and 2037 = Das Datum muß zwischen 1970 und 2037 liegen
+up = Hoch
+down = Runter
+stop = Stop
+Entry = Eintrag
+name may not contain blanks = Name darf keine Leerstellen enthalten

eloglang.italian

@@ -342,3 +342,8 @@ Text fields may contain regular expressions =
 Case sensitive = 
 List = 
 Date must be between 1970 and 2037 = 
+up = 
+down = 
+stop = 
+Entry = 
+name may not contain blanks = 

eloglang.japanese

@@ -341,3 +341,8 @@ Text fields may contain regular expressions =
 Case sensitive = 
 List = 
 Date must be between 1970 and 2037 = 
+up = 
+down = 
+stop = 
+Entry = 
+name may not contain blanks = 

eloglang.spanish

@@ -339,3 +339,8 @@ Case sensitive =
 From = 
 List = 
 Date must be between 1970 and 2037 = 
+up = 
+down = 
+stop = 
+Entry = 
+name may not contain blanks = 

src/elogd.c

@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
 
    $Log$
+   Revision 1.557  2005/02/14 10:52:36  ritt
+   Version 2.5.7-1
+
    Revision 1.556  2005/02/14 10:44:16  ritt
    Fixed buffer overflow in decode_post()
 
@@ -13285,8 +13288,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
                   char attrib[MAX_N_ATTR][NAME_LENGTH], int n_attr,
                   char *text, BOOL show_text,
                   char attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], char *encoding,
-                  BOOL select, int *n_display, char *locked_by, int highlight,
+                  BOOL select, int *n_display, char *locked_by, int highlight, regex_t * re_buf)
-                  regex_t *re_buf)
 {
    char str[NAME_LENGTH], ref[256], *nowrap, sclass[80], format[256],
        file_name[MAX_PATH_LENGTH], *slist, *svalue;
@@ -13371,13 +13373,13 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
       else {
          /* if top level only, display reply icon if message has a reply */
          if (getcfg(lbs->name, "Top level only", str, sizeof(str)) && atoi(str) == 1 && reply_to[0])
-            rsprintf("<img border=0 src=\"reply.png\" alt=\"%s\">&nbsp;", loc("reply"));
+            rsprintf("<img border=0 src=\"reply.png\" alt=\"%s\">&nbsp;", loc("Reply"));
          else {
             /* display standard icons */
             if (level == 0)
-               rsprintf("<img border=0 src=\"entry.png\" alt=\"%s\">&nbsp;", loc("entry"));
+               rsprintf("<img border=0 src=\"entry.png\" alt=\"%s\">&nbsp;", loc("Entry"));
             else
-               rsprintf("<img border=0 src=\"reply.png\" alt=\"%s\">&nbsp;", loc("reply"));
+               rsprintf("<img border=0 src=\"reply.png\" alt=\"%s\">&nbsp;", loc("Reply"));
          }
       }
       if (highlight != message_id)
@@ -13429,9 +13431,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
          if (strieq(disp_attr[index], loc("ID"))) {
             if (strieq(mode, "Threaded")) {
                if (level == 0)
-                  rsprintf("<img border=0 src=\"entry.png\" alt=\"%s\">&nbsp;", loc("entry"));
+                  rsprintf("<img border=0 src=\"entry.png\" alt=\"%s\">&nbsp;", loc("Entry"));
                else
-                  rsprintf("<img border=0 src=\"reply.png\" alt=\"%s\">&nbsp;", loc("reply"));
+                  rsprintf("<img border=0 src=\"reply.png\" alt=\"%s\">&nbsp;", loc("Reply"));
 
                skip_comma = TRUE;
 
@@ -13526,7 +13528,8 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
 
                   else if (attr_flags[i] & AF_ICON) {
                      if (attrib[i][0])
-                        rsprintf("&nbsp;<img border=0 src=\"icons/%s\" alt=\"%s\">&nbsp;", attrib[i], attrib[i]);
+                        rsprintf("&nbsp;<img border=0 src=\"icons/%s\" alt=\"%s\">&nbsp;", attrib[i],
+                                 attrib[i]);
                   }
 
                   else {
@@ -13751,8 +13754,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
                   if (is_ascii(file_name) &&
                       !chkext(attachment[index], ".PS") &&
                       !chkext(attachment[index], ".PDF") &&
-                      !chkext(attachment[index], ".EPS") &&
+                      !chkext(attachment[index], ".EPS") && show_attachments) {
-                      show_attachments) {
 
                      /* display attachment */
                      rsprintf("</td></tr><tr><td colspan=%d class=\"messagelist\"><pre>", colspan);
@@ -16073,8 +16075,7 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf
                text1[i] = 0;
              */
 
-            highlight_searchtext(re_buf, text, text1, 
+            highlight_searchtext(re_buf, text, text1, strieq(encoding, "plain") || !strieq(mode, "Full"));
-               strieq(encoding, "plain") || !strieq(mode, "Full"));
             strlcpy(text, text1, TEXT_SIZE);
          }
 
@@ -17753,7 +17754,8 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
 
       if (locked_by && locked_by[0]) {
          sprintf(str, "%s %s", loc("Entry is currently edited by"), locked_by);
-         rsprintf("<tr><td nowrap colspan=2 class=\"errormsg\"><img src=\"stop.png\" alt=\"%s\">\n", loc("stop"));
+         rsprintf("<tr><td nowrap colspan=2 class=\"errormsg\"><img src=\"stop.png\" alt=\"%s\">\n",
+                  loc("stop"));
          rsprintf("%s<br>%s</td></tr>\n", str, loc("You can \"steal\" the lock by editing this entry"));
       }