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

5 files changed, 38 insertions, 38 deletions

diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index b8174c7a6..cfd95d014 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -32,7 +32,7 @@ class CommandAlltime : public Command
 
 		std::string msg = ":" + std::string(ServerInstance->Config->ServerName.c_str()) + " NOTICE " + user->nick + " :System time is " + fmtdate + "(" + ConvToStr(ServerInstance->Time()) + ") on " + ServerInstance->Config->ServerName;
 
-		ServerInstance->DumpText(user, msg);
+		user->SendText(msg);
 
 		/* we want this routed out! */
 		return CMD_SUCCESS;
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 4a89f9948..c7ec7a4db 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -389,7 +389,7 @@ public:
 			if (now > (dat->lastnotify + (time_t)notify_cooldown))
 			{
 				user->WriteNumeric(717, "%s %s :has been informed that you messaged them.", user->nick.c_str(), dest->nick.c_str());
-				ServerInstance->DumpText(dest, ":%s 718 %s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
+				dest->SendText(":%s 718 %s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
 					ServerInstance->Config->ServerName.c_str(), dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str());
 				dat->lastnotify = now;
 			}
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 4b960e18b..0b222ba89 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -41,12 +41,12 @@ class CommandCheck : public Command
 			ExtensionItem* item = i->first;
 			std::string value = item->serialize(FORMAT_USER, ext, i->second);
 			if (!value.empty())
-				ServerInstance->DumpText(user, checkstr + " meta:" + item->key + " " + value);
+				user->SendText(checkstr + " meta:" + item->key + " " + value);
 			else if (!item->key.empty())
 				dumpkeys << " " << item->key;
 		}
 		if (!dumpkeys.str().empty())
-			ServerInstance->DumpText(user,checkstr + " metadata", dumpkeys);
+			user->SendText(checkstr + " metadata", dumpkeys);
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -71,47 +71,47 @@ class CommandCheck : public Command
 		 *  :server.name 304 target :CHECK END
 		 */
 
-		ServerInstance->DumpText(user, checkstr + " START " + parameters[0]);
+		user->SendText(checkstr + " START " + parameters[0]);
 
 		if (targuser)
 		{
 			/* /check on a user */
-			ServerInstance->DumpText(user, checkstr + " nuh " + targuser->GetFullHost());
-			ServerInstance->DumpText(user, checkstr + " realnuh " + targuser->GetFullRealHost());
-			ServerInstance->DumpText(user, checkstr + " realname " + targuser->fullname);
-			ServerInstance->DumpText(user, checkstr + " modes +" + targuser->FormatModes());
-			ServerInstance->DumpText(user, checkstr + " snomasks +" + targuser->FormatNoticeMasks());
-			ServerInstance->DumpText(user, checkstr + " server " + targuser->server);
-			ServerInstance->DumpText(user, checkstr + " uid " + targuser->uuid);
-			ServerInstance->DumpText(user, checkstr + " signon " + timestring(targuser->signon));
-			ServerInstance->DumpText(user, checkstr + " nickts " + timestring(targuser->age));
+			user->SendText(checkstr + " nuh " + targuser->GetFullHost());
+			user->SendText(checkstr + " realnuh " + targuser->GetFullRealHost());
+			user->SendText(checkstr + " realname " + targuser->fullname);
+			user->SendText(checkstr + " modes +" + targuser->FormatModes());
+			user->SendText(checkstr + " snomasks +" + targuser->FormatNoticeMasks());
+			user->SendText(checkstr + " server " + targuser->server);
+			user->SendText(checkstr + " uid " + targuser->uuid);
+			user->SendText(checkstr + " signon " + timestring(targuser->signon));
+			user->SendText(checkstr + " nickts " + timestring(targuser->age));
 			if (IS_LOCAL(targuser))
-				ServerInstance->DumpText(user, checkstr + " lastmsg " + timestring(targuser->idle_lastmsg));
+				user->SendText(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg));
 
 			if (IS_AWAY(targuser))
 			{
 				/* user is away */
-				ServerInstance->DumpText(user, checkstr + " awaytime " + timestring(targuser->awaytime));
-				ServerInstance->DumpText(user, checkstr + " awaymsg " + targuser->awaymsg);
+				user->SendText(checkstr + " awaytime " + timestring(targuser->awaytime));
+				user->SendText(checkstr + " awaymsg " + targuser->awaymsg);
 			}
 
 			if (IS_OPER(targuser))
 			{
 				/* user is an oper of type ____ */
-				ServerInstance->DumpText(user, checkstr + " opertype " + irc::Spacify(targuser->oper.c_str()));
+				user->SendText(checkstr + " opertype " + irc::Spacify(targuser->oper.c_str()));
 			}
 
 			if (IS_LOCAL(targuser))
 			{
-				ServerInstance->DumpText(user, checkstr + " clientaddr " + irc::sockets::satouser(&targuser->client_sa));
-				ServerInstance->DumpText(user, checkstr + " serveraddr " + irc::sockets::satouser(&targuser->server_sa));
+				user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(&targuser->client_sa));
+				user->SendText(checkstr + " serveraddr " + irc::sockets::satouser(&targuser->server_sa));
 
 				std::string classname = targuser->GetClass()->name;
 				if (!classname.empty())
