X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hostchange.cpp;h=01c11443cba3463589e3d9e932754332b6114a50;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=e63c61631511f87b42f8f71b58f18f4f85d44c47;hpb=4b77a708565e75edc662db2b16f6b2da047c4d96;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index e63c61631..01c11443c 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()
+	{
 		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)
 	{
-		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,7 +92,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"))));
 		}
 	}
 
@@ -160,9 +159,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;
 				}
 			}