Commit patch from danieldg that makes a ton of stuff const-safe for latest warn-happy...

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

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 196c435531d176459491cd567cbd0a4839734d84..25a860ae42bc8e62912630cabee9167d95d610c1 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -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
@@ -17,11 +17,11 @@
 
 /** Handle /SWHOIS
  */
-class cmd_swhois : public Command
+class CommandSwhois : public Command
 {
        
  public:
-       cmd_swhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
+       CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2)
        {
                this->source = "m_swhois.so";
                syntax = "<nick> <swhois>";
@@ -38,12 +38,6 @@ class cmd_swhois : public Command
                        return CMD_FAILURE;
                }
 
-               if (!*parameters[1])
-               {
-                       user->WriteServ("NOTICE %s :*** SWHOIS: Whois line must be specified", user->nick);
-                       return CMD_FAILURE;
-               }
-               
                std::string line;
                for (int i = 1; i < pcnt; i++)
                {
@@ -59,18 +53,17 @@ class cmd_swhois : public Command
                if (text)
                {
                        // We already had it set...
-                       
                        if (!ServerInstance->ULine(user->server))
                                // Ulines set SWHOISes silently
-                               ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
                        
                        dest->Shrink("swhois");
-                       DELETE(text);
+                       delete text;
                }
                else if (!ServerInstance->ULine(user->server))
                {
                        // Ulines set SWHOISes silently
-                       ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
+                       ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
                }
                
                text = new std::string(line);
@@ -89,6 +82,13 @@ class cmd_swhois : public Command
                Event event((char*)metadata,(Module*)this,"send_metadata");
                event.Send(ServerInstance);
                delete metadata;
+               
+               // If it's an empty swhois, unset it (not ideal, but ok)
+               if (text->empty())
+               {
+                       dest->Shrink("swhois");
+                       delete text;
+               }
 
                return CMD_LOCALONLY;
        }
@@ -97,7 +97,7 @@ class cmd_swhois : public Command
 
 class ModuleSWhois : public Module
 {
-       cmd_swhois* mycommand;
+       CommandSwhois* mycommand;
        
        ConfigReader* Conf;
        
@@ -106,20 +106,18 @@ class ModuleSWhois : public Module
        {
                
                Conf = new ConfigReader(ServerInstance);
-               mycommand = new cmd_swhois(ServerInstance);
+               mycommand = new CommandSwhois(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+               Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnRehash, I_OnPostCommand };
+               ServerInstance->Modules->Attach(eventlist, this, 7);
        }
 
        void OnRehash(User* user, const std::string &parameter)
        {
-               DELETE(Conf);
+               delete Conf;
                Conf = new ConfigReader(ServerInstance);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnDecodeMetaData] = List[I_OnWhoisLine] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnRehash] = List[I_OnPostCommand] = 1;
-       }
 
        // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
        int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
@@ -169,7 +167,7 @@ class ModuleSWhois : public Module
                if (swhois)
                {
                        user->Shrink("swhois");
-                       DELETE(swhois);
+                       delete swhois;
                }
        }
 
@@ -184,7 +182,7 @@ class ModuleSWhois : public Module
                        if (swhois)
                        {
                                user->Shrink("swhois");
-                               DELETE(swhois);
+                               delete swhois;
                        }
                }
        }
@@ -206,8 +204,8 @@ class ModuleSWhois : public Module
                        std::string* text;
                        if (!dest->GetExt("swhois", text))
                        {
-                               std::string* text = new std::string(extdata);
-                               dest->Extend("swhois",text);
+                               std::string* text2 = new std::string(extdata);
+                               dest->Extend("swhois",text2);
                        }
                }
        }
@@ -248,7 +246,7 @@ class ModuleSWhois : public Module
                if (user->GetExt("swhois", old))
                {
                        user->Shrink("swhois");
-                       DELETE(old);
+                       delete old;
                }
                
                if (!swhois.length())
@@ -267,7 +265,7 @@ class ModuleSWhois : public Module
 
        virtual ~ModuleSWhois()
        {
-               DELETE(Conf);
+               delete Conf;
        }
        
        virtual Version GetVersion()