Move DumpText into User; kill unused WriteWallOps and DecreasePenalty functions

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11931 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 13 insertions, 17 deletions

diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index 5f7dabdbf..64ff81b81 100644
--- a/src/commands/cmd_modules.cpp
+++ b/src/commands/cmd_modules.cpp
@@ -58,16 +58,16 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
 
-			ServerInstance->DumpText(user, ":%s 702 %s :%p %s %s :%s - %s", ServerInstance->Config->ServerName.c_str(),
+			user->SendText(":%s 702 %s :%p %s %s :%s - %s", ServerInstance->Config->ServerName.c_str(),
 				user->nick.c_str(), (void*)m, module_names[i].c_str(), flags.c_str(), V.description.c_str(), V.version.c_str());
 		}
 		else
 		{
-			ServerInstance->DumpText(user, ":%s 702 %s :%s %s", ServerInstance->Config->ServerName.c_str(),
+			user->SendText(":%s 702 %s :%s %s", ServerInstance->Config->ServerName.c_str(),
 				user->nick.c_str(), module_names[i].c_str(), V.description.c_str());
 		}
 	}
-	ServerInstance->DumpText(user, ":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
+	user->SendText(":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
 
 	return CMD_SUCCESS;
 }
diff --git a/src/commands/cmd_wallops.cpp b/src/commands/cmd_wallops.cpp
index 7894419c1..52d28e987 100644
--- a/src/commands/cmd_wallops.cpp
+++ b/src/commands/cmd_wallops.cpp
@@ -13,14 +13,6 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_WALLOPS_H__
-#define __CMD_WALLOPS_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** Handle /WALLOPS. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -41,14 +33,18 @@ class CommandWallops : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
-
-
 CmdResult CommandWallops::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	user->WriteWallOps(std::string(parameters[0]));
+	std::string wallop("WALLOPS :");
+	wallop.append(parameters[0]);
+
+	for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+	{
+		User* t = *i;
+		if (t->IsModeSet('w'))
+			user->WriteTo(t,wallop);
+	}
+
 	FOREACH_MOD(I_OnWallops,OnWallops(user,parameters[0]));
 	return CMD_SUCCESS;
 }