CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_04
Commit time: 2002-12-15 22:54:18 UTC
Modified files:
Tag: u2_10_11_04
ChangeLog ircd/m_wallchops.c ircd/m_wallvoices.c ircd/m_whois.c
Log message:
Author: hikari <[EMAIL PROTECTED]> and Zoot <[EMAIL PROTECTED]>
Log message:
Fix of a bug in ms_wallchops and ms_wallvoices that was cauing @ and + to
be applied at every hop (my bad, wasn't thinking).
Applied Zoot's WHOIS optimisation patch which uses the IsChanOp and
HasVoice macros.
blessed be,
hikari
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.126 ircu2.10/ChangeLog:1.290.2.126.2.1
--- ircu2.10/ChangeLog:1.290.2.126 Sat Dec 14 17:02:37 2002
+++ ircu2.10/ChangeLog Sun Dec 15 14:54:06 2002
@@ -1,3 +1,12 @@
+2002-12-14 hikari <[EMAIL PROTECTED]>
+ * ircd/m_wallchops.c: fixed ms_wallchops()
+ * ircd/m_wallvoices.c: fixed ms_wallvoices()
+
+2002-12-13 Zoot <[EMAIL PROTECTED]>
+ * ircd/m_whois.c (do_whois): use IsChanOp and HasVoice macros
+ instead of is_chan_op() and has_voice since we already have
+ membership links.
+
2002-12-15 Isomer <[EMAIL PROTECTED]>
* include/patchlevel.h: Release this sucker!
Index: ircu2.10/ircd/m_wallchops.c
diff -u ircu2.10/ircd/m_wallchops.c:1.5.2.1 ircu2.10/ircd/m_wallchops.c:1.5.2.1.2.1
--- ircu2.10/ircd/m_wallchops.c:1.5.2.1 Sat Dec 14 17:02:42 2002
+++ ircu2.10/ircd/m_wallchops.c Sun Dec 15 14:54:07 2002
@@ -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_wallchops.c,v 1.5.2.1 2002/12/15 01:02:42 isomer Exp $
+ * $Id: m_wallchops.c,v 1.5.2.1.2.1 2002/12/15 22:54:07 shad0w Exp $
*/
/*
@@ -147,7 +147,7 @@
if (client_can_send_to_channel(sptr, chptr)) {
sendcmdto_channel_butone(sptr, CMD_WALLCHOPS, chptr, cptr,
SKIP_DEAF | SKIP_BURST | SKIP_NONOPS,
- "%H :@ %s", chptr, parv[parc - 1]);
+ "%H :%s", chptr, parv[parc - 1]);
} else
send_reply(sptr, ERR_CANNOTSENDTOCHAN, parv[1]);
}
Index: ircu2.10/ircd/m_wallvoices.c
diff -u ircu2.10/ircd/m_wallvoices.c:1.1.4.1 ircu2.10/ircd/m_wallvoices.c:1.1.4.1.2.1
--- ircu2.10/ircd/m_wallvoices.c:1.1.4.1 Sat Dec 14 17:02:42 2002
+++ ircu2.10/ircd/m_wallvoices.c Sun Dec 15 14:54:07 2002
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_wallvoices.c,v 1.1.4.1 2002/12/15 01:02:42 isomer Exp $
+ * $Id: m_wallvoices.c,v 1.1.4.1.2.1 2002/12/15 22:54:07 shad0w Exp $
*/
/*
@@ -146,7 +146,7 @@
if (client_can_send_to_channel(sptr, chptr)) {
sendcmdto_channel_butone(sptr, CMD_WALLVOICES, chptr, cptr,
SKIP_DEAF | SKIP_BURST | SKIP_NONVOICES,
- "%H :+ %s", chptr, parv[parc - 1]);
+ "%H :%s", chptr, parv[parc - 1]);
} else
send_reply(sptr, ERR_CANNOTSENDTOCHAN, parv[1]);
}
Index: ircu2.10/ircd/m_whois.c
diff -u ircu2.10/ircd/m_whois.c:1.19.2.9 ircu2.10/ircd/m_whois.c:1.19.2.9.2.1
--- ircu2.10/ircd/m_whois.c:1.19.2.9 Sat Dec 14 17:02:42 2002
+++ ircu2.10/ircd/m_whois.c Sun Dec 15 14:54:08 2002
@@ -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_whois.c,v 1.19.2.9 2002/12/15 01:02:42 isomer Exp $
+ * $Id: m_whois.c,v 1.19.2.9.2.1 2002/12/15 22:54:08 shad0w Exp $
*/
/*
@@ -166,12 +166,17 @@
}
if (IsDeaf(acptr))
*(buf + len++) = '-';
- if (is_chan_op(acptr, chptr))
- *(buf + len++) = '@';
- else if (has_voice(acptr, chptr))
- *(buf + len++) = '+';
- else if (IsZombie(chan))
+ if (IsZombie(chan))
+ {
*(buf + len++) = '!';
+ }
+ else
+ {
+ if (IsChanOp(chan))
+ *(buf + len++) = '@';
+ else if (HasVoice(chan))
+ *(buf + len++) = '+';
+ }
if (len)
*(buf + len) = '\0';
strcpy(buf + len, chptr->chname);
----------------------- End of diff -----------------------
