A few more I missed.

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

diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index d8cb309278754b40c406d7c18145ea0053e1cace..586c6f84e7b7d6da58d76a3d266bf2adb73b50a7 100644 (file)
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -2,48 +2,54 @@
  *       | 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-2007 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;
-
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for the SETNAME command */
 
-Server *Srv;
+
 
 class cmd_setname : public command_t
 {
  public:
-       cmd_setname () : command_t("SETNAME", 0, 1)
+       cmd_setname (InspIRCd* Instance) : command_t(Instance,"SETNAME", 0, 1)
        {
                this->source = "m_setname.so";
+               syntax = "<new-gecos>";
        }
 
-       void Handle (char **parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               std::string line = "";
-               for (int i = 0; i < pcnt-1; i++)
+               if (!*parameters[0])
+               {
+                       user->WriteServ("NOTICE %s :*** SETNAME: GECOS must be specified", user->nick);
+                       return CMD_FAILURE;
+               }
+               
+               if (strlen(parameters[0]) > MAXGECOS)
+               {
+                       user->WriteServ("NOTICE %s :*** SETNAME: GECOS too long", user->nick);
+                       return CMD_FAILURE;
+               }
+               
+               if (user->ChangeName(parameters[0]))
                {
-                       line = line + std::string(parameters[i]);
+                       ServerInstance->WriteOpers("%s used SETNAME to change their GECOS to %s", user->nick, parameters[0]);
+                       return CMD_SUCCESS;
                }
-               line = line + std::string(parameters[pcnt-1]);
-               Srv->ChangeGECOS(user,line);
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -52,12 +58,12 @@ class ModuleSetName : public Module
 {
        cmd_setname*    mycommand;
  public:
-       ModuleSetName(Server* Me)
-               : Module::Module(Me)
+       ModuleSetName(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_setname();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_setname(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSetName()
@@ -66,34 +72,9 @@ class ModuleSetName : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetNameFactory : public ModuleFactory
-{
- public:
-       ModuleSetNameFactory()
-       {
-       }
-       
-       ~ModuleSetNameFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleSetName(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSetNameFactory;
-}
-
+MODULE_INIT(ModuleSetName)