Fix for SF bug #2491886. Added OSMSG_USER_ALREADY_THERE.

diff --git a/ChangeLog b/ChangeLog
index bd35c73417f0816ea104d0bdfbf4353f444f8bc8..add70515e90442594eec9607e7bef0635e210e14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
-2009-01-04  Alex Schumann   <rubin@afternet.org>
+2008-01-12  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
+
+       * src/opserv.c: Fix for SF bug #2491886. Added OSMSG_USER_ALREADY_THERE.
+
+2009-01-04  Alex Schumann  <rubin@afternet.org>
 
        * src/nickserv.c: fix access change bug when using ldap but not
        ldap_oper_group_dn.

diff --git a/src/opserv.c b/src/opserv.c
index 058a17ebedef6ea5dae028280d170fedf6abb189..197610a38e6a495a3bbd1516e4ac9d6f53cf1881 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -165,6 +165,7 @@ static const struct message_entry msgtab[] = {
     { "OSMSG_NO_DEBUG_CHANNEL", "No debug channel has been configured." },
     { "OSMSG_INVITE_DONE", "Invited $b%s$b to $b%s$b." },
     { "OSMSG_ALREADY_THERE", "You are already in $b%s$b." },
+    { "OSMSG_USER_ALREADY_THERE", "%s is already in $b%s$b." },
     { "OSMSG_NOT_THERE", "You not in $b%s$b." },
     { "OSMSG_JOIN_DONE", "I have joined $b%s$b." },
     { "OSMSG_MARK_SET", "Set the MARK." },
@@ -1627,7 +1628,7 @@ static MODCMD_FUNC(cmd_svsjoin)
        channel = AddChannel(argv[2], now, NULL, NULL, NULL);
     }
     if (GetUserMode(channel, target)) {
-        reply("OSMSG_ALREADY_THERE", channel->name);
+        reply("OSMSG_USER_ALREADY_THERE", target->nick, channel->name);
         return 0;
     }
     irc_svsjoin(opserv, target, channel);