X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_customtitle.cpp;h=35992d505bd3ba0d5d283793d2077e70128f2622;hb=6e85701ecb09604f2c87010683638ec0446cc515;hp=85f0972377b42911979cf2b0e539ddd4314c0456;hpb=a1a7b96a8c994eb09a3d071f3daf28252b8c188b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 85f097237..35992d505 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -33,7 +33,7 @@ class CommandTitle : public Command
 		std::string xhost;
 		while (hl >> xhost)
 		{
-			if (InspIRCd::Match(host, xhost) || InspIRCd::MatchCIDR(ip,xhost))
+			if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
 			{
 				return true;
 			}
@@ -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];
 
@@ -79,36 +76,26 @@ class CommandTitle : public Command
 				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);
+		ServerInstance->AddCommand(&cmd);
 		Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup };
 		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
@@ -191,12 +178,16 @@ class ModuleCustomTitle : public Module
 		if ((target_type == TYPE_USER) && (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);
 			}
 		}
 	}
@@ -207,7 +198,7 @@ class ModuleCustomTitle : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };