X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hostchange.cpp;h=7c25b4994ac7af7d21c63879dc0b32a7ae606b4f;hb=4ab1c43c1eee708fc50a4808f714a731891b75e8;hp=099050a27401130ee2d2480f56e96d016809eb2f;hpb=c8b41aa5d256d99eee67ec94492a94dc30e0ea35;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index 099050a27..7c25b4994 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -47,26 +47,25 @@ typedef std::vector<std::pair<std::string, Host> > hostchanges_t;
 
 class ModuleHostChange : public Module
 {
- private:
 	hostchanges_t hostchanges;
 	std::string MySuffix;
 	std::string MyPrefix;
 	std::string MySeparator;
 
  public:
-	ModuleHostChange()
-			{
+	void init() CXX11_OVERRIDE
+	{
 		OnRehash(NULL);
 		Implementation eventlist[] = { I_OnRehash, I_OnUserConnect };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
-		ConfigReader Conf;
-		MySuffix = Conf.ReadValue("host","suffix",0);
-		MyPrefix = Conf.ReadValue("host","prefix","",0);
-		MySeparator = Conf.ReadValue("host","separator",".",0);
+		ConfigTag* host = ServerInstance->Config->ConfValue("host");
+		MySuffix = host->getString("suffix");
+		MyPrefix = host->getString("prefix");
+		MySeparator = host->getString("separator", ".");
 		hostchanges.clear();
 
 		std::set<std::string> dupecheck;
@@ -84,7 +83,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;
@@ -93,18 +92,18 @@ 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"))));
 		}
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		// returns the version number of the module to be
 		// listed in /MODULES
 		return Version("Provides masking of user hostnames in a different way to m_cloaking", VF_VENDOR);
 	}
 
-	virtual void OnUserConnect(LocalUser* user)
+	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
 	{
 		for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
 		{
@@ -160,9 +159,9 @@ class ModuleHostChange : public Module
 				}
 				if (!newhost.empty())
 				{
-					user->WriteServ("NOTICE "+user->nick+" :Setting your virtual host: " + newhost);
+					user->WriteNotice("Setting your virtual host: " + newhost);
 					if (!user->ChangeDisplayedHost(newhost.c_str()))
-						user->WriteServ("NOTICE "+user->nick+" :Could not set your virtual host: " + newhost);
+						user->WriteNotice("Could not set your virtual host: " + newhost);
 					return;
 				}
 			}