From 9e2a1468d781f77b18a88b343a8927320cdfb0cf Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Tue, 2 Aug 2005 18:39:12 +0000
Subject: [PATCH] Remove obsolete options

SVN revision: 1466
---
 doc/config.html | 25 ++++++++++++++++++++++++-
 src/elogd.c     | 22 +++++++++-------------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/doc/config.html b/doc/config.html
index 9afc1cb0..14088b97 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -1222,7 +1222,7 @@ Same as before, but gets added after the previous entry.
 <p>
 
 <li><b><code>Prepend on edit = &lt;string&gt;</code></b>
-<li><b><code>Apend on edit = &lt;string&gt;</code></b>
+<li><b><code>Append on edit = &lt;string&gt;</code></b>
 </br>
 Same as before, but for editing entries.
 <p>
@@ -1707,6 +1707,12 @@ have been updated recently. If this value is set to <b>2</b>, the resubmit box
 is not displayed at all. The default is <b>0</b>.
 <p>
 
+<li><b><code>Resubmit replies = 0|1</code></b> </br> If this flag is set to 
+<b>1</b> and an entry is resubmited as a new entry and this entry has replies, 
+all replies of this entry are resubmittes as new entries as well. The default is 
+<b>0</b>. 
+<p>
+
 <li><b><code>Display Email recipients = 0|1</code></b>
 </br>
 If this flag is <b>1</b>, the email recipients are displayed when a logbook
@@ -1850,6 +1856,23 @@ This switch has two meanings. First, it defines the default state of the
 if the quick filters are case sensitive or not. The default is <b>0</b>.
 <p>
 
+<li><b><code>Mode commands = 0|1</code></b> 
+</br> 
+If this flag is missing or set to <b>1</b>, the links "Full", "Summary" and 
+"Threaded" are shown on the top of the listing page. If this flag is set to 
+<b>0</b>, these commands are hidden. This might be useful in logbooks where only 
+one mode makes sense for example. 
+<p>
+
+<li><b><code>Suppress execute default = 0|1</code></b> 
+</br> 
+External scripts can be called with the <code><b>Execute new/edit/delete</b></code>
+options. If these options are enabled, a checkbox appears which lets the user
+suppress execution of the external script. The setting of this flag determines
+the default state of this checkbox. In logbooks where a script should only be
+ocasionally executed, it could make sense to set this flag to <b>1</b>.
+<p>
+
 </ul><p>
 
 <a name="themes"><hr>
diff --git a/src/elogd.c b/src/elogd.c
index f52b7773..aa991a62 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
 
    $Log$
+   Revision 1.734  2005/08/02 18:39:12  ritt
+   Remove obsolete options
+
    Revision 1.733  2005/07/29 14:35:11  ritt
    Added icons for 'show new/all'
 
@@ -10651,10 +10654,8 @@ void show_find_form(LOGBOOK * lbs)
 
    rsprintf("<tr><td class=\"form2\"><b>%s:</b><br>", loc("Options"));
 
-   if (!getcfg(lbs->name, "Number attachments", str, sizeof(str)) || atoi(str) > 0) {
-      rsprintf("<input type=checkbox id=\"attach\" name=\"attach\" value=1>");
-      rsprintf("<label for=\"attach\">%s<br></label>\n", loc("Show attachments"));
-   }
+   rsprintf("<input type=checkbox id=\"attach\" name=\"attach\" value=1>");
+   rsprintf("<label for=\"attach\">%s<br></label>\n", loc("Show attachments"));
 
    rsprintf("<input type=checkbox id=\"printable\" name=\"printable\" value=1>");
    rsprintf("<label for=\"printable\">%s<br></label>\n", loc("Printable output"));
@@ -15134,16 +15135,11 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
       if (attr_icon[0])
          rsprintf("\n<img border=0 src=\"icons/%s\" alt=\"%s\" title=\"%s\">\n&nbsp;", attr_icon, attr_icon, attr_icon);
       else {
-         /* if top level only, display reply icon if message has a reply */
-         if (getcfg(lbs->name, "Top level only", str, sizeof(str)) && atoi(str) == 1 && reply_to[0])
+         /* display standard icons */
+         if (level == 0)
+            rsprintf("\n<img border=0 src=\"entry.png\" alt=\"%s\" title=\"%s\">\n&nbsp;", loc("Entry"), loc("Entry"));
+         else
             rsprintf("\n<img border=0 src=\"reply.png\" alt=\"%s\" title=\"%s\">\n&nbsp;", loc("Reply"), loc("Reply"));
-         else {
-            /* display standard icons */
-            if (level == 0)
-               rsprintf("\n<img border=0 src=\"entry.png\" alt=\"%s\" title=\"%s\">\n&nbsp;", loc("Entry"), loc("Entry"));
-            else
-               rsprintf("\n<img border=0 src=\"reply.png\" alt=\"%s\" title=\"%s\">\n&nbsp;", loc("Reply"), loc("Reply"));
-         }
       }
       if (highlight != message_id)
          rsprintf("</a>\n");