Remove VF_COMMON from mode-provider modules (no longer needed due to better CAPAB...

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

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 732d588570df7b147563fb7ce58a9d9f603167be..b8835f7989569df7ba76d02a4eeaf14be1174d37 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.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
@@ -24,7 +24,7 @@
 class OperPrefixMode : public ModeHandler
 {
        public:
-               OperPrefixMode(InspIRCd* Instance, Module* Creator, char pfx) : ModeHandler(Creator, 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+               OperPrefixMode(Module* Creator, char pfx) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
                {
                        list = true;
                        prefix = pfx;
@@ -39,7 +39,7 @@ class OperPrefixMode : public ModeHandler
 
                ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
                {
-                       if (IS_FAKE(source) || (source && ServerInstance->ULine(source->server)))
+                       if (IS_SERVER(source) || (source && ServerInstance->ULine(source->server)))
                                return MODEACTION_ALLOW;
                        else
                        {
@@ -49,27 +49,6 @@ class OperPrefixMode : public ModeHandler
                        }
                }
 
-               ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-               {
-                       User* x = ServerInstance->FindNick(parameter);
-                       Membership* m = channel->GetUser(x);
-                       if (x)
-                       {
-                               if (!m)
-                               {
-                                       return std::make_pair(false, parameter);
-                               }
-                               else
-                               {
-                                       if (m->hasMode('y'))
-                                               return std::make_pair(true, x->nick);
-                                       else
-                                                       return std::make_pair(false, parameter);
-                               }
-                       }
-                       return std::make_pair(false, parameter);
-               }
-
                bool NeedsOper() { return true; }
 };
 
@@ -78,12 +57,11 @@ class ModuleOperPrefixMode : public Module
  private:
        OperPrefixMode* opm;
  public:
-       ModuleOperPrefixMode(InspIRCd* Me) : Module(Me)
-       {
-               ConfigReader Conf(ServerInstance);
+       ModuleOperPrefixMode()  {
+               ConfigReader Conf;
                std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
 
-               opm = new OperPrefixMode(ServerInstance, this, pfx[0]);
+               opm = new OperPrefixMode(this, pfx[0]);
                if ((!ServerInstance->Modes->AddMode(opm)))
                        throw ModuleException("Could not add a new mode!");
 
@@ -111,7 +89,7 @@ class ModuleOperPrefixMode : public Module
        ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
        {
                /* force event propagation to its ModeHandler */
-               if (!IS_FAKE(user) && chan && (mode == 'y'))
+               if (!IS_SERVER(user) && chan && (mode == 'y'))
                        return MOD_RES_ALLOW;
                return MOD_RES_PASSTHRU;
        }
@@ -129,13 +107,12 @@ class ModuleOperPrefixMode : public Module
 
        ~ModuleOperPrefixMode()
        {
-               ServerInstance->Modes->DelMode(opm);
                delete opm;
        }
 
        Version GetVersion()
        {
-               return Version("Gives opers cmode +y which provides a staff prefix.", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
        }
 };