Remove an extern, partly because it's unused, partly because it then gets shadowed...

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

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index cb852dabc51846f638430ac4c60a90c1744f6cc7..b9051ea6fcf753298d66167b0d25488ab6783e2c 100644 (file)
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
+ *                       E-mail:
  *                <brain@chatspike.net>
  *                <Craig@chatspike.net>
  *
@@ -14,53 +14,19 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
 #include "cmd_topic.h"
 
 extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
 extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+extern ModuleList modules;
+extern FactoryList factory;
 
 void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -71,7 +37,7 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
                Ptr = FindChan(parameters[0]);
                if (Ptr)
                {
-                       if (((Ptr) && (!has_channel(user,Ptr))) && (Ptr->binarymodes & CM_SECRET))
+                       if ((Ptr->modes[CM_SECRET]) && (!Ptr->HasUser(user)))
                        {
                                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, Ptr->name);
                                return;
@@ -99,12 +65,12 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
                {
                        if (IS_LOCAL(user))
                        {
-                               if ((Ptr) && (!has_channel(user,Ptr)))
+                               if (!Ptr->HasUser(user))
                                {
                                        WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
                                        return;
                                }
-                               if ((Ptr->binarymodes & CM_TOPICLOCK) && (cstatus(user,Ptr)<STATUS_HOP))
+                               if ((Ptr->modes[CM_TOPICLOCK]) && (cstatus(user,Ptr)<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);
                                        return;
@@ -113,13 +79,13 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
                        char topic[MAXTOPIC];
                        strlcpy(topic,parameters[1],MAXTOPIC-1);
 
-                        if (IS_LOCAL(user))
-                        {
-                                int MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(user,Ptr,topic));
-                                if (MOD_RESULT)
-                                        return;
-                        }
+                       if (IS_LOCAL(user))
+                       {
+                               int MOD_RESULT = 0;
+                               FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(user,Ptr,topic));
+                               if (MOD_RESULT)
+                                       return;
+                       }
 
                        strlcpy(Ptr->topic,topic,MAXTOPIC-1);
                        strlcpy(Ptr->setby,user->nick,NICKMAX-1);
@@ -136,5 +102,3 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
                }
        }
 }
-
-