TRE regex provider (the same engine used by Unreal 3.2)

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

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 82bd87a56bacb798bd7c9d788c39929d6df03798..0d5334da40c1b336172ef376b63965d3447a63f7 100644 (file)
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /** Holds a users m_safelist state
  */
@@ -45,7 +44,7 @@ class ModuleSafeList : public Module
                Implementation eventlist[] = { I_OnBufferFlushed, I_OnPreCommand, I_OnCleanup, I_OnUserQuit, I_On005Numeric, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 6);
        }
- 
+
        virtual ~ModuleSafeList()
        {
        }
@@ -58,50 +57,51 @@ class ModuleSafeList : public Module
                ServerNameSize = strlen(ServerInstance->Config->ServerName) + 4;
                global_listing = 0;
        }
- 
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
- 
+
 
        /*
         * OnPreCommand()
         *   Intercept the LIST command.
-        */ 
-       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+        */
+       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                /* If the command doesnt appear to be valid, we dont want to mess with it. */
                if (!validated)
                        return 0;
- 
+
                if (command == "LIST")
                {
-                       return this->HandleList(parameters, pcnt, user);
+                       return this->HandleList(parameters, user);
                }
                return 0;
        }
-       
+
        /*
         * HandleList()
         *   Handle (override) the LIST command.
         */
-       int HandleList(const char* const* parameters, int pcnt, User* user)
+       int HandleList(const std::vector<std::string> &parameters, User* user)
        {
+               int pcnt = parameters.size();
                int minusers = 0, maxusers = 0;
 
                if (global_listing >= LimitList && !IS_OPER(user))
                {
-                       user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick);
-                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
-                       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                       user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick.c_str());
+                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                        return 1;
                }
 
                /* First, let's check if the user is currently /list'ing */
                ListData *ld;
                user->GetExt("safelist_cache", ld);
- 
+
                if (ld)
                {
                        /* user is already /list'ing, we don't want to do shit. */
@@ -111,15 +111,15 @@ class ModuleSafeList : public Module
                /* Work around mIRC suckyness. YOU SUCK, KHALED! */
                if (pcnt == 1)
                {
-                       if (*parameters[0] == '<')
+                       if (parameters[0][0] == '<')
                        {
-                               maxusers = atoi(parameters[0]+1);
+                               maxusers = atoi(parameters[0].c_str()+1);
                                ServerInstance->Logs->Log("m_safelist",DEBUG,"Max users: %d", maxusers);
                                pcnt = 0;
                        }
-                       else if (*parameters[0] == '>')
+                       else if (parameters[0][0] == '>')
                        {
-                               minusers = atoi(parameters[0]+1);
+                               minusers = atoi(parameters[0].c_str()+1);
                                ServerInstance->Logs->Log("m_safelist",DEBUG,"Min users: %d", minusers);
                                pcnt = 0;
                        }
@@ -131,9 +131,9 @@ class ModuleSafeList : public Module
                {
                        if (ServerInstance->Time() < (*last_list_time)+ThrottleSecs)
                        {
-                               user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick);
-                               user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
-                               user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                               user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick.c_str());
+                               user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+                               user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                                return 1;
                        }
 
@@ -141,7 +141,7 @@ class ModuleSafeList : public Module
                        user->Shrink("safelist_last");
                }
 
- 
+
                /*
                 * start at channel 0! ;)
                 */
@@ -152,7 +152,7 @@ class ModuleSafeList : public Module
                *llt = ServerInstance->Time();
                user->Extend("safelist_last", llt);
 
-               user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+               user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
 
                global_listing++;
 
@@ -182,22 +182,22 @@ class ModuleSafeList : public Module
                                        continue;
                                }
 
-                               if ((chan) && (chan->modes[CM_PRIVATE]))
+                               if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user)))
                                {
-                                       bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str())));
+                                       bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob)));
                                        if ((users) && (display))
                                        {
-                                               int counter = snprintf(buffer, MAXBUF, "322 %s *", user->nick);
+                                               int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users);
                                                amount_sent += counter + ServerNameSize;
                                                user->WriteServ(std::string(buffer));
                                        }
                                }
-                               else if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user)))
+                               else if ((chan) && ((((!(chan->IsModeSet('p'))) && (!(chan->IsModeSet('s'))))) || (has_user) || IS_OPER(user)))
                                {
-                                       bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str())));
+                                       bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob)));
                                        if ((users) && (display))
                                        {
-                                               int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick, chan->name, users, chan->ChanModes(has_user), chan->topic);
+                                               int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic.c_str());
                                                amount_sent += counter + ServerNameSize;
                                                user->WriteServ(std::string(buffer));
                                        }
@@ -209,7 +209,7 @@ class ModuleSafeList : public Module
                                                if (!ld->list_ended)
                                                {
                                                        ld->list_ended = true;
-                                                       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                                                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                                                }
                                        }
                                }