From bf342b72c2414807f382ba499a2c23653da273aa Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Wed, 19 Mar 2003 08:56:40 +0000
Subject: [PATCH] Added 'quote on reply'

SVN revision: 445
---
 doc/ChangeLog   |  6 ++++
 doc/config.html |  5 ++++
 eloglang.french | 30 +++++++++++++++++--
 src/elogd.c     | 76 ++++++++++++++++++++++++++-----------------------
 4 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f05e598a..de4a5043 100755
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+Version 2.3.4, released March xxth, 2003
+========================================
+
+- Added option "Quote on reply"
+
+
 Version 2.3.3, released March 14th, 2003
 ========================================
 
diff --git a/doc/config.html b/doc/config.html
index 5c2c9c64..e651aa5b 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -739,6 +739,11 @@ 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>Quote on reply = 0 | 1</code></b>
+<br>
+This flag controls if the original text is quoted in a reply. Default is <b>1</b>
+<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
diff --git a/eloglang.french b/eloglang.french
index 03692ab8..d3e3c874 100755
--- a/eloglang.french
+++ b/eloglang.french
@@ -3,8 +3,8 @@
 # $Revision$
 #
 
-# ElogLang.French - French interface file for ELOG 2.2.5+
-# version 1.5 - 12/01/03 by Fred Pacquier <fredp@dial.oleane.com>
+# ElogLang.French - French interface file for ELOG 2.3.3+
+# version 1.6 - 14/03/03 by Fred Pacquier <fredp@dial.oleane.com>
 #
 
 #
@@ -220,3 +220,29 @@ Expand = D
 Full = Détail
 Summary = Résumé
 Threaded = Arborescence
+
+#
+# New strings for V2.2.6
+ELOG Entries = entrées ELOG
+Filters = Filtres
+Mode = Mode
+Options = Options
+Error: start date after end date = Erreur : la date de début est postérieure à la date de fin
+and all their replies = et toutes leurs réponses
+Your request has been forwarded to the administrator. You will be notified by email upon activation of your new account. = Votre demande a été envoyée à l'administrateur. Vous serez averti(e) par mél lors de l'activation de votre nouveau compte.
+
+#
+# New strings for V2.3.1
+Upload = Envoyer
+Requested = Demandé
+Registration request on logbook "%s" = Demande d'inscription pour le registre "%s"
+A new ELOG user wants to register on "%s" = Un nouvel utilisateur ELOG souhaite s'inscrire à "%s"
+
+#
+# New strings for V2.3.2
+One message = Un message
+%d messages = %d messges
+and its replies = avec ses réponses
+and their replies =	avec leurs réponses
+moved successfully from "%s" to "%s" = déplacés avec succès de "%s" à "%s"
+copied successfully from "%s" to "%s" = copiés avec succès de "%s" à "%s"
diff --git a/src/elogd.c b/src/elogd.c
index 40b1d510..6bccc485 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
   Contents:     Web server program for Electronic Logbook ELOG
 
   $Log$
+  Revision 1.49  2003/03/19 08:56:40  midas
+  Added 'quote on reply'
+
   Revision 1.48  2003/03/14 08:55:46  midas
   Version 2.3.3
 
@@ -5298,49 +5301,52 @@ time_t now;
         }
       else
         {
-        p = text;
-
-        if (!getcfg(lbs->name, "Reply string", reply_string))
-          strcpy(reply_string, "> ");
-
-        do
+        if (!getcfg(lbs->name, "Quote on reply", str) || atoi(str) > 0)
           {
-          if (strchr(p, '\n'))
-            {
-            *strchr(p, '\n') = 0;
+          p = text;
 
-            if (encoding[0] == 'H')
+          if (!getcfg(lbs->name, "Reply string", reply_string))
+            strcpy(reply_string, "> ");
+
+          do
+            {
+            if (strchr(p, '\n'))
               {
-              rsputs2(reply_string);
-              rsprintf("%s<br>\n", p);
+              *strchr(p, '\n') = 0;
+
+              if (encoding[0] == 'H')
+                {
+                rsputs2(reply_string);
+                rsprintf("%s<br>\n", p);
+                }
+              else
+                {
+                rsputs(reply_string);
+                rsprintf("%s\n", p);
+                }
+
+              p += strlen(p)+1;
+              if (*p == '\n')
+                p++;
               }
             else
               {
-              rsputs(reply_string);
-              rsprintf("%s\n", p);
+              if (encoding[0] == 'H')
+                {
+                rsputs2(reply_string);
+                rsprintf("%s<p>\n", p);
+                }
+              else
+                {
+                rsputs(reply_string);
+                rsprintf("%s\n\n", p);
+                }
+
+              break;
               }
 
-            p += strlen(p)+1;
-            if (*p == '\n')
-              p++;
-            }
-          else
-            {
-            if (encoding[0] == 'H')
-              {
-              rsputs2(reply_string);
-              rsprintf("%s<p>\n", p);
-              }
-            else
-              {
-              rsputs(reply_string);
-              rsprintf("%s\n\n", p);
-              }
-
-            break;
-            }
-
-          } while (TRUE);
+            } while (TRUE);
+          }
         }
       }