Restore <options:exemptchanops> with long names

[user/henk/code/inspircd.git] / src / modules / m_services_account.cpp

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 3f1913de4ed7afb57d6d0be7adb013169e59361f..61026c08f5d0cdbfb4f6ba91eebb4d7ee903f3d5 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -20,9 +20,8 @@
  */
 class Channel_r : public ModeHandler
 {
-
  public:
-       Channel_r(Module* Creator) : ModeHandler(Creator, "registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { }
+       Channel_r(Module* Creator) : ModeHandler(Creator, "c_registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -52,7 +51,7 @@ class User_r : public ModeHandler
 {
 
  public:
-       User_r(Module* Creator) : ModeHandler(Creator, "registered", 'r', PARAM_NONE, MODETYPE_USER) { }
+       User_r(Module* Creator) : ModeHandler(Creator, "u_registered", 'r', PARAM_NONE, MODETYPE_USER) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -120,9 +119,9 @@ class ModuleServicesAccount : public Module
                ServerInstance->Modules->AddService(m5);
                ServerInstance->Modules->AddService(accountname);
                Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
-                       I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
+                       I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick, I_OnSetConnectClass };
 
-               ServerInstance->Modules->Attach(eventlist, this, 8);
+               ServerInstance->Modules->Attach(eventlist, this, 9);
        }
 
        void On005Numeric(std::string &t)
@@ -176,8 +175,7 @@ class ModuleServicesAccount : public Module
                if (target_type == TYPE_CHANNEL)
                {
                        Channel* c = (Channel*)dest;
-                       ModResult res;
-                       FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"regmoderated"));
+                       ModResult res = ServerInstance->OnCheckExemption(user,c,"regmoderated");
 
                        if (c->IsModeSet('M') && !is_registered && res != MOD_RES_ALLOW)
                        {
@@ -272,8 +270,11 @@ class ModuleServicesAccount : public Module
                }
        }
 
-       ~ModuleServicesAccount()
+       ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
        {
+               if (myclass->config->getBool("requireaccount") && !accountname.get(user))
+                       return MOD_RES_DENY;
+               return MOD_RES_PASSTHRU;
        }
 
        Version GetVersion()