Revert automated conversion by Special, as it (unfortunately) neglects some details...

[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 3a5ea7462796321fa3b7252f5f05be4399f00042..2717d873a90ca4e56adef6b9dd58521794e21185 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -20,18 +20,18 @@ class ModuleDenyChannels : public Module
 {
  private:
 
-       
+
        ConfigReader *Conf;
 
  public:
        ModuleDenyChannels(InspIRCd* Me) : Module(Me)
        {
-               
+
                Conf = new ConfigReader(ServerInstance);
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
-       
+
        virtual void OnRehash(User* user, const std::string &param)
        {
                delete Conf;
@@ -41,33 +41,33 @@ class ModuleDenyChannels : public Module
                {
                        std::string name = Conf->ReadValue("badchan","name",i);
                        std::string redirect = Conf->ReadValue("badchan","redirect",i);
-                       
+
                        if (!redirect.empty())
                        {
-                       
-                               if (!ServerInstance->IsChannel(redirect.c_str()))
+
+                               if (!ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax))
                                {
                                        if (user)
-                                               user->WriteServ("Notice %s :Invalid badchan redirect '%s'", user->nick, redirect.c_str());
+                                               user->WriteServ("Notice %s :Invalid badchan redirect '%s'", user->nick.c_str(), redirect.c_str());
                                        throw ModuleException("Invalid badchan redirect, not a channel");
                                }
-       
+
                                for (int j =0; j < Conf->Enumerate("badchan"); j++)
                                {
-                                       if (match(redirect.c_str(), Conf->ReadValue("badchan","name",j).c_str()))
+                                       if (match(redirect, Conf->ReadValue("badchan","name",j)))
                                        {
                                                bool goodchan = false;
                                                for (int k =0; k < Conf->Enumerate("goodchan"); k++)
                                                {
-                                                       if (match(redirect.c_str(), Conf->ReadValue("goodchan","name",k).c_str()))
+                                                       if (match(redirect, Conf->ReadValue("goodchan","name",k)))
                                                                goodchan = true;
                                                }
-       
+
                                                if (!goodchan)
                                                {
                                                        /* <badchan:redirect> is a badchan */
                                                        if (user)
-                                                               user->WriteServ("NOTICE %s :Badchan %s redirects to badchan %s", user->nick, name.c_str(), redirect.c_str());
+                                                               user->WriteServ("NOTICE %s :Badchan %s redirects to badchan %s", user->nick.c_str(), name.c_str(), redirect.c_str());
                                                        throw ModuleException("Badchan redirect loop");
                                                }
                                        }
@@ -80,18 +80,18 @@ class ModuleDenyChannels : public Module
        {
                delete Conf;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
 
 
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                for (int j =0; j < Conf->Enumerate("badchan"); j++)
                {
-                       if (match(cname, Conf->ReadValue("badchan","name",j).c_str()))
+                       if (match(cname, Conf->ReadValue("badchan","name",j)))
                        {
                                if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
                                {
@@ -104,25 +104,25 @@ class ModuleDenyChannels : public Module
 
                                        for (int i = 0; i < Conf->Enumerate("goodchan"); i++)
                                        {
-                                               if (match(cname, Conf->ReadValue("goodchan", "name", i).c_str()))
+                                               if (match(cname, Conf->ReadValue("goodchan", "name", i)))
                                                {
                                                        return 0;
                                                }
                                        }
-                                       
-                                       if (ServerInstance->IsChannel(redirect.c_str()))
+
+                                       if (ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax))
                                        {
                                                /* simple way to avoid potential loops: don't redirect to +L channels */
                                                Channel *newchan = ServerInstance->FindChan(redirect);
                                                if ((!newchan) || (!(newchan->IsModeSet('L'))))
                                                {
-                                                       user->WriteServ("926 %s %s :Channel %s is forbidden, redirecting to %s: %s",user->nick,cname,cname,redirect.c_str(), reason.c_str());
-                                                       Channel::JoinUser(ServerInstance,user,redirect.c_str(),false,"",false,ServerInstance->Time(true));
+                                                       user->WriteNumeric(926, "%s %s :Channel %s is forbidden, redirecting to %s: %s",user->nick.c_str(),cname,cname,redirect.c_str(), reason.c_str());
+                                                       Channel::JoinUser(ServerInstance,user,redirect.c_str(),false,"",false,ServerInstance->Time());
                                                        return 1;
                                                }
                                        }
 
-                                       user->WriteServ("926 %s %s :Channel %s is forbidden: %s",user->nick,cname,cname,reason.c_str());
+                                       user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname,cname,reason.c_str());
                                        return 1;
                                }
                        }