X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=1300092c7afe7c049b6bbee827942722ed0f4191;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=c72e183906a5e5350a0705fe71569f84d16ef6bf;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index c72e18390..1300092c7 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -61,11 +61,12 @@ class CommandWebirc : public Command
 	LocalStringExt webirc_ip;
 
 	CGIHostlist Hosts;
-	CommandWebirc(InspIRCd* Instance, Module* Creator, bool bnotify)
-		: Command(Instance, Creator, "WEBIRC", 0, 4, true), notify(bnotify),
+	CommandWebirc(Module* Creator, bool bnotify)
+		: Command(Creator, "WEBIRC", 4), notify(bnotify),
 		  realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", Creator),
 		  webirc_hostname("cgiirc_webirc_hostname", Creator), webirc_ip("cgiirc_webirc_ip", Creator)
 		{
+			works_before_reg = true;
 			this->syntax = "password client hostname ip";
 		}
 		CmdResult Handle(const std::vector<std::string> &parameters, User *user)
@@ -105,8 +106,8 @@ class CGIResolver : public Resolver
 	User* them;
 	bool notify;
  public:
-	CGIResolver(Module* me, InspIRCd* Instance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
-		: Resolver(Instance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
+	CGIResolver(Module* me, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
+		: Resolver(source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
 	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 	{
@@ -145,7 +146,7 @@ class ModuleCgiIRC : public Module
 	CommandWebirc cmd;
 	bool NotifyOpers;
 public:
-	ModuleCgiIRC(InspIRCd* Me) : Module(Me), cmd(Me, this, NotifyOpers)
+	ModuleCgiIRC() : cmd(this, NotifyOpers)
 	{
 		OnRehash(NULL);
 		ServerInstance->AddCommand(&cmd);
@@ -166,7 +167,7 @@ public:
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 		cmd.Hosts.clear();
 
 		NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0);	// If we send an oper notice when a CGI:IRC has their host changed.
@@ -306,7 +307,7 @@ public:
 				{
 
 					bool cached;
-					CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
+					CGIResolver* r = new CGIResolver(this, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
 					ServerInstance->AddResolver(r, cached);
 				}
 				catch (...)
@@ -357,7 +358,7 @@ public:
 		{
 
 			bool cached;
-			CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached);
+			CGIResolver* r = new CGIResolver(this, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached);
 			ServerInstance->AddResolver(r, cached);
 		}
 		catch (...)
@@ -433,7 +434,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR,API_VERSION);
 	}
 
 };