X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_topic.cpp;h=b3034ba39c76441ff326a6bd38cef775dd9dd4aa;hb=4487dde76ffbdb21e7dc319b3b87d09c3cf60d8c;hp=770b95660313c2fd8d08c08a19be60063b7fa5a9;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 770b95660..b3034ba39 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -11,28 +11,25 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "commands/cmd_topic.h"
 
 
-
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_topic(Instance);
 }
 
-CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_topic::Handle (const char** parameters, int pcnt, User *user)
 {
-	chanrec* Ptr;
+	Channel* Ptr;
 
 	if (pcnt == 1)
 	{
 		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;
@@ -66,9 +63,9 @@ 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;
 				}
 			}
@@ -95,7 +92,11 @@ CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
 				strlcpy(Ptr->topic, parameters[1], 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);