Convert SWhois, SERVER, EOB..

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1313 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 9 insertions, 8 deletions

diff --git a/include/extern.h b/include/extern.h
index 575de3d86..6f735c800 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1165,12 +1165,12 @@ E void anope_SendForceNickChange(const char *nick,const char *newnick, time_t wh
 E void anope_SendSVSNOOP(const char *server, int set);			  	  		  /* SVSNOOP */
 E void anope_SendSVSO(const char *source,const char *nick, const char *flag);          	  		  /* SVSO   */
 E void anope_SendSVSPart(const char *source, const char *nick,const char *chan);          	  		  /* SVSPART   */
-E void anope_cmd_swhois(const char *source, const char *who, const char *mask);	  	  		  /* SWHOIS */
+E void anope_SendSWhois(const char *source, const char *who, const char *mask);	  	  		  /* SWHOIS */
 E void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when); /* TOPIC */
 E void anope_SendSGLineDel(const char *mask);				  	  		  /* UNSGLINE */
 E void anope_SendSQLineDel(const char *user);                               	  		  /* UNSQLINE */
 E void anope_SendSZLineDel(const char *mask);				  	  		  /* UNSZLINE */
-E void anope_cmd_eob();									  /* EOB - end of burst */
+E void anope_SendEOB();									  /* EOB - end of burst */
 E void anope_cmd_burst();									  /* BURST  - use eob to send burst 0 */
 E void anope_cmd_svswatch(const char *sender, const char *nick, const char *parm);
 E void anope_SendCTCP(const char *source, const char *dest,  const char *fmt, ...);   	  		  /* CTCP */
@@ -1251,7 +1251,7 @@ E void anope_SendSVID3(User *u, const char *ts);
 E void anope_SendUnregisteredNick(User *u);
 E int anope_flood_mode_check(const char *value);
 
-E void anope_cmd_jupe(const char *jserver, const char *who, const char *reason);
+E void anope_SendJupe(const char *jserver, const char *who, const char *reason);
 
 E int anope_valid_nick(const char *nick);
 E int anope_valid_chan(const char *chan);
diff --git a/include/services.h b/include/services.h
index 0d595d1a1..9e46b88c5 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1335,15 +1335,16 @@ class IRCDProto {
 		}
 		virtual void SendSVSJoin(const char *, const char *, const char *, const char *) { }
 		virtual void SendSVSPart(const char *, const char *, const char *) { }
-		virtual void cmd_swhois(const char *, const char *, const char *) { }
-		virtual void cmd_eob() { }
-		virtual void cmd_server(const char *, int, const char *) = 0;
-		virtual void cmd_jupe(const char *jserver, const char *who, const char *reason)
+		virtual void SendSWhois(const char *, const char *, const char *) { }
+		virtual void SendEOB() { }
+		virtual void SendServer(const char *, int, const char *) = 0;
+		virtual void SendJupe(const char *jserver, const char *who, const char *reason)
 		{
+			// XXX: this should NOT be done here. protocol modules are *only* for protocol. -- w00t
 			char rbuf[256];
 			snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who, reason ? ": " : "", reason ? reason : "");
 			if (findserver(servlist, jserver)) SendSquit(jserver, rbuf);
-			cmd_server(jserver, 2, rbuf);
+			SendServer(jserver, 2, rbuf);
 			new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 		}
 		virtual void set_umode(User *, int, const char **) = 0;