Move all_opers into class InspIRCd

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 78beb571522706ce39eb01e3df943ddcb4f1ab57..9321047a871797906d0c201aa3370c4247e8ce9e 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -31,7 +31,6 @@
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
 #include "mode.h"
 #include "xline.h"
 #include "commands.h"
@@ -47,16 +46,11 @@
 #include "inspircd.h"
 
 extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
 extern time_t TIME;
 extern command_table cmdlist;
 
 class Server;
 
-featurelist Features;
-
 // version is a simple class for holding a modules version number
 
 Version::Version(int major, int minor, int revision, int build, int flags)
@@ -299,9 +293,9 @@ Module* InspIRCd::FindFeature(const std::string &FeatureName)
 const std::string& InspIRCd::GetModuleName(Module* m)
 {
        static std::string nothing = ""; /* Prevent compiler warning */
-       for (int i = 0; i <= MODCOUNT; i++)
+       for (int i = 0; i <= this->GetModuleCount(); i++)
        {
-               if (modules[i] == m)
+               if (this->modules[i] == m)
                {
                        return this->Config->module_names[i];
                }
@@ -327,11 +321,6 @@ void Server::DelSocket(InspSocket* sock)
        }
 }
 
-long Server::GetChannelCount()
-{
-       return (long)ServerInstance->chanlist.size();
-}
-
 /* This is ugly, yes, but hash_map's arent designed to be
  * addressed in this manner, and this is a bit of a kludge.
  * Luckily its a specialist function and rarely used by
@@ -400,11 +389,6 @@ void Server::DumpText(userrec* User, const std::string &LinePrefix, stringstream
        User->WriteServ(CompleteLine);
 }
 
-bool Server::IsNick(const std::string &nick)
-{
-       return (isnick(nick.c_str()) != 0);
-}
-
 userrec* Server::FindDescriptor(int socket)
 {
        return (socket < 65536 ? ServerInstance->fd_ref_table[socket] : NULL);
@@ -584,13 +568,13 @@ bool Server::IsValidMask(const std::string &mask)
        return true;
 }
 
-Module* Server::FindModule(const std::string &name)
+Module* InspIRCd::FindModule(const std::string &name)
 {
-       for (int i = 0; i <= MODCOUNT; i++)
+       for (int i = 0; i <= this->GetModuleCount(); i++)
        {
-               if (ServerInstance->Config->module_names[i] == name)
+               if (this->Config->module_names[i] == name)
                {
-                       return modules[i];
+                       return this->modules[i];
                }
        }
        return NULL;
@@ -691,7 +675,7 @@ void ConfigReader::DumpErrors(bool bail, userrec* user)
        if (bail)
        {
                printf("There were errors in your configuration:\n%s", this->errorlog->str().c_str());
-               Exit(0);
+               InspIRCd::Exit(ERROR);
        }
        else
        {
@@ -812,7 +796,3 @@ int FileReader::FileSize()
 }
 
 
-std::vector<Module*> modules(255);
-std::vector<ircd_module*> factory(255);
-
-int MODCOUNT  = -1;