fix some unitialised vectors and tidy up a bit.

[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 185055a5dd21f59793f23f91e3024179a96d4be9..1dbcc219e27eaf6f3f77446cd865d9990afc65c2 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* const* parameters, int pcnt, User* user)
+       CmdResult Handle(const std::vector<std::string> &parameters, User* user)
        {
                if (!IS_LOCAL(user))
                        return CMD_LOCALONLY;
@@ -64,7 +64,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
                        std::string title = Conf.ReadValue("title", "title", "", i);
                        std::string vhost = Conf.ReadValue("title", "vhost", "", i);
 
-                       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())
+                       if (!strcmp(name.c_str(),parameters[0].c_str()) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
                        {
                                std::string* text;
                                user->GetExt("ctitle", text);
@@ -78,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());
@@ -101,7 +95,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 
                if (!ServerInstance->ULine(user->server))
                        // Ulines also fail TITLEs silently
-                       ServerInstance->SNO->WriteToSnoMask('A', "Failed TITLE attempt by %s!%s@%s using login '%s'",user->nick,user->ident,user->host,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('A', "Failed TITLE attempt by %s!%s@%s using login '%s'",user->nick,user->ident,user->host,parameters[0].c_str());
 
                user->WriteServ("NOTICE %s :Invalid title credentials",user->nick);
                return CMD_SUCCESS;
@@ -221,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);
        }
 };