]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_customtitle.cpp
Change module versions to use a string instead of fixed digits, and use propset ID...
[user/henk/code/inspircd.git] / src / modules / m_customtitle.cpp
index 6e6de8da99a05dd20ad3a8d20d5fa7a5e5ff9e3c..6f832e476321bb3080121c0f3b6d25ecbcfa6a32 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */
 
 /** Handle /TITLE
  */
-class cmd_title : public command_t
+class CommandTitle : public Command
 {
-       
  public:
-       cmd_title (InspIRCd* Instance) : command_t(Instance,"TITLE",0,2)
+       CommandTitle (InspIRCd* Instance) : Command(Instance,"TITLE",0,2)
        {
                this->source = "m_customtitle.so";
                syntax = "<user> <password>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
-{
-    std::stringstream hl(hostlist);
-    std::string xhost;
-    while (hl >> xhost)
-    {
-        if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-       CmdResult Handle(const char** parameters, int pcnt, userrec* user)
+       bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
+       {
+               std::stringstream hl(hostlist);
+               std::string xhost;
+               while (hl >> xhost)
+               {
+                       if (InspIRCd::Match(host, xhost) || InspIRCd::MatchCIDR(ip,xhost))
+                       {
+                               return true;
+                       }
+               }
+               return false;
+       }
+
+       CmdResult Handle(const std::vector<std::string> &parameters, User* user)
        {
                if (!IS_LOCAL(user))
                        return CMD_LOCALONLY;
-       
+
                char TheHost[MAXBUF];
                char TheIP[MAXBUF];
 
-               snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
-               snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString());
+               snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(), user->host.c_str());
+               snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(), user->GetIPString());
 
                ConfigReader Conf(ServerInstance);
                for (int i=0; i<Conf.Enumerate("title"); i++)
                {
                        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].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);
-
-                               if (text)
+                               if (user->GetExt("ctitle", text))
                                {
                                        user->Shrink("ctitle");
-                                       DELETE(text);
+                                       delete text;
                                }
 
                                text = new std::string(title);
                                user->Extend("ctitle", text);
 
-//                             METADATA peavey ctitle :Official Chat Helper
+                               ServerInstance->PI->SendMetaData(user, TYPE_USER, "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;
-                                                                                       
                                if (!vhost.empty())
                                        user->ChangeDisplayedHost(vhost.c_str());
 
                                if (!ServerInstance->ULine(user->server))
                                        // Ulines set TITLEs silently
-                                       ServerInstance->WriteOpers("*** %s used TITLE to set custom title '%s'",user->nick,title.c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('A', "%s used TITLE to set custom title '%s'",user->nick.c_str(),title.c_str());
 
-                               user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick, title.c_str());
+                               user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick.c_str(), title.c_str());
 
                                return CMD_SUCCESS;
                        }
@@ -104,9 +91,9 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 
                if (!ServerInstance->ULine(user->server))
                        // Ulines also fail TITLEs silently
-                       ServerInstance->WriteOpers("*** 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.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str());
 
-               user->WriteServ("NOTICE %s :Invalid title credentials",user->nick);
+               user->WriteServ("NOTICE %s :Invalid title credentials",user->nick.c_str());
                return CMD_SUCCESS;
        }
 
@@ -114,33 +101,30 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 
 class ModuleCustomTitle : public Module
 {
-       cmd_title* mycommand;
-       
+       CommandTitle* mycommand;
+
  public:
        ModuleCustomTitle(InspIRCd* Me) : Module(Me)
        {
-               
-               mycommand = new cmd_title(ServerInstance);
+
+               mycommand = new CommandTitle(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+               Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnDecodeMetaData] = List[I_OnWhoisLine] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = 1;
-       }
 
        // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-       int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+       int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
        {
                /* We use this and not OnWhois because this triggers for remote, too */
                if (numeric == 312)
                {
                        /* Insert our numeric before 312 */
                        std::string* ctitle;
-                       dest->GetExt("ctitle", ctitle);
-                       if (ctitle)
+                       if (dest->GetExt("ctitle", ctitle))
                        {
-                               ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick,dest->nick,ctitle->c_str());
+                               ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), ctitle->c_str());
                        }
                }
                /* Dont block anything */
@@ -148,19 +132,18 @@ class ModuleCustomTitle : public Module
        }
 
        // Whenever the linking module wants to send out data, but doesnt know what the data
-       // represents (e.g. it is metadata, added to a userrec or chanrec by a module) then
+       // represents (e.g. it is metadata, added to a User or Channel by a module) then
        // this method is called. We should use the ProtoSendMetaData function after we've
        // corrected decided how the data should look, to send the metadata on its way if
        // it is ours.
-       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+       virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
        {
                // check if the linking module wants to know about OUR metadata
                if (extname == "ctitle")
                {
                        // check if this user has an ctitle field to send
                        std::string* ctitle;
-                       user->GetExt("ctitle", ctitle);
-                       if (ctitle)
+                       if (user->GetExt("ctitle", ctitle))
                        {
                                // call this function in the linking module, let it format the data how it
                                // sees fit, and send it on its way. We dont need or want to know how.
@@ -170,14 +153,13 @@ class ModuleCustomTitle : public Module
        }
 
        // when a user quits, tidy up their metadata
-       virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+       virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
        {
                std::string* ctitle;
-               user->GetExt("ctitle", ctitle);
-               if (ctitle)
+               if (user->GetExt("ctitle", ctitle))
                {
                        user->Shrink("ctitle");
-                       DELETE(ctitle);
+                       delete ctitle;
                }
        }
 
@@ -186,13 +168,12 @@ class ModuleCustomTitle : public Module
        {
                if (target_type == TYPE_USER)
                {
-                       userrec* user = (userrec*)item;
+                       User* user = (User*)item;
                        std::string* ctitle;
-                       user->GetExt("ctitle", ctitle);
-                       if (ctitle)
+                       if (user->GetExt("ctitle", ctitle))
                        {
                                user->Shrink("ctitle");
-                               DELETE(ctitle);
+                               delete ctitle;
                        }
                }
        }
@@ -209,24 +190,24 @@ class ModuleCustomTitle : public Module
                // check if its our metadata key, and its associated with a user
                if ((target_type == TYPE_USER) && (extname == "ctitle"))
                {
-                       userrec* dest = (userrec*)target;
+                       User* dest = (User*)target;
                        // if they dont already have an ctitle field, accept the remote server's
                        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);
                        }
                }
        }
-       
+
        virtual ~ModuleCustomTitle()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+               return Version("$Id", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };