diff options
Diffstat (limited to 'src/xline.cpp')
| -rw-r--r-- | src/xline.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/xline.cpp b/src/xline.cpp index 830f6d7c6..ae66b939d 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -39,12 +39,11 @@ using namespace std; #include "configreader.h" #include "cull_list.h" -extern ServerConfig *Config; +extern InspIRCd* ServerInstance; extern int MODCOUNT; extern std::vector<Module*> modules; extern std::vector<ircd_module*> factory; -extern ServerConfig* Config; extern user_hash clientlist; extern std::vector<userrec*> local_users; @@ -717,7 +716,7 @@ void apply_lines(const int What) void stats_k(userrec* user, string_list &results) { - std::string sn = Config->ServerName; + std::string sn = ServerInstance->Config->ServerName; for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++) results.push_back(sn+" 216 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++) @@ -726,7 +725,7 @@ void stats_k(userrec* user, string_list &results) void stats_g(userrec* user, string_list &results) { - std::string sn = Config->ServerName; + std::string sn = ServerInstance->Config->ServerName; for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++) results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++) @@ -735,7 +734,7 @@ void stats_g(userrec* user, string_list &results) void stats_q(userrec* user, string_list &results) { - std::string sn = Config->ServerName; + std::string sn = ServerInstance->Config->ServerName; for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++) results.push_back(sn+" 217 "+user->nick+" :"+i->nick+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++) @@ -744,7 +743,7 @@ void stats_q(userrec* user, string_list &results) void stats_z(userrec* user, string_list &results) { - std::string sn = Config->ServerName; + std::string sn = ServerInstance->Config->ServerName; for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++) results.push_back(sn+" 223 "+user->nick+" :"+i->ipaddr+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++) @@ -753,7 +752,7 @@ void stats_z(userrec* user, string_list &results) void stats_e(userrec* user, string_list &results) { - std::string sn = Config->ServerName; + std::string sn = ServerInstance->Config->ServerName; for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++) results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++) |