Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / m_wallops.c

diff --git a/modules/m_wallops.c b/modules/m_wallops.c
index ccd25e91a21c89776963c5f06162a8a0a8b04e6e..d2c2b28de44efe79cfd6cb274fee52a1c11ec7b6 100644 (file)
--- a/modules/m_wallops.c
+++ b/modules/m_wallops.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"
@@ -71,8 +71,6 @@ mo_operwall(struct Client *client_p, struct Client *source_p, int parc, const ch
        sendto_wallops_flags(UMODE_OPERWALL, source_p, "OPERWALL - %s", parv[1]);
        sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s OPERWALL :%s", 
                      use_id(source_p), parv[1]);
-       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s OPERWALL :%s", 
-                     source_p->name, parv[1]);
 
        return 0;
 }
@@ -80,7 +78,6 @@ mo_operwall(struct Client *client_p, struct Client *source_p, int parc, const ch
 /*
  * ms_operwall - OPERWALL message handler
  *  (write to *all* local opers currently online)
- *      parv[0] = sender prefix
  *      parv[1] = message text
  */
 static int
@@ -88,8 +85,6 @@ ms_operwall(struct Client *client_p, struct Client *source_p, int parc, const ch
 {
        sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s OPERWALL :%s",
                      use_id(source_p), parv[1]);
-       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s OPERWALL :%s",
-                     source_p->name, parv[1]);
        sendto_wallops_flags(UMODE_OPERWALL, source_p, "OPERWALL - %s", parv[1]);
 
        return 0;
@@ -124,8 +119,6 @@ ms_wallops(struct Client *client_p, struct Client *source_p, int parc, const cha
 
        sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s WALLOPS :%s", 
                      use_id(source_p), parv[1]);
-       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s WALLOPS :%s", 
-                     source_p->name, parv[1]);
 
        return 0;
 }