m_ssl_openssl Fix debug message

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

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 46732b6a67bf36a0f34da7a88def06495c44d62b..7ac46573224f8eb9aa1e6f9edd7bc08e4060b6f5 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -30,6 +30,7 @@ class CommandSajoin : public Command
  public:
        CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 2)
        {
+               allow_empty_last_param = false;
                flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
@@ -37,7 +38,7 @@ class CommandSajoin : public Command
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
-               if (dest)
+               if ((dest) && (dest->registered == REG_ALL))
                {
                        if (ServerInstance->ULine(dest->server))
                        {
@@ -47,7 +48,7 @@ class CommandSajoin : public Command
                        if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax))
                        {
                                /* we didn't need to check this for each character ;) */
-                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name or name too long");
+                               user->WriteServ("NOTICE "+user->nick+" :*** Invalid characters in channel name or name too long");
                                return CMD_FAILURE;
                        }
 
@@ -64,30 +65,29 @@ class CommandSajoin : public Command
                                {
                                        if (n->HasUser(dest))
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+                                               ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+parameters[1]);
                                                return CMD_SUCCESS;
                                        }
                                        else
                                        {
-                                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
+                                               user->WriteServ("NOTICE "+user->nick+" :*** Could not join "+dest->nick+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
                                                return CMD_FAILURE;
                                        }
                                }
                                else
                                {
-                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]);
+                                       user->WriteServ("NOTICE "+user->nick+" :*** Could not join "+dest->nick+" to "+parameters[1]);
                                        return CMD_FAILURE;
                                }
                        }
                        else
                        {
-                               ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
                                return CMD_SUCCESS;
                        }
                }
                else
                {
-                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** No such nickname "+parameters[0]);
+                       user->WriteServ("NOTICE "+user->nick+" :*** No such nickname "+parameters[0]);
                        return CMD_FAILURE;
                }
        }
@@ -108,7 +108,11 @@ class ModuleSajoin : public Module
        ModuleSajoin()
                : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(cmd);
        }
 
        virtual ~ModuleSajoin()