Merge branch 'next_colivre' into ActionItem2871

Leandro Nunes dos Santos
2 parents 6e1fdc22 4eb56579
Showing 236 changed files with 5968 additions and 662 deletions Show diff stats
COPYRIGHT
HACKING
HACKING.rails235
INSTALL.chat
README
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/spam_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/boxes_helper.rb
app/helpers/categories_helper.rb
app/helpers/cms_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/folder_helper.rb
app/helpers/sweeper_helper.rb
@@ -4,8 +4,9 @@ Copyright (c) 2007-2009,
   Cáritas Brasileira <http://www.caritasbrasileira.org/>
 Copyright (c) 2007-2009,
   Ynternet.org Foundation <http://www.ynternet.org/>
-Copyright (c) 2008-2009,
+Copyright (c) 2008-2013,
   Colivre <http://www.colivre.coop.br/>
+Copyright (c) the Noosfero contributors. See AUTHORS
  
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -52,3 +52,12 @@ If you write such script for your own OS, *please* share it with us at the
 development mailing list so that we can include it in the official repository.
 This way other people using the same OS will have to put less effort to develop
 Noosfero.
+
+== Submitting your changes back
+
+For now please read:
+
+- Coding conventions
+  http://noosfero.org/Development/CodingConventions
+- Patch guidelines
+  http://noosfero.org/Development/PatchGuidelines
@@ -1,13 +0,0 @@
-This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
-development.
-
-Install dependencies:
-
-gem install rails -v 2.3.5
-gem install i18n
-gem install will_paginate -v 2.3.12
-gem install cucumber
-
-Creating initial environment:
-
-rake db:schema:load
@@ -6,7 +6,7 @@ To configure XMPP/BOSH in Noosfero you need:
 * SystemTimer - http://ph7spot.com/musings/system-timer
 * Pidgin data files - http://www.pidgin.im/
  
-If you use Debian Wheezy:
+If you use Debian 6.0 (squeeze):
  
 # apt-get install librestclient-ruby pidgin-data ruby1.8-dev
 # gem install SystemTimer
-noosfero - a web-based social platform
+Noosfero - a web-based social platform
 ======================================
  
-:: About the project
+http://www.noosfero.org/
  
-Homepage: http://www.noosfero.org/
+Documentation
+-------------
  
-:: Authors and copyright
+The following documentation is available:
  
-Authors: see file AUTHORS
-Copyright information: see file COPYRIGHT
-Full license text; see file COPYING
+File                  Purpose
+~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+INSTALL               install instructions
+INSTALL.awstats       install instructions - access statistics service
+INSTALL.chat          install instructions - chat service
+INSTALL.email         install instructions - email service
+INSTALL.multitenancy  install instructions - multiple sites
+INSTALL.varnish       install instructions - varnish HTTP caching (recommended)
+HACKING               development instruction
+RELEASING             instructions for doing releases
+doc/noosfero/*        user documentation (available through the app itself)
+
+
+Authors and copyright
+---------------------
+
+Authorship and copyright information is available in the files listed below.
+
+File                  Purpose
+~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+AUTHORS               list of authors (updated at each release)
+COPYRIGHT             Copyright statement for the project
+COPYING               Full text of the project license
@@ -144,10 +144,15 @@ class CmsController &lt; MyProfileController
  
   post_only :set_home_page
   def set_home_page
-    @article = profile.articles.find(params[:id])
-    profile.home_page = @article
-    profile.save(false)
-    session[:notice] = _('"%s" configured as home page.') % @article.name
+    article = params[:id].nil? ? nil : profile.articles.find(params[:id])
+    profile.update_attribute(:home_page, article)
+
+    if article.nil?
+      session[:notice] = _('Homepage reseted.')
+    else
+      session[:notice] = _('"%s" configured as homepage.') % article.name
+    end
+
     redirect_to (request.referer || profile.url)
   end
  
@@ -267,7 +272,10 @@ class CmsController &lt; MyProfileController
     @back_to = params[:back_to] || request.referer || url_for(profile.public_profile_url)
     @task = SuggestArticle.new(params[:task])
     if request.post?
-       @task.target = profile
+      @task.target = profile
+      @task.ip_address = request.remote_ip
+      @task.user_agent = request.user_agent
+      @task.referrer = request.referrer
       if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
         session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
         redirect_to @back_to
@@ -9,9 +9,10 @@ class MembershipsController &lt; MyProfileController
   def new_community
     @community = Community.new(params[:community])
     @community.environment = environment
+    @back_to = params[:back_to] || url_for(:action => 'index')
     if request.post? && @community.valid?
       @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]))
-      redirect_to :action => 'index'
+      redirect_to @back_to
       return
     end
   end
@@ -4,7 +4,7 @@ class ProfileEditorController &lt; MyProfileController
   protect 'destroy_profile', :profile, :only => [:destroy_profile]
  
   def index
-    @pending_tasks = Task.to(profile).pending.select{|i| user.has_permission?(i.permission, profile)}
+    @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
   end
  
   helper :profile
@@ -14,9 +14,15 @@ class SpamController &lt; MyProfileController
         if params[:remove_comment]
           profile.comments_received.find(params[:remove_comment]).destroy
         end
+        if params[:remove_task]
+          Task.to(profile).find_by_id(params[:remove_task]).destroy
+        end
         if params[:mark_comment_as_ham]
           profile.comments_received.find(params[:mark_comment_as_ham]).ham!
         end
+        if params[:mark_task_as_ham] && (t = Task.to(profile).find_by_id(params[:mark_task_as_ham]))
+          t.ham!
+        end
         if request.xhr?
           json_response(true)
         else
@@ -28,7 +34,8 @@ class SpamController &lt; MyProfileController
       return
     end
  
-    @spam = profile.comments_received.spam.paginate({:page => params[:page]})
+    @comment_spam = profile.comments_received.spam.paginate({:page => params[:comments_page]})
+    @task_spam = Task.to(profile).spam.paginate({:page => params[:tasks_page]})
   end
  
   protected
@@ -4,12 +4,12 @@ class TasksController &lt; MyProfileController
  
   def index
     @filter = params[:filter_type].blank? ? nil : params[:filter_type]
-    @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
+    @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
     @failed = params ? params[:failed] : {}
   end
  
   def processed
-    @tasks = Task.to(profile).closed.sort_by(&:created_at)
+    @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
   end
  
   VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
@@ -57,7 +57,7 @@ class TasksController &lt; MyProfileController
   end
  
   def list_requested
-    @tasks = Task.find_all_by_requestor_id(profile.id)
+    @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
   end
  
   def ticket_details
@@ -53,7 +53,9 @@ class ContentViewerController &lt; ApplicationController
     # At this point the page will be showed
     @page.hit
  
-    unless @page.mime_type == 'text/html' || (@page.image? && params[:view])
+    @page = FilePresenter.for @page
+
+    unless @page.mime_type == 'text/html' || params[:view]
       headers['Content-Type'] = @page.mime_type
       data = @page.data
  
@@ -206,10 +206,50 @@ class ProfileController &lt; PublicController
   end
  
   def view_more_network_activities
-    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page]) 
+    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
     render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
   end
  
+  def more_comments
+    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
+    comments_count = activity.comments.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
+        :partial => 'comment', :collection => activity.comments.paginate(:per_page => comments_per_page, :page => comment_page)
+
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity]
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
+          :partial => 'more_comments', :locals => {:activity => activity, :comment_page => comment_page}
+      end
+    end
+  end
+
+  def more_replies
+    activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
+    comments_count = activity.replies.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
+        :partial => 'profile_scrap', :collection => activity.replies.paginate(:per_page => comments_per_page, :page => comment_page), :as => :scrap
+
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity]
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
+          :partial => 'more_replies', :locals => {:activity => activity, :comment_page => comment_page}
+      end
+    end
+  end
+
   def remove_scrap
     begin
       scrap = current_user.person.scraps(params[:scrap_id])
@@ -343,6 +383,7 @@ class ProfileController &lt; PublicController
     end
   end
  
+
   protected
  
   def check_access_to_profile
@@ -393,4 +434,5 @@ class ProfileController &lt; PublicController
   def relations_to_include
     [:image, :domains, :preferred_domain, :environment]
   end
+
 end
@@ -558,6 +558,9 @@ module ApplicationHelper
   # displays a link to the profile homepage with its image (as generated by
   # #profile_image) and its name below it.
   def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
+    if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
+      return instance_eval(&content)
+    end
     name = profile.short_name
     if profile.person?
       url = url_for(profile.check_friendship_url)
@@ -574,16 +577,16 @@ module ApplicationHelper
     extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag('div', content_tag(tag,
-        (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
-        link_to(
-            content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
-            content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-            extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
-            profile.url,
-            :class => 'profile_link url',
-            :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
-            :title => profile.name ),
-        :class => 'vcard'), :class => 'common-profile-list-block')
+                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
+    link_to(
+      content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
+      content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
+      extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+      profile.url,
+      :class => 'profile_link url',
+      :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
+      :title => profile.name ),
+      :class => 'vcard'), :class => 'common-profile-list-block')
   end
  
   def gravatar_url_for(email, options = {})
@@ -1113,15 +1116,34 @@ module ApplicationHelper
     result
   end
  
-  def manage_enterprises
-    if user && !user.enterprises.empty?
-      enterprises_link = user.enterprises.map do |enterprise|
-        link_to(content_tag('strong', [_('<span>Manage</span> %s') % enterprise.short_name(25)]), @environment.top_url + "/myprofile/#{enterprise.identifier}", :class => "icon-menu-"+enterprise.class.identification.underscore, :title => [_('Manage %s') % enterprise.short_name])
+  def manage_link(list, kind)
+    if list.present?
+      link_to_all = nil
+      if list.count > 5
+        list = list.first(5)
+        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => current_user.login)
+      end
+      link = list.map do |element|
+        link_to(content_tag('strong', [_('<span>Manage</span> %s') % element.short_name(25)]), @environment.top_url + "/myprofile/#{element.identifier}", :class => "icon-menu-"+element.class.identification.underscore, :title => [_('Manage %s') % element.short_name])
       end
-      render :partial => 'shared/manage_enterprises', :locals => {:enterprises_link => enterprises_link}
+      if link_to_all
+        link << link_to_all
+      end
+      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s}
     end
   end
  
+  def manage_enterprises
+    return unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
+    manage_link(user.enterprises, :enterprises)
+  end
+
+  def manage_communities
+    return unless user && user.environment.enabled?(:display_my_communities_on_user_menu)
+    administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
+    manage_link(administered_communities, :communities)
+  end
+
   def usermenu_logged_in
     pending_tasks_count = ''
     count = user ? Task.to(user).pending.count : -1
@@ -1133,6 +1155,7 @@ module ApplicationHelper
     render_environment_features(:usermenu) +
     link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     manage_enterprises.to_s +
+    manage_communities.to_s +
     link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
@@ -1401,8 +1424,8 @@ module ApplicationHelper
   end
  
   def filter_html(html, source)
-    if @plugins
-      html = convert_macro(html, source)
+    if @plugins && source && source.has_macro?
+      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
       #TODO This parse should be done through the macro infra, but since there
       #     are old things that do not support it we are keeping this hot spot.
       html = @plugins.pipeline(:parse_content, html, source).first
@@ -42,7 +42,7 @@ module BlogHelper
  
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
-    html = send("display_#{format}_format", article).html_safe
+    html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
  
     article_title(article, :no_comments => no_comments) + html
   end
@@ -100,9 +100,7 @@ module BoxesHelper
       options[:title] = _("This block is invisible. Your visitors will not see it.")
     end
  
-    if @controller.send(:content_editor?)
-      result = filter_html(result, block)
-    end
+    result = filter_html(result, block)
  
     box_decorator.block_target(block.box, block) +
       content_tag('div',
@@ -3,10 +3,21 @@ module CategoriesHelper
  
   COLORS = [
     [ N_('Do not display at the menu'), nil ],
-    [ N_('Orange'), 1 ],
-    [ N_('Green'), 2 ],
-    [ N_('Purple'), 3 ],
-    [ N_('Red'), 4 ],
+    [ N_('Orange'), 1],
+    [ N_('Green'), 2],
+    [ N_('Purple'), 3],
+    [ N_('Red'), 4],
+    [ N_('Dark Green'), 5],
+    [ N_('Blue Oil'), 6],
+    [ N_('Blue'), 7],
+    [ N_('Brown'), 8],
+    [ N_('Light Green'), 9],
+    [ N_('Light Blue'), 10],
+    [ N_('Dark Blue'), 11],
+    [ N_('Blue Pool'), 12],
+    [ N_('Beige'), 13],
+    [ N_('Yellow'), 14],
+    [ N_('Light Brown'), 15]
   ]
  
   TYPES = [
@@ -33,7 +33,7 @@ module CmsHelper
       link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
     else
       if article.image?
-         image_tag(icon_for_article(article)) + link_to(article_name, article.url)
+        image_tag(icon_for_article(article)) + link_to(article_name, article.url)
       else
         link_to article_name, article.url, :class => icon_for_article(article)
       end
@@ -17,7 +17,7 @@ module ContentViewerHelper
     title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = article.title if title.blank?
     title = content_tag('h1', h(title), :class => 'title')
-    if article.belongs_to_blog?
+    if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
         title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
       end
@@ -21,6 +21,7 @@ module FolderHelper
   end
  
   def display_article_in_listing(article, recursive = false, level = 0)
+    article = FilePresenter.for article
     article_link = if article.image?
          link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
        else
@@ -40,12 +41,15 @@ module FolderHelper
   end
  
   def icon_for_article(article)
-    icon = article.class.icon_name(article)
+    article = FilePresenter.for article
+    icon = article.respond_to?(:icon_name) ?
+             article.icon_name :
+             article.class.icon_name(article)
     if (icon =~ /\//)
       icon
     else
-      klasses = 'icon icon-' + icon
-      if article.kind_of?(UploadedFile)
+      klasses = 'icon ' + [icon].flatten.map{|name| 'icon-'+name}.join(' ')
+      if article.kind_of?(UploadedFile) || article.kind_of?(FilePresenter)
         klasses += ' icon-upload-file'
       end
       klasses
@@ -44,4 +44,30 @@ module SweeperHelper
   def expire_profile_index(profile)
     expire_timeout_fragment(profile.relationships_cache_key)
   end
+
+  def expire_blocks_cache(context, causes)
+    if context.kind_of?(Profile)
+      profile = context
+      environment = profile.environment
+    else
+      environment = context
+      profile = nil
+    end
+
+    blocks_to_expire = []
+    if profile
+      profile.blocks.each {|block|
+        conditions = block.class.expire_on
+        blocks_to_expire << block unless (conditions[:profile] & causes).empty?
+      }
+    end
+    environment.blocks.each {|block|
+      conditions = block.class.expire_on
+      blocks_to_expire << block unless (conditions[:environment] & causes).empty?
+    }
+
+    blocks_to_expire.uniq!
+    BlockSweeper.expire_blocks(blocks_to_expire)
+  end
+
 end
@@ -2,6 +2,8 @@ require &#39;hpricot&#39;
  
 class Article < ActiveRecord::Base
  
+  acts_as_having_image
+
   SEARCHABLE_FIELDS = {
     :name => 10,
     :abstract => 3,
@@ -154,8 +156,12 @@ class Article &lt; ActiveRecord::Base
     end
   end
  
+  def css_class_list
+    [self.class.name.underscore.dasherize]
+  end
+
   def css_class_name
-    self.class.name.underscore.dasherize
+    [css_class_list].flatten.compact.join(' ')
   end
  
   def pending_categorizations
@@ -310,6 +316,10 @@ class Article &lt; ActiveRecord::Base
   def belongs_to_blog?
     self.parent and self.parent.blog?
   end
+  
+  def belongs_to_forum?
+    self.parent and self.parent.forum?
+  end
  
   def info_from_last_update
     last_comment = comments.last
@@ -325,7 +335,7 @@ class Article &lt; ActiveRecord::Base
   end
  
   def view_url
-    @view_url ||= image? ? url.merge(:view => true) : url
+    @view_url ||= is_a?(UploadedFile) ? url.merge(:view => true) : url
   end
  
   def comment_url_structure(comment, action = :edit)
@@ -673,6 +683,10 @@ class Article &lt; ActiveRecord::Base
  
   delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
  
+  def has_macro?
+    true
+  end
+
   private
  
   def sanitize_tag_list
@@ -12,7 +12,7 @@ class ArticleBlock &lt; Block
     block = self
     lambda do
       block_title(block.title) +
-      (block.article ? article_to_html(block.article,
+      (block.article ? article_to_html(FilePresenter.for(block.article),
           :gallery_view => false,
           :inside_block => block,               # For Blogs and folders
           :format => block.visualization_format # For Articles and contents
@@ -23,7 +23,7 @@ class ArticleBlock &lt; Block
   def article_id
     self.settings[:article_id]
   end
-  
+
   def article_id= value
     self.settings[:article_id] = value.blank? ? nil : value.to_i
   end
@@ -63,4 +63,9 @@ class ArticleBlock &lt; Block
   end
  
   settings_items :visualization_format, :type => :string, :default => 'short'
+
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
+
 end
@@ -138,4 +138,19 @@ class Block &lt; ActiveRecord::Base
     4.hours
   end
  
+  def has_macro?
+    false
+  end
+
+  # Override in your subclasses.
+  # Define which events and context should cause the block cache to expire
+  # Possible events are: :article, :profile, :friendship, :category
+  # Possible contexts are: :profile, :environment
+  def self.expire_on
+    {
+      :profile => [],
+      :environment => []
+    }
+  end
+
 end
@@ -45,4 +45,7 @@ class BlogArchivesBlock &lt; Block
     content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
   end
  
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
 end
@@ -35,4 +35,7 @@ class CategoriesBlock &lt; Block
     end
   end
  
+  def self.expire_on
+      { :profile => [], :environment => [:category] }
+  end
 end
@@ -12,7 +12,7 @@ class Category &lt; ActiveRecord::Base
   validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
   belongs_to :environment
  
-  validates_inclusion_of :display_color, :in => [ 1, 2, 3, 4, nil ]
+  validates_inclusion_of :display_color, :in => 1..15, :allow_nil => true
   validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('%{fn} was already assigned to another category.').fix_i18n
  
   # Finds all top level categories for a given environment. 
@@ -16,9 +16,7 @@ class Comment &lt; ActiveRecord::Base
   has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
   belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
  
-  named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
   named_scope :without_reply, :conditions => ['reply_of_id IS NULL']
-  named_scope :spam, :conditions => ['spam = ?', true]
  
   # unauthenticated authors:
   validates_presence_of :name, :if => (lambda { |record| !record.email.blank? })
@@ -108,6 +106,17 @@ class Comment &lt; ActiveRecord::Base
  
   include Noosfero::Plugin::HotSpot
  
+  include Spammable
+
+  def after_spam!
+    SpammerLogger.log(ip_address, self)
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+  end
+
+  def after_ham!
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+  end
+
   def verify_and_notify
     check_for_spam
     unless spam?
@@ -115,10 +124,6 @@ class Comment &lt; ActiveRecord::Base
     end
   end
  
-  def check_for_spam
-    plugins.dispatch(:check_comment_for_spam, self)
-  end
-
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
       if !notification_emails.empty?
@@ -205,37 +210,6 @@ class Comment &lt; ActiveRecord::Base
     @rejected = true
   end
  
-  def spam?
-    !spam.nil? && spam
-  end
-
-  def ham?
-    !spam.nil? && !spam
-  end
-
-  def spam!
-    self.spam = true
-    self.save!
-    SpammerLogger.log(ip_address, self)
-    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
-    self
-  end
-
-  def ham!
-    self.spam = false
-    self.save!
-    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
-    self
-  end
-
-  def marked_as_spam
-    plugins.dispatch(:comment_marked_as_spam, self)
-  end
-
-  def marked_as_ham
-    plugins.dispatch(:comment_marked_as_ham, self)
-  end
-
   def need_moderation?
     article.moderate_comments? && (author.nil? || article.author != author)
   end
@@ -127,7 +127,9 @@ class Environment &lt; ActiveRecord::Base
       'captcha_for_logged_users' => _('Ask captcha when a logged user comments too'),
       'skip_new_user_email_confirmation' => _('Skip e-mail confirmation for new users'),
       'send_welcome_email_to_new_users' => _('Send welcome e-mail to new users'),
-      'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login')
+      'allow_change_of_redirection_after_login' => _('Allow users to set the page to redirect after login'),
+      'display_my_communities_on_user_menu' => _('Display on menu the list of communities the user can manage'),
+      'display_my_enterprises_on_user_menu' => _('Display on menu the list of enterprises the user can manage')
     }
   end
  
@@ -33,6 +33,12 @@ class LinkListBlock &lt; Block
     ['chat', N_('Chat')]
   ]
  
+  TARGET_OPTIONS = [
+    [N_('Same page'), '_self'],
+    [N_('New tab'), '_blank'],
+    [N_('New window'), '_new'],
+  ]
+
   settings_items :links, Array, :default => []
  
   before_save do |block|
@@ -57,7 +63,7 @@ class LinkListBlock &lt; Block
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
     sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :class => klass)
+      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass)
     )
   end
  
@@ -10,4 +10,7 @@ class RawHTMLBlock &lt; Block
     (title.blank? ? '' : block_title(title)).html_safe + html.to_s.html_safe
   end
  
+  def has_macro?
+    true
+  end
 end
@@ -30,4 +30,7 @@ class RecentDocumentsBlock &lt; Block
     end
   end
  
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
 end
@@ -6,6 +6,8 @@ class SpammerLogger &lt; Logger
     if object
       if object.kind_of?(Comment)
         @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
+      elsif object.kind_of?(SuggestArticle)
+        @logger << "[#{Time.now.strftime('%F %T %z')}] SuggestArticle-id: #{object.id} IP: #{spammer_ip}\n"
       end
     else
         @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
@@ -11,6 +11,17 @@ class SuggestArticle &lt; Task
   settings_items :source, :type => String
   settings_items :source_name, :type => String
   settings_items :highlighted, :type => :boolean, :default => false
+  settings_items :ip_address, :type => String
+  settings_items :user_agent, :type => String
+  settings_items :referrer, :type => String
+
+  after_create :schedule_spam_checking
+
+  def schedule_spam_checking
+    self.delay.check_for_spam
+  end
+
+  include Noosfero::Plugin::HotSpot
  
   def sender
     "#{name} (#{email})"
@@ -61,4 +72,12 @@ class SuggestArticle &lt; Task
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
  
+  def after_spam!
+    SpammerLogger.log(ip_address, self)
+    self.delay.marked_as_spam
+  end
+
+  def after_ham!
+    self.delay.marked_as_ham
+  end
 end
@@ -59,4 +59,8 @@ class TagsBlock &lt; Block
     15.minutes
   end
  
+  def self.expire_on
+      { :profile => [:article], :environment => [:article] }
+  end
+
 end
@@ -235,6 +235,8 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
+  include Spammable
+
   protected
  
   # This method must be overrided in subclasses, and its implementation must do
@@ -275,6 +277,7 @@ class Task &lt; ActiveRecord::Base
   named_scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions =>  [conditions]} }
   named_scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} }
  
+
   named_scope :to, lambda { |profile|
     environment_condition = nil
     if profile.person?
@@ -41,7 +41,25 @@ class UploadedFile &lt; Article
   end
  
   def self.max_size
-    UploadedFile.attachment_options[:max_size]
+    default = 5.megabytes
+
+    multipliers = {
+      :KB => :kilobytes,
+      :MB => :megabytes,
+      :GB => :gigabytes,
+      :TB => :terabytes,
+    }
+    max_upload_size = NOOSFERO_CONF['max_upload_size']
+
+    if max_upload_size =~ /^(\d+(\.\d+)?)\s*(KB|MB|GB|TB)?$/
+      number = $1.to_f
+      unit = $3 || :MB
+      multiplier = multipliers[unit.to_sym]
+
+      number.send(multiplier).to_i
+    else
+      default
+    end
   end
  
   # FIXME need to define min/max file size
@@ -52,20 +70,28 @@ class UploadedFile &lt; Article
   has_attachment :storage => :file_system,
     :thumbnails => { :icon => [24,24], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
     :thumbnail_class => Thumbnail,
-    :max_size => 5.megabytes # remember to update validate message below
+    :max_size => self.max_size
  
-  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
+  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of %{size}").sub('%{size}', self.max_size.to_humanreadable).fix_i18n
  
   delay_attachment_fu_thumbnails
  
   postgresql_attachment_fu
  
+  # Use this method only to get the generic icon for this kind of content.
+  # If you want the specific icon for a file type or the iconified version
+  # of an image, use FilePresenter.for(uploaded_file).icon_name
   def self.icon_name(article = nil)
-    if article
-      article.image? ? article.public_filename(:icon) : (article.mime_type ? article.mime_type.gsub(/[\/+.]/, '-') : 'upload-file')
-    else
-      'upload-file'
+    unless article.nil?
+      warn = ('='*80) + "\n" +
+             'The method `UploadedFile.icon_name(obj)` is deprecated. ' +
+             'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+             "\n" + ('='*80)
+      raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+      Rails.logger.warn warn if Rails.logger
+      puts warn if ENV['RAILS_ENV'] == 'development'
     end
+    'upload-file'
   end
  
   def mime_type
@@ -91,40 +117,27 @@ class UploadedFile &lt; Article
   end
  
   def to_html(options = {})
+    warn = ('='*80) + "\n" +
+           'The method `UploadedFile#to_html()` is deprecated. ' +
+           'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+           "\n" + ('='*80)
+    raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+    Rails.logger.warn warn if Rails.logger
+    puts warn if ENV['RAILS_ENV'] == 'development'
     article = self
     if image?
       lambda do
-        if article.gallery? && options[:gallery_view]
-          images = article.parent.images
-          current_index = images.index(article)
-          total_of_images = images.count
-
-          link_to_previous = if current_index >= 1
-            link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'left')
-          else
-            content_tag('span', _('&laquo; Previous'), :class => 'left')
-          end
-
-          link_to_next = if current_index < total_of_images - 1
-            link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'right')
-          else
-            content_tag('span', _('Next &raquo;'), :class => 'right')
-          end
-
-          content_tag(
-            'div',
-            link_to_previous + (content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images]).html_safe + link_to_next,
-            :class => 'gallery-navigation'
-          )
-        end.to_s +
-        image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
-
+        image_tag(article.public_filename(:display),
+                  :class => article.css_class_name,
+                  :style => 'max-width: 100%') +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     else
       lambda do
-        content_tag('ul', content_tag('li', link_to(article.name, article.url, :class => article.css_class_name))) +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
+        content_tag('div',
+                    link_to(article.name, article.url),
+                    :class => article.css_class_name) +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     end
   end
@@ -0,0 +1,7 @@
+# Made to encapsulate any UploadedFile
+class FilePresenter::Generic < FilePresenter
+  # if returns low priority, because it is generic.
+  def self.accepts?(f)
+    1 if f.is_a? UploadedFile
+  end
+end
@@ -0,0 +1,14 @@
+class FilePresenter::Image < FilePresenter
+  def self.accepts?(f)
+    return nil unless f.respond_to? :image?
+    f.image? ? 10 : nil
+  end
+
+  def icon_name
+    public_filename :icon
+  end
+
+  def short_description
+    _('Image (%s)') % content_type.split('/')[1].upcase
+  end
+end
@@ -16,15 +16,15 @@ class ArticleSweeper &lt; ActiveRecord::Observer
     end
   end
  
+
 protected
  
   def expire_caches(article)
+    expire_blocks_cache(article.profile, [:article])
+
     return if !article.environment
+
     article.hierarchy(true).each { |a| a.touch if a != article }
-    blocks = article.profile.blocks
-    blocks += article.profile.environment.blocks if article.profile.environment
-    blocks = blocks.select{|b|[RecentDocumentsBlock, BlogArchivesBlock].any?{|c| b.kind_of?(c)}}
-    BlockSweeper.expire_blocks(blocks)
     env = article.profile.environment
     if env && (env.portal_community == article.profile)
       article.environment.locales.keys.each do |locale|
@@ -3,7 +3,13 @@ class CategorySweeper &lt; ActiveRecord::Observer
   include SweeperHelper
  
   def after_save(category)
+    expire_blocks_cache(category.environment, [:category])
+
+    # Needed for environments with application layout
     expire_fragment(category.environment.id.to_s + "_categories_menu")
   end
  
+  def after_destroy(category)
+    expire_blocks_cache(category.environment, [:category])
+  end
 end
 <strong><%= _('Links') %></strong>
 <div id='edit-link-list-block' style='width:450px'>
 <table id='links' class='noborder'>
-  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
+  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th><th><%= _('Target') %></th></tr>
   <% for link in @block.links do %>
     <tr>
       <td>
@@ -9,6 +9,9 @@
       </td>
       <td><%= text_field_tag 'block[links][][name]', link[:name], :class => 'link-name', :maxlength => 20 %></td>
       <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address], :class => 'link-address' %></td>
+      <td>
+        <%= select_tag('block[links][][target]', options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])) %>
+      </td>
     </tr>
   <% end %>
 </table>
@@ -18,7 +21,9 @@
     page.insert_html :bottom, 'links', content_tag('tr',
       content_tag('td', icon_selector('ok')) +
       content_tag('td', text_field_tag('block[links][][name]', '', :maxlength => 20)) +
-      content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'cel-address'))
+      content_tag('td', text_field_tag('block[links][][address]', nil, :class => 'link-address'), :class => 'cel-address') +
+      content_tag('td', select_tag('block[links][][target]',
+options_for_select(LinkListBlock::TARGET_OPTIONS, link[:target])))
     ) +
     javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
 end %>
@@ -2,6 +2,18 @@
   <%= _('Content management') %>
 </h1>
  
+<% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
+  <div class="cms-homepage">
+    <%= _('Profile homepage:') %>
+    <% if profile.home_page %>
+      <%= link_to_article(profile.home_page) %>
+      <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+    <% else %>
+      <span class="cms-homepage-default"><%= _('Profile Information') %></span>
+    <% end %>
+  </div>
+<% end %>
+
 <% button_bar(:style => 'margin-bottom: 1em;') do %>
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
  
@@ -40,20 +52,27 @@
     </tr>
   <% end %>
  
-  <% @articles.each do |article| %>
+  <% @articles.each do |article| article = FilePresenter.for article %>
     <tr title="<%= article.title%>" >
-      <td>
+      <td class="article-name">
         <%= link_to_article(article) %>
       </td>
-      <td>
-        <%= article.class.short_description %>
+      <% short_description =  article.respond_to?(:short_description) ?
+            article.short_description :
+            article.class.short_description %>
+      <td class="article-mime" title=<%= short_description.to_json %>>
+        <%= short_description %>
       </td>
       <td class="article-controls">
         <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
         <%= button_without_text :eyes, _('Public view'), article.view_url %>
         <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%>
         <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
-          <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+          <% if profile.home_page != article %>
+            <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+          <% else %>
+            <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+          <% end %>
         <% end %>
         <%= display_delete_button(article) if !remove_content_button(:delete) %>
       </td>
@@ -0,0 +1,9 @@
+<span class="download-link">
+  <span>Download</span>
+  <strong><%= link_to generic.filename, generic.public_filename %></strong>
+</span>
+
+<div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
+  <%= generic.abstract %>
+</div>
+
@@ -0,0 +1,36 @@
+<% if image.gallery? && options[:gallery_view] %>
+<%
+  images = image.parent.images
+  current_index = images.index(image.encapsulated_file)
+  total_of_images = images.count
+  link_to_previous = if current_index >= 1
+   link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'previous')
+  else
+    content_tag('span', _('&laquo; Previous'), :class => 'previous')
+  end
+
+  link_to_next = if current_index < total_of_images - 1
+    link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'next')
+  else
+    content_tag('span', _('Next &raquo;'), :class => 'next')
+  end
+%>
+
+<div class="gallery-navigation">
+  <%= link_to_previous %>
+  <span class="total-of-images">
+    <%= _('image %d of %d') % [current_index + 1, total_of_images] %>
+  </span>
+  <%= link_to_next %>
+</div>
+
+<% end %>
+
+<%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
+
+<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
+
+<div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
+  <%= image.abstract %>
+</div>
+
@@ -46,9 +46,11 @@
  
   <%= template_options(Community, 'community')%>
  
+  <%= hidden_field_tag('back_to', @back_to) %>
+
   <% button_bar do %>
     <%= submit_button(:save, _('Create')) %>
-    <%= button(:cancel, _('Cancel'), :action => 'index') %>
+    <%= button(:cancel, _('Cancel'), @back_to ) %>
   <% end %>
  
 <% end %>
@@ -0,0 +1,3 @@
+<div class='view-more-comments'>
+  <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (comment_page + 1)) %>
+</div>
@@ -0,0 +1,3 @@
+<div class='view-more-replies'>
+  <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (comment_page + 1)) %>
+</div>
@@ -4,7 +4,7 @@
     <% if activity.kind_of?(ActionTracker::Record) %>
       <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
     <% else %>
-      <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
+      <%= render :partial => 'profile_scraps', :locals => { :activity => activity, :scrap => activity } %>
     <% end %>
   <% end %>
 <% end %>
 <hr />
  
-<% if activity.comments_count > 2 %>
+<ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments"  >
+</ul>
+<% if activity.comments_count > 0 %>
+<div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments" >
   <div class='view-all-comments icon-chat'>
-    <%= link_to(_("View all %s comments") % activity.comments_count, '#') %>
+     <%= link_to(n_('View comment', "View all %s comments", activity.comments_count) % activity.comments_count, :profile => profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (1)) %>
   </div>
+</div>
 <% end %>
-
-<ul class="profile-wall-activities-comments" style="<%= 'display:none;' if (activity.comments_count > 2) %>" >
-  <%= render :partial => 'comment', :collection => activity.comments_as_thread %>
-</ul>
-
 <%= render :partial => 'profile_comment_form', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -16,13 +16,7 @@
     </div>
   </div>
  
-  <% if scrap.replies.count > 2 %>
-    <div class='view-all-comments icon-chat'>
-      <%= link_to(_("View all %s comments") % scrap.replies.count, '#') %>
-    </div>
-  <% end %>
-
-  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
+  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
-NÃO DEVE APARECER
+<li class='profile-activity-item' id='profile-activity-item-<%= scrap.id %>'>
+  <div class='profile-activity-image'>
+    <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
+  </div>
+  <div class='profile-activity-description'>
+    <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
+    <p class='profile-activity-text'><%= txt2html scrap.content %></p>
+    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <div class='profile-wall-actions'>
+    <% if logged_in? && current_person.follows?(scrap.sender) %>
+      <span class='profile-activity-send-reply'>
+        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
+      </span>
+    <% end %>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
+    </div>
+  </div>
+
+
+  <ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
+  </ul>
+
+  <% if scrap.replies.count > 0 %>
+    <div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments">
+      <div class='view-all-comments icon-chat'>
+        <%= link_to(n_('View comment', "View all %s comments", scrap.replies.count) % scrap.replies.count, :profile => profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (1)) %>
+      </div>
+    </div>
+  <% end %>
+  <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
+  <hr />
+</li>
@@ -1,8 +0,0 @@
-<div id='manage-enterprises'>
-  <a href="#" id='manage-enterprises-link' class='simplemenu-trigger' title='<%= _('Manage enterprises') %>'><i class="icon-menu-enterprise"></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My enterprises') %></strong></a>
-  <ul class='simplemenu-submenu'>
-    <% enterprises_link.each do |link| %>
-      <li class='simplemenu-item'><%= link %></li>
-    <% end %>
-  </ul>
-</div>
@@ -0,0 +1,8 @@
+<div id=<%= "manage-#{kind}" %> class="manage-groups">
+  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % kind %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My %s') % kind %></strong></a>
+  <ul class="simplemenu-submenu">
+    <% link.each do |link| %>
+      <li class="simplemenu-item"><%= link %></li>
+    <% end %>
+  </ul>
+</div>
@@ -0,0 +1,11 @@
+<%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
+<div id='article'>
+  <div class="comments" id="comments_list">
+    <ul class="article-comments-list">
+      <%= render :partial => 'comment/comment', :collection => @comment_spam %>
+    </ul>
+  </div>
+</div>
+
+<%= pagination_links @comment_spam, :param_name => :comments_page %>
+
@@ -0,0 +1,21 @@
+<% render :layout => 'task', :locals => { :task => task } do %>
+  <% content_for :extra_buttons do %>
+    <%= button_to_function('down', _('Show details'), "toggleDetails(this, '#{_('Hide details')}', '#{_('Show details')}')" ) %>
+  <% end %>
+
+  <% content_for :extra_content do %>
+    <ul class="suggest-article-details" style="display: none">
+      <li><strong><%=_('Sent by')%></strong>: <%=task.name%> </li>
+      <li><strong><%=_('Email')%></strong>: <%=task.email%> </li>
+      <li><strong><%=_('Source')%></strong>: <%=task.source_name%> </li>
+      <li><strong><%=_('Source URL')%></strong>: <%=task.source%> </li>
+      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
+      <li><strong><%=_('Lead')%></strong>: <%=task.article_abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_abstract%> </li>
+      <li><strong><%=_('Body')%></strong>:
+      <div class='suggest-article-body'>
+        <%= task.article_body %>
+      </div>
+      </li>
+    </ul>
+  <% end %>
+<% end %>
@@ -0,0 +1,18 @@
+<div class="task_box" id="task-<%= task.id %>">
+  <%= render :partial => 'tasks/task_icon', :locals => {:task => task} %>
+  <%= render :partial => 'tasks/task_title', :locals => {:task => task} %>
+  <div class="task-information">
+    <%= task_information(task) %>
+  </div>
+
+  <%= yield %> <% # ??? %>
+
+  <% button_bar do %>
+    <%= button_to_function('new', _('Mark as NOT SPAM'), 'removeTaskBox(this, %s, "%s", "")' % [url_for(:mark_task_as_ham => task.id).to_json, "task-#{task.id}"]) %>
+    <%= yield :extra_buttons %>
+    <%= button_to_function('delete', _('Remove'), 'removeTaskBox(this, %s, "%s", %s)' % [url_for(:profile => params[:profile], :remove_task => task.id).to_json, "task-#{task.id}", _('Are you sure you want to remove this article suggestion?').to_json]) %>
+
+  <% end %>
+
+  <%= yield :extra_content %>
+</div>
@@ -0,0 +1,4 @@
+<% @task_spam.each do |t| %>
+  <%= render :partial => partial_for_class(t.class), :locals => { :task => t } %>
+<% end %>
+<%= pagination_links @task_spam, :param_name => :tasks_page %>
+<%= stylesheet('tasks') %>
+
 <h1><%= _('Manage SPAM') %></h1>
  
+<% no_tabs = @comment_spam.blank? && @task_spam.blank? %>
+
+<%= _('There are no spams to review.') if no_tabs %>
+
 <% button_bar do %>
   <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
 <% end %>
  
 <%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
-<div id='article'>
-  <div class="comments" id="comments_list">
-    <ul class="article-comments-list">
-      <%= render :partial => 'comment/comment', :collection => @spam %>
-    </ul>
-  </div>
-</div>
  
-<%= pagination_links @spam %>
+<% tabs = [] %>
+<% tabs << {:title => _('Comment Spam'), :id => 'comment-spam',
+  :content => (render :partial => 'comment_spam')} if @comment_spam.present? %>
+<% tabs << {:title => _('Task Spam'), :id => 'task-spam',
+  :content => (render :partial => 'task_spam') } if @task_spam.present? %>
+<%= render_tabs(tabs) %>
  
-<% button_bar do %>
-  <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+<% unless no_tabs %>
+  <% button_bar do %>
+    <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+  <% end %>
 <% end %>
+
+<%= javascript_include_tag 'spam' %>
 <div class="task_box" id="task-<%= task.id %>">
  
-  <div class="task_icon">
-    <%
-        icon_info = task.icon
-        if icon_info[:type] == :profile_image
-          icon = profile_image(icon_info[:profile], :minor)
-        elsif icon_info[:type] == :defined_image
-          icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
-        end
-      %>
-    <%=
-        if icon_info[:url]
-          link_to(icon, icon_info[:url])
-        else
-          icon
-        end
-      %>
-
-  </div>
+  <%= render :partial => 'task_icon', :locals => {:task => task} %>
  
   <div class="task_decisions">
     <%=
@@ -39,9 +22,7 @@
     %>
   </div><!-- class="task_decisions" -->
  
-  <strong class="task_title">
-    <%= task.title %>
-  </strong>
+  <%= render :partial => 'task_title', :locals => {:task => task} %>
  
   <div class="task_information">
     <%= task_information(task) %>
@@ -0,0 +1,16 @@
+<%
+  icon_info = task.icon
+  if icon_info[:type] == :profile_image
+    icon = profile_image(icon_info[:profile], :minor)
+  elsif icon_info[:type] == :defined_image
+    icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
+  end
+
+  if icon_info[:url]
+    icon = link_to(icon, icon_info[:url])
+  end
+%>
+
+<div class="task_icon">
+  <%= icon %>
+</div>
@@ -0,0 +1,3 @@
+<strong class="task_title">
+  <%= task.title %>
+</strong>
@@ -4,4 +4,5 @@ require &#39;noosfero/plugin/manager&#39;
 require 'noosfero/plugin/active_record'
 require 'noosfero/plugin/mailer_base'
 require 'noosfero/plugin/settings'
+require 'noosfero/plugin/spammable'
 Noosfero::Plugin.init_system if $NOOSFERO_LOAD_PLUGINS
@@ -8,6 +8,7 @@ development:
   gravatar: wavatar
   googlemaps_initial_zoom: 4
   exception_recipients: [admin@example.com]
+  max_upload_size: 5MB
  
 test:
  
@@ -0,0 +1,13 @@
+class AddSpamToTask < ActiveRecord::Migration
+  def self.up
+    change_table :tasks do |t|
+      t.boolean :spam, :default => false
+    end
+    Task.update_all ["spam = ?", false]
+    add_index :tasks, [:spam]
+  end
+
+  def self.down
+    remove_column :tasks, :spam
+  end
+end
@@ -0,0 +1,13 @@
+class AddImageToArticle < ActiveRecord::Migration
+
+  def self.up
+    add_column :articles, :image_id, :integer
+    add_column :article_versions, :image_id, :integer
+  end
+
+  def self.down
+    remove_column :articles, :image_id
+    remove_column :article_versions, :image_id
+  end
+
+end
@@ -0,0 +1,13 @@
+class AddPositionToArticle < ActiveRecord::Migration
+
+  def self.up
+    add_column :articles, :position, :integer
+    add_column :article_versions, :position, :integer
+  end
+
+  def self.down
+    remove_column :articles, :position
+    remove_column :article_versions, :position
+  end
+
+end
@@ -0,0 +1,14 @@
+class EnableEnterprisesListOnUserMenu < ActiveRecord::Migration
+  def self.up
+    # The enterprises were always listed on user menu.
+    # As now it is configured by admin, the running environments should not need to enable it
+    select_all("select id from environments").each do |environment|
+      env = Environment.find(environment['id'])
+      env.enable(:display_my_enterprises_on_user_menu)
+    end
+  end
+
+  def self.down
+    #nothing to be done
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20130711213046) do
+ActiveRecord::Schema.define(:version => 20131116165327) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -86,6 +86,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
+    t.integer  "image_id"
+    t.integer  "position"
   end
  
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
@@ -129,6 +131,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
+    t.integer  "image_id"
+    t.integer  "position"
   end
  
   add_index "articles", ["name"], :name => "index_articles_on_name"
@@ -547,8 +551,11 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.datetime "created_at"
     t.string   "target_type"
     t.integer  "image_id"
+    t.boolean  "spam",                       :default => false
   end
  
+  add_index "tasks", ["spam"], :name => "index_tasks_on_spam"
+
   create_table "thumbnails", :force => true do |t|
     t.integer "size"
     t.string  "content_type"
@@ -9,7 +9,7 @@ Feature: browse catalogs
     And the following enterprises
       | identifier | owner     | name                               | enabled |
       | artebonito | joaosilva | Associação de Artesanato de Bonito | true    |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
     And the following product_categories
       | name   |
       | categ1 |
@@ -6,7 +6,7 @@ Background:
   Given the following enterprises
     | identifier | name       |
     | shop1      | Shoes Shop |
-  And feature "disable_products_for_enterprises" is disabled on environment
+  And feature "products_for_enterprises" is enabled on environment
   And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
  
 Scenario: show all enterprises
@@ -21,6 +21,7 @@ Feature: enterprise homepage
     And the following product
       | name             | category | owner  |
       | Natural Handmade | soap     | mayhem |
+    And feature "products_for_enterprises" is enabled on environment
  
  
   Scenario: display profile info
@@ -19,7 +19,7 @@ Feature: manage inputs
     And the following product
       | owner      | category | name       |
       | redemoinho | rock     | Abbey Road |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
     And the following units
       | singular | plural |
       | Meter    | Meters |
@@ -19,7 +19,7 @@ Feature: manage product price details
     And the following product
       | owner      | category | name       | price |
       | redemoinho | rock     | Abbey Road | 80.0  |
-    And feature "disable_products_for_enterprises" is disabled on environment
+    And feature "products_for_enterprises" is enabled on environment
     And the following inputs
       | product    | category  | price_per_unit | amount_used |
       | Abbey Road | Rock      | 10.0           | 2           |
@@ -9,7 +9,7 @@ Feature: manage products
     And the following enterprises
       | identifier | owner | name | enabled |
       | redemoinho | joaosilva | Rede Moinho | true |
-    And feature "disable_products_for_enterprises" is disabled on environment
+   And feature "products_for_enterprises" is enabled on environment
  
   Scenario: display "create new product" button
     Given I am logged in as "joaosilva"
@@ -20,14 +20,20 @@ end
 class FeedUpdater
  
   class ExceptionNotification < ActionMailer::Base
-    def mail error
+    def mail container, error
       environment = Environment.default
  
       recipients NOOSFERO_CONF['exception_recipients']
       from       environment.contact_email
       reply_to   environment.contact_email
       subject    "[#{environment.name}] Feed-updater: #{error.message}"
-      body       render(:text => error.backtrace.join("\n"))
+      body       render(:text => "
+Container:
+#{container.inspect}
+
+Backtrace:
+#{error.backtrace.join("\n")}
+      ")
     end
   end
  
@@ -88,11 +94,13 @@ class FeedUpdater
         if !running
           break
         end
-        feed_handler.process(container)
+        begin
+          feed_handler.process(container)
+        rescue Exception => e
+          FeedUpdater::ExceptionNotification.deliver_mail container, e if NOOSFERO_CONF['exception_recipients'].present?
+        end
       end
     end
-  rescue Exception => e
-    FeedUpdater::ExceptionNotification.deliver_mail e if NOOSFERO_CONF['exception_recipients'].present?
   end
 end
  
@@ -0,0 +1,107 @@
+# All file presenters must extends `FilePresenter` not only to ensure the
+# same interface, but also to make `FilePresenter.for(file)` to work.
+class FilePresenter
+
+  # Will return a encapsulated `UploadedFile` or the same object if no
+  # one accepts it. That behave allow to give any model to this class,
+  # like a Article and have no trouble with that.
+  def self.for(f)
+    return f if f.is_a? FilePresenter
+    klass = FilePresenter.subclasses.sort_by {|class_name|
+      class_name.constantize.accepts?(f) || 0
+    }.last.constantize
+    klass.accepts?(f) ? klass.new(f) : f
+  end
+
+  def initialize(f)
+    @file = f
+  end
+
+  # Allows to use the original `UploadedFile` reference.
+  def encapsulated_file
+    @file
+  end
+
+  def id
+    @file.id
+  end
+
+  def reload
+    @file.reload
+    self
+  end
+
+  # This method must be overridden in subclasses.
+  #
+  # If the class accepts the file, return a number that represents the
+  # priority the class should be given to handle that file. Higher numbers
+  # mean higher priority.
+  #
+  # If the class does not accept the file, return false.
+  def self.accepts?(f)
+    nil
+  end
+
+  def short_description
+    _("File (%s)") % content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
+  end
+
+  # Define the css classes to style the page fragment with the file related
+  # content. If you want other classes to identify this area to your
+  # customized presenter, so do this:
+  #   def css_class_list
+  #     [super, 'myclass'].flatten
+  #   end
+  def css_class_list
+    [ @file.css_class_list,
+      'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
+      'content-type_' + self.content_type.split('/')[0],
+      'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
+    ].flatten
+  end
+
+  # Enable file presenter to customize the css classes on view_page.rhtml
+  # You may not overwrite this method on your customized presenter.
+  def css_class_name
+    [css_class_list].flatten.compact.join(' ')
+  end
+
+  # The generic icon class-name or the specific file path.
+  # You may replace this method on your custom FilePresenter.
+  # See the current used icons class-names in public/designs/icons/tango/style.css
+  def icon_name
+    if mime_type
+      [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
+    else
+      'upload-file'
+    end
+  end
+
+  # Automatic render `file_presenter/<custom>.html.erb` to display your
+  # custom presenter html content.
+  # You may not overwrite this method on your customized presenter.
+  # A variable with the same presenter name will be created to refer
+  # to the file object.
+  # Example:
+  # The `FilePresenter::Image` render `file_presenter/image.html.erb`
+  # inside the `file_presenter/image.html.erb` you can access the
+  # required `FilePresenter::Image` instance in the `image` variable.
+  def to_html(options = {})
+    file = self
+    lambda do
+      render :partial => file.class.to_s.underscore,
+             :locals => { :options => options },
+             :object => file
+    end
+  end
+
+  # That makes the presenter to works like any other `UploadedFile` instance.
+  def method_missing(m, *args)
+    @file.send(m, *args)
+  end
+end
+
+# Preload FilePresenters to allow `FilePresenter.for()` to work
+Dir.glob(File.join('app', 'presenters', '*.rb')) do |file|
+  load file
+end
@@ -155,6 +155,7 @@ class Noosfero::Plugin
  
   # Here the developer may specify the events to which the plugins can
   # register and must return true or false. The default value must be false.
+  # Must also explicitly define its returning variables.
  
   # -> If true, noosfero will include plugin_dir/public/style.css into
   # application
@@ -162,10 +163,6 @@ class Noosfero::Plugin
     false
   end
  
-  # Here the developer should specify the events to which the plugins can
-  # register to. Must be explicitly defined its returning
-  # variables.
-
   # -> Adds buttons to the control panel
   # returns = { :title => title, :icon => icon, :url => url }
   #   title = name that will be displayed.
@@ -175,6 +172,13 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Customize profile block design and behavior
+  # (overwrites profile_image_link function)
+  # returns = lambda block that creates html code.
+  def profile_image_link(profile, size, tag, extra_info)
+    nil
+  end
+
   # -> Adds tabs to the profile
   # returns   = { :title => title, :id => id, :content => content, :start => start }
   #   title   = name that will be displayed.
@@ -304,45 +308,16 @@ class Noosfero::Plugin
     scope
   end
  
-  # This method is called by the CommentHandler background job before sending
-  # the notification email. If the comment is marked as spam (i.e. by calling
-  # <tt>comment.spam!</tt>), then the notification email will *not* be sent.
-  #
-  # example:
-  #
-  #   def check_comment_for_spam(comment)
-  #     if anti_spam_service.is_spam?(comment)
-  #       comment.spam!
-  #     end
-  #   end
-  #
-  def check_comment_for_spam(comment)
+  # -> Allows plugins to check weather object is a spam
+  def check_for_spam(object)
   end
  
-  # This method is called when the user manually marks a comment as SPAM. A
-  # plugin implementing this method should train its spam detection mechanism
-  # by submitting this comment as a confirmed spam.
-  #
-  # example:
-  #
-  #   def comment_marked_as_spam(comment)
-  #     anti_spam_service.train_with_spam(comment)
-  #   end
-  #
-  def comment_marked_as_spam(comment)
+  # -> Allows plugins to know when an object is marked as a spam
+  def marked_as_spam(object)
   end
  
-  # This method is called when the user manually marks a comment a NOT SPAM. A
-  # plugin implementing this method should train its spam detection mechanism
-  # by submitting this coimment as a confirmed ham.
-  #
-  # example:
-  #
-  #   def comment_marked_as_ham(comment)
-  #     anti_spam_service.train_with_ham(comment)
-  #   end
-  #
-  def comment_marked_as_ham(comment)
+  # -> Allows plugins to know when an object is marked as a ham
+  def marked_as_ham(object)
   end
  
   # Adds extra actions for comments
@@ -34,18 +34,20 @@ class Noosfero::Plugin::Manager
   alias :dispatch_scopes :dispatch_without_flatten
  
   def dispatch_first(event, *args)
-    result = nil
+    default = Noosfero::Plugin.new.send(event, *args)
+    result = default
     each do |plugin|
       result = plugin.send(event, *args)
-      break if result.present?
+      break if result != default
     end
     result
   end
  
   def fetch_first_plugin(event, *args)
+    default = Noosfero::Plugin.new.send(event, *args)
     result = nil
     each do |plugin|
-      if plugin.send(event, *args)
+      if plugin.send(event, *args) != default
         result = plugin.class
         break
       end
@@ -0,0 +1,13 @@
+Spammable.module_eval do
+  def marked_as_spam
+    plugins.dispatch(:marked_as_spam, self)
+  end
+
+  def marked_as_ham
+    plugins.dispatch(:marked_as_ham, self)
+  end
+
+  def check_for_spam
+    plugins.dispatch(:check_for_spam, self)
+  end
+end
@@ -0,0 +1,51 @@
+module Spammable
+  def self.included(recipient)
+    #TODO This line crashes the migration which includes the spam attribute to
+    #     Task...  =P
+    #     No fail-safe until someone find out how to use this without crashing
+    #     the migration process
+    #raise "This model (#{recipient.to_s}) should have a spam attribute!" if !recipient.new.respond_to?('spam=')
+    recipient.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def self.extended (base)
+      if base.respond_to?(:named_scope)
+        base.class_eval do
+          named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
+          named_scope :spam, :conditions => ['spam = ?', true]
+        end
+      end
+    end
+  end
+
+  def spam?
+    !spam.nil? && spam
+  end
+
+  def ham?
+    !spam.nil? && !spam
+  end
+
+  def spam!
+    before_spam!
+    self.spam = true
+    self.save!
+    after_spam!
+    self
+  end
+
+  def ham!
+    before_ham!
+    self.spam = false
+    self.save!
+    after_ham!
+    self
+  end
+
+  def after_spam!; end
+  def before_spam!; end
+
+  def after_ham!; end
+  def before_ham!; end
+end
@@ -5,38 +5,37 @@ class AntiSpamPlugin &lt; Noosfero::Plugin
   end
  
   def self.plugin_description
-    _("Checks comments against a spam checking service compatible with the Akismet API")
+    _("Tests comments and suggested articles against a spam checking service compatible with the Akismet API")
   end
  
   def self.host_default_setting
     'api.antispam.typepad.com'
   end
  
-  def check_comment_for_spam(comment)
-    if rakismet_call(comment, :spam?)
-      comment.spam = true
-      comment.save!
+  def check_for_spam(object)
+    if rakismet_call AntiSpamPlugin::Wrapper.wrap(object), object.environment, :spam?
+      object.spam = true
+      object.save!
     end
   end
  
-  def comment_marked_as_spam(comment)
-    rakismet_call(comment, :spam!)
+  def marked_as_spam(object)
+    rakismet_call AntiSpamPlugin::Wrapper.wrap(object), object.environment, :spam!
   end
  
-  def comment_marked_as_ham(comment)
-    rakismet_call(comment, :ham!)
+  def marked_as_ham(object)
+    rakismet_call AntiSpamPlugin::Wrapper.wrap(object), object.environment, :ham!
   end
  
   protected
  
-  def rakismet_call(comment, op)
-    settings = Noosfero::Plugin::Settings.new(comment.environment, self.class)
+  def rakismet_call(submission, environment, op)
+    settings = Noosfero::Plugin::Settings.new(environment, self.class)
  
     Rakismet.host = settings.host
     Rakismet.key = settings.api_key
-    Rakismet.url = comment.environment.top_url
+    Rakismet.url = environment.top_url
  
-    submission = AntiSpamPlugin::CommentWrapper.new(comment)
     submission.send(op)
   end
  
-class AntiSpamPlugin::CommentWrapper < Struct.new(:comment)
-
-  delegate :author_name, :author_email, :title, :body, :ip_address, :user_agent, :referrer, :to => :comment
-
-  include Rakismet::Model
-
-  alias :author :author_name
-  alias :user_ip :ip_address
-  alias :content :body
-
+class AntiSpamPlugin::CommentWrapper < AntiSpamPlugin::Wrapper
+  alias_attribute :author, :author_name
+  alias_attribute :user_ip, :ip_address
+  alias_attribute :content, :body
+
+  def self.wraps?(object)
+    object.kind_of?(Comment)
+  end
 end
@@ -0,0 +1,10 @@
+class AntiSpamPlugin::SuggestArticleWrapper < AntiSpamPlugin::Wrapper
+  alias_attribute :author, :name
+  alias_attribute :author_email, :email
+  alias_attribute :user_ip, :ip_address
+  alias_attribute :content, :article_body
+
+  def self.wraps?(object)
+    object.kind_of?(SuggestArticle)
+  end
+end
@@ -0,0 +1,18 @@
+class AntiSpamPlugin::Wrapper < SimpleDelegator
+  include Rakismet::Model
+
+  @@wrappers = []
+
+  def self.wrap(object)
+    wrapper = @@wrappers.find { |wrapper| wrapper.wraps?(object) }
+    wrapper ? wrapper.new(object) : object
+  end
+
+  def self.wraps?(object)
+    false
+  end
+
+  def self.inherited(child)
+    @@wrappers << child
+  end
+end
 require 'test_helper'
  
-class AntiSpamPluginCommentWrapperTest < ActiveSupport::TestCase
+class AntiSpamPlugin::CommentWrapperTest < ActiveSupport::TestCase
  
   def setup
     @comment = Comment.new(
@@ -15,10 +15,6 @@ class AntiSpamPluginCommentWrapperTest &lt; ActiveSupport::TestCase
     @wrapper = AntiSpamPlugin::CommentWrapper.new(@comment)
   end
  
-  should 'use Rakismet::Model' do
-    assert_includes @wrapper.class.included_modules, Rakismet::Model
-  end
-
   should 'get contents' do
     assert_equal @comment.body, @wrapper.content
   end
@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class AntiSpamPlugin::SuggestArticleWrapperTest < ActiveSupport::TestCase
+
+  def setup
+    @suggest_article = SuggestArticle.new(
+      :article_body => 'comment body',
+      :name => 'author',
+      :email => 'foo@example.com',
+      :ip_address => '1.2.3.4',
+      :user_agent => 'Some Good Browser (I hope)',
+      :referrer => 'http://noosfero.org/'
+    )
+    @wrapper = AntiSpamPlugin::SuggestArticleWrapper.new(@suggest_article)
+  end
+
+  should 'get contents' do
+    assert_equal @suggest_article.article_body, @wrapper.content
+  end
+
+  should 'get author name' do
+    assert_equal @suggest_article.name, @wrapper.author
+  end
+
+  should 'get author email' do
+    assert_equal @suggest_article.email, @wrapper.author_email
+  end
+
+  should 'get IP address' do
+    assert_equal @suggest_article.ip_address, @wrapper.user_ip
+  end
+
+  should 'get User-Agent' do
+    assert_equal @suggest_article.user_agent, @wrapper.user_agent
+  end
+
+  should 'get get Referrer' do
+    assert_equal @suggest_article.referrer, @wrapper.referrer
+  end
+
+end
@@ -0,0 +1,25 @@
+require 'test_helper'
+require 'anti_spam_plugin/wrapper'
+
+class AntiSpamPluginWrapperTest < ActiveSupport::TestCase
+  should 'use Rakismet::Model' do
+    wrapped = AntiSpamPlugin::Wrapper.new(mock)
+    assert_includes wrapped.class.included_modules, Rakismet::Model
+  end
+
+  should 'wrap object according to wraps? method' do
+    class EvenWrapper < AntiSpamPlugin::Wrapper
+      def self.wraps?(object)
+        object % 2 == 0
+      end
+    end
+    class OddWrapper < AntiSpamPlugin::Wrapper
+      def self.wraps?(object)
+        object % 2 != 0
+      end
+    end
+
+    assert AntiSpamPlugin::Wrapper.wrap(5).kind_of?(OddWrapper)
+    assert AntiSpamPlugin::Wrapper.wrap(6).kind_of?(EvenWrapper)
+  end
+end
@@ -2,35 +2,36 @@ require &#39;test_helper&#39;
  
 class AntiSpamPluginTest < ActiveSupport::TestCase
  
-  def setup
-    profile = fast_create(Profile)
-    article = fast_create(TextileArticle, :profile_id => profile.id)
-    @comment = fast_create(Comment, :source_id => article.id, :source_type => 'Article')
+  class SpammableContent
+    attr_accessor :spam
+    include Spammable
  
-    @settings = Noosfero::Plugin::Settings.new(@comment.environment, AntiSpamPlugin)
-    @settings.api_key = 'b8b80ddb8084062d0c9119c945ce3bc3'
-    @settings.save!
+    def save!; end
+    def environment; Environment.default; end
+  end
  
+  def setup
+    @spammable = SpammableContent.new
     @plugin = AntiSpamPlugin.new
-    @plugin.context = @comment
   end
  
-  should 'check for spam and mark comment as spam if server says it is spam' do
-    AntiSpamPlugin::CommentWrapper.any_instance.expects(:spam?).returns(true)
-    @comment.expects(:save!)
+  attr_accessor :spammable
  
-    @plugin.check_comment_for_spam(@comment)
-    assert @comment.spam
-  end
+  should 'check for spam and mark as spam if server says it is spam' do
+    spammable.expects(:spam?).returns(true)
+    spammable.expects(:save!)
  
-  should 'report spam' do
-    AntiSpamPlugin::CommentWrapper.any_instance.expects(:spam!)
-    @plugin.comment_marked_as_spam(@comment)
+    @plugin.check_for_spam(spammable)
+    assert spammable.spam
   end
  
-  should 'report ham' do
-    AntiSpamPlugin::CommentWrapper.any_instance.expects(:ham!)
-    @plugin.comment_marked_as_ham(@comment)
+  should 'report comment spam' do
+    spammable.expects(:spam!)
+    @plugin.marked_as_spam(spammable)
   end
  
+  should 'report comment ham' do
+    spammable.expects(:ham!)
+    @plugin.marked_as_ham(spammable)
+  end
 end
 class CommentGroupPluginProfileController < ProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
  
   def view_comments
-    article_id = params[:article_id]
-    group_id = params[:group_id]
+    @article_id = params[:article_id]
+    @group_id = params[:group_id]
  
-    article = profile.articles.find(article_id)
-    comments = article.group_comments.without_spam.in_group(group_id)
-    render :update do |page|
-      page.replace_html "comments_list_group_#{group_id}", :partial => 'comment/comment.rhtml', :collection => comments
-      page.replace_html "comment-count-#{group_id}", comments.count
-    end
+    article = profile.articles.find(@article_id)
+    @group_comment_page = (params[:group_comment_page] || 1).to_i
+
+    @comments = article.comments.without_spam.in_group(@group_id)
+    @comments_count = @comments.count
+    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => @group_comment_page )
+
+    @no_more_pages = @comments_count <= @group_comment_page * per_page
+  end
+
+  def per_page
+    3
   end
  
 end
@@ -24,6 +24,11 @@ class CommentGroupPlugin &lt; Noosfero::Plugin
     'comment_group_macro.js'
   end
  
+  def stylesheet?
+    true
+  end
+
+
 end
  
 require_dependency 'comment_group_plugin/macros/allow_comment'
@@ -11,7 +11,6 @@ class CommentGroupPlugin::AllowComment &lt; Noosfero::Plugin::Macro
       :css_files => 'comment_group.css' }
   end
  
-  #FIXME Make this test
   def parse(params, inner_html, source)
     group_id = params[:group_id].to_i
     article = source
@@ -2,13 +2,10 @@ require_dependency &#39;article&#39;
  
 class Article
  
-  #FIXME make this test
   has_many :group_comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc', :conditions => [ 'group_id IS NOT NULL']
  
-  #FIXME make this test
   validate :not_empty_group_comments_removed
  
-  #FIXME make this test
   def not_empty_group_comments_removed
     if body
       groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
@@ -0,0 +1,7 @@
+div.article-comments-list-more{
+  width: 100%;
+  height: 30px;
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 5px;
+}
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/profile/comment_group_plugin_profile_controller'
  
 # Re-raise errors caught by the controller.
@@ -21,18 +21,52 @@ class CommentGroupPluginProfileControllerTest &lt; ActionController::TestCase
   should 'be able to show group comments' do
     comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
     xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
-    assert_template 'comment/_comment.rhtml'
+    assert_template 'comment_group_plugin_profile/view_comments.rjs'
     assert_match /comments_list_group_0/, @response.body
     assert_match /\"comment-count-0\", \"1\"/, @response.body
   end
  
   should 'do not show global comments' do
-    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'global comment', :body => 'global', :group_id => nil)
-    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    fast_create(Comment, :source_id => article, :author_id => profile, :title => 'global comment', :body => 'global', :group_id => nil)
+    fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
     xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
-    assert_template 'comment/_comment.rhtml'
+    assert_template 'comment_group_plugin_profile/view_comments.rjs'
     assert_match /comments_list_group_0/, @response.body
     assert_match /\"comment-count-0\", \"1\"/, @response.body
   end
  
+  should 'show first page comments only' do
+    comment1 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'secondpage', :group_id => 0)
+    comment2 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'firstpage 1', :group_id => 0)
+    comment3 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'firstpage 2', :group_id => 0)
+    comment4 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'firstpage 3', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_match /firstpage 1/, @response.body
+    assert_match /firstpage 2/, @response.body
+    assert_match /firstpage 3/, @response.body
+    assert_no_match /secondpage/, @response.body
+  end
+
+  should 'show link to display more comments' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'secondpage', :body => 'secondpage', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_match /group_comment_page=2/, @response.body
+  end
+
+  should 'do not show link to display more comments if do not have more pages' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_no_match /group_comment_page/, @response.body
+  end
+
+  should 'do not show link to display more comments if do not have any comments' do
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_no_match /group_comment_page/, @response.body
+  end
+
 end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/public/comment_group_plugin_public_controller'
  
 # Re-raise errors caught by the controller.
@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ContentViewerController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e) 
+    raise e 
+  end 
+end
+
+class ContentViewerControllerTest < ActionController::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @page = fast_create(Article, :profile_id => @profile.id, :body => "<div class=\"macro\" data-macro-group_id=\"1\" data-macro='comment_group_plugin/allow_comment' ></div>")
+    @environment = Environment.default
+    @environment.enable_plugin(CommentGroupPlugin)
+  end
+
+  attr_reader :page
+
+  should 'parse article body and render comment group view' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => page.id)
+    get :view_page, @page.url
+    assert_tag 'div', :attributes => {:class => 'comment_group_1'}
+    assert_tag 'div', :attributes => {:id => 'comments_group_count_1'}
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class AllowCommentTest < ActiveSupport::TestCase
+
+  def setup
+    @macro = CommentGroupPlugin::AllowComment.new
+  end
+
+  attr_reader :macro
+
+  should 'have a configuration' do
+    assert CommentGroupPlugin::AllowComment.configuration
+  end
+
+  should 'parse contents to include comment group view' do
+    profile = fast_create(Community)
+    article = fast_create(Article, :profile_id => profile.id)
+    comment = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    inner_html = 'inner'
+    content = macro.parse({:group_id => comment.group_id}, inner_html, article)
+
+    expects(:render).with({:partial => 'plugins/comment_group/views/comment_group.rhtml', :locals => {:group_id => comment.group_id, :article_id => article.id, :inner_html => inner_html, :count => 1, :profile_identifier => profile.identifier} })
+    instance_eval(&content)
+  end
+
+end
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ArticleTest < ActiveSupport::TestCase
+
+  def setup
+    profile = fast_create(Community)
+    @article = fast_create(Article, :profile_id => profile.id)
+  end
+
+  attr_reader :article
+
+  should 'return group comments from article' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    comment2 = fast_create(Comment, :group_id => nil, :source_id => article.id)
+    assert_equal [comment1], article.group_comments
+  end
+
+  should 'do not allow a exclusion of a group comment macro if this group has comments' do
+    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=2></div>")
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    assert !article.save
+    assert_equal 'Not empty group comment cannot be removed', article.errors[:base]
+  end
+
+  should 'allow save if comment group macro is not removed for group with comments' do
+    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=1></div>")
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    assert article.save
+  end
+
+end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
  
 class CommentGroupPluginTest < ActiveSupport::TestCase
  
-  include Noosfero::Plugin::HotSpot
-
   def setup
     @environment = Environment.default
+    @plugin = CommentGroupPlugin.new
+  end
+
+  attr_reader :environment, :plugin
+
+  should 'have a name' do
+    assert_not_equal Noosfero::Plugin.plugin_name, CommentGroupPlugin::plugin_name
+  end
+
+  should 'describe yourself' do
+    assert_not_equal Noosfero::Plugin.plugin_description, CommentGroupPlugin::plugin_description
+  end
+
+  should 'have a js file' do
+    assert !plugin.js_files.blank?
   end
  
-  attr_reader :environment
+  should 'have stylesheet' do
+    assert plugin.stylesheet?
+  end
+
+  should 'have extra contents for comment form' do
+    comment = fast_create(Comment, :group_id => 1)
+    content = plugin.comment_form_extra_contents({:comment => comment})
+    expects(:hidden_field_tag).with('comment[group_id]', comment.group_id).once
+    instance_eval(&content)
+  end
+
+  should 'do not have extra contents for comments without group' do
+    comment = fast_create(Comment, :group_id => nil)
+    content = plugin.comment_form_extra_contents({:comment => comment})
+    assert_equal nil, instance_eval(&content)
+  end
+
+  should 'call without_group for scope passed as parameter to unavailable_comments' do
+    article = fast_create(Article)
+    article.expects(:without_group).once
+    plugin.unavailable_comments(article)
+  end
  
 #FIXME Obsolete test
 #
...	...	@@ -4,8 +4,9 @@ Copyright (c) 2007-2009,
4	4	Cáritas Brasileira <http://www.caritasbrasileira.org/>
5	5	Copyright (c) 2007-2009,
6	6	Ynternet.org Foundation <http://www.ynternet.org/>
7		-Copyright (c) 2008-2009,
	7	+Copyright (c) 2008-2013,
8	8	Colivre <http://www.colivre.coop.br/>
	9	+Copyright (c) the Noosfero contributors. See AUTHORS
9	10
10	11	This program is free software: you can redistribute it and/or modify
11	12	it under the terms of the GNU Affero General Public License as published by
...	...
...	...	@@ -52,3 +52,12 @@ If you write such script for your own OS, please share it with us at the
52	52	development mailing list so that we can include it in the official repository.
53	53	This way other people using the same OS will have to put less effort to develop
54	54	Noosfero.
	55	+
	56	+== Submitting your changes back
	57	+
	58	+For now please read:
	59	+
	60	+- Coding conventions
	61	+ http://noosfero.org/Development/CodingConventions
	62	+- Patch guidelines
	63	+ http://noosfero.org/Development/PatchGuidelines
...	...
...	...	@@ -1,13 +0,0 @@
1		-This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
2		-development.
3		-
4		-Install dependencies:
5		-
6		-gem install rails -v 2.3.5
7		-gem install i18n
8		-gem install will_paginate -v 2.3.12
9		-gem install cucumber
10		-
11		-Creating initial environment:
12		-
13		-rake db:schema:load
...	...	@@ -6,7 +6,7 @@ To configure XMPP/BOSH in Noosfero you need:
6	6	* SystemTimer - http://ph7spot.com/musings/system-timer
7	7	* Pidgin data files - http://www.pidgin.im/
8	8
9		-If you use Debian Wheezy:
	9	+If you use Debian 6.0 (squeeze):
10	10
11	11	# apt-get install librestclient-ruby pidgin-data ruby1.8-dev
12	12	# gem install SystemTimer
...	...
1		-noosfero - a web-based social platform
	1	+Noosfero - a web-based social platform
2	2	======================================
3	3
4		-:: About the project
	4	+http://www.noosfero.org/
5	5
6		-Homepage: http://www.noosfero.org/
	6	+Documentation
	7	+-------------
7	8
8		-:: Authors and copyright
	9	+The following documentation is available:
9	10
10		-Authors: see file AUTHORS
11		-Copyright information: see file COPYRIGHT
12		-Full license text; see file COPYING
	11	+File Purpose
	12	+~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	13	+INSTALL install instructions
	14	+INSTALL.awstats install instructions - access statistics service
	15	+INSTALL.chat install instructions - chat service
	16	+INSTALL.email install instructions - email service
	17	+INSTALL.multitenancy install instructions - multiple sites
	18	+INSTALL.varnish install instructions - varnish HTTP caching (recommended)
	19	+HACKING development instruction
	20	+RELEASING instructions for doing releases
	21	+doc/noosfero/* user documentation (available through the app itself)
	22	+
	23	+
	24	+Authors and copyright
	25	+---------------------
	26	+
	27	+Authorship and copyright information is available in the files listed below.
	28	+
	29	+File Purpose
	30	+~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	31	+AUTHORS list of authors (updated at each release)
	32	+COPYRIGHT Copyright statement for the project
	33	+COPYING Full text of the project license
...	...
...	...	@@ -144,10 +144,15 @@ class CmsController < MyProfileController
144	144
145	145	post_only :set_home_page
146	146	def set_home_page
147		- @article = profile.articles.find(params[:id])
148		- profile.home_page = @article
149		- profile.save(false)
150		- session[:notice] = _('"%s" configured as home page.') % @article.name
	147	+ article = params[:id].nil? ? nil : profile.articles.find(params[:id])
	148	+ profile.update_attribute(:home_page, article)
	149	+
	150	+ if article.nil?
	151	+ session[:notice] = _('Homepage reseted.')
	152	+ else
	153	+ session[:notice] = _('"%s" configured as homepage.') % article.name
	154	+ end
	155	+
151	156	redirect_to (request.referer \|\| profile.url)
152	157	end
153	158
...	...	@@ -267,7 +272,10 @@ class CmsController < MyProfileController
267	272	@back_to = params[:back_to] \|\| request.referer \|\| url_for(profile.public_profile_url)
268	273	@task = SuggestArticle.new(params[:task])
269	274	if request.post?
270		- @task.target = profile
	275	+ @task.target = profile
	276	+ @task.ip_address = request.remote_ip
	277	+ @task.user_agent = request.user_agent
	278	+ @task.referrer = request.referrer
271	279	if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
272	280	session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
273	281	redirect_to @back_to
...	...
...	...	@@ -9,9 +9,10 @@ class MembershipsController < MyProfileController
9	9	def new_community
10	10	@community = Community.new(params[:community])
11	11	@community.environment = environment
	12	+ @back_to = params[:back_to] \|\| url_for(:action => 'index')
12	13	if request.post? && @community.valid?
13	14	@community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]))
14		- redirect_to :action => 'index'
	15	+ redirect_to @back_to
15	16	return
16	17	end
17	18	end
...	...
...	...	@@ -4,7 +4,7 @@ class ProfileEditorController < MyProfileController
4	4	protect 'destroy_profile', :profile, :only => [:destroy_profile]
5	5
6	6	def index
7		- @pending_tasks = Task.to(profile).pending.select{\|i\| user.has_permission?(i.permission, profile)}
	7	+ @pending_tasks = Task.to(profile).pending.without_spam.select{\|i\| user.has_permission?(i.permission, profile)}
8	8	end
9	9
10	10	helper :profile
...	...
...	...	@@ -14,9 +14,15 @@ class SpamController < MyProfileController
14	14	if params[:remove_comment]
15	15	profile.comments_received.find(params[:remove_comment]).destroy
16	16	end
	17	+ if params[:remove_task]
	18	+ Task.to(profile).find_by_id(params[:remove_task]).destroy
	19	+ end
17	20	if params[:mark_comment_as_ham]
18	21	profile.comments_received.find(params[:mark_comment_as_ham]).ham!
19	22	end
	23	+ if params[:mark_task_as_ham] && (t = Task.to(profile).find_by_id(params[:mark_task_as_ham]))
	24	+ t.ham!
	25	+ end
20	26	if request.xhr?
21	27	json_response(true)
22	28	else
...	...	@@ -28,7 +34,8 @@ class SpamController < MyProfileController
28	34	return
29	35	end
30	36
31		- @spam = profile.comments_received.spam.paginate({:page => params[:page]})
	37	+ @comment_spam = profile.comments_received.spam.paginate({:page => params[:comments_page]})
	38	+ @task_spam = Task.to(profile).spam.paginate({:page => params[:tasks_page]})
32	39	end
33	40
34	41	protected
...	...
...	...	@@ -4,12 +4,12 @@ class TasksController < MyProfileController
4	4
5	5	def index
6	6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]
7		- @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
	7	+ @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
8	8	@failed = params ? params[:failed] : {}
9	9	end
10	10
11	11	def processed
12		- @tasks = Task.to(profile).closed.sort_by(&:created_at)
	12	+ @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
13	13	end
14	14
15	15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
...	...	@@ -57,7 +57,7 @@ class TasksController < MyProfileController
57	57	end
58	58
59	59	def list_requested
60		- @tasks = Task.find_all_by_requestor_id(profile.id)
	60	+ @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
61	61	end
62	62
63	63	def ticket_details
...	...