X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=499886535d1b075a2eaf524d44dab7fa04905729;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=4cfbeb7151a30b3b7dce1533fb728bacb83b18fa;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 4cfbeb715..499886535 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -43,9 +43,6 @@ class CommandTitle : public Command
 
 	CmdResult Handle(const std::vector<std::string> &parameters, User* user)
 	{
-		if (!IS_LOCAL(user))
-			return CMD_LOCALONLY;
-
 		char TheHost[MAXBUF];
 		char TheIP[MAXBUF];
 
@@ -74,42 +71,32 @@ class CommandTitle : public Command
 				text = new std::string(title);
 				user->Extend("ctitle", text);
 
-				ServerInstance->PI->SendMetaData(user, TYPE_USER, "ctitle", *text);
+				ServerInstance->PI->SendMetaData(user, "ctitle", *text);
 
 				if (!vhost.empty())
 					user->ChangeDisplayedHost(vhost.c_str());
 
-				if (!ServerInstance->ULine(user->server))
-					// Ulines set TITLEs silently
-					ServerInstance->SNO->WriteToSnoMask('A', "%s used TITLE to set custom title '%s'",user->nick.c_str(),title.c_str());
-
 				user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick.c_str(), title.c_str());
 
-				return CMD_SUCCESS;
+				return CMD_LOCALONLY;
 			}
 		}
 
-		if (!ServerInstance->ULine(user->server))
-			// Ulines also fail TITLEs silently
-			ServerInstance->SNO->WriteToSnoMask('A', "Failed TITLE attempt by %s!%s@%s using login '%s'", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str());
-
 		user->WriteServ("NOTICE %s :Invalid title credentials",user->nick.c_str());
-		return CMD_SUCCESS;
+		return CMD_LOCALONLY;
 	}
 
 };
 
 class ModuleCustomTitle : public Module
 {
-	CommandTitle* mycommand;
+	CommandTitle cmd;
 
  public:
-	ModuleCustomTitle(InspIRCd* Me) : Module(Me)
+	ModuleCustomTitle(InspIRCd* Me) : Module(Me), cmd(Me)
 	{
-
-		mycommand = new CommandTitle(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-		Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup };
+		ServerInstance->AddCommand(&cmd);
+		Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUser, I_OnUserQuit, I_OnCleanup };
 		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
@@ -136,20 +123,12 @@ class ModuleCustomTitle : public Module
 	// this method is called. We should use the ProtoSendMetaData function after we've
 	// corrected decided how the data should look, to send the metadata on its way if
 	// it is ours.
-	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	virtual void OnSyncUser(User* user, Module* proto, void* opaque)
 	{
-		// check if the linking module wants to know about OUR metadata
-		if (extname == "ctitle")
-		{
-			// check if this user has an ctitle field to send
-			std::string* ctitle;
-			if (user->GetExt("ctitle", ctitle))
-			{
-				// call this function in the linking module, let it format the data how it
-				// sees fit, and send it on its way. We dont need or want to know how.
-				proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*ctitle);
-			}
-		}
+		// check if this user has an ctitle field to send
+		std::string* ctitle;
+		if (user->GetExt("ctitle", ctitle))
+			proto->ProtoSendMetaData(opaque,user,"ctitle",*ctitle);
 	}
 
 	// when a user quits, tidy up their metadata
@@ -185,18 +164,22 @@ class ModuleCustomTitle : public Module
 	// In our case we're only sending a single string around, so we just construct a std::string.
 	// Some modules will probably get much more complex and format more detailed structs and classes
 	// in a textual way for sending over the link.
-	virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
+	virtual void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata)
 	{
+		User* dest = dynamic_cast<User*>(target);
 		// check if its our metadata key, and its associated with a user
-		if ((target_type == TYPE_USER) && (extname == "ctitle"))
+		if (dest && (extname == "ctitle"))
 		{
-			User* dest = (User*)target;
-			// if they dont already have an ctitle field, accept the remote server's
 			std::string* text;
-			if (!dest->GetExt("ctitle", text))
+			if (dest->GetExt("ctitle", text))
+			{
+				dest->Shrink("ctitle");
+				delete text;
+			}
+			if (!extdata.empty())
 			{
-				std::string* ntext = new std::string(extdata);
-				dest->Extend("ctitle",ntext);
+				text = new std::string(extdata);
+				dest->Extend("ctitle", text);
 			}
 		}
 	}