Merge pull request #1141 from SaberUK/master+windows-purge

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

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 7d3b3f90ce091d20b2d07713a5664ad6c9fdc27d..cb065d2fc3cf3e29be2ee700f0e7aa252837c119 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -93,10 +93,7 @@ class CommandSVSSilence : public Command
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               User* target = ServerInstance->FindNick(parameters[0]);
-               if (target)
-                       return ROUTE_OPT_UCAST(target->server);
-               return ROUTE_LOCALONLY;
+               return ROUTE_OPT_UCAST(parameters[0]);
        }
 };
 
@@ -170,8 +167,8 @@ class CommandSilence : public Command
                                        for (silencelist::iterator i = sl->begin(); i != sl->end(); i++)
                                        {
                                                // search through for the item
-                                               irc::string listitem = i->first.c_str();
-                                               if (listitem == mask && i->second == pattern)
+                                               const std::string& listitem = i->first;
+                                               if ((irc::equals(listitem, mask)) && (i->second == pattern))
                                                {
                                                        sl->erase(i);
                                                        user->WriteNumeric(950, user->nick, InspIRCd::Format("Removed %s %s from silence list", mask.c_str(), decomppattern.c_str()));
@@ -203,8 +200,8 @@ class CommandSilence : public Command
                                std::string decomppattern = DecompPattern(pattern);
                                for (silencelist::iterator n = sl->begin(); n != sl->end();  n++)
                                {
-                                       irc::string listitem = n->first.c_str();
-                                       if (listitem == mask && n->second == pattern)
+                                       const std::string& listitem = n->first;
+                                       if ((irc::equals(listitem, mask)) && (n->second == pattern))
                                        {
                                                user->WriteNumeric(952, user->nick, InspIRCd::Format("%s %s is already on your silence list", mask.c_str(), decomppattern.c_str()));
                                                return CMD_FAILURE;