BUILD : 1.7.6 (521) BUGS : 254, 266 NOTES : Fixed up some alog() messages, and MemoServ INFO showing -1 for no hard limit

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


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

Changes

@@ -16,6 +16,7 @@ Provided by Anope Dev. <dev@anope.org> - 2004
 11/19 A Added anope_cmd_ctcp() to code API, for sending CTCP messages.    [ #00]
 11/18 A Unable to use registered nicknames as bot nicks from now on.      [ #00]
 11/18 A NSAddAccessOnReg to control access list on registration.          [ #00]
+01/04 F Fixed up some alog() messages that were incorrect.                [#266]
 01/01 F Ultimate3 channel modes, which had been defined incorrectly.      [ #00]
 12/31 F Fixed integer overflow error with CS ACCESS/LEVELS.               [#262]
 12/30 F Fixed moduleAddData using an old moduleData as list head.         [#261]

src/botserv.c

@@ -2456,8 +2456,7 @@ static int do_say(User * u)
             ci->bi->lastmsg = time(NULL);
             if (logchan && LogBot)
                 anope_cmd_privmsg(ci->bi->nick, LogChannel,
-                                  ":SAY %s %s %s", u->nick, ci->name,
-                                  text);
+                                  "SAY %s %s %s", u->nick, ci->name, text);
         } else {
             syntax_error(s_BotServ, u, "SAY", BOT_SAY_SYNTAX);
         }
@@ -2492,7 +2491,7 @@ static int do_act(User * u)
                           text, 1);
         ci->bi->lastmsg = time(NULL);
         if (logchan && LogBot)
-            anope_cmd_privmsg(ci->bi->nick, LogChannel, ":ACT %s %s %s",
+            anope_cmd_privmsg(ci->bi->nick, LogChannel, "ACT %s %s %s",
                               u->nick, ci->name, text);
     }
     return MOD_CONT;

src/chanserv.c

@@ -2855,13 +2855,18 @@ static int do_logout(User * u)
         if (u2) {
             make_unidentified(u2, ci);
             notice_lang(s_ChanServ, u, CHAN_LOGOUT_SUCCEEDED, nick, chan);
+            alog("%s: User %s!%s@%s has been logged out of channel %s.",
+                 s_ChanServ, u2->nick, u2->username, common_get_vhost(u2),
+                 chan);
         } else {
             int i;
             for (i = 0; i < 1024; i++)
                 for (u2 = userlist[i]; u2; u2 = u2->next)
                     make_unidentified(u2, ci);
             notice_lang(s_ChanServ, u, CHAN_LOGOUT_ALL_SUCCEEDED, chan);
+            alog("%s: All users identified have been logged out of channel %s.", s_ChanServ, chan);
         }
+
     }
     return MOD_CONT;
 }
@@ -5805,9 +5810,10 @@ static int do_cs_topic(User * u)
             c->topic_time = ci->last_topic_time;
         }
 
-        if (is_services_admin(u))
+        if (is_services_admin(u) && !check_access(u, ci, CA_TOPIC))
             alog("%s: %s!%s@%s changed topic of %s as services admin.",
-                 s_ChanServ, u->nick, u->username, u->host, c->name);
+                 s_ChanServ, u->nick, u->username, common_get_vhost(u),
+                 c->name);
         if (ircd->join2set) {
             if (whosends(ci) == s_ChanServ) {
                 anope_cmd_join(s_ChanServ, c->name, time(NULL));

src/nickserv.c

@@ -3029,10 +3029,13 @@ static int do_set_email(User * u, NickCore * nc, char *param)
         return MOD_CONT;
     }
 
-    alog("%s: %s!%s@%s (e-mail: %s) changed its e-mail to %s.", s_NickServ,
-         u->nick, u->username, common_get_vhost(u),
-         (nc->email ? nc->email : "none"), (param ? param : "none"));
-
+    if (u->na && u->na->nc != nc && is_services_admin(u)) {
+        alog("%s: %s!%s@%s used SET EMAIL as Services admin on %s (e-mail: %s)", s_NickServ, u->nick, u->username, common_get_vhost(u), nc->display, (nc->email ? nc->email : "none"));
+    } else {
+        alog("%s: %s!%s@%s (e-mail: %s) changed its e-mail to %s.",
+             s_NickServ, u->nick, u->username, common_get_vhost(u),
+             (nc->email ? nc->email : "none"), (param ? param : "none"));
+    }
     if (nc->email)
         free(nc->email);
 

src/operserv.c

@@ -2519,7 +2519,6 @@ int add_sgline(User * u, char *mask, const char *by, const time_t expires,
                const char *reason)
 {
     int deleted = 0, i;
-    int x;
     SXLine *entry;
     User *u2, *next;
     char buf[BUFSIZE];
@@ -2987,7 +2986,6 @@ int add_sqline(User * u, char *mask, const char *by, const time_t expires,
                const char *reason)
 {
     int deleted = 0, i;
-    int x;
     User *u2, *next;
     SXLine *entry;
     char buf[BUFSIZE];

version.log

@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="6"
-VERSION_BUILD="520"
+VERSION_BUILD="521"
 
 # $Log$
 #
+# BUILD : 1.7.6 (521)
+# BUGS  : 254, 266
+# NOTES : Fixed up some alog() messages, and MemoServ INFO showing -1 for no hard limit
+#
 # BUILD : 1.7.6 (520)
 # BUGS  : 265
 # NOTES : Fixed a few issues with chanserv, botserv, symbiosis, and topics