Instead of re adding the HandshakeTimer in m_spanningtree, make it a reoccurring...

[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 3cb4da3e1d817f661f744b203e8979dcf5d63b9c..96d2d97a2ac88b978a838e0aa43fe4b13981b630 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -68,7 +68,7 @@ class CommandWebirc : public Command
 
                        for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
                        {
-                               if(InspIRCd::Match(user->host, iter->hostmask) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask))
+                               if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
                                {
                                        if(iter->type == WEBIRC && parameters[0] == iter->password)
                                        {
@@ -82,6 +82,8 @@ class CommandWebirc : public Command
                                        }
                                }
                        }
+
+                       ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str());
                        return CMD_FAILURE;
                }
 };
@@ -154,7 +156,7 @@ public:
 
        virtual void Prioritize()
        {
-               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_FIRST);
+               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
        }
 
        virtual void OnRehash(User* user, const std::string &parameter)
@@ -264,7 +266,7 @@ public:
        {
                for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
                {
-                       if(InspIRCd::Match(user->host, iter->hostmask) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask))
+                       if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
                        {
                                // Deal with it...
                                if(iter->type == PASS)