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

Made help system fall back to the highest help string available instead of giving "no help" to services opers etc everywhere.

Browse Source 
Fixes bug #1102 and any other bugs related to it.


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2473 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
adam-
2009-08-26 22:35:43 +00:00
parent d3d36ff73c
commit d468567a12
2 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/commands.c
+36 -35
View File
@@ -167,6 +167,8 @@ void do_help_cmd(char *service, User * u, Command * c, const char *cmd)
const char *p1 = NULL, *p2 = NULL, *p3 = NULL, *p4 = NULL;
Module *calling_module = mod_current_module;
char *calling_module_name = mod_current_module_name;
int help_message;
int (*help_message_ptr)(User *u);
for (current = c; (current) && (cont == MOD_CONT);
current = current->next) {
@@ -180,6 +182,10 @@ void do_help_cmd(char *service, User * u, Command * c, const char *cmd)
p2 = current->help_param2;
p3 = current->help_param3;
p4 = current->help_param4;
help_message = 0;
help_message_ptr = NULL;
if (current->helpmsg_all >= 0) {
notice_help(service, u, current->helpmsg_all, p1, p2, p3, p4);
has_had_help = 1;
@@ -187,43 +193,38 @@ void do_help_cmd(char *service, User * u, Command * c, const char *cmd)
cont = current->all_help(u);
has_had_help = 1;
}
if (is_services_root(u)) {
if (current->helpmsg_root >= 0) {
notice_help(service, u, current->helpmsg_root, p1, p2, p3,
p4);
has_had_help = 1;
} else if (current->root_help) {
cont = current->root_help(u);
has_had_help = 1;
}
} else if (is_services_admin(u)) {
if (current->helpmsg_admin >= 0) {
notice_help(service, u, current->helpmsg_admin, p1, p2, p3,
p4);
has_had_help = 1;
} else if (current->admin_help) {
cont = current->admin_help(u);
has_had_help = 1;
}
} else if (is_services_oper(u)) {
if (current->helpmsg_oper >= 0) {
notice_help(service, u, current->helpmsg_oper, p1, p2, p3,
p4);
has_had_help = 1;
} else if (current->oper_help) {
cont = current->oper_help(u);
has_had_help = 1;
}
if (is_services_root(u) && (current->helpmsg_root >= 0 || current->root_help)) {
if (current->helpmsg_root >= 0)
help_message = current->helpmsg_root;
else if (current->root_help)
help_message_ptr = current->root_help;
} else if (is_services_admin(u) && (current->helpmsg_admin >= 0 || current->admin_help)) {
if (current->helpmsg_admin >= 0)
help_message = current->helpmsg_admin;
else if (current->admin_help)
help_message_ptr = current->admin_help;
} else if (is_services_oper(u) && (current->helpmsg_oper >= 0 || current->oper_help)) {
if (current->helpmsg_oper >= 0)
help_message = current->helpmsg_oper;
else if (current->oper_help)
help_message_ptr = current->oper_help;
} else {
if (current->helpmsg_reg >= 0) {
notice_help(service, u, current->helpmsg_reg, p1, p2, p3,
p4);
has_had_help = 1;
} else if (current->regular_help) {
cont = current->regular_help(u);
has_had_help = 1;
}
/* Shouldn't we check for the user to be identified? */
if (current->helpmsg_reg >= 0)
help_message = current->helpmsg_reg;
else if (current->regular_help)
help_message_ptr = current->regular_help;
}
if (help_message) {
notice_lang(service, u, help_message, p1, p2, p3, p4);
has_had_help = 1;
} else if (help_message_ptr) {
cont = help_message_ptr(u);
has_had_help = 1;
}
}
if (has_had_help == 0) {
notice_lang(service, u, NO_HELP_AVAILABLE, cmd);
version.log
+2 -1
View File
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="2"
VERSION_EXTRA="-svn"
VERSION_BUILD="2472"
VERSION_BUILD="2473"
# $Log$ # Changes since 1.8.2 Release
#Revision 2473 - Made help system fall back to the highest help string available instead of giving "no help" to services opers everywhere
#Revision 2472 - Show services opers /nickserv help saset
#Revision 2471 - Fixed a bug in help to show /chanserv help (un)suspend and /nickserv help (un)suspend to services operators
#Revision 2448 - Updated Turkish language file