Forward port r9782: show IP (not unknown) for unauthed connections

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

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index a38deeb5f1a5a5f8cd0d8a0bbd3fd0dbda41ceae..79f9dff3c9dc99c45eeddc3104b0b947ea0c4e82 100644 (file)
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -27,7 +27,7 @@ class CommandTline : public Command
                this->syntax = "<mask>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                float n_counted = 0;
                float n_matched = 0;
@@ -44,8 +44,7 @@ class CommandTline : public Command
                        }
                        else
                        {
-                               char host[MAXBUF];
-                               snprintf(host, MAXBUF, "%s@%s", u->second->ident, u->second->GetIPString());
+                               std::string host = std::string(u->second->ident) + "@" + u->second->GetIPString();
                                if (match(host, parameters[0], true))
                                {
                                        n_matched++;
@@ -54,9 +53,9 @@ class CommandTline : public Command
                        }
                }
                if (n_matched)
-                       user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick, n_counted, parameters[0], n_matched, (n_matched/n_counted)*100, n_match_host, n_match_ip);
+                       user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick.c_str(), n_counted, parameters[0].c_str(), n_matched, (n_matched/n_counted)*100, n_match_host, n_match_ip);
                else
-                       user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick, n_counted, parameters[0]);
+                       user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick.c_str(), n_counted, parameters[0].c_str());
 
                return CMD_LOCALONLY;                   
        }
@@ -82,7 +81,7 @@ class ModuleTLine : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR,API_VERSION);
+               return Version(1, 2, 0, 0, VF_VENDOR,API_VERSION);
        }
 };