pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-01 07:36:38 +02:00
Code Activity

BUILD : 1.7.8 (602) BUGS : 308, 311 NOTES : Fixed a couple of bugs, some smelling errors, and only in debug will nonexistent warnings display

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


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@450 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b
2005-03-07 01:56:32 +00:00
parent cd81294abf
commit 84a39def3d
19 changed files with 191 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+2
View File
@@ -6,6 +6,8 @@ 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/06 F Services not remove modes correct in some cases. [#308]
03/06 F Protected Umode users are protected from bans. [#311]
03/05 F Added UPDATE to ns help menu [ #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]
docs/EVENTS
+1
View File
@@ -164,4 +164,5 @@ Anope Internal Events
| EVENT_NICK_IDENTIFY | Nick of the user involved |
| EVENT_SERVER_SQUIT | Name of the server involved |
| EVENT_SERVER_CONNECT | Name of the server involved |
| EVENT_DEFCON_LEVEL | Level of Defcon being invoked |
|------------------------|-------------------------------------------|
include/events.h
+1 -1
View File
@@ -45,5 +45,5 @@
#define EVENT_NICK_IDENTIFY "nick_id"
#define EVENT_SERVER_SQUIT "server_squit"
#define EVENT_SERVER_CONNECT "server_connect"
#define EVENT_DEFCON_LEVEL "defcon_level"
src/channels.c
+53 -23
View File
@@ -182,6 +182,7 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
CUMode *cum;
unsigned char botmode = 0;
BotInfo *bi;
char *lastnick = NULL;
if (debug)
alog("debug: Changing modes for %s to %s", chan->name,
@@ -235,8 +236,10 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
}
if (!(user = finduser(*av))) {
alog("channel: MODE %s %c%c for nonexistent user %s",
chan->name, (add ? '+' : '-'), mode, *av);
if (debug) {
alog("channel: MODE %s %c%c for nonexistent user %s",
chan->name, (add ? '+' : '-'), mode, *av);
}
continue;
}
@@ -273,7 +276,14 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
alog("debug: Modes already sent calling remove_user_status() to clean up");
}
chan_remove_user_status(chan, user, cum->status);
check = 2;
if (!lastnick) {
check = 2;
lastnick = sstrdup(user->nick);
} else {
if (stricmp(user->nick, lastnick)) {
check = 1;
}
}
continue;
} else {
chan_set_user_status(chan, user, cum->status);
@@ -529,8 +539,10 @@ void do_join(const char *source, int ac, char **av)
user = finduser(source);
}
if (!user) {
alog("user: JOIN from nonexistent user %s: %s", source,
merge_args(ac, av));
if (debug) {
alog("user: JOIN from nonexistent user %s: %s", source,
merge_args(ac, av));
}
return;
}
@@ -612,8 +624,10 @@ void do_kick(const char *source, int ac, char **av)
user = finduser(s);
}
if (!user) {
alog("user: KICK for nonexistent user %s on %s: %s", s, av[0],
merge_args(ac - 2, av + 2));
if (debug) {
alog("user: KICK for nonexistent user %s on %s: %s", s,
av[0], merge_args(ac - 2, av + 2));
}
continue;
}
if (debug) {
@@ -653,8 +667,10 @@ void do_part(const char *source, int ac, char **av)
user = finduser(source);
if (!user) {
alog("user: PART from nonexistent user %s: %s", source,
merge_args(ac, av));
if (debug) {
alog("user: PART from nonexistent user %s: %s", source,
merge_args(ac, av));
}
return;
}
t = av[0];
@@ -798,8 +814,10 @@ void do_sjoin(const char *source, int ac, char **av)
user = finduser(s);
}
if (!user) {
alog("user: SJOIN for nonexistent user %s on %s", s,
av[1]);
if (debug) {
alog("user: SJOIN for nonexistent user %s on %s", s,
av[1]);
}
return;
}
@@ -867,8 +885,10 @@ void do_sjoin(const char *source, int ac, char **av)
user = finduser(s);
if (!user) {
alog("user: SJOIN for nonexistent user %s on %s", s,
av[1]);
if (debug) {
alog("user: SJOIN for nonexistent user %s on %s", s,
av[1]);
}
return;
}
@@ -934,8 +954,10 @@ void do_sjoin(const char *source, int ac, char **av)
user = finduser(s);
}
if (!user) {
alog("user: SJOIN for nonexistent user %s on %s", s,
av[1]);
if (debug) {
alog("user: SJOIN for nonexistent user %s on %s", s,
av[1]);
}
return;
}
@@ -979,8 +1001,10 @@ void do_sjoin(const char *source, int ac, char **av)
user = finduser(source);
}
if (!user) {
alog("user: SJOIN for nonexistent user %s on %s", source,
av[1]);
if (debug) {
alog("user: SJOIN for nonexistent user %s on %s", source,
av[1]);
}
return;
}
@@ -1050,8 +1074,10 @@ void do_cmode(const char *source, int ac, char **av)
if (!chan) {
ci = cs_findchan(av[0]);
if (!(ci && (ci->flags & CI_VERBOTEN)))
alog("channel: MODE %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
if (debug) {
alog("channel: MODE %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
}
return;
}
@@ -1091,8 +1117,10 @@ void do_topic(const char *source, int ac, char **av)
topic_time = ts;
if (!c) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
if (debug) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
}
return;
}
@@ -1235,8 +1263,10 @@ void chan_adduser2(User * user, Channel * c)
}
/**
* We let the bot join even if it was an ignored user, as if we dont, and the ignored user dosnt just leave, the bot will never
* make it into the channel, leaving the channel botless even for legit users - Rob
* We let the bot join even if it was an ignored user, as if we don't,
* and the ignored user dosnt just leave, the bot will never
* make it into the channel, leaving the channel botless even for
* legit users - Rob
**/
if (s_BotServ && c->ci && c->ci->bi) {
if (c->usercount == BSMinUsers)
src/chanserv.c
+7
View File
@@ -5752,6 +5752,11 @@ static int do_ban(User * u)
u->nick, ci->name);
continue;
}
if (is_protected(u)) {
notice_lang(s_ChanServ, u, PERMISSION_DENIED);
continue;
}
av[0] = sstrdup("+b");
get_idealban(ci, u, mask, sizeof(mask));
av[1] = mask;
@@ -5802,6 +5807,8 @@ static int do_ban(User * u)
*/
} else if (ircd->except && is_excepted(ci, u2)) {
notice_lang(s_ChanServ, u, CHAN_EXCEPTED, u2->nick, ci->name);
} else if (ircd->protectedumode && is_protected(u2)) {
notice_lang(s_ChanServ, u, PERMISSION_DENIED);
} else {
char *av[3];
char mask[BUFSIZE];
src/hybrid.c
+4 -2
View File
@@ -575,8 +575,10 @@ int anope_event_topic(char *source, int ac, char **av)
time_t topic_time = time(NULL);
if (!c) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
if (debug) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
}
return MOD_CONT;
}
src/operserv.c
+2 -1
View File
@@ -5026,8 +5026,8 @@ static int do_defcon(User * u)
notice_lang(s_OperServ, u, OPER_DEFCON_SYNTAX);
return MOD_CONT;
}
DefConLevel = newLevel;
send_event("EVENT_DEFCON_LEVEL", "%d", DefConLevel);
DefContimer = time(NULL);
notice_lang(s_OperServ, u, OPER_DEFCON_CHANGED, DefConLevel);
defcon_sendlvls(u);
@@ -5123,6 +5123,7 @@ void resetDefCon(int level)
if ((DefContimer)
&& (time(NULL) - DefContimer >= dotime(DefConTimeOut))) {
DefConLevel = level;
send_event("EVENT_DEFCON_LEVEL", "%d", DefConLevel);
alog("Defcon level timeout, returning to lvl %d", level);
anope_cmd_global(s_OperServ,
getstring2(NULL, OPER_DEFCON_WALL),
src/plexus.c
+6 -3
View File
@@ -636,8 +636,10 @@ int anope_event_topic(char *source, int ac, char **av)
time_t topic_time = time(NULL);
if (!c) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
if (debug) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
}
return MOD_CONT;
}
@@ -954,8 +956,9 @@ int anope_event_sethost(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
if (debug)
if (debug) {
alog("user: SETHOST for nonexistent user %s", source);
}
return MOD_CONT;
}
src/ptlink.c
+3 -1
View File
@@ -432,7 +432,9 @@ int anope_event_newmask(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: NEWMASK for nonexistent user %s", av[0]);
if (debug) {
alog("user: NEWMASK for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
src/rageircd.c
+2 -1
View File
@@ -450,8 +450,9 @@ int anope_event_vhost(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
if (debug)
if (debug) {
alog("user: VHOST for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
src/ratbox.c
+8 -4
View File
@@ -643,8 +643,10 @@ int anope_event_topic(char *source, int ac, char **av)
time_t topic_time = time(NULL);
if (!c) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
if (debug) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
}
return MOD_CONT;
}
@@ -691,8 +693,10 @@ int anope_event_tburst(char *source, int ac, char **av)
topic_time = strtol(av[1], NULL, 10);
if (!c) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
if (debug) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
}
return MOD_CONT;
}
src/shadowircd.c
+8 -4
View File
@@ -651,8 +651,10 @@ int anope_event_topic(char *source, int ac, char **av)
time_t topic_time = time(NULL);
if (!c) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
if (debug) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
}
return MOD_CONT;
}
@@ -695,8 +697,10 @@ int anope_event_tburst(char *source, int ac, char **av)
topic_time = strtol(av[1], NULL, 10);
if (!c) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
if (debug) {
alog("channel: TOPIC %s for nonexistent channel %s",
merge_args(ac - 1, av + 1), av[0]);
}
return MOD_CONT;
}
src/solidircd.c
+3 -1
View File
@@ -721,7 +721,9 @@ int anope_event_vs(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: SVHOST for nonexistent user %s", av[0]);
if (debug) {
alog("user: SVHOST for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
src/ultimate2.c
+17 -6
View File
@@ -454,7 +454,9 @@ int anope_event_setname(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETNAME for nonexistent user %s", source);
if (debug) {
alog("user: SETNAME for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -471,7 +473,9 @@ int anope_event_chgname(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -488,7 +492,9 @@ int anope_event_setident(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETIDENT for nonexistent user %s", source);
if (debug) {
alog("user: SETIDENT for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -505,7 +511,9 @@ int anope_event_chgident(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -522,8 +530,9 @@ int anope_event_sethost(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
if (debug)
if (debug) {
alog("user: SETHOST for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -558,7 +567,9 @@ int anope_event_chghost(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGHOST for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGHOST for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
src/ultimate3.c
+14 -5
View File
@@ -543,8 +543,9 @@ int anope_event_sethost(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
if (debug)
if (debug) {
alog("user: SETHOST for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -934,7 +935,9 @@ int anope_event_setname(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETNAME for nonexistent user %s", source);
if (debug) {
alog("user: SETNAME for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -951,7 +954,9 @@ int anope_event_chgname(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -968,7 +973,9 @@ int anope_event_setident(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETIDENT for nonexistent user %s", source);
if (debug) {
alog("user: SETIDENT for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -984,7 +991,9 @@ int anope_event_chgident(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
src/unreal31.c
+17 -6
View File
@@ -1262,7 +1262,9 @@ int anope_event_setname(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETNAME for nonexistent user %s", source);
if (debug) {
alog("user: SETNAME for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -1279,7 +1281,9 @@ int anope_event_chgname(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -1296,7 +1300,9 @@ int anope_event_setident(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETIDENT for nonexistent user %s", source);
if (debug) {
alog("user: SETIDENT for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -1312,7 +1318,9 @@ int anope_event_chgident(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -1329,8 +1337,9 @@ int anope_event_sethost(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
if (debug)
if (debug) {
alog("user: SETHOST for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -1378,7 +1387,9 @@ int anope_event_chghost(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGHOST for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGHOST for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
src/unreal32.c
+18 -7
View File
@@ -69,7 +69,7 @@ IRCDVar ircd[] = {
1, /* Has exceptions +e */
1, /* TS Topic Forward */
0, /* TS Topci Backward */
0, /* Protected Umode */
UMODE_S, /* Protected Umode */
0, /* Has Admin */
0, /* Chan SQlines */
0, /* Quit on Kill */
@@ -1715,7 +1715,9 @@ int anope_event_setname(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETNAME for nonexistent user %s", source);
if (debug) {
alog("user: SETNAME for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -1732,7 +1734,9 @@ int anope_event_chgname(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -1749,7 +1753,9 @@ int anope_event_setident(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETIDENT for nonexistent user %s", source);
if (debug) {
alog("user: SETIDENT for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -1765,7 +1771,9 @@ int anope_event_chgident(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -1782,8 +1790,9 @@ int anope_event_sethost(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
if (debug)
if (debug) {
alog("user: SETHOST for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -1871,7 +1880,9 @@ int anope_event_chghost(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGHOST for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGHOST for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
src/viagra.c
+20 -7
View File
@@ -438,7 +438,9 @@ int anope_event_setname(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETNAME for nonexistent user %s", source);
if (debug) {
alog("user: SETNAME for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -461,7 +463,9 @@ int anope_event_chgname(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGNAME for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -478,7 +482,9 @@ int anope_event_setident(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
alog("user: SETIDENT for nonexistent user %s", source);
if (debug) {
alog("user: SETIDENT for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -495,7 +501,9 @@ int anope_event_chgident(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGIDENT for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -517,8 +525,9 @@ int anope_event_sethost(char *source, int ac, char **av)
u = finduser(source);
if (!u) {
if (debug)
if (debug) {
alog("user: SETHOST for nonexistent user %s", source);
}
return MOD_CONT;
}
@@ -553,7 +562,9 @@ int anope_event_vs(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: VS for nonexistent user %s", av[0]);
if (debug) {
alog("user: VS for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
@@ -571,7 +582,9 @@ int anope_event_chghost(char *source, int ac, char **av)
u = finduser(av[0]);
if (!u) {
alog("user: CHGHOST for nonexistent user %s", av[0]);
if (debug) {
alog("user: CHGHOST for nonexistent user %s", av[0]);
}
return MOD_CONT;
}
version.log
+5 -1
View File
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="8"
VERSION_BUILD="601"
VERSION_BUILD="602"
# $Log$
#
# BUILD : 1.7.8 (602)
# BUGS : 308, 311
# NOTES : Fixed a couple of bugs, some smelling errors, and only in debug will nonexistent warnings display
#
# BUILD : 1.7.8 (601)
# BUGS : N/A
# NOTES : Only module subfolders which contain Makefiles will be compiled on nix