Move InspIRCd::IsValidMask() to helperfuncs.cpp

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

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 06036fe010cf0d298356f90c7d8809e65007555e..e12fd64f9ef6becf26db735955246c7279e05cac 100644 (file)
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -11,28 +11,25 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "commands/cmd_topic.h"
 #include "inspircd.h"
+#include "commands/cmd_topic.h"
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-       return new cmd_topic(Instance);
+       return new CommandTopic(Instance);
 }
 
-CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult CommandTopic::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,7 +63,7 @@ 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 the topic on this channel", user->nick, Ptr->name);
                                        return CMD_FAILURE;