Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / commands / cmd_gline.cpp

diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index 0061bfe00f086746317d864a53e9284b77a71a00..ea2850f6f1deadab3c5801bee51468c9f229d496 100644 (file)
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -13,20 +13,35 @@
 
 #include "inspircd.h"
 #include "xline.h"
-#include "commands/cmd_gline.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /GLINE. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandGline : public Command
 {
-       return new CommandGline(Instance);
-}
+ public:
+       /** Constructor for gline.
+        */
+       CommandGline (Module* parent) : Command(parent,"GLINE",1,3) { flags_needed = 'o'; Penalty = 0; syntax = "<ident@host> [<duration> :<reason>]"; }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
+
 
 /** Handle /GLINE
  */
-CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User *user)
 {
        std::string target = parameters[0];
-               
-       if (pcnt >= 3)
+
+       if (parameters.size() >= 3)
        {
                IdentHostPair ih;
                User* find = ServerInstance->FindNick(target.c_str());
@@ -41,32 +56,32 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
 
                if (ih.first.empty())
                {
-                       user->WriteServ("NOTICE %s :*** Target not found", user->nick);
+                       user->WriteServ("NOTICE %s :*** Target not found", user->nick.c_str());
                        return CMD_FAILURE;
                }
 
                if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
                        return CMD_FAILURE;
 
-               else if (strchr(target.c_str(),'!'))
+               else if (target.find('!') != std::string::npos)
                {
-                       user->WriteServ("NOTICE %s :*** G-Line cannot operate on nick!user@host masks",user->nick);
+                       user->WriteServ("NOTICE %s :*** G-Line cannot operate on nick!user@host masks",user->nick.c_str());
                        return CMD_FAILURE;
                }
 
-               long duration = ServerInstance->Duration(parameters[1]);
-               GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
+               long duration = ServerInstance->Duration(parameters[1].c_str());
+               GLine* gl = new GLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
                if (ServerInstance->XLines->AddLine(gl, user))
                {
                        if (!duration)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,target.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s: %s",user->nick.c_str(),target.c_str(), parameters[2].c_str());
                        }
                        else
                        {
                                time_t c_requires_crap = duration + ServerInstance->Time();
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s",user->nick,target.c_str(),
-                                               ServerInstance->TimeString(c_requires_crap).c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
+                                               ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
                        }
 
                        ServerInstance->XLines->ApplyLines();
@@ -74,7 +89,7 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
                else
                {
                        delete gl;
-                       user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,target.c_str());
+                       user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick.c_str(),target.c_str());
                }
 
        }
@@ -82,14 +97,15 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
        {
                if (ServerInstance->XLines->DelLine(target.c_str(),"G",user))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,target.c_str());
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s removed G-line on %s",user->nick.c_str(),target.c_str());
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick,target.c_str());
+                       user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick.c_str(),target.c_str());
                }
        }
 
        return CMD_SUCCESS;
 }
 
+COMMAND_INIT(CommandGline)