diff options
| author | Adam <Adam@anope.org> | 2011-08-09 01:55:34 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-08-09 01:55:34 -0400 |
| commit | 776583a665fdc1b98b66266f6649865d27337a28 (patch) | |
| tree | be07b292c7d307285b5afd78c5e816df8e2a71c5 /modules/pseudoclients | |
| parent | 91c3363c1578d24e70d0ed215d6aedc769076f08 (diff) | |
Simiplied a bit of the access system
Diffstat (limited to 'modules/pseudoclients')
| -rw-r--r-- | modules/pseudoclients/bs_main.cpp | 4 | ||||
| -rw-r--r-- | modules/pseudoclients/ms_main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/pseudoclients/bs_main.cpp b/modules/pseudoclients/bs_main.cpp index 56de249c5..34214ad3d 100644 --- a/modules/pseudoclients/bs_main.cpp +++ b/modules/pseudoclients/bs_main.cpp @@ -81,7 +81,7 @@ class BotServCore : public Module if (bi == NULL || !bi->commands.count(command)) return; - if (c->ci->HasPriv(u, CA_FANTASIA)) + if (c->ci->AccessFor(u).HasPriv(CA_FANTASIA)) { this->fantasy_channel = c; @@ -125,7 +125,7 @@ class BotServCore : public Module * to has synced, or we'll get greet-floods when the net * recovers from a netsplit. -GD */ - if (c->FindUser(c->ci->bi) && c->ci->botflags.HasFlag(BS_GREET) && user->Account() && !user->Account()->greet.empty() && c->ci->HasPriv(user, CA_GREET) && user->server->IsSynced()) + if (c->FindUser(c->ci->bi) && c->ci->botflags.HasFlag(BS_GREET) && user->Account() && !user->Account()->greet.empty() && c->ci->AccessFor(user).HasPriv(CA_GREET) && user->server->IsSynced()) { ircdproto->SendPrivmsg(c->ci->bi, c->name, "[%s] %s", user->Account()->display.c_str(), user->Account()->greet.c_str()); c->ci->bi->lastmsg = Anope::CurTime; diff --git a/modules/pseudoclients/ms_main.cpp b/modules/pseudoclients/ms_main.cpp index bb6d7847e..c002fc147 100644 --- a/modules/pseudoclients/ms_main.cpp +++ b/modules/pseudoclients/ms_main.cpp @@ -98,7 +98,7 @@ class MyMemoServService : public MemoServService { UserContainer *cu = *it; - if (ci->HasPriv(cu->user, CA_MEMO)) + if (ci->AccessFor(cu->user).HasPriv(CA_MEMO)) { if (cu->user->Account() && cu->user->Account()->HasFlag(NI_MEMO_RECEIVE)) cu->user->SendMessage(MemoServ, MEMO_NEW_X_MEMO_ARRIVED, ci->name.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->MemoServ.c_str(), ci->name.c_str(), mi->memos.size()); @@ -179,7 +179,7 @@ class MemoServCore : public Module void OnJoinChannel(User *u, Channel *c) { - if (c->ci && c->ci->HasPriv(u, CA_MEMO) && c->ci->memos.memos.size() > 0) + if (c->ci && c->ci->AccessFor(u).HasPriv(CA_MEMO) && c->ci->memos.memos.size() > 0) { if (c->ci->memos.memos.size() == 1) u->SendMessage(MemoServ, _("There is \002%d\002 memo on channel %s."), c->ci->memos.memos.size(), c->ci->name.c_str()); |