Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-08-17 01:57:13 UTC
Modified files:
ChangeLog ircd/channel.c ircd/m_burst.c ircd/m_invite.c
ircd/s_user.c
Log message:
Switch more uses of &me to &his for channel localcasts.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.671 ircu2.10/ChangeLog:1.672
--- ircu2.10/ChangeLog:1.671 Mon Aug 15 16:22:50 2005
+++ ircu2.10/ChangeLog Tue Aug 16 18:57:02 2005
@@ -1,3 +1,18 @@
+2005-08-16 Michael Poole <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* include/supported.h (FEATURESVALUES2): Add +d channel mode.
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.140 ircu2.10/ircd/channel.c:1.141
--- ircu2.10/ircd/channel.c:1.140 Mon Aug 15 16:22:50 2005
+++ ircu2.10/ircd/channel.c Tue Aug 16 18:57:03 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Channel management and maintenance
- * @version $Id: channel.c,v 1.140 2005/08/15 23:22:50 entrope Exp $
+ * @version $Id: channel.c,v 1.141 2005/08/17 01:57:03 entrope Exp $
*/
#include "config.h"
@@ -3424,7 +3424,7 @@
/* 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))
Index: ircu2.10/ircd/m_burst.c
diff -u ircu2.10/ircd/m_burst.c:1.36 ircu2.10/ircd/m_burst.c:1.37
--- ircu2.10/ircd/m_burst.c:1.36 Thu Jul 14 20:02:49 2005
+++ ircu2.10/ircd/m_burst.c Tue Aug 16 18:57:03 2005
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_burst.c,v 1.36 2005/07/15 03:02:49 entrope Exp $
+ * $Id: m_burst.c,v 1.37 2005/08/17 01:57:03 entrope Exp $
*/
/*
@@ -306,7 +306,7 @@
*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) {
Index: ircu2.10/ircd/m_invite.c
diff -u ircu2.10/ircd/m_invite.c:1.23 ircu2.10/ircd/m_invite.c:1.24
--- ircu2.10/ircd/m_invite.c:1.23 Fri Jun 24 04:31:26 2005
+++ ircu2.10/ircd/m_invite.c Tue Aug 16 18:57:03 2005
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_invite.c,v 1.23 2005/06/24 11:31:26 a1kmm Exp $
+ * $Id: m_invite.c,v 1.24 2005/08/17 01:57:03 entrope Exp $
*/
/*
@@ -188,7 +188,7 @@
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 @@
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);
Index: ircu2.10/ircd/s_user.c
diff -u ircu2.10/ircd/s_user.c:1.98 ircu2.10/ircd/s_user.c:1.99
--- ircu2.10/ircd/s_user.c:1.98 Mon Jun 27 06:25:52 2005
+++ ircu2.10/ircd/s_user.c Tue Aug 16 18:57:03 2005
@@ -22,7 +22,7 @@
*/
/** @file
* @brief Miscellaneous user-related helper functions.
- * @version $Id: s_user.c,v 1.98 2005/06/27 13:25:52 entrope Exp $
+ * @version $Id: s_user.c,v 1.99 2005/08/17 01:57:03 entrope Exp $
*/
#include "config.h"
@@ -1184,11 +1184,11 @@
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;
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
