summaryrefslogtreecommitdiff
path: root/src/commands.cpp
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-14 14:17:15 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-14 14:17:15 +0000
commitd37773215ac095af0cdd1de5299ce854be2d661e (patch)
treed6701e3c31c5816f8fc935ed2a81f5a63ad8e89a /src/commands.cpp
parent7bef53268e05fd6fdff652c37df885b95c946370 (diff)
Moved include stack stuff to be private to ServerConfig
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2410 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/commands.cpp')
-rw-r--r--src/commands.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/commands.cpp b/src/commands.cpp
index a9bc5895e..29eb0d7fe 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -73,11 +73,9 @@ extern int WHOWAS_STALE;
extern int WHOWAS_MAX;
extern time_t startup_time;
extern time_t TIME;
-extern std::vector<std::string> module_names;
extern int boundPortCount;
extern int portCount;
extern int ports[MAXSOCKS];
-extern ClassVector Classes;
const long duration_m = 60;
const long duration_h = duration_m * 60;
@@ -1276,7 +1274,7 @@ void handle_trace(char **parameters, int pcnt, userrec *user)
void handle_modules(char **parameters, int pcnt, userrec *user)
{
- for (unsigned int i = 0; i < module_names.size(); i++)
+ for (unsigned int i = 0; i < Config->module_names.size(); i++)
{
Version V = modules[i]->GetVersion();
char modulename[MAXBUF];
@@ -1292,7 +1290,7 @@ void handle_modules(char **parameters, int pcnt, userrec *user)
strlcat(flagstate,", service provider",MAXBUF);
if (!flagstate[0])
strcpy(flagstate," <no flags>");
- strlcpy(modulename,module_names[i].c_str(),256);
+ strlcpy(modulename,Config->module_names[i].c_str(),256);
if (strchr(user->modes,'o'))
{
WriteServ(user->fd,"900 %s :0x%08lx %d.%d.%d.%d %s (%s)",user->nick,modules[i],V.Major,V.Minor,V.Revision,V.Build,CleanFilename(modulename),flagstate+2);
@@ -1328,7 +1326,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
if (*parameters[0] == 'i')
{
int idx = 0;
- for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+ for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
{
WriteServ(user->fd,"215 %s I * * * %d %d %s *",user->nick,MAXCLIENTS,idx,Config->ServerName);
idx++;
@@ -1338,7 +1336,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
if (*parameters[0] == 'y')
{
int idx = 0;
- for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+ for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
{
WriteServ(user->fd,"218 %s Y %d %d 0 %d %d",user->nick,idx,120,i->flood,i->registration_timeout);
idx++;