removed a bunch of blank comment lines

[citadel.git] / webcit / paging.c

diff --git a/webcit/paging.c b/webcit/paging.c
index 2c052971a5c4c469b7c8cf49b275bbac4c4e182f..38b8b541d482befa0408e5231fb5bd773f966856 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -1,23 +1,15 @@
 /*
- * $Id$
- *
  * This module handles instant message related functions.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2012 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "webcit.h"
@@ -31,8 +23,8 @@ void display_page(void)
 
        strcpy(recp, bstr("recp"));
 
-        output_headers(1, 1, 2, 0, 0, 0);
-        wc_printf("<div id=\"banner\">\n");
+        output_headers(1, 1, 1, 0, 0, 0);
+        wc_printf("<div id=\"room_banner_override\">\n");
         wc_printf("<h1>");
        wc_printf(_("Send instant message"));
        wc_printf("</h1>");
@@ -40,8 +32,7 @@ void display_page(void)
 
        wc_printf("<div id=\"content\" class=\"service\">\n");
 
-        wc_printf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"paging_background\"><tr><td>\n");
+       wc_printf("<table class=\"paging_background\"><tr><td>\n");
 
        wc_printf(_("Send an instant message to: "));
        escputs(recp);
@@ -58,18 +49,18 @@ void display_page(void)
        wc_printf("\">\n");
 
        wc_printf(_("Enter message text:"));
-       wc_printf("<br />");
+       wc_printf("<br>");
 
        wc_printf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=5 COLS=40 "
                "WIDTH=40></TEXTAREA>\n");
 
-       wc_printf("</TD></TR></TABLE><br />\n");
+       wc_printf("</TD></TR></TABLE><br>\n");
 
        wc_printf("<INPUT TYPE=\"submit\" NAME=\"send_button\" VALUE=\"%s\">", _("Send message"));
-       wc_printf("<br /><a href=\"javascript:window.close();\"%s</A>\n", _("Cancel"));
+       wc_printf("<br><a href=\"javascript:window.close();\"%s</A>\n", _("Cancel"));
 
        wc_printf("</FORM></CENTER>\n");
-       wc_printf("</td></tr></table></div>\n");
+       wc_printf("</td></tr></table>\n");
        wDumpContent(1);
 }
 
@@ -79,32 +70,23 @@ void display_page(void)
 void page_user(void)
 {
        char recp[256];
-       char buf[256];
+       StrBuf *Line;
 
        safestrncpy(recp, bstr("recp"), sizeof recp);
 
        if (!havebstr("send_button")) {
-               safestrncpy(WC->ImportantMessage,
-                       _("Message was not sent."),
-                       sizeof WC->ImportantMessage
-               );
+               AppendImportantMessage(_("Message was not sent."), -1);
        } else {
+               Line = NewStrBuf();
                serv_printf("SEXP %s|-", recp);
-               serv_getln(buf, sizeof buf);
-
-               if (buf[0] == '4') {
+               StrBuf_ServGetln(Line);
+               if (GetServerStatusMsg(Line, NULL, 0, 0) == 4) {
+                       char buf[256];
                        text_to_server(bstr("msgtext"));
                        serv_puts("000");
                        stresc(buf, 256, recp, 0, 0);
-                       snprintf(WC->ImportantMessage,
-                               sizeof WC->ImportantMessage,
-                               "%s%s.",
-                               _("Message has been sent to "),
-                               buf
-                       );
-               }
-               else {
-                       safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
+                       AppendImportantMessage(buf, -1);
+                       AppendImportantMessage(_("Message has been sent to "), -1);
                }
        }