Add a metric assload of TRANSLATE macros to modules.

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index 8b91f7af52de55ec4bcc2d66bd182d4f20572835..7321d11c425a9cb86a539a33d72e2695f081a358 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -12,10 +12,7 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 #include "inspstring.h"
-#include "mode.h"
 
 /* +s (secret) */
 #include "modes/cmode_s.h"
@@ -79,6 +76,7 @@ unsigned int ModeHandler::GetCount()
 void ModeHandler::ChangeCount(int modifier)
 {
        count += modifier;
+       ServerInstance->Log(DEBUG,"Change count for mode %c is now %d", mode, count);
 }
 
 ModeType ModeHandler::GetModeType()
@@ -127,6 +125,10 @@ void ModeHandler::DisplayList(userrec* user, chanrec* channel)
 {
 }
 
+void ModeHandler::DisplayEmptyList(userrec* user, chanrec* channel)
+{
+}
+
 bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
 {
        return (ours < theirs);
@@ -280,7 +282,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
        chanrec* targetchannel = ServerInstance->FindChan(parameters[0]);
        userrec* targetuser  = ServerInstance->FindNick(parameters[0]);
 
-       LastParse = "";
+       LastParse.clear();
 
        /* Special case for displaying the list for listmodes,
         * e.g. MODE #chan b, or MODE #chan +b without a parameter
@@ -326,6 +328,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
                                {
                                        user->WriteServ("482 %s %s :Only half-operators and above may view the +%c list",user->nick, targetchannel->name, *mode++);
+                                       mh->DisplayEmptyList(user, targetchannel);
                                        continue;
                                }
 
@@ -411,9 +414,9 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                }
 
                std::string mode_sequence = parameters[1];
-               std::string parameter = "";
+               std::string parameter;
                std::ostringstream parameter_list;
-               std::string output_sequence = "";
+               std::string output_sequence;
                bool adding = true, state_change = false;
                unsigned char handler_id = 0;
                int parameter_counter = 2; /* Index of first parameter */
@@ -484,7 +487,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 
                                                                        /* Yerk, invalid! */
                                                                        if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
-                                                                               parameter = "";
+                                                                               parameter.clear();
                                                                }
                                                                else
                                                                {
@@ -496,7 +499,6 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                                                
                                                                for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
                                                                {
-                                                                       ServerInstance->Log(DEBUG,"Call mode watcher");
                                                                        if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == false)
                                                                        {
                                                                                abort = true;
@@ -543,7 +545,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                                        /* Call the handler for the mode */
                                                        ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
 
-                                                       if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter == ""))
+                                                       if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter.empty()))
                                                        {
                                                                /* The handler nuked the parameter and they are supposed to have one.
                                                                 * We CANT continue now, even if they actually returned MODEACTION_ALLOW,
@@ -565,8 +567,10 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                                                /* Add the mode letter */
                                                                output_sequence.push_back(modechar);
 
+                                                               modehandlers[handler_id]->ChangeCount(adding ? 1 : -1);
+
                                                                /* Is there a valid parameter for this mode? If so add it to the parameter list */
-                                                               if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter != ""))
+                                                               if ((modehandlers[handler_id]->GetNumParams(adding)) && (!parameter.empty()))
                                                                {
                                                                        parameter_list << " " << parameter;
                                                                        parameter_count++;
@@ -605,8 +609,9 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                break;
                        }
                }
+
                /* Was there at least one valid mode in the sequence? */
-               if (output_sequence != "")
+               if (!output_sequence.empty())
                {
                        if (servermode)
                        {
@@ -691,7 +696,7 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
         * If they do that, thats their problem, and if i ever EVER see an
         * official InspIRCd developer do that, i'll beat them with a paddle!
         */
-       if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z'))
+       if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z') || (mh->GetPrefix() > 126))
                return false;
 
        /* A mode prefix of ',' is not acceptable, it would fuck up server to server.
@@ -783,6 +788,9 @@ std::string ModeParser::ChannelModeList()
 
        for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
+               if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
+                       continue;
+
                unsigned char pos = (mode-65) | MASK_CHANNEL;
 
                if (modehandlers[pos])
@@ -799,6 +807,9 @@ std::string ModeParser::ParaModeList()
 
        for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
+               if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
+                       continue;
+
                unsigned char pos = (mode-65) | MASK_CHANNEL;
 
                if ((modehandlers[pos]) && (modehandlers[pos]->GetNumParams(true)))
@@ -859,6 +870,9 @@ std::string ModeParser::ChanModes()
 
        for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
+               if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
+                       continue;
+
                unsigned char pos = (mode-65) | MASK_CHANNEL;
                 /* One parameter when adding */
                if (modehandlers[pos])
@@ -905,13 +919,16 @@ bool ModeParser::PrefixComparison(prefixtype one, prefixtype two)
 
 std::string ModeParser::BuildPrefixes()
 {
-       std::string mletters = "";
-       std::string mprefixes = "";
+       std::string mletters;
+       std::string mprefixes;
        pfxcontainer pfx;
        std::map<char,char> prefix_to_mode;
 
        for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
+               if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
+                       continue;
+
                unsigned char pos = (mode-65) | MASK_CHANNEL;
 
                if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix()))
@@ -1046,7 +1063,7 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
        memset(modewatchers, 0, sizeof(modewatchers));
 
        /* Last parse string */
-       LastParse = "";
+       LastParse.clear();
 
        /* Initialise the RFC mode letters */
        for (int index = 0; modes[index].modechar; index++)