Release 2.7.3-1

SVN revision: 2058

doc/ChangeLog

@@ -1,3 +1,21 @@
+Version 2.7.3, released Feb. 22th, 2008
+=======================================
+
+- Implemented native SSL support
+- Added version information to elog.c
+- Use absolute links for inline images in email notifications
+- Put thumbnails in HTML encoded email notifications
+- Adjusted menu height
+- Remove ',' from date in CSV export
+- Replace elog:... by HTML link when encoding is HTML
+- Fixed importing of datetime attributes
+- Added patch from Olivier Callot regarding max. line length in summary display
+- Fixed shell problems under Linux
+- Added code to auto-detect ImageMagick
+- Implemented thumbnails for PDF and images with resizing and rotation
+- Allow Ctrl-Shift-PgUp/PgDn for browsing
+- Moved browsing buttons to the left side
+
 Version 2.7.2, released Jan. 30th, 2008
 =======================================
 

doc/adminguide.html

@@ -221,9 +221,6 @@ URL = http://your.proxy.host/subdir/
 
 into elogd.cfg.<p>
 
-Note that the variable $remote_host cannot be used inside elogd since the remote host is always
-the proxy host (anybody knows how to fix that???).<p>
-
 <hr><a name="imagemagick"> <div class=section>&nbsp; Installing ImageMagick &nbsp;</div> <p> 
 When images are attached to ELOG entries, thumbnails can be created for quick preview.
 This works also for PDF and PostScript files. ELOG forwards any image operation
@@ -337,16 +334,28 @@ Logbook dir</b></CODE> in the <b><a href="config.html">elogd.cfg description</a>
 <hr><a name="secure">
 <div class=section>&nbsp; Secure Connections HOWTO &nbsp;</div>
 <p>
-Although the <code><b>elogd</b></code> program does not support secure
+<h3><i>Using elogd itself</i>:</h3>
-connections over SSL directly, it is still possible to access <code><b>elogd</b></code>
+
-securely using one of the following methods. <b>It is recommented to run elog 
+Starting from version 2.7.3 on, the <code><b>elogd</b></code> program supports 
-through an HTTPS proxy to avoid exposing elog passwords to clear text sniffing 
+secure connections over the Secure Socker Layer (SSL) directly.
+<b>It is recommented to run elog 
+only through secure HTTPS connections if passwords are used. Otherwise the
+passwords are send over the network in clear text and exposed to sniffing 
 attacks</b>.
 
+To use SSL, put <code><b>SSL = 1</b></code> into the config file. If the 
+<code><b>URL =</b></code> directive is used, make sure to use 
+<code><b>https://...</code></b> instead of <code><b>http://...</code></b>
+there. The ELOG distribution contains a simple self-signed certificate in the
+<code><b>ssl</b></code> subdirectory. One can replace this certificate and key
+with a real ceritficate to avoid browser pop-up windows warning about the
+self-signed certificate.
+
 <h3><i>Using Apache</i>:</h3>
 
-The <a href="http://httpd.apache.org">Apache<a> web server can be used as a proxy
+Another possibility is to use the <a href="http://httpd.apache.org">Apache<a> 
-server allowing secure connections. To do so, Apache has to be configured
+web server as a proxy server allowing secure connections. To do so, Apache 
+has to be configured
 accordingly and a certificate has to be generated. See some
 <a href="http://slacksite.com/apache/certificate.html">instructions</a>
 on how to create a certificate, and see <i>Running elogd under Apache</i>
@@ -396,51 +405,6 @@ access <b> <code>http://localhost:1234</code></b> from your browser and reach
 <code><b>elogd</b></code> in a secure way.
 <p>
 
-<h3><i>Using stunnel</i>:</h3>
-
-<i><b>Note: It was reported that the below instructions are outdated. However
-I will leave them for a while as a working basis for someone who volunteers
-to update them.</i></b>.<p>
-
-To use <code><b>elogd</b></code> togethwer with
-<a href="http://www.stunnel.or/g">stunnel</a>, following steps are necessary:
-
-<OL>
-<LI>Start <code><b>elogd</b></code>. If another Web server is running
-on port 80, use a different port.
-<P></P>
-<LI>Configure stunnel. This requires the creation of a certificate. See
-the <a href="http://www.stunnel.org/faq/certs.html">manual</a> for
-details.
-<P></P>
-<LI>Start the <b><code>stunnel</code></b> program if not already done
-    and start it with:
-<P>
-    <pre>stunnel -d 443 -r your.host.name:80</pre>
-    Substitute the port 80 if you started <code><b>elogd</b></code> on another port. This
-    causes <b><code>stunnel</code></b> to receive requests on the https port 443 and
-    forward them to the <code><b>elogd</b></code> port.
-<P></P>
-<LI>Put the URL under which <code><b>elogd</b></code> runs into elogd.cfg:<p>
-    <pre>URL = https://your.host.name/</pre>
-
-    Note the <b><code>https</code></b> at the beginning of the URL, which is
-    mandatory. Once you use the <b><code>https</code></b> URL, elog won't work 
-    correctly when accessed not through stunnel via 
-    <b><code>http://..</code></b>, since any redirection would always bring you 
-    back to https://...).<p></p>
-
-<LI>Connect to your logbook with a browser which supports SSL via:
-<P>
-    <pre>https://your.host.name/</pre>
-<LI>If you have problems, start stunnel in the foreground mode with
-<P>
-    <pre>stunnel -f -d 443 -r your.host.name:80</pre>
-
-This reveals any potential error.<p></p></LI>
-</OL>
-<p>
-
 <hr><a name="tech">
 <div class=section>&nbsp; How It All Works &nbsp;</div>
 <p>

