X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_topic.cpp;h=33005cab28e76a68ba86e5f8920aa0d8cea3be63;hb=107595610061e05871094ef6161a287c1dd53737;hp=6d2f6cf9e38b303408de09f0b1b7488310c23355;hpb=4cf0ae1308fe98757de42ffbe391e61844ac9e0a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 6d2f6cf9e..33005cab2 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -2,26 +2,23 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *	     	          E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
 #include "commands/cmd_topic.h"
 
 
-
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
 	return new cmd_topic(Instance);
 }
@@ -35,7 +32,7 @@ CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
 		Ptr = ServerInstance->FindChan(parameters[0]);
 		if (Ptr)
 		{
-			if ((Ptr->modes[CM_SECRET]) && (!Ptr->HasUser(user)))
+			if ((Ptr->IsModeSet('s')) && (!Ptr->HasUser(user)))
 			{
 				user->WriteServ("401 %s %s :No such nick/channel",user->nick, Ptr->name);
 				return CMD_FAILURE;
@@ -69,31 +66,46 @@ CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
 					user->WriteServ("442 %s %s :You're not on that channel!",user->nick, Ptr->name);
 					return CMD_FAILURE;
 				}
-				if ((Ptr->modes[CM_TOPICLOCK]) && (Ptr->GetStatus(user) < STATUS_HOP))
+				if ((Ptr->IsModeSet('t')) && (Ptr->GetStatus(user) < STATUS_HOP))
 				{
-					user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel", user->nick, Ptr->name);
+					user->WriteServ("482 %s %s :You must be at least a half-operator to change the topic on this channel", user->nick, Ptr->name);
 					return CMD_FAILURE;
 				}
 			}
+
 			char topic[MAXTOPIC];
-			strlcpy(topic,parameters[1],MAXTOPIC-1);
 
 			if (IS_LOCAL(user))
 			{
+				/* XXX: we need two string copies for a local topic, because we cant
+				 * let a module see the topic as longer than it actually is
+				 */
 				int MOD_RESULT = 0;
+
+				strlcpy(topic,parameters[1],MAXTOPIC-1);
 				FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(user,Ptr,topic));
 				if (MOD_RESULT)
 					return CMD_FAILURE;
+
+				strlcpy(Ptr->topic,topic,MAXTOPIC-1);
+			}
+			else
+			{
+				/* Sneaky shortcut, one string copy for a remote topic */
+				strlcpy(Ptr->topic, parameters[1], MAXTOPIC-1);
 			}
 
-			strlcpy(Ptr->topic,topic,MAXTOPIC-1);
-			strlcpy(Ptr->setby,user->nick,NICKMAX-1);
+			if (ServerInstance->Config->FullHostInTopic)
+				strlcpy(Ptr->setby,user->GetFullHost(),127);
+			else
+				strlcpy(Ptr->setby,user->nick,127);
+
 			Ptr->topicset = ServerInstance->Time();
 			Ptr->WriteChannel(user, "TOPIC %s :%s", Ptr->name, Ptr->topic);
+
 			if (IS_LOCAL(user))
-			{
-				FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(user,Ptr,topic));
-			}
+				/* We know 'topic' will contain valid data here */
+				FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(user, Ptr, topic));
 		}
 		else
 		{