added mode help from jigsy

diff --git a/ChangeLog b/ChangeLog
index 3a7ffdd7ce49d6ff7bd9f39ffcb86531b6cdf9f6..73e9297ba9efe64a1f9c9ef888a7a6cd04fd68bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
+2007-04-06  Alex Schumann  <rubin@afternet.org>
+
+        * src/chanserv.help: added Jigsy's mode help MODE CHANNEL and MODE
+       USER
+
 2007-04-07  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
 
        * ChangeLog: Email update.

diff --git a/src/chanserv.help b/src/chanserv.help
index 2f72a113a841f24ec1a24ab8ec4b49ee0f0401e2..c653c7ffb7ec21da8770c61062c7c5299374f442 100644 (file)
--- a/src/chanserv.help
+++ b/src/chanserv.help
@@ -716,3 +716,68 @@
         "Futher, the X3 team would like to thank:",
         "     $breed$b - who tirelessly nagged us to upgrade our services",
         "$bAfterNET Users and Opers$b - who faught both for and against the change, for the better of Afternet.");
+
+"MODES" (
+        "/msg $C HELP MODES <option>",
+        "This command will return information for either:",
+        "CHANNEL: Channel mode(s).",
+        "USER:    User mode(s).",
+        "$b$b",
+        "See MODES USER, and MODES CHANNEL for the meaning of modes.",
+        "$uSee also:$u set",
+        );
+
+"MODES USER" (
+        "*a - IRC administrator.",
+        " d - Deaf mode. All #channel messages are ignored.",
+        "*f - Fake host mode. ($bInvisible mode, will not be visibly set. Can only be set by a U:lined service.$b)",
+        " g - Allows you to see desynch wallops.",
+        "*h - Sethost mode. ($bInvisible mode, will not be visibly set.$b)",
+        " i - Invisible. A user will not be able to see you in /names or /who list(s). They $bmust$b know your exact nick.",
+        " k - Network service. You cannot be deopped, kicked or killed.",
+        "*n - Channels will not be shown in a user(s) /whois reply.",
+        " o - Global IRC operator.",
+        " r - Registered user. ($bInvisible mode, will not be visibly set. Can only be set by a U:lined service.$b)",
+        " s - Server notices.",
+        " w - See wallops and wallusers messages.",
+        " x - Real host will be obfuscated if authed to $N. ($bFixed mode, cannot be unset.$b)",
+        "*B - User is a bot.",
+        "*I - Idle time will not be shown in a user(s) /whois reply.",
+        "*O - Local IRC operator. ($bDeprecated and disabled. *ALL* IRC operators are global.$b)",
+        "*R - Only registered user(s) are allowed to message you.",
+        "*W - /whois paranoia. IRC operators are informed of a /whois taking place on them. ($bDisabled.$b)",
+        "*X - Extra oper. Gives extra abilities and privileges to IRC operators.",
+        "$b$b",
+        "$bNote:$b * indicates that the mode is only available on some networks."
+        );
+
+"MODES CHANNEL" (
+        "*a - IRC administrators only. ($bCan only be set by IRC administrators/operators. Can be overriden by /invite.$b)",
+        " b - Bans a user from a channel. ($bCan be overriden by /invite.$b)",
+        "*c - Incoming colour messages to the channel are blocked.",
+        "*e - Excludes a user from being banned from a channel. If they're +b'd and +e'd, they will still be able to join.",
+        "*h - Gives a user hop status. ($b%%$b)",
+        " i - Invite only. A user must be /invite'd to the channel in order to join.",
+        " k - Channel requires a key in order to join. ($bCan be overriden by /invite.$b)",
+        " l - Limit. Only a certain number of user(s) are allowed to join the channel. ($bCan be overriden by /invite.$b)",
+        " m - Moderated. Nobody other than hops ($b%%$b), ops ($b@$b) or voices ($b+$b) can talk.",
+        " n - All external messages will be blocked. ($bMust be in the channel in order to talk.$b)",
+        " o - Gives a user op status. ($b@$b)",
+        " p - Private. The channel will not appear in /list but will appear in /whois replies.",
+        " r - A user must be registered in order to join the channel. ($bCan be overriden by /invite.$b)",
+        " s - Secret. The channel will not appear in /list and /whois replies.",
+        " t - Only op(s) can change the topic.",
+        " v - Gives a user voice status. ($b+$b)",
+        "*z - Persistant channel. Once the last user has left, the channel will not be destroyed. ($bDisabled.$b)",
+        "*C - /ctcp messages to the channel are blocked.",
+        "*L - Mode(s) will not be displayed in /list.",
+        "*M - Only registered user(s) are allowed to talk in a channel. (Excludes hops ($b%%$b), ops ($b@$b) and voices. ($b+$b))",
+        "*N - /notices to the channel are blocked.",
+        "*O - IRC operators only. ($bCan only be set by either $C or IRC adminstrators/operators. Can be overriden by /invite.$b)",
+        "*Q - Part and quit messages will not be displayed in a channel.",
+        "*S - Bold, colour, reverse and underline code(s) are stripped from incoming messages.",
+        "*T - /amsgs to the channel are blocked.",
+        "*Z - SSL user(s) only. ($bCan only be set by either $C or those on an SSL connection.$b)",
+        "$b$b",
+        "$bNote:$b * indicates that the mode is only available on some networks."
+        );

