iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed an unnecessary admin check from the new traffic page.

Browse Source 
Sorry for not noticing this earlier :(


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1959 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
cflakes
2010-05-01 12:07:23 +00:00
parent af0dd16d1d
commit ca394439ec
1 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
modules/webadmin.cpp
View File

@@ -750,53 +750,51 @@ public:
CSmartPtr<CWebSession> spSession = WebSock.GetSession();
Tmpl["Uptime"] = CZNC::Get().GetUptime();
if (spSession->IsAdmin()) {
const map<CString,CUser*>& msUsers = CZNC::Get().GetUserMap();
Tmpl["TotalUsers"] = CString(msUsers.size());
const map<CString,CUser*>& msUsers = CZNC::Get().GetUserMap();
Tmpl["TotalUsers"] = CString(msUsers.size());
unsigned int uiAttached = 0, uiClients = 0, uiServers = 0;
unsigned int uiAttached = 0, uiClients = 0, uiServers = 0;
for (map<CString,CUser*>::const_iterator it = msUsers.begin(); it != msUsers.end(); ++it) {
CUser& User = *it->second;
if (User.IsUserAttached()) {
uiAttached++;
}
if (User.IsIRCConnected()) {
uiServers++;
}
uiClients += User.GetClients().size();
for (map<CString,CUser*>::const_iterator it = msUsers.begin(); it != msUsers.end(); ++it) {
CUser& User = *it->second;
if (User.IsUserAttached()) {
uiAttached++;
}
Tmpl["AttachedUsers"] = CString(uiAttached);
Tmpl["TotalCConnections"] = CString(uiClients);
Tmpl["TotalIRCConnections"] = CString(uiServers);
CZNC::TrafficStatsPair Users, ZNC, Total;
CZNC::TrafficStatsMap traffic = CZNC::Get().GetTrafficStats(Users, ZNC, Total);
CZNC::TrafficStatsMap::const_iterator it;
for (it = traffic.begin(); it != traffic.end(); ++it) {
CTemplate& l = Tmpl.AddRow("TrafficLoop");
l["Username"] = it->first;
l["In"] = CString::ToByteStr(it->second.first);
l["Out"] = CString::ToByteStr(it->second.second);
l["Total"] = CString::ToByteStr(it->second.first + it->second.second);
if (User.IsIRCConnected()) {
uiServers++;
}
Tmpl["UserIn"] = CString::ToByteStr(Users.first);
Tmpl["UserOut"] = CString::ToByteStr(Users.second);
Tmpl["UserTotal"] = CString::ToByteStr(Users.first + Users.second);
Tmpl["ZNCIn"] = CString::ToByteStr(ZNC.first);
Tmpl["ZNCOut"] = CString::ToByteStr(ZNC.second);
Tmpl["ZNCTotal"] = CString::ToByteStr(ZNC.first + ZNC.second);
Tmpl["AllIn"] = CString::ToByteStr(Total.first);
Tmpl["AllOut"] = CString::ToByteStr(Total.second);
Tmpl["AllTotal"] = CString::ToByteStr(Total.first + Total.second);
uiClients += User.GetClients().size();
}
Tmpl["AttachedUsers"] = CString(uiAttached);
Tmpl["TotalCConnections"] = CString(uiClients);
Tmpl["TotalIRCConnections"] = CString(uiServers);
CZNC::TrafficStatsPair Users, ZNC, Total;
CZNC::TrafficStatsMap traffic = CZNC::Get().GetTrafficStats(Users, ZNC, Total);
CZNC::TrafficStatsMap::const_iterator it;
for (it = traffic.begin(); it != traffic.end(); ++it) {
CTemplate& l = Tmpl.AddRow("TrafficLoop");
l["Username"] = it->first;
l["In"] = CString::ToByteStr(it->second.first);
l["Out"] = CString::ToByteStr(it->second.second);
l["Total"] = CString::ToByteStr(it->second.first + it->second.second);
}
Tmpl["UserIn"] = CString::ToByteStr(Users.first);
Tmpl["UserOut"] = CString::ToByteStr(Users.second);
Tmpl["UserTotal"] = CString::ToByteStr(Users.first + Users.second);
Tmpl["ZNCIn"] = CString::ToByteStr(ZNC.first);
Tmpl["ZNCOut"] = CString::ToByteStr(ZNC.second);
Tmpl["ZNCTotal"] = CString::ToByteStr(ZNC.first + ZNC.second);
Tmpl["AllIn"] = CString::ToByteStr(Total.first);
Tmpl["AllOut"] = CString::ToByteStr(Total.second);
Tmpl["AllTotal"] = CString::ToByteStr(Total.first + Total.second);
return true;
}