fix some unitialised vectors and tidy up a bit.

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

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index fe8da9280e3295a0219a9e85ded483214cfe802e..d5ad01dc0dc11d8f337e1caf2c1f2b37f889cd1c 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -41,7 +41,8 @@ public:
 
        void Apply(User *u)
        {
-               // Application is done by the module.
+               if (!u->GetExt("shunned"))
+                       u->Extend("shunned");
        }
 
 
@@ -69,12 +70,6 @@ class ShunFactory : public XLineFactory
        {
                return new Shun(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
        }
-
-       virtual bool AutoApplyToUserList(XLine*)
-       {
-               // No, we don't want to be applied to users automagically.
-               return false;
-       }
 };
 
 //typedef std::vector<Shun> shunlist;
@@ -90,26 +85,26 @@ class cmd_shun : public Command
                this->source = "m_shun.so";
        }
 
-       CmdResult Handle(const char* const*parameters, int pcnt, User *user)
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user)
        {
                /* syntax: SHUN nick!user@host time :reason goes here */
                /* 'time' is a human-readable timestring, like 2d3h2s. */
 
-               if(pcnt == 1)
+               if (parameters.size() == 1)
                {
-                       if (ServerInstance->XLines->DelLine(parameters[0], "S", user))
+                       if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick,parameters[0]);
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick,parameters[0].c_str());
                        }
                        else
                        {
                                // XXX todo implement stats
-                               user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick,parameters[0]);
+                               user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick,parameters[0].c_str());
                        }
 
                        return CMD_SUCCESS;
                }
-               else if (pcnt >= 2)
+               else if (parameters.size() >= 2)
                {
                        // Adding - XXX todo make this respect <insane> tag perhaps..
                        long duration = ServerInstance->Duration(parameters[1]);
@@ -117,7 +112,7 @@ class cmd_shun : public Command
 
                        try
                        {
-                               r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+                               r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), parameters[0].c_str());
                        }
                        catch (...)
                        {
@@ -130,12 +125,12 @@ class cmd_shun : public Command
                                {
                                        if (!duration)
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick, parameters[0]);
+                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick, parameters[0].c_str());
                                        }
                                        else
                                        {
                                                time_t c_requires_crap = duration + ServerInstance->Time();
-                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick, parameters[0],
+                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick, parameters[0].c_str(),
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                                        }
 
@@ -144,7 +139,7 @@ class cmd_shun : public Command
                                else
                                {
                                        delete r;
-                                       user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick, parameters[0]);
+                                       user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick, parameters[0].c_str());
                                }
                        }
                }
@@ -167,8 +162,8 @@ class ModuleShun : public Module
                mycommand = new cmd_shun(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
-               Implementation eventlist[] = { I_OnStats, I_OnPreCommand };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        virtual ~ModuleShun()
@@ -185,20 +180,27 @@ class ModuleShun : public Module
                return 0;
        }
 
-       virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
+       virtual void OnUserConnect(User* user)
        {
-               if (user->registered != REG_ALL)
-                       return 0;
+               if (!IS_LOCAL(user))
+                       return;
 
-               if((command != "PONG") && (command != "PING"))
+               // Apply lines on user connect
+               XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
+
+               if (rl)
                {
-                       // Don't let them issue cmd if they are shunned..
-                       XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
+                       // Bang. :P
+                       rl->Apply(user);
+               }
+       }
 
-                       if (rl)
-                       {
+       virtual int OnPreCommand(const std::string &command, const std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
+       {
+               if((command != "PONG") && (command != "PING"))
+               {
+                       if (user->GetExt("shunned"))
                                return 1;
-                       }
                }
 
                return 0;