[myexperiment-hackers] [2878] trunk/app: Fix feedback to use reCAPTCHA.

[noreply]

Revision

2878

Author

dtm

Date

2011-12-09 05:20:01 -0500 (Fri, 09 Dec 2011)

Log Message

Fix feedback to use reCAPTCHA.

Modified Paths

• trunk/app/controllers/feedback_controller.rb
• trunk/app/views/feedback/index.rhtml

Diff

Modified: trunk/app/controllers/feedback_controller.rb (2877 => 2878)

--- trunk/app/controllers/feedback_controller.rb	2011-12-09 09:05:00 UTC (rev 2877)
+++ trunk/app/controllers/feedback_controller.rb	2011-12-09 10:20:01 UTC (rev 2878)
@@ -21,7 +21,14 @@
         format.html { redirect_to "/feedback" }
       end
     else
-      if params[:feedback] && captcha_valid?(params[:feedback][:captcha_id], params[:feedback][:captcha_validation])
+      captcha_verified = false
+      if Conf.recaptcha_enable
+        captcha_verified = verify_recaptcha(:private_key => Conf.recaptcha_private)
+      else
+        captcha_verified = params[:feedback] && captcha_valid?(params[:feedback][:captcha_id], params[:feedback][:captcha_validation])
+      end
+
+      if captcha_verified
     
         from_user = ( params[:from].blank? ? 'no from': params[:from] ) + ' (' + (!params[:email].blank? ? params[:email] : 'no email') + ')';
         Mailer.deliver_feedback(from_user, params[:subject], params[:content])

Modified: trunk/app/views/feedback/index.rhtml (2877 => 2878)

--- trunk/app/views/feedback/index.rhtml	2011-12-09 09:05:00 UTC (rev 2877)
+++ trunk/app/views/feedback/index.rhtml	2011-12-09 10:20:01 UTC (rev 2878)
@@ -48,15 +48,19 @@
 			<p><b>Message</b></p>
 			<textarea id="feedback_content" name="content" rows="8" style="width: 400px;"><%= params[:content] %></textarea><br/>
 		<% if !logged_in? %>
-		<% c = prepare_captcha :type => :image -%>	
-		     <br/>
-	         <p style="text-align: center;">
-	            <%= captcha_hidden_field c, 'feedback' %>
-                <%= captcha_image_tag c %><br/>
-             </p>
-             <p style="text-align: center;"><%= captcha_label 'feedback', 'Type in the text from the image above' %></p>
-             <p style="text-align: center;"><%= captcha_text_field 'feedback' %></p>
-         <% end %>
+			<% if Conf.recaptcha_enable -%>
+				<%= recaptcha_tags(:public_key => Conf.recaptcha_public) -%>
+			<% else -%>
+				<% c = prepare_captcha :type => :image -%>	
+				<br/>
+				<p style="text-align: center;">
+				<%= captcha_hidden_field c, 'feedback' %>
+				<%= captcha_image_tag c %><br/>
+				</p>
+				<p style="text-align: center;"><%= captcha_label 'feedback', 'Type in the text from the image above' %></p>
+				<p style="text-align: center;"><%= captcha_text_field 'feedback' %></p>
+			<% end %>
+		<% end %>
 		  <br/><br>
 		
     	<center><%= submit_tag "Submit Feedback", :disable_with => "Submitting&hellip;" %></center>