Remote server PRIVMSG/NOTICE to nickname support

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

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index e3d84e10f6eb24fad1dba8acfa000495ed75b6d6..5d0e77ffe4a73c9d2af696a802b10006ef334e98 100644 (file)
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -43,7 +43,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
     return false;
 }
 
-       CmdResult Handle(const char** parameters, int pcnt, User* user)
+       CmdResult Handle(const char* const* parameters, int pcnt, User* user)
        {
                if (!IS_LOCAL(user))
                        return CMD_LOCALONLY;
@@ -59,11 +59,12 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
                {
                        std::string name = Conf.ReadValue("title", "name", "", i);
                        std::string pass = Conf.ReadValue("title", "password", "", i);
+                       std::string hash = Conf.ReadValue("title", "hash", "", i);
                        std::string host = Conf.ReadValue("title", "host", "*@*", i);
                        std::string title = Conf.ReadValue("title", "title", "", i);
                        std::string vhost = Conf.ReadValue("title", "vhost", "", i);
 
-                       if (!strcmp(name.c_str(),parameters[0]) && !strcmp(pass.c_str(),parameters[1]) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
+                       if (!strcmp(name.c_str(),parameters[0]) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1], hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
                        {
                                std::string* text;
                                user->GetExt("ctitle", text);
@@ -77,13 +78,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
                                text = new std::string(title);
                                user->Extend("ctitle", text);
 
-                               std::deque<std::string>* metadata = new std::deque<std::string>;
-                               metadata->push_back(user->nick);
-                               metadata->push_back("ctitle");      // The metadata id
-                               metadata->push_back(*text);     // The value to send
-                               Event event((char*)metadata,(Module*)this,"send_metadata");
-                               event.Send(ServerInstance);
-                               delete metadata;
+                               ServerInstance->PI->SendMetaData(user, TYPE_USER, "ctitle", *text);
                                                                                        
                                if (!vhost.empty())
                                        user->ChangeDisplayedHost(vhost.c_str());
@@ -208,8 +203,8 @@ class ModuleCustomTitle : public Module
                        std::string* text;
                        if (!dest->GetExt("ctitle", text))
                        {
-                               std::string* text = new std::string(extdata);
-                               dest->Extend("ctitle",text);
+                               std::string* ntext = new std::string(extdata);
+                               dest->Extend("ctitle",ntext);
                        }
                }
        }
@@ -220,7 +215,7 @@ class ModuleCustomTitle : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };