Some more text fixes and improvements (#1618).

[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 2b9c2e1c21c28edfaf62adc6d3513a1ffa0ee08f..83c40533800ecb6d9a380843ded9d27a0a06999d 100644 (file)
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -26,9 +26,10 @@
 class AutoOpList : public ListModeBase
 {
  public:
-       AutoOpList(Module* Creator) : ListModeBase(Creator, "autoop", 'w', "End of Channel Access List", 910, 911, true)
+       AutoOpList(Module* Creator)
+               : ListModeBase(Creator, "autoop", 'w', "End of Channel Access List", 910, 911, true)
        {
-               levelrequired = OP_VALUE;
+               ranktoset = ranktounset = OP_VALUE;
                tidy = false;
        }
 
@@ -41,7 +42,7 @@ class AutoOpList : public ListModeBase
                return mh ? mh->IsPrefixMode() : NULL;
        }
 
-       ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
+       ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding) CXX11_OVERRIDE
        {
                std::string::size_type pos = parameter.find(':');
                if (pos == 0 || pos == std::string::npos)
@@ -52,8 +53,7 @@ class AutoOpList : public ListModeBase
 
                if (adding && !mh)
                {
-                       source->WriteNumeric(415, "%s :Cannot find prefix mode '%s' for autoop",
-                               mid.c_str(), mid.c_str());
+                       source->WriteNumeric(ERR_UNKNOWNMODE, mid, InspIRCd::Format("Cannot find prefix mode '%s' for autoop", mid.c_str()));
                        return MOD_RES_DENY;
                }
                else if (!mh)
@@ -62,10 +62,9 @@ class AutoOpList : public ListModeBase
                std::string dummy;
                if (mh->AccessCheck(source, channel, dummy, true) == MOD_RES_DENY)
                        return MOD_RES_DENY;
-               if (mh->GetLevelRequired() > mylevel)
+               if (mh->GetLevelRequired(true) > mylevel)
                {
-                       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());
+                       source->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, InspIRCd::Format("You must be able to set mode '%s' to include it in an autoop", mid.c_str()));
                        return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
@@ -113,7 +112,7 @@ class ModuleAutoOp : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for the +w channel mode", VF_VENDOR);
+               return Version("Provides channel mode +w, basic channel access controls", VF_VENDOR);
        }
 };