projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Author: Michael Poole <mdpoole@troilus.org>
[ircu2.10.12-pk.git]
/
ircd
/
m_wallvoices.c
diff --git
a/ircd/m_wallvoices.c
b/ircd/m_wallvoices.c
index 4aa3d860963535931bbe70ba923c04949d2663a1..c5d0461dab54fc7b1ba0e9a733d92543de83b8cb 100644
(file)
--- a/
ircd/m_wallvoices.c
+++ b/
ircd/m_wallvoices.c
@@
-84,6
+84,7
@@
#include "client.h"
#include "hash.h"
#include "ircd.h"
#include "client.h"
#include "hash.h"
#include "ircd.h"
+#include "ircd_log.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "msg.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "msg.h"
@@
-92,7
+93,7
@@
#include "s_user.h"
#include "send.h"
#include "s_user.h"
#include "send.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
/*
* m_wallvoices - local generic message handler
/*
* m_wallvoices - local generic message handler
@@
-113,7
+114,7
@@
int m_wallvoices(struct Client* cptr, struct Client* sptr, int parc, char* parv[
return send_reply(sptr, ERR_NOTEXTTOSEND);
if (IsChannelName(parv[1]) && (chptr = FindChannel(parv[1]))) {
return send_reply(sptr, ERR_NOTEXTTOSEND);
if (IsChannelName(parv[1]) && (chptr = FindChannel(parv[1]))) {
- if (client_can_send_to_channel(sptr, chptr)) {
+ if (client_can_send_to_channel(sptr, chptr
, 1
)) {
if ((chptr->mode.mode & MODE_NOPRIVMSGS) &&
check_target_limit(sptr, chptr, chptr->chname, 0))
return 0;
if ((chptr->mode.mode & MODE_NOPRIVMSGS) &&
check_target_limit(sptr, chptr, chptr->chname, 0))
return 0;
@@
-142,11
+143,11
@@
int ms_wallvoices(struct Client* cptr, struct Client* sptr, int parc, char* parv
if (parc < 3 || !IsUser(sptr))
return 0;
if (parc < 3 || !IsUser(sptr))
return 0;
- if ((chptr = FindChannel(parv[1]))) {
- if (client_can_send_to_channel(sptr, chptr)) {
+ if (
!IsLocalChannel(parv[1]) &&
(chptr = FindChannel(parv[1]))) {
+ if (client_can_send_to_channel(sptr, chptr
, 1
)) {
sendcmdto_channel_butone(sptr, CMD_WALLVOICES, chptr, cptr,
SKIP_DEAF | SKIP_BURST | SKIP_NONVOICES,
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]);
}
} else
send_reply(sptr, ERR_CANNOTSENDTOCHAN, parv[1]);
}