m_sajoin Abort and report if the target user is already on the channel

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

diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index d195345cafdd8a54c23ea5abd1a8a256a18addc4..828bef14c06bb60ee320cc1a964c91492af3d9dc 100644 (file)
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -36,13 +36,9 @@ class AutoOpList : public ListModeBase
        {
                if (mid.length() == 1)
                        return ServerInstance->Modes->FindPrefixMode(mid[0]);
-               for(char c='A'; c < 'z'; c++)
-               {
-                       PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(c);
-                       if (mh && mh->name == mid)
-                               return mh;
-               }
-               return NULL;
+
+               ModeHandler* mh = ServerInstance->Modes->FindMode(mid, MODETYPE_CHANNEL);
+               return mh ? mh->IsPrefixMode() : NULL;
        }
 
        ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
@@ -56,8 +52,8 @@ class AutoOpList : public ListModeBase
 
                if (adding && !mh)
                {
-                       source->WriteNumeric(415, "%s %s :Cannot find prefix mode '%s' for autoop",
-                               source->nick.c_str(), mid.c_str(), mid.c_str());
+                       source->WriteNumeric(415, "%s :Cannot find prefix mode '%s' for autoop",
+                               mid.c_str(), mid.c_str());
                        return MOD_RES_DENY;
                }
                else if (!mh)
@@ -68,8 +64,8 @@ class AutoOpList : public ListModeBase
                        return MOD_RES_DENY;
                if (mh->GetLevelRequired() > mylevel)
                {
-                       source->WriteNumeric(482, "%s %s :You must be able to set mode '%s' to include it in an autoop",
-                               source->nick.c_str(), channel->name.c_str(), mid.c_str());
+                       source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be able to set mode '%s' to include it in an autoop",
+                               channel->name.c_str(), mid.c_str());
                        return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
@@ -116,11 +112,6 @@ class ModuleAutoOp : public Module
                }
        }
 
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
-       {
-               mh.DoSyncChannel(chan, proto, opaque);
-       }
-
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                mh.DoRehash();