-					ServerInstance->DumpText(user, checkstr + " connectclass " + classname);
+					user->SendText(checkstr + " connectclass " + classname);
 			}
 			else
-				ServerInstance->DumpText(user, checkstr + " onip " + targuser->GetIPString());
+				user->SendText(checkstr + " onip " + targuser->GetIPString());
 
 			for (UCListIter i = targuser->chans.begin(); i != targuser->chans.end(); i++)
 			{
@@ -121,25 +121,25 @@ class CommandCheck : public Command
 
 			std::stringstream dump(chliststr);
 
-			ServerInstance->DumpText(user,checkstr + " onchans", dump);
+			user->SendText(checkstr + " onchans", dump);
 
 			dumpExt(user, checkstr, targuser);
 		}
 		else if (targchan)
 		{
 			/* /check on a channel */
-			ServerInstance->DumpText(user, checkstr + " timestamp " + timestring(targchan->age));
+			user->SendText(checkstr + " timestamp " + timestring(targchan->age));
 
 			if (targchan->topic[0] != 0)
 			{
 				/* there is a topic, assume topic related information exists */
-				ServerInstance->DumpText(user, checkstr + " topic " + targchan->topic);
-				ServerInstance->DumpText(user, checkstr + " topic_setby " + targchan->setby);
-				ServerInstance->DumpText(user, checkstr + " topic_setat " + timestring(targchan->topicset));
+				user->SendText(checkstr + " topic " + targchan->topic);
+				user->SendText(checkstr + " topic_setby " + targchan->setby);
+				user->SendText(checkstr + " topic_setat " + timestring(targchan->topicset));
 			}
 
-			ServerInstance->DumpText(user, checkstr + " modes " + targchan->ChanModes(true));
-			ServerInstance->DumpText(user, checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
+			user->SendText(checkstr + " modes " + targchan->ChanModes(true));
+			user->SendText(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
 
 			/* now the ugly bit, spool current members of a channel. :| */
 
@@ -153,7 +153,7 @@ class CommandCheck : public Command
 				 * Unlike Asuka, I define a clone as coming from the same host. --w00t
 				 */
 				snprintf(tmpbuf, MAXBUF, "%-3lu %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(), i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
-				ServerInstance->DumpText(user, checkstr + " member " + tmpbuf);
+				user->SendText(checkstr + " member " + tmpbuf);
 			}
 
 			dumpExt(user, checkstr, targchan);
@@ -169,20 +169,20 @@ class CommandCheck : public Command
 				if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
 				{
 					/* host or vhost matches mask */
-					ServerInstance->DumpText(user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+					user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
 				}
 				/* IP address */
 				else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0]))
 				{
 					/* same IP. */
-					ServerInstance->DumpText(user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+					user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
 				}
 			}
 
-			ServerInstance->DumpText(user, checkstr + " matches " + ConvToStr(x));
+			user->SendText(checkstr + " matches " + ConvToStr(x));
 		}
 
-		ServerInstance->DumpText(user, checkstr + " END " + parameters[0]);
+		user->SendText(checkstr + " END " + parameters[0]);
 
 		return CMD_SUCCESS;
 	}
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 50032919a..86b535f4e 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -76,7 +76,7 @@ class CommandGunloadmodule : public Command
 			if (m && ServerInstance->Modules->Unload(m))
 			{
 				ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-				ServerInstance->DumpText(user, ":%s 973 %s %s :Module successfully unloaded.",
+				user->SendText(":%s 973 %s %s :Module successfully unloaded.",
 					ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
 			}
 			else
diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 7d09d939f..7c9247a06 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -170,13 +170,13 @@ bool ModuleSpanningTree::HandleMap(const std::vector<std::string>& parameters, U
 	{
 		// terminate the string at maxnamew characters
 		names[100 * t + maxnamew] = '\0';
-		ServerInstance->DumpText(user, ":%s %d %s :%s %s", ServerInstance->Config->ServerName.c_str(),
+		user->SendText(":%s %d %s :%s %s", ServerInstance->Config->ServerName.c_str(),
 			RPL_MAP, user->nick.c_str(), names + 100 * t, stats + 50 * t);
 	}
-	ServerInstance->DumpText(user, ":%s %d %s :%d server%s and %d user%s, average %.2f users per server",
+	user->SendText(":%s %d %s :%d server%s and %d user%s, average %.2f users per server",
 		ServerInstance->Config->ServerName.c_str(), RPL_MAPUSERS, user->nick.c_str(),
 		line, (line > 1 ? "s" : ""), totusers, (totusers > 1 ? "s" : ""), avg_users);
-	ServerInstance->DumpText(user, ":%s %d %s :End of /MAP", ServerInstance->Config->ServerName.c_str(),
+	user->SendText(":%s %d %s :End of /MAP", ServerInstance->Config->ServerName.c_str(),
 		RPL_ENDMAP, user->nick.c_str());
 
 	delete[] names;