Added 'suppress default = 3'

SVN revision: 1424

doc/config.html

@@ -1664,14 +1664,15 @@ for <a href="http://midas.psi.ch/elog/elcode_en.html">ELCode</a> encoding,
 to <b>2</b> for HTML encoding. The default is <b>0</b>.
 <p>
 
-<li><b><code>Suppress default = 0|1|2</code></b>
+<li><b><code>Suppress default = 0|1|2|3</code></b>
 </br>
 This specifies the default state of the "<I>Suppress Email notification</I>" button on the
 new message entry form. For installations where normally an email notification is
 not necessary, the default can be set to <b>1</b>. If an important entry is
 entered, users can then uncheck the suppress box. If this value is set to <b>2
 </b>, the suppress box is not displayed at all, so that an email notification is
-always produced. The default is <b>0</b>.
+always produced. If this value is set to <b>3</b>, the email notification is
+always suppressed. The default is <b>0</b>.
 <p>
 
 <li><b><code>Resubmit default = 0|1|2</code></b>

src/elogd.c

@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
 
    $Log$
+   Revision 1.700  2005/07/07 20:02:43  ritt
+   Added 'suppress default = 3'
+
    Revision 1.699  2005/07/07 19:47:11  ritt
    Tooltips only for logbooks, not groups
 
@@ -10232,6 +10235,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
             rsprintf("<input type=checkbox checked name=suppress value=1>%s\n",
                      loc("Suppress Email notification"));
          }
+
       } else {
          rsprintf("<input type=checkbox name=suppress value=1>%s\n", loc("Suppress Email notification"));
       }
@@ -19108,6 +19112,8 @@ void submit_elog(LOGBOOK * lbs)
    /*---- email notifications ----*/
 
    suppress = atoi(getparam("suppress"));
+   if (getcfg(lbs->name, "Suppress default", str, sizeof(str)) && atoi(str) == 3) 
+      suppress = 3;
 
    /* check for mail submissions */
    mail_param[0] = 0;
@@ -19116,7 +19122,8 @@ void submit_elog(LOGBOOK * lbs)
    mail_to_size = 256;
 
    if (suppress) {
-      strcpy(mail_param, "?suppress=1");
+      if (suppress != 3)
+         strcpy(mail_param, "?suppress=1");
    } else {
       if (!(*getparam("edit_id")
             && getcfg(lbs->name, "Suppress Email on edit", str, sizeof(str))