Merge login and terms screens, assume TOU and contributor terms are accepted on ...

[rails.git] / app / models / request_token.rb

diff --git a/app/models/request_token.rb b/app/models/request_token.rb
index 335a735bc5a4dbcab80c07d92f2791df53447509..adeabb18497ff4fd7e0556df56aecd16579a9be1 100644 (file)
--- a/app/models/request_token.rb
+++ b/app/models/request_token.rb
@@ -40,8 +40,9 @@ class RequestToken < OauthToken
 
   def authorize!(user)
     return false if authorized?
 
   def authorize!(user)
     return false if authorized?

+

     self.user = user
     self.user = user

-    self.authorized_at = Time.now
+    self.authorized_at = Time.now.utc

     self.verifier = OAuth::Helper.generate_key(20)[0, 20] unless oauth10?
     save
   end
     self.verifier = OAuth::Helper.generate_key(20)[0, 20] unless oauth10?
     save
   end


@@ -76,6 +77,6 @@ class RequestToken < OauthToken
   end
 
   def oauth10?
   end
 
   def oauth10?

-    (defined? OAUTH_10_SUPPORT) && OAUTH_10_SUPPORT && callback_url.blank?
+    Settings.key?(:oauth_10_support) && Settings.oauth_10_support && callback_url.blank?

   end
 end
   end
 end