Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters

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

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index b2421ab43de793de609aedb653a298b7c331a387..1b2ce9b1382e4f7580b005f572375331cd8da932 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -1,98 +1,99 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-
-/* $ModDesc: Provides support for USERIP command */
-
-Server *Srv;
-        
-void handle_userip(char **parameters, int pcnt, userrec *user)
-{
-        char Return[MAXBUF],junk[MAXBUF];
-        snprintf(Return,MAXBUF,"340 %s :",user->nick);
-        for (int i = 0; i < pcnt; i++)
-        {
-                userrec *u = Find(parameters[i]);
-                if (u)
-                {
-                        snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,strchr(u->modes,'o') ? "*" : "",u->ident,u->ip);
-                        strlcat(Return,junk,MAXBUF);
-                }
-        }
-        WriteServ(user->fd,Return);
-}
 
+#include "inspircd.h"
 
-class ModuleUserIP : public Module
+/** Handle /USERIP
+ */
+class CommandUserip : public Command
 {
  public:
-       ModuleUserIP()
+       CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
        {
-               Srv = new Server;
-               Srv->AddCommand("USERIP",handle_userip,'o',1,"m_Userip.so");
+               syntax = "<nick> [<nick> ...]";
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
-               output = output + std::string(" USERIP");
-        }
-       
-       virtual ~ModuleUserIP()
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               delete Srv;
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,1,VF_VENDOR);
+               std::string retbuf = "340 " + user->nick + " :";
+               int nicks = 0;
+               bool checked_privs = false;
+               bool has_privs = false;
+
+               for (int i = 0; i < (int)parameters.size(); i++)
+               {
+                       User *u = ServerInstance->FindNickOnly(parameters[i]);
+                       if ((u) && (u->registered == REG_ALL))
+                       {
+                               // Anyone may query their own IP
+                               if (u != user)
+                               {
+                                       if (!checked_privs)
+                                       {
+                                               // Do not trigger the insufficient priviliges message more than once
+                                               checked_privs = true;
+                                               has_privs = user->HasPrivPermission("users/auspex");
+                                               if (!has_privs)
+                                                       user->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges");
+                                       }
+
+                                       if (!has_privs)
+                                               continue;
+                               }
+
+                               retbuf = retbuf + u->nick + (u->IsOper() ? "*" : "") + "=";
+                               if (u->IsAway())
+                                       retbuf += "-";
+                               else
+                                       retbuf += "+";
+                               retbuf += u->ident + "@" + u->GetIPString() + " ";
+                               nicks++;
+                       }
+               }
+
+               if (nicks != 0)
+                       user->WriteServ(retbuf);
+
+               return CMD_SUCCESS;
        }
-       
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleUserIPFactory : public ModuleFactory
+class ModuleUserIP : public Module
 {
+       CommandUserip cmd;
  public:
-       ModuleUserIPFactory()
+       ModuleUserIP()
+               : cmd(this)
        {
        }
-       
-       ~ModuleUserIPFactory()
+
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
+               tokens["USERIP"];
        }
-       
-       virtual Module * CreateModule()
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return new ModuleUserIP;
+               return Version("Provides support for USERIP command",VF_VENDOR);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleUserIPFactory;
-}
-
+MODULE_INIT(ModuleUserIP)