Added option 'Reply string'

SVN revision: 395

doc/ChangeLog

@@ -6,6 +6,10 @@ Version 2.3.1, released Februar xxx, 2003
 - Added option 'subst on edit <attrib> = <value>"
 - Removed "number attachments", added "enable attachments"
 - Redesigned attachment uploading
+- Use absolute "Location:" statements for redirection if "URL"
+  option is present in elogd.cfg
+- Added proper handling of "<br>" in attributes
+- Added "Reply string" option
 
 Version 2.3.0, released Februar 7th, 2003
 =========================================

doc/config.html

@@ -724,6 +724,12 @@ entry when creating a reply to that entry. This can make sense for example for
 the author, since the author of a reply can be different from the original author.
 <p>
 
+<LI><b><code>Reply string = &lt;string&gt;</code></b>
+<br>
+String used to mark original message lines. Default is <b><code>"> "</code></b>. Can
+be empty string ("") if no message marking is desired.
+<p>
+
 <LI><b><code>Subst on reply &lt;attribute &gt; = &lt;string&gt;</code></b>
 <br>
 Substitution of attributes for replies. This option can be used to replace the current

eloglang.dutch

@@ -197,7 +197,7 @@ All = Alle
 Display = Toon
 entries per page = berichten per pagina
 Toggle all = Toon alles
-Automatic email notifications=Automatisch e-mail aankondiging
+Enable email notifications=Automatisch e-mail aankondiging
 
 # New strings for V2.2.2
 A old entry has been updated on %s = Een ouder bericht is op %s gewijzigd
@@ -208,3 +208,13 @@ Expand = Uitbreiden
 Full = Volledig
 Summary = Samenvatting
 Threaded = Berichtdraad
+
+#
+# New strings for V2.2.6
+ELOG Entries = ELOG Invoer
+Filters = Filter
+Mode = Modus
+Options = Opties
+Error: start date after end date = Fout: Begindatum begint na de einddatum
+and all their replies = en alle antwoorden
+Your request has been forwarded to the administrator. You will be notified by email upon activation of your new account. = Je verzoek is doorgestuurd naar de administraotr. Je krijgt per e-mail bericht als het account geactiveerd is.

eloglang.french

@@ -207,7 +207,7 @@ Display = Afficher
 entries per page = entrées par page
 Toggle all = Basculer tout
 Selected entries = Entrées sélectionnées
-Automatic email notifications = Notifications automatiques par mél.
+Enable email notifications = Notifications automatiques par mél.
 
 #
 # New strings for V2.2.2

eloglang.german

@@ -198,7 +198,7 @@ Display = Zeige
 entries per page = Einträge pro Seite
 Toggle all = Alle umschalten
 Selected entries = Ausgewählte Einträge
-Automatic email notifications = Automatische Email Benachrichtigung
+Enable email notifications = Email Benachrichtigung	ermöglichen
 
 #
 # New strings for V2.2.2

src/elogd.c

@@ -6,6 +6,9 @@
   Contents:     Web server program for Electronic Logbook ELOG
 
   $Log$
+  Revision 1.14  2003/02/16 13:29:02  midas
+  Added option 'Reply string'
+
   Revision 1.13  2003/02/15 10:12:33  midas
   Special treatement of <br> in attributes
 
@@ -1376,7 +1379,14 @@ int  fh;
               while (*pstr == ' ' || *pstr == '\t')
                 *pstr-- = 0;
 
-              strcpy(value, str);
+              if (str[0] == '"' && str[strlen(str)-1] == '"')
+                {
+                strcpy(value, str+1);
+                value[strlen(value)-1] = 0;
+                }
+              else
+                strcpy(value, str);
+
               free(str);
               return 1;
               }
@@ -4580,7 +4590,7 @@ char   str[80], date[80], attrib[MAX_N_ATTR][NAME_LENGTH],
 void show_edit_form(LOGBOOK *lbs, int message_id, BOOL bedit, BOOL upload)
 {
 int    i, j, n, index, size, width, height, fh, length, first;
-char   str[1000], preset[1000], *p, star[80], comment[10000];
+char   str[1000], preset[1000], *p, star[80], comment[10000], reply_string[256];
 char   list[MAX_N_ATTR][NAME_LENGTH], file_name[256], *buffer, format[256];
 char   date[80], attrib[MAX_N_ATTR][NAME_LENGTH], text[TEXT_SIZE],
        orig_tag[80], reply_tag[80], att[MAX_ATTACHMENTS][256], encoding[80],
@@ -5050,6 +5060,10 @@ time_t now;
       else
         {
         p = text;
+
+        if (!getcfg(lbs->name, "Reply string", reply_string))
+          strcpy(reply_string, "> ");
+
         do
           {
           if (strchr(p, '\n'))
@@ -5057,9 +5071,15 @@ time_t now;
             *strchr(p, '\n') = 0;
 
             if (encoding[0] == 'H')
-              rsprintf("&gt; %s<br>\n", p);
+              {
+              rsputs2(reply_string);
+              rsprintf("%s<br>\n", p);
+              }
             else
-              rsprintf("> %s\n", p);
+              {
+              rsputs(reply_string);
+              rsprintf("%s\n", p);
+              }
 
             p += strlen(p)+1;
             if (*p == '\n')
@@ -5068,9 +5088,15 @@ time_t now;
           else
             {
             if (encoding[0] == 'H')
-              rsprintf("&gt; %s<p>\n", p);
+              {
+              rsputs2(reply_string);
+              rsprintf("%s<p>\n", p);
+              }
             else
-              rsprintf("> %s\n\n", p);
+              {
+              rsputs(reply_string);
+              rsprintf("%s\n\n", p);
+              }
 
             break;
             }