Change the DNSBL hit snomask to SNO_REJ (+r) as to not spam SNO_GENERAL

[irc/rqf/shadowircd.git] / extensions / m_opme.c

diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index 78a7706f1da4242d602e6ce900fa4827dd37dc1e..c60a06a6f2341e7f2ee663dadc55ff6e3ad4320f 100644 (file)
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -16,19 +16,17 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: m_opme.c 3554 2007-08-10 22:31:14Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"
@@ -50,7 +48,6 @@ DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3554 $"
 
 /*
 ** mo_opme
-**      parv[0] = sender prefix
 **      parv[1] = channel
 */
 static int
@@ -78,7 +75,7 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
        {
                msptr = ptr->data;
 
-               if(is_chanop(msptr))
+               if(is_chanop(msptr) || is_admin(msptr))
                {
                        sendto_one_notice(source_p, ":%s Channel is not opless", parv[1]);
                        return 0;
@@ -105,13 +102,9 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
                              ":%s WALLOPS :OPME called for [%s] by %s!%s@%s",
                              me.name, parv[1], source_p->name, source_p->username, source_p->host);
                sendto_server(NULL, chptr, CAP_TS6, NOCAPS, ":%s PART %s", source_p->id, parv[1]);
-               sendto_server(NULL, chptr, NOCAPS, CAP_TS6, ":%s PART %s", source_p->name, parv[1]);
                sendto_server(NULL, chptr, CAP_TS6, NOCAPS,
                              ":%s SJOIN %ld %s + :@%s",
                              me.id, (long) chptr->channelts, parv[1], source_p->id);
-               sendto_server(NULL, chptr, NOCAPS, CAP_TS6,
-                             ":%s SJOIN %ld %s + :@%s",
-                             me.name, (long) chptr->channelts, parv[1], source_p->name);
        }
 
        sendto_channel_local(ALL_MEMBERS, chptr,