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 767607c6d451ee9f0b846c865a4e1a8fa8d68b2f..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;
@@ -47,7 +47,7 @@ class cmd_dccallow : public command_t
        cmd_dccallow(InspIRCd* Me) : command_t(Me, "DCCALLOW", 0, 0)
        {
                this->source = "m_dccallow.so";
-               syntax = "{[+|-]<nick> <time>}";
+               syntax = "{[+|-]<nick> <time>|HELP|LIST}";
        }
 
        CmdResult Handle(const char **parameters, int pcnt, userrec *user)
@@ -57,7 +57,7 @@ class cmd_dccallow : public command_t
                {
                        // display current DCCALLOW list
                        DisplayDCCAllowList(user);
-                       return CMD_SUCCESS;
+                       return CMD_FAILURE;
                }
                else if (pcnt > 0)
                {
@@ -70,13 +70,13 @@ class cmd_dccallow : public command_t
                                {
                                        // list current DCCALLOW list
                                        DisplayDCCAllowList(user);
-                                       return CMD_SUCCESS;
+                                       return CMD_FAILURE;
                                } 
                                else if (!strcasecmp(parameters[0], "HELP"))
                                {
                                        // display help
                                        DisplayHelp(user);
-                                       return CMD_SUCCESS;
+                                       return CMD_FAILURE;
                                }
                        }
                        
@@ -116,7 +116,7 @@ class cmd_dccallow : public command_t
                                                for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
                                                {
                                                        userrec* u = (userrec*)(*j);
-                                                       if (u->nick == user->nick)
+                                                       if (u == user)
                                                        {
                                                                ul.erase(j);
                                                                break;
@@ -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);
                                        }
@@ -141,19 +141,24 @@ class cmd_dccallow : public command_t
                                                if (k->nickname == target->nick)
                                                {
                                                        user->WriteServ("996 %s %s :%s is already on your DCCALLOW list", user->nick, user->nick, target->nick);
-                                                       return CMD_SUCCESS;
+                                                       return CMD_FAILURE;
+                                               }
+                                               else if (ServerInstance->MatchText(user->GetFullHost(), k->hostmask))
+                                               {
+                                                       user->WriteServ("996 %s %s :You cannot add yourself to your own DCCALLOW list!", user->nick, user->nick);
+                                                       return CMD_FAILURE;
                                                }
                                        }
                                
                                        std::string mask = std::string(target->nick)+"!"+std::string(target->ident)+"@"+std::string(target->dhost);
-                                       std::string default_length = Conf->ReadValue("dccallow", "length", 0).c_str();
+                                       std::string default_length = Conf->ReadValue("dccallow", "length", 0);
                
                                        long length;
-                                       if (pcnt == 1 || ServerInstance->Duration(parameters[1]) < 1)
+                                       if (pcnt < 2)
                                        {
                                                length = ServerInstance->Duration(default_length.c_str());
                                        } 
-                                       else if (parameters[1] == 0)
+                                       else if (!atoi(parameters[1]))
                                        {
                                                length = 0;
                                        }
@@ -188,7 +193,7 @@ class cmd_dccallow : public command_t
                                return CMD_FAILURE;
                        }
                }
-               return CMD_SUCCESS;
+               return CMD_FAILURE;
        }
 
        void DisplayHelp(userrec* user)
@@ -296,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'))
                        {
@@ -405,8 +414,6 @@ class ModuleDCCAllow : public Module
                        }
                        else
                        {
-                               DELETE(dl);
-                               u->Shrink("dccallow_list");
                                RemoveFromUserlist(u);
                                ServerInstance->Log(DEBUG, "m_dccallow.so: UH OH! Couldn't get DCCALLOW list for %s", u->nick);
                        }
@@ -440,8 +447,6 @@ class ModuleDCCAllow : public Module
                        }
                        else
                        {
-                               DELETE(dl);
-                               u->Shrink("dccallow_list");
                                RemoveFromUserlist(u);
                        }
                }
@@ -453,9 +458,9 @@ class ModuleDCCAllow : public Module
                for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
                {
                        userrec* u = (userrec*)(*j);
-                       if (u->nick == user->nick)
+                       if (u == user)
                        {
-                                       ul.erase(j);
+                               ul.erase(j);
                                break;
                        }
                }
@@ -482,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);
        }
 };