diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/commands/cmd_stats.cpp | 21 | ||||
| -rw-r--r-- | src/xline.cpp | 44 |
2 files changed, 24 insertions, 41 deletions
diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp index 73b68dabe..5d4417689 100644 --- a/src/commands/cmd_stats.cpp +++ b/src/commands/cmd_stats.cpp @@ -140,23 +140,18 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str break; case 'k': - ServerInstance->XLines->stats_k(user,results); - break; - case 'g': - ServerInstance->XLines->stats_g(user,results); - break; - case 'q': - ServerInstance->XLines->stats_q(user,results); - break; - case 'Z': - ServerInstance->XLines->stats_z(user,results); - break; - case 'e': - ServerInstance->XLines->stats_e(user,results); + /* FIXME: Make the 216 here different depending on stats char: + * k: 216 + * g: 223 + * q: 217 + * z: 223 + * e: 223 + */ + ServerInstance->XLines->InvokeStats(toupper(statschar),216,user,results); break; /* stats m (list number of times each command has been used, plus bytecount) */ diff --git a/src/xline.cpp b/src/xline.cpp index 37dc2c0e9..be5bf8588 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -409,40 +409,28 @@ void XLineManager::ApplyLines() pending_lines.clear(); } -void XLineManager::stats_k(User* user, string_list &results) -{ - /*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)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);*/ -} +/* k: 216 + * g: 223 + * q: 217 + * z: 223 + * e: 223 + */ -void XLineManager::stats_g(User* user, string_list &results) +void XLineManager::InvokeStats(const char type, int numeric, User* user, string_list &results) { - /*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)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);*/ -} + std::string sn = ServerInstance->Config->ServerName; -void XLineManager::stats_q(User* user, string_list &results) -{ - /*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);*/ -} + std::map<const char, std::map<std::string, XLine*> >::iterator n = lookup_lines.find(type); -void XLineManager::stats_z(User* user, string_list &results) -{ - /*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);*/ + if (n != lookup_lines.end()) + { + std::map<std::string, XLine*>& list = n->second; + for (std::map<std::string, XLine*>::iterator i = list.begin(); i != list.end(); i++) + results.push_back(sn+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+ + ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+std::string(i->second->source)+" :"+(i->second->reason)); + } } -void XLineManager::stats_e(User* user, string_list &results) -{ - /*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)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);*/ -} XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance), PermLines(0) { |