Implement IRCv3 message tag support.

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

diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp
index fb7bae234c2c48c288104d7423f67f252b09fdbf..08d3533cd120dfe5cc2c920e67a408acf7f48b3a 100644 (file)
--- a/src/modules/m_passforward.cpp
+++ b/src/modules/m_passforward.cpp
@@ -17,34 +17,24 @@
  */
 
 
-/* $ModDesc: Forwards a password users can send on connect (for example for NickServ identification). */
-
 #include "inspircd.h"
 
 class ModulePassForward : public Module
 {
- private:
        std::string nickrequired, forwardmsg, forwardcmd;
 
  public:
-       ModulePassForward()
-       {
-               OnRehash(NULL);
-               Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Sends server password to NickServ", VF_VENDOR);
        }
 
-       void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               ConfigReader Conf;
-               nickrequired = Conf.ReadValue("passforward", "nick", "NickServ", 0);
-               forwardmsg = Conf.ReadValue("passforward", "forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired", 0);
-               forwardcmd = Conf.ReadValue("passforward", "cmd", "PRIVMSG $nickrequired :IDENTIFY $pass", 0);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("passforward");
+               nickrequired = tag->getString("nick", "NickServ");
+               forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired");
+               forwardcmd = tag->getString("cmd", "PRIVMSG $nickrequired :IDENTIFY $pass");
        }
 
        void FormatStr(std::string& result, const std::string& format, const LocalUser* user)
@@ -54,22 +44,22 @@ class ModulePassForward : public Module
                        char c = format[i];
                        if (c == '$')
                        {
-                               if (format.substr(i, 13) == "$nickrequired")
+                               if (!format.compare(i, 13, "$nickrequired", 13))
                                {
                                        result.append(nickrequired);
                                        i += 12;
                                }
-                               else if (format.substr(i, 5) == "$nick")
+                               else if (!format.compare(i, 5, "$nick", 5))
                                {
                                        result.append(user->nick);
                                        i += 4;
                                }
-                               else if (format.substr(i, 5) == "$user")
+                               else if (!format.compare(i, 5, "$user", 5))
                                {
                                        result.append(user->ident);
                                        i += 4;
                                }
-                               else if (format.substr(i,5) == "$pass")
+                               else if (!format.compare(i, 5, "$pass", 5))
                                {
                                        result.append(user->password);
                                        i += 4;
@@ -82,27 +72,31 @@ class ModulePassForward : public Module
                }
        }
 
-       virtual void OnPostConnect(User* ruser)
+       void OnPostConnect(User* ruser) CXX11_OVERRIDE
        {
                LocalUser* user = IS_LOCAL(ruser);
                if (!user || user->password.empty())
                        return;
 
+               // If the connect class requires a password, don't forward it
+               if (!user->MyClass->config->getString("password").empty())
+                       return;
+
                if (!nickrequired.empty())
                {
                        /* Check if nick exists and its server is ulined */
-                       User* u = ServerInstance->FindNick(nickrequired.c_str());
-                       if (!u || !ServerInstance->ULine(u->server))
+                       User* u = ServerInstance->FindNick(nickrequired);
+                       if (!u || !u->server->IsULine())
                                return;
                }
 
                std::string tmp;
-               FormatStr(tmp,forwardmsg, user);
-               user->WriteServ(tmp);
+               FormatStr(tmp, forwardmsg, user);
+               ServerInstance->Parser.ProcessBuffer(user, tmp);
 
                tmp.clear();
                FormatStr(tmp,forwardcmd, user);
-               ServerInstance->Parser->ProcessBuffer(tmp,user);
+               ServerInstance->Parser.ProcessBuffer(user, tmp);
        }
 };