Allow multiple autoconnects in a single <autoconnect> tag, fix infinite failover

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

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index fc99cd29f24416302d1e5ffbe50f7a6b6f0a410f..9ff250cd6349583dc138f5f8a5e52d4653861baa 100644 (file)
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -21,7 +21,7 @@ class CommandTitle : public Command
 {
  public:
        StringExtItem ctitle;
-       CommandTitle (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"TITLE",0,2),
+       CommandTitle(Module* Creator) : Command(Creator,"TITLE", 2),
                ctitle("ctitle", Creator)
        {
                syntax = "<user> <password>";
@@ -50,7 +50,7 @@ class CommandTitle : public Command
                snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(), user->host.c_str());
                snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(), user->GetIPString());
 
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                for (int i=0; i<Conf.Enumerate("title"); i++)
                {
                        std::string name = Conf.ReadValue("title", "name", "", i);
@@ -86,7 +86,7 @@ class ModuleCustomTitle : public Module
        CommandTitle cmd;
 
  public:
-       ModuleCustomTitle(InspIRCd* Me) : Module(Me), cmd(Me, this)
+       ModuleCustomTitle() : cmd(this)
        {
                ServerInstance->AddCommand(&cmd);
                Extensible::Register(&cmd.ctitle);