Move Blocking/NonBlocking to socket.cpp and make inline

[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 9477a37f6b34ab9e478027097e6bedb6fb6edb81..b3ecfec06d8deaf9990d1effab4eef15e7eb583f 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -58,14 +58,14 @@ class cmd_tban : public command_t
                        {
                                if (!Srv->IsValidMask(parameters[2]))
                                {
-                                       Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban mask");
+                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
                                        return;
                                }
                                for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
                                {
                                        if (!strcasecmp(i->data,parameters[2]))
                                        {
-                                               Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0]));
+                                               user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0]));
                                                return;
                                        }
                                }
@@ -74,7 +74,7 @@ class cmd_tban : public command_t
                                unsigned long expire = Srv->CalcDuration(parameters[1]) + time(NULL);
                                if (Srv->CalcDuration(parameters[1]) < 1)
                                {
-                                       Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban time");
+                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
                                        return;
                                }
                                char duration[MAXBUF];
@@ -98,14 +98,14 @@ class cmd_tban : public command_t
                                        T.mask = mask;
                                        T.expire = expire;
                                        TimedBanList.push_back(T);
-                                       Srv->SendChannelServerNotice(Srv->GetServerName(),channel,"NOTICE "+std::string(channel->name)+" :"+std::string(user->nick)+" added a timed ban on "+mask+" lasting for "+std::string(duration)+" seconds.");
+                                       channel->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s added a timed ban on %s lasting for %s seconds.", channel->name, user->nick, mask.c_str(), duration);
                                }
                                return;
                        }
-                       else WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name);
+                       else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name);
                        return;
                }
-               WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]);
+               user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
        }
 };
 
@@ -161,7 +161,7 @@ class ModuleTimedBans : public Module
                                        again = true;
                                        if (cr)
                                        {
-                                               Srv->SendChannelServerNotice(Srv->GetServerName(),cr,"NOTICE "+std::string(cr->name)+" :Timed ban on "+i->mask+" expired.");
+                                               cr->WriteChannelWithServ(Srv->GetServerName().c_str(), "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";