Remove whitespace and minor style changes

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

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 2b550408cebb8f0fd96b0bdcf3a5496ff1a3e88c..b35ee3487e4581257a6b162e39c18462c83ded65 100644 (file)
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -51,11 +51,6 @@ class ModuleServProtectMode : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(bm);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides usermode +k to protect services from kicks, kills, and mode changes.", VF_VENDOR);
@@ -65,7 +60,7 @@ class ModuleServProtectMode : public Module
        {
                if (dest->IsModeSet(bm))
                {
-                       ServerInstance->SendWhoisLine(user, dest, 310, user->nick+" "+dest->nick+" :is a Network Service on "+ServerInstance->Config->Network);
+                       ServerInstance->SendWhoisLine(user, dest, 310, dest->nick+" :is a Network Service on "+ServerInstance->Config->Network);
                }
        }
 
@@ -74,7 +69,7 @@ class ModuleServProtectMode : public Module
                /* Check that the mode is not a server mode, it is being removed, the user making the change is local, there is a parameter,
                 * and the user making the change is not a uline
                 */
-               if (!adding && chan && IS_LOCAL(user) && !param.empty() && !ServerInstance->ULine(user->server))
+               if (!adding && chan && IS_LOCAL(user) && !param.empty())
                {
                        /* Check if the parameter is a valid nick/uuid
                         */
@@ -89,7 +84,7 @@ class ModuleServProtectMode : public Module
                                if (u->IsModeSet(bm) && memb && memb->modes.find(mode) != std::string::npos)
                                {
                                        /* BZZZT, Denied! */
-                                       user->WriteNumeric(482, "%s %s :You are not permitted to remove privileges from %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network.c_str());
+                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You are not permitted to remove privileges from %s services", chan->name.c_str(), ServerInstance->Config->Network.c_str());
                                        return MOD_RES_DENY;
                                }
                        }
@@ -105,7 +100,7 @@ class ModuleServProtectMode : public Module
 
                if (dst->IsModeSet(bm))
                {
-                       src->WriteNumeric(485, "%s :You are not permitted to kill %s services!", src->nick.c_str(), ServerInstance->Config->Network.c_str());
+                       src->WriteNumeric(485, ":You are not permitted to kill %s services!", ServerInstance->Config->Network.c_str());
                        ServerInstance->SNO->WriteGlobalSno('a', src->nick+" tried to kill service "+dst->nick+" ("+reason+")");
                        return MOD_RES_DENY;
                }
@@ -116,8 +111,8 @@ class ModuleServProtectMode : public Module
        {
                if (memb->user->IsModeSet(bm))
                {
-                       src->WriteNumeric(484, "%s %s :You are not permitted to kick services",
-                               src->nick.c_str(), memb->chan->name.c_str());
+                       src->WriteNumeric(ERR_RESTRICTED, "%s :You are not permitted to kick services",
+                               memb->chan->name.c_str());
                        return MOD_RES_DENY;
                }
 
@@ -130,5 +125,4 @@ class ModuleServProtectMode : public Module
        }
 };
 
-
 MODULE_INIT(ModuleServProtectMode)