Switch more uses of &me to &his for channel localcasts.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1457 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 7e07712850b707f042c49ffcc0e1eb39c484c032..67ca31e59e81c17f65d6b3a3f3e0fe76fb8a1b51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-08-16  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/channel.c (joinbuf_join): Switch to &his instead of &me for
+       announcements to local users in a channel.
+
+       * ircd/m_burst.c (ms_burst): Likewise.
+
+       * ircd/m_invite.c (m_invite): Likewise.
+       (ms_invite): Likewise.
+
+2005-08-16  Jukka Ollila <jaollila@niksula.hut.fi>
+
+       * ircd/s_user.c (hide_hostmask): Use HIS_SERVERNAME instead of the
+       real thing for the post-mode-x rejoin.
+
 2005-08-15  Michael Poole <mdpoole@troilus.org>
 
        * include/supported.h (FEATURESVALUES2): Add +d channel mode.

diff --git a/ircd/channel.c b/ircd/channel.c
index f29c124e44167fe9707432efc711af167cb6cb23..fcf1d3a4e1818edce15ababf3f88a3968199be73 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -3424,7 +3424,7 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
 
       /* send an op, too, if needed */
       if (flags & CHFL_CHANOP && (oplevel < MAXOPLEVEL || !MyUser(jbuf->jb_source)))
-       sendcmdto_channel_butserv_butone((chan->mode.apass[0] ? &me : jbuf->jb_source),
+       sendcmdto_channel_butserv_butone((chan->mode.apass[0] ? &his : jbuf->jb_source),
                                          CMD_MODE, chan, NULL, 0, "%H +o %C",
                                         chan, jbuf->jb_source);
     } else if (MyUser(jbuf->jb_source))

diff --git a/ircd/m_burst.c b/ircd/m_burst.c
index 79cce5a6cb3abd5673690eaa53b7c9fd95e736f1..6cddc477c2015c66dbe65b68519863039539aa48 100644 (file)
--- a/ircd/m_burst.c
+++ b/ircd/m_burst.c
@@ -306,7 +306,7 @@ int ms_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       *chptr->topic = '\0';
       *chptr->topic_nick = '\0';
       chptr->topic_time = 0;
-      sendcmdto_channel_butserv_butone(&me, CMD_TOPIC, chptr, NULL, 0,
+      sendcmdto_channel_butserv_butone(&his, CMD_TOPIC, chptr, NULL, 0,
                                        "%H :%s", chptr, chptr->topic);
     }
   } else if (chptr->creationtime == timestamp) {

diff --git a/ircd/m_invite.c b/ircd/m_invite.c
index a83b41e165bce260d8bf2eac94aa379a496c9b8c..e5270f2e4e10cb00453043e944c6ced7bc74a200 100644 (file)
--- a/ircd/m_invite.c
+++ b/ircd/m_invite.c
@@ -188,7 +188,7 @@ int m_invite(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (!IsLocalChannel(chptr->chname) || MyConnect(acptr)) {
     if (feature_bool(FEAT_ANNOUNCE_INVITES)) {
       /* Announce to channel operators. */
-      sendcmdto_channel_butserv_butone(&me, get_error_numeric(RPL_ISSUEDINVITE)->str,
+      sendcmdto_channel_butserv_butone(&his, get_error_numeric(RPL_ISSUEDINVITE)->str,
                                        NULL, chptr, sptr, SKIP_NONOPS,
                                        "%H %C %C :%C has been invited by %C",
                                        chptr, acptr, sptr, acptr, sptr);
@@ -292,7 +292,7 @@ int ms_invite(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 
   if (feature_bool(FEAT_ANNOUNCE_INVITES)) {
     /* Announce to channel operators. */
-    sendcmdto_channel_butserv_butone(&me, get_error_numeric(RPL_ISSUEDINVITE)->str,
+    sendcmdto_channel_butserv_butone(&his, get_error_numeric(RPL_ISSUEDINVITE)->str,
                                      NULL, chptr, sptr, SKIP_NONOPS,
                                      "%H %C %C :%C has been invited by %C",
                                      chptr, acptr, sptr, acptr, sptr);

diff --git a/ircd/s_user.c b/ircd/s_user.c
index aac289f98867623214decfa73e2e806a452cf46c..7d9faaf3d5b41c951c6813ccf76561a061fc42d1 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -1184,11 +1184,11 @@ hide_hostmask(struct Client *cptr, unsigned int flag)
       sendcmdto_channel_butserv_butone(cptr, CMD_JOIN, chan->channel, cptr, 0,
                                          "%H", chan->channel);
     if (IsChanOp(chan) && HasVoice(chan))
-      sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan->channel, cptr, 0,
+      sendcmdto_channel_butserv_butone(&his, CMD_MODE, chan->channel, cptr, 0,
                                        "%H +ov %C %C", chan->channel, cptr,
                                        cptr);
     else if (IsChanOp(chan) || HasVoice(chan))
-      sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan->channel, cptr, 0,
+      sendcmdto_channel_butserv_butone(&his, CMD_MODE, chan->channel, cptr, 0,
         "%H +%c %C", chan->channel, IsChanOp(chan) ? 'o' : 'v', cptr);
   }
   return 0;