From 2eae82da5c3fc53ce9d32a20b0cf5650bb60f540 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 8 Apr 2013 01:01:23 -0500 Subject: Check the channel secure option isn't set in ChannelInfo::AccessFor too --- src/regchannel.cpp | 2 +- src/users.cpp | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 9148d99fd..89dd14e06 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -602,7 +602,7 @@ AccessGroup ChannelInfo::AccessFor(const User *u) return group; const NickCore *nc = u->Account(); - if (nc == NULL && u->IsRecognized()) + if (nc == NULL && !this->HasExt("SECURE") && u->IsRecognized()) { const NickAlias *na = NickAlias::Find(u->nick); if (na != NULL) diff --git a/src/users.cpp b/src/users.cpp index 1355911bf..691653055 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -456,24 +456,20 @@ NickCore *User::Account() const return this->nc; } -bool User::IsIdentified(bool CheckNick) const +bool User::IsIdentified(bool check_nick) const { - if (CheckNick && this->nc) + if (check_nick && this->nc) { NickAlias *na = NickAlias::Find(this->nc->display); - - if (na && *na->nc == *this->nc) - return true; - - return false; + return na && *na->nc == *this->nc; } return this->nc ? true : false; } -bool User::IsRecognized(bool CheckSecure) const +bool User::IsRecognized(bool check_secure) const { - if (CheckSecure && on_access) + if (check_secure && on_access) { const NickAlias *na = NickAlias::Find(this->nick); -- cgit