Allow for nick!user@host in TOPIC information.

[user/henk/code/inspircd.git] / src / commands.cpp

diff --git a/src/commands.cpp b/src/commands.cpp
index 60e7c98dc958a450e050348c1034da897adf8e1a..c31885483df4d404922c8678747078575898e409 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -106,7 +103,6 @@ long InspIRCd::Duration(const char* str)
 
 bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
 {
-       char buffer[MAXBUF];
        char itrigger[MAXBUF];
        long matches = 0;
        
@@ -116,15 +112,18 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
        if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
                return false;
        
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
        {
-               strlcpy(buffer,u->second->ident,MAXBUF);
-               charlcat(buffer,'@',MAXBUF);
-               strlcat(buffer,u->second->host,MAXBUF);
-               if (match(buffer,mask.c_str()))
+               if ((match(u->second->MakeHost(),mask.c_str(),true)) || (match(u->second->MakeHostIP(),mask.c_str(),true)))
+               {
                        matches++;
+               }
        }
-       float percent = ((float)matches / (float)clientlist.size()) * 100;
+
+       if (!matches)
+               return false;
+
+       float percent = ((float)matches / (float)clientlist->size()) * 100;
        if (percent > (float)atof(itrigger))
        {
                WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent);
@@ -144,13 +143,16 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
        if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
                return false;
        
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
        {
                if (match(u->second->GetIPString(),ip.c_str(),true))
                        matches++;
        }
-       
-       float percent = ((float)matches / (float)clientlist.size()) * 100;
+
+       if (!matches)
+               return false;
+
+       float percent = ((float)matches / (float)clientlist->size()) * 100;
        if (percent > (float)atof(itrigger))
        {
                WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent);
@@ -170,13 +172,16 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
        if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
                return false;
 
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
        {
                if (match(u->second->nick,nick.c_str()))
                        matches++;
        }
-       
-       float percent = ((float)matches / (float)clientlist.size()) * 100;
+
+       if (!matches)
+               return false;
+
+       float percent = ((float)matches / (float)clientlist->size()) * 100;
        if (percent > (float)atof(itrigger))
        {
                WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);