Change to use std::string::iterator rather than making a copy of the pointer and...

[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 7ba046983e45b8807085cd848ec134409fbb72b1..c868060984175f8afa8f0c15a65e1c44ed051f18 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -17,24 +14,25 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */
 
+/** Handle /SWHOIS
+ */
 class cmd_swhois : public command_t
 {
-       Server* Srv;
+       
  public:
-       cmd_swhois(Server* server) : command_t("SWHOIS",'o',2)
+       cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
        {
-               this->Srv = server;
                this->source = "m_swhois.so";
                syntax = "<nick> <swhois>";
        }
 
-       void Handle(const char** parameters, int pcnt, userrec* user)
+       CmdResult Handle(const char** parameters, int pcnt, userrec* user)
        {
-               userrec* dest = Srv->FindNick(std::string(parameters[0]));
+               userrec* dest = ServerInstance->FindNick(parameters[0]);
                if(dest)
                {
                        std::string line;
@@ -53,49 +51,53 @@ class cmd_swhois : public command_t
                        {
                                // We already had it set...
                                
-                               if (!Srv->IsUlined(user->server))
+                               if (!ServerInstance->ULine(user->server))
                                        // Ulines set SWHOISes silently
-                                       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->WriteOpers("*** %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);
                        }
-                       else if(!Srv->IsUlined(user->server))
+                       else if(!ServerInstance->ULine(user->server))
                        {
                                // Ulines set SWHOISes silently
-                               WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
+                               ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
                        }
                        
                        text = new std::string(line);
                        dest->Extend("swhois", text);
+
+                       return CMD_SUCCESS;
                }
+
+               return CMD_FAILURE;
        }
 };
 
 class ModuleSWhois : public Module
 {
        cmd_swhois* mycommand;
-       Server* Srv;
+       
        ConfigReader* Conf;
        
  public:
-       ModuleSWhois(Server* Me) : Module::Module(Me)
+       ModuleSWhois(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               Conf = new ConfigReader();
-               mycommand = new cmd_swhois(Srv);
-               Srv->AddCommand(mycommand);
+               
+               Conf = new ConfigReader(ServerInstance);
+               mycommand = new cmd_swhois(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
 
        void OnRehash(const std::string &parameter)
        {
                DELETE(Conf);
-               Conf = new ConfigReader();
+               Conf = new ConfigReader(ServerInstance);
        }
 
        void Implements(char* List)
        {
-               List[I_OnWhois] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnRehash] = List[I_OnOper] = 1;
+               List[I_OnWhois] = 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.
@@ -105,7 +107,7 @@ class ModuleSWhois : public Module
                dest->GetExt("swhois", swhois);
                if (swhois)
                {
-                       WriteServ(source->fd,"320 %s %s :%s",source->nick,dest->nick,swhois->c_str());
+                       ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :%s",source->nick,dest->nick,swhois->c_str());
                }
        }
 
@@ -182,32 +184,50 @@ class ModuleSWhois : public Module
                }
        }
        
-       virtual void OnOper(userrec* user, const std::string &opertype)
+       virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
        {
-               for(int i =0; i < Conf->Enumerate("type"); i++)
+               if ((command != "OPER") || (result != CMD_SUCCESS))
+                       return;
+               
+               std::string swhois;
+               
+               for (int i = 0; i < Conf->Enumerate("oper"); i++)
                {
-                       std::string type = Conf->ReadValue("type", "name", i);
+                       std::string name = Conf->ReadValue("oper", "name", i);
                        
-                       if(strcmp(type.c_str(), user->oper) == 0)
+                       if (name == params[0])
                        {
-                               std::string swhois = Conf->ReadValue("type", "swhois", i);
+                               swhois = Conf->ReadValue("oper", "swhois", i);
+                               break;
+                       }
+               }
+               
+               if (!swhois.length())
+               {
+                       for (int i = 0; i < Conf->Enumerate("type"); i++)
+                       {
+                               std::string type = Conf->ReadValue("type", "name", i);
                                
-                               if(swhois.length())
+                               if (type == user->oper)
                                {
-                                       std::string* old;
-                                       if(user->GetExt("swhois", old))
-                                       {
-                                               user->Shrink("swhois");
-                                               DELETE(old);
-                                       }
-                       
-                                       std::string* text = new std::string(swhois);
-                                       user->Extend("swhois", text);
-                                       
+                                       swhois = Conf->ReadValue("type", "swhois", i);
                                        break;
                                }
                        }
-               }               
+               }
+
+               std::string *old;
+               if (user->GetExt("swhois", old))
+               {
+                       user->Shrink("swhois");
+                       DELETE(old);
+               }
+               
+               if (!swhois.length())
+                       return;
+               
+               std::string *text = new std::string(swhois);
+               user->Extend("swhois", text);
        }
        
        virtual ~ModuleSWhois()
@@ -217,7 +237,7 @@ class ModuleSWhois : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
 };
 
@@ -233,7 +253,7 @@ class ModuleSWhoisFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSWhois(Me);
        }