Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 a3ddb2e410878c79df6f26a6db448b9862764605..5fb64a27ef9747679e329c3520b07de31863382f 100644 (file)
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -31,7 +31,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;
@@ -132,7 +132,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);
                                        }
@@ -183,7 +183,7 @@ class cmd_dccallow : public command_t
                                                user->WriteServ("994 %s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
                                        }
                                
-                                       return CMD_FAILURE;
+                                       return CMD_SUCCESS;
                                }
                        }
                        else
@@ -301,6 +301,10 @@ class ModuleDCCAllow : public Module
                if (target_type == TYPE_USER)
                {
                        userrec* u = (userrec*)dest;
+
+                       /* Always allow a user to dcc themselves (although... why?) */
+                       if (user == u)
+                               return 0;
                
                        if ((text.length()) && (text[0] == '\1'))
                        {
@@ -483,7 +487,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,API_VERSION);
        }
 };