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

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 1dbcc219e27eaf6f3f77446cd865d9990afc65c2..6f832e476321bb3080121c0f3b6d25ecbcfa6a32 100644 (file)
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */
 
@@ -20,7 +19,6 @@
  */
 class CommandTitle : public Command
 {
-       
  public:
        CommandTitle (InspIRCd* Instance) : Command(Instance,"TITLE",0,2)
        {
@@ -29,30 +27,30 @@ class CommandTitle : public Command
                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;
-}
+       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++)
@@ -67,9 +65,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
                        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;
@@ -79,15 +75,15 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
                                user->Extend("ctitle", text);
 
                                ServerInstance->PI->SendMetaData(user, TYPE_USER, "ctitle", *text);
-                                                                                       
+
                                if (!vhost.empty())
                                        user->ChangeDisplayedHost(vhost.c_str());
 
                                if (!ServerInstance->ULine(user->server))
                                        // Ulines set TITLEs silently
-                                       ServerInstance->SNO->WriteToSnoMask('A', "%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;
                        }
@@ -95,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->SNO->WriteToSnoMask('A', "Failed TITLE attempt by %s!%s@%s using login '%s'",user->nick,user->ident,user->host,parameters[0].c_str());
+                       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;
        }
 
@@ -106,11 +102,11 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 class ModuleCustomTitle : public Module
 {
        CommandTitle* mycommand;
-       
+
  public:
        ModuleCustomTitle(InspIRCd* Me) : Module(Me)
        {
-               
+
                mycommand = new CommandTitle(ServerInstance);
                ServerInstance->AddCommand(mycommand);
                Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup };
@@ -126,10 +122,9 @@ class ModuleCustomTitle : public Module
                {
                        /* 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,8 +143,7 @@ class ModuleCustomTitle : public Module
                {
                        // 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.
@@ -162,8 +156,7 @@ class ModuleCustomTitle : public Module
        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;
@@ -177,8 +170,7 @@ class ModuleCustomTitle : public Module
                {
                        User* user = (User*)item;
                        std::string* ctitle;
-                       user->GetExt("ctitle", ctitle);
-                       if (ctitle)
+                       if (user->GetExt("ctitle", ctitle))
                        {
                                user->Shrink("ctitle");
                                delete ctitle;
@@ -208,14 +200,14 @@ class ModuleCustomTitle : public Module
                        }
                }
        }
-       
+
        virtual ~ModuleCustomTitle()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };