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))
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 */
/*
* 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.
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);
}
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);
/* 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) {
/*
* 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.
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;
}
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 */
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);
a = '>';
if (qrflags & QR_DIRECTORY)
a = ']';
- if ((a == ']') && (qrflags & QR_NETWORK))
- a = '}';
- if ((a == '>') && (qrflags & QR_NETWORK))
- a = ')';
return (a);
}