From 3f143633541a5361bf5b02b0d69b65447aea7b79 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 29 May 2017 12:49:22 -0400
Subject: Remove recognized status and secure

Also remove /ns status, which is now almost useless with no recognized
status, and /ns access.
---
 modules/database/flatfile.cpp |  5 +++--
 modules/database/old.cpp      | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'modules/database')

diff --git a/modules/database/flatfile.cpp b/modules/database/flatfile.cpp
index 5c0f43108..9cdc0bff4 100644
--- a/modules/database/flatfile.cpp
+++ b/modules/database/flatfile.cpp
@@ -24,7 +24,6 @@
 #include "modules/chanserv/log.h"
 #include "modules/chanserv/set_misc.h"
 #include "modules/chanserv/suspend.h"
-#include "modules/nickserv/access.h"
 #include "modules/nickserv/ajoin.h"
 #include "modules/nickserv/cert.h"
 #include "modules/nickserv/set_misc.h"
@@ -49,6 +48,7 @@ class DBFlatFile : public Module
 		account->SetLanguage(data["language"]);
 		account->SetOper(Oper::Find(account->GetDisplay()));
 
+#if 0
 		spacesepstream sep = data["access"];
 		for (Anope::string token; sep.GetToken(token);)
 		{
@@ -59,6 +59,7 @@ class DBFlatFile : public Module
 				access->SetMask(token);
 			}
 		}
+#endif
 
 		MemoServ::MemoInfo *memos = account->GetMemos();
 		if (memos != nullptr)
@@ -71,7 +72,7 @@ class DBFlatFile : public Module
 			catch (const ConvertException &) { }
 		}
 
-		sep = data["memoignore"];
+		spacesepstream sep = data["memoignore"];
 		for (Anope::string token; memos && sep.GetToken(token);)
 		{
 			MemoServ::Ignore *ign = Serialize::New<MemoServ::Ignore *>();
diff --git a/modules/database/old.cpp b/modules/database/old.cpp
index 49692b8bd..80e179637 100644
--- a/modules/database/old.cpp
+++ b/modules/database/old.cpp
@@ -30,7 +30,6 @@
 #include "modules/nickserv/suspend.h"
 #include "modules/chanserv/suspend.h"
 #include "modules/chanserv/access.h"
-#include "modules/nickserv/access.h"
 
 #define READ(x) \
 if (true) \
@@ -517,8 +516,8 @@ static void LoadNicks()
 			READ(read_uint32(&u32, f));
 			if (u32 & OLD_NI_KILLPROTECT)
 				nc->SetKillProtect(true);
-			if (u32 & OLD_NI_SECURE)
-				nc->SetSecure(true);
+			//if (u32 & OLD_NI_SECURE)
+			//	nc->SetSecure(true);
 			if (u32 & OLD_NI_MSG)
 				nc->SetMsg(true);
 			if (u32 & OLD_NI_MEMO_HARDMAX)
@@ -608,12 +607,14 @@ static void LoadNicks()
 			{
 				READ(read_string(buffer, f));
 
+#if 0
 				NickAccess *a = Serialize::New<NickAccess *>();
 				if (a)
 				{
 					a->SetAccount(nc);
 					a->SetMask(buffer);
 				}
+#endif
 			}
 
 			int16_t i16;
@@ -868,8 +869,8 @@ static void LoadChannels()
 				ci->SetRestricted(true);
 			if (tmpu32 & OLD_CI_PEACE)
 				ci->SetPeace(true);
-			if (tmpu32 & OLD_CI_SECURE)
-				ci->SetSecure(true);
+			//if (tmpu32 & OLD_CI_SECURE)
+			//	ci->SetSecure(true);
 			if (tmpu32 & OLD_CI_NO_EXPIRE)
 				ci->SetNoExpire(true);
 			if (tmpu32 & OLD_CI_MEMO_HARDMAX)
-- 
cgit