Replace mode letter parameter of OnRawMode() with a ModeHandler*, remove pcnt

[user/henk/code/inspircd.git] / src / modules / m_dnsbl.cpp

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index fa9e73bd4b03828921b942b0532a9e93c008caae..63dda547fbadba3447925d09b3f7551f2bb9cdf2 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -136,13 +136,16 @@ class DNSBLResolver : public DNS::Request
                                                        "*", them->GetIPString());
                                        if (ServerInstance->XLines->AddLine(kl,NULL))
                                        {
-                                               std::string timestr = ServerInstance->TimeString(kl->expiry);
+                                               std::string timestr = InspIRCd::TimeString(kl->expiry);
                                                ServerInstance->SNO->WriteGlobalSno('x',"K:line added due to DNSBL match on *@%s to expire on %s: %s",
                                                        them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
                                                ServerInstance->XLines->ApplyLines();
                                        }
                                        else
+                                       {
                                                delete kl;
+                                               return;
+                                       }
                                        break;
                                }
                                case DNSBLConfEntry::I_GLINE:
@@ -151,13 +154,16 @@ class DNSBLResolver : public DNS::Request
                                                        "*", them->GetIPString());
                                        if (ServerInstance->XLines->AddLine(gl,NULL))
                                        {
-                                               std::string timestr = ServerInstance->TimeString(gl->expiry);
+                                               std::string timestr = InspIRCd::TimeString(gl->expiry);
                                                ServerInstance->SNO->WriteGlobalSno('x',"G:line added due to DNSBL match on *@%s to expire on %s: %s",
                                                        them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
                                                ServerInstance->XLines->ApplyLines();
                                        }
                                        else
+                                       {
                                                delete gl;
+                                               return;
+                                       }
                                        break;
                                }
                                case DNSBLConfEntry::I_ZLINE:
@@ -166,13 +172,16 @@ class DNSBLResolver : public DNS::Request
                                                        them->GetIPString());
                                        if (ServerInstance->XLines->AddLine(zl,NULL))
                                        {
-                                               std::string timestr = ServerInstance->TimeString(zl->expiry);
+                                               std::string timestr = InspIRCd::TimeString(zl->expiry);
                                                ServerInstance->SNO->WriteGlobalSno('x',"Z:line added due to DNSBL match on *@%s to expire on %s: %s",
                                                        them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
                                                ServerInstance->XLines->ApplyLines();
                                        }
                                        else
+                                       {
                                                delete zl;
+                                               return;
+                                       }
                                        break;
                                }
                                case DNSBLConfEntry::I_UNKNOWN:
@@ -346,7 +355,7 @@ class ModuleDNSBL : public Module
                        catch (DNS::Exception &ex)
                        {
                                delete r;
-                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, std::string(ex.GetReason()));
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, ex.GetReason());
                        }
 
                        if (user->quitting)
@@ -385,12 +394,12 @@ class ModuleDNSBL : public Module
                        total_hits += (*i)->stats_hits;
                        total_misses += (*i)->stats_misses;
 
-                       results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
+                       results.push_back("304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
                                        ConvToStr((*i)->stats_hits) + " hits and " + ConvToStr((*i)->stats_misses) + " misses");
                }
 
-               results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
-               results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
+               results.push_back("304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
+               results.push_back("304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
 
                return MOD_RES_PASSTHRU;
        }