pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-25 02:46:37 +02:00
Code Activity

BUILD : 1.7.12 (914) BUGS : NOTES : Anope 1.7.12-rc1 stuffs

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


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@660 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b
2005-10-21 14:20:46 +00:00
parent 96c98e6eea
commit 4e09ffe9b4
30 changed files with 293 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+1 -1
View File
@@ -1,4 +1,4 @@
Anope Version S V N
Anope Version 1.7.12
--------------------
Provided by Anope Dev. <dev@anope.org> - 2005
10/01 A Information on uplink server can be displayed via OperServ STATS. [ #00]
Changes.conf
+2 -2
View File
@@ -1,5 +1,5 @@
Anope Version S V N
-------------------
Anope Version 1.7.12
--------------------
** ADDED CONFIGURATION DIRECTIVES **
# BSFantasyCharacter [REQUIRED]
Changes.lang
+1 -1
View File
@@ -1,4 +1,4 @@
Anope Version S V N
Anope Version 1.7.12
--------------------
*** New Strings:
OPER_STATS_UPLINK_SERVER
Changes.mysql
+1 -1
View File
@@ -1,4 +1,4 @@
Anope Version S V N
Anope Version 1.7.12
--------------------
- NONE
src/core/bs_bot.c
+2 -2
View File
@@ -101,8 +101,8 @@ int do_bot(User * u)
notice_lang(s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick);
else if (strlen(nick) > NickLen)
notice_lang(s_BotServ, u, BOT_BAD_NICK);
else if (strlen(user) >= USERMAX)
notice_lang(s_BotServ, u, BOT_BAD_IDENT);
else if (strlen(user) >= USERMAX)
notice_lang(s_BotServ, u, BOT_BAD_IDENT);
else {
NickAlias *na;
src/core/bs_fantasy_kickban.c
+2 -1
View File
@@ -62,7 +62,8 @@ int do_fantasy(int argc, char **argv)
if (argc < 3)
return MOD_CONT;
if ((stricmp(argv[0], "kickban") == 0) || (stricmp(argv[0], "kb") == 0)) {
if ((stricmp(argv[0], "kickban") == 0)
|| (stricmp(argv[0], "kb") == 0)) {
u = finduser(argv[1]);
ci = cs_findchan(argv[2]);
if (!u || !ci)
src/core/cs_access.c
+8 -4
View File
@@ -32,7 +32,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("ACCESS", do_access, NULL, CHAN_HELP_ACCESS, -1, -1,
@@ -220,7 +221,8 @@ int do_access(User * u)
}
access->level = level;
snprintf(event_access, BUFSIZE, "%d", access->level);
send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick, na->nick, event_access);
send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick,
na->nick, event_access);
alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, access->level, na->nick, nc->display, ci->name);
notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED,
access->nc->display, chan, level);
@@ -252,7 +254,8 @@ int do_access(User * u)
access->last_seen = 0;
snprintf(event_access, BUFSIZE, "%d", access->level);
send_event(EVENT_ACCESS_ADD, 4, ci->name, u->nick, na->nick, event_access);
send_event(EVENT_ACCESS_ADD, 4, ci->name, u->nick, na->nick,
event_access);
alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->username, u->host, ulev, access->level, na->nick, nc->display, ci->name);
notice_lang(s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display,
ci->name, access->level);
@@ -311,7 +314,8 @@ int do_access(User * u)
deleted = 0;
notice_lang(s_ChanServ, u, PERMISSION_DENIED);
} else {
send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, na->nick);
send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick,
na->nick);
notice_lang(s_ChanServ, u, CHAN_ACCESS_DELETED,
access->nc->display, ci->name);
alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", s_ChanServ, u->nick, u->username, u->host, get_access(u, ci), na->nick, access->nc->display, chan);
src/core/cs_xop.c
+11 -7
View File
@@ -98,10 +98,11 @@ int AnopeInit(int argc, char **argv)
c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1);
moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
if (ircd->halfop) {
c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, -1);
moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
}
if (ircd->halfop) {
c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1,
-1);
moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
}
c = createCommand("SOP", do_sop, NULL, CHAN_HELP_SOP, -1, -1, -1, -1);
moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
c = createCommand("VOP", do_vop, NULL, CHAN_HELP_VOP, -1, -1, -1, -1);
@@ -330,11 +331,13 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs)
snprintf(event_access, BUFSIZE, "%d", access->level);
if (!change) {
send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick, na->nick, event_access);
send_event(EVENT_ACCESS_CHANGE, 4, ci->name, u->nick, na->nick,
event_access);
notice_lang(s_ChanServ, u, xmsgs[3], access->nc->display,
ci->name);
} else {
send_event(EVENT_ACCESS_ADD, 4, ci->name, u->nick, na->nick, event_access);
send_event(EVENT_ACCESS_ADD, 4, ci->name, u->nick, na->nick,
event_access);
notice_lang(s_ChanServ, u, xmsgs[4], access->nc->display,
ci->name);
}
@@ -394,7 +397,8 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs)
deleted = 0;
notice_lang(s_ChanServ, u, PERMISSION_DENIED);
} else {
send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick, na->nick);
send_event(EVENT_ACCESS_DEL, 3, ci->name, u->nick,
na->nick);
notice_lang(s_ChanServ, u, xmsgs[8], access->nc->display,
ci->name);
access->nc = NULL;
src/core/ms_rsend.c
+2 -1
View File
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("RSEND", do_rsend, NULL, MEMO_HELP_RSEND, -1, -1, -1,
-1);
src/core/ms_send.c
+2 -1
View File
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("SEND", do_send, NULL, MEMO_HELP_SEND, -1, -1, -1,
-1);
src/core/ms_sendall.c
+2 -1
View File
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("SENDALL", do_sendall, is_services_admin, -1, -1, -1,
MEMO_HELP_SENDALL, MEMO_HELP_SENDALL);
src/core/ms_staff.c
+2 -1
View File
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("STAFF", do_staff, is_services_oper, -1, -1,
MEMO_HELP_STAFF, MEMO_HELP_STAFF, MEMO_HELP_STAFF);
src/core/ns_info.c
+2 -1
View File
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("INFO", do_info, NULL, NICK_HELP_INFO, -1,
src/core/ns_saset.c
+56 -44
View File
@@ -47,41 +47,41 @@ int AnopeInit(int argc, char **argv)
c = createCommand("SASET", do_saset, is_services_admin, -1, -1, -1,
NICK_HELP_SASET, NICK_HELP_SASET);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET DISPLAY", NULL, is_services_admin, NICK_HELP_SASET_DISPLAY, -1,
-1, -1, -1);
c = createCommand("SASET DISPLAY", NULL, is_services_admin,
NICK_HELP_SASET_DISPLAY, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET PASSWORD", NULL, is_services_admin, NICK_HELP_SASET_PASSWORD,
-1, -1, -1, -1);
c = createCommand("SASET PASSWORD", NULL, is_services_admin,
NICK_HELP_SASET_PASSWORD, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET URL", NULL, is_services_admin, NICK_HELP_SASET_URL, -1, -1, -1,
-1);
c = createCommand("SASET URL", NULL, is_services_admin,
NICK_HELP_SASET_URL, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET EMAIL", NULL, is_services_admin, NICK_HELP_SASET_EMAIL, -1, -1,
-1, -1);
c = createCommand("SASET EMAIL", NULL, is_services_admin,
NICK_HELP_SASET_EMAIL, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET ICQ", NULL, is_services_admin, NICK_HELP_SASET_ICQ, -1, -1, -1,
-1);
c = createCommand("SASET ICQ", NULL, is_services_admin,
NICK_HELP_SASET_ICQ, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET GREET", NULL, is_services_admin, NICK_HELP_SASET_GREET, -1, -1,
-1, -1);
c = createCommand("SASET GREET", NULL, is_services_admin,
NICK_HELP_SASET_GREET, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET KILL", NULL, is_services_admin, NICK_HELP_SASET_KILL, -1, -1,
-1, -1);
c = createCommand("SASET KILL", NULL, is_services_admin,
NICK_HELP_SASET_KILL, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET SECURE", NULL, is_services_admin, NICK_HELP_SASET_SECURE, -1,
-1, -1, -1);
c = createCommand("SASET SECURE", NULL, is_services_admin,
NICK_HELP_SASET_SECURE, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET PRIVATE", NULL, is_services_admin, NICK_HELP_SASET_PRIVATE, -1,
-1, -1, -1);
c = createCommand("SASET PRIVATE", NULL, is_services_admin,
NICK_HELP_SASET_PRIVATE, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET MSG", NULL, is_services_admin, NICK_HELP_SASET_MSG, -1, -1, -1,
-1);
c = createCommand("SASET MSG", NULL, is_services_admin,
NICK_HELP_SASET_MSG, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET HIDE", NULL, is_services_admin, NICK_HELP_SASET_HIDE, -1, -1,
-1, -1);
c = createCommand("SASET HIDE", NULL, is_services_admin,
NICK_HELP_SASET_HIDE, -1, -1, -1, -1);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
c = createCommand("SASET NOEXPIRE", is_services_admin, NULL, -1, -1, -1,
NICK_HELP_SASET_NOEXPIRE,
c = createCommand("SASET NOEXPIRE", is_services_admin, NULL, -1, -1,
-1, NICK_HELP_SASET_NOEXPIRE,
NICK_HELP_SASET_NOEXPIRE);
moduleAddCommand(NICKSERV, c, MOD_UNIQUE);
@@ -106,8 +106,8 @@ void AnopeFini(void)
**/
void myNickServHelp(User * u)
{
if (is_services_admin(u))
notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET);
if (is_services_admin(u))
notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET);
}
/**
@@ -117,7 +117,7 @@ void myNickServHelp(User * u)
**/
int do_saset(User * u)
{
char *nick = strtok(NULL, " ");
char *nick = strtok(NULL, " ");
char *cmd = strtok(NULL, " ");
char *param = strtok(NULL, " ");
@@ -127,12 +127,12 @@ int do_saset(User * u)
notice_lang(s_NickServ, u, NICK_SASET_DISABLED);
return MOD_CONT;
}
if (!(na = findnick(nick))) {
if (!(na = findnick(nick))) {
notice_lang(s_NickServ, u, NICK_SASET_BAD_NICK, nick);
return MOD_CONT;
}
return MOD_CONT;
}
if (!param
&& (!cmd
|| (stricmp(cmd, "URL") != 0 && stricmp(cmd, "EMAIL") != 0
@@ -190,7 +190,8 @@ int do_saset_display(User * u, NickCore * nc, char *param)
}
if (i == nc->aliases.count) {
notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_INVALID, nc->display);
notice_lang(s_NickServ, u, NICK_SASET_DISPLAY_INVALID,
nc->display);
return MOD_CONT;
}
@@ -228,7 +229,8 @@ int do_saset_password(User * u, NickCore * nc, char *param)
memset(param, 0, len);
alog("%s: Failed to encrypt password for %s (set)", s_NickServ,
nc->display);
notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_FAILED, nc->display);
notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_FAILED,
nc->display);
return MOD_CONT;
}
@@ -236,14 +238,17 @@ int do_saset_password(User * u, NickCore * nc, char *param)
notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display);
#else
nc->pass = sstrdup(param);
notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display, nc->pass);
notice_lang(s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display,
nc->pass);
#endif
alog("%s: %s!%s@%s used SASET PASSWORD on %s (e-mail: %s)", s_NickServ, u->nick, u->username, u->host, nc->display, (nc->email ? nc->email : "none"));
alog("%s: %s!%s@%s used SASET PASSWORD on %s (e-mail: %s)", s_NickServ,
u->nick, u->username, u->host, nc->display,
(nc->email ? nc->email : "none"));
if (WallSetpass)
anope_cmd_global(s_NickServ,
"\2%s\2 used SASET PASSWORD on \2%s\2",
u->nick, nc->display);
"\2%s\2 used SASET PASSWORD on \2%s\2",
u->nick, nc->display);
return MOD_CONT;
}
@@ -254,7 +259,8 @@ int do_saset_url(User * u, NickCore * nc, char *param)
if (param) {
nc->url = sstrdup(param);
notice_lang(s_NickServ, u, NICK_SASET_URL_CHANGED, nc->display, param);
notice_lang(s_NickServ, u, NICK_SASET_URL_CHANGED, nc->display,
param);
} else {
nc->url = NULL;
notice_lang(s_NickServ, u, NICK_SASET_URL_UNSET, nc->display);
@@ -277,14 +283,17 @@ int do_saset_email(User * u, NickCore * nc, char *param)
return MOD_CONT;
}
alog("%s: %s!%s@%s used SASET EMAIL on %s (e-mail: %s)", s_NickServ, u->nick, u->username, u->host, nc->display, (nc->email ? nc->email : "none"));
alog("%s: %s!%s@%s used SASET EMAIL on %s (e-mail: %s)", s_NickServ,
u->nick, u->username, u->host, nc->display,
(nc->email ? nc->email : "none"));
if (nc->email)
free(nc->email);
if (param) {
nc->email = sstrdup(param);
notice_lang(s_NickServ, u, NICK_SASET_EMAIL_CHANGED, nc->display, param);
notice_lang(s_NickServ, u, NICK_SASET_EMAIL_CHANGED, nc->display,
param);
} else {
nc->email = NULL;
notice_lang(s_NickServ, u, NICK_SASET_EMAIL_UNSET, nc->display);
@@ -300,7 +309,8 @@ int do_saset_icq(User * u, NickCore * nc, char *param)
notice_lang(s_NickServ, u, NICK_SASET_ICQ_INVALID, param);
} else {
nc->icq = tmp;
notice_lang(s_NickServ, u, NICK_SASET_ICQ_CHANGED, nc->display, param);
notice_lang(s_NickServ, u, NICK_SASET_ICQ_CHANGED, nc->display,
param);
}
} else {
nc->icq = 0;
@@ -322,7 +332,8 @@ int do_saset_greet(User * u, NickCore * nc, char *param)
(end ? end : ""));
nc->greet = sstrdup(buf);
notice_lang(s_NickServ, u, NICK_SASET_GREET_CHANGED, nc->display, buf);
notice_lang(s_NickServ, u, NICK_SASET_GREET_CHANGED, nc->display,
buf);
} else {
nc->greet = NULL;
notice_lang(s_NickServ, u, NICK_SASET_GREET_UNSET, nc->display);
@@ -368,7 +379,8 @@ int do_saset_secure(User * u, NickCore * nc, char *param)
nc->flags &= ~NI_SECURE;
notice_lang(s_NickServ, u, NICK_SASET_SECURE_OFF, nc->display);
} else {
syntax_error(s_NickServ, u, "SASET SECURE", NICK_SASET_SECURE_SYNTAX);
syntax_error(s_NickServ, u, "SASET SECURE",
NICK_SASET_SECURE_SYNTAX);
}
return MOD_CONT;
}
src/core/ns_set.c
+7 -9
View File
@@ -113,13 +113,13 @@ int do_set(User * u)
{
char *cmd = strtok(NULL, " ");
char *param = strtok(NULL, " ");
NickAlias *na = u->na;
NickAlias *na = u->na;
if (readonly) {
notice_lang(s_NickServ, u, NICK_SET_DISABLED);
return MOD_CONT;
}
if (!param
&& (!cmd
|| (stricmp(cmd, "URL") != 0 && stricmp(cmd, "EMAIL") != 0
@@ -197,8 +197,7 @@ int do_set_password(User * u, NickCore * nc, char *param)
{
int len = strlen(param);
if (stricmp(nc->display, param) == 0
|| (StrictPasswords && len < 5)) {
if (stricmp(nc->display, param) == 0 || (StrictPasswords && len < 5)) {
notice_lang(s_NickServ, u, MORE_OBSCURE_PASSWORD);
return MOD_CONT;
}
@@ -225,8 +224,7 @@ int do_set_password(User * u, NickCore * nc, char *param)
#endif
alog("%s: %s!%s@%s (e-mail: %s) changed its password.", s_NickServ,
u->nick, u->username, u->host,
(nc->email ? nc->email : "none"));
u->nick, u->username, u->host, (nc->email ? nc->email : "none"));
return MOD_CONT;
}
@@ -277,8 +275,8 @@ int do_set_email(User * u, NickCore * nc, char *param)
}
alog("%s: %s!%s@%s (e-mail: %s) changed its e-mail to %s.",
s_NickServ, u->nick, u->username, u->host,
(nc->email ? nc->email : "none"), (param ? param : "none"));
s_NickServ, u->nick, u->username, u->host,
(nc->email ? nc->email : "none"), (param ? param : "none"));
if (nc->email)
free(nc->email);
src/core/os_akill.c
+3 -2
View File
@@ -35,7 +35,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("AKILL", do_akill, is_services_oper, OPER_HELP_AKILL,
-1, -1, -1, -1);
@@ -183,7 +184,7 @@ int do_akill(User * u)
notice_lang(s_OperServ, u, READ_ONLY_MODE);
}
if (AddAkiller) {
free(reason);
free(reason);
}
} else {
syntax_error(s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX);
src/core/os_chankill.c
+2 -1
View File
@@ -29,7 +29,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("CHANKILL", do_chankill, is_services_admin,
src/core/os_modload.c
+4 -3
View File
@@ -36,7 +36,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("MODLOAD", do_modload, is_services_root, -1, -1, -1,
@@ -82,8 +83,8 @@ int do_modload(User * u)
syntax_error(s_OperServ, u, "MODLOAD", OPER_MODULE_LOAD_SYNTAX);
return MOD_CONT;
}
if (!queueModuleLoad(name, u))
if (!queueModuleLoad(name, u))
notice_lang(s_OperServ, u, OPER_MODULE_LOAD_FAIL, name);
return MOD_CONT;
}
src/core/os_modunload.c
+4 -3
View File
@@ -35,7 +35,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("MODUNLOAD", do_modunload, is_services_root, -1, -1,
@@ -82,8 +83,8 @@ int do_modunload(User * u)
OPER_MODULE_UNLOAD_SYNTAX);
return MOD_CONT;
}
if (!queueModuleUnload(name, u))
if (!queueModuleUnload(name, u))
notice_lang(s_OperServ, u, OPER_MODULE_REMOVE_FAIL, name);
return MOD_CONT;
}
src/core/os_stats.c
+127 -115
View File
@@ -35,7 +35,8 @@ int AnopeInit(int argc, char **argv)
Command *c;
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(CORE);
c = createCommand("STATS", do_stats, is_services_oper, OPER_HELP_STATS,
@@ -75,17 +76,17 @@ void myOperServHelp(User * u)
* @param s The server to start counting from
* @return Amount of servers connected to server s
**/
int stats_count_servers(Server *s)
int stats_count_servers(Server * s)
{
int count = 1;
while (s) {
if (s->links)
count += stats_count_servers(s->links);
s = s->next;
}
return count;
int count = 1;
while (s) {
if (s->links)
count += stats_count_servers(s->links);
s = s->next;
}
return count;
}
/**
@@ -101,9 +102,9 @@ int do_stats(User * u)
mins = (uptime / 60) % 60, secs = uptime % 60;
struct tm *tm;
char timebuf[64];
char buf[512];
int buflen;
int i;
char buf[512];
int buflen;
int i;
if (extra && stricmp(extra, "ALL") != 0) {
if (stricmp(extra, "AKILL") == 0) {
@@ -232,108 +233,119 @@ int do_stats(User * u)
notice_lang(s_OperServ, u, OPER_STATS_UNKNOWN_OPTION, extra);
}
}
if (!extra || ((stricmp(extra, "MEMORY") != 0) && (stricmp(extra, "UPLINK") != 0))) {
notice_lang(s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt, opcnt);
tm = localtime(&maxusertime);
strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT,
tm);
notice_lang(s_OperServ, u, OPER_STATS_MAX_USERS, maxusercnt, timebuf);
if (days > 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_DHMS,
days, hours, mins, secs);
} else if (days == 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1DHMS,
days, hours, mins, secs);
} else {
if (hours > 1) {
if (mins != 1) {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HMS,
hours, mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HM1S,
hours, mins, secs);
}
} else {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1MS,
hours, mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1M1S,
hours, mins, secs);
}
}
} else if (hours == 1) {
if (mins != 1) {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HMS,
hours, mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HM1S,
hours, mins, secs);
}
} else {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1H1MS,
hours, mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1H1M1S,
hours, mins, secs);
}
}
} else {
if (mins != 1) {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_MS,
mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_M1S,
mins, secs);
}
} else {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1MS,
mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1M1S,
mins, secs);
}
}
}
}
if (!extra
|| ((stricmp(extra, "MEMORY") != 0)
&& (stricmp(extra, "UPLINK") != 0))) {
notice_lang(s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt,
opcnt);
tm = localtime(&maxusertime);
strftime_lang(timebuf, sizeof(timebuf), u,
STRFTIME_DATE_TIME_FORMAT, tm);
notice_lang(s_OperServ, u, OPER_STATS_MAX_USERS, maxusercnt,
timebuf);
if (days > 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_DHMS,
days, hours, mins, secs);
} else if (days == 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1DHMS,
days, hours, mins, secs);
} else {
if (hours > 1) {
if (mins != 1) {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HMS,
hours, mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_HM1S,
hours, mins, secs);
}
} else {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1MS,
hours, mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_H1M1S,
hours, mins, secs);
}
}
} else if (hours == 1) {
if (mins != 1) {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HMS,
hours, mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1HM1S,
hours, mins, secs);
}
} else {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1H1MS,
hours, mins, secs);
} else {
notice_lang(s_OperServ, u,
OPER_STATS_UPTIME_1H1M1S, hours, mins,
secs);
}
}
} else {
if (mins != 1) {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_MS,
mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_M1S,
mins, secs);
}
} else {
if (secs != 1) {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1MS,
mins, secs);
} else {
notice_lang(s_OperServ, u, OPER_STATS_UPTIME_1M1S,
mins, secs);
}
}
}
}
}
if (extra && ((stricmp(extra, "ALL") == 0) || (stricmp(extra, "UPLINK") == 0)) && is_services_admin(u)) {
buf[0] = '\0';
buflen = 511; /* How confusing, this is the amount of space left! */
for (i = 0; capab_info[i].token; i++) {
if (uplink_capab & capab_info[i].flag) {
strncat(buf, " ", buflen);
buflen--;
strncat(buf, capab_info[i].token, buflen);
buflen -= strlen(capab_info[i].token);
/* Special cases */
if (capab_info[i].flag == CAPAB_CHANMODE) {
strncat(buf, "=", buflen);
buflen--;
strncat(buf, ircd->chanmodes, buflen);
buflen -= strlen(ircd->chanmodes);
}
if (capab_info[i].flag == CAPAB_NICKCHARS) {
strncat(buf, "=", buflen);
buflen--;
strncat(buf, ircd->nickchars, buflen);
buflen -= strlen(ircd->nickchars);
}
}
}
notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER, serv_uplink->name);
notice_lang(s_OperServ, u, OPER_STATS_UPLINK_CAPAB, buf);
notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER_COUNT, stats_count_servers(serv_uplink));
}
if (extra && ((stricmp(extra, "ALL") == 0) || (stricmp(extra, "MEMORY") == 0)) && is_services_admin(u)) {
if (extra
&& ((stricmp(extra, "ALL") == 0)
|| (stricmp(extra, "UPLINK") == 0)) && is_services_admin(u)) {
buf[0] = '\0';
buflen = 511; /* How confusing, this is the amount of space left! */
for (i = 0; capab_info[i].token; i++) {
if (uplink_capab & capab_info[i].flag) {
strncat(buf, " ", buflen);
buflen--;
strncat(buf, capab_info[i].token, buflen);
buflen -= strlen(capab_info[i].token);
/* Special cases */
if (capab_info[i].flag == CAPAB_CHANMODE) {
strncat(buf, "=", buflen);
buflen--;
strncat(buf, ircd->chanmodes, buflen);
buflen -= strlen(ircd->chanmodes);
}
if (capab_info[i].flag == CAPAB_NICKCHARS) {
strncat(buf, "=", buflen);
buflen--;
strncat(buf, ircd->nickchars, buflen);
buflen -= strlen(ircd->nickchars);
}
}
}
notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER,
serv_uplink->name);
notice_lang(s_OperServ, u, OPER_STATS_UPLINK_CAPAB, buf);
notice_lang(s_OperServ, u, OPER_STATS_UPLINK_SERVER_COUNT,
stats_count_servers(serv_uplink));
}
if (extra
&& ((stricmp(extra, "ALL") == 0)
|| (stricmp(extra, "MEMORY") == 0)) && is_services_admin(u)) {
long count, mem;
notice_lang(s_OperServ, u, OPER_STATS_BYTES_READ,
src/protocol/bahamut.c
+3 -2
View File
@@ -740,7 +740,7 @@ void bahamut_cmd_svsadmin(char *server, int set)
/* SGLINE */
void bahamut_cmd_sgline(char *mask, char *reason)
{
send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
send_cmd(NULL, "SGLINE %d :%s:%s", (int) strlen(mask), mask, reason);
}
/* RAKILL */
@@ -1628,7 +1628,8 @@ int AnopeInit(int argc, char **argv)
{
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(PROTOCOL);
pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*");
src/protocol/hybrid.c
+27 -27
View File
@@ -1204,34 +1204,34 @@ void hybrid_cmd_351(char *source)
/* Event: PROTOCTL */
int anope_event_capab(char *source, int ac, char **av)
{
int argvsize = 8;
int argc;
char **argv;
char *str;
if (ac < 1)
return MOD_CONT;
/* We get the params as one arg, we should split it for capab_parse */
argv = scalloc(argvsize, sizeof(char *));
argc = 0;
while ((str = myStrGetToken(av[0], ' ', argc))) {
if (argc == argvsize) {
argvsize += 8;
argv = srealloc(argv, argvsize * sizeof(char *));
}
argv[argc] = str;
argc++;
}
int argvsize = 8;
int argc;
char **argv;
char *str;
if (ac < 1)
return MOD_CONT;
/* We get the params as one arg, we should split it for capab_parse */
argv = scalloc(argvsize, sizeof(char *));
argc = 0;
while ((str = myStrGetToken(av[0], ' ', argc))) {
if (argc == argvsize) {
argvsize += 8;
argv = srealloc(argv, argvsize * sizeof(char *));
}
argv[argc] = str;
argc++;
}
capab_parse(argc, argv);
/* Free our built ac/av */
for (argvsize = 0; argvsize < argc; argvsize++) {
free(argv[argvsize]);
}
free(argv);
/* Free our built ac/av */
for (argvsize = 0; argvsize < argc; argvsize++) {
free(argv[argvsize]);
}
free(argv);
return MOD_CONT;
}
src/protocol/plexus.c
+2
View File
@@ -1,3 +1,4 @@
/* PlexusIRCD IRCD functions
/* PlexusIRCD IRCD functions
*
* (C) 2003-2005 Anope Team
@@ -1851,3 +1852,4 @@ AnopeInit (int argc, char **argv)
}
/* EOF */
src/protocol/ptlink.c
+2
View File
@@ -1,3 +1,4 @@
/* PTLink IRCD functions
/* PTLink IRCD functions
*
* (C) 2003-2005 Anope Team
@@ -1717,3 +1718,4 @@ int AnopeInit(int argc, char **argv)
}
/* EOF */
src/protocol/rageircd.c
+4 -3
View File
@@ -1,3 +1,4 @@
/* Rage IRCD functions
/* Rage IRCD functions
*
* (C) 2003-2005 Anope Team
@@ -561,7 +562,6 @@ void moduleAddIRCDMsgs(void) {
}
/* *INDENT-ON* */
int anope_event_error(char *source, int ac, char **av)
{
if (ac >= 1) {
if (debug) {
@@ -628,7 +628,7 @@ void rageircd_cmd_svsadmin(char *server, int set)
void rageircd_cmd_sgline(char *mask, char *reason)
{
send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
send_cmd(NULL, "SGLINE %d :%s:%s", (int) strlen(mask), mask, reason);
}
@@ -1625,7 +1625,8 @@ int AnopeInit(int argc, char **argv)
{
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(PROTOCOL);
pmodule_ircd_version("RageIRCd 2.0.x");
src/protocol/ratbox.c
+2 -1
View File
@@ -1360,7 +1360,8 @@ void ratbox_cmd_nick(char *nick, char *name, char *mode)
(long int) time(NULL), mode, ServiceUser, ServiceHost,
ServerName, name);
}
send_cmd(UseTS6 ? nicknumbuf : nick, "RESV * %s :%s", nick, "Reserved for services");
send_cmd(UseTS6 ? nicknumbuf : nick, "RESV * %s :%s", nick,
"Reserved for services");
}
void ratbox_cmd_kick(char *source, char *chan, char *user, char *buf)
src/protocol/solidircd.c
+3 -2
View File
@@ -764,7 +764,7 @@ void solidircd_cmd_svsadmin(char *server, int set)
/* SGLINE */
void solidircd_cmd_sgline(char *mask, char *reason)
{
send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
send_cmd(NULL, "SGLINE %d :%s:%s", (int) strlen(mask), mask, reason);
}
/* RAKILL */
@@ -1656,7 +1656,8 @@ int AnopeInit(int argc, char **argv)
{
moduleAddAuthor("Anope");
moduleAddVersion("$Id$");
moduleAddVersion
("$Id$");
moduleSetType(PROTOCOL);
pmodule_ircd_version("Solid-IRCd 3.4.*");
src/protocol/ultimate3.c
+1 -1
View File
@@ -703,7 +703,7 @@ void ultimate3_cmd_svsadmin(char *server, int set)
void ultimate3_cmd_sgline(char *mask, char *reason)
{
send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
send_cmd(NULL, "SGLINE %d :%s:%s", (int) strlen(mask), mask, reason);
}
void ultimate3_cmd_remove_akill(char *user, char *host)
src/protocol/viagra.c
+1 -1
View File
@@ -774,7 +774,7 @@ void viagra_cmd_svsadmin(char *server, int set)
void viagra_cmd_sgline(char *mask, char *reason)
{
send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
send_cmd(NULL, "SGLINE %d :%s:%s", (int) strlen(mask), mask, reason);
}
void viagra_cmd_remove_akill(char *user, char *host)
version.log
+7 -3
View File
@@ -7,12 +7,16 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="11"
VERSION_EXTRA="-svn"
VERSION_BUILD="913"
VERSION_PATCH="12"
VERSION_EXTRA="-rc1"
VERSION_BUILD="914"
# $Log$
#
# BUILD : 1.7.12 (914)
# BUGS :
# NOTES : Anope 1.7.12-rc1 stuffs
#
# BUILD : 1.7.11 (913)
# BUGS :
# NOTES : Turned NickLen into RECOMMENDED and BSFantasyCharacter into OPTIONAL