Fix various rline bugs, implement /stats R, and fix the issue where you get no error...

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

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index dcef9196ddbeff81eb755ee4175b8f28f42c7884..4ed1782789f80d8a92894f65ce70328e0824b97a 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -34,14 +34,12 @@ class CommandSwhois : public Command
 
                if (!dest)
                {
-                       user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
 
                std::string* text;
-               dest->GetExt("swhois", text);
-
-               if (text)
+               if (dest->GetExt("swhois", text))
                {
                        // We already had it set...
                        if (!ServerInstance->ULine(user->server))
@@ -112,8 +110,7 @@ class ModuleSWhois : public Module
                {
                        /* Insert our numeric before 312 */
                        std::string* swhois;
-                       dest->GetExt("swhois", swhois);
-                       if (swhois)
+                       if (dest->GetExt("swhois", swhois))
                        {
                                ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), swhois->c_str());
                        }
@@ -135,8 +132,7 @@ class ModuleSWhois : public Module
                {
                        // check if this user has an swhois field to send
                        std::string* swhois;
-                       user->GetExt("swhois", swhois);
-                       if (swhois)
+                       if (user->GetExt("swhois", swhois))
                        {
                                // call this function in the linking module, let it format the data how it
                                // sees fit, and send it on its way. We dont need or want to know how.
@@ -149,8 +145,7 @@ class ModuleSWhois : public Module
        virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
        {
                std::string* swhois;
-               user->GetExt("swhois", swhois);
-               if (swhois)
+               if (user->GetExt("swhois", swhois))
                {
                        user->Shrink("swhois");
                        delete swhois;
@@ -164,8 +159,7 @@ class ModuleSWhois : public Module
                {
                        User* user = (User*)item;
                        std::string* swhois;
-                       user->GetExt("swhois", swhois);
-                       if (swhois)
+                       if (user->GetExt("swhois", swhois))
                        {
                                user->Shrink("swhois");
                                delete swhois;
@@ -257,7 +251,7 @@ class ModuleSWhois : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };