Merge pull request #302 from edk0/sasl-usercloak

[solanum.git] / extensions / m_omode.c

diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index 3fd9ce5282e080530083f7e373278f737236c094..571868f749e68374e643ed75ba0075f226e1366e 100644 (file)
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -21,8 +21,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_omode.c 3121 2007-01-02 13:23:04Z jilles $
  */
 
 #include "stdinc.h"
@@ -44,7 +42,9 @@
 #include "messages.h"
 #include "logger.h"
 
-static int mo_omode(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char omode_desc[] = "Allow admins to forcibly change modes on channels with the OMODE command";
+
+static void mo_omode(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message omode_msgtab = {
        "OMODE", 0, 0, 0, 0,
@@ -53,13 +53,13 @@ struct Message omode_msgtab = {
 
 mapi_clist_av1 omode_clist[] = { &omode_msgtab, NULL };
 
-DECLARE_MODULE_AV1(omode, NULL, NULL, omode_clist, NULL, NULL, "$Revision: 3121 $");
+DECLARE_MODULE_AV2(omode, NULL, NULL, omode_clist, NULL, NULL, NULL, NULL, omode_desc);
 
 /*
  * mo_omode - MODE command handler
  * parv[1] - channel
  */
-static int
+static void
 mo_omode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Channel *chptr = NULL;
@@ -72,7 +72,7 @@ mo_omode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        if(!IsOperAdmin(source_p))
        {
                sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
-               return 0;
+               return;
        }
 
        /* Now, try to find the channel in question */
@@ -80,7 +80,7 @@ mo_omode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        {
                sendto_one_numeric(source_p, ERR_BADCHANNAME,
                                form_str(ERR_BADCHANNAME), parv[1]);
-               return 0;
+               return;
        }
 
        chptr = find_channel(parv[1]);
@@ -89,7 +89,7 @@ mo_omode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        {
                sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
                                form_str(ERR_NOSUCHCHANNEL), parv[1]);
-               return 0;
+               return;
        }
 
        /* Now know the channel exists */
@@ -99,7 +99,7 @@ mo_omode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        if (is_chanop(msptr))
        {
                sendto_one_notice(source_p, ":Use a normal MODE you idiot");
-               return 0;
+               return;
        }
 
        params[0] = '\0';
@@ -133,9 +133,9 @@ mo_omode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                {
                        sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,
                                           form_str(ERR_USERNOTINCHANNEL), parv[3], chptr->chname);
-                       return 0;
+                       return;
                }
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
+               sendto_channel_local(&me, ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
                                me.name, parv[1], source_p->name);
                sendto_server(NULL, chptr, CAP_TS6, NOCAPS,
                                ":%s TMODE %ld %s +o %s",
@@ -164,5 +164,4 @@ mo_omode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                        remove_user_from_channel(msptr);
        }
 #endif
-       return 0;
 }