Remove support for the old inline paging mode ... geez, we've only had extended pagin...

[citadel.git] / textclient / client_chat.c

diff --git a/textclient/client_chat.c b/textclient/client_chat.c
index e725f02e95cc34ab6d5e8d8e8f1142c52d710da4..1339d0e61b703eab311ebfb1c7ffcdce51d701a6 100644 (file)
--- a/textclient/client_chat.c
+++ b/textclient/client_chat.c
@@ -1,16 +1,14 @@
-/*
- * front end for multiuser chat
- *
- * Copyright (c) 1987-2016 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.
- */
+// front end for multiuser chat
+//
+// Copyright (c) 1987-2016 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, and/or
+// disclosure are subject to the GNU General Purpose 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 "textclient.h"
 
@@ -19,8 +17,7 @@
 extern char temp[];
 char last_paged[SIZ] = "";
 
-void chatmode(CtdlIPC *ipc)
-{
+void chatmode(CtdlIPC *ipc) {
        char wbuf[SIZ];
        char buf[SIZ];
        char response[SIZ];
@@ -46,7 +43,7 @@ void chatmode(CtdlIPC *ipc)
 
        strcpy(buf, "");
        strcpy(wbuf, "");
-       strcpy(last_user, ""); 
+       strcpy(last_user, "");
        color(BRIGHT_YELLOW);
        scr_printf("\n");
        scr_printf("> ");
@@ -138,7 +135,7 @@ void chatmode(CtdlIPC *ipc)
                snprintf(buf, sizeof buf, "RCHT poll|%d", seq);
                CtdlIPC_chat_send(ipc, buf);
                CtdlIPC_chat_recv(ipc, response);
-       
+
                if (response[0] == '1') {
                        seq = extract_int(&response[4], 0);
                        extract_token(c_user, &response[4], 2, '|', sizeof c_user);
@@ -177,64 +174,47 @@ void chatmode(CtdlIPC *ipc)
 }
 
 
-/*
- * send an instant message
- */
-void page_user(CtdlIPC *ipc)
-{
+// send an instant message
+void page_user(CtdlIPC * ipc) {
        char buf[SIZ], touser[SIZ], msg[SIZ];
        FILE *pagefp;
 
        strcpy(touser, last_paged);
        strprompt("Page who", touser, 30);
 
-       /* old server -- use inline paging */
-       if (ipc->ServInfo.paging_level == 0) {
-               newprompt("Message: ", msg, 69);
-               snprintf(buf, sizeof buf, "SEXP %s|%s", touser, msg);
-               CtdlIPC_chat_send(ipc, buf);
-               CtdlIPC_chat_recv(ipc, buf);
-               if (!strncmp(buf, "200", 3)) {
-                       strcpy(last_paged, touser);
-               }
+       snprintf(buf, sizeof buf, "SEXP %s||", touser);
+       CtdlIPC_chat_send(ipc, buf);
+       CtdlIPC_chat_recv(ipc, buf);
+       if (buf[0] != '2') {
                scr_printf("%s\n", &buf[4]);
                return;
        }
-       /* new server -- use extended paging */
-       else if (ipc->ServInfo.paging_level >= 1) {
-               snprintf(buf, sizeof buf, "SEXP %s||", touser);
-               CtdlIPC_chat_send(ipc, buf);
-               CtdlIPC_chat_recv(ipc, buf);
-               if (buf[0] != '2') {
-                       scr_printf("%s\n", &buf[4]);
-                       return;
-               }
-               if (client_make_message(ipc, temp, touser, 0, 0, 0, NULL, 0) != 0) {
-                       scr_printf("No message sent.\n");
-                       return;
-               }
-               pagefp = fopen(temp, "r");
-               unlink(temp);
-               snprintf(buf, sizeof buf, "SEXP %s|-", touser);
-               CtdlIPC_chat_send(ipc, buf);
-               CtdlIPC_chat_recv(ipc, buf);
-               if (buf[0] == '4') {
-                       strcpy(last_paged, touser);
-                       while (fgets(buf, sizeof buf, pagefp) != NULL) {
-                               buf[strlen(buf) - 1] = 0;
-                               CtdlIPC_chat_send(ipc, buf);
-                       }
-                       fclose(pagefp);
-                       CtdlIPC_chat_send(ipc, "000");
-                       scr_printf("Message sent.\n");
-               } else {
-                       scr_printf("%s\n", &buf[4]);
+       if (client_make_message(ipc, temp, touser, 0, 0, 0, NULL, 0) != 0) {
+               scr_printf("No message sent.\n");
+               return;
+       }
+       pagefp = fopen(temp, "r");
+       unlink(temp);
+       snprintf(buf, sizeof buf, "SEXP %s|-", touser);
+       CtdlIPC_chat_send(ipc, buf);
+       CtdlIPC_chat_recv(ipc, buf);
+       if (buf[0] == '4') {
+               strcpy(last_paged, touser);
+               while (fgets(buf, sizeof buf, pagefp) != NULL) {
+                       buf[strlen(buf) - 1] = 0;
+                       CtdlIPC_chat_send(ipc, buf);
                }
+               fclose(pagefp);
+               CtdlIPC_chat_send(ipc, "000");
+               scr_printf("Message sent.\n");
+       }
+       else {
+               scr_printf("%s\n", &buf[4]);
        }
 }
 
 
-void quiet_mode(CtdlIPC *ipc)
+void quiet_mode(CtdlIPC * ipc)
 {
        static int quiet = 0;
        char cret[SIZ];
@@ -243,16 +223,14 @@ void quiet_mode(CtdlIPC *ipc)
        r = CtdlIPCEnableInstantMessageReceipt(ipc, !quiet, cret);
        if (r / 100 == 2) {
                quiet = !quiet;
-               scr_printf("Quiet mode %sabled (%sother users may page you)\n",
-                               (quiet) ? "en" : "dis",
-                               (quiet) ? "no " : "");
+               scr_printf("Quiet mode %sabled (%sother users may page you)\n", (quiet) ? "en" : "dis", (quiet) ? "no " : "");
        } else {
                scr_printf("Unable to change quiet mode: %s\n", cret);
        }
 }
 
 
-void stealth_mode(CtdlIPC *ipc)
+void stealth_mode(CtdlIPC * ipc)
 {
        static int stealth = 0;
        char cret[SIZ];
@@ -262,8 +240,7 @@ void stealth_mode(CtdlIPC *ipc)
        if (r / 100 == 2) {
                stealth = !stealth;
                scr_printf("Stealth mode %sabled (you are %s)\n",
-                               (stealth) ? "en" : "dis",
-                               (stealth) ? "invisible" : "listed as online");
+                          (stealth) ? "en" : "dis", (stealth) ? "invisible" : "listed as online");
        } else {
                scr_printf("Unable to change stealth mode: %s\n", cret);
        }