Migrate u_listmode.h into the core, change +b to use it

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index f440fca26539cf735d4f8b3df23acdd4cc63a443..804463309c398bc2f18c256ba30276d278b5392d 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -25,6 +25,7 @@
 #include "inspircd.h"
 #include <fstream>
 #include "xline.h"
+#include "listmode.h"
 #include "exitcodes.h"
 #include "configparser.h"
 #include <iostream>
@@ -568,16 +569,6 @@ void ServerConfig::Fill()
                ulines[assign(server)] = tag->getBool("silent");
        }
 
-       tags = ConfTags("banlist");
-       for(ConfigIter i = tags.first; i != tags.second; ++i)
-       {
-               ConfigTag* tag = i->second;
-               std::string chan;
-               if (!tag->readString("chan", chan))
-                       throw CoreException("<banlist> tag missing chan at " + tag->getTagLocation());
-               maxbans[chan] = tag->getInt("limit");
-       }
-
        ReadXLine(this, "badip", "ipmask", ServerInstance->XLines->GetFactory("Z"));
        ReadXLine(this, "badnick", "nick", ServerInstance->XLines->GetFactory("Q"));
        ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
@@ -936,7 +927,8 @@ void ConfigReaderThread::Finish()
                ServerInstance->XLines->CheckELines();
                ServerInstance->XLines->ApplyLines();
                ServerInstance->Res->Rehash();
-               ServerInstance->ResetMaxBans();
+               ModeReference ban(NULL, "ban");
+               static_cast<ListModeBase*>(*ban)->DoRehash();
                Config->ApplyDisabledCommands(Config->DisabledCommands);
                User* user = ServerInstance->FindNick(TheUserUID);
                FOREACH_MOD(I_OnRehash, OnRehash(user));