Remove recognized status and secure

Also remove /ns status, which is now almost useless with no recognized
status, and /ns access.

1 files changed, 3 insertions, 23 deletions

diff --git a/src/users.cpp b/src/users.cpp
index 17f854ab6..3561e9ea9 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -49,7 +49,6 @@ User::User(const Anope::string &snick, const Anope::string &sident, const Anope:
 	quit = false;
 	server = NULL;
 	invalid_pw_count = invalid_pw_time = lastmemosend = lastnickreg = lastmail = 0;
-	on_access = false;
 
 	this->nick = snick;
 	this->ident = sident;
@@ -153,7 +152,7 @@ void User::ChangeNick(const Anope::string &newnick, time_t ts)
 	else
 	{
 		NickServ::Nick *old_na = NickServ::FindNick(this->nick);
-		if (old_na && (this->IsIdentified(true) || this->IsRecognized()))
+		if (old_na && this->IsIdentified(true))
 			old_na->SetLastSeen(Anope::CurTime);
 
 		UserListByNick.erase(this->nick);
@@ -169,14 +168,11 @@ void User::ChangeNick(const Anope::string &newnick, time_t ts)
 		}
 		other = this;
 
-		on_access = false;
 		if (NickServ::service)
 		{
 			NickServ::Nick *na = NickServ::service->FindNick(this->nick);
 			if (na)
 			{
-				on_access = na->GetAccount()->IsOnAccess(this);
-
 				if (na->GetAccount() == this->Account())
 				{
 					na->SetLastSeen(Anope::CurTime);
@@ -289,7 +285,7 @@ void User::SetRealname(const Anope::string &srealname)
 	//XXX event
 	NickServ::Nick *na = NickServ::FindNick(this->nick);
 
-	if (na && (this->IsIdentified(true) || this->IsRecognized()))
+	if (na && this->IsIdentified(true))
 		na->SetLastRealname(srealname);
 
 	logger.Category("realname").Log(_("{0} changed realname to {1}"), this->GetMask(), srealname);
@@ -456,19 +452,6 @@ bool User::IsIdentified(bool check_nick) const
 	return this->nc ? true : false;
 }
 
-bool User::IsRecognized(bool check_secure) const
-{
-	if (check_secure && on_access)
-	{
-		NickServ::Nick *na = NickServ::FindNick(nick);
-
-		if (!na || na->GetAccount()->IsSecure())
-			return false;
-	}
-
-	return on_access;
-}
-
 bool User::IsServicesOper()
 {
 	if (!this->nc || !this->nc->GetOper())
@@ -530,11 +513,8 @@ void User::UpdateHost()
 
 	//XXX event
 	NickServ::Nick *na = NickServ::FindNick(this->nick);
-	on_access = false;
-	if (na)
-		on_access = na->GetAccount()->IsOnAccess(this);
 
-	if (na && (this->IsIdentified(true) || this->IsRecognized()))
+	if (na && this->IsIdentified(true))
 	{
 		Anope::string last_usermask = this->GetIdent() + "@" + this->GetDisplayedHost();
 		Anope::string last_realhost = this->GetIdent() + "@" + this->host;