]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_timedbans.cpp
converting m_d* done
[user/henk/code/inspircd.git] / src / modules / m_timedbans.cpp
index a226b97472fd9f6edb476cfb607cfa50f0503f65..693e72019fa3a1aa102627a572d438fe4ac25b69 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -30,17 +30,17 @@ timedbans TimedBanList;
 
 /** Handle /TBAN
  */
-class cmd_tban : public Command
+class CommandTban : public Command
 {
  public:
cmd_tban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3)
      CommandTban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3)
        {
                this->source = "m_timedbans.so";
                syntax = "<channel> <duration> <banmask>";
                TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                Channel* channel = ServerInstance->FindChan(parameters[0]);
                if (channel)
@@ -85,34 +85,40 @@ class cmd_tban : public Command
                                                was_added = true;
                                if (was_added)
                                {
+                                       CUList tmp;
                                        T.channel = channelname;
                                        T.mask = mask;
                                        T.expire = expire;
                                        TimedBanList.push_back(T);
-                                       channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
+                                       channel->WriteAllExcept(user, true, '@', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
+                                       if (ServerInstance->Config->AllowHalfop)
+                                               channel->WriteAllExcept(user, true, '%', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
                                        return CMD_SUCCESS;
                                }
                                return CMD_FAILURE;
                        }
-                       else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name);
+                       else user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick, channel->name,
+                                       ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
                        return CMD_FAILURE;
                }
-               user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
+               user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]);
                return CMD_FAILURE;
        }
 };
 
 class ModuleTimedBans : public Module
 {
-       cmd_tban* mycommand;
+       CommandTban* mycommand;
  public:
        ModuleTimedBans(InspIRCd* Me)
                : Module(Me)
        {
                
-               mycommand = new cmd_tban(ServerInstance);
+               mycommand = new CommandTban(ServerInstance);
                ServerInstance->AddCommand(mycommand);
                TimedBanList.clear();
+               Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
        
        virtual ~ModuleTimedBans()
@@ -120,11 +126,6 @@ class ModuleTimedBans : public Module
                TimedBanList.clear();
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1;
-       }
-
        virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask)
        {
                irc::string listitem = banmask.c_str();
@@ -144,40 +145,41 @@ class ModuleTimedBans : public Module
 
        virtual void OnBackgroundTimer(time_t curtime)
        {
-               bool again = true;
-               while (again)
+               timedbans::iterator safei;
+               for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end();)
                {
-                       again = false;
-                       for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
+                       /* Safe copy of iterator, so we can erase as we iterate */
+                       safei = i;
+                       ++i;
+
+                       if (curtime > safei->expire)
                        {
-                               if (curtime > i->expire)
+                               Channel* cr = ServerInstance->FindChan(safei->channel);
+                               if (cr)
                                {
-                                       Channel* cr = ServerInstance->FindChan(i->channel);
-                                       again = true;
-                                       if (cr)
-                                       {
-                                               cr->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :Timed ban on %s expired.", cr->name, i->mask.c_str());
-                                               const char *setban[3];
-                                               setban[0] = i->channel.c_str();
-                                               setban[1] = "-b";
-                                               setban[2] = i->mask.c_str();
-
-                                               /* Send mode remotely*/
-                                               std::deque<std::string> n;
-                                               n.push_back(setban[0]);
-                                               n.push_back("-b");
-                                               n.push_back(setban[2]);
-                                               ServerInstance->SendMode(setban,3, ServerInstance->FakeClient);
-                                               Event rmode((char *)&n, NULL, "send_mode");
-                                               rmode.Send(ServerInstance);
-                                       }
-                                       else
-                                       {
-                                               /* Where the hell did our channel go?! */
-                                               TimedBanList.erase(i);
-                                       }
-                                       // we used to delete the item here, but we dont need to as the servermode above does it for us,
-                                       break;
+                                       const char *setban[3];
+                                       std::string mask = safei->mask;
+
+                                       setban[0] = safei->channel.c_str();
+                                       setban[1] = "-b";
+                                       setban[2] = mask.c_str();
+
+                                       CUList empty;
+                                       cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, safei->mask.c_str());
+                                       if (ServerInstance->Config->AllowHalfop)
+                                               cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, safei->mask.c_str());
+
+                                       /* Removes the ban item for us, no ::erase() needed */
+                                       ServerInstance->PI->SendModeStr(safei->channel, std::string("-b ") + setban[2]);
+                                       ServerInstance->SendMode(setban, 3, ServerInstance->FakeClient);
+
+                                       if (ServerInstance->Modes->GetLastParse().empty())
+                                               TimedBanList.erase(safei);
+                               }
+                               else
+                               {
+                                       /* Where the hell did our channel go?! */
+                                       TimedBanList.erase(safei);
                                }
                        }
                }
@@ -185,7 +187,7 @@ class ModuleTimedBans : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };