Mark +P mode as oper-only now that it no longer requires an explicit permission string

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

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 9db0b5b4ad64feb5e6dce64973f7abb0d70fada9..5cd2674a3d6e15b28e458efc1f0f5ab7456eaa55 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -40,35 +40,14 @@ class ModuleModesOnOper : public Module
 
        virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
        {
-               TagIndex::iterator typetag = ServerInstance->Config->opertypes.find(opertype);
-               if (typetag == ServerInstance->Config->opertypes.end())
-                       return;
                // whenever a user opers, go through the oper types, find their <type:modes>,
                // and if they have one apply their modes. The mode string can contain +modes
                // to add modes to the user or -modes to take modes from the user.
-               std::string ThisOpersModes = typetag->second->getString("modes");
+               std::string ThisOpersModes = user->oper->getConfig("modes");
                if (!ThisOpersModes.empty())
                {
                        ApplyModes(user, ThisOpersModes);
                }
-
-               if (!opername.empty()) // if user is local ..
-               {
-                       for (int i = 0;; i++)
-                       {
-                               ConfigTag* tag = ServerInstance->Config->ConfValue("oper", i);
-                               if (!tag)
-                                       break;
-                               if (tag->getString("name") != opername)
-                                       continue;
-                               ThisOpersModes = tag->getString("modes");
-                               if (!ThisOpersModes.empty())
-                               {
-                                       ApplyModes(user, ThisOpersModes);
-                               }
-                               break;
-                       }
-               }
        }
 
        void ApplyModes(User *u, std::string &smodes)
@@ -94,8 +73,7 @@ class ModuleModesOnOper : public Module
                        modes.push_back(tokens[k]);
                }
 
-               ServerInstance->SendMode(modes, u);
-               ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+               ServerInstance->SendGlobalMode(modes, u);
        }
 };