m_spanningtree Remove unneeded #includes

[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 bf09c1f6e4a228dda9b0c6c2f1a1ad50008d6385..5b1eeab9bbc75df0153431be5395a9e0d500b7fa 100644 (file)
--- a/src/modules/m_passforward.cpp
+++ b/src/modules/m_passforward.cpp
@@ -23,15 +23,14 @@
 
 class ModulePassForward : public Module
 {
- private:
        std::string nickrequired, forwardmsg, forwardcmd;
 
  public:
-       ModulePassForward()
+       void init()
        {
                OnRehash(NULL);
                Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        Version GetVersion()
@@ -41,13 +40,13 @@ class ModulePassForward : public Module
 
        void OnRehash(User* user)
        {
-               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 std::string &nick, const std::string &pass)
+       void FormatStr(std::string& result, const std::string& format, const LocalUser* user)
        {
                for (unsigned int i = 0; i < format.length(); i++)
                {
@@ -61,12 +60,17 @@ class ModulePassForward : public Module
                                }
                                else if (format.substr(i, 5) == "$nick")
                                {
-                                       result.append(nick);
+                                       result.append(user->nick);
+                                       i += 4;
+                               }
+                               else if (format.substr(i, 5) == "$user")
+                               {
+                                       result.append(user->ident);
                                        i += 4;
                                }
                                else if (format.substr(i,5) == "$pass")
                                {
-                                       result.append(pass);
+                                       result.append(user->password);
                                        i += 4;
                                }
                                else
@@ -92,11 +96,11 @@ class ModulePassForward : public Module
                }
 
                std::string tmp;
-               FormatStr(tmp,forwardmsg, user->nick, user->password);
+               FormatStr(tmp,forwardmsg, user);
                user->WriteServ(tmp);
 
                tmp.clear();
-               FormatStr(tmp,forwardcmd, user->nick, user->password);
+               FormatStr(tmp,forwardcmd, user);
                ServerInstance->Parser->ProcessBuffer(tmp,user);
        }
 };