Change IS_FAKE and CheckTimeStamp to IS_SERVER and ResolveModeConflict to clarify...

[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..223768dac8d92b681dc94d75c8c4f47ea787462d 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -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, '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
                        {
@@ -78,12 +78,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 +110,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;
        }