Refactor port binding, warning not yet tested fully

[user/henk/code/inspircd.git] / src / cmd_topic.cpp

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 770b95660313c2fd8d08c08a19be60063b7fa5a9..dfd03a65183884f9db9a9a1ba8e846053a5cf7a2 100644 (file)
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -68,7 +68,7 @@ CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
                                }
                                if ((Ptr->modes[CM_TOPICLOCK]) && (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 +95,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);