X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fnickserv.help;h=dcc67cb2dee4e3a586877938faa45aa76421e434;hb=HEAD;hp=a32a36a6af8b0906fae5f439f31702216914a415;hpb=88ec110dae46f3eb1cd940aa246d13fcfe08069c;p=srvx.git

diff --git a/src/nickserv.help b/src/nickserv.help
index a32a36a..dcc67cb 100644
--- a/src/nickserv.help
+++ b/src/nickserv.help
@@ -86,15 +86,17 @@
 
 "OUNREGISTER" {
         "/services/nickserv/disable_nicks" (
-        "/msg $N OUNREGISTER <nick|*account>",
+        "/msg $N OUNREGISTER <nick|*account> [FORCE]",
         "Un-registers the specified account.",
         "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).",
+        "Without FORCE only accounts that are inactive and have no special flags can be unregistered.",
         "$uSee Also:$u oregister"
         );
         "!/services/nickserv/disable_nicks" (
-        "/msg $N OUNREGISTER <nick|*account>",
+        "/msg $N OUNREGISTER <nick|*account> [FORCE]",
         "Un-registers the specified account, and any nicks that have been registered to that account.",
         "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).",
+        "Without FORCE only accounts that are inactive and have no special flags can be unregistered.",
         "$uSee Also:$u oregister, oregnick, ounregnick"
         );
 };
@@ -210,6 +212,13 @@
         );
 };
 
+"ODELCOOKIE" {
+        "/services/nickserv/email_enabled" (
+        "/msg $N ODELCOOKIE <nick|*account>",
+        "Requests that $N cancel a cookie for the specified account."
+        );
+};
+
 "COOKIE" {
         "/services/nickserv/email_enabled" (
         "/msg $N@$s COOKIE <account> <cookie>",
@@ -289,6 +298,8 @@
         "$bc$b  Use mIRC color codes in responses",
         "$bf$b  Account frozen/on vacation (will not be unregistered for inactivity; cleared when account is authenticated against)",
         "$bn$b  No-delete (will never be unregistered for inactivity)",
+		"$bb$b  Bot",
+		"$bI$b  Invisible (user will not be shown in staff list)",
         "$uSee Also:$u accountinfo, set");
 "OADDMASK" ("/msg $N OADDMASK <nick|*account> <user@host>",
         "Adds a hostmask to the specified account.",
@@ -300,13 +311,25 @@
         "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 oaddmask");
 "OREGISTER" {
-        "/services/nickserv/disable_nicks" (
-        "/msg $N@$s OREGISTER <account> <password> <user@host|nick>",
+        "/services/nickserv/email_enabled && /services/nickserv/disable_nicks" (
+        "/msg $N@$s OREGISTER <account> <password> [user@host|nick|*] [email]",
         "Registers an account with $b$N$b using the specified account, password, and user@host. If the nick of an online user is specified, then that user's user@host is used.  If no nickname or hostmask is used, it uses a default hostmask the first time the user authenticates.",
+        "If an email is specified, the account will only be registered if the email is valid and not blacklisted and after registering, the email will be set on the account.",
         "$uSee Also:$u ounregister"
         );
-        "!/services/nickserv/disable_nicks" (
-        "/msg $N@$s OREGISTER <account> <password> <user@host|nick>",
+        "/services/nickserv/email_enabled && !/services/nickserv/disable_nicks" (
+        "/msg $N@$s OREGISTER <account> <password> [user@host|nick|*] [email]",
+        "Registers an account with $b$N$b using the specified account, password, and user@host. If the nick of an online user is specified, then that user's user@host is used.  If no nickname or hostmask is used, it uses a default hostmask the first time the user authenticates.",
+        "If an email is specified, the account will only be registered if the email is valid and not blacklisted and after registering, the email will be set on the account.",
+        "$uSee Also:$u oregnick, ounregister, ounregnick"
+        );
+        "!/services/nickserv/email_enabled && /services/nickserv/disable_nicks" (
+        "/msg $N@$s OREGISTER <account> <password> [user@host|nick|*]",
+        "Registers an account with $b$N$b using the specified account, password, and user@host. If the nick of an online user is specified, then that user's user@host is used.  If no nickname or hostmask is used, it uses a default hostmask the first time the user authenticates.",
+        "$uSee Also:$u ounregister"
+        );
+        "!/services/nickserv/email_enabled && !/services/nickserv/disable_nicks" (
+        "/msg $N@$s OREGISTER <account> <password> [user@host|nick|*]",
         "Registers an account with $b$N$b using the specified account, password, and user@host. If the nick of an online user is specified, then that user's user@host is used.  If no nickname or hostmask is used, it uses a default hostmask the first time the user authenticates.",
         "$uSee Also:$u oregnick, ounregister, ounregnick"
         );
@@ -318,6 +341,7 @@
         "$bPASSWORD$b: Sets user's password.",
         "$bFLAGS$b: Changes account flags for user.",
         "$bLEVEL$b: Sets $O access level.",
+        "$bSTAFF_LEVEL$b: Sets staff 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"
@@ -328,6 +352,7 @@
         "$bPASSWORD$b: Sets user's password.",
         "$bFLAGS$b: Changes account flags for user.",
         "$bLEVEL$b: Sets $O access level.",
+        "$bSTAFF_LEVEL$b: Sets staff 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"