converting m_d* done

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

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index a5c98dbbfcaddaa1719c69f90c92920f0a9edd6d..95c7cd37b1c51052890b4dea0abdbcf96e03cfbd 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -92,7 +92,7 @@ class cmd_shun : public Command
 
                if(pcnt == 1)
                {
-                       if (ServerInstance->XLines->DelLine(parameters[0], "S", user))
+                       if (ServerInstance->XLines->DelLine(parameters[0], "SHUN", user))
                        {
                                ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick,parameters[0]);
                        }
@@ -182,6 +182,9 @@ class ModuleShun : public Module
 
        virtual void OnUserConnect(User* user)
        {
+               if (!IS_LOCAL(user))
+                       return;
+
                // Apply lines on user connect
                XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
 
@@ -194,9 +197,6 @@ class ModuleShun : public Module
 
        virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
        {
-               if (user->registered != REG_ALL)
-                       return 0;
-
                if((command != "PONG") && (command != "PING"))
                {
                        if (user->GetExt("shunned"))