Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

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

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 7ca2908463e50c8984fc5eae6228a7833ad092dd..81cb7dc3732bc94b4e6eec5e389e124628ca771f 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -25,9 +25,8 @@ using namespace std;
 
 /* $ModDesc: Provides support for SANICK command */
 
-
-
-
+/** Handle /SANICK
+ */
 class cmd_sanick : public command_t
 {
  public:
@@ -47,21 +46,25 @@ class cmd_sanick : public command_t
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
                                return CMD_FAILURE;
                        }
+                       std::string oldnick = user->nick;
                        if (ServerInstance->IsNick(parameters[1]))
                        {
                                if (source->ForceNickChange(parameters[1]))
                                {
-                                       ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+                                       ServerInstance->WriteOpers(oldnick+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
                                        return CMD_SUCCESS;
                                }
                                else
                                {
                                        /* We couldnt change the nick */
-                                       ServerInstance->WriteOpers(std::string(user->nick)+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
-                                       userrec::QuitUser(ServerInstance, source, "Nickname collision");
+                                       ServerInstance->WriteOpers(oldnick+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
                                        return CMD_FAILURE;
                                }
                        }
+                       else
+                       {
+                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
+                       }
 
                        return CMD_FAILURE;
                }
@@ -89,7 +92,7 @@ class ModuleSanick : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
 };