removed user/host/room masquerade from both clients

diff --git a/textclient/citadel.c b/textclient/citadel.c
index b63f07d4b99c7a72a8855b4308922029c6fcc6d5..3832838ca5a48a25061abd2c4381ed8dd647185b 100644 (file)
--- a/textclient/citadel.c
+++ b/textclient/citadel.c
@@ -1847,13 +1847,6 @@ int main(int argc, char **argv)
                        case 73:
                                cli_image_upload(ipc, "_roompic_");
                                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;

diff --git a/textclient/citadel.rc b/textclient/citadel.rc
index 09792b05453c1cbcd8f450857abb92039c7faa85..7ad566d83ef48832f2261f9bfdab7d9802d1c82b 100644 (file)
--- a/textclient/citadel.rc
+++ b/textclient/citadel.rc
@@ -277,7 +277,6 @@ cmd=36,0,&.,&Enter,&ASCII message
 cmd=37,0,&.,&Enter,&Configuration
 cmd=38,0,&.,&Enter,a new &Room
 cmd=39,0,&.,&Enter,&Textfile
-cmd=77,0,&.,&Enter,&Username
 # cmd=40,0,&.,&Enter,file using &Xmodem
 # cmd=42,0,&.,&Enter,file using &Ymodem
 # cmd=44,0,&.,&Enter,file using &Zmodem

diff --git a/textclient/citadel_ipc.c b/textclient/citadel_ipc.c
index 5b34772fcfc3a7be9a843e79a4aeb41060034815..f810edf001b4bec57052946659a45637787e25a9 100644 (file)
--- a/textclient/citadel_ipc.c
+++ b/textclient/citadel_ipc.c
@@ -1957,28 +1957,6 @@ int CtdlIPCEnterSystemMessage(CtdlIPC * ipc, const char *filename, const char *t
 }
 
 
-/* UCHG */
-int CtdlIPCChangeUsername(CtdlIPC * ipc, const char *username, char *cret)
-{
-       int ret;
-       char *aaa;
-
-       if (!cret)
-               return -2;
-       if (!username)
-               return -2;
-
-       aaa = (char *) malloc(strlen(username) + 6);
-       if (!aaa)
-               return -1;
-
-       sprintf(aaa, "UCHG %s", username);
-       ret = CtdlIPCGenericCommand(ipc, aaa, NULL, 0, NULL, NULL, cret);
-       free(aaa);
-       return ret;
-}
-
-
 /* TIME */
 /* This function returns the actual server time reported, or 0 if error */
 time_t CtdlIPCServerTime(CtdlIPC * ipc, char *cret)

diff --git a/textclient/textclient.h b/textclient/textclient.h
index 3c84830ffb4ae58e777d1935fe32b38e4f649e9a..922644642358d81d9a092aec432b536394ef9290 100644 (file)
--- a/textclient/textclient.h
+++ b/textclient/textclient.h
@@ -479,7 +479,6 @@ int CtdlIPCTerminateSession(CtdlIPC *ipc, int sid, char *cret);
 int CtdlIPCTerminateServerNow(CtdlIPC *ipc, char *cret);
 int CtdlIPCTerminateServerScheduled(CtdlIPC *ipc, int mode, char *cret);
 int CtdlIPCEnterSystemMessage(CtdlIPC *ipc, const char *filename, const char *text, char *cret);
-int CtdlIPCChangeUsername(CtdlIPC *ipc, const char *username, char *cret);
 time_t CtdlIPCServerTime(CtdlIPC *ipc, char *crert);
 int CtdlIPCAideGetUserParameters(CtdlIPC *ipc, const char *who, struct ctdluser **uret, char *cret);
 int CtdlIPCAideGetEmailAddresses(CtdlIPC *ipc, const char *who, char *, char *cret);

diff --git a/webcit/static/t/who/section.html b/webcit/static/t/who/section.html
index 1944f2a8cdd1c932e5065796c70f7cb54a4e1723..16bcbf2a9ca74c745e85e235453d23554bc9b2d7 100644 (file)
--- a/webcit/static/t/who/section.html
+++ b/webcit/static/t/who/section.html
@@ -5,9 +5,6 @@
                        (<a href="display_edituser?username=<?WHO:NAME("U")>&edit_config_button=Edit+configuration&nonce=<?NONCE>"><?_("Edit configuration")></a>)&nbsp;
                        (<a href="display_edituser?username=<?WHO:NAME("U")>&edit_abe_button=Edit+address+book+entry"><?_("Edit address book entry")></a>)
                <??("X", 2)><??("X", 1)>
-               <?!("WHO:ISME", 3)>
-                       <a href="edit_me"><img src="static/webcit_icons/essen/16x16/config.png" alt="(<?_("edit")>)" title="<?_("edit")>"></a>
-               <?!("X", 3)>
        </td>
        <!-- link to page this user -->
        <td><a href="display_page?recp=<?WHO:NAME("X")>">

diff --git a/webcit/who.c b/webcit/who.c
index cb886b9c543b67dfd6566466d5658067a01be40c..11c68d86c99602c3c8dddf456e01d0e55e3a3925 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -142,34 +142,6 @@ void terminate_session(void)
 }
 
 
-/*
- * Change your session info (fake roomname and hostname)
- */
-void edit_me(void)
-{
-       char buf[SIZ];
-
-       output_headers(1, 0, 0, 0, 0, 0);
-       if (havebstr("change_room_name_button")) {
-               serv_printf("RCHG %s", bstr("fake_roomname"));
-               serv_getln(buf, sizeof buf);
-               do_template("who");
-       } else if (havebstr("change_host_name_button")) {
-               serv_printf("HCHG %s", bstr("fake_hostname"));
-               serv_getln(buf, sizeof buf);
-               do_template("who");
-       } else if (havebstr("change_user_name_button")) {
-               serv_printf("UCHG %s", bstr("fake_username"));
-               serv_getln(buf, sizeof buf);
-               do_template("who");
-       } else if (havebstr("cancel_button")) {
-               do_template("who");
-       } else {
-               do_template("who_edit");
-       }
-       end_burst();
-}
-
 void _terminate_session(void) {
        slrp_highest();
        terminate_session();
@@ -312,7 +284,6 @@ InitModule_WHO
        RegisterCTX(CTX_WHO);
 
        WebcitAddUrlHandler(HKEY("terminate_session"), "", 0, _terminate_session, 0);
-       WebcitAddUrlHandler(HKEY("edit_me"), "", 0, edit_me, 0);
 
        RegisterIterator("WHOLIST", 1, NULL, GetWholistHash, NULL, DeleteWholistHash, CTX_WHO, CTX_NONE, IT_NOFLAG);