Implement support for millisecond level server-time accuracy.

[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 3eab189f28cabb43115fae07715e0ef66f95928e..b1b08228c50a71a8a4c3d9786bf2ad5814204543 100644 (file)
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -26,7 +26,8 @@
 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)
        {
                ranktoset = ranktounset = OP_VALUE;
                tidy = false;
@@ -52,7 +53,7 @@ class AutoOpList : public ListModeBase
 
                if (adding && !mh)
                {
-                       source->WriteNumeric(415, mid, InspIRCd::Format("Cannot find prefix mode '%s' for autoop", 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)
@@ -61,9 +62,10 @@ class AutoOpList : public ListModeBase
                std::string dummy;
                if (mh->AccessCheck(source, channel, dummy, true) == MOD_RES_DENY)
                        return MOD_RES_DENY;
-               if (mh->GetLevelRequired(true) > mylevel)
+               if (mh->GetLevelRequired(adding) > mylevel)
                {
-                       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()));
+                       source->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, InspIRCd::Format("You must be able to %s mode %c (%s) to %s an autoop containing it",
+                               adding ? "set" : "unset", mh->GetModeChar(), mh->name.c_str(), adding ? "add" : "remove"));
                        return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
@@ -111,7 +113,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);
        }
 };