Convert GenRandom to std::function.

[user/henk/code/inspircd.git] / src / modes / umode_s.cpp

diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index f5631c6950561e8317811f64549fac6a85b1dec8..ffad21662283dc08b19e8df893f6a8e19457d472 100644 (file)
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -20,9 +20,6 @@
 
 
 #include "inspircd.h"
-#include "mode.h"
-#include "channels.h"
-#include "users.h"
 #include "builtinmodes.h"
 
 ModeUserServerNoticeMask::ModeUserServerNoticeMask() : ModeHandler(NULL, "snomask", 's', PARAM_SETONLY, MODETYPE_USER)
@@ -32,15 +29,11 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask() : ModeHandler(NULL, "snomas
 
 ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding)
 {
-       /* Set the array fields */
        if (adding)
        {
-               /* Fix for bug #310 reported by Smartys */
-               if (!dest->IsModeSet(this))
-                       dest->snomasks.reset();
-
                dest->SetMode(this, true);
-               parameter = dest->ProcessNoticeMasks(parameter.c_str());
+               // Process the parameter (remove chars we don't understand, remove redundant chars, etc.)
+               parameter = ProcessNoticeMasks(dest, parameter);
                return MODEACTION_ALLOW;
        }
        else
@@ -48,23 +41,104 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Chan
                if (dest->IsModeSet(this))
                {
                        dest->SetMode(this, false);
+                       dest->snomasks.reset();
                        return MODEACTION_ALLOW;
                }
        }
 
-       /* Allow the change */
+       // Mode not set and trying to unset, deny
        return MODEACTION_DENY;
 }
 
-std::string ModeUserServerNoticeMask::GetUserParameter(User* user)
+std::string ModeUserServerNoticeMask::GetUserParameter(const User* user) const
 {
-       std::string masks = user->FormatNoticeMasks();
-       if (masks.length())
-               masks = "+" + masks;
-       return masks;
+       std::string ret;
+       if (!user->IsModeSet(this))
+               return ret;
+
+       ret.push_back('+');
+       for (unsigned char n = 0; n < 64; n++)
+       {
+               if (user->snomasks[n])
+                       ret.push_back(n + 'A');
+       }
+       return ret;
 }
 
 void ModeUserServerNoticeMask::OnParameterMissing(User* user, User* dest, Channel* channel)
 {
        user->WriteNotice("*** The user mode +s requires a parameter (server notice mask). Please provide a parameter, e.g. '+s +*'.");
 }
+
+std::string ModeUserServerNoticeMask::ProcessNoticeMasks(User* user, const std::string& input)
+{
+       bool adding = true;
+       std::bitset<64> curr = user->snomasks;
+
+       for (std::string::const_iterator i = input.begin(); i != input.end(); ++i)
+       {
+               switch (*i)
+               {
+                       case '+':
+                               adding = true;
+                       break;
+                       case '-':
+                               adding = false;
+                       break;
+                       case '*':
+                               for (size_t j = 0; j < 64; j++)
+                               {
+                                       if (ServerInstance->SNO->IsSnomaskUsable(j+'A'))
+                                               curr[j] = adding;
+                               }
+                       break;
+                       default:
+                               // For local users check whether the given snomask is valid and enabled - IsSnomaskUsable() tests both.
+                               // For remote users accept what we were told, unless the snomask char is not a letter.
+                               if (IS_LOCAL(user))
+                               {
+                                       if (!ServerInstance->SNO->IsSnomaskUsable(*i))
+                                       {
+                                               user->WriteNumeric(ERR_UNKNOWNSNOMASK, *i, "is unknown snomask char to me");
+                                               continue;
+                                       }
+                               }
+                               else if (!(((*i >= 'a') && (*i <= 'z')) || ((*i >= 'A') && (*i <= 'Z'))))
+                                       continue;
+
+                               size_t index = ((*i) - 'A');
+                               curr[index] = adding;
+                       break;
+               }
+       }
+
+       std::string plus = "+";
+       std::string minus = "-";
+
+       // Apply changes and construct two strings consisting of the newly added and the removed snomask chars
+       for (size_t i = 0; i < 64; i++)
+       {
+               bool isset = curr[i];
+               if (user->snomasks[i] != isset)
+               {
+                       user->snomasks[i] = isset;
+                       std::string& appendhere = (isset ? plus : minus);
+                       appendhere.push_back(i+'A');
+               }
+       }
+
+       // Create the final string that will be shown to the user and sent to servers
+       // Form: "+ABc-de"
+       std::string output;
+       if (plus.length() > 1)
+               output = plus;
+
+       if (minus.length() > 1)
+               output += minus;
+
+       // Unset the snomask usermode itself if every snomask was unset
+       if (user->snomasks.none())
+               user->SetMode(this, false);
+
+       return output;
+}