doc/config.html

@@ -101,6 +101,18 @@ Use Mail Subject = Location
         Specifies the TCP port under which the server is listening. Default is
         80. Can be superseeded via the '-p' command line flag.
       </li>
+      <li>
+        <b><code>SSL = &lt;0 | 1&gt;</code></b><br>
+        Turn on Secure Socket Layer transport. If SSL is on, one can connect
+        via <code><b>https://...</b></code> to the elogd daemon. If the 
+        <code><b>URL =</b></code> directive is used, make sure to use 
+        <code><b>https://...</code></b> instead of <code><b>http://...</code></b>
+        there. The ELOG distribution contains a simple self-signed certificate 
+        in the <code><b>ssl</b></code> subdirectory. One can replace this 
+        certificate and key with a real ceritficate to avoid browser pop-up 
+        windows warning about the self-signed certificate. The default for
+        this option is <code><b>0</b></code>.
+      </li>
       <li>
         <b><code>Resource dir = &lt;directory&gt;</code></b><br>
         Specifies the root directory for ELOG resources like help files,
@@ -287,7 +299,7 @@ elogd -t &lt;your password&gt;
         If one of the three cases is true:
         <ul>
           <li>
-            <code><b>elogd</b></code> runs with <i>stunnel</i>
+            <code><b>elogd</b></code> runs with <i>SSL</i> enabled
           </li>
           <li>
             <code><b>elogd</b></code> runs under a proxy
@@ -298,9 +310,8 @@ elogd -t &lt;your password&gt;
         <p>
           then the URL under which <code><b>elogd</b></code> is running has to
           be specified manually with this statement. The URL has to contain the
-          port number if not the standard port 80 is used, it has to specify
+          port number if not the standard port 80 is used or 433 for SSL, 
-          <i>https://</i> if used under <i>stunnel</i>, and it has to contain
+          and it has to contain the directory if used under a proxy like<br>
-          the directory if used under a proxy like<br>
           <br>
         </p>
         <table border="0" cellpadding="10">
@@ -317,7 +328,7 @@ elogd -t &lt;your password&gt;
               <code>URL = https://host.domain/</code>
             </td>
             <td>
-              if running under <i>stunnel</i>
+              if SSL is enabled (SSL = 1) 
             </td>
           </tr>
           <tr>

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.7.2</div>
+      <div class="version">Current version is : 2.7.3</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>

elog.nsi

@@ -84,6 +84,10 @@ Section "ELOG system (required)" SecSystem
   SetOutPath $INSTDIR\resources
   File resources\eloghelp_english.html
 
+  ; ssl directory
+  SetOutPath $INSTDIR\ssl
+  File ssl\*.*
+
   ; src directory
   SetOutPath $INSTDIR\src
   File src\*.c

resources/eloglang.brazilian

@@ -457,3 +457,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.bulgarian

@@ -457,3 +457,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.czech

@@ -455,3 +455,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.danish

@@ -455,3 +455,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.dutch

@@ -453,3 +453,14 @@ Please choose format to import: = Kies het formaat om te importeren
 Enter text = Voer tekst in
 Show HTML source code = Toon HTML broncode
 or until I log out =  of tot ik afmeld
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.french

@@ -455,3 +455,10 @@ Please choose format to import: = Veuillez choisir le format d'importation :
 Enter text = Saisir le texte
 Show HTML source code = Voir le code source HTML
 or until I log out = ou jusqu'à ce que je me déconnecte
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.german

@@ -450,3 +450,10 @@ Please choose format to import: = Bitte Importformat ausw
 Enter text = Text eingeben
 Show HTML source code = HTML Quellcode anzeigen
 or until I log out = oder bis zum Ausloggen
+Make smaller = Verkleinern
+Original size = Originalgröße
+Make larger = Vergrößern
+Rotate left = Links rotieren
+Rotate right = Rechts rotieren
+Delete attachment = Anhang löschen
+Cannot create thumbnail, please check ImageMagick installation = Kann Vorschau nicht erstellen, bitte ImageMagick Installation überprüfen

resources/eloglang.italian

@@ -453,3 +453,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.japanese

@@ -453,3 +453,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.ru_CP1251

@@ -454,3 +454,14 @@ or until I log out =
 Show HTML source code = Показать исходный код HTML
 Cannot send email notification to "%s" = Не удается отправить уведомление для "%s"
 
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.spanish

@@ -455,3 +455,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.swedish

@@ -457,3 +457,14 @@ Show HTML source code = Visa HTML k
 or until I log out = eller tills jag loggar ut
 
 
+
+#
+#---- please translate following items and then remove this comment ----#
+#
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.turkish

@@ -457,3 +457,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.zh_CN-GB2312

@@ -456,3 +456,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

resources/eloglang.zh_CN-UTF8

@@ -456,3 +456,10 @@ Please choose format to import: =
 Enter text = 
 Show HTML source code = 
 or until I log out = 
+Make smaller = 
+Original size = 
+Make larger = 
+Rotate left = 
+Rotate right = 
+Delete attachment = 
+Cannot create thumbnail, please check ImageMagick installation = 

src/elog.c

@@ -9,7 +9,7 @@
 
 \********************************************************************/
 
-#define VERSION "2.7.2"
+#define VERSION "2.7.3"
 char svn_revision[] = "$Id$";
 
 /* ELOG identification */

src/elogd.c

@@ -10,7 +10,7 @@
 \********************************************************************/
 
 /* Version of ELOG */
-#define VERSION "2.7.2"
+#define VERSION "2.7.3"
 char svn_revision[] = "$Id$";
 
 /* ELOG identification */
@@ -5584,7 +5584,8 @@ void replace_inline_img(LOGBOOK *lbs, char *str)
 
 /*------------------------------------------------------------------*/
 
-void convert_elog_link(LOGBOOK *lbs, char *link, char *link_text, char *result, int absolute_link, int message_id)
+void convert_elog_link(LOGBOOK * lbs, char *link, char *link_text, char *result, int absolute_link,
+                       int message_id)
 {
    char str[256], base_url[256];
    int i;
@@ -8930,7 +8931,8 @@ void attrib_from_param(int n_attr, char attrib[MAX_N_ATTR][NAME_LENGTH])
 
 void ricon(char *name, char *comment, char *onclick)
 {
-   rsprintf("<img align=\"middle\" name=\"%s\" src=\"icons/elc_%s.png\" alt=\"%s\" title=\"%s\" border=\"0\"\n",
+   rsprintf
+       ("<img align=\"middle\" name=\"%s\" src=\"icons/elc_%s.png\" alt=\"%s\" title=\"%s\" border=\"0\"\n",
         name, name, comment, comment);
    rsprintf(" onclick=\"%s\"", onclick);
    rsprintf(" onmousedown=\"document.images.%s.src='icons/eld_%s.png'\"\n", name, name);
@@ -11154,7 +11156,8 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
                            strlcpy(str, att[index], sizeof(str));
                            str[13] = 0;
                            if (strrchr(thumb_name, DIR_SEPARATOR))
-                              strlcpy(file_enc, strrchr(thumb_name, DIR_SEPARATOR)+1+14, sizeof(file_enc));
+                              strlcpy(file_enc, strrchr(thumb_name, DIR_SEPARATOR) + 1 + 14,
+                                      sizeof(file_enc));
                            else
                               strlcpy(file_enc, thumb_name + 14, sizeof(file_enc));
                            url_encode(file_enc, sizeof(file_enc));      /* for file names with special characters like "+" */
@@ -11169,7 +11172,8 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
                                  strlcpy(str, att[index], sizeof(str));
                                  str[13] = 0;
                                  if (strrchr(thumb_name, DIR_SEPARATOR))
-                                    strlcpy(file_enc, strrchr(thumb_name, DIR_SEPARATOR)+1+14, sizeof(file_enc));
+                                    strlcpy(file_enc, strrchr(thumb_name, DIR_SEPARATOR) + 1 + 14,
+                                            sizeof(file_enc));
                                  else
                                     strlcpy(file_enc, thumb_name + 14, sizeof(file_enc));
                                  url_encode(file_enc, sizeof(file_enc));        /* for file names with special characters like "+" */
@@ -13966,8 +13970,7 @@ void csv_import(LOGBOOK * lbs, const char *csv, const char *csvfile)
 
          /* skip message ID and date attributes */
          for (i = attr_offset = 0; i < n; i++)
-            if (strieq(list + i * NAME_LENGTH, "Message ID") ||
+            if (strieq(list + i * NAME_LENGTH, "Message ID") || strieq(list + i * NAME_LENGTH, "Date"))
-                strieq(list + i * NAME_LENGTH, "Date"))
                attr_offset++;
 
          if (isparam("preview")) {
@@ -16445,8 +16448,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
    char str[NAME_LENGTH], ref[256], *nowrap, sclass[80], format[256],
        file_name[MAX_PATH_LENGTH], *slist, *svalue, comment[256];
    char display[NAME_LENGTH], attr_icon[80];
-   int i, j, i_line, index, colspan, n_attachments, line_len, thumb_status,
+   int i, j, i_line, index, colspan, n_attachments, line_len, thumb_status, max_line_len;
-      max_line_len;
    BOOL skip_comma;
    FILE *f;
    struct tm *pts;
@@ -17044,7 +17046,8 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
             } else {
 
                if (thumb_status) {
-                  rsprintf("<tr><td colspan=%d class=\"attachment\">%s %d: <a href=\"%s\" target=\"_blank\">%s</a>\n",
+                  rsprintf
+                      ("<tr><td colspan=%d class=\"attachment\">%s %d: <a href=\"%s\" target=\"_blank\">%s</a>\n",
                        colspan, loc("Attachment"), index + 1, ref, attachment[index] + 14);
 
                   if (show_attachments) {
@@ -17515,8 +17518,7 @@ BOOL is_command_allowed(LOGBOOK * lbs, char *command)
    /* exclude other non-localized commands */
    else if (command[0] && strieq(command, "GetMD5")) {
       return TRUE;
-   }
+   } else if (command[0] && strieq(command, "IM")) {
-   else if (command[0] && strieq(command, "IM")) {
       return TRUE;
    }
    /* check if command is present in the menu list */
@@ -22440,8 +22442,7 @@ void call_image_magick(LOGBOOK *lbs)
 
    if (strieq(getparam("req"), "original")) {
       new_size = (int) (cur_width / 1.5);
-      sprintf(cmd, "convert '%s' '%s'", 
+      sprintf(cmd, "convert '%s' '%s'", file_name, thumb_name);
-         file_name, thumb_name); 
    }
 
    if (strieq(getparam("req"), "smaller")) {
@@ -22475,8 +22476,7 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
 {
    int size, i, j, k, n, n_log, status, fh, length, message_error, index, n_hidden,
        message_id, orig_message_id, format_flags[MAX_N_ATTR], att_hide[MAX_ATTACHMENTS],
-       att_inline[MAX_ATTACHMENTS], n_attachments, n_lines, n_disp_attr, attr_index[MAX_N_ATTR],
+       att_inline[MAX_ATTACHMENTS], n_attachments, n_lines, n_disp_attr, attr_index[MAX_N_ATTR], thumb_status;
-       thumb_status;
    char str[2 * NAME_LENGTH], ref[256], file_enc[256], attrib[MAX_N_ATTR][NAME_LENGTH];
    char date[80], text[TEXT_SIZE], menu_str[1000], cmd[256], script[256],
        orig_tag[80], reply_tag[MAX_REPLY_TO * 10], display[NAME_LENGTH],
@@ -24894,7 +24894,8 @@ void show_uploader_finished(LOGBOOK * lbs)
    rsprintf("    if (opener.document.title == \"FCKeditor\") {\n");
    rsprintf("       i = opener.parent.next_attachment;\n");
    rsprintf("       opener.FCKeditorAPI.GetInstance('Text').\n");
-   rsprintf("InsertHtml('<a href=\"%s\"><img border=0 alt=\"%s\" src=\"%s\" name=\"att'+(i-1)+'\" id=\"att'+(i-1)+'\"></a>');\n",
+   rsprintf
+       ("InsertHtml('<a href=\"%s\"><img border=0 alt=\"%s\" src=\"%s\" name=\"att'+(i-1)+'\" id=\"att'+(i-1)+'\"></a>');\n",
         ref, att + 14, ref_thumb);
    rsprintf("       opener.parent.document.form1.inlineatt.value = '%s';\n", att);
    rsprintf("       opener.parent.document.form1.jcmd.value = 'Upload';\n");
@@ -27075,8 +27076,7 @@ void server_loop(void)
 
    /* initialize SSL if requested */
    _ssl_flag = 0;
-   if (getcfg("global", "SSL", str, sizeof(str)) &&
+   if (getcfg("global", "SSL", str, sizeof(str)) && atoi(str) == 1) {
-      atoi(str) == 1) {
 #ifdef HAVE_SSL
       ssl_ctx = init_ssl();
       if (ssl_ctx == NULL) {
@@ -27348,7 +27348,6 @@ void server_loop(void)
                      min = ka_time[i];
                      i_min = i;
                   }
-
 #ifdef HAVE_SSL
                if (_ssl_flag) {
                   SSL_set_fd(ssl_con, ka_sock[i_min]);