From a9be394c2df9fcfa94b3b9c3e398c81ac4f20206 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 27 Apr 2021 18:05:14 -0400
Subject: [PATCH] Remove support for the old inline paging mode ... geez, we've
 only had extended paging for 21 years

---
 textclient/citadel_ipc.c |  3 --
 textclient/client_chat.c | 72 +++++++++++++++-------------------------
 textclient/textclient.h  |  1 -
 3 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/textclient/citadel_ipc.c b/textclient/citadel_ipc.c
index 123258f76..bcabb468e 100644
--- 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 5b0da95f4..1339d0e61 100644
--- 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 2a3703648..a13f4ae3d 100644
--- 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;
-- 
2.30.2