diff --git a/Gemfile b/Gemfile index 0275e8aab..0d4deeef0 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "select2-rails", '3.3.1' gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git' gem "acts_as_unvlogable" gem 'youtube_it' -gem 'negative_captcha' +gem 'gotcha' # gem "memcached", "~> 1.4.3" # gem "memcache-client" diff --git a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb index 6d5fa928b..ae1c9d098 100644 --- a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb +++ b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb @@ -1,5 +1,4 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController - before_filter :setup_negative_captcha, :only => [:index, :create] layout false @@ -14,15 +13,20 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController def create @ask_question = AskQuestion.new(params[:ask_question]) - if verify_recaptcha model: @ask_question, private_key: '6Lfl7OESAAAAAD4rl5S16-zjt5yiKNYJ6jsqdwmL' + if gotcha_valid? && @ask_question.save @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new - AskMailer.reply(@ask_question).deliver - @ask_question.save + #@ask_question.save redirect_to root_path AskAdmin.all.each do |ask_admin| + AskMailer.notice(ask_admin, @ask_question).deliver Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id) end - end + else + # @captcha.error will explain what went wrong + flash[:notice] = "Please refill human verification" + render :action => 'index' + end + #respond_to do |format| # format.js #end @@ -35,7 +39,7 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController secret: "8a056b337dcc34741626c0b2a14dc3a05794abc11a83407f1d8ed1a1c48afec01dcae1ec2f90348981564ee1d05a537253881cf86bf9644ec4695ab797317738", spinner: request.remote_ip, # Whatever fields are in your form - fields: [:name, :email, :contect], + fields: [:name, :email, :content], params: params ) end diff --git a/vendor/built_in_modules/ask_new/app/mailers/ask_mailer.rb b/vendor/built_in_modules/ask_new/app/mailers/ask_mailer.rb index 5f0ebb886..daa121bfe 100644 --- a/vendor/built_in_modules/ask_new/app/mailers/ask_mailer.rb +++ b/vendor/built_in_modules/ask_new/app/mailers/ask_mailer.rb @@ -1,6 +1,6 @@ class AskMailer < ActionMailer::Base default from: 'orbit_test@rulingcom.com' - + def reply(ask_question) @ask_question = ask_question mail(:to => @ask_question.email, :subject => "#{t('ask.reply')}:#{@ask_question.title}") diff --git a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb index 42f50e6f3..0bc080e81 100644 --- a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb +++ b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb @@ -55,11 +55,13 @@ <%= f.text_area :content, rows: 8, class: 'input-xlarge' %> -
+
- <%= recaptcha_tags ajax: true, public_key: '6Lfl7OESAAAAAKdxTSSmWSOWlL__04A9AqQzD7_z' %> + <%= gotcha_error %> + <%= gotcha%>
+
<%= f.submit t('submit'), class: 'btn btn-primary' %> <%= f.button t('cancel'), type: 'reset', class: 'btn' %> @@ -77,4 +79,4 @@ return false; }); }); - + \ No newline at end of file