m_ssl_openssl is sending log messages and calling itself m_ssl_gnutls..

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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 4356dbcfd0056cd1fe1cd9caa4a20df30df046c8..265a0f7753e96a65c3161310e229f60b173bfd90 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -51,14 +51,14 @@ class SeeWhois : public ModeHandler
 
 class ModuleShowwhois : public Module
 {
-       
+
        SeeWhois* sw;
 
  public:
 
        ModuleShowwhois(InspIRCd* Me) : Module(Me)
        {
-               
+
                sw = new SeeWhois(ServerInstance);
                if (!ServerInstance->Modes->AddMode(sw))
                        throw ModuleException("Could not add new modes!");
@@ -75,7 +75,7 @@ class ModuleShowwhois : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
        virtual void OnWhois(User* source, User* dest)
@@ -84,17 +84,12 @@ class ModuleShowwhois : public Module
                {
                        if (IS_LOCAL(dest))
                        {
-                               dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
+                               dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.", dest->nick.c_str(), source->nick.c_str(), source->ident.c_str(), source->host.c_str());
                        }
                        else
                        {
-                               std::deque<std::string> params;
-                               params.push_back(dest->nick);
-                               std::string msg = ":";
-                               msg = msg + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
-                               params.push_back(msg);
-                               Event ev((char *) &params, NULL, "send_push");
-                               ev.Send(ServerInstance);
+                               std::string msg = std::string(":") + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host.c_str() + ") did a /whois on you.";
+                               ServerInstance->PI->PushToClient(dest, msg);
                        }
                }
        }