BUILD : 1.7.8 (598) BUGS : 310 NOTES : Updated Unreal 3.2 token support.

git-svn-id: svn://svn.anope.org/anope/trunk@598 31f1291d-b8d6-0310-a050-a5561fc1590b


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

3 files changed, 20 insertions, 11 deletions

diff --git a/Changes b/Changes
index 3fdbaf2e4..044c57008 100644
--- a/Changes
+++ b/Changes
@@ -6,6 +6,7 @@ Provided by Anope Dev. <dev@anope.org> - 2005
 02/13 A Internal Event support, see EVENTS in the doc folder for help     [ #00]
 02/05 A Support for Unreal 3.2 +I channel mode.                           [ #00]
 02/03 A Merged anope-win32 branch into the main, now Win32 ready.         [ #00]
+03/05 F Updated Unreal 3.2 token support.                                 [#310]
 03/03 F Numeric in the config is now a string not an int                  [ #00]
 03/02 F Fixed LogUser message, normalizes the "realname" on nick change.  [#306]
 03/02 F ircd protocol support for owner and admin taken from proto. files.[ #00]
diff --git a/src/unreal32.c b/src/unreal32.c
index eff1c4469..0e45ebe3a 100644
--- a/src/unreal32.c
+++ b/src/unreal32.c
@@ -1110,8 +1110,9 @@ void anope_cmd_pong(char *servname, char *who)
 /* JOIN */
 void anope_cmd_join(char *user, char *channel, time_t chantime)
 {
-    send_cmd(ServerName, "SJOIN !%s %s :%s",
-             base64enc((long int) chantime), channel, user);
+    send_cmd(ServerName, "%s !%s %s :%s",
+             send_token("SJOIN", "~"), base64enc((long int) chantime),
+             channel, user);
     /* send_cmd(user, "%s %s", send_token("JOIN", "C"), channel); */
 }
 
@@ -1928,15 +1929,16 @@ int anope_event_whois(char *source, int ac, char **av)
 /* SVSHOLD - set */
 void anope_cmd_svshold(char *nick)
 {
-    send_cmd(NULL, "TKL + Q H %s %s %ld %ld :%s", nick, ServerName,
-             (long int) time(NULL) + NSReleaseTimeout,
+    send_cmd(NULL, "%s + Q H %s %s %ld %ld :%s", send_token("TKL", "BD"),
+             nick, ServerName, (long int) time(NULL) + NSReleaseTimeout,
              (long int) time(NULL), "Being held for registered user");
 }
 
 /* SVSHOLD - release */
 void anope_cmd_release_svshold(char *nick)
 {
-    send_cmd(NULL, "TKL - Q * %s %s", nick, ServerName);
+    send_cmd(NULL, "%s - Q * %s %s", send_token("TKL", "BD"), nick,
+             ServerName);
 }
 
 /* UNSGLINE */
@@ -1945,7 +1947,7 @@ void anope_cmd_release_svshold(char *nick)
 */
 void anope_cmd_unsgline(char *mask)
 {
-    send_cmd(NULL, "SVSNLINE - :%s", mask);
+    send_cmd(NULL, "%s - :%s", send_token("SVSNLINE", "BR"), mask);
 }
 
 /* UNSZLINE */
@@ -1970,7 +1972,8 @@ void anope_cmd_szline(char *mask, char *reason, char *whom)
 void anope_cmd_sgline(char *mask, char *reason)
 {
     strnrepl(reason, BUFSIZE, " ", "_");
-    send_cmd(NULL, "SVSNLINE + %s :%s", reason, mask);
+    send_cmd(NULL, "%s + %s :%s", send_token("SVSNLINE", "BR"), reason,
+             mask);
 }
 
 /* SVSMODE -b */
@@ -2119,12 +2122,12 @@ int anope_event_sjoin(char *source, int ac, char **av)
 
 void anope_cmd_swhois(char *source, char *who, char *mask)
 {
-    send_cmd(source, "SWHOIS %s :%s", who, mask);
+    send_cmd(source, "%s %s :%s", send_token("SWHOIS", "BA"), who, mask);
 }
 
 void anope_cmd_eob()
 {
-    send_cmd(ServerName, "EOS");
+    send_cmd(ServerName, "%s", send_token("EOS", "ES"));
 }
 
 /* svswatch
@@ -2134,7 +2137,8 @@ void anope_cmd_eob()
  */
 void anope_cmd_svswatch(char *sender, char *nick, char *parm)
 {
-    send_cmd(sender, "SVSWATCH %s :%s", nick, parm);
+    send_cmd(sender, "%s %s :%s", send_token("SVSWATCH", "Bw"), nick,
+             parm);
 }
 
 /* check if +f mode is valid for the ircd */
diff --git a/version.log b/version.log
index 1909ed566..015d7bc65 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="8"
-VERSION_BUILD="596"
+VERSION_BUILD="598"
 
 # $Log$
 #
+# BUILD : 1.7.8 (598)
+# BUGS  : 310
+# NOTES : Updated Unreal 3.2 token support.
+#
 # BUILD : 1.7.8 (596)
 # BUGS  : N/A
 # NOTES : Added clean_modules and distclean_modules as valid make targets