Prevent setting mode -H if already unset, bug #74

[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 5dc54fba67bde35c7075717272f1b865a531ca54..3448bf9f5b58013a0ff69d4a60424a32548902ec 100644 (file)
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -24,6 +24,20 @@ class AutoOpList : public ListModeBase
        AutoOpList(Module* Creator) : ListModeBase(Creator, "autoop", 'w', "End of Channel Access List", 910, 911, true)
        {
                levelrequired = OP_VALUE;
+               tidy = false;
+       }
+
+       ModeHandler* FindMode(const std::string& mid)
+       {
+               if (mid.length() == 1)
+                       return ServerInstance->Modes->FindMode(mid[0], MODETYPE_CHANNEL);
+               for(char c='A'; c < 'z'; c++)
+               {
+                       ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
+                       if (mh && mh->name == mid)
+                               return mh;
+               }
+               return NULL;
        }
 
        ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
@@ -32,26 +46,31 @@ class AutoOpList : public ListModeBase
                if (pos == 0 || pos == std::string::npos)
                        return adding ? MOD_RES_DENY : MOD_RES_PASSTHRU;
                unsigned int mylevel = channel->GetPrefixValue(source);
-               while (pos > 0)
+               std::string mid = parameter.substr(0, pos);
+               ModeHandler* mh = FindMode(mid);
+
+               if (adding && (!mh || !mh->GetPrefixRank()))
                {
-                       pos--;
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(parameter[pos], MODETYPE_CHANNEL);
-                       if (adding && !mh)
-                               return MOD_RES_DENY;
-                       else if (!mh)
-                               continue;
-
-                       std::string dummy;
-                       if (mh->AccessCheck(source, channel, dummy, true) == MOD_RES_DENY)
-                               return MOD_RES_DENY;
-                       if (mh->GetLevelRequired() > mylevel)
-                               return MOD_RES_DENY;
+                       source->WriteNumeric(415, "%s %s :Cannot find prefix mode '%s' for autoop",
+                               source->nick.c_str(), mid.c_str(), mid.c_str());
+                       return MOD_RES_DENY;
+               }
+               else if (!mh)
+                       return MOD_RES_PASSTHRU;
+
+               std::string dummy;
+               if (mh->AccessCheck(source, channel, dummy, true) == MOD_RES_DENY)
+                       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());
+                       return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }
 };
 
-
 class ModuleAutoOp : public Module
 {
        AutoOpList mh;
@@ -80,7 +99,11 @@ public:
                                if (colon == std::string::npos)
                                        continue;
                                if (chan->CheckBan(user, it->mask.substr(colon+1)))
-                                       privs += it->mask.substr(0, colon);
+                               {
+                                       ModeHandler* given = mh.FindMode(it->mask.substr(0, colon));
+                                       if (given)
+                                               privs += given->GetModeChar();
+                               }
                        }
                }