[Taros] Add m_sakick.so

[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 25ddfcb5860b980006915e7cf8312eced06e0885..09d9872ad1dddfc1876e9c79f327d80bbe29d801 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -54,7 +54,7 @@ public:
 
        void DisplayExpiry()
        {
-               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, ServerInstance->Time() - this->set_time);
+               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time));
        }
 
        const char* Displayable()
@@ -114,12 +114,23 @@ class CommandShun : public Command
                else if (parameters.size() >= 2)
                {
                        // Adding - XXX todo make this respect <insane> tag perhaps..
-                       long duration = ServerInstance->Duration(parameters[1]);
+                       long duration;
+                       std::string expr;
+                       if (parameters.size() > 2)
+                       {
+                               duration = ServerInstance->Duration(parameters[1]);
+                               expr = parameters[2];
+                       }
+                       else
+                       {
+                               duration = 0;
+                               expr = parameters[1];
+                       }
                        Shun *r = NULL;
 
                        try
                        {
-                               r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
+                               r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), parameters[0].c_str());
                        }
                        catch (...)
                        {
@@ -132,12 +143,14 @@ class CommandShun : public Command
                                {
                                        if (!duration)
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s",
+                                                       user->nick.c_str(), parameters[0].c_str(), expr.c_str());
                                        }
                                        else
                                        {
                                                time_t c_requires_crap = duration + ServerInstance->Time();
-                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s: %s",
+                                                       user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), expr.c_str());
                                        }
 
                                        ServerInstance->XLines->ApplyLines();
@@ -145,7 +158,7 @@ class CommandShun : public Command
                                else
                                {
                                        delete r;
-                                       user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), parameters[0].c_str());
+                                       user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), expr.c_str());
                                }
                        }
                }
@@ -160,6 +173,7 @@ class ModuleShun : public Module
        ShunFactory *f;
        std::set<std::string> ShunEnabledCommands;
        bool NotifyOfShun;
+       bool affectopers;
 
  public:
        ModuleShun(InspIRCd* Me) : Module(Me)
@@ -200,6 +214,7 @@ class ModuleShun : public Module
 
                ShunEnabledCommands.clear();
                NotifyOfShun = true;
+               affectopers = false;
 
                std::stringstream dcmds(cmds);
                std::string thiscmd;
@@ -210,6 +225,7 @@ class ModuleShun : public Module
                }
 
                NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
+               affectopers = MyConf.ReadFlag("shun", "affectopers", "no", 0);
        }
 
        virtual void OnUserConnect(User* user)
@@ -239,6 +255,12 @@ class ModuleShun : public Module
                        return 0;
                }
 
+               if (!affectopers && IS_OPER(user))
+               {
+                       /* Don't do anything if the user is an operator and affectopers isn't set */
+                       return 0;
+               }
+
                std::set<std::string>::iterator i = ShunEnabledCommands.find(command);
 
                if (i == ShunEnabledCommands.end())