Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[user/henk/code/inspircd.git] / src / commands / cmd_ison.cpp

diff --git a/src/commands/cmd_ison.cpp b/src/commands/cmd_ison.cpp
index 3f5b2da90413a9edd8769fe0cb54e274781e81ab..01d12e13bd14149a80f20fda18128cf5d1463988 100644 (file)
--- a/src/commands/cmd_ison.cpp
+++ b/src/commands/cmd_ison.cpp
@@ -1,23 +1,46 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
+
 #include "inspircd.h"
-#include "commands/cmd_ison.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /ISON. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandIson : public Command
 {
-       return new CommandIson(Instance);
-}
+ public:
+       /** Constructor for ison.
+        */
+       CommandIson ( Module* parent) : Command(parent,"ISON", 1) {
+               syntax = "<nick> {nick}";
+       }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
 /** Handle /ISON
  */
@@ -25,24 +48,21 @@ CmdResult CommandIson::Handle (const std::vector<std::string>& parameters, User
 {
        std::map<User*,User*> ison_already;
        User *u;
-       std::string reply = std::string("303 ") + user->nick + " :";
+       std::string reply = "303 " + user->nick + " :";
 
        for (unsigned int i = 0; i < parameters.size(); i++)
        {
-               u = ServerInstance->FindNick(parameters[i]);
+               u = ServerInstance->FindNickOnly(parameters[i]);
                if (ison_already.find(u) != ison_already.end())
                        continue;
 
-               if (u)
+               if ((u) && (u->registered == REG_ALL))
                {
-                       if (u->Visibility && !u->Visibility->VisibleTo(user))
-                               continue;
-
                        reply.append(u->nick).append(" ");
                        if (reply.length() > 450)
                        {
                                user->WriteServ(reply);
-                               reply = std::string("303 ") + user->nick + " :";
+                               reply = "303 " + user->nick + " :";
                        }
                        ison_already[u] = u;
                }
@@ -57,20 +77,17 @@ CmdResult CommandIson::Handle (const std::vector<std::string>& parameters, User
 
                                while (list.GetToken(item))
                                {
-                                       u = ServerInstance->FindNick(item);
+                                       u = ServerInstance->FindNickOnly(item);
                                        if (ison_already.find(u) != ison_already.end())
                                                continue;
 
-                                       if (u)
+                                       if ((u) && (u->registered == REG_ALL))
                                        {
-                                               if (u->Visibility && !u->Visibility->VisibleTo(user))
-                                                       continue;
-
                                                reply.append(u->nick).append(" ");
                                                if (reply.length() > 450)
                                                {
                                                        user->WriteServ(reply);
-                                                       reply = std::string("303 ") + user->nick + " :";
+                                                       reply = "303 " + user->nick + " :";
                                                }
                                                ison_already[u] = u;
                                        }
@@ -85,3 +102,5 @@ CmdResult CommandIson::Handle (const std::vector<std::string>& parameters, User
        return CMD_SUCCESS;
 }
 
+
+COMMAND_INIT(CommandIson)