Remove "servermode" parameter, replace with IS_FAKE() which is more reliable

[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 6614b867bf1ee6cd64c7ff5413ee674b61a03d0b..deb826108af13261ae30b4a4da6681ba9059c8da 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,7 +19,7 @@
 
 #include "inspircd.h"
 
-static char prefixchar;
+#define OPERPREFIX_VALUE 1000000
 
 std::set<std::string>* SetupExt(User* user)
 {
@@ -51,16 +51,16 @@ void AddPrefixChan(User* user, Channel* channel)
 class OperPrefixMode : public ModeHandler
 {
        public:
-               OperPrefixMode(InspIRCd* Instance) : ModeHandler(Instance, 'y', 1, 1, true, MODETYPE_CHANNEL, false, prefixchar) { }
+               OperPrefixMode(InspIRCd* Instance, Module* Creator, char pfx) : ModeHandler(Instance, Creator, 'y', 1, 1, true, MODETYPE_CHANNEL, false, pfx, pfx, TR_NICK) { }
 
                unsigned int GetPrefixRank()
                {
-                       return 40000;
+                       return OPERPREFIX_VALUE;
                }
 
-               ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
+               ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
                {
-                       if (servermode || (source && ServerInstance->ULine(source->server)))
+                       if (IS_FAKE(source) || (source && ServerInstance->ULine(source->server)))
                                return MODEACTION_ALLOW;
                        else
                        {
@@ -111,11 +111,9 @@ class ModuleOperPrefixMode : public Module
        ModuleOperPrefixMode(InspIRCd* Me) : Module(Me)
        {
                ConfigReader Conf(ServerInstance);
-               std::string tmp;
-               tmp = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
-               strlcpy(&prefixchar,tmp.c_str(),2);
+               std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
 
-               opm = new OperPrefixMode(ServerInstance);
+               opm = new OperPrefixMode(ServerInstance, this, pfx[0]);
                if ((!ServerInstance->Modes->AddMode(opm)))
                        throw ModuleException("Could not add a new mode!");
 
@@ -129,9 +127,9 @@ class ModuleOperPrefixMode : public Module
                        DelPrefixChan(user, channel);
                else
                        AddPrefixChan(user, channel);
-               char modeline[]="+y";
+               char modeline[] = "+y";
                if (negate)
-                       modeline [0]='-';
+                       modeline[0] = '-';
                std::vector<std::string> modechange;
                modechange.push_back(channel->name);
                modechange.push_back(modeline);
@@ -153,10 +151,10 @@ class ModuleOperPrefixMode : public Module
        }
 
        // XXX: is there a better way to do this?
-       virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt, bool servermode)
+       virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
        {
                /* force event propagation to its ModeHandler */
-               if (!servermode && chan && (mode == 'y'))
+               if (!IS_FAKE(user) && chan && (mode == 'y'))
                        return ACR_ALLOW;
                return 0;
        }
@@ -189,7 +187,7 @@ class ModuleOperPrefixMode : public Module
                        {
                                for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
                                {
-                                       ModePair ms=opm->ModeSet(NULL, NULL , v->first, user->nick);
+                                       ModePair ms = opm->ModeSet(NULL, NULL , v->first, user->nick);
                                        if (ms.first)
                                        {
                                                PushChanMode(v->first, user, true);