Merge pull request #1185 from SaberUK/master+lockserv

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

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index f3fe38a3ca8b9c37342fbca98c0f7aa36e2f30ab..874e6440f81495986d66d433dc02cbdcc32fb984 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -28,7 +28,6 @@
 class TimedBan
 {
  public:
-       std::string channel;
        std::string mask;
        time_t expire;
        Channel* chan;
@@ -83,7 +82,6 @@ class CommandTban : public Command
                }
 
                TimedBan T;
-               std::string channelname = parameters[0];
                unsigned long duration = InspIRCd::Duration(parameters[1]);
                unsigned long expire = duration + ServerInstance->Time();
                if (duration < 1)
@@ -114,7 +112,6 @@ class CommandTban : public Command
                }
 
                CUList tmp;
-               T.channel = channelname;
                T.mask = mask;
                T.expire = expire + (IS_REMOTE(user) ? 5 : 0);
                T.chan = channel;
@@ -206,13 +203,11 @@ class ModuleTimedBans : public Module
 
                for (timedbans::iterator i = expired.begin(); i != expired.end(); i++)
                {
-                       std::string chan = i->channel;
                        std::string mask = i->mask;
-                       Channel* cr = ServerInstance->FindChan(chan);
-                       if (cr)
+                       Channel* cr = i->chan;
                        {
                                CUList empty;
-                               std::string expiry = "*** Timed ban on " + chan + " expired.";
+                               std::string expiry = "*** Timed ban on " + cr->name + " expired.";
                                cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
                                ServerInstance->PI->SendChannelNotice(cr, '@', expiry);