Convert OpenID authentication to use OmniAuth

[rails.git] / app / helpers / user_helper.rb

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index ba37a13341a7e2486d6c0192e6c1a63e9b3bd64a..d488371666f5147f9428ec2613ff07df569b5465 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -45,14 +45,14 @@ module UserHelper
   # OpenID support
 
   def openid_logo
-    image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo"
+    image_tag "openid_small.png", :alt => t("user.login.openid_logo_alt"), :class => "openid_logo"
   end
 
   def openid_button(name, url)
     link_to(
       image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),
-      "#",
-      :class => "openid_button", :data => { :url => url },
+      auth_path(:provider => "openid", :openid_url => url),
+      :class => "openid_button",
       :title => t("user.login.openid_providers.#{name}.title")
     )
   end
@@ -62,9 +62,9 @@ module UserHelper
   # See http://en.gravatar.com/site/implement/images/ for details.
   def user_gravatar_url(user, options = {})
     size = options[:size] || 100
-    hash = Digest::MD5::hexdigest(user.email.downcase)
+    hash = Digest::MD5.hexdigest(user.email.downcase)
     default_image_url = image_url("users/images/large.png")
-    url = "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
+    "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
   end
 
   def user_gravatar_tag(user, options = {})