DOH! Fix my muppetry of a segfault, and fix some warnings

[user/henk/code/inspircd.git] / src / modules / m_uninvite.cpp

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index e7d952386e565802ee678c8507585a2cc31e048d..9940d46d8818315b28af23d45526710b23492f4d 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,96 +2,94 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 /* $ModDesc: Provides the UNINVITE command which lets users un-invite other users from channels (!) */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
-Server *Srv;
-        
-class cmd_uninvite : public command_t
+/** Handle /UNINVITE
+ */     
+class CommandUninvite : public Command
 {
  public:
-       cmd_uninvite () : command_t("UNINVITE", 0, 2)
+       CommandUninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
        {
                this->source = "m_uninvite.so";
+               syntax = "<nick> <channel>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       void Handle (char **parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
-                userrec* u = Find(parameters[0]);
-                chanrec* c = FindChan(parameters[1]);
-                         
-                if ((!c) || (!u))
-                {        
-                        if (!c)
-                        {
-                                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]);
-                        }
-                        else
-                        {
-                                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-                        }
-                                
-                        return; 
-                }        
-
-                if (c->binarymodes & CM_INVITEONLY)
-                {
-                        if (cstatus(user,c) < STATUS_HOP)
-                        {
-                                WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
-                                return;
-                        }
-                }
+               User* u = ServerInstance->FindNick(parameters[0]);
+               Channel* c = ServerInstance->FindChan(parameters[1]);
+                        
+               if ((!c) || (!u))
+               {       
+                       if (!c)
+                       {
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[1]);
+                       }
+                       else
+                       {
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
+                       }
+                               
+                       return CMD_FAILURE;
+               }       
+
+               if (c->modes[CM_INVITEONLY])
+               {
+                       if (c->GetStatus(user) < STATUS_HOP)
+                       {
+                               user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick, c->name,
+                                               ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
+                               return CMD_FAILURE;
+                       }
+               }
 
                irc::string xname(c->name);
 
-                if (!u->IsInvited(xname))
-                {
-                        WriteServ(user->fd,"491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
-                        return;
-                }
-                if (has_channel(user,c))
-                {
-                        WriteServ(user->fd,"492 %s %s :You're not on that channel!",user->nick, c->name);
-                        return;
-                }
-
-                u->RemoveInvite(xname);
-                WriteServ(user->fd,"NOTICE %s :*** Uninvited %s from %s",user->nick,u->nick,c->name);
-                WriteChannel(user,"NOTICE %s :*** %s uninvited %s.",c->name,user->nick,u->nick);
-        }
+               if (!u->IsInvited(xname))
+               {
+                       user->WriteNumeric(491, "%s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
+                       return CMD_FAILURE;
+               }
+               if (!c->HasUser(user))
+               {
+                       user->WriteNumeric(492, "%s %s :You're not on that channel!",user->nick, c->name);
+                       return CMD_FAILURE;
+               }
+
+               u->RemoveInvite(xname);
+               user->WriteNumeric(494, "%s %s %s :Uninvited",user->nick,c->name,u->nick);
+               u->WriteNumeric(493, "%s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
+               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick);
+
+               return CMD_SUCCESS;
+       }
 };
 
 class ModuleUninvite : public Module
 {
-       cmd_uninvite *mycommand;
+       CommandUninvite *mycommand;
 
  public:
 
-       ModuleUninvite(Server* Me) : Module::Module(Me)
+       ModuleUninvite(InspIRCd* Me) : Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_uninvite();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new CommandUninvite(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleUninvite()
@@ -100,31 +98,9 @@ class ModuleUninvite : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_VENDOR);
+               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
        }
 };
 
+MODULE_INIT(ModuleUninvite)
 
-class ModuleUninviteFactory : public ModuleFactory
-{
- public:
-       ModuleUninviteFactory()
-       {
-       }
-       
-       ~ModuleUninviteFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleUninvite(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleUninviteFactory;
-}