Relocate help strings to proper locations, add help for 'mode' command

[user/henk/code/ruby/rbot.git] / lib / rbot / core / auth.rb

diff --git a/lib/rbot/core/auth.rb b/lib/rbot/core/auth.rb
index 7feba4daf1b0bf072fcdd2d549cdd18d777cdd85..eee500456c241e135fb919018c572d98bc359cd8 100644 (file)
--- a/lib/rbot/core/auth.rb
+++ b/lib/rbot/core/auth.rb
@@ -1,6 +1,11 @@
 #-- vim:sw=2:et\r
 #++\r
-\r
+#\r
+# :title: rbot auth management from IRC\r
+#\r
+# Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>\r
+# Copyright:: (C) 2006,2007 Giuseppe Bilotta\r
+# License:: GPL v2\r
 \r
 class AuthModule < CoreBotModule\r
 \r
@@ -89,7 +94,7 @@ class AuthModule < CoreBotModule
     splits = params[:args]\r
 \r
     has_for = splits[-2] == "for"\r
-    return usage unless has_for\r
+    return usage(m) unless has_for\r
 \r
     begin\r
       user = @bot.auth.get_botuser(splits[-1].sub(/^all$/,"everyone"))\r
@@ -188,6 +193,11 @@ class AuthModule < CoreBotModule
     "welcome, #{get_botusername_for(user)}"\r
   end\r
 \r
+  def auth_auth(m, params)\r
+    params[:botuser] = 'owner'\r
+    auth_login(m,params)\r
+  end\r
+\r
   def auth_login(m, params)\r
     begin\r
       case @bot.auth.login(m.source, params[:botuser], params[:password])\r
@@ -241,6 +251,8 @@ class AuthModule < CoreBotModule
         return "permissions [re]set <permission> [in <channel>] for <user>: sets or resets the permissions for botuser <user> in channel <channel> (use ? to change the permissions for private addressing)"\r
       when "view"\r
         return "permissions view [for <user>]: display the permissions for user <user>"\r
+      else\r
+        return "topics: syntax, (re)set, view"\r
       end\r
     when "user"\r
       case topic\r
@@ -779,6 +791,11 @@ auth.map "whoami",
   :action => 'auth_whoami',\r
   :auth_path => '!*!'\r
 \r
+auth.map "auth :password",\r
+  :action => 'auth_auth',\r
+  :public => false,\r
+  :auth_path => '!login!'\r
+\r
 auth.map "login :botuser :password",\r
   :action => 'auth_login',\r
   :public => false,\r