From 9fdae7159a71d6e7baefc20f7973bb7de35e3f9e Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Wed, 7 May 2003 18:45:43 +0000
Subject: [PATCH] - moved lock.gif to themes directory - fixed a few bugs with
 </th> - added anchor <a name=attX> (X=1,2,3) for attachments

SVN revision: 524
---
 doc/ChangeLog                       |   9 ++++++++
 src/elogd.c                         |  32 ++++++++++++++--------------
 lock.gif => themes/default/lock.gif | Bin 144 -> 143 bytes
 3 files changed, 25 insertions(+), 16 deletions(-)
 rename lock.gif => themes/default/lock.gif (68%)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5bbdf414..c5bc5cfe 100755
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+Version 2.3.7, released April 23rd, 2003
+========================================
+
+- Fixed bug in password recovery with logbooks containing blanks
+- Fixed bug with logbooks containing blanks in registration notification
+- Added icon for protected logbooks
+- Increased number of attachments to 50
+- Implemented 3D cell frames
+
 Version 2.3.6, released April 23rd, 2003
 ========================================
 
diff --git a/src/elogd.c b/src/elogd.c
index b763a56c..f1b18715 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,11 @@
   Contents:     Web server program for Electronic Logbook ELOG
 
   $Log$
+  Revision 1.102  2003/05/07 18:45:42  midas
+  - moved lock.gif to themes directory
+  - fixed a few bugs with </th>
+  - added anchor <a name=attX> (X=1,2,3) for attachments
+
   Revision 1.101  2003/05/02 21:40:06  midas
   Introduced 3D cell frames
 
@@ -824,7 +829,7 @@
 \********************************************************************/
 
 /* Version of ELOG */
-#define VERSION "2.3.6"
+#define VERSION "2.3.7"
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -5349,6 +5354,7 @@ time_t now;
       {
       rsprintf("<td class=\"attribvalue\">\n");
       rsputs2(attrib[index]);
+      rsprintf("&nbsp;");
 
       if (attr_flags[index] & AF_MULTI)
         {
@@ -9116,7 +9122,7 @@ LOGBOOK *lbs_cur;
 
     /* empty title for selection box */
     if (atoi(getparam("select")) == 1)
-      rsprintf("<th class=\"listtitle\"></td>&nbsp;\n");
+      rsprintf("<th class=\"listtitle\"></th>&nbsp;\n");
     
     for (i=0 ; i<n_attr_disp ; i++)
       {
@@ -9164,12 +9170,12 @@ LOGBOOK *lbs_cur;
       else if (strcmp(getparam("rsort"), disp_attr[i]) == 0)
         strcpy(img, "<img align=top src=\"down.gif\">");
 
-      rsprintf("<th class=\"listtitle\"><a href=\"%s\">%s</a>%s</td>\n", 
+      rsprintf("<th class=\"listtitle\"><a href=\"%s\">%s</a>%s</th>\n", 
                 ref, disp_attr[i], img);
       }
 
     if (!equal_ustring(mode, "Full") && n_line > 0)
-      rsprintf("<th class=\"listtitle\">Text</td>\n");
+      rsprintf("<th class=\"listtitle\">Text</th>\n");
 
     rsprintf("</tr>\n\n");
     }
@@ -10593,6 +10599,7 @@ BOOL   first;
               strstr(att, ".PNG"))
             {
             rsprintf("<tr><td class=\"messageframe\">\n");
+            rsprintf("<a name=\"att%d\">\n", index+1);
             rsprintf("<img src=\"%s\"></td></tr>", ref);
             rsprintf("</td></tr>\n\n");
             }
@@ -10605,6 +10612,9 @@ BOOL   first;
               /* display attachment */
               rsprintf("<tr><td class=\"messageframe\">\n");
 
+              /* anchor for references */
+              rsprintf("<a name=\"att%d\">\n", index+1);
+
               if (!strstr(att, ".HTML"))
                 rsprintf("<pre class=\"messagepre\">");
 
@@ -12770,19 +12780,9 @@ int                  net_buffer_size;
 
       if (strstr(logbook, ".gif") || strstr(logbook, ".jpg") ||
           strstr(logbook, ".jpg") || strstr(logbook, ".png") ||
-          strstr(logbook, ".htm"))
+          strstr(logbook, ".htm") || strstr(logbook, ".css"))
         {
-        /* serve file directly */
-        strlcpy(str, resource_dir, sizeof(str));
-        strlcat(str, logbook, sizeof(str));
-        send_file_direct(str);
-        send(_sock, return_buffer, return_length, 0);
-
-        goto finished;
-        }
-      else if (strstr(logbook, ".css"))
-        {
-        /* send default CSS file */
+        /* serve file directly from themes directory */
         strlcpy(str, resource_dir, sizeof(str));
         strlcat(str, "themes", sizeof(str));
         strlcat(str, DIR_SEPARATOR_STR, sizeof(str));
diff --git a/lock.gif b/themes/default/lock.gif
similarity index 68%
rename from lock.gif
rename to themes/default/lock.gif
index a5d8a35e8d16c4a0ebab7a196d0493af931068db..7d3a4f8c252f9394255a02e9f8660bf4752b01c5 100755
GIT binary patch
delta 8
PcmbQh*v~kjkC6)i3*-Vz

delta 9
QcmeBYoWMAtkBOHH01iL`SpWb4