[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-04-15 21:27:45
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-04-15 21:27:31 UTC Modified files: ChangeLog.X3 src/nickserv.c src/nickserv.help src/proto-common.c Log message: Author: Log message: ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.18 x3/ChangeLog.X3:1.19 --- x3/ChangeLog.X3:1.18 Sun Apr 3 22:31:42 2005 +++ x3/ChangeLog.X3 Fri Apr 15 14:27:21 2005 @@ -1,6 +1,17 @@ /*********************************************************************** X3 ChangeLog +2005-04-15 Alex Schumann <ru...@af...> + + * src/proto-common.c: Temp fix for x3 not seeing -hv modes being set + at the same time. The whole block needs to be if/else instead of + switch though, to be cleaner. + + * src/nickserv.help: added fakehost and title options to help oset. + + * src/nickserv.c: removed 'style' setting. (was not being used in + code anyway) + 2005-04-04 Neil Spierling <sir...@gm...> * src/proto-p10.c: Reinstated +d usermode. @@ -90,5 +101,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.18 $" +#define CVS_VERSION "$Revision: 1.19 $" Index: x3/src/nickserv.c diff -u x3/src/nickserv.c:1.20 x3/src/nickserv.c:1.21 --- x3/src/nickserv.c:1.20 Sat Mar 19 17:11:35 2005 +++ x3/src/nickserv.c Fri Apr 15 14:27:21 2005 @@ -134,7 +134,7 @@ { "NSMSG_HANDLE_TOLONG", "The account name %s is too long. Account names must be %lu charactors or less."}, { "NSMSG_PASSWORD_SHORT", "Your password must be at least %lu characters long." }, { "NSMSG_PASSWORD_ACCOUNT", "Your password may not be the same as your account name." }, - { "NSMSG_PASSWORD_DICTIONARY", "Your password should not be the word \"password\", or any other dictionary word." }, + { "NSMSG_PASSWORD_DICTIONARY", "Your password is too simple. You must choose a password that is not just a word or name." }, { "NSMSG_PASSWORD_READABLE", "Your password must have at least %lu digit(s), %lu capital letter(s), and %lu lower-case letter(s)." }, { "NSMSG_PARTIAL_REGISTER", "Account has been registered to you; nick was already registered to someone else." }, { "NSMSG_OREGISTER_VICTIM", "%s has registered a new account for you (named %s)." }, @@ -274,7 +274,9 @@ { "NSMSG_RECLAIMED_SVSNICK", "Forcibly changed %s's nick." }, { "NSMSG_RECLAIMED_KILL", "Disconnected %s from the network." }, { "NSMSG_CLONE_AUTH", "Warning: %s (%s@%s) authed to your account." }, - { "NSMSG_SETTING_LIST", "$b$N account settings:$b" }, + { "NSMSG_SETTING_LIST", "$b$N account settings$b" }, + { "NSMSG_SETTING_LIST_HEADER", "----------------------------------------" }, + { "NSMSG_SETTING_LIST_END", "-------------End Of Settings------------" }, { "NSMSG_INVALID_OPTION", "$b%s$b is an invalid account setting." }, { "NSMSG_INVALID_ANNOUNCE", "$b%s$b is an invalid announcements value." }, { "NSMSG_SET_INFO", "$bINFO: $b%s" }, @@ -2283,16 +2285,18 @@ option_func_t *opt; unsigned int i; char *set_display[] = { - "INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", "STYLE", + "INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", /* "STYLE", */ "EMAIL", "ANNOUNCEMENTS", "MAXLOGINS", "LANGUAGE" }; send_message(user, nickserv, "NSMSG_SETTING_LIST"); + send_message(user, nickserv, "NSMSG_SETTING_LIST_HEADER"); /* Do this so options are presented in a consistent order. */ for (i = 0; i < ArrayLength(set_display); ++i) if ((opt = dict_find(nickserv_opt_dict, set_display[i], NULL))) opt(user, hi, override, 0, NULL); + send_message(user, nickserv, "NSMSG_SETTING_LIST_END"); } static NICKSERV_FUNC(cmd_set) @@ -2414,6 +2418,7 @@ return 1; } +/* static OPTION_FUNC(opt_style) { char *style; @@ -2437,6 +2442,7 @@ send_message(user, nickserv, "NSMSG_SET_STYLE", style); return 1; } +*/ static OPTION_FUNC(opt_announcements) { @@ -4028,7 +4034,7 @@ dict_insert(nickserv_opt_dict, "TABLEWIDTH", opt_tablewidth); dict_insert(nickserv_opt_dict, "COLOR", opt_color); dict_insert(nickserv_opt_dict, "PRIVMSG", opt_privmsg); - dict_insert(nickserv_opt_dict, "STYLE", opt_style); +/* dict_insert(nickserv_opt_dict, "STYLE", opt_style); */ dict_insert(nickserv_opt_dict, "PASS", opt_password); dict_insert(nickserv_opt_dict, "PASSWORD", opt_password); dict_insert(nickserv_opt_dict, "FLAGS", opt_flags); Index: x3/src/nickserv.help diff -u x3/src/nickserv.help:1.7 x3/src/nickserv.help:1.8 --- x3/src/nickserv.help:1.7 Tue Mar 15 15:31:01 2005 +++ x3/src/nickserv.help Fri Apr 15 14:27:21 2005 @@ -376,28 +376,19 @@ "$uSee Also:$u oregnick, ounregister, ounregnick" ); }; -"OSET" { - "/services/nickserv/disable_nicks" ( - "/msg $N OSET <nick|*account> [<setting> <value>]", - "Changes an account's settings for X3. In addition to the normal $bset$b settings, you may set:", - "$bPASSWORD$b: Sets user's password.", - "$bFLAGS$b: Changes account flags for user.", - "$bLEVEL$b: Sets $O access level.", - "$bEPITHET$b: The description $C shows for the user's access.", - "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).", - "$uSee Also:$u accountinfo, account flags, set, userinfo" - ); - "!/services/nickserv/disable_nicks" ( - "/msg $N OSET <nick|*account> [<setting> <value>]", - "Changes an account's settings for X3. In addition to the normal $bset$b settings, you may set:", - "$bPASSWORD$b: Sets user's password.", - "$bFLAGS$b: Changes account flags for user.", - "$bLEVEL$b: Sets $O access level.", - "$bEPITHET$b: The description $C shows for the user's access.", - "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).", - "$uSee Also:$u accountinfo, account flags, nickinfo, set, userinfo" - ); -}; +"OSET" ( + "/msg $N OSET <nick|*account> [<setting> <value>]", + "Allows opers/helpers to change a users account settings. You may set:", + "$bPASSWORD$b: Sets user's password.", + "$bFLAGS$b: Changes account flags (SphHdscfn) for user (see $uaccount flags$u).", + "$bLEVEL$b: Sets $O access level.", + "$bEPITHET$b: The description $C shows for the user's access.", + "$bTITLE$b: The title the user will get (in there hostname) when +x.", + "$bFAKEHOST$b: The fake hostname the user will get when +x.", + "..or anything $bset$b can change.", + "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).", + "$uSee Also:$u accountinfo, account flags, set, userinfo" +); "ODELCOOKIE" { "/services/nickserv/email_enabled" ( Index: x3/src/proto-common.c diff -u x3/src/proto-common.c:1.10 x3/src/proto-common.c:1.11 --- x3/src/proto-common.c:1.10 Sat Mar 12 18:51:11 2005 +++ x3/src/proto-common.c Fri Apr 15 14:27:21 2005 @@ -626,13 +626,23 @@ break; } break; + /* XXX Hack: this is the stupedest use of switch iv ever seen. + * you have to compare for EVERY POSSIBLE COMBINATION of bitmask + * because switch does only full comparison. This needs redone as if/else. + **/ case MODE_CHANOP: case MODE_HALFOP: case MODE_VOICE: + case MODE_VOICE|MODE_CHANOP: + case MODE_VOICE|MODE_HALFOP: + case MODE_CHANOP|MODE_HALFOP: case MODE_VOICE|MODE_CHANOP|MODE_HALFOP: case MODE_REMOVE|MODE_CHANOP: case MODE_REMOVE|MODE_HALFOP: case MODE_REMOVE|MODE_VOICE: + case MODE_REMOVE|MODE_VOICE|MODE_CHANOP: + case MODE_REMOVE|MODE_VOICE|MODE_HALFOP: + case MODE_REMOVE|MODE_CHANOP|MODE_HALFOP: case MODE_REMOVE|MODE_VOICE|MODE_CHANOP|MODE_HALFOP: if (change->args[ii].mode & MODE_REMOVE) change->args[ii].u.member->modes &= ~change->args[ii].mode; ----------------------- End of diff ----------------------- |