* Fix inspsocket to not include uio.h on windows.

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 0424e7a09ff7482f73c2b2ab0a8f3fe8cb25a5c9..5df0281c96cfa37f657c1f140fe217efb1ccad61 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -181,7 +181,7 @@ bool XLineManager::AddLine(XLine* line, User* user)
                }
        }
 
-       /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
+       /*ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
        XLineFactory* xlf = GetFactory(line->type);
        if (!xlf)
                return false;
@@ -338,9 +338,10 @@ void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
 // applies lines, removing clients and changing nicks etc as applicable
 void XLineManager::ApplyLines()
 {
-       for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+       std::vector<User*>::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin();
+       while (u2 != ServerInstance->Users->local_users.rend())
        {
-               User* u = (User*)(*u2);
+               User* u = *u2++;
 
                // Don't ban people who are exempt.
                if (u->exempt)
@@ -388,13 +389,13 @@ void XLineManager::InvokeStats(const std::string &type, int numeric, User* user,
 }
 
 
-XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)
+XLineManager::XLineManager()
 {
-       GFact = new GLineFactory(Instance);
-       EFact = new ELineFactory(Instance);
-       KFact = new KLineFactory(Instance);
-       QFact = new QLineFactory(Instance);
-       ZFact = new ZLineFactory(Instance);
+       GFact = new GLineFactory;
+       EFact = new ELineFactory;
+       KFact = new KLineFactory;
+       QFact = new QLineFactory;
+       ZFact = new ZLineFactory;
 
        RegisterFactory(GFact);
        RegisterFactory(EFact);
@@ -442,9 +443,9 @@ bool XLine::IsBurstable()
 void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 {
        char sreason[MAXBUF];
-       snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
-       if (*ServerInstance->Config->MoronBanner)
-               u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner);
+       snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason.c_str());
+       if (!ServerInstance->Config->MoronBanner.empty())
+               u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner.c_str());
 
        if (ServerInstance->Config->HideBans)
                ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
@@ -481,7 +482,7 @@ bool KLine::Matches(User *u)
 
 void KLine::Apply(User* u)
 {
-       DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false);
+       DefaultApply(u, "K", (this->identmask ==  "*") ? true : false);
 }
 
 bool GLine::Matches(User *u)
@@ -503,7 +504,7 @@ bool GLine::Matches(User *u)
 
 void GLine::Apply(User* u)
 {
-       DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false);
+       DefaultApply(u, "G", (this->identmask == "*") ? true : false);
 }
 
 bool ELine::Matches(User *u)
@@ -599,27 +600,32 @@ void ELine::OnAdd()
 
 void ELine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",
+               identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 void QLine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",
+               nick.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 void ZLine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",
+               ipaddr.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 void KLine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",
+               identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 void GLine::DisplayExpiry()
 {
-       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,(long int)(ServerInstance->Time() - this->set_time));
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",
+               identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
 }
 
 const char* ELine::Displayable()
@@ -639,12 +645,12 @@ const char* GLine::Displayable()
 
 const char* ZLine::Displayable()
 {
-       return ipaddr;
+       return ipaddr.c_str();
 }
 
 const char* QLine::Displayable()
 {
-       return nick;
+       return nick.c_str();
 }
 
 bool KLine::IsBurstable()