diff --git a/src/nickserv.c b/src/nickserv.c
index 787fac1302d744a6883cfa3d36b6d6a805f144f4..ca13059fa731715e551dcb724fa0bd8ad1f63ae2 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -164,6 +164,7 @@ static dict_t nickserv_email_dict; /* contains struct handle_info_list*, indexed
 static char handle_inverse_flags[256];
 static unsigned int flag_access_levels[32];
 static const struct message_entry msgtab[] = {
+    { "NSMSG_NO_ANGLEBRACKETS", "The < and > in help indicate that that word is a required parameter, but DO NOT actually type them in messages to me." },
     { "NSMSG_HANDLE_EXISTS", "Account $b%s$b is already registered." },
     { "NSMSG_HANDLE_TOLONG", "The account name %s is too long. Account names must be %lu characters or less."},
     { "NSMSG_PASSWORD_SHORT", "Your password must be at least %lu characters long." },
@@ -300,7 +301,7 @@ static const struct message_entry msgtab[] = {
     { "NSMSG_DB_UNREADABLE", "Unable to read database file %s; check the log for more information." },
     { "NSMSG_DB_MERGED", "$N merged DB from %s (in "FMT_TIME_T".%03lu seconds)." },
     { "NSMSG_HANDLE_CHANGED", "$b%s$b's account name has been changed to $b%s$b." },
-    { "NSMSG_BAD_HANDLE", "Account $b%s$b not registered because it is in use by a network service, is too long, or contains invalid characters." },
+    { "NSMSG_BAD_HANDLE", "Account $b%s$b is not allowed because it is reserved, is too long, or contains invalid characters." },
     { "NSMSG_BAD_NICK", "Nickname $b%s$b not registered because it is in use by a network service, is too long, or contains invalid characters." },
     { "NSMSG_BAD_EMAIL_ADDR", "Please use a well-formed email address." },
     { "NSMSG_FAIL_RENAME", "Account $b%s$b not renamed to $b%s$b because it is in use by a network services, or contains invalid characters." },
@@ -2034,6 +2035,15 @@ static NICKSERV_FUNC(cmd_auth)
     }
     if (argc == 3) {
 #ifdef WITH_LDAP
+        if(strchr(argv[1], '<') || strchr(argv[1], '>')) {
+            reply("NSMSG_NO_ANGLEBRACKETS");
+            return 0;
+        }
+        if (!is_valid_handle(argv[1])) {
+                reply("NSMSG_BAD_HANDLE", argv[1]);
+                return 0;
+        }
+
         if(nickserv_conf.ldap_enable) {
             ldap_result = ldap_check_auth(argv[1], argv[2]);
             /* Get the users email address and update it */