X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=3386e8cd7ca35a38e5c349b2a97ea59c8ae517ab;hb=8af4a2795befd73e1b3bf048560054d8fb7fc0f4;hp=6b100605e71cdefe76e44094b3243ecab9539daa;hpb=accccc212cd4f08a3c5532b1ae7a17e76bac8718;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 6b100605e..3386e8cd7 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */
-
 /** Handle /TITLE
  */
 class CommandTitle : public Command
@@ -50,7 +48,7 @@ class CommandTitle : public Command
 			std::string title = i->second->getString("title");
 			std::string vhost = i->second->getString("vhost");
 
-			if (Name == parameters[0] && !ServerInstance->PassCompare(user, pass, parameters[1], hash) &&
+			if (Name == parameters[0] && ServerInstance->PassCompare(user, pass, parameters[1], hash) &&
 				InspIRCd::MatchMask(host, userHost, userIP) && !title.empty())
 			{
 				ctitle.set(user, title);
@@ -58,7 +56,7 @@ class CommandTitle : public Command
 				ServerInstance->PI->SendMetaData(user, "ctitle", title);
 
 				if (!vhost.empty())
-					user->ChangeDisplayedHost(vhost.c_str());
+					user->ChangeDisplayedHost(vhost);
 
 				user->WriteNotice("Custom title set to '" + title + "'");
 
@@ -81,15 +79,8 @@ class ModuleCustomTitle : public Module
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(cmd);
-		ServerInstance->Modules->AddService(cmd.ctitle);
-		ServerInstance->Modules->Attach(I_OnWhoisLine, this);
-	}
-
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
 		if (numeric == 312)
@@ -98,14 +89,14 @@ class ModuleCustomTitle : public Module
 			const std::string* ctitle = cmd.ctitle.get(dest);
 			if (ctitle)
 			{
-				ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), ctitle->c_str());
+				ServerInstance->SendWhoisLine(user, dest, 320, "%s :%s", dest->nick.c_str(), ctitle->c_str());
 			}
 		}
 		/* Don't block anything */
 		return MOD_RES_PASSTHRU;
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR);
 	}