Always reset the levels of newly created channels, fixed DetermineLevel matching ACCESS_INVALID levels, and added in a disabled config option for levels

1 files changed, 10 insertions, 3 deletions

diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 777b0c176..fa23658c8 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -94,7 +94,7 @@ class AccessChanAccess : public ChanAccess
 	{
 		for (int i = 0; defaultLevels[i].priv != CA_SIZE; ++i)
 			if (defaultLevels[i].priv == priv)
-				return DetermineLevel(this) >= this->ci->levels[priv];
+				return this->ci->levels[priv] != ACCESS_INVALID && DetermineLevel(this) >= this->ci->levels[priv];
 		return false;
 	}
 
@@ -884,8 +884,8 @@ class CSAccess : public Module
 		ModuleManager::RegisterService(&commandcsaccess);
 		ModuleManager::RegisterService(&commandcslevels);
 
-		Implementation i[] = { I_OnReload, I_OnChanRegistered };
-		ModuleManager::Attach(i, this, 2);
+		Implementation i[] = { I_OnReload, I_OnChanRegistered, I_OnCreateChan };
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		this->OnReload();
 	}
@@ -901,6 +901,8 @@ class CSAccess : public Module
 			const Anope::string &value = config.ReadValue("chanserv", l.config_name, "", 0);
 			if (value.equals_ci("founder"))
 				l.default_level = ACCESS_FOUNDER;
+			else if (value.equals_ci("disabled"))
+				l.default_level = ACCESS_INVALID;
 			else
 				l.default_level = config.ReadInteger("chanserv", l.config_name, 0, false);
 		}
@@ -910,6 +912,11 @@ class CSAccess : public Module
 	{
 		reset_levels(ci);
 	}
+
+	void OnCreateChan(ChannelInfo *ci)
+	{
+		reset_levels(ci);
+	}
 };
 
 MODULE_INIT(CSAccess)