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 41dcd15bffc3f0c569dbee9e0fc8f5d505d1d29e..586c6f84e7b7d6da58d76a3d266bf2adb73b50a7 100644 (file)
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -2,28 +2,20 @@
  *       | 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 "inspircd.h"
-
 /* $ModDesc: Provides support for the SETNAME command */
 
 
@@ -39,13 +31,23 @@ class cmd_setname : public command_t
 
        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]);
-               user->ChangeName(line.c_str());
 
                return CMD_SUCCESS;
        }
@@ -57,7 +59,7 @@ class ModuleSetName : public Module
        cmd_setname*    mycommand;
  public:
        ModuleSetName(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_setname(ServerInstance);
@@ -70,34 +72,9 @@ class ModuleSetName : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,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(InspIRCd* Me)
-       {
-               return new ModuleSetName(Me);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSetNameFactory;
-}
-
+MODULE_INIT(ModuleSetName)