[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-04-24 06:07:47
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-04-24 06:07:36 UTC Modified files: ChangeLog.X3 src/chanserv.c src/modcmd.c Log message: See changelog ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.22 x3/ChangeLog.X3:1.23 --- x3/ChangeLog.X3:1.22 Sat Apr 23 10:48:34 2005 +++ x3/ChangeLog.X3 Sat Apr 23 23:07:25 2005 @@ -6,6 +6,7 @@ voicelevel, hard coding them to OP, HALFOP, and PEON. Changed topicmask to be an on or off setting, uninfluenced by enftopic. Added feature to use mask on /topic in addition to ,topic sets. + Removed special consideration for ircops in protect_user() * src/chanserv.help: updated documentation to reflect the new and much simpler topicmask feature, and removed op/voice levels. @@ -13,6 +14,8 @@ * src/nickserv.c: added tailing 'end of' line for accountinfo for non-opers too. + * src/modcmd.c: tweaked alias notification for help and breef help. + 2005-04-20 Alex Schumann <ru...@af...> * src/proto-common.c: removing +d. needs to be a config option @@ -125,5 +128,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.22 $" +#define CVS_VERSION "$Revision: 1.23 $" Index: x3/src/chanserv.c diff -u x3/src/chanserv.c:1.22 x3/src/chanserv.c:1.23 --- x3/src/chanserv.c:1.22 Fri Apr 22 23:40:44 2005 +++ x3/src/chanserv.c Sat Apr 23 23:07:26 2005 @@ -1427,7 +1427,7 @@ /* Don't protect if no one is to be protected, someone is attacking himself, or if the aggressor is an IRC Operator. */ - if(protect == 'n' || victim == aggressor || IsOper(aggressor)) + if(protect == 'n' || victim == aggressor /* Opers dont get special treatment :/ || IsOper(aggressor) */) return 0; /* Don't protect if the victim isn't authenticated (because they Index: x3/src/modcmd.c diff -u x3/src/modcmd.c:1.13 x3/src/modcmd.c:1.14 --- x3/src/modcmd.c:1.13 Wed Apr 20 07:39:48 2005 +++ x3/src/modcmd.c Sat Apr 23 23:07:26 2005 @@ -775,9 +775,9 @@ * 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) + if(cmd->command->name && strcasecmp(cmd->command->name, cmd->name)) { - send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, cmd->command->name); + send_message(user, bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name); } /* If it's an alias, show what it's an alias for. */ @@ -815,7 +815,7 @@ if(!r) { if(cmd->command->name) { - send_message(user, bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name); + send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, cmd->command->name); r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->command->name); } } ----------------------- End of diff ----------------------- |