Merge pull request #53 from ShadowNinja/clarify_U+R

[solanum.git] / extensions / m_omode.c

diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index cb2b0d39e6be5567dbb29d25c37c82ba1f4192ad..d6e5dfbc3da0293a6e796b3fd2d5de00d0bc9dd3 100644 (file)
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
@@ -41,6 +41,8 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
+#include "messages.h"
+#include "logger.h"
 
 static int mo_omode(struct Client *, struct Client *, int, const char **);
 
@@ -55,7 +57,6 @@ DECLARE_MODULE_AV1(omode, NULL, NULL, omode_clist, NULL, NULL, "$Revision: 3121
 
 /*
  * mo_omode - MODE command handler
- * parv[0] - sender
  * parv[1] - channel
  */
 static int
@@ -109,20 +110,20 @@ mo_omode(struct Client *client_p, struct Client *source_p, int parc, const char
                rb_strlcat(params, parv[i], sizeof params);
        }
 
-       sendto_wallops_flags(UMODE_WALLOP, &me, 
+       sendto_wallops_flags(UMODE_WALLOP, &me,
                             "OMODE called for [%s] [%s] by %s!%s@%s",
                             parv[1], params, source_p->name, source_p->username, source_p->host);
        ilog(L_MAIN, "OMODE called for [%s] [%s] by %s",
             parv[1], params, get_oper_name(source_p));
 
        if(*chptr->chname != '&')
-               sendto_server(NULL, NULL, NOCAPS, NOCAPS, 
+               sendto_server(NULL, NULL, NOCAPS, NOCAPS,
                              ":%s WALLOPS :OMODE called for [%s] [%s] by %s!%s@%s",
                              me.name, parv[1], params, source_p->name, source_p->username,
                              source_p->host);
 
 #if 0
-       set_channel_mode(client_p, source_p->servptr, chptr, msptr, 
+       set_channel_mode(client_p, source_p->servptr, chptr, msptr,
                         parc - 2, parv + 2);
 #else
        if (parc == 4 && !strcmp(parv[2], "+o") && !irccmp(parv[3], source_p->name))
@@ -140,9 +141,6 @@ mo_omode(struct Client *client_p, struct Client *source_p, int parc, const char
                                ":%s TMODE %ld %s +o %s",
                                me.id, (long) chptr->channelts, parv[1],
                                source_p->id);
-               sendto_server(NULL, chptr, NOCAPS, CAP_TS6,
-                               ":%s MODE %s +o %s",
-                               me.name, parv[1], source_p->name);
                msptr->flags |= CHFL_CHANOP;
        }
        else
@@ -155,7 +153,7 @@ mo_omode(struct Client *client_p, struct Client *source_p, int parc, const char
                        add_user_to_channel(chptr, source_p, CHFL_CHANOP);
                        msptr = find_channel_membership(chptr, source_p);
                }
-               set_channel_mode(client_p, source_p, chptr, msptr, 
+               set_channel_mode(client_p, source_p, chptr, msptr,
                                parc - 2, parv + 2);
                /* We know they were not opped before and they can't have opped
                 * themselves as set_channel_mode() does not allow that