Fixing some session errors (by cassiano)

reu · Sep 20, 2011 · 3371d86 · 3371d86
1 parent e4393a4
commit 3371d86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/traptcha/controller_helpers.rb b/lib/traptcha/controller_helpers.rb
@@ -7,9 +7,9 @@ module ControllerHelpers
     end
 
     def valid_captcha?
-      params[:captcha] && session[:captcha] && Traptcha::Captcha.new(params[:captcha]).value == session[:captcha]
+      params[:captcha] && params[:secure_hash] && Traptcha::Captcha.new(params[:captcha]).value == params[:secure_hash]
     end
-  
+
     def validate_captcha
       raise Traptcha::InvalidCaptcha unless valid_captcha?
     end

diff --git a/lib/traptcha/view_helpers.rb b/lib/traptcha/view_helpers.rb
@@ -1,7 +1,11 @@
+require 'base64'
+
 module Traptcha
   module ViewHelpers
     def captcha_image_tag
-      tag :img, :src => "#{captcha_path}?#{rand}", :id => 'traptcha', :alt => 'captcha'
+      captcha = Traptcha::Captcha.generate
+
+      tag(:img, :src => "data:image/png;base64,#{Base64.encode64(captcha.to_png)}", :id => 'traptcha', :alt => 'captcha') + hidden_field_tag(:secure_hash, captcha.value)
     end
 
     def captcha_label_tag