X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_b.cpp;h=82e57ea7bb1e3bddd406482b9b4dfa6dc560a1fe;hb=e84bf9f3ec5a60078c32b272d3d7885c0708c544;hp=569fb67727b34817134fee3274e731334beb288e;hpb=a1f073f66f4b985bf776b9be2015136209c0c311;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 569fb6772..82e57ea7b 100644
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -8,26 +8,18 @@
 #include "channels.h"
 #include "users.h"
 #include "helperfuncs.h"
-#include "message.h"
 #include "modules.h"
 #include "inspstring.h"
 #include "hashcomp.h"
 #include "modes/cmode_b.h"
 
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern int MODCOUNT;
-extern time_t TIME;
-
-ModeChannelBan::ModeChannelBan() : ModeHandler('b', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b', 1, 1, true, MODETYPE_CHANNEL, false)
 {
 }
 
 ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 {
-	int status = cstatus(source, channel);
+	int status = channel->GetStatus(source);
 	/* Call the correct method depending on wether we're adding or removing the mode */
 	if (adding)
 	{
@@ -50,9 +42,9 @@ void ModeChannelBan::DisplayList(userrec* user, chanrec* channel)
 	/* Display the channel banlist */
 	for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
 	{
-		WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, channel->name, i->data, i->set_by, i->set_time);
+		user->WriteServ("367 %s %s %s %s %d",user->nick, channel->name, i->data, i->set_by, i->set_time);
 	}
-	WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, channel->name);
+	user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
 	return;
 }
 
@@ -60,7 +52,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
 {
 	if ((!user) || (!chan))
 	{
-		log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
+		ServerInstance->Log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
 		dest = "";
 		return dest;
 	}
@@ -71,10 +63,10 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
 	if (dest == "")
 		return dest;
 
-	long maxbans = GetMaxBans(chan->name);
+	long maxbans = chan->GetMaxBans();
 	if ((unsigned)chan->bans.size() > (unsigned)maxbans)
 	{
-		WriteServ(user->fd,"478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans);
+		user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans);
 		dest = "";
 		return dest;
 	}
@@ -97,7 +89,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
 		}
 	}
 
-	b.set_time = TIME;
+	b.set_time = ServerInstance->Time();
 	strlcpy(b.data,dest.c_str(),MAXBUF);
 	if (*user->nick)
 	{
@@ -105,7 +97,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
 	}
 	else
 	{
-		strlcpy(b.set_by,Config->ServerName,NICKMAX-1);
+		strlcpy(b.set_by,ServerInstance->Config->ServerName,NICKMAX-1);
 	}
 	chan->bans.push_back(b);
 	return dest;
@@ -127,7 +119,7 @@ std::string& ModeChannelBan::DelBan(userrec *user,std::string& dest,chanrec *cha
 {
 	if ((!user) || (!chan))
 	{
-		log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
+		ServerInstance->Log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
 		dest = "";
 		return dest;
 	}