X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=textclient%2Fcitadel.c;h=e5017fd9540f6f2c94fb9b15187bfe5c8b24b567;hb=633eabfc5820a6cc3b3c45793243928d0fa9c099;hp=99951034d9382e2a0bad019f48ae6bb850c450bc;hpb=da6bb5e24252a0ff56d314a60081ae9ed31ab1a7;p=citadel.git diff --git a/textclient/citadel.c b/textclient/citadel.c index 99951034d..e5017fd95 100644 --- a/textclient/citadel.c +++ b/textclient/citadel.c @@ -1,16 +1,14 @@ -/* - * Main source module for the client program. - * - * 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. - * - * 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. - */ +// Main source module for the client program. +// +// Copyright (c) 1987-2019 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" @@ -390,11 +388,13 @@ void dotgoto(CtdlIPC * ipc, char *towhere, int display_name, int fromungoto) switch (room->RRdefaultview) { case VIEW_BBS: case VIEW_MAILBOX: + entmsg_ok = ENTMSG_OK_YES; + break; case VIEW_BLOG: - entmsg_ok = 1; + entmsg_ok = ENTMSG_OK_BLOG; break; default: - entmsg_ok = 0; + entmsg_ok = ENTMSG_OK_NO; break; } @@ -1847,25 +1847,6 @@ int main(int argc, char **argv) case 73: cli_image_upload(ipc, "_roompic_"); break; - case 75: - enternew(ipc, "roomname", aaa, 20); - r = CtdlIPCChangeRoomname(ipc, aaa, bbb); - if (r / 100 != 2) - scr_printf("\n%s\n", bbb); - break; - case 76: - enternew(ipc, "hostname", aaa, 25); - r = CtdlIPCChangeHostname(ipc, aaa, bbb); - if (r / 100 != 2) - scr_printf("\n%s\n", bbb); - break; - case 77: - enternew(ipc, "username", aaa, 32); - r = CtdlIPCChangeUsername(ipc, aaa, bbb); - if (r / 100 != 2) - scr_printf("\n%s\n", bbb); - break; - case 35: set_password(ipc); break; @@ -2116,10 +2097,6 @@ int main(int argc, char **argv) dotknown(ipc, 5, NULL); break; - case 126: /* .KShared */ - dotknown(ipc, 6, NULL); - break; - case 127: /* Configure POP3 aggregation */ do_pop3client_configuration(ipc); break;