Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

[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 784328eb59d5b8d7ebd7ad1fd359d00a8e100512..01d12e13bd14149a80f20fda18128cf5d1463988 100644 (file)
--- a/src/commands/cmd_ison.cpp
+++ b/src/commands/cmd_ison.cpp
@@ -30,7 +30,9 @@ class CommandIson : public Command
  public:
        /** Constructor for ison.
         */
-       CommandIson ( Module* parent) : Command(parent,"ISON",0,0) { syntax = "<nick> {nick}"; }
+       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
@@ -46,7 +48,7 @@ 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++)
        {
@@ -54,13 +56,13 @@ CmdResult CommandIson::Handle (const std::vector<std::string>& parameters, User
                if (ison_already.find(u) != ison_already.end())
                        continue;
 
-               if (u)
+               if ((u) && (u->registered == REG_ALL))
                {
                        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;
                }
@@ -79,13 +81,13 @@ CmdResult CommandIson::Handle (const std::vector<std::string>& parameters, User
                                        if (ison_already.find(u) != ison_already.end())
                                                continue;
 
-                                       if (u)
+                                       if ((u) && (u->registered == REG_ALL))
                                        {
                                                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;
                                        }