Complain when duplicate tags are found using ConfValue

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

diff --git a/src/users.cpp b/src/users.cpp
index f69d34fea34bce9c47e76dfebf2afa96c7092ed4..d30526186a4b87c9f2a3c0f21f06b0c0464493ab 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -37,9 +37,9 @@ std::string User::ProcessNoticeMasks(const char *sm)
                                adding = false;
                        break;
                        case '*':
-                               for (unsigned char d = 'A'; d <= 'z'; d++)
+                               for (unsigned char d = 'a'; d <= 'z'; d++)
                                {
-                                       if (ServerInstance->SNO->IsEnabled(d))
+                                       if (!ServerInstance->SNO->masks[d - 'a'].Description.empty())
                                        {
                                                if ((!IsNoticeMaskSet(d) && adding) || (IsNoticeMaskSet(d) && !adding))
                                                {
@@ -50,12 +50,23 @@ std::string User::ProcessNoticeMasks(const char *sm)
 
                                                        output += d;
                                                }
+                                               oldadding = adding;
+                                               char u = toupper(d);
+                                               if ((!IsNoticeMaskSet(u) && adding) || (IsNoticeMaskSet(u) && !adding))
+                                               {
+                                                       if ((oldadding != adding) || (!output.length()))
+                                                               output += (adding ? '+' : '-');
+
+                                                       this->SetNoticeMask(u, adding);
+
+                                                       output += u;
+                                               }
+                                               oldadding = adding;
                                        }
-                                       oldadding = adding;
                                }
                        break;
                        default:
-                               if ((*c >= 'A') && (*c <= 'z') && (ServerInstance->SNO->IsEnabled(*c)))
+                               if (isalpha(*c))
                                {
                                        if ((!IsNoticeMaskSet(*c) && adding) || (IsNoticeMaskSet(*c) && !adding))
                                        {
@@ -716,6 +727,7 @@ void LocalUser::CheckClass()
        if (!a)
        {
                ServerInstance->Users->QuitUser(this, "Access denied by configuration");
+               return;
        }
        else if (a->type == CC_DENY)
        {