myaccess and help oregister improvements

diff --git a/ChangeLog b/ChangeLog
index 5e4a74e0a49ee0365de1c62855649c8cc3766bc2..d982c570c917ce06835a19e8a20890bdb4f2a011 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 /***********************************************************************
  X3 ChangeLog
 
+2006-11-30  Alex Schumann   <rubin@afternet.org>
+
+       * src/chanserv.c: Modified .myaccess such that if you give it your own
+       account when you are not a helper, it still works. (Requested by
+       Jigsy)
+
+       * src/nickserv.help: Corrected the help file to feed oregister based
+       on email_required instead of email_enabled
+
 2006-10-18  Neil Spierling  <sirvulcan@gmail.com>
 
        * src/opserv.c: Minor cosmetic error noticed by Raisk. If doing an

diff --git a/src/chanserv.c b/src/chanserv.c
index 5dba22f2d309349fd0ee4f002a68b8c4877273c9..0654ef1201f64d119f4ae32ae7bd98883f5ee197 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -3746,14 +3746,13 @@ static CHANSERV_FUNC(cmd_myaccess)
 
     if(argc < 2)
         target_handle = user->handle_info;
-    else if(!IsHelping(user))
+    else if(!(target_handle = modcmd_get_handle_info(user, argv[1])))
+        return 0;
+    else if(!IsHelping(user) && target_handle != user->handle_info)
     {
         reply("CSMSG_MYACCESS_SELF_ONLY", argv[0]);
         return 0;
     }
-    else if(!(target_handle = modcmd_get_handle_info(user, argv[1])))
-        return 0;
-
     if(!target_handle->channels)
     {
         reply("CSMSG_SQUAT_ACCESS", target_handle->handle);

diff --git a/src/nickserv.help b/src/nickserv.help
index 0838e636ac121f0ac58941b4b7da165a25d348bc..965757c4e69e9c6373708a9138b07f7623930e33 100644 (file)
--- a/src/nickserv.help
+++ b/src/nickserv.help
@@ -382,24 +382,24 @@
         "$uSee Also:$u oaddmask");
 "OREGISTER" {
         "/services/nickserv/disable_nicks" {
-                "/services/nickserv/email_enabled" (
+                "/services/nickserv/email_required" (
                 "/msg $N@$s OREGISTER <account> <password> <email> [user@host] [nick]",
                 "Registers an account for nick with $b$N$b using the specified account name, password, email address and user@host. If the nick of an online user is specified, then they will be logged in, and that user's user@host is used if you don't specify one.  If no nickname or hostmask is used, it uses a default hostmask, or adds one when they first authenticate.",
                 "$uSee Also:$u ounregister, oaddmask, oset"
                 );
-                "!/services/nickserv/email_enabled" (
+                "!/services/nickserv/email_required" (
                 "/msg $N@$s OREGISTER <account> <password> [user@host] [nick]",
                 "Registers an account for nick with $b$N$b using the specified account name, password, email address and user@host. If the nick of an online user is specified, then they will be logged in, and that user's user@host is used if you don't specify one.  If no nickname or hostmask is used, it uses a default hostmask, or adds one when they first authenticate.",
                 "$uSee Also:$u ounregister, oaddmask, oset"
                 );
         };
         "!/services/nickserv/disable_nicks" {
-                "/services/nickserv/email_enabled" (
+                "/services/nickserv/email_required" (
                 "/msg $N@$s OREGISTER <account> <password> <email> [user@host] [nick]",
                 "Registers an account for nick with $b$N$b using the specified account name, password, email address and user@host. If the nick of an online user is specified, then they will be logged in, and that user's user@host is used if you don't specify one.  If no nickname or hostmask is used, it uses a default hostmask, or adds one when they first authenticate.",
                 "$uSee Also:$u oregnick, ounregister, ounregnick, oaddmask, oset"
                 );
-                "!/services/nickserv/email_enabled" (
+                "!/services/nickserv/email_required" (
                 "/msg $N@$s OREGISTER <account> <password> [user@host] [nick]",
                 "Registers an account for nick with $b$N$b using the specified account name, password, email address and user@host. If the nick of an online user is specified, then they will be logged in, and that user's user@host is used if you don't specify one.  If no nickname or hostmask is used, it uses a default hostmask, or adds one when they first authenticate.",
                 "$uSee Also:$u oregnick, ounregister, ounregnick, oaddmask, oset"