pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-01 17:46:38 +02:00
Code Activity

Allow channels on access lists

Browse Source
This commit is contained in:
Adam
2013-07-03 22:45:00 -04:00
parent c2e1a8a3e2
commit 7f971043bc
11 changed files with 294 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/regchannel.cpp
+33 -23
View File
@@ -400,16 +400,8 @@ AccessGroup ChannelInfo::AccessFor(const User *u)
for (unsigned i = 0, end = this->GetAccessCount(); i < end; ++i)
{
ChanAccess *a = this->GetAccess(i);
if (a->nc)
{
if (a->nc == nc)
group.push_back(a);
}
else if (a->Matches(u, nc))
{
if (a->Matches(u, u->Account(), group.path))
group.push_back(a);
}
}
if (group.founder || !group.empty())
@@ -434,18 +426,10 @@ AccessGroup ChannelInfo::AccessFor(const NickCore *nc)
for (unsigned i = 0, end = this->GetAccessCount(); i < end; ++i)
{
ChanAccess *a = this->GetAccess(i);
if (a->nc)
{
if (a->nc == nc)
group.push_back(a);
}
else if (this->GetAccess(i)->Matches(NULL, nc))
{
group.push_back(this->GetAccess(i));
}
if (a->Matches(NULL, nc, group.path))
group.push_back(a);
}
if (group.founder || !group.empty())
{
this->last_used = Anope::CurTime;
@@ -462,12 +446,38 @@ unsigned ChannelInfo::GetAccessCount() const
return this->access->size();
}
void ChannelInfo::EraseAccess(unsigned index)
unsigned ChannelInfo::GetDeepAccessCount() const
{
ChanAccess::Path path;
for (unsigned i = 0, end = this->GetAccessCount(); i < end; ++i)
{
ChanAccess *a = this->GetAccess(i);
a->Matches(NULL, NULL, path);
}
unsigned count = this->GetAccessCount();
std::set<const ChannelInfo *> channels;
channels.insert(this);
for (ChanAccess::Set::iterator it = path.first.begin(); it != path.first.end(); ++it)
{
const ChannelInfo *ci = it->first->ci;
if (!channels.count(ci))
{
channels.count(ci);
count += ci->GetAccessCount();
}
}
return count;
}
ChanAccess *ChannelInfo::EraseAccess(unsigned index)
{
if (this->access->empty() || index >= this->access->size())
return;
return NULL;
delete this->access->at(index);
ChanAccess *ca = this->access->at(index);
this->access->erase(this->access->begin() + index);
return ca;
}
void ChannelInfo::ClearAccess()