Add a snotice when a user tries to use WEBIRC without matching any configured blocks.

[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 c6ccbb7ebb5b85404efae29671279810797a85b3..1127d397dbf27aa65fab9f587adeefb69b90c431 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,8 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include 
-"inspircd.h"
+#include "inspircd.h"
 #include "xline.h"
 
 /* $ModDesc: Provides the /shun command, which stops a user executing all commands except PING and PONG. */
@@ -55,7 +54,7 @@ public:
 
        void DisplayExpiry()
        {
-               ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration);
+               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()
@@ -107,7 +106,7 @@ class CommandShun : public Command
                        else
                        {
                                // XXX todo implement stats
-                               user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick.c_str(),parameters[0].c_str());
+                               user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats S.",user->nick.c_str(),parameters[0].c_str());
                        }
 
                        return CMD_SUCCESS;
@@ -159,7 +158,7 @@ class ModuleShun : public Module
 {
        CommandShun* mycommand;
        ShunFactory *f;
-       std::map<std::string, bool> ShunEnabledCommands;
+       std::set<std::string> ShunEnabledCommands;
        bool NotifyOfShun;
 
  public:
@@ -207,7 +206,7 @@ class ModuleShun : public Module
 
                while (dcmds >> thiscmd)
                {
-                       ShunEnabledCommands[thiscmd] = true;
+                       ShunEnabledCommands.insert(thiscmd);
                }
 
                NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
@@ -240,11 +239,12 @@ class ModuleShun : public Module
                        return 0;
                }
 
-               std::map<std::string, bool>::iterator i = ShunEnabledCommands.find(command);
+               std::set<std::string>::iterator i = ShunEnabledCommands.find(command);
 
                if (i == ShunEnabledCommands.end())
                {
-                       user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
+                       if (NotifyOfShun)
+                               user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
                        return 1;
                }