Merge pull request #514 from SaberUK/master+virtual-cleanup

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

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 8cd5088bcff0033feeba4366eb89f1740e790e3b..4c29fe6bc4101e1a737fbe8bd07c1bc033be7a4c 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -28,6 +28,8 @@
 class CommandKnock : public Command
 {
  public:
+       bool sendnotice;
+       bool sendnumeric;
        CommandKnock(Module* Creator) : Command(Creator,"KNOCK", 2, 2)
        {
                syntax = "<channel> <reason>";
@@ -62,8 +64,13 @@ class CommandKnock : public Command
                        return CMD_FAILURE;
                }
 
-               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name.c_str(), user->nick.c_str(), c->name.c_str(), parameters[1].c_str());
-               user->WriteServ("NOTICE %s :KNOCKing on %s", user->nick.c_str(), c->name.c_str());
+               if (sendnotice)
+                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name.c_str(), user->nick.c_str(), c->name.c_str(), parameters[1].c_str());
+
+               if (sendnumeric)
+                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "710 %s %s %s :is KNOCKing: %s", c->name.c_str(), c->name.c_str(), user->GetFullHost().c_str(), parameters[1].c_str());
+
+               user->WriteNotice("KNOCKing on " + c->name);
                return CMD_SUCCESS;
        }
 
@@ -88,18 +95,40 @@ class ModuleKnock : public Module
  public:
        ModuleKnock() : cmd(this), kn(this)
        {
-               if (!ServerInstance->Modes->AddMode(&kn))
-                       throw ModuleException("Could not add new modes!");
-               ServerInstance->AddCommand(&cmd);
-
        }
 
+       void init() CXX11_OVERRIDE
+       {
+               ServerInstance->Modules->AddService(kn);
+               ServerInstance->Modules->AddService(cmd);
 
-       virtual ~ModuleKnock()
+               ServerInstance->Modules->Attach(I_OnRehash, this);
+               OnRehash(NULL);
+       }
+
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
+               std::string knocknotify = ServerInstance->Config->ConfValue("knock")->getString("notify");
+               irc::string notify(knocknotify.c_str());
+
+               if (notify == "numeric")
+               {
+                       cmd.sendnotice = false;
+                       cmd.sendnumeric = true;
+               }
+               else if (notify == "both")
+               {
+                       cmd.sendnotice = true;
+                       cmd.sendnumeric = true;
+               }
+               else
+               {
+                       cmd.sendnotice = true;
+                       cmd.sendnumeric = false;
+               }
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR);
        }