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

diff --git a/textclient/citadel_ipc.c b/textclient/citadel_ipc.c
index 123258f7681303685963de79ed357c2df0771304..bcabb468ebed9ef1bd857bc7b208b1f1e224cde9 100644 (file)
--- a/textclient/citadel_ipc.c
+++ b/textclient/citadel_ipc.c
@@ -834,9 +834,6 @@ int CtdlIPCServerInfo(CtdlIPC * ipc, char *cret)
                        case 10:
                                ipc->ServInfo.ok_floors = atoi(buf);
                                break;
-                       case 11:
-                               ipc->ServInfo.paging_level = atoi(buf);
-                               break;
                        case 13:
                                ipc->ServInfo.supports_qnop = atoi(buf);
                                break;

diff --git a/textclient/client_chat.c b/textclient/client_chat.c
index 5b0da95f4024022f798e63f3b37b7a56b4a4ef08..1339d0e61b703eab311ebfb1c7ffcdce51d701a6 100644 (file)
--- a/textclient/client_chat.c
+++ b/textclient/client_chat.c
@@ -17,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];
@@ -175,59 +174,42 @@ 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]);
        }
 }
 

diff --git a/textclient/textclient.h b/textclient/textclient.h
index 2a370364861268a9e86f7f62fc10828f3eb93361..a13f4ae3dbb78b076b71e64a618b644a864d936c 100644 (file)
--- a/textclient/textclient.h
+++ b/textclient/textclient.h
@@ -141,7 +141,6 @@ struct CtdlServInfo {
        char sysadm[64];
        char moreprompt[256];
        int ok_floors;
-       int paging_level;
        int supports_qnop;
        int supports_ldap;
        int newuser_disabled;