* Did most of the migration from save_message() to CtdlSaveMsg(). The

[citadel.git] / citadel / serv_chat.c

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index b2c5995facb280608ca4f50119d9d91c728bdee4..197ace6dd1e19c32be44b4e9401ce581b3b5e0d4 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -42,29 +42,15 @@ int ChatLastMsg = 0;
 
 extern struct CitContext *ContextList;
 
-#define MODULE_NAME    "Chat module"
-#define MODULE_AUTHOR  "Art Cancro"
-#define MODULE_EMAIL   "ajc@uncnsrd.mt-kisco.ny.us"
-#define MAJOR_VERSION  2
-#define MINOR_VERSION  0
-
-static struct DLModule_Info info =
-{
-       MODULE_NAME,
-       MODULE_AUTHOR,
-       MODULE_EMAIL,
-       MAJOR_VERSION,
-       MINOR_VERSION
-};
-
-struct DLModule_Info *Dynamic_Module_Init(void)
+char *Dynamic_Module_Init(void)
 {
        CtdlRegisterProtoHook(cmd_chat, "CHAT", "Begin real-time chat");
        CtdlRegisterProtoHook(cmd_pexp, "PEXP", "Poll for express messages");
        CtdlRegisterProtoHook(cmd_gexp, "GEXP", "Get express messages");
        CtdlRegisterProtoHook(cmd_sexp, "SEXP", "Send an express message");
        CtdlRegisterSessionHook(delete_express_messages, EVT_STOP);
-       return &info;
+       CtdlRegisterXmsgHook(send_express_message, XMSG_PRI_LOCAL);
+       return "$Id$";
 }
 
 void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
@@ -80,11 +66,11 @@ void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
        else
                un = CC->usersupp.fullname;
        if (flag == 1) {
-               sprintf(bcast, ":|<%s %s>", un, cmdbuf);
+               snprintf(bcast, sizeof bcast, ":|<%s %s>", un, cmdbuf);
        } else if (flag == 0) {
-               sprintf(bcast, "%s|%s", un, cmdbuf);
+               snprintf(bcast, sizeof bcast, "%s|%s", un, cmdbuf);
        } else if (flag == 2) {
-               sprintf(bcast, ":|<%s whispers %s>", un, cmdbuf);
+               snprintf(bcast, sizeof bcast, ":|<%s whispers %s>", un, cmdbuf);
        }
        if ((strcasecmp(cmdbuf, "NOOP")) && (flag != 2)) {
                fp = fopen(CHATLOG, "a");
@@ -109,7 +95,7 @@ void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
                clnew->chat_username[sizeof clnew->chat_username - 1] = 0;
        } else
                clnew->chat_username[0] = '\0';
-       strcpy(clnew->chat_text, bcast);
+       safestrncpy(clnew->chat_text, bcast, sizeof clnew->chat_text);
 
        /* Here's the critical section.
         * First, add the new message to the queue...
@@ -164,19 +150,26 @@ t_context *find_context(char **unstr)
 }
 
 /*
- * List users in chat.  Setting allflag to 1 also lists users elsewhere.
+ * List users in chat.
+ * allflag ==  0 = list users in chat
+ *             1 = list users in chat, followed by users not in chat
+ *             2 = display count only
  */
 
 void do_chat_listing(int allflag)
 {
        struct CitContext *ccptr;
+       int count = 0;
 
-       cprintf(":|\n:| Users currently in chat:\n");
+       if ((allflag == 0) || (allflag == 1))
+               cprintf(":|\n:| Users currently in chat:\n");
        begin_critical_section(S_SESSION_TABLE);
        for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
+               if (!strcasecmp(ccptr->cs_room, "<chat>")) ++count;
                if ((!strcasecmp(ccptr->cs_room, "<chat>"))
                    && ((ccptr->cs_flags & CS_STEALTH) == 0)) {
-                       cprintf(":| %-25s <%s>\n", (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user, ccptr->chat_room);
+                       if ((allflag == 0) || (allflag == 1))
+                               cprintf(":| %-25s <%s>\n", (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user, ccptr->chat_room);
                }
        }
 
@@ -190,6 +183,14 @@ void do_chat_listing(int allflag)
                }
        }
        end_critical_section(S_SESSION_TABLE);
+
+       if (allflag == 2) {
+               if (count > 1) 
+                       cprintf(":|There are %d users here.\n", count);
+               else
+                       cprintf(":|Note: you are the only one here.\n");
+       }
+
        cprintf(":|\n");
 }
 
@@ -211,7 +212,7 @@ void cmd_chat(char *argbuf)
        }
        strcpy(CC->chat_room, "Main room");
 
-       strcpy(hold_cs_room, CC->cs_room);
+       safestrncpy(hold_cs_room, CC->cs_room, sizeof hold_cs_room);
        CC->cs_flags = CC->cs_flags | CS_CHAT;
        set_wtmpsupp("<chat>");
        cprintf("%d Entering chat mode (type '/help' for available commands)\n",
@@ -224,6 +225,8 @@ void cmd_chat(char *argbuf)
        }
        strcpy(cmdbuf, "");
 
+       do_chat_listing(2);
+
        while (1) {
                int ok_cmd;
 
@@ -472,7 +475,8 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                                        mallok(sizeof (struct ExpressMessage));
                                memset(newmsg, 0,
                                        sizeof (struct ExpressMessage));
-                               strcpy(newmsg->sender, lun);
+                               safestrncpy(newmsg->sender, lun,
+                                           sizeof newmsg->sender);
                                if (!strcasecmp(x_user, "broadcast"))
                                        newmsg->flags |= EM_BROADCAST;
                                newmsg->text = mallok(msglen);
@@ -492,7 +496,11 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
        }
        end_critical_section(S_SESSION_TABLE);
 
-       /* Log the page to disk if configured to do so */
+       /* Log the page to disk if configured to do so 
+
+
+       ****** FIX FIX FIX   add this back in *************
+
        if ((strlen(config.c_logpages) > 0) && (do_send) ) {
                fp = fopen(CC->temp, "wb");
                fprintf(fp, "%c%c%c", 255, MES_NORMAL, 0);
@@ -504,9 +512,10 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
                fprintf(fp, "N%s%c", NODENAME, 0);
                fprintf(fp, "M%s\n%c", x_msg, 0);
                fclose(fp);
-               save_message(CC->temp, "", config.c_logpages, M_LOCAL, 1);
+               save_message(CC->temp, "", config.c_logpages, MES_LOCAL, 1);
                unlink(CC->temp);
        }
+       *************************************/
        return (message_sent);
 }
 
@@ -545,7 +554,7 @@ void cmd_sexp(char *argbuf)
        }
        /* This loop handles text-transfer pages */
        if (!strcmp(x_msg, "-")) {
-               message_sent = send_express_message(lun, x_user, "");
+               message_sent = PerformXmsgHooks(lun, x_user, "");
                if (message_sent == 0) {
                        cprintf("%d No user '%s' logged in.\n", ERROR, x_user);
                        return;
@@ -562,12 +571,12 @@ void cmd_sexp(char *argbuf)
                                strcat(x_big_msgbuf, "\n");
                        strcat(x_big_msgbuf, x_msg);
                }
-               send_express_message(lun, x_user, x_big_msgbuf);
+               PerformXmsgHooks(lun, x_user, x_big_msgbuf);
                phree(x_big_msgbuf);
 
                /* This loop handles inline pages */
        } else {
-               message_sent = send_express_message(lun, x_user, x_msg);
+               message_sent = PerformXmsgHooks(lun, x_user, x_msg);
 
                if (message_sent > 0) {
                        if (strlen(x_msg) > 0)