Sucky stuff

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 629672b248e1b8343a1dba39f0b2f49206a376c2..e2c1317804658f5cbd35c8a826ff753b7c9b9c03 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -52,27 +52,19 @@ using namespace std;
 
 extern SocketEngine* SE;
 extern ServerConfig *Config;
+extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern std::vector<InspSocket*> module_sockets;
 
 extern time_t TIME;
-extern int WHOWAS_STALE;
-extern int WHOWAS_MAX;
-extern time_t startup_time;
-extern int boundPortCount;
-extern int portCount;
-extern int ports[MAXSOCKS];
-
 class Server;
 extern userrec* fd_ref_table[65536];
 
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 extern command_table cmdlist;
-extern address_cache IP;                                     
 ExtModeList EMode;
 
 // returns true if an extended mode character is in use
@@ -329,6 +321,11 @@ void Server::RehashServer()
        Config->Read(false,NULL);
 }
 
+ServerConfig* Server::GetConfig()
+{
+       return Config;
+}
+
 void Server::DelSocket(InspSocket* sock)
 {
        for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
@@ -531,22 +528,22 @@ bool Server::IsOnChannel(userrec* User, chanrec* Chan)
 
 std::string Server::GetServerName()
 {
-       return getservername();
+       return Config->ServerName;
 }
 
 std::string Server::GetNetworkName()
 {
-       return getnetworkname();
+       return Config->Network;
 }
 
 std::string Server::GetServerDescription()
 {
-       return getserverdesc();
+       return Config->ServerDesc;
 }
 
 Admin Server::GetAdmin()
 {
-       return Admin(getadminname(),getadminemail(),getadminnick());
+       return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick);
 }