Remove whitespace at end of canonicalized header lines

[citadel.git] / webcit / paging.c

diff --git a/webcit/paging.c b/webcit/paging.c
index efece86ba6d415e0cd3096b56bdae60e844e612a..f022c48bc10576e450a79c28fcc2a74c7fcb4485 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -1,36 +1,25 @@
-/*
- * This module handles instant message related functions.
- *
- * Copyright (c) 1996-2010 by the citadel.org team
- *
- * This program is open source 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 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
- */
+// This module handles instant message related functions.
+//
+// Copyright (c) 1996-2023 by the citadel.org team
+//
+// 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.
 
 #include "webcit.h"
 
-/*
- * display the form for paging (x-messaging) another user
- */
-void display_page(void)
-{
+// display the form for paging (x-messaging) another user
+void display_page(void) {
        char recp[SIZ];
 
        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>");
@@ -70,11 +59,9 @@ void display_page(void)
        wDumpContent(1);
 }
 
-/*
- * page another user
- */
-void page_user(void)
-{
+
+// page another user
+void page_user(void) {
        char recp[256];
        StrBuf *Line;
 
@@ -82,7 +69,8 @@ void page_user(void)
 
        if (!havebstr("send_button")) {
                AppendImportantMessage(_("Message was not sent."), -1);
-       } else {
+       }
+       else {
                Line = NewStrBuf();
                serv_printf("SEXP %s|-", recp);
                StrBuf_ServGetln(Line);
@@ -100,19 +88,15 @@ void page_user(void)
 }
 
 
-
-/*
- * display page popup
- * If there are instant messages waiting, and we notice that we haven't checked them in
- * a while, it probably means that we need to open the instant messenger window.
- */
-int Conditional_PAGE_WAITING(StrBuf *Target, WCTemplputParams *TP)
-{
+// display page popup
+// If there are instant messages waiting, and we notice that we haven't checked them in
+// a while, it probably means that we need to open the instant messenger window.
+int Conditional_PAGE_WAITING(StrBuf *Target, WCTemplputParams *TP) {
        int len;
        char buf[SIZ];
 
-       /** JavaScript function to alert the user that popups are probably blocked */
-       /** First, do the check as part of our page load. */
+       // JavaScript function to alert the user that popups are probably blocked
+       // First, do the check as part of our page load.
        serv_puts("NOOP");
        len = serv_getln(buf, sizeof buf);
        if ((len >= 3) && (buf[3] == '*')) {
@@ -121,7 +105,7 @@ int Conditional_PAGE_WAITING(StrBuf *Target, WCTemplputParams *TP)
                }
        }
        return 0;
-       /* Then schedule it to happen again a minute from now if the user is idle. */
+       // Then schedule it to happen again a minute from now if the user is idle.
 }
 
 
@@ -139,7 +123,7 @@ void ajax_send_instant_message(void) {
                serv_puts("000");
        }
 
-       escputs(buf);   /* doesn't really matter what we return - the client ignores it */
+       escputs(buf);   // doesn't really matter what we return - the client ignores it
 }
 
 
@@ -150,7 +134,7 @@ InitModule_PAGING
        WebcitAddUrlHandler(HKEY("display_page"), "", 0, display_page, 0);
        WebcitAddUrlHandler(HKEY("page_user"), "", 0, page_user, 0);
        WebcitAddUrlHandler(HKEY("ajax_send_instant_message"), "", 0, ajax_send_instant_message, AJAX);
-       RegisterConditional(HKEY("COND:PAGE:WAITING"), 0, Conditional_PAGE_WAITING, CTX_NONE);
+       RegisterConditional("COND:PAGE:WAITING", 0, Conditional_PAGE_WAITING, CTX_NONE);
 }