Clean up the WEBIRC command handler.

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

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 60af0e3913a43aa21611efb5388f9df52ab15d0e..467c8a03b3dfe6f0c02a2ea18506cdc00949c941 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -32,13 +32,7 @@ class ModuleDenyChannels : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                /* check for redirect validity and loops/chains */
                ConfigTagList tags = ServerInstance->Config->ConfTags("badchan");
@@ -52,8 +46,8 @@ class ModuleDenyChannels : public Module
 
                                if (!ServerInstance->IsChannel(redirect))
                                {
-                                       if (user)
-                                               user->WriteNotice("Invalid badchan redirect '" + redirect + "'");
+                                       if (status.srcuser)
+                                               status.srcuser->WriteNotice("Invalid badchan redirect '" + redirect + "'");
                                        throw ModuleException("Invalid badchan redirect, not a channel");
                                }
 
@@ -62,7 +56,7 @@ class ModuleDenyChannels : public Module
                                        if (InspIRCd::Match(redirect, j->second->getString("name")))
                                        {
                                                bool goodchan = false;
-                                               ConfigTagList goodchans = ServerInstance->Config->ConfTags("badchan");
+                                               ConfigTagList goodchans = ServerInstance->Config->ConfTags("goodchan");
                                                for (ConfigIter k = goodchans.first; k != goodchans.second; ++k)
                                                {
                                                        if (InspIRCd::Match(redirect, k->second->getString("name")))
@@ -72,8 +66,8 @@ class ModuleDenyChannels : public Module
                                                if (!goodchan)
                                                {
                                                        /* <badchan:redirect> is a badchan */
-                                                       if (user)
-                                                               user->WriteNotice("Badchan " + name + " redirects to badchan " + redirect);
+                                                       if (status.srcuser)
+                                                               status.srcuser->WriteNotice("Badchan " + name + " redirects to badchan " + redirect);
                                                        throw ModuleException("Badchan redirect loop");
                                                }
                                        }
@@ -119,13 +113,13 @@ class ModuleDenyChannels : public Module
                                                Channel *newchan = ServerInstance->FindChan(redirect);
                                                if ((!newchan) || (!newchan->IsModeSet(redirectmode)))
                                                {
-                                                       user->WriteNumeric(926, "%s %s :Channel %s is forbidden, redirecting to %s: %s",user->nick.c_str(),cname.c_str(),cname.c_str(),redirect.c_str(), reason.c_str());
+                                                       user->WriteNumeric(926, cname, InspIRCd::Format("Channel %s is forbidden, redirecting to %s: %s", cname.c_str(), redirect.c_str(), reason.c_str()));
                                                        Channel::JoinUser(user, redirect);
                                                        return MOD_RES_DENY;
                                                }
                                        }
 
-                                       user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname.c_str(),cname.c_str(),reason.c_str());
+                                       user->WriteNumeric(926, cname, InspIRCd::Format("Channel %s is forbidden: %s", cname.c_str(), reason.c_str()));
                                        return MOD_RES_DENY;
                                }
                        }