Completed the overhaul of setup.

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 2b66fdbe24029a51e77fd6896008977b5ebc31c1..29b6f621f0abd3403a22ea8e63dc7744fadbb5a7 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -712,40 +712,42 @@ void cmd_user(char *cmdbuf)
  */
 void do_login(void)
 {
-       CC->logged_in = 1;
-       syslog(LOG_NOTICE, "<%s> logged in\n", CC->curr_user);
+       struct CitContext *CCC = CC;
 
-       CtdlGetUserLock(&CC->user, CC->curr_user);
-       ++(CC->user.timescalled);
-       CC->previous_login = CC->user.lastcall;
-       time(&CC->user.lastcall);
+       CCC->logged_in = 1;
+       syslog(LOG_NOTICE, "<%s> logged in\n", CCC->curr_user);
+
+       CtdlGetUserLock(&CCC->user, CCC->curr_user);
+       ++(CCC->user.timescalled);
+       CCC->previous_login = CCC->user.lastcall;
+       time(&CCC->user.lastcall);
 
        /* If this user's name is the name of the system administrator
         * (as specified in setup), automatically assign access level 6.
         */
-       if (!strcasecmp(CC->user.fullname, config.c_sysadm)) {
-               CC->user.axlevel = AxAideU;
+       if (!strcasecmp(CCC->user.fullname, config.c_sysadm)) {
+               CCC->user.axlevel = AxAideU;
        }
 
        /* If we're authenticating off the host system, automatically give
         * root the highest level of access.
         */
        if (config.c_auth_mode == AUTHMODE_HOST) {
-               if (CC->user.uid == 0) {
-                       CC->user.axlevel = AxAideU;
+               if (CCC->user.uid == 0) {
+                       CCC->user.axlevel = AxAideU;
                }
        }
 
-       CtdlPutUserLock(&CC->user);
+       CtdlPutUserLock(&CCC->user);
 
        /*
-        * Populate CC->cs_inet_email with a default address.  This will be
+        * Populate CCC->cs_inet_email with a default address.  This will be
         * overwritten with the user's directory address, if one exists, when
         * the vCard module's login hook runs.
         */
-       snprintf(CC->cs_inet_email, sizeof CC->cs_inet_email, "%s@%s",
-               CC->user.fullname, config.c_fqdn);
-       convert_spaces_to_underscores(CC->cs_inet_email);
+       snprintf(CCC->cs_inet_email, sizeof CCC->cs_inet_email, "%s@%s",
+               CCC->user.fullname, config.c_fqdn);
+       convert_spaces_to_underscores(CCC->cs_inet_email);
 
        /* Create any personal rooms required by the system.
         * (Technically, MAILROOM should be there already, but just in case...)
@@ -801,7 +803,7 @@ void CtdlUserLogout(void)
         * If we were talking to a network node, we're not anymore...
         */
        if (!IsEmptyStr(CCC->net_node)) {
-               network_talking_to(CCC->net_node, NTT_REMOVE);
+               network_talking_to(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
        }
 
        /* Run any hooks registered by modules... */
@@ -2100,18 +2102,18 @@ CTDL_MODULE_INIT(user_ops)
                CtdlRegisterProtoHook(cmd_invt, "INVT", "Invite a user to a room");
                CtdlRegisterProtoHook(cmd_kick, "KICK", "Kick a user out of a room");
                CtdlRegisterProtoHook(cmd_forg, "FORG", "Forget a room");
-               CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Autoconverted. TODO: document me.");
+               CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Get Next Unregistered User");
                CtdlRegisterProtoHook(cmd_vali, "VALI", "Validate new users");
                CtdlRegisterProtoHook(cmd_list, "LIST", "List users");
-               CtdlRegisterProtoHook(cmd_chek, "CHEK", "Autoconverted. TODO: document me.");
-               CtdlRegisterProtoHook(cmd_qusr, "QUSR", "Autoconverted. TODO: document me.");
-               CtdlRegisterProtoHook(cmd_agup, "AGUP", "Autoconverted. TODO: document me.");
-               CtdlRegisterProtoHook(cmd_asup, "ASUP", "Autoconverted. TODO: document me.");
-               CtdlRegisterProtoHook(cmd_seen, "SEEN", "Autoconverted. TODO: document me.");
-               CtdlRegisterProtoHook(cmd_gtsn, "GTSN", "Autoconverted. TODO: document me.");
-               CtdlRegisterProtoHook(cmd_view, "VIEW", "Autoconverted. TODO: document me.");
-               CtdlRegisterProtoHook(cmd_renu, "RENU", "Autoconverted. TODO: document me.");
-               CtdlRegisterProtoHook(cmd_newu, "NEWU", "Autoconverted. TODO: document me.");
+               CtdlRegisterProtoHook(cmd_chek, "CHEK", "assorted info we need to check at login");
+               CtdlRegisterProtoHook(cmd_qusr, "QUSR", "check to see if a user exists");
+               CtdlRegisterProtoHook(cmd_agup, "AGUP", "Administratively Get User Parameters");
+               CtdlRegisterProtoHook(cmd_asup, "ASUP", "Administratively Set User Parameters");
+               CtdlRegisterProtoHook(cmd_seen, "SEEN", "Manipulate seen/unread message flags");
+               CtdlRegisterProtoHook(cmd_gtsn, "GTSN", "Fetch seen/unread message flags");
+               CtdlRegisterProtoHook(cmd_view, "VIEW", "Set preferred view for user/room combination");
+               CtdlRegisterProtoHook(cmd_renu, "RENU", "Rename a user");
+               CtdlRegisterProtoHook(cmd_newu, "NEWU", "Log in as a new user");
        }
        /* return our Subversion id for the Log */
        return "user_ops";