m_spanningtree Call the collision handler with the proper parameter (client ip instea...

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

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 3b3c44d390cd59b1c4f3af083af2a5dd37051968..330c1b6c4e40448a30514071599df740ea7d9b6b 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -1,16 +1,28 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * ---------------------------------------------------
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 #ifndef WINDOWS
@@ -53,16 +65,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 +168,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,6 +189,8 @@ public:
        void Prioritize()
        {
                ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
+               Module* umodes = ServerInstance->Modules->Find("m_conn_umodes.so");
+               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_BEFORE, &umodes);
        }
 
        void OnRehash(User* user)
@@ -185,7 +198,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)
@@ -278,24 +291,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);
        }
 
@@ -319,13 +330,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());
                        }
 
@@ -371,7 +382,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);
                }
@@ -379,7 +390,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());
                }