Convert remaining InspIRCd::Log() calls to new logging system

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

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 3d0c48b7c52d6c16e92cb131087ac74df863c276..3f7e27418a34bdbd025d8094d55f7107a4095baf 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -33,25 +33,35 @@ public:
        CGItype type;
        std::string password;
 
-       CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST, const std::string &password ="")
-       : hostmask(mask), type(t), password(password)
+       CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST, const std::string &spassword ="")
+       : hostmask(mask), type(t), password(spassword)
        {
        }
 };
 typedef std::vector<CGIhost> CGIHostlist;
 
+/*
+ * WEBIRC
+ *  This is used for the webirc method of CGIIRC auth, and is (really) the best way to do these things.
+ *  Syntax: WEBIRC password client hostname ip
+ *  Where password is a shared key, client is the name of the "client" and version (e.g. cgiirc), hostname
+ *  is the resolved host of the client issuing the command and IP is the real IP of the client.
+ *
+ * How it works:
+ *  To tie in with the rest of cgiirc module, and to avoid race conditions, /webirc is only processed locally
+ *  and simply sets metadata on the user, which is later decoded on full connect to give something meaningful.
+ */
 class CommandWebirc : public Command
 {
-       InspIRCd* Me;
        CGIHostlist Hosts;
        bool notify;
        public:
-               CommandWebirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : Command(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify)
+               CommandWebirc(InspIRCd* Instance, CGIHostlist &cHosts, bool bnotify) : Command(Instance, "WEBIRC", 0, 4, true), Hosts(cHosts), notify(bnotify)
                {
                        this->source = "m_cgiirc.so";
                        this->syntax = "password client hostname ip";
                }
-               CmdResult Handle(const char** parameters, int pcnt, User *user)
+               CmdResult Handle(const char* const* parameters, int pcnt, User *user)
                {
                        if(user->registered == REG_ALL)
                                return CMD_FAILURE;
@@ -86,8 +96,8 @@ class CGIResolver : public Resolver
        User* them;
        bool notify;
  public:
-       CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
-               : Resolver(ServerInstance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
+       CGIResolver(Module* me, InspIRCd* Instance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
+               : Resolver(Instance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
        virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
        {
@@ -134,7 +144,7 @@ public:
                mycommand = new CommandWebirc(Me, Hosts, NotifyOpers);
                ServerInstance->AddCommand(mycommand);
 
-               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUserQuit, I_OnUserConnect };
+               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
                ServerInstance->Modules->Attach(eventlist, this, 7);
        }
 
@@ -162,7 +172,7 @@ public:
                        if(hostmask.length())
                        {
                                if (type == "webirc" && !password.length()) {
-                                               ServerInstance->Log(DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
+                                               ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
                                }
                                else
                                {
@@ -186,7 +196,7 @@ public:
                        }
                        else
                        {
-                               ServerInstance->Log(DEFAULT, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
+                               ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
                                continue;
                        }
                }
@@ -240,7 +250,7 @@ public:
                }
        }
 
-       virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
+       virtual void OnUserDisconnect(User* user)
        {
                OnCleanup(TYPE_USER, user);
        }