* use strbuffer as wprintf backend

[citadel.git] / webcit / paging.c
diff --git a/webcit/paging.c b/webcit/paging.c

index e58160733dfa2cd1db4393addc500b3fac18666a..502f9c069a1ff1a28a58de88e98b271d291a4717 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -34,7 +34,7 @@ void display_page(void)
         wprintf("<br>\n");
  
         wprintf("<FORM METHOD=\"POST\" action=\"page_user\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
  
         wprintf("<TABLE border=0 width=100%%><TR><TD>\n");
  
@@ -68,7 +68,7 @@ void page_user(void)
  
         safestrncpy(recp, bstr("recp"), sizeof recp);
  
-       if (IsEmptyStr(bstr("send_button"))) {
+       if (!havebstr("send_button")) {
                 safestrncpy(WC->ImportantMessage,
                         _("Message was not sent."),
                         sizeof WC->ImportantMessage
@@ -80,7 +80,7 @@ void page_user(void)
                 if (buf[0] == '4') {
                         text_to_server(bstr("msgtext"));
                         serv_puts("000");
-                       stresc(buf, recp, 0, 0);
+                       stresc(buf, 256, recp, 0, 0);
                         snprintf(WC->ImportantMessage,
                                 sizeof WC->ImportantMessage,
                                 "%s%s.",
@@ -277,8 +277,7 @@ void chat_recv(void) {
  
         output_headers(0, 0, 0, 0, 0, 0);
  
-       wprintf("Content-type: text/html; charset=utf-8\n");
-       wprintf("\n");
+       hprintf("Content-type: text/html; charset=utf-8\r\n");
         wprintf("<html>\n"
                 "<head>\n"
                 "<meta http-equiv=\"refresh\" content=\"3\" />\n"
@@ -425,28 +424,27 @@ void chat_send(void) {
         char buf[SIZ];
  
         output_headers(0, 0, 0, 0, 0, 0);
-       wprintf("Content-type: text/html; charset=utf-8\n");
-       wprintf("\n");
+       hprintf("Content-type: text/html; charset=utf-8\r\n");
         wprintf("<HTML>"
                 "<BODY onLoad=\"document.chatsendform.send_this.focus();\" >"
         );
  
-       if (bstr("send_this") != NULL) {
+       if (havebstr("send_this")) {
                 strcpy(send_this, bstr("send_this"));
         }
         else {
                 strcpy(send_this, "");
         }
  
-       if (!IsEmptyStr(bstr("help_button"))) {
+       if (havebstr("help_button")) {
                 strcpy(send_this, "/help");
         }
  
-       if (!IsEmptyStr(bstr("list_button"))) {
+       if (havebstr("list_button")) {
                 strcpy(send_this, "/who");
         }
  
-       if (!IsEmptyStr(bstr("exit_button"))) {
+       if (havebstr("exit_button")) {
                 strcpy(send_this, "/quit");
         }
  
@@ -484,7 +482,7 @@ void chat_send(void) {
         WC->chat_sock = i;
  
         wprintf("<FORM METHOD=\"POST\" action=\"chat_send\" NAME=\"chatsendform\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
         wprintf("<INPUT TYPE=\"text\" SIZE=\"80\" MAXLENGTH=\"%d\" "
                 "NAME=\"send_this\">\n", SIZ-10);
         wprintf("<br />");
@@ -498,4 +496,15 @@ void chat_send(void) {
         wDumpContent(0);
  }
  
+void 
+InitModule_PAGING
+(void)
+{
+       WebcitAddUrlHandler(HKEY("display_page"), display_page, 0);
+       WebcitAddUrlHandler(HKEY("page_user"), page_user, 0);
+       WebcitAddUrlHandler(HKEY("chat"), do_chat, 0);
+       WebcitAddUrlHandler(HKEY("chat_recv"), chat_recv, 0);
+       WebcitAddUrlHandler(HKEY("chat_send"), chat_send, 0);
+}
+
  /*@}*/