Register a few extensions that weren't registered

[user/henk/code/inspircd.git] / src / modules / m_shun.cpp

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 399de24b86de4cd6b735457685dedc10a781139e..70115288919383cca126e7e5acea59502ad80d34 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -168,7 +168,7 @@ class CommandShun : public Command
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               return ROUTE_LOCALONLY;
+               return ROUTE_BROADCAST;
        }
 };
 
@@ -182,12 +182,16 @@ class ModuleShun : public Module
 
  public:
        ModuleShun() : cmd(this)
+       {
+       }
+
+       void init()
        {
                ServerInstance->XLines->RegisterFactory(&f);
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
 
                Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
@@ -214,8 +218,8 @@ class ModuleShun : public Module
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader MyConf;
-               std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("shun");
+               std::string cmds = tag->getString("enabledcommands");
                std::transform(cmds.begin(), cmds.end(), cmds.begin(), ::toupper);
 
                if (cmds.empty())
@@ -231,8 +235,8 @@ class ModuleShun : public Module
                        ShunEnabledCommands.insert(thiscmd);
                }
 
-               NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
-               affectopers = MyConf.ReadFlag("shun", "affectopers", "no", 0);
+               NotifyOfShun = tag->getBool("notifyuser", true);
+               affectopers = tag->getBool("affectopers", false);
        }
 
        virtual ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, LocalUser* user, bool validated, const std::string &original_line)