Implement feature in bug #395 reported by stealth, and tidy up a bit

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

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 770b95660313c2fd8d08c08a19be60063b7fa5a9..33005cab28e76a68ba86e5f8920aa0d8cea3be63 100644 (file)
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -11,14 +11,14 @@
  * ---------------------------------------------------
  */
 
+#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);
 }
@@ -32,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;
@@ -66,9 +66,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 +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);