Merge pull request #357 from StevenVanAcker/insp20

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

diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index cc7c575080c56a75b7864036ce40681c2c3099f8..6efa9974bc1bff4aa4022e94b64cb95983e96a49 100644 (file)
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -61,13 +61,6 @@ class ModuleHostChange : public Module
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       void Prioritize()
-       {
-               Module* cloak = ServerInstance->Modules->Find("m_cloaking.so");
-               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_AFTER, &cloak);
-       }
-
-
        virtual void OnRehash(User* user)
        {
                ConfigReader Conf;
@@ -91,7 +84,7 @@ class ModuleHostChange : public Module
                        if (!strcasecmp(action.c_str(), "set"))
                        {
                                act = Host::HCA_SET;
-                               newhost = tag->getString("newhost");
+                               newhost = tag->getString("value");
                        }
                        else if (!strcasecmp(action.c_str(), "suffix"))
                                act = Host::HCA_SUFFIX;
@@ -100,7 +93,7 @@ class ModuleHostChange : public Module
                        else
                                throw ModuleException("Invalid hostchange action: " + action);
 
-                       hostchanges.push_back(std::make_pair(mask, Host(act, tag->getString("ports"), newhost)));
+                       hostchanges.push_back(std::make_pair(mask, Host(act, newhost, tag->getString("ports"))));
                }
        }
 
@@ -167,9 +160,9 @@ class ModuleHostChange : public Module
                                }
                                if (!newhost.empty())
                                {
-                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your virtual host: " + newhost);
+                                       user->WriteServ("NOTICE "+user->nick+" :Setting your virtual host: " + newhost);
                                        if (!user->ChangeDisplayedHost(newhost.c_str()))
-                                               user->WriteServ("NOTICE "+std::string(user->nick)+" :Could not set your virtual host: " + newhost);
+                                               user->WriteServ("NOTICE "+user->nick+" :Could not set your virtual host: " + newhost);
                                        return;
                                }
                        }