extern time_t TIME -> InspIRCd::Time()

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

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 191cecb0f909fc5684df267f8c6dbbf6b50a29a3..fd9f192ae4cdf462a9afa682ea9bb31ef76c533d 100644 (file)
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -18,62 +18,55 @@
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "message.h"
 #include "commands.h"
 #include "commands/cmd_topic.h"
 #include "helperfuncs.h"
 
-extern ServerConfig* Config;
-extern int MODCOUNT;
-extern time_t TIME;
-extern ModuleList modules;
-extern FactoryList factory;
-
-void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
 {
        chanrec* Ptr;
 
        if (pcnt == 1)
        {
-               Ptr = FindChan(parameters[0]);
+               Ptr = ServerInstance->FindChan(parameters[0]);
                if (Ptr)
                {
                        if ((Ptr->modes[CM_SECRET]) && (!Ptr->HasUser(user)))
                        {
-                               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, Ptr->name);
+                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, Ptr->name);
                                return;
                        }
                        if (Ptr->topicset)
                        {
-                               WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
-                               WriteServ(user->fd,"333 %s %s %s %d", user->nick, Ptr->name, Ptr->setby, Ptr->topicset);
+                               user->WriteServ("332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
+                               user->WriteServ("333 %s %s %s %d", user->nick, Ptr->name, Ptr->setby, Ptr->topicset);
                        }
                        else
                        {
-                               WriteServ(user->fd,"331 %s %s :No topic is set.", user->nick, Ptr->name);
+                               user->WriteServ("331 %s %s :No topic is set.", user->nick, Ptr->name);
                        }
                }
                else
                {
-                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                }
                return;
        }
        else if (pcnt>1)
        {
-               Ptr = FindChan(parameters[0]);
+               Ptr = ServerInstance->FindChan(parameters[0]);
                if (Ptr)
                {
                        if (IS_LOCAL(user))
                        {
                                if (!Ptr->HasUser(user))
                                {
-                                       WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
+                                       user->WriteServ("442 %s %s :You're not on that channel!",user->nick, Ptr->name);
                                        return;
                                }
-                               if ((Ptr->modes[CM_TOPICLOCK]) && (cstatus(user,Ptr)<STATUS_HOP))
+                               if ((Ptr->modes[CM_TOPICLOCK]) && (Ptr->GetStatus(user) < STATUS_HOP))
                                {
-                                       WriteServ(user->fd,"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 modes on this channel", user->nick, Ptr->name);
                                        return;
                                }
                        }
@@ -90,8 +83,8 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
 
                        strlcpy(Ptr->topic,topic,MAXTOPIC-1);
                        strlcpy(Ptr->setby,user->nick,NICKMAX-1);
-                       Ptr->topicset = TIME;
-                       WriteChannel(Ptr,user,"TOPIC %s :%s",Ptr->name, Ptr->topic);
+                       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));
@@ -99,7 +92,8 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
                }
                else
                {
-                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                }
        }
 }
+