* Client ability to force display of prompts in Mail rooms, even when

          the user has prompting turned off (citadel.rc option)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 653d59a5f4ed55f6276aa2b72a990c2380cdb9c2..027946ea92aabebf147c535d0a3ddbc61f5fb266 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,6 @@
+Mon Oct 19 20:52:55 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * Client ability to force display of prompts in Mail rooms, even when
+         the user has prompting turned off (citadel.rc option)
 1998-10-16 Nathan Bryant <bryant@cs.usm.maine.edu>
        * sysdep.c (cprintf): generate a newline on truncated buffer
        * room_ops.c: exploitable overrun fixes

diff --git a/citadel/citadel.rc b/citadel/citadel.rc
index aeb845f5b64cdf39f0d3efedf57ae274f2d48373..f4345a0f69b9d19f8a3bb65507b2d6b114b132c7 100644 (file)
--- a/citadel/citadel.rc
+++ b/citadel/citadel.rc
@@ -38,6 +38,11 @@ local_screen_dimensions=0
 #
 display_message_numbers=0
 
+# The FORCE_MAIL_PROMPTS directive causes mail rooms to always display a
+# prompt after each message, even if the user has prompts turned off.
+#
+force_mail_prompts=1
+
 # USE_FLOORS determines whether the user sees floors, or a flat room space.
 # Set it to YES to always use floors, NO to never use floors, or DEFAULT
 # to use the setting in the user's configuration (which is normally the case).

diff --git a/citadel/commands.c b/citadel/commands.c
index aad829e6656cd088ec02c3c8045691dc0c5d95a7..85080bd44572bcbba0303e3f608c9fb982a1f4d7 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -51,6 +51,7 @@ int rc_exp_beep;
 char rc_exp_cmd[256];
 int rc_allow_attachments;
 int rc_display_message_numbers;
+int rc_force_mail_prompts;
 
 char *gl_string;
 int next_lazy_cmd = 5;
@@ -303,6 +304,7 @@ void load_command_set(void) {
        rc_allow_attachments = 0;
        strcpy(rc_exp_cmd, "");
        rc_display_message_numbers = 0;
+       rc_force_mail_prompts = 0;
 
        /* now try to open the citadel.rc file */
 
@@ -357,6 +359,10 @@ void load_command_set(void) {
                rc_display_message_numbers = atoi(&buf[24]);
                }
 
+           if (!struncmp(buf,"force_mail_prompts=", 19)) {
+               rc_force_mail_prompts = atoi(&buf[19]);
+               }
+
            if (!struncmp(buf,"username=",9))
                strcpy(rc_username,&buf[9]);
 

diff --git a/citadel/messages.c b/citadel/messages.c
index 1acee11515096fb69f29cffa3d3fb0d005f6298f..99258049f1465d943a17d690864e9656a6d1545a 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -68,6 +68,7 @@ extern char editor_path[];
 extern char printcmd[];
 extern int rc_allow_attachments;
 extern int rc_display_message_numbers;
+extern int rc_force_mail_prompts;
 
 extern int editor_pid;
 
@@ -1031,7 +1032,11 @@ RMSGREAD:        fflush(stdout);
                        printf("Message printed.\n");
                        }
                if (e==3) return;
-               if ((userflags&US_NOPROMPT)||(e==2)) e='n';
+               if ( ((userflags&US_NOPROMPT)||(e==2)) 
+                  && (((room_flags&QR_MAILBOX)==0)
+                    ||(rc_force_mail_prompts==0))  ) {
+                       e='n';
+                       }
                else {
                        printf("(%d) ",num_msgs-a-1);
                        if (is_mail==1) printf("<R>eply ");