Same tweak, again

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

diff --git a/src/commands.cpp b/src/commands.cpp
index 15070abdfe2cf103d3e920287e44c0766d5fa9ca..65b11e5a027a8091e98c60d836b35df34b8cef7c 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -19,86 +19,6 @@
 #include "xline.h"
 #include "command_parse.h"
 
-bool InspIRCd::ULine(const char* server)
-{
-       if (!server)
-               return false;
-       if (!*server)
-               return true;
-
-       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
-}
-
-int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnum)
-{
-       int MOD_RESULT = 0;
-       FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnum))
-       if (MOD_RESULT == 1)
-               return 0;
-       if (MOD_RESULT == -1)
-               return 1;
-       return strcmp(data,input);
-}
-
-long InspIRCd::Duration(const char* str)
-{
-       char n_field[MAXBUF];
-       long total = 0;
-       n_field[0] = 0;
-
-       if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y')))
-       {
-               std::string n = str;
-               n += 's';
-               return Duration(n.c_str());
-       }
-       
-       for (char* i = (char*)str; *i; i++)
-       {
-               // if we have digits, build up a string for the value in n_field,
-               // up to 10 digits in size.
-               if ((*i >= '0') && (*i <= '9'))
-               {
-                       strlcat(n_field,i,10);
-               }
-               else
-               {
-                       // we dont have a digit, check for numeric tokens
-                       switch (tolower(*i))
-                       {
-                               case 's':
-                                       total += atoi(n_field);
-                               break;
-
-                               case 'm':
-                                       total += (atoi(n_field)*duration_m);
-                               break;
-
-                               case 'h':
-                                       total += (atoi(n_field)*duration_h);
-                               break;
-
-                               case 'd':
-                                       total += (atoi(n_field)*duration_d);
-                               break;
-
-                               case 'w':
-                                       total += (atoi(n_field)*duration_w);
-                               break;
-
-                               case 'y':
-                                       total += (atoi(n_field)*duration_y);
-                               break;
-                       }
-                       n_field[0] = 0;
-               }
-       }
-       // add trailing seconds
-       total += atoi(n_field);
-       
-       return total;
-}
-
 /* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
 
 bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
@@ -114,9 +34,15 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
        
        for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
        {
-               if (match(u->second->MakeHost(),mask.c_str()),true)
+               if ((match(u->second->MakeHost(),mask.c_str(),true)) || (match(u->second->MakeHostIP(),mask.c_str(),true)))
+               {
                        matches++;
+               }
        }
+
+       if (!matches)
+               return false;
+
        float percent = ((float)matches / (float)clientlist->size()) * 100;
        if (percent > (float)atof(itrigger))
        {
@@ -142,7 +68,10 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
                if (match(u->second->GetIPString(),ip.c_str(),true))
                        matches++;
        }
-       
+
+       if (!matches)
+               return false;
+
        float percent = ((float)matches / (float)clientlist->size()) * 100;
        if (percent > (float)atof(itrigger))
        {
@@ -168,7 +97,10 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
                if (match(u->second->nick,nick.c_str()))
                        matches++;
        }
-       
+
+       if (!matches)
+               return false;
+
        float percent = ((float)matches / (float)clientlist->size()) * 100;
        if (percent > (float)atof(itrigger))
        {