* "Delete message" button now confirms on client-side using JavaScript

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 916a2fae74749eee82a137e4ab8b8441f342075d..f13e1f779bcc7aaaa0fb191086d0f167aea9693d 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 213.3  2001/01/25 23:10:00  ajc
+* "Delete message" button now confirms on client-side using JavaScript
+
 Revision 213.2  2000/12/05 18:39:49  ajc
 * Added support for non-USA countries in registration screen (requires the
   latest Citadel server, which supports the country field)
@@ -511,4 +514,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/messages.c b/webcit/messages.c
index 58a5a61ab4a7d89a739f950c8092c011e6fe6833..6c36c3e006a7996fd27165b9b24f9894dcd01a13 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -202,11 +202,11 @@ void read_message(long msgnum, int is_summary) {
                        "</TD>\n", msgnum);
 
                wprintf("<TD BGCOLOR=\"AAAADD\">"
-                       "<A HREF=\"/confirm_delete_msg"
-                       "&msgid=%ld"
-                       "\"><FONT SIZE=-1>Del</FONT></A>"
+                       "<A HREF=\"/delete_msg"
+                       "&msgid=%ld\""
+                       "onClick=\"return confirm('Delete this message?');\""
+                       "><FONT SIZE=-1>Del</FONT></A>"
                        "</TD>\n", msgnum);
-
        }
 
        wprintf("</TR></TABLE>\n"
@@ -532,38 +532,6 @@ DONE:      wDumpContent(1);
 
 
 
-/*
- * Confirm deletion of a message
- */
-void confirm_delete_msg(void)
-{
-       long msgid;
-
-       msgid = atol(bstr("msgid"));
-
-       output_headers(1);
-
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Confirm deletion of message</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       wprintf("<CENTER>");
-
-       wprintf("Are you sure you want to delete this message? <BR>\n");
-
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/delete_msg\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
-               bstr("msgid"));
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Yes\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"No\">");
-       wprintf("</FORM></CENTER>\n");
-
-       wprintf("</CENTER>\n");
-       wDumpContent(1);
-}
-
-
 
 void delete_msg(void)
 {
@@ -574,14 +542,10 @@ void delete_msg(void)
 
        output_headers(1);
 
-       if (!strcasecmp(bstr("yesno"), "Yes")) {
-               sprintf(buf, "DELE %ld", msgid);
-               serv_puts(buf);
-               serv_gets(buf);
-               wprintf("<EM>%s</EM><BR>\n", &buf[4]);
-       } else {
-               wprintf("<EM>Message not deleted.</EM><BR>\n");
-       }
+       sprintf(buf, "DELE %ld", msgid);
+       serv_puts(buf);
+       serv_gets(buf);
+       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
 
        wDumpContent(1);
 }

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 9e68860a764d9e1b22ae90bed7402c7ad21a68b4..10d1a02296919adeb5da7a995aef411c8dbeaa84 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -796,8 +796,6 @@ void session_loop(struct httprequest *req)
                display_enter();
        } else if (!strcasecmp(action, "post")) {
                post_message();
-       } else if (!strcasecmp(action, "confirm_delete_msg")) {
-               confirm_delete_msg();
        } else if (!strcasecmp(action, "delete_msg")) {
                delete_msg();
        } else if (!strcasecmp(action, "confirm_move_msg")) {