removed node display and network parameters from text client

diff --git a/textclient/src/citadel_ipc.c b/textclient/src/citadel_ipc.c
index e5767357567a7b8484f7e3f957f6f6c88692c3aa..e0e299ac59dbf3409c02dff6450b6b0785ee7c11 100644 (file)
--- a/textclient/src/citadel_ipc.c
+++ b/textclient/src/citadel_ipc.c
@@ -657,12 +657,8 @@ int CtdlIPCGetSingleMessage(CtdlIPC *ipc, long msgnum, int headers, int as_mime,
                                        safestrncpy(mret[0]->subject, &aaa[5], SIZ);
                                else if (!strncasecmp(aaa, "rfca=", 5))
                                        safestrncpy(mret[0]->email, &aaa[5], SIZ);
-                               else if (!strncasecmp(aaa, "hnod=", 5))
-                                       safestrncpy(mret[0]->hnod, &aaa[5], SIZ);
                                else if (!strncasecmp(aaa, "room=", 5))
                                        safestrncpy(mret[0]->room, &aaa[5], SIZ);
-                               else if (!strncasecmp(aaa, "node=", 5))
-                                       safestrncpy(mret[0]->node, &aaa[5], SIZ);
                                else if (!strncasecmp(aaa, "rcpt=", 5))
                                        safestrncpy(mret[0]->recipient, &aaa[5], SIZ);
                                else if (!strncasecmp(aaa, "wefw=", 5))

diff --git a/textclient/src/include/citadel_ipc.h b/textclient/src/include/citadel_ipc.h
index 536c138817a268215b1544bb4038b0aa974b9d03..ab054dd29d63f1695256853d69713ee4bf018934 100644 (file)
--- a/textclient/src/include/citadel_ipc.h
+++ b/textclient/src/include/citadel_ipc.h
@@ -242,8 +242,6 @@ struct ctdlipcmessage {
        char author[SIZ];               /* Sender of message */
        char recipient[SIZ];            /* Recipient of message */
        char room[SIZ];                 /* Originating room */
-       char node[SIZ];                 /* Short nodename of origin system */
-       char hnod[SIZ];                 /* Humannode of origin system */
        struct parts *attachments;      /* Available attachments */
        char *text;                     /* Message text */
        int type;                       /* Message type */

diff --git a/textclient/src/messages.c b/textclient/src/messages.c
index 1337b029c968f4be1d7778c8a78b89a6fd587124..aeb5a4e0035a2a266e037844f3d5bf08e5667e7b 100644 (file)
--- a/textclient/src/messages.c
+++ b/textclient/src/messages.c
@@ -1,7 +1,7 @@
 /*
  * Text client functions for reading and writing of messages
  *
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2018 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.
@@ -493,10 +493,10 @@ int read_message(CtdlIPC *ipc,
                if (!IsEmptyStr(message->email)) {
                        scr_printf("rfca=%s\n", message->email);
                }
-               scr_printf("hnod=%s\nroom=%s\nnode=%s\ntime=%s",
-                               message->hnod, message->room,
-                               message->node, 
-                               asctime(localtime(&message->time)));
+               scr_printf("room=%s\ntime=%s",
+                       message->room,
+                       asctime(localtime(&message->time))
+               );
                if (!IsEmptyStr(message->recipient)) {
                        scr_printf("rcpt=%s\n", message->recipient);
                }
@@ -562,35 +562,6 @@ int read_message(CtdlIPC *ipc,
                                scr_printf("> ");
                        }
                }
-               if (!IsEmptyStr(message->node)) {
-                       if ((room_flags & QR_NETWORK)
-                           || ((strcasecmp(message->node, ipc->ServInfo.nodename)
-                            && (strcasecmp(message->node, ipc->ServInfo.fqdn))))) {
-                               if (IsEmptyStr(message->email)) {
-                                       if (dest) {
-                                               fprintf(dest, "@%s ", message->node);
-                                       } else {
-                                               color(DIM_WHITE);
-                                               scr_printf("@");
-                                               color(BRIGHT_YELLOW);
-                                               scr_printf("%s ", message->node);
-                                       }
-                               }
-                       }
-               }
-               if (strcasecmp(message->hnod, ipc->ServInfo.humannode)
-                   && (!IsEmptyStr(message->hnod)) && (IsEmptyStr(message->email))) {
-                       if (dest) {
-                               fprintf(dest, "(%s) ", message->hnod);
-                       } else {
-                               color(DIM_WHITE);
-                               scr_printf("(");
-                               color(BRIGHT_WHITE);
-                               scr_printf("%s", message->hnod);
-                               color(DIM_WHITE);
-                               scr_printf(") ");
-                       }
-               }
                if (strcasecmp(message->room, room_name) && (IsEmptyStr(message->email))) {
                        if (dest) {
                                fprintf(dest, "in %s> ", message->room);
@@ -633,8 +604,7 @@ int read_message(CtdlIPC *ipc,
        /* But if we can't do that, set it to a Citadel address.
         */
        if (!strcmp(reply_to, NO_REPLY_TO)) {
-               snprintf(reply_to, sizeof(reply_to), "%s @ %s",
-                        message->author, message->node);
+               safestrncpy(reply_to, message->author, sizeof(reply_to));
        }
 
        if (message->msgid != NULL) {

diff --git a/textclient/src/rooms.c b/textclient/src/rooms.c
index 7754316b02c5838c3d927936efd9f92e4e127d26..19d321bb48f7b09d61f7309b9f8511ef70c07502 100644 (file)
--- a/textclient/src/rooms.c
+++ b/textclient/src/rooms.c
@@ -1,7 +1,7 @@
 /*
  * Client-side functions which perform room operations
  *
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2018 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.
@@ -122,14 +122,12 @@ void room_tree_list(struct ctdlroomlisting *rp)
                        color(DIM_WHITE);
                }
                scr_printf("%s", rmname);
-               if ((f & QR_DIRECTORY) && (f & QR_NETWORK))
-                       scr_printf("}  ");
-               else if (f & QR_DIRECTORY)
+               if (f & QR_DIRECTORY) {
                        scr_printf("]  ");
-               else if (f & QR_NETWORK)
-                       scr_printf(")  ");
-               else
+               }
+               else {
                        scr_printf(">  ");
+               }
                c = c + strlen(rmname) + 3;
        }
 
@@ -399,11 +397,6 @@ void dotknown(CtdlIPC *ipc, int what, char *match)
            listrms(listing, LISTRMS_ALL, -1, QR_READONLY, NULL);
        scr_printf("\n");
                break;
-    case 6:
-       scr_printf("\n   Shared rooms:\n");
-           listrms(listing, LISTRMS_ALL, -1, QR_NETWORK, NULL);
-       scr_printf("\n");
-               break;
        }
 
        /* Free the room list */
@@ -590,8 +583,6 @@ void editthisroom(CtdlIPC *ipc)
                    set_room_attr(ipc, attr->QRflags,
                                                "Visible directory", QR_VISDIR);
        }
-       attr->QRflags = set_room_attr(ipc, attr->QRflags,
-                                       "Network shared room", QR_NETWORK);
        attr->QRflags2 = set_room_attr(ipc, attr->QRflags2,
                                "Self-service list subscribe/unsubscribe",
                                QR2_SELFLIST);

diff --git a/textclient/src/routines2.c b/textclient/src/routines2.c
index 33f9925005c3f47c4e8d8e966706a5129e1a605e..0862f0120b63deb105feb87a9f615c97eaf71d47 100644 (file)
--- a/textclient/src/routines2.c
+++ b/textclient/src/routines2.c
@@ -69,10 +69,6 @@ int room_prompt(unsigned int qrflags)
        a = '>';
        if (qrflags & QR_DIRECTORY)
                a = ']';
-       if ((a == ']') && (qrflags & QR_NETWORK))
-               a = '}';
-       if ((a == '>') && (qrflags & QR_NETWORK))
-               a = ')';
        return (a);
 }