X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=446ac2475b7339db724622670062ff0e2c253542;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=fc99cd29f24416302d1e5ffbe50f7a6b6f0a410f;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index fc99cd29f..446ac2475 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -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,17 +50,17 @@ 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);
+			std::string Name = Conf.ReadValue("title", "name", "", i);
 			std::string pass = Conf.ReadValue("title", "password", "", i);
 			std::string hash = Conf.ReadValue("title", "hash", "", i);
 			std::string host = Conf.ReadValue("title", "host", "*@*", i);
 			std::string title = Conf.ReadValue("title", "title", "", i);
 			std::string vhost = Conf.ReadValue("title", "vhost", "", i);
 
-			if (!strcmp(name.c_str(),parameters[0].c_str()) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
+			if (!strcmp(Name.c_str(),parameters[0].c_str()) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
 			{
 				ctitle.set(user, title);
 
@@ -86,10 +86,10 @@ 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);
+		ServerInstance->Extensions.Register(&cmd.ctitle);
 		ServerInstance->Modules->Attach(I_OnWhoisLine, this);
 	}
 
@@ -116,7 +116,7 @@ class ModuleCustomTitle : public Module
 
 	Version GetVersion()
 	{
-		return Version("Custom Title for users", VF_COMMON | VF_VENDOR);
+		return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR);
 	}
 };