ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove some fake client stuff, make it use the global record

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7941 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t 2007-08-28 13:40:21 +00:00
parent 67b09fde7b
commit 2829ce8112
7 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/channels.cpp
View File

@ -177,9 +177,6 @@ void chanrec::SetDefaultModes()
list.GetToken(modeseq);
userrec* dummyuser = new userrec(ServerInstance);
dummyuser->SetFd(FD_MAGIC_NUMBER);
for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n)
{
ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL);
@ -190,11 +187,9 @@ void chanrec::SetDefaultModes()
else
parameter.clear();
mode->OnModeChange(dummyuser, dummyuser, this, parameter, true);
mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true);
}
}
delete dummyuser;
}
/*
@ -367,11 +362,9 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs)
{
userrec* dummyuser = new userrec(Instance);
std::string nick = user->nick;
bool silent = false;
dummyuser->SetFd(FD_MAGIC_NUMBER);
Ptr->AddUser(user);
/* Just in case they have no permissions */
@ -385,7 +378,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con
{
Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
/* Make sure that the mode handler knows this mode was now set */
mh->OnModeChange(dummyuser, dummyuser, Ptr, nick, true);
mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true);
switch (mh->GetPrefix())
{
@ -410,8 +403,6 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con
}
}
delete dummyuser;
FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, silent));
if (!silent)

8
src/mode.cpp
View File

@ -1018,14 +1018,8 @@ void ModeHandler::RemoveMode(chanrec* channel)
if (channel->IsModeSet(this->GetModeChar()))
{
userrec* n = new userrec(ServerInstance);
sprintf(moderemove,"-%c",this->GetModeChar());
n->SetFd(FD_MAGIC_NUMBER);
ServerInstance->SendMode(parameters, 2, n);
delete n;
ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient);
}
}

7
src/modes/cmode_b.cpp
View File

@ -53,21 +53,18 @@ void ModeChannelBan::RemoveMode(chanrec* channel)
{
BanList copy;
char moderemove[MAXBUF];
userrec* n = new userrec(ServerInstance);
n->SetFd(FD_MAGIC_NUMBER);
for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
{
copy.push_back(*i);
}
for (BanList::iterator i = copy.begin(); i != copy.end(); i++)
{
sprintf(moderemove,"-%c",this->GetModeChar());
const char* parameters[] = { channel->name, moderemove, i->data };
ServerInstance->SendMode(parameters, 3, n);
ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
}
delete n;
}
void ModeChannelBan::RemoveMode(userrec* user)

7
src/modes/cmode_h.cpp
View File

@ -50,21 +50,20 @@ void ModeChannelHalfOp::RemoveMode(chanrec* channel)
CUList* list = channel->GetHalfoppedUsers();
CUList copy;
char moderemove[MAXBUF];
userrec* n = new userrec(ServerInstance);
n->SetFd(FD_MAGIC_NUMBER);
for (CUList::iterator i = list->begin(); i != list->end(); i++)
{
userrec* n = i->first;
copy.insert(std::make_pair(n,n->nick));
}
for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
{
sprintf(moderemove,"-%c",this->GetModeChar());
const char* parameters[] = { channel->name, moderemove, i->first->nick };
ServerInstance->SendMode(parameters, 3, n);
ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
}
delete n;
}
void ModeChannelHalfOp::RemoveMode(userrec* user)

8
src/modes/cmode_k.cpp
View File

@ -43,14 +43,8 @@ void ModeChannelKey::RemoveMode(chanrec* channel)
if (channel->IsModeSet(this->GetModeChar()))
{
userrec* n = new userrec(ServerInstance);
sprintf(moderemove,"-%c",this->GetModeChar());
n->SetFd(FD_MAGIC_NUMBER);
ServerInstance->SendMode(parameters, 3, n);
delete n;
ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
}
}

6
src/modes/cmode_o.cpp
View File

@ -51,21 +51,19 @@ void ModeChannelOp::RemoveMode(chanrec* channel)
CUList* list = channel->GetOppedUsers();
CUList copy;
char moderemove[MAXBUF];
userrec* n = new userrec(ServerInstance);
n->SetFd(FD_MAGIC_NUMBER);
for (CUList::iterator i = list->begin(); i != list->end(); i++)
{
userrec* n = i->first;
copy.insert(std::make_pair(n,n->nick));
}
for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
{
sprintf(moderemove,"-%c",this->GetModeChar());
const char* parameters[] = { channel->name, moderemove, i->first->nick };
ServerInstance->SendMode(parameters, 3, n);
ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
}
delete n;
}
void ModeChannelOp::RemoveMode(userrec* user)

6
src/modes/cmode_v.cpp
View File

@ -50,21 +50,19 @@ void ModeChannelVoice::RemoveMode(chanrec* channel)
CUList* list = channel->GetVoicedUsers();
CUList copy;
char moderemove[MAXBUF];
userrec* n = new userrec(ServerInstance);
n->SetFd(FD_MAGIC_NUMBER);
for (CUList::iterator i = list->begin(); i != list->end(); i++)
{
userrec* n = i->first;
copy.insert(std::make_pair(n,n->nick));
}
for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
{
sprintf(moderemove,"-%c",this->GetModeChar());
const char* parameters[] = { channel->name, moderemove, i->first->nick };
ServerInstance->SendMode(parameters, 3, n);
ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
}
delete n;
}
void ModeChannelVoice::RemoveMode(userrec* user)