Remove recognized status and secure

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

4 files changed, 1 insertions, 22 deletions

diff --git a/modules/chanserv/main/channel.cpp b/modules/chanserv/main/channel.cpp
index b9e519427..5f7c71c8c 100644
--- a/modules/chanserv/main/channel.cpp
+++ b/modules/chanserv/main/channel.cpp
@@ -247,16 +247,6 @@ void ChannelImpl::SetRestricted(bool restricted)
 	Set(&ChannelType::restricted, restricted);
 }
 
-bool ChannelImpl::IsSecure()
-{
-	return Get(&ChannelType::secure);
-}
-
-void ChannelImpl::SetSecure(bool secure)
-{
-	Set(&ChannelType::secure, secure);
-}
-
 bool ChannelImpl::IsSecureOps()
 {
 	return Get(&ChannelType::secureops);
@@ -370,12 +360,6 @@ ChanServ::AccessGroup ChannelImpl::AccessFor(const User *u, bool updateLastUsed)
 		return group;
 
 	NickServ::Account *nc = u->Account();
-	if (nc == NULL && !this->IsSecure() && u->IsRecognized())
-	{
-		NickServ::Nick *na = NickServ::FindNick(u->nick);
-		if (na != NULL)
-			nc = na->GetAccount();
-	}
 
 	group.super_admin = u->super_admin;
 	group.founder = IsFounder(u);
diff --git a/modules/chanserv/main/channel.h b/modules/chanserv/main/channel.h
index cd419b351..eebddf91b 100644
--- a/modules/chanserv/main/channel.h
+++ b/modules/chanserv/main/channel.h
@@ -35,7 +35,6 @@ class ChannelImpl : public ChanServ::Channel
 	Serialize::Storage<bool> peace;
 	Serialize::Storage<bool> securefounder;
 	Serialize::Storage<bool> restricted;
-	Serialize::Storage<bool> secure;
 	Serialize::Storage<bool> secureops;
 	Serialize::Storage<bool> signkick;
 	Serialize::Storage<bool> signkicklevel;
@@ -110,9 +109,6 @@ class ChannelImpl : public ChanServ::Channel
 	bool IsRestricted() override;
 	void SetRestricted(bool) override;
 
-	bool IsSecure() override;
-	void SetSecure(bool) override;
-
 	bool IsSecureOps() override;
 	void SetSecureOps(bool) override;
 
diff --git a/modules/chanserv/main/channeltype.cpp b/modules/chanserv/main/channeltype.cpp
index 8e5c10b48..ca74263cd 100644
--- a/modules/chanserv/main/channeltype.cpp
+++ b/modules/chanserv/main/channeltype.cpp
@@ -39,7 +39,6 @@ ChannelType::ChannelType(Module *me) : Serialize::Type<ChannelImpl>(me)
 	, peace(this, "peace", &ChannelImpl::peace)
 	, securefounder(this, "securefounder", &ChannelImpl::securefounder)
 	, restricted(this, "restricted", &ChannelImpl::restricted)
-	, secure(this, "secure", &ChannelImpl::secure)
 	, secureops(this, "secureops", &ChannelImpl::secureops)
 	, signkick(this, "signkick", &ChannelImpl::signkick)
 	, signkicklevel(this, "signkicklevel", &ChannelImpl::signkicklevel)
diff --git a/modules/chanserv/main/channeltype.h b/modules/chanserv/main/channeltype.h
index 1e10f01ea..af4bc6cc9 100644
--- a/modules/chanserv/main/channeltype.h
+++ b/modules/chanserv/main/channeltype.h
@@ -48,7 +48,7 @@ class ChannelType : public Serialize::Type<ChannelImpl>
 	Serialize::ObjectField<ChannelImpl, BotInfo *> servicebot;
 
 	Serialize::Field<ChannelImpl, bool> greet, fantasy, noautoop, peace, securefounder,
-		restricted, secure, secureops, signkick, signkicklevel, noexpire, keepmodes,
+		restricted, secureops, signkick, signkicklevel, noexpire, keepmodes,
 		persist, topiclock, keeptopic, _private;
 
  	ChannelType(Module *);