Refactor the internals of the oper system.

- Allow overriding privileges from the <class> blocks in the <type>
  and <oper> blocks.
- Separate oper types from oper accounts in the code. This enables
  moving some core stuff out of the config tag later.
- Merge the config tags together to make a synthetic tag that can
  have getXXX called on it instead of using getConfig and then
  converting it.
- Move the details of Have*Permission into the oper type class.
- Improve oper events to allow modules to easily hook into the oper
  system.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/channels.cpp b/src/channels.cpp
index 591f3368b..d98bcc123 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -188,11 +188,8 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
 	{
 		unsigned long maxchans = user->GetClass()->maxchans;
 		if (user->IsOper())
-		{
-			unsigned long opermaxchans = ConvToNum<unsigned int>(user->oper->getConfig("maxchans"));
-			if (opermaxchans > maxchans)
-				maxchans = opermaxchans;
-		}
+			maxchans = user->oper->GetConfig()->getUInt("maxchans", maxchans, maxchans);
+
 		if (user->chans.size() >= maxchans)
 		{
 			user->WriteNumeric(ERR_TOOMANYCHANNELS, cname, "You are on too many channels");