Release 2.7.5-1

SVN revision: 2130

NT/elogd.sln

@@ -9,6 +9,10 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "locext", "locext.vcproj", "{77ED3530-9382-4830-8513-9729C051A93E}"
 EndProject
 Global
+	GlobalSection(SubversionScc) = preSolution
+		Svn-Managed = True
+		Manager = AnkhSVN - Subversion Support for Visual Studio
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32

checklist.txt

@@ -23,7 +23,6 @@ On midas.psi.ch:
 
 Declare new version at freshmeat.
 
-
 Checklist for new ELOG intermediate release
 ===========================================
 

doc/ChangeLog

@@ -1,3 +1,22 @@
+Version 2.7.5, released Sept. 22th 2008
+=======================================
+
+- Added msvcr71.dll to Windows distribution
+- Fixed problem with quick filters and ^xxx$ search
+- Fixed bug which could crash elogd
+- Added "past-n" to display last n hours
+- Encode command line if it contains a '<'
+- Evaluate "skiplock" parameter to make elog submissions work with "use lock=1"
+- encoded logbook in case it contains blanks
+- added "skiplock" parameter to make elog work with "use lock=1"
+- Call _exit in my_shell to prevent calling of cleanup()
+- Search for whole words in quick filter using ^*$ regular expression
+- Made preset of $user_email work with attributes of type useremail
+- Added code to check for invalid URL in the form 'http://server//xyz' 
+- Do not go into infite loop for interrupted POST transfer
+- Added sorting for muserlist and museremail
+- Made quick filter work with icons
+
 Version 2.7.4, released June 9th, 2008
 ======================================
 

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

doc/index_d.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.3</div>
+      <div class="version">Current version is : 2.7.5</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>
       

resources/eloglang.brazilian

@@ -447,7 +447,6 @@ XML Import =
 A old entry has been updated on %s = 
 This entry has in meantime been locked by %s = 
 This entry has in meantime been modified by someone else = 
-Submitting it now would overwrite the other modification and is therefore prohibited = 
 First entry, Ctrl-Home = 
 Previous entry, Ctrl-PgUp = 
 Next entry, Ctrl-PgDn = 

resources/eloglang.bulgarian

@@ -447,7 +447,6 @@ XML Import =
 A old entry has been updated on %s = 
 This entry has in meantime been locked by %s = 
 This entry has in meantime been modified by someone else = 
-Submitting it now would overwrite the other modification and is therefore prohibited = 
 First entry, Ctrl-Home = 
 Previous entry, Ctrl-PgUp = 
 Next entry, Ctrl-PgDn = 

resources/eloglang.czech

@@ -445,7 +445,6 @@ XML Import =
 A old entry has been updated on %s = 
 This entry has in meantime been locked by %s = 
 This entry has in meantime been modified by someone else = 
-Submitting it now would overwrite the other modification and is therefore prohibited = 
 First entry, Ctrl-Home = 
 Previous entry, Ctrl-PgUp = 
 Next entry, Ctrl-PgDn = 

resources/eloglang.danish

@@ -445,7 +445,6 @@ XML Import =
 A old entry has been updated on %s = 
 This entry has in meantime been locked by %s = 
 This entry has in meantime been modified by someone else = 
-Submitting it now would overwrite the other modification and is therefore prohibited = 
 First entry, Ctrl-Home = 
 Previous entry, Ctrl-PgUp = 
 Next entry, Ctrl-PgDn = 

resources/eloglang.dutch

@@ -443,7 +443,6 @@ XML Import = XML import
 A old entry has been updated on %s = Een oud bericht is vernieuwd op %s
 This entry has in meantime been locked by %s = Dit bericht is intussen geblokkeerd door %s
 This entry has in meantime been modified by someone else = Dit bericht is intussen geblokkeerd door iemand anders
