BUILD : 1.7.8 (758) BUGS : 332 NOTES : FIXED: anope_event_away() doing dangerous things with ac/av, viagra had issues in notice_ops, anope_cmd_mode() used wrongly for dreamforge and ultimate2

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


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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/protocol/ultimate2.c b/src/protocol/ultimate2.c
index eb8d29462..cdd7016d5 100644
--- a/src/protocol/ultimate2.c
+++ b/src/protocol/ultimate2.c
@@ -154,9 +154,13 @@ void ultiamte2_set_umode(User * user, int ac, char **av)
 
     while (*modes) {
 
-        add ? (user->mode |= umodes[(int) *modes]) : (user->mode &=
-                                                      ~umodes[(int)
-                                                              *modes]);
+		/* This looks better, much better than "add ? (do_add) : (do_remove)".
+		* At least this is readable without paying much attention :) -GD
+		*/
+		if (add)
+			user->mode |= umodes[(int) *modes];
+		else
+			user->mode &= ~umodes[(int) *modes];
 
         switch (*modes++) {
         case '+':
@@ -1111,15 +1115,11 @@ int anope_event_ping(char *source, int ac, char **av)
 
 int anope_event_away(char *source, int ac, char **av)
 {
-    if (ac) {
-        return MOD_CONT;
-    }
-
     if (!source) {
         return MOD_CONT;
     }
-    m_away(source, av[0]);
-    return MOD_CONT;
+	m_away(source, (ac ? av[0] : NULL));
+	return MOD_CONT;
 }
 
 int anope_event_topic(char *source, int ac, char **av)
@@ -1407,7 +1407,7 @@ void ultimate2_cmd_guest_nick(char *nick, char *user, char *host,
 {
     send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick,
              (long int) time(NULL), user, host, ServerName, real);
-    anope_cmd_mode(nick, "MODE %s %s", nick, modes);
+    anope_cmd_mode(nick, nick, "MODE %s %s", modes);
 }