Merge pull request #1162 from SaberUK/insp20+fix-deinstall

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

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 93a3d5b5a52aace04b7c379b9a7ebb395a04be4b..fb78e41b29cb45f9dede6dc908c219e94060c203 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -32,7 +32,7 @@ class CBan : public XLine
 public:
        irc::string matchtext;
 
-       CBan(time_t s_time, long d, std::string src, std::string re, std::string ch)
+       CBan(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& ch)
                : XLine(s_time, d, src, re, "CBAN")
        {
                this->matchtext = ch.c_str();
@@ -74,7 +74,7 @@ class CBanFactory : public XLineFactory
  public:
        CBanFactory() : XLineFactory("CBAN") { }
 
-       /** Generate a shun
+       /** Generate a CBAN
        */
        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
        {
@@ -112,55 +112,44 @@ class CommandCBan : public Command
                        else
                        {
                                user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick.c_str(),parameters[0].c_str());
+                               return CMD_FAILURE;
                        }
-
-                       return CMD_SUCCESS;
                }
-               else if (parameters.size() >= 2)
+               else
                {
                        // Adding - XXX todo make this respect <insane> tag perhaps..
                        long duration = ServerInstance->Duration(parameters[1]);
-                       CBan *r = NULL;
                        const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied";
+                       CBan* r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
 
-                       try
-                       {
-                               r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
-                       }
-                       catch (...)
+                       if (ServerInstance->XLines->AddLine(r, user))
                        {
-                               ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up.
-                       }
-
-                       if (r)
-                       {
-                               if (ServerInstance->XLines->AddLine(r, user))
+                               if (!duration)
                                {
-                                       if (!duration)
-                                       {
-                                               ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason);
-                                       }
-                                       else
-                                       {
-                                               time_t c_requires_crap = duration + ServerInstance->Time();
-                                               ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), reason);
-                                       }
-
-                                       ServerInstance->XLines->ApplyLines();
+                                       ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason);
                                }
                                else
                                {
-                                       delete r;
-                                       user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick.c_str(), parameters[0].c_str());
+                                       time_t c_requires_crap = duration + ServerInstance->Time();
+                                       std::string timestr = ServerInstance->TimeString(c_requires_crap);
+                                       ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), timestr.c_str(), reason);
                                }
                        }
+                       else
+                       {
+                               delete r;
+                               user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick.c_str(), parameters[0].c_str());
+                               return CMD_FAILURE;
+                       }
                }
-
-               return CMD_FAILURE;
+               return CMD_SUCCESS;
        }
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
+               if (IS_LOCAL(user))
+                       return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
+
                return ROUTE_BROADCAST;
        }
 };
@@ -172,12 +161,16 @@ class ModuleCBan : public Module
 
  public:
        ModuleCBan() : mycommand(this)
+       {
+       }
+
+       void init()
        {
                ServerInstance->XLines->RegisterFactory(&f);
 
-               ServerInstance->AddCommand(&mycommand);
+               ServerInstance->Modules->AddService(mycommand);
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnStats };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleCBan()
@@ -203,9 +196,8 @@ class ModuleCBan : public Module
                {
                        // Channel is banned.
                        user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason.c_str());
-                       ServerInstance->SNO->WriteToSnoMask('a', "%s tried to join %s which is CBANed (%s)",
+                       ServerInstance->SNO->WriteGlobalSno('a', "%s tried to join %s which is CBANed (%s)",
                                 user->nick.c_str(), cname, rl->reason.c_str());
-                       ServerInstance->PI->SendSNONotice("A", user->nick + " tried to join " + std::string(cname) + " which is CBANed (" + rl->reason + ")");
                        return MOD_RES_DENY;
                }