lib/antispam.rb public/images/guess0.jpg public/images/guess1.jpg public/images/guess2.jpg public/images/guess3.jpg public/images/guess4.jpg public/uploads/0000/0013/Aishwarya.jpg public/uploads/0000/0013/Aishwarya_thumb.jpg @@ -1,5 +1,7 @@ class ArticlesController < ApplicationController + include Antispam + before_filter :login_required, :except => :show before_filter :load_logged_in_user, :only => [:index, :edit, :create, :update, :destroy] before_filter :load_categories, :only => [:new, :edit] @@ -37,8 +39,7 @@ class ArticlesController < ApplicationController @latest_articles = author.articles.recent_articles @tagz = author.tagz # anti spam for comment posting - @antispam1 = rand(10) - @antispam2 = rand(10) + @antispam = random_antispam_question respond_to do |format| format.html app/controllers/articles_controller.rb @@ -1,5 +1,7 @@ class CommentsController < ApplicationController + include Antispam + before_filter :is_owner_of_commented_article?, :only => :destroy before_filter :load_article @@ -14,10 +16,14 @@ class CommentsController < ApplicationController @comment.author = logged_in_user.username @comment.email = logged_in_user.email @comment.url = blog_url_from_username(logged_in_user.username) + # the user posting the comment is not logged in. check the antispam response + elsif !valid?(params[:comment][:antispam], params[:antispam_result]) + flash[:error] = _('invalid_antispam_response') + redirect_to article_path and return end # now chech that we have both the comment author name and the comment if @comment.author.blank? or @comment.body.blank? - flash[:notice] = _('comment_incomplete') + flash[:error] = _('comment_incomplete') redirect_to article_path and return end app/controllers/comments_controller.rb @@ -2,7 +2,9 @@ module ApplicationHelper include DomainManager - + include Antispam + + # subdomains def current_subdomain self.request.subdomains.join('.') end @@ -72,8 +74,11 @@ module ApplicationHelper User.find(session[:user_id]) end - # localization helpers + def method_name + + end + # localization helpers def confirm_comment_deletion _('confirm_comment_deletion') end @@ -90,7 +95,11 @@ module ApplicationHelper _('homepage_magazine') end - def global_menu_caffee + def homepage_theme + _('homepage_theme') + end + + def homepage_caffee _('homepage_caffee') end app/helpers/application_helper.rb @@ -3,7 +3,7 @@ module HomeHelper def profile_picture(user) upload = Upload.find_by_filename(user.profiles.find(:first).avatar) avatar_picture = upload.nil? ? nil : upload.public_filename(:thumb).to_s - unless avatar_picture.blank? + unless avatar_picture.blank? or !File.exists?("public" + avatar_picture) "<img src='#{avatar_picture}' alt='#{user.username}' />" else "<img src='/images/user#{rand(10).to_s}.png' alt=#{user.username} />" app/helpers/home_helper.rb @@ -1,5 +1,9 @@ class Comment < ActiveRecord::Base belongs_to :article, :counter_cache => true + + def antispam=(value) + # we only need this to send the antispam back to the controller + end end app/models/comment.rb @@ -1,7 +1,6 @@ <% form_for( Comment.new, :url => user_article_comments_path(@article.user, @article), :html => { - :id => 'new_comment_form', - :onsubmit => "return #{session[:id].blank?} || (parseInt($('op_1').innerHTML) + parseInt($('op_2').innerHTML) == parseInt($('antispam_result').value));" + :id => 'new_comment_form' }) do |f| -%> <% unless session[:user_id] -%> @@ -30,11 +29,18 @@ <p> <%= f.text_area :body, :rows => 20, :cols => 53 %> </p> - <% unless session[:id].blank? %> - <p> - <label for="antispam"><span id="op_1"><%= @antispam1 %></span> + <span id="op_2"><%= @antispam2 %></span> = </label> <%= text_field_tag :antispam_result, "", :size => 2 %> + <% if session[:user_id].blank? %> + <p id="antispam"> + <table> + <tr> + <td><%= image_tag path_for_antispam(@antispam) %></td> + <td width="20%"> ==> </td> + <td width="30%"><%= text_field_tag :antispam_result, "", :size => 10 %></td> + </tr> + </table> </p> - <% end %> + <%= f.hidden_field :antispam, :value => @antispam %> + <% end %> <p> <%= f.submit save %> app/views/articles/_new_comment.html.erb @@ -15,7 +15,7 @@ <div id="menu"> <ul> <li><%= link_to homepage, blog_farm_url %></a></li> - <li><%= link_to global_menu_caffee, cat_url(Category.find_by_name(global_menu_caffee)) %></a></li> + <li><%= link_to homepage_theme, cat_url(Category.find_by_name(homepage_caffee)) %></a></li> <li><%= link_to 'login', user_login_path, :id => 'last' %></li> </ul> </div> app/views/layouts/application.html.erb @@ -17,4 +17,4 @@ config.action_view.debug_rjs = true # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false -ActionController::Base.session_options[:session_domain] = '.imac.dev' \ No newline at end of file +ActionController::Base.session_options[:session_domain] = '.macbook.dev' \ No newline at end of file config/environments/development.rb @@ -5,6 +5,7 @@ homepage_pubbers: pubbers homepage_articles: articles homepage_magazine: magazine homepage_caffee: morning coffee +homepage_theme: caffee please_log_in: please log in specify_name: please fill out the username already_taken_username: this username is already taken. please choose another one @@ -57,6 +58,7 @@ administer_existing_articles: modify existing articles administer_comments: administer comments administer_uploaded_files: administer uploaded files comments: comments +invalid_antispam_response: invalid antispam response said: said new_comment_added: new comment added confirm_comment_deletion: are you sure you want to delete this comment? vendor/plugins/polyglot/languages/en.yml @@ -5,6 +5,7 @@ homepage_pubbers: pubberi homepage_articles: articole homepage_magazine: revista homepage_caffee: cafeaua de dimineata +homepage_theme: cafea please_log_in: te rugam sa te loghezi specify_name: va rugam sa introduceti numele already_taken_username: acest username este deja folosit. va rugam sa alegeti altul @@ -57,6 +58,7 @@ administer_existing_articles: modifica articolele existente administer_comments: administreaza comentarii administer_uploaded_files: administreaza fisierele uploadate comments: comentarii +invalid_antispam_response: raspunsul antispam invalid said: a spus new_comment_added: a fost adaugat un nou comentariu confirm_comment_deletion: esti sigur ca vrei sa stergi acest comentariu? vendor/plugins/polyglot/languages/ro.yml 9711599eb0eaa3ce6a697bf554f38ccbc72aeeeb sergiu truta sergiutruta@gmail.com http://github.com/sergiutruta/blogpub/commit/6b7ae124b0967012a2f8188508bd8105848c384e 6b7ae124b0967012a2f8188508bd8105848c384e 2008-03-21T16:03:01-07:00 2008-03-21T16:03:01-07:00 changed the antispam criteria b0b72e7d8f8aceefdfbeaeefee3afa26790f515a sergiu truta sergiutruta@gmail.com