-Submitting it now would overwrite the other modification and is therefore prohibited = Nu versturen zou een andere wijziging overschrijven en is daarom niet toegestaan
 First entry, Ctrl-Home = Eerste bericht, Ctrl-Home
 Previous entry, Ctrl-PgUp = Vorige bericht, Ctrl-PgUp
 Next entry, Ctrl-PgDn = Volgende bericht, Ctrl-PgDn

resources/eloglang.french

@@ -441,7 +441,6 @@ XML Import = Import XML
 A old entry has been updated on %s = Un ancienne entrée a été mise à jour sur %s
 This entry has in meantime been locked by %s = Cette entrée a été verrouillée entre temps sur %s
 This entry has in meantime been modified by someone else = Cette entrée a été modifiée entre temps par quelqu'un d'autre
-Submitting it now would overwrite the other modification and is therefore prohibited = La valider maintenant écraserait l'autre modification et n'est donc pas autorisé
 First entry, Ctrl-Home = Première entrée, Ctrl-Home
 Previous entry, Ctrl-PgUp = Entrée précédente, Ctrl-PgUp
 Next entry, Ctrl-PgDn = Entrée suivante, Ctrl-PgDn

resources/eloglang.german

@@ -440,7 +440,6 @@ XML Import = XML Import
 A old entry has been updated on %s = Ein alter Eintrag wurde auf %s erneuert
 This entry has in meantime been locked by %s = Dieser Eintrag wurde in der Zwischenzeit von %s gesperrt
 This entry has in meantime been modified by someone else = Dieser Eintrag wurde in der Zwischenzeit von jemandem andern geändert
-Submitting it now would overwrite the other modification and is therefore prohibited = Jetzt abschicken würde die andere Änderung überscheiben und ist deshalb verboten
 First entry, Ctrl-Home = Erster Eintrag, Strg-Pos1
 Previous entry, Ctrl-PgUp = Vorheriger Eintrag, Strg-BildHoch
 Next entry, Ctrl-PgDn = Nächster Eintrag, Strg-BildRunter

resources/eloglang.italian

@@ -443,7 +443,6 @@ XML Import =
 A old entry has been updated on %s = 
 This entry has in meantime been locked by %s = 
 This entry has in meantime been modified by someone else = 
-Submitting it now would overwrite the other modification and is therefore prohibited = 
 First entry, Ctrl-Home = 
 Previous entry, Ctrl-PgUp = 
 Next entry, Ctrl-PgDn = 

resources/eloglang.japanese

@@ -443,7 +443,6 @@ XML Import =
 A old entry has been updated on %s = 
 This entry has in meantime been locked by %s = 
 This entry has in meantime been modified by someone else = 
-Submitting it now would overwrite the other modification and is therefore prohibited = 
 First entry, Ctrl-Home = 
 Previous entry, Ctrl-PgUp = 
 Next entry, Ctrl-PgDn = 

resources/eloglang.ru_CP1251

@@ -449,7 +449,6 @@ Enter heading level (1, 2 or 3) =
 Insert anchor point = Вставить якорь
 Derive attributes from XML file = Извлечь атрибуты из XML файла
 XML import preview of %s = Предпросмотр XML импорта %s
-Submitting it now would overwrite the other modification and is therefore prohibited = Çàïðåùåíî, ïîòîìó ÷òî ñåé÷àñ ìîæåò ïåðåïèñàòü äðóãóþ ìîäèôèêàöèþ.
 or until I log out = или пока я не выйду
 Show HTML source code = Показать исходный код HTML
 Cannot send email notification to "%s" = Не удается отправить уведомление для "%s"

resources/eloglang.spanish

@@ -441,7 +441,6 @@ XML Import = Importar XML
 A old entry has been updated on %s = Una entrada anterior ha sido actualizada en %s
 This entry has in meantime been locked by %s = Esta entrada ha sido bloqueada por %s
 This entry has in meantime been modified by someone else = Esta entrada ha sido modificada por alguien mas mientras se escribia
-Submitting it now would overwrite the other modification and is therefore prohibited = Enviar esto ahora sobreescribiria la otra modificacion, por lo tanto no esta permitido
 First entry, Ctrl-Home = Primera entrada, Ctrl-Home
 Previous entry, Ctrl-PgUp = Entrada anterior, Ctrl-PgUp
 Next entry, Ctrl-PgDn = Entrada siguiente, Ctrl-PgDn

resources/eloglang.swedish

@@ -445,7 +445,6 @@ XML Import = XML-Import
 A old entry has been updated on %s = En gammal post har uppdaterats på %s
 This entry has in meantime been locked by %s = Denna post har under tiden låsts av %s
 This entry has in meantime been modified by someone else = Denna post har under tiden ändrats av någon annan
-Submitting it now would overwrite the other modification and is therefore prohibited = Om den sparas nu skulle den andra ändringen skrivas över och är därför inte tillåtet 
 First entry, Ctrl-Home = Första posten, Ctrl-Home
 Previous entry, Ctrl-PgUp = Föregående post, Ctrl-PgUp
 Next entry, Ctrl-PgDn = Nästa post, Ctrl-PgDn

resources/eloglang.turkish

@@ -447,7 +447,6 @@ XML Import =
 A old entry has been updated on %s = 
 This entry has in meantime been locked by %s = 
 This entry has in meantime been modified by someone else = 
-Submitting it now would overwrite the other modification and is therefore prohibited = 
 First entry, Ctrl-Home = 
 Previous entry, Ctrl-PgUp = 
 Next entry, Ctrl-PgDn = 

resources/eloglang.zh_CN-GB2312

@@ -446,7 +446,6 @@ XML Import =
 A old entry has been updated on %s = 
 This entry has in meantime been locked by %s = 
 This entry has in meantime been modified by someone else = 
-Submitting it now would overwrite the other modification and is therefore prohibited = 
 First entry, Ctrl-Home = 
 Previous entry, Ctrl-PgUp = 
 Next entry, Ctrl-PgDn = 

resources/eloglang.zh_CN-UTF8

@@ -446,7 +446,6 @@ XML Import =
 A old entry has been updated on %s = 
 This entry has in meantime been locked by %s = 
 This entry has in meantime been modified by someone else = 
-Submitting it now would overwrite the other modification and is therefore prohibited = 
 First entry, Ctrl-Home = 
 Previous entry, Ctrl-PgUp = 
 Next entry, Ctrl-PgDn = 

src/elog.c

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

src/elogd.c

@@ -9,7 +9,7 @@
  \********************************************************************/
 
 /* Version of ELOG */
-#define VERSION "2.7.4"
+#define VERSION "2.7.5"
 char svn_revision[] = "$Id$";
 
 /* ELOG identification */
@@ -5802,25 +5802,45 @@ PATTERN_LIST pattern_list[] = {
    /* smileys */
    {
     ":))", "<img alt=\"Happy\" title=\"Happy\" src=\"%sicons/happy.png\">"}, {
-   ":-))", "<img alt=\"Happy\" title=\"Happy\" src=\"%sicons/happy.png\">"}, {
+                                                                              ":-))",
+                                                                              "<img alt=\"Happy\" title=\"Happy\" src=\"%sicons/happy.png\">"},
+   {
     ":)", "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"}, {
-   ":-)", "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"}, {
+                                                                             ":-)",
+                                                                             "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"},
+   {
     ":(", "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"}, {
-   ":-(", "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"}, {
+                                                                             ":-(",
+                                                                             "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"},
+   {
     ";)", "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"}, {
-   ";-)", "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"}, {
+                                                                          ";-)",
+                                                                          "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"},
+   {
     ":d", "<img alt=\"Big grin\" title=\"Big grin\" src=\"%sicons/biggrin.png\">"}, {
-   "?-)", "<img alt=\"Confused\" title=\"Confused\" src=\"%sicons/confused.png\">"}, {
+                                                                                     "?-)",
+                                                                                     "<img alt=\"Confused\" title=\"Confused\" src=\"%sicons/confused.png\">"},
+   {
     ";(", "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"}, {
-   ";-(", "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"}, {
+                                                                                ";-(",
+                                                                                "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"},
+   {
     ":]", "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"}, {
-   ":-]", "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"}, {
+                                                                                   ":-]",
+                                                                                   "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"},
+   {
     ":o", "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"}, {
-   ":-o", "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"}, {
+                                                                          ":-o",
+                                                                          "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"},
+   {
     "8-)", "<img alt=\"Cool\" title=\"Cool\" src=\"%sicons/cool.png\">"}, {
-   "8o", "<img alt=\"Astonished\" title=\"Astonished\" src=\"%sicons/astonished.png\">"}, {
+                                                                           "8o",
+                                                                           "<img alt=\"Astonished\" title=\"Astonished\" src=\"%sicons/astonished.png\">"},
+   {
     "x-(", "<img alt=\"Mad\" title=\"Mad\" src=\"%sicons/mad.png\">"}, {
-   ":p", "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"}, {
+                                                                        ":p",
+                                                                        "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
+   {
     ":-p", "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
    /* formatting */
    {
@@ -5830,21 +5850,29 @@ PATTERN_LIST pattern_list[] = {
                                                       "[/u]", "</u>"}, {
                                                                         "[i]", "<i>"}, {
                                                                                         "[/i]", "</i>"}, {
-   "[center]", "<center>"}, {
+                                                                                                          "[center]",
+                                                                                                          "<center>"},
+   {
     "[/center]", "</center>"}, {
                                 "[color=", "<font color=\"%s\">"}, {
                                                                     "[/color]", "</font>"}, {
-   "[size=", "<font size=\"%s\">"}, {
+                                                                                             "[size=",
+                                                                                             "<font size=\"%s\">"},
+   {
     "[/size]", "</font>"}, {
                             "[font=", "<font face=\"%s\">"}, {
                                                               "[/font]", "</font>"}, {
                                                                                       "\r\n[code]", "<pre>"}, {
-   "[code]", "<pre>"}, {
+                                                                                                               "[code]",
+                                                                                                               "<pre>"},
+   {
     "[/code]\r\n", "</pre>"}, {
                                "[/code]", "</pre>"}, {
                                                       "\r\n[code1]", "<pre>"}, {
                                                                                 "[code1]", "<pre>"}, {
-   "[/code1]\r\n", "</pre>"}, {
+                                                                                                      "[/code1]\r\n",
+                                                                                                      "</pre>"},
+   {
     "[/code1]", "</pre>"},
    /* lists */
    {
@@ -5862,13 +5890,16 @@ PATTERN_LIST pattern_list[] = {
                                           "[h2]", "<h2>"}, {
                                                             "[/h2]", "</h2>"}, {
                                                                                 "[h3]", "<h3>"}, {
-   "[/h3]", "</h3>"},
+                                                                                                  "[/h3]",
+                                                                                                  "</h3>"},
    /* URLs */
    {
     "[url=", "<a href=\"%#\">%s</a>"}, {
                                         "[url]", "<a href=\"%#\">%s</a>"}, {
                                                                             "[/url]", ""}, {
-   "[email]", "<a href=\"mailto:%#\">%s</a>"}, {
+                                                                                            "[email]",
+                                                                                            "<a href=\"mailto:%#\">%s</a>"},
+   {
     "[/email]", ""}, {
                       "[img]", "<a href=\"%#\"><img border=0 src=\"%#?thumb=1\"></a>"}, {
                                                                                          "[/img]", ""},
@@ -5887,7 +5918,9 @@ PATTERN_LIST pattern_list[] = {
     "[table]", "<table><tr><td>"}, {
                                     "[table ", "<table %s><tr><td>"}, {
                                                                        "|-", "</td></tr><tr><td>"}, {
-   "|", "</td><td>"}, {
+                                                                                                     "|",
+                                                                                                     "</td><td>"},
+   {
     "[/table]", "</td></tr></table>"},
    /* horizontal line */
    {
@@ -5896,7 +5929,8 @@ PATTERN_LIST pattern_list[] = {
    {
     "[anchor]", "<a name=\"%#\">"}, {
                                      "[/anchor]", "</a>"}, {
-"", ""}};
+                                                            "", ""}
+};
 
 char
 *email_quote_table =
@@ -10111,7 +10145,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
                /* sort list */
                qsort(user_list, n, sizeof(char *), ascii_compare);
 
-               for (i = 0; i<n; i++) {
+               for (i = 0; i < n; i++) {
                   sprintf(str, "%s_%d", ua, i);
 
                   rsprintf("<span style=\"white-space:nowrap;\">\n");
@@ -10167,14 +10201,14 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
                /* sort list */
                qsort(user_list, n, sizeof(char *), ascii_compare);
 
-               for (i = 0; i<n ; i++) {
+               for (i = 0; i < n; i++) {
                   sprintf(str, "%s_%d", ua, i);
 
                   rsprintf("<span style=\"white-space:nowrap;\">\n");
 
                   for (j = 0; j < n_moptions; j++)
                      if (strcmp(attr_moptions[j], user_list[i]) == 0 ||
-                         strcmp(attr_moptions[j]+7, user_list[i]) == 0)
+                         strcmp(attr_moptions[j] + 7, user_list[i]) == 0)
                         break;
 
                   if (j < n_moptions)
@@ -10219,7 +10253,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
                      break;
                   get_user_line(lbs, login_name, NULL, NULL, str, NULL, NULL);
 
-                  if (strieq(str, attrib[index]) || strieq(str, attrib[index]+7))
+                  if (strieq(str, attrib[index]) || strieq(str, attrib[index] + 7))
                      rsprintf("<option selected value=\"%s\">%s\n", str, str);
                   else
                      rsprintf("<option value=\"%s\">%s\n", str, str);
@@ -19971,9 +20005,9 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
 
                   if (comment[0] == 0) {
                      strlcpy(str, getparam(attr_list[i]), sizeof(str));
-                     if (str[0] == '^' && str[strlen(str)-1] == '$') {
+                     if (str[0] == '^' && str[strlen(str) - 1] == '$') {
-                        str[strlen(str)-1] = 0;
+                        str[strlen(str) - 1] = 0;
-                        strlcpy(comment, str+1, NAME_LENGTH);
+                        strlcpy(comment, str + 1, NAME_LENGTH);
                      } else
                         strlcpy(comment, str, NAME_LENGTH);
                      strlcpy(str, comment, sizeof(str));
@@ -20012,9 +20046,9 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
          attrib[i][0] = 0;
          if (isparam(attr_list[i])) {
             strlcpy(str, getparam(attr_list[i]), sizeof(str));
-            if (str[0] == '^' && str[strlen(str)-1] == '$') {
+            if (str[0] == '^' && str[strlen(str) - 1] == '$') {
-               str[strlen(str)-1] = 0;
+               str[strlen(str) - 1] = 0;
-               strlcpy(attrib[i], str+1, NAME_LENGTH);
+               strlcpy(attrib[i], str + 1, NAME_LENGTH);
             } else
                strlcpy(attrib[i], str, NAME_LENGTH);
          }
@@ -21863,7 +21897,8 @@ void submit_elog(LOGBOOK * lbs)
                sprintf(str, loc("This entry has in meantime been modified by someone else"));
             strlcat(str, ".<p>\n", sizeof(str));
             strlcat(str,
-                    loc("Submitting it now would overwrite the other modification and is therefore prohibited"),
+                    loc
+                    ("Submitting it now would overwrite the other modification and is therefore prohibited"),
                     sizeof(str));
             strlcat(str, ".", sizeof(str));