[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-05-18 16:03:37
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-05-18 16:03:23 UTC Modified files: ChangeLog.X3 src/chanserv.help src/global.c src/global.help src/modcmd.c src/modcmd.h src/nickserv.c src/nickserv.help src/opserv.c src/opserv.help Log message: Fixed up the help system some more, and some other small changes. ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.30 x3/ChangeLog.X3:1.31 --- x3/ChangeLog.X3:1.30 Mon May 16 20:45:28 2005 +++ x3/ChangeLog.X3 Wed May 18 09:03:12 2005 @@ -1,6 +1,27 @@ /*********************************************************************** X3 ChangeLog +2005-05-18 Alex Schumann <ru...@af...> + + * src/modcmd.c: Fixed up the help system (again) + + * src/modcmd.h: Fixed up the help system (again) + + * src/global.c: Fixed syntax display + + * src/chanserv.help: Removed =---= formatting, fixed a few things. + + * src/nickserv.help: Removed =---= formatting, fixed a few things. + + * src/opserv.help: Removed =---= formatting, fixed a few things. + + * src/global.help: simplified index + + * src/nickserv.c: Changed message users get when their email is + already used for an account, fixed syntax help + + * src/opserv.c: fixed syntax help + 2005-05-16 Alex Schumann <ru...@af...> * src/chanserv.help: Fixed a couple ban/lamer conversions i missed in @@ -189,5 +210,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.30 $" +#define CVS_VERSION "$Revision: 1.31 $" Index: x3/src/chanserv.help diff -u x3/src/chanserv.help:1.14 x3/src/chanserv.help:1.15 --- x3/src/chanserv.help:1.14 Mon May 16 20:45:28 2005 +++ x3/src/chanserv.help Wed May 18 09:03:13 2005 @@ -1,12 +1,16 @@ -"<INDEX>" ("=--------------- $b$C Help$b --------------=", +"<INDEX>" ( " Hello there! ", + " I'm $C, your handy channel services bot.", + " $b$b", " Please select the area you would like ", " help with from the list below. The ", " help system uses the format: ", " $b/MSG $C HELP <$bsubject$b>$b ", + " (In help, Words in <> represent required", + " paramiters. Words in [] are optional.)", " For example: $b/msg $C HELP UBM$b ", - " shows help with the UnBanMe command. ", - "=--------------------------------------=", + " shows help with the Un-Ban Me command. ", + "=---------------------------------------=", " GENERAL - How to use $C ", " USER - Commands to add and remove", " bans, ops and managers from ", @@ -16,9 +20,11 @@ " and topic.", " INFORMATION - Informative commands.", " OPER - Commands for IRC Operators.", - "=--------------------------------------=", + "$b$b", + "Also see $b/MSG $N HELP$b for getting", + "and maintaining your user account." ); -"USER" ("=-- $bUserlist Management Commands:$b ---=", +"USER" ("$bUserlist Management Commands:$b", " $bUSERS$b Show the channels userlist.", " $bCLIST$b Show all COOWNERs of a channel.", " $bMLIST$b Show all MANAGERs of a channel.", @@ -54,11 +60,10 @@ "$b$b", " $bMYACCESS$b Show all channels where you have access.", " $bDELETEME$b Delete YOURSELF from the userlist.", - " $bGIVEOWNERSHIP$b Give away ownership to another user.", - "=------------- End of Help ------------=" + " $bGIVEOWNERSHIP$b Give away ownership to another user." ); -"CHANNEL" ("=-------- $bChannel Commands:$b ---------=", +"CHANNEL" ("$bChannel Commands:$b", " $bSET$b Change various channel settings.", " $bTOPIC$b Set the current topic, or reset it to the default topic.", " $bMODE$b Change a channel mode.", @@ -87,20 +92,18 @@ " $bINVITE$b Admit a user to pass through +ib modes in your channel.", "$b$b", " $bINFO$b Show numerical information about the users in a channel.", - " $bEVENTS$b View a list of events relevant to a channel.", - "=------------- End of Help ------------=" + " $bEVENTS$b View a list of events relevant to a channel." ); -"INFORMATION" ("=------- $bInformative Commands:$b ------=", +"INFORMATION" ("$bInformative Commands:$b", " $bVERSION$b Check the current running version of $C.", " $bNETINFO$b Check current network-wide information.", " $bSTAFF$b Get a list of all the current staff.", " $bIRCOPS$b Get a list of all the current IRC operators.", " $bHELPERS$b Get a list of all the current support helpers.", " $bPEEK$b Reveal information on a channel's modes, topic and ops.", - " $bCOMMAND$b Display some information about a command.", - "=------------- End of Help ------------=" + " $bCOMMAND$b Display some information about a command." ); -"OPER" ("=-- $bHelper/IRC Operator commands:$b ---=", +"OPER" ("$bHelper/IRC Operator commands:$b", " $bGOD$b Turn security override on/off.", " $bOPCHAN$b Force $C to op itself in a channel.", "$b$b", @@ -124,11 +127,10 @@ " $bCREATENOTE$b Create a new note type.", " $bREMOVENOTE$b Remove an existing note type.", "*$bSAY$b Have $C say a message in a channel.", - "*$bEMOTE$b Equivalent to $C doing a /me in a channel.", - "=------------- End of Help ------------=" + "*$bEMOTE$b Equivalent to $C doing a /me in a channel." ); -"GENERAL" ("=----------- General Help -------------=", +"GENERAL" ( " NOTE: Before using $C or being added ", " to channel userlists, users must ", " register an account with $b$N$b. ", @@ -157,12 +159,11 @@ " expected as well. ", " See $b/msg $C HELP <COMMAND>$b for the ", " exact syntax of each command. ", - "=---------- For more info see ----------=", - " http://www.afternet.org/support ", - "=---------------------------------------=" + "=---------- For more info see: ---------=", + " http://www.afternet.org/support " ); -"LOGIN" ("=-- Logging In --=", +"LOGIN" ( " Please login using:", " /MSG $N AUTH <account> <password>", " or the shortcut:", Index: x3/src/global.c diff -u x3/src/global.c:1.3 x3/src/global.c:1.4 --- x3/src/global.c:1.3 Sat Mar 12 12:13:14 2005 +++ x3/src/global.c Wed May 18 09:03:13 2005 @@ -62,7 +62,7 @@ { NULL, NULL } }; -#define GLOBAL_SYNTAX() svccmd_send_help(user, global, cmd) +#define GLOBAL_SYNTAX() svccmd_send_help_brief(user, global, cmd) #define GLOBAL_FUNC(NAME) MODCMD_FUNC(NAME) struct userNode *global; Index: x3/src/global.help diff -u x3/src/global.help:1.2 x3/src/global.help:1.3 --- x3/src/global.help:1.2 Sun Mar 6 19:51:24 2005 +++ x3/src/global.help Wed May 18 09:03:13 2005 @@ -1,4 +1,4 @@ -"<INDEX>" ("$b$G Help$b", +"<INDEX>" ( "The $b$G$b service allows network administrators to manage and send important notices to users. It also allows users to retrieve, at once, all messages addressed to them.", "$bUser Commands:$b", " MESSAGES Sends you all messages addressed to your user class.", Index: x3/src/modcmd.c diff -u x3/src/modcmd.c:1.15 x3/src/modcmd.c:1.16 --- x3/src/modcmd.c:1.15 Thu May 5 17:30:51 2005 +++ x3/src/modcmd.c Wed May 18 09:03:13 2005 @@ -55,8 +55,11 @@ { "MCMSG_NO_CHANNEL_BEFORE", "You may not give a channel name before this command." }, { "MCMSG_NO_PLUS_CHANNEL", "You may not use a +channel with this command." }, { "MCMSG_COMMAND_ALIASES", "%s is an alias for: %s" }, -/* { "MCMSG_HELP_COMMAND_ALIAS_FOR", "$bALIAS FOR:$b %s" },*/ { "MCMSG_HELP_COMMAND_ALIAS", "$uAlias for:$u %s" }, + { "MCMSG_HELP_COMMAND_HEADER", "Command help for: $b%s$b" }, + { "MCMSG_HELP_TOPIC_HEADER", "Help topic: $b%s$b" }, + { "MCMSG_HELP_DIVIDER", "=---------------------------------------=" }, + { "MCMSG_HELP_FOOTER", "=------------- End of Help -------------=" }, { "MCMSG_COMMAND_BINDING", "%s is a binding of: %s" }, { "MCMSG_ALIAS_ERROR", "Error in alias expansion for %s; check the error log for details." }, { "MCMSG_INTERNAL_COMMAND", "$b%s$b is an internal command and cannot be called directly; please check command bindings." }, @@ -757,60 +760,18 @@ return 1; } -int -svccmd_send_help(struct userNode *user, struct userNode *bot, struct svccmd *cmd) { - char cmdname[MAXLEN]; - unsigned int nn; - int r; - /* Show command name (in bold). */ - for (nn=0; cmd->name[nn]; nn++) - cmdname[nn] = toupper(cmd->name[nn]); - cmdname[nn] = 0; - send_message_type(4, user, bot, "=--- $b%s$b ---=", cmdname); - - /* Show the help entry for the underlying command. */ - /* Lets not show help for a parent command, thats not what - * they asked for! - * return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name); - * TODO: We actually DO want to show the parent IF there is no other help. - */ - r = send_help(user, bot, cmd->command->parent->helpfile, cmd->name); - if(cmd->command->name && strcasecmp(cmd->command->name, cmd->name)) - { - send_message(user, bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name); - } - - /* If it's an alias, show what it's an alias for. */ - if (cmd->alias.used) { - char alias_text[MAXLEN]; - unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text); - send_message(user, bot, "MCMSG_HELP_COMMAND_ALIAS", alias_text); - } - return r; -} - +/* First line (syntax usually) only help.. used for wrong param counts etc */ int svccmd_send_help_brief(struct userNode *user, struct userNode *bot, struct svccmd *cmd) { - char cmdname[MAXLEN]; - unsigned int nn; int r; - /* Show command name (in bold). */ - for (nn=0; cmd->name[nn]; nn++) - cmdname[nn] = toupper(cmd->name[nn]); - cmdname[nn] = 0; - /* Show the help entry for the underlying command. */ - /* Lets not show help for a parent command, thats not what - * they asked for! - * return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name); - * TODO: We actually DO want to show the parent IF there is no other help. - */ /* If it's an alias, show what it's an alias for. */ if (cmd->alias.used) { char alias_text[MAXLEN]; unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text); send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, cmd->command->name); } + /* Send the syntax line of help.. */ r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->name); if(!r) { if(cmd->command->name) @@ -819,31 +780,59 @@ r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->command->name); } } - return r; } - int -svccmd_send_help_2(struct userNode *user, struct service *service, const char *topic) { +svccmd_send_help(struct userNode *user, struct service *service, const char *topic) { struct module *module; struct svccmd *cmd; - unsigned int ii; - - /* If there is a command, send help for the command */ - if ((cmd = dict_find(service->commands, topic, NULL))) - return svccmd_send_help(user, service->bot, cmd); + char cmdname[MAXLEN]; + unsigned int nn; /* If there is no topic show the index */ if (!topic) topic = "<index>"; - /* look for the thing in the included help files */ - for (ii = 0; ii < service->modules.used; ++ii) { - module = service->modules.list[ii]; - if (!module->helpfile) - continue; - if (dict_find(module->helpfile->db, topic, NULL)) - return send_help(user, service->bot, module->helpfile, topic); + /* make heading str (uppercase) */ + for (nn=0; topic[nn]; nn++) + cmdname[nn] = toupper(topic[nn]); + cmdname[nn] = 0; + + /* If there is a command 'topic', send command help for the command */ + if ((cmd = dict_find(service->commands, topic, NULL))) + { + send_message(user, service->bot, "MCMSG_HELP_COMMAND_HEADER", cmdname); + send_message(user, service->bot, "MCMSG_HELP_DIVIDER"); + send_help(user, service->bot, cmd->command->parent->helpfile, cmd->name); + + /* Show if its an alias, or a binding of another command */ + if (cmd->alias.used) + { + char alias_text[MAXLEN]; + unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text); + send_message(user, service->bot, "MCMSG_HELP_COMMAND_ALIAS", alias_text); + } + else if(cmd->command->name && strcasecmp(cmd->command->name, cmd->name)) + { + send_message(user, service->bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name); + } + send_message(user, service->bot, "MCMSG_HELP_FOOTER"); + return true; + } + else /* look for topic in the help files loaded to this nick/service */ + { + /* Check for non command help in first primary help file, then + * check for help for this on another service and provide a tip */ + module = service->modules.list[0]; + if (module->helpfile && dict_find(module->helpfile->db, topic, NULL)) + { + + send_message(user, service->bot, "MCMSG_HELP_TOPIC_HEADER", cmdname); + send_message(user, service->bot, "MCMSG_HELP_DIVIDER"); + send_help(user, service->bot, module->helpfile, topic); + send_message(user, service->bot, "MCMSG_HELP_FOOTER"); + return true; + } } /* Otherwise say we cant find it */ send_message(user, service->bot, "MSG_TOPIC_UNKNOWN"); @@ -1276,7 +1265,7 @@ const char *topic; topic = (argc < 2) ? NULL : unsplit_string(argv+1, argc-1, NULL); - return svccmd_send_help_2(user, cmd->parent, topic); + return svccmd_send_help(user, cmd->parent, topic); } static MODCMD_FUNC(cmd_timecmd) { @@ -2388,7 +2377,7 @@ service_make_alias(service, "delmanager", "*chanserv.deluser", "manager", "$1", NULL); service_make_alias(service, "delop", "*chanserv.deluser", "op", "$1", NULL); service_make_alias(service, "delpeon", "*chanserv.deluser", "peon", "$1", NULL); - service_make_alias(service, "llist", "*chanserv.lamers", "1", "$1", NULL); + service_make_alias(service, "llist", "*chanserv.lamers", "$1", NULL); service_make_alias(service, "command", "*modcmd.command", NULL); service_make_alias(service, "god", "*modcmd.god", NULL); } else if (!irccasecmp(def_binds[ii].svcname, "OpServ")) { Index: x3/src/modcmd.h diff -u x3/src/modcmd.h:1.4 x3/src/modcmd.h:1.5 --- x3/src/modcmd.h:1.4 Thu Mar 17 22:19:43 2005 +++ x3/src/modcmd.h Wed May 18 09:03:13 2005 @@ -164,7 +164,7 @@ struct svccmd *service_bind_modcmd(struct service *service, struct modcmd *cmd, const char *name); /* Send help for a command to a user. */ -int svccmd_send_help(struct userNode *user, struct userNode *bot, struct svccmd *cmd); +int svccmd_send_help(struct userNode *user, struct service *service, const char *topic); /* .. and if somebody doesn't have a modcmd handy .. */ int svccmd_send_help_2(struct userNode *user, struct service *service, const char *topic); /* Send brief help for a command to a user. */ Index: x3/src/nickserv.c diff -u x3/src/nickserv.c:1.26 x3/src/nickserv.c:1.27 --- x3/src/nickserv.c:1.26 Wed May 4 20:19:09 2005 +++ x3/src/nickserv.c Wed May 18 09:03:13 2005 @@ -157,7 +157,7 @@ { "NSMSG_HANDLE_ACTIVATED", "Your account is now activated (with the password you entered when you registered). You are now authenticated to your account." }, { "NSMSG_PASSWORD_CHANGED", "You have successfully changed your password to what you requested with the $bresetpass$b command." }, { "NSMSG_EMAIL_PROHIBITED", "%s may not be used as an email address: %s" }, - { "NSMSG_EMAIL_OVERUSED", "There are already the maximum number of accounts associated with that email address." }, + { "NSMSG_EMAIL_OVERUSED", "That email address already has an account. Use RESETPASS if you forgot your password." }, { "NSMSG_EMAIL_SAME", "That is the email address already there; no need to change it." }, { "NSMSG_EMAIL_CHANGED", "You have successfully changed your email address." }, { "NSMSG_BAD_COOKIE_TYPE", "Your account had bad cookie type %d; sorry. I am confused. Please report this bug." }, @@ -1726,7 +1726,7 @@ pw_arg = 1; } else { reply("MSG_MISSING_PARAMS", argv[0]); - svccmd_send_help(user, nickserv, cmd); + svccmd_send_help_brief(user, nickserv, cmd); return 0; } if (!hi) { Index: x3/src/nickserv.help diff -u x3/src/nickserv.help:1.11 x3/src/nickserv.help:1.12 --- x3/src/nickserv.help:1.11 Wed May 4 17:03:23 2005 +++ x3/src/nickserv.help Wed May 18 09:03:13 2005 @@ -1,7 +1,6 @@ "<INDEX>" { "/services/nickserv/disable_nicks" { "/services/nickserv/email_enabled" ( - "=------------ $b$N Help$b -----------=", " $b$N$b is an authentication service,", " providing login identification for", " the network. $N is how you 'log in'", @@ -9,6 +8,14 @@ " with $C, and its how ircops are known", " to $O and $G.", " $b$b", + " The help system uses the format:", + " $b/MSG $N HELP <$bsubject$b>$b ", + " (In help, Words in <> represent required", + " paramiters. Words in [] are optional.)", + " For example: $b/msg $N HELP RESETPASS$b", + " shows help with the command to reset a ", + " lost password.", + " $b$b", " $b$N$b help categories:", " $bACCOUNT$b Account management.", " $bEMAIL$b Email based commands", @@ -19,11 +26,9 @@ "$b$b", " $b$N is $uNOT$u a NickServ$b! ", " see $b/msg $N HELP NOT NICKSERV$b ", - " for details ", - "=--------------------------------------=" + " for details " ); "!/services/nickserv/email_enabled" ( - "=------------ $b$N Help$b -----------=", " $b$N$b is an authentication service,", " providing login identification for", " the network. $N is how you 'log in'", @@ -38,13 +43,11 @@ "$b$b", " $b$N is $uNOT$u a NickServ$b! ", " see $b/msg $N HELP NOT NICKSERV$b ", - " for details ", - "=--------------------------------------=" + " for details " ); }; "!/services/nickserv/disable_nicks" { "/services/nickserv/email_enabled" ( - "=------------ $b$N Help$b -----------=", "$b$N Help$b", "$b$N$b is a nickname and authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid. It also manages nickname ownership.", "$b$N$b command categories:", @@ -53,11 +56,9 @@ " EMAIL Email maintenance commands.", " INFORMATION Other functions.", " COMMANDS A list of all available commands.", - " OPER $N commands for IRC Operators.", - "=----------- End of Help --------------=" + " OPER $N commands for IRC Operators." ); "!/services/nickserv/email_enabled" ( - "=------------ $b$N Help$b -----------=", "$b$N Help$b", "$b$N$b is a nickname and authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid. It also manages nickname ownership.", "$b$N$b command categories:", @@ -65,8 +66,7 @@ " NICK Nick management.", " INFORMATION Other functions.", " COMMANDS A list of all available commands.", - " OPER $N commands for IRC Operators.", - "=----------- End of Help --------------=" + " OPER $N commands for IRC Operators." ); }; }; @@ -75,7 +75,6 @@ "ACCOUNT" { "/services/nickserv/enable_ghost" ( - "=------------ $bACCOUNT Help$b -----------=", " Accounts are the way that $b$C$b ", " identifies you for access to channels. ", " They are slightly similar to IRC nicks, ", @@ -93,11 +92,9 @@ " $bDELMASK$b Remove a hostmask from your account.", " $bSET$b Set per-account options.", " $bGHOST$b Disconnects your old clients", - " $bACCOUNT FLAGS$b Definition for each account flag", - "=----------- End of Help --------------=" + " $bACCOUNT FLAGS$b Definition for each account flag" ); "!/services/nickserv/enable_ghost" ( - "=------------ $bACCOUNT Help$b -----------=", " Accounts are the way that $b$C$b ", " identifies you for access to channels. ", " They are slightly similar to IRC nicks, ", @@ -116,14 +113,12 @@ " $bDELMASK$b Remove a hostmask from your account.", " $bSET$b Set per-account options.", " $bRENAME$b Renames an account", - " $bACCOUNT FLAGS$b Definition for each account flag", - "=----------- End of Help --------------=" + " $bACCOUNT FLAGS$b Definition for each account flag" ); }; "NOT NICKSERV" { "/services/nickserv/disable_nicks" ( - "=------------ $bNOT NICKSERV$b ------------=", " $N is $unot$u a NickServ. On this network, ", " nicknames are not owned. $N allows ", " you to register a single account to ", @@ -131,20 +126,18 @@ " your nickname. ", " $b$N$b can tell you what ", " account a user is authenticated to ", - " using the $bUSERINFO$b command. ", - "=----------- End of Help --------------=" + " using the $bUSERINFO$b command. " ); }; -"INFORMATION" ("=------- $bInformational commands$b -------=", +"INFORMATION" ("$bInformational commands:$b", " $bACCOUNTINFO$b Displays information about an account.", " $bUSERINFO$b Display what account an online user is authenticated to.", " $bSTATUS$b $b$N$b status.", - " $bVERSION$b $b$N$b version information.", - "=----------- End of Help --------------=" + " $bVERSION$b $b$N$b version information." ); -"OPER" ("=---------- $bIRC Operator Help$b ---------=", +"OPER" ("$bIRC Operator Help:$b", " $bSEARCH$b Search accounts and apply an action.", " $bOSET$b Modify account details including password.", " $bRENAME$b Rename an account.", @@ -155,8 +148,7 @@ "*$bOUNREGNICK$b Remove a nick from someone's account.", " $bOADDMASK$b Add a mask to someone's account.", " $bODELMASK$b Remove a mask from someone's account.", - " $bMERGEDB$b Load a database into memory.", - "=----------- End of Help --------------=" + " $bMERGEDB$b Load a database into memory." ); Index: x3/src/opserv.c diff -u x3/src/opserv.c:1.16 x3/src/opserv.c:1.17 --- x3/src/opserv.c:1.16 Sat Mar 19 17:43:54 2005 +++ x3/src/opserv.c Wed May 18 09:03:13 2005 @@ -271,7 +271,7 @@ { NULL, NULL } }; -#define OPSERV_SYNTAX() svccmd_send_help(user, opserv, cmd) +#define OPSERV_SYNTAX() svccmd_send_help_brief(user, opserv, cmd) typedef int (*discrim_search_func)(struct userNode *match, void *extra); Index: x3/src/opserv.help diff -u x3/src/opserv.help:1.7 x3/src/opserv.help:1.8 --- x3/src/opserv.help:1.7 Thu May 5 17:30:51 2005 +++ x3/src/opserv.help Wed May 18 09:03:13 2005 @@ -1,4 +1,4 @@ -"<INDEX>" ("=------------------ $b$O Help$b ------------------=", +"<INDEX>" ( " $O provides Oper Services for the Network. ", " Please choose from the following categories: ", " $bGOD$b Enabling channel override. ", @@ -14,12 +14,11 @@ " $bSETTINGS$b View and temporarily change ", " config file settings. ", " $bADMIN$b Misc Administrator Commands. ", - " $bOWNERONLY$b $O operator only commands. ", - "=---------------- End of Help ----------------=" + " $bOWNERONLY$b $O operator only commands. " ); "COMMANDS" "${index}"; -"PUNISH" ("=------------- $bUser Punishments$b --------------=", +"PUNISH" ( " $bGLINE$b Global Ban a host.", " $bUNGLINE$b Remove a GLINE.", " $bBLOCK$b Gline by nickname.", @@ -27,36 +26,32 @@ " $bGTRACE$b Search the gline list.", " $b$b", " $bGAG$b Cause the services to ignore... ", - " $bUNGAG$b ...or unignore by mask.", - "=---------------- End of Help ----------------=" + " $bUNGAG$b ...or unignore by mask." ); -"INFORMATION" ("=----------- $bInformation Gathering$b -----------=", +"INFORMATION" ( " $bACCESS$b Shows a users $O access level.", " $bSTATS$b Show various lists and runtime info.", " $bWHOIS$b Show details about a user by nick.", " $bVERSION$b Show the $O version information.", " $bLOG$b View $O logs.", - " $bTRACES$b Powerfull commands for viewing or acting on lists of IRC objects.", - "=--------------- End of Help ----------------=" + " $bTRACES$b Powerfull commands for viewing or acting on lists of IRC objects." ); -"TRACES" ("=------------------ $bTraces$b ------------------=", +"TRACES" ( " $bTRACE$b Search current users and optionally apply an action.", " $bGTRACE$b Search current GLINEs and optionally remove them.", - " $bCSEARCH$b Search current channels.", - "=--------------- End of Help ----------------=" + " $bCSEARCH$b Search current channels." ); -"ALERTS" ("=------------------ $bAlerts$b ------------------=", +"ALERTS" ( " $bADDALERT$b Make $O automatically do something", " when users match a criteria.", " $bDELALERT$b Remove an alert.", - " $bSTATS ALERT$b See a listing of alerts. ", - "=--------------- End of Help ----------------=" + " $bSTATS ALERT$b See a listing of alerts. " ); -"CHANNEL" ("=------------- $bChannel Commands$b -------------=", +"CHANNEL" ( " $bOP$b Op someone.", " $bDEOP$b Deop someone.", " $bVOICE$b Voice someone.", @@ -75,26 +70,23 @@ " $bINVITE$b Invite someone to a channel.", " $bINVITEME$b Invite yourself to a channel.", " $bCLEARBANS$b Cear all bans from a channel.", - " $bCLEARMODES$b Clear all modes from a channel.", - "=--------------- End of Help ----------------=" + " $bCLEARMODES$b Clear all modes from a channel." ); -"CLONES" ("=-------------- $bClone handling$b --------------=", +"CLONES" ( " $bADDTRUST$b Add a clone limit exemption for a host.", " $bDELTRUST$b Remove a clone exemption.", " $bEDITTRUST$b Modify a clone exemption.", " $bquery services/opserv/untrusted_max$b", - " View the clone kill limit", - "=--------------- End of Help ----------------=" + " View the clone kill limit" ); -"SETTINGS" ("=----------------- $bSettings$b -----------------=", +"SETTINGS" ( " $bQUERY$b Show a runtime config setting.", - " $bSET$b $uTemporarily$u change a runtime config setting.", - "=--------------- End of Help ----------------=" + " $bSET$b $uTemporarily$u change a runtime config setting." ); -"ADMIN" ("=---------- $bAdministrative Commands$b ---------=", +"ADMIN" ( " $bACCESS$b Modify someone's $O access level.", " $bCOMMAND$b Show details of a command.", " $bSHOWCOMMANDS$b List all commands and required access levels.", @@ -114,11 +106,10 @@ " $b$b", " $bREFRESHG$b Refresh the Glines.", " $bSETTIME$b Synchronize time across the network.", - " $bTIMECMD$b Time how long a command runs.", - "=--------------- End of Help ----------------=" + " $bTIMECMD$b Time how long a command runs." ); -"OWNERONLY" ("=------------- $bOwner Only Stuff$b -------------=", +"OWNERONLY" ( " $bWRITE$b Write out a database.", " $bWRITEALL$b Write out ALL databases.", " $bREOPEN$b Close and Re-Open the logs.", @@ -150,8 +141,7 @@ " $bDELEXEMPT$b Remove an exception of the illegal word list.", " $b$b", " $bDUMP$b Drop safetychecked server protocol to the server. ", - " $bRAW$b Draw raw server protocol to the server. (DANGEROUS!)", - "=--------------- End of Help ----------------=" + " $bRAW$b Drop raw server protocol to the server. (DANGEROUS!)" ); @@ -171,7 +161,7 @@ "$uSee Also:$u delalert, alert reaction, trace criteria" ); -"TIME NOTATION" ("=---------------- $bTime Notation$b ---------------=", +"TIME NOTATION" ( " Many commands require a duration perameter ", " which all use the same syntax: ", " 1s - 1 second ", @@ -183,8 +173,7 @@ " 1y - 1 year", " Times can be compounded such as: ", " 1m40s - 1 minute and 40 seconds ", - " 5h20m30s - 5 hours 20 minutes and 30 seconds ", - "=-----------------------------------------------=" + " 5h20m30s - 5 hours 20 minutes and 30 seconds " ); "ADDTRUST" ("/msg $O ADDTRUST <ip> <count> <duration> <reason>", ----------------------- End of diff ----------------------- |