Add extra /map info (connection uptime, and lag time) to /MAP for opers. Adds feature...

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

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index d74945b626df851bf0ee881065f7a070e511b194..d92aeed82dfaa24f02a5c9b4b07bf2fa62018077 100644 (file)
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -1,6 +1,15 @@
- /* m_dccallow - Jamie Penman-Smithson <jamie@silverdream.org> - September 2006 */
-
-using namespace std;
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
 
 #include <stdio.h>
 #include <vector>
@@ -31,7 +40,7 @@ class DCCAllow
 
        DCCAllow() { }
 
-       DCCAllow(std::string nick, std::string hm, time_t so, long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
+       DCCAllow(const std::string &nick, const std::string &hm, const time_t so, const long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
 };
 
 typedef std::vector<userrec *> userlist;
@@ -85,7 +94,6 @@ class cmd_dccallow : public command_t
        
                        if (target)
                        {
-                               ServerInstance->Log(DEBUG, "m_dccallow.so: got target %s and action %c", target->nick, action);
                                
                                if (action == '-')
                                {
@@ -132,7 +140,7 @@ class cmd_dccallow : public command_t
                                        if (!dl)
                                        {
                                                dl = new dccallowlist;
-                                               user->Extend(std::string("dccallow_list"), dl);
+                                               user->Extend("dccallow_list", dl);
                                                // add this user to the userlist
                                                ul.push_back(user);
                                        }
@@ -258,13 +266,13 @@ class ModuleDCCAllow : public Module
                List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                delete Conf;
                Conf = new ConfigReader(ServerInstance);
        }
 
-       virtual void OnUserQuit(userrec* user, const std::string &reason)
+       virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
        {
                dccallowlist* dl;
        
@@ -289,15 +297,16 @@ class ModuleDCCAllow : public Module
                return 0;
        }
 
-       virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status)
+       virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return OnUserPreNotice(user, dest, target_type, text, status);
+               return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
        }
 
-       virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status)
+       virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               Expire();
-       
+               if (!IS_LOCAL(user))
+                       return 0;
+
                if (target_type == TYPE_USER)
                {
                        userrec* u = (userrec*)dest;
@@ -308,6 +317,9 @@ class ModuleDCCAllow : public Module
                
                        if ((text.length()) && (text[0] == '\1'))
                        {
+
+                               Expire();
+
                                // :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :DCC SEND m_dnsbl.cpp 3232235786 52650 9676
                                // :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :VERSION
                                        
@@ -338,7 +350,6 @@ class ModuleDCCAllow : public Module
                                                tokens.push_back(buf);
                
                                        irc::string type = tokens[1].c_str();
-                                       ServerInstance->Log(DEBUG, "m_dccallow.so: got DCC type %s", type.c_str());
                
                                        bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0);
                
@@ -348,25 +359,19 @@ class ModuleDCCAllow : public Module
                                                std::string filename = tokens[2];
                                        
                                                if (defaultaction == "allow") 
-                                               {
                                                        return 0;
-                                               }
                                
                                                for (unsigned int i = 0; i < bfl.size(); i++)
                                                {
                                                        if (ServerInstance->MatchText(filename, bfl[i].filemask))
                                                        {
-                                                               if (strcmp(bfl[i].action.c_str(), "allow") == 0)
-                                                               {
+                                                               if (bfl[i].action == "allow")
                                                                        return 0;
-                                                               }
                                                        }
                                                        else
                                                        {
                                                                if (defaultaction == "allow")
-                                                               {
                                                                        return 0;
-                                                               }
                                                        }
                                                        user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick, u->nick, filename.c_str());
                                                        u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, filename.c_str());
@@ -415,7 +420,6 @@ class ModuleDCCAllow : public Module
                        else
                        {
                                RemoveFromUserlist(u);
-                               ServerInstance->Log(DEBUG, "m_dccallow.so: UH OH! Couldn't get DCCALLOW list for %s", u->nick);
                        }
                }
        }
@@ -487,7 +491,7 @@ class ModuleDCCAllow : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_COMMON,API_VERSION);
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };