@@ -1,10 +1,13 @@ class Exclusions < Application before :load_site_from_params before :ensure_authenticated, :only => :index + before :load_user, :only => :index + before :ensure_permissions, :only => :index def index only_provides :text @exclusions = Exclusion.all(:site_id => @site.id) + Log.create!(:site_id => @site.id, :user_id => @current_user.id, :type => 'request_exclusion_list') display @exclusions end @@ -20,10 +23,29 @@ class Exclusions < Application display @exclusion end - def create - @exclusion = Exclusion.new(params[:exclusion].merge(:site_id => @site.id)) - if @exclusion.save - render "You have been unsubscribed from #{@site.url}" + def create + previous_exclusion = Exclusion.first(:site_id => @site.id, :email => params[:exclusion][:email].downcase) + @exclusion = previous_exclusion || Exclusion.new(params[:exclusion].merge(:site_id => @site.id)) + + captcha_correct = recaptcha_valid? + unless captcha_correct + @exclusion.valid? + @exclusion.errors.add(:general, "Captcha code is incorrect") + return render(:new) + end + + referring_user_id = params[:ref] + success = false + + if previous_exclusion + success = true + else + success = @exclusion.save + end + + if success + Log.create!( :exclusion_id => @exclusion.id, :site_id => @site.id, :user_id => referring_user_id, :type => "unsubscribe" ) + redirect resource(@site, @exclusion) else render :new end @@ -36,4 +58,13 @@ class Exclusions < Application throw :halt, "Unknown site. Site is required." unless @site end + def load_user + @current_user = User.get(session[:user]) + throw :halt, "Invalid user" unless @current_user + end + + def ensure_permissions + throw :halt, "Access denied for this site" unless @current_user.sites.include? @site + end + end # Exclusions app/controllers/exclusions.rb @@ -5,5 +5,8 @@ == Unsubscribe from #{ @site.url } %fieldset = text_field :email, :label => "E-Mail" + = hidden_field :name => "ref", :value => params[:ref] + %br + = recaptcha_tags %br =submit "Unsubscribe" app/views/exclusions/new.html.haml @@ -1,5 +1,5 @@ # dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading. -merb_gems_version = "1.0.12" +merb_gems_version = "1.0.11" dm_gems_version = "0.9.11" do_gems_version = "0.9.11" @@ -29,9 +29,11 @@ dependency "dm-migrations", dm_gems_version dependency "dm-timestamps", dm_gems_version dependency "dm-types", dm_gems_version dependency "dm-validations", dm_gems_version -dependency "dm-serializer", dm_gems_version +dependency "dm-serializer", dm_gems_version dependency "merb_datamapper", merb_gems_version dependency "merb-haml", merb_gems_version +dependency "merb-recaptcha", "~> 1.0.0", :require_as => "merb-recaptcha" + require "digest/md5" config/dependencies.rb @@ -21,4 +21,6 @@ end Merb::BootLoader.after_app_loads do # This will get executed after your app's classes have been loaded. + Merb::Plugins.config[:merb_recaptcha][:public_key] = "6Lcx-AcAAAAAAAWZMMCko0qAdOpIAO07x0h9Tq33" + Merb::Plugins.config[:merb_recaptcha][:private_key] = "6Lcx-AcAAAAAAJzvtnIxoxsyPX9AslQXF1kUXW0H" end config/init.rb 878173c929575662e8633de9fe150a9bb4f37aff Luke Galea lukegalea@lgs-pro.local http://github.com/lukegalea/unsub/commit/707acea72c689faa74c6b53a32b007b2b43794d3 707acea72c689faa74c6b53a32b007b2b43794d3 2009-10-14T14:26:33-07:00 2009-10-14T14:26:33-07:00 Add recaptcha ad1acc2aa2012b31b387e245257dce45e1427745 Luke Galea lukegalea@lgs-pro.local