X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_cgiirc.cpp;h=a5144e36d0cd7f5994be1bdfd8e92ee700dbc316;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=d4e3762969a2f33f29cb1fcac356e3c753aa273e;hpb=3c8c936a59120f963197f26eb30723589476073d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index d4e376296..a5144e36d 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -53,16 +53,16 @@ typedef std::vector<CGIhost> CGIHostlist;
  */
 class CommandWebirc : public Command
 {
-	bool notify;
  public:
+	bool notify;
 	StringExtItem realhost;
 	StringExtItem realip;
 	LocalStringExt webirc_hostname;
 	LocalStringExt webirc_ip;
 
 	CGIHostlist Hosts;
-	CommandWebirc(Module* Creator, bool bnotify)
-		: Command(Creator, "WEBIRC", 4), notify(bnotify),
+	CommandWebirc(Module* Creator)
+		: Command(Creator, "WEBIRC", 4),
 		  realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", Creator),
 		  webirc_hostname("cgiirc_webirc_hostname", Creator), webirc_ip("cgiirc_webirc_ip", Creator)
 		{
@@ -156,9 +156,8 @@ class ModuleCgiIRC : public Module
 {
 	CommandWebirc cmd;
 	LocalIntExt waiting;
-	bool NotifyOpers;
 public:
-	ModuleCgiIRC() : cmd(this, NotifyOpers), waiting("cgiirc-delay", this)
+	ModuleCgiIRC() : cmd(this), waiting("cgiirc-delay", this)
 	{
 	}
 
@@ -178,7 +177,7 @@ public:
 	void Prioritize()
 	{
 		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
-		Module* umodes = ServerInstance->Modules->Find("m_conn_umodes.cpp");
+		Module* umodes = ServerInstance->Modules->Find("m_conn_umodes.so");
 		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_BEFORE, &umodes);
 	}
 
@@ -187,7 +186,7 @@ public:
 		cmd.Hosts.clear();
 
 		// Do we send an oper notice when a CGI:IRC has their host changed?
-		NotifyOpers = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true);
+		cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true);
 
 		ConfigTagList tags = ServerInstance->Config->ConfTags("cgihost");
 		for (ConfigIter i = tags.first; i != tags.second; ++i)
@@ -280,24 +279,22 @@ public:
 	{
 		std::string *webirc_hostname = cmd.webirc_hostname.get(user);
 		std::string *webirc_ip = cmd.webirc_ip.get(user);
+		if (!webirc_ip)
+			return;
+		ServerInstance->Users->RemoveCloneCounts(user);
+		user->SetClientIP(webirc_ip->c_str());
+		user->InvalidateCache();
 		if (webirc_hostname && webirc_hostname->length() < 64)
-		{
-			user->host = *webirc_hostname;
-			user->dhost = *webirc_hostname;
-			user->InvalidateCache();
-		}
-		if (webirc_ip)
-		{
-			ServerInstance->Users->RemoveCloneCounts(user);
-			user->SetClientIP(webirc_ip->c_str());
-			user->InvalidateCache();
-			cmd.webirc_ip.unset(user);
-			ServerInstance->Users->AddLocalClone(user);
-			ServerInstance->Users->AddGlobalClone(user);
-			user->SetClass();
-			user->CheckClass();
-			user->CheckLines(true);
-		}
+			user->host = user->dhost = *webirc_hostname;
+		else
+			user->host = user->dhost = user->GetIPString();
+		user->InvalidateCache();
+		ServerInstance->Users->AddLocalClone(user);
+		ServerInstance->Users->AddGlobalClone(user);
+		user->SetClass();
+		user->CheckClass();
+		user->CheckLines(true);
+		cmd.webirc_ip.unset(user);
 		cmd.webirc_hostname.unset(user);
 	}
 
@@ -321,13 +318,13 @@ public:
 			try
 			{
 				bool cached;
-				CGIResolver* r = new CGIResolver(this, NotifyOpers, user->password, false, user, "PASS", cached, waiting);
+				CGIResolver* r = new CGIResolver(this, cmd.notify, user->password, false, user, "PASS", cached, waiting);
 				ServerInstance->AddResolver(r, cached);
 				waiting.set(user, waiting.get(user) + 1);
 			}
 			catch (...)
 			{
-				if (NotifyOpers)
+				if (cmd.notify)
 					ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str());
 			}
 
@@ -373,7 +370,7 @@ public:
 		{
 
 			bool cached;
-			CGIResolver* r = new CGIResolver(this, NotifyOpers, newipstr, false, user, "IDENT", cached, waiting);
+			CGIResolver* r = new CGIResolver(this, cmd.notify, newipstr, false, user, "IDENT", cached, waiting);
 			ServerInstance->AddResolver(r, cached);
 			waiting.set(user, waiting.get(user) + 1);
 		}
@@ -381,7 +378,7 @@ public:
 		{
 			user->InvalidateCache();
 
-			if(NotifyOpers)
+			if(cmd.notify)
 				 ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str());
 		}