From 1f6be0ca77d1e30294dc3add26d1a24adeb1788e Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sat, 15 Dec 2001 20:51:33 +0000
Subject: [PATCH] * "reply" button on pop-up pages

---
 webcit/ChangeLog |  4 +++-
 webcit/paging.c  | 24 ++++++++++++++++++++----
 webcit/webcit.c  |  2 +-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index ad8b68168..15b455363 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 301.17  2001/12/15 20:51:33  ajc
+* "reply" button on pop-up pages
+
 Revision 301.16  2001/12/11 16:02:40  ajc
 * Completed support for add/remove mailing list recipients.
 
@@ -659,4 +662,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/paging.c b/webcit/paging.c
index 9b506109f..9cdb897eb 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -39,7 +39,7 @@ void display_page(void)
 	wprintf("</FONT></TD></TR></TABLE>\n");
 
 	wprintf("<CENTER>This will send a page (instant message) "
-		"to %s.<BR><BR>\n", recp);
+		"to %s.\n", recp);
 
 	wprintf("<FORM METHOD=\"POST\" ACTION=\"/page_user\">\n");
 
@@ -50,10 +50,14 @@ void display_page(void)
 	escputs(recp);
 	wprintf("\">\n");
 
+	wprintf("<INPUT TYPE=\"hidden\" NAME=\"closewin\" VALUE=\"");
+	escputs(bstr("closewin"));
+	wprintf("\">\n");
+
 	wprintf("Enter message text:<BR>");
 
 	wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=5 COLS=40 "
-		"WIDTH=40></TEXTAREA><P>\n");
+		"WIDTH=40></TEXTAREA>\n");
 
 	wprintf("</TD></TR></TABLE><BR>\n");
 
@@ -72,11 +76,13 @@ void page_user(void)
 	char recp[SIZ];
 	char sc[SIZ];
 	char buf[SIZ];
+	char closewin[SIZ];
 
 	output_headers(1);
 
 	strcpy(recp, bstr("recp"));
 	strcpy(sc, bstr("sc"));
+	strcpy(closewin, bstr("closewin"));
 
 	if (strcmp(sc, "Send message")) {
 		wprintf("<EM>Message was not sent.</EM><BR>\n");
@@ -95,6 +101,12 @@ void page_user(void)
 			wprintf("<EM>%s</EM><BR>\n", &buf[4]);
 		}
 	}
+	
+	if (!strcasecmp(closewin, "yes")) {
+		wprintf("<CENTER><A HREF=\"javascript:window.close();\">"
+			"[ close window ]</A></CENTER>\n");
+	}
+
 	wDumpContent(1);
 }
 
@@ -154,8 +166,12 @@ void page_popup(void)
 		fmout(NULL);
 	}
 
-	wprintf("<CENTER>"
-		"<A HREF=\"javascript:window.close();\">"
+	wprintf("<CENTER>");
+	wprintf("<A HREF=\"/display_page&closewin=yes&recp=");
+	urlescputs(pagefrom);
+        wprintf("\">[ reply ]</A>&nbsp;&nbsp;&nbsp;\n");
+
+	wprintf("<A HREF=\"javascript:window.close();\">"
 		"[ close window ]</A></B>\n"
 		"</CENTER>");
 
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 8aa27b7ca..d2be7d414 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -339,7 +339,7 @@ void output_headers(int controlcode)
 		wprintf("function launch_page_popup() {\n");
 		wprintf("pwin = window.open('/page_popup', 'CitaPage%d', "
 			"'toolbar=no,location=no,copyhistory=no,status=no,"
-			"scrollbars=yes,resizable=no,height=150,width=400');\n",
+			"scrollbars=yes,resizable=no,height=250,width=400');\n",
 			++pageseq);
 		wprintf("}\n");
 		wprintf("</SCRIPT>\n");
-- 
2.39.2