Merge branch 'stable'

Conflicts: db/schema.rb test/unit/person_test.rb

Merge branch 'stable'
Conflicts: db/schema.rb test/unit/person_test.rb
Rodrigo Souto
2 parents e9bc0f67 9a383b33
Showing 33 changed files with 304 additions and 99 deletions Show diff stats
AUTHORS
app/controllers/application_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/models/person.rb
app/models/profile.rb
app/models/scrap.rb
app/models/user.rb
app/views/comment/_comment.rhtml
app/views/profile/_comment.rhtml
app/views/profile/_reply_scrap_on_self.rhtml
app/views/search/_comment.rhtml
config/environment.rb
config/initializers/action_tracker.rb
db/migrate/20130918183842_create_sessions.rb
db/schema.rb
debian/changelog
lib/noosfero.rb
lib/noosfero/gravatar.rb
@@ -149,6 +149,7 @@ João M. M. Silva + Rafael Manzo &lt;jaodsilv@linux.ime.usp.br&gt;
 João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
 Josef Spillner <josef.spillner@tu-dresden.de>
+Junior Silva <juniorsilva1001@gmail.com>
 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
@@ -161,6 +162,7 @@ Lucas Melo &lt;lucaspradomelo@gmail.com&gt;
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
+Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
@@ -197,6 +199,7 @@ root &lt;root@debian.sdr.serpro&gt;
 Samuel R. C. Vale <srcvale@holoscopio.com>
 Valessio Brito <valessio@gmail.com>
 vfcosta <vfcosta@gmail.com>
+Victor Costa <vfcosta@gmail.com>
 Vinicius Cubas Brand <viniciuscb@gmail.com>
 Visita <visita@debian.(none)>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
@@ -2,7 +2,7 @@ class ApplicationController &lt; ActionController::Base
  
   before_filter :setup_multitenancy
   before_filter :detect_stuff_by_domain
-  before_filter :init_noosfero_plugins
+  before_filter :init_noosfero_plugins_controller_filters
   before_filter :allow_cross_domain_access
  
   def allow_cross_domain_access
@@ -21,8 +21,12 @@ class ApplicationController &lt; ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
-    prepend_view_path('public/' + theme_path)
-    theme_option(:layout) || 'application'
+    theme_layout = theme_option(:layout)
+    if theme_layout
+      theme_view_file('layouts/'+theme_layout) || theme_layout
+    else
+     'application'
+    end
   end
  
   filter_parameter_logging :password
@@ -122,22 +126,21 @@ class ApplicationController &lt; ActionController::Base
  
   include Noosfero::Plugin::HotSpot
  
-  def init_noosfero_plugins
-    plugins.each do |plugin|
-      prepend_view_path(plugin.class.view_path)
-    end
-    init_noosfero_plugins_controller_filters
-  end
-
   # This is a generic method that initialize any possible filter defined by a
   # plugin to the current controller being initialized.
   def init_noosfero_plugins_controller_filters
     plugins.each do |plugin|
       filters = plugin.send(self.class.name.underscore + '_filters')
       filters = [filters] if !filters.kind_of?(Array)
+      controller_filters = self.class.filter_chain.map {|c| c.method }
       filters.each do |plugin_filter|
-        self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] || {}))
-        self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
+        filter_method = plugin.class.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]
+        unless controller_filters.include?(filter_method)
+          self.class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
+          self.class.send(:define_method, filter_method) do
+            instance_eval(&plugin_filter[:block]) if environment.plugin_enabled?(plugin.class)
+          end
+        end
       end
     end
   end
@@ -274,7 +274,7 @@ class AccountController &lt; ApplicationController
   def user_data
     user_data =
       if logged_in?
-        current_user.data_hash
+        current_user.data_hash(gravatar_default)
       else
         { }
       end
@@ -96,7 +96,7 @@ class ContentViewerController &lt; ApplicationController
     end
  
     if @page.folder? && @page.gallery?
-      @images = @page.images
+      @images = @page.images.select{ |a| a.display_to? user }
       @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
     end
  
@@ -38,6 +38,8 @@ module ApplicationHelper
  
   include LayoutHelper
  
+  include Noosfero::Gravatar
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -366,7 +368,7 @@ module ApplicationHelper
   def current_theme
     @current_theme ||=
       begin
-        if (session[:theme])
+        if session[:theme]
           session[:theme]
         else
           # utility for developers: set the theme to 'random' in development mode and
@@ -375,7 +377,7 @@ module ApplicationHelper
           if ENV['RAILS_ENV'] == 'development' && environment.theme == 'random'
             @random_theme ||= Dir.glob('public/designs/themes/*').map { |f| File.basename(f) }.rand
             @random_theme
-          elsif ENV['RAILS_ENV'] == 'development' && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
+          elsif ENV['RAILS_ENV'] == 'development' && respond_to?(:params) && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
             params[:theme]
           else
             if profile && !profile.theme.nil?
@@ -397,16 +399,23 @@ module ApplicationHelper
       end
   end
  
-  def theme_include(template)
+  def theme_view_file(template)
     ['.rhtml', '.html.erb'].each do |ext|
-      file = (RAILS_ROOT + '/public' + theme_path + '/' + template  + ext)
-      if File.exists?(file)
-        return render :file => file, :use_full_path => false
-      end
+      file = (RAILS_ROOT + '/public' + theme_path + '/' + template + ext)
+      return file if File.exists?(file)
     end
     nil
   end
  
+  def theme_include(template)
+    file = theme_view_file(template)
+    if file
+      render :file => file, :use_full_path => false
+    else
+      nil
+    end
+  end
+
   def theme_favicon
     return '/designs/themes/' + current_theme + '/favicon.ico' if profile.nil? || profile.theme.nil?
     if File.exists?(File.join(RAILS_ROOT, 'public', theme_path, 'favicon.ico'))
@@ -589,33 +598,8 @@ module ApplicationHelper
       :class => 'vcard'), :class => 'common-profile-list-block')
   end
  
-  def gravatar_url_for(email, options = {})
-    # Ta dando erro de roteamento
-    default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
-    url_for( { :gravatar_id => Digest::MD5.hexdigest(email.to_s),
-               :host => 'www.gravatar.com',
-               :protocol => 'http://',
-               :only_path => false,
-               :controller => 'avatar.php',
-               :d => default
-             }.merge(options) )
-  end
-
-  def str_gravatar_url_for(email, options = {})
-    default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
-    url = 'http://www.gravatar.com/avatar.php?gravatar_id=' +
-           Digest::MD5.hexdigest(email.to_s)
-    {
-      :only_path => false,
-      :d => default
-    }.merge(options).each { |k,v|
-      url += ( '&%s=%s' % [ k,v ] )
-    }
-    url
-  end
-
-  def gravatar_profile_url(email)
-    'http://www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
+  def gravatar_default
+    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar']
   end
  
   attr_reader :environment
@@ -940,7 +924,7 @@ module ApplicationHelper
     (@category ? " - #{@category.full_name}" : '')
   end
  
-  # DEPRECATED. Do not use this·
+  # DEPRECATED. Do not use this.
   def import_controller_stylesheets(options = {})
     stylesheet_import( "controller_"+ @controller.controller_name(), options )
   end
@@ -1158,12 +1142,12 @@ module ApplicationHelper
       pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
  
-    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i style="background-image:url({avatar})"></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
     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') +
+    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :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")) +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :class => 'ctrl-panel', :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"))
   end
@@ -476,7 +476,7 @@ class Person &lt; Profile
   end
  
   def activities
-    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' ORDER BY updated_at DESC")
+    Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' and action_tracker.verb != 'reply_scrap_on_self' ORDER BY updated_at DESC")
   end
  
   # by default, all fields are private
@@ -484,6 +484,13 @@ class Person &lt; Profile
     self.fields_privacy.nil? ? [] : self.fields_privacy.reject{ |k, v| v != 'public' }.keys.map(&:to_s)
   end
  
+  include Noosfero::Gravatar
+
+  def profile_custom_icon(gravatar_default=nil)
+    (self.image.present? && self.image.public_filename(:icon)) ||
+    gravatar_profile_image_url(self.email, :size=>20, :d => gravatar_default)
+  end
+
   protected
  
   def followed_by?(profile)
@@ -845,8 +845,10 @@ private :generate_url, :url_options
     }[amount] || _("%s members") % amount
   end
  
-  def profile_custom_icon
-    self.image.public_filename(:icon) unless self.image.blank?
+  include Noosfero::Gravatar
+
+  def profile_custom_icon(gravatar_default=nil)
+    image.public_filename(:icon) if image.present?
   end
  
   def jid(options = {})
@@ -14,9 +14,11 @@ class Scrap &lt; ActiveRecord::Base
  
   named_scope :not_replies, :conditions => {:scrap_id => nil}
  
-  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.receiver != s.sender}, :custom_target => :action_tracker_target 
+  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target 
  
-  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.receiver == s.sender}
+  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}
+
+  track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender != s.receiver && s.sender == s.top_root.receiver}
  
   after_create do |scrap|
     scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
@@ -25,6 +27,12 @@ class Scrap &lt; ActiveRecord::Base
  
   before_validation :strip_all_html_tags
  
+  def top_root
+    scrap = self
+    scrap = Scrap.find(scrap.scrap_id) while scrap.scrap_id
+    scrap
+  end
+
   def strip_all_html_tags
     sanitizer = HTML::WhiteListSanitizer.new
     self.content = sanitizer.sanitize(self.content, :tags => [])
@@ -290,19 +290,21 @@ class User &lt; ActiveRecord::Base
     end
   end
  
-  def data_hash
+  def data_hash(gravatar_default = nil)
     friends_list = {}
     enterprises = person.enterprises.map { |e| { 'name' => e.short_name, 'identifier' => e.identifier } }
     self.person.friends.online.map do |person|
       friends_list[person.identifier] = {
-        'avatar' => person.profile_custom_icon,
+        'avatar' => person.profile_custom_icon(gravatar_default),
         'name' => person.short_name,
         'jid' => person.full_jid,
         'status' => person.user.chat_status,
       }
     end
+
     {
       'login' => self.login,
+      'avatar' => self.person.profile_custom_icon(gravatar_default),
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,
       'since_year' => self.person.created_at.year,
@@ -13,11 +13,11 @@
   <% else %>
     <% url_image, status_class = comment.author_id ?
        [comment.removed_user_image, 'icon-user-removed'] :
-       [str_gravatar_url_for( comment.email, :size => 50, :d=>404 ), 'icon-user-unknown'] %>
+       [gravatar_profile_image_url( comment.email, :size => 50, :d=>404 ), 'icon-user-unknown'] %>
  
     <%= link_to(
           image_tag(url_image, :onerror=>'gravatarCommentFailback(this)',
-                   'data-gravatar'=>str_gravatar_url_for(comment.email, :size=>50)) +
+                   'data-gravatar'=>gravatar_profile_image_url(comment.email, :size=>50)) +
           content_tag('span', comment.author_name, :class => 'comment-info') +
           content_tag('span', comment.message,
                              :class => 'comment-user-status ' + status_class),
@@ -16,11 +16,11 @@
   <% else %>
     <% url_image, status_class = comment.author_id ?
        [comment.removed_user_image, 'icon-user-removed'] :
-       [str_gravatar_url_for( comment.email ), 'icon-user-unknown'] %>
+       [gravatar_profile_image_url( comment.email ), 'icon-user-unknown'] %>
  
     <%= link_to(
           image_tag(url_image, :onerror=>'gravatarCommentFailback(this)',
-                   'data-gravatar'=>str_gravatar_url_for(comment.email)) +
+                   'data-gravatar'=>gravatar_profile_image_url(comment.email)) +
           content_tag('span', comment.author_name, :class => 'comment-info') +
           content_tag('span', comment.message,
                    :class => 'comment-user-status comment-user-status-wall ' + status_class),
@@ -0,0 +1 @@
+_leave_scrap.rhtml
 \ No newline at end of file
@@ -8,7 +8,7 @@
     <%# unauthenticated user: display gravatar icon %>
     <%= content_tag 'span', '&nbsp;',
         :class => 'comment-picture',
-        :style => 'background-image:url(%s)' % str_gravatar_url_for( comment.email, :size => 20 )
+        :style => 'background-image:url(%s)' % gravatar_profile_image_url( comment.email, :size => 20 )
     %>
   <%- end %>
   <strong><%= link_to(comment.title, comment.url) %></strong>
@@ -48,7 +48,7 @@ Rails::Initializer.run do |config|
  
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake db:sessions:create')
-  # config.action_controller.session_store = :active_record_store
+  config.action_controller.session_store = :active_record_store
  
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper, 
@@ -2,6 +2,8 @@ require &#39;noosfero/i18n&#39;
  
 # ActionTracker plugin stuff
  
+@reply_scrap_description = lambda { _('sent a message to %{receiver}: <br /> "%{message}"') % { :receiver => "{{link_to(ta.get_receiver_name, ta.get_receiver_url)}}", :message => "{{auto_link_urls(ta.get_content)}}" } }
+
 ActionTrackerConfig.verbs = {
  
   :create_article => { 
@@ -49,12 +51,16 @@ ActionTrackerConfig.verbs = {
   },
  
   :leave_scrap => {
-    :description => lambda { _('sent a message to %{receiver}: <br /> "%{message}"') % { :receiver => "{{link_to(ta.get_receiver_name, ta.get_receiver_url)}}", :message => "{{auto_link_urls(ta.get_content)}}" } }
+    :description => @reply_scrap_description
   },
  
   :leave_scrap_to_self => {
     :description => lambda { _('wrote: <br /> "%{text}"') % { :text => "{{auto_link_urls(ta.get_content)}}" } }
-  }
+  },
+
+  :reply_scrap_on_self => {
+    :description => @reply_scrap_description
+  },
 }
  
 ActionTrackerConfig.current_user_method = :current_person
@@ -0,0 +1,16 @@
+class CreateSessions < ActiveRecord::Migration
+  def self.up
+    create_table :sessions do |t|
+      t.string :session_id, :null => false
+      t.text :data
+      t.timestamps
+    end
+
+    add_index :sessions, :session_id
+    add_index :sessions, :updated_at
+  end
+
+  def self.down
+    drop_table :sessions
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20131116165327) do
+ActiveRecord::Schema.define(:version => 20131121162641) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -524,6 +524,16 @@ ActiveRecord::Schema.define(:version =&gt; 20131116165327) do
     t.integer  "context_id"
   end
  
+  create_table "sessions", :force => true do |t|
+    t.string   "session_id", :null => false
+    t.text     "data"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
+  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
+
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
+noosfero (0.45.1) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Tue, 07 Jan 2014 14:12:53 +0000
+
 noosfero (0.45.0) unstable; urgency=low
  
   * New features release
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.45.0'
+  VERSION = '0.45.1'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -0,0 +1,11 @@
+module Noosfero::Gravatar
+  def gravatar_profile_image_url(email, options = {})
+    "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.to_s)}?" + {
+      :only_path => false,
+    }.merge(options).map{|k,v| '%s=%s' % [ k,v ] }.join('&')
+  end
+
+  def gravatar_profile_url(email)
+    'http://www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
+  end
+end
@@ -57,6 +57,9 @@ class Noosfero::Plugin
         path << File.join(dir, 'lib')
       end
  
+      # add view path
+      ActionController::Base.view_paths.unshift(File.join(dir, 'views'))
+
       # load vendor/plugins
       Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin|
         [ ActiveSupport::Dependencies.load_paths, $:].each{ |path| path << "#{vendor_plugin}/lib" }
@@ -13,7 +13,7 @@
     <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
  
     <% button_bar do %>
-      <%= submit_button :save, _('Save'), :cancel => {:action => 'index'} %>
+      <%= submit_button :save, _('Save'), :cancel => {:controller=>:profile, :profile => profile.identifier} %>
     <% end %>
   <% end %>
 <% else %>
@@ -89,7 +89,7 @@ body, th, td, input {
   color: #555753;
 }
  
-#controlpanel, #logout, #openchat, .manage-groups {
+#user .logged-in > * {
   margin-left: 25px;
 }
  
@@ -105,6 +105,14 @@ body, th, td, input {
   top: 3px;
 }
  
+#user #homepage-link i {
+  width: 18px;
+  height: 18px;
+  left: -20px;
+  top: -2px;
+  background-position: 50% 50%;
+}
+
 #user form {
   position: relative;
   display: inline;
@@ -539,7 +539,11 @@ jQuery(function($) {
         }
         $(this).attr('href', new_href);
       });
-      var html = $(this).html().replace(/{login}/g, data.login).replace('{month}', data.since_month).replace('{year}', data.since_year);
+      var html = $(this).html()
+                        .replace(/{login}/g, data.login)
+                        .replace('{avatar}', data.avatar)
+                        .replace('{month}', data.since_month)
+                        .replace('{year}', data.since_year);
       $(this).html(html).fadeIn();
       if (data.is_admin) {
         $('#user .admin-link').show();
@@ -286,10 +286,10 @@ div.pending-tasks {
   border: 1px solid #BFC2BC;
   margin-bottom: 20px;
 }
-#pending-tasks-count {
+#user .logged-in #pending-tasks-count {
   padding-left: 5px;
   padding-right: 5px;
-  margin-left: 2px;
+  margin-left: 3px;
   text-decoration: none;
   background-color: #F57900;
   -moz-border-radius: 2px;
@@ -871,7 +871,10 @@ code input {
 }
 #manage-enterprises .simplemenu-item a {
   background-repeat: no-repeat;
-  padding-left: 20px;
+  background-position: 5px 50%;
+  padding: 1px 0px 0px 26px;
+  line-height: 15px;
+  display: block;
 }
 #manage-enterprises .simplemenu-item a span {
   display: none;
@@ -1287,6 +1290,7 @@ a.comment-picture {
 .scrap-replies {
   border: 1px solid #fff;
   padding: 0;
+  border-right: 0px;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
@@ -5571,7 +5575,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
  
 #profile-wall ul.profile-wall-activities-comments ul,
 #profile-network ul.profile-wall-activities-comments ul {
-  padding-left: 0px;
+  padding-left: 12px;
 }
  
 #profile-wall .profile-wall-activities-comments li,
@@ -500,4 +500,46 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     end
  
   end
+
+  should 'do not duplicate plugin filters' do
+
+    class FilterPlugin < Noosfero::Plugin
+      def test_controller_filters
+        { :type => 'before_filter',
+          :method_name => 'filter_plugin',
+          :options => {:only => 'some_method'},
+          :block => lambda {} }
+      end
+    end
+
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([FilterPlugin.new])
+
+    get :index
+    get :index
+    assert_equal 1, @controller.class.filter_chain.select{|c| c.method == 'application_controller_test_filter_plugin_filter_plugin'}.count
+  end
+
+  should 'do not call plugin filter block on a environment that this plugin is not enabled' do
+
+    class OtherFilterPlugin < Noosfero::Plugin
+      def test_controller_filters
+        { :type => 'before_filter',
+          :method_name => 'filter_plugin',
+          :options => {:only => 'some_method'},
+          :block => lambda {'plugin block called'} }
+      end
+    end
+
+    environment1 = fast_create(Environment, :name => 'test environment')
+    environment1.enable_plugin(OtherFilterPlugin.name)
+    environment2 = fast_create(Environment, :name => 'other test environment')
+
+    @controller.stubs(:environment).returns(environment1)
+    get :index
+    assert_equal 'plugin block called', @controller.application_controller_test_other_filter_plugin_filter_plugin
+
+    @controller.stubs(:environment).returns(environment2)
+    assert_equal nil, @controller.application_controller_test_other_filter_plugin_filter_plugin
+  end
+
 end
@@ -600,6 +600,29 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_equal 2, assigns(:images).size
   end
  
+  should 'not display private images in the slideshow for unauthorized people' do
+    owner = create_user('owner').person
+    unauthorized = create_user('unauthorized').person
+    folder = Gallery.create!(:name => 'gallery', :profile => owner)
+    image1 = UploadedFile.create!(:profile => owner, :parent => folder, :uploaded_data => fixture_file_upload('/files/other-pic.jpg', 'image/jpg'), :published => false)
+    login_as('unauthorized')
+    get :view_page, :profile => owner.identifier, :page => folder.explode_path, :slideshow => true
+    assert_response :success
+    assert_equal 0, assigns(:images).length
+  end
+
+  should 'not display private images thumbnails for unauthorized people' do
+    owner = create_user('owner').person
+    unauthorized = create_user('unauthorized').person
+    folder = Gallery.create!(:name => 'gallery', :profile => owner)
+    image1 = UploadedFile.create!(:profile => owner, :parent => folder, :uploaded_data => fixture_file_upload('/files/other-pic.jpg', 'image/jpg'), :published => false)
+    login_as('unauthorized')
+    get :view_page, :profile => owner.identifier, :page => folder.explode_path
+    assert_response :success
+    assert_select '.image-gallery-item', 0
+  end   
+  
+
   should 'display default image in the slideshow if thumbnails were not processed' do
     @controller.stubs(:per_page).returns(1)
     folder = Gallery.create!(:name => 'gallery', :profile => profile)
@@ -466,32 +466,19 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     assert_match(/Community nick/, page_title)
   end
  
-  should 'generate a gravatar image url' do
-    stubs(:environment).returns(Environment.default)
-    @controller = ApplicationController.new
-
+  should 'gravatar default parameter' do
+    profile = mock
+    profile.stubs(:theme).returns('some-theme')
+    stubs(:profile).returns(profile)
     with_constants :NOOSFERO_CONF => {'gravatar' => 'crazyvatar'} do
-      url = str_gravatar_url_for( 'rms@gnu.org', :size => 50 )
-      assert_match(/^http:\/\/www\.gravatar\.com\/avatar\.php\?/, url)
-      assert_match(/(\?|&)gravatar_id=ed5214d4b49154ba0dc397a28ee90eb7(&|$)/, url)
-      assert_match(/(\?|&)d=crazyvatar(&|$)/, url)
-      assert_match(/(\?|&)size=50(&|$)/, url)
+      assert_equal gravatar_default, 'crazyvatar'
     end
     stubs(:theme_option).returns('gravatar' => 'nicevatar')
     with_constants :NOOSFERO_CONF => {'gravatar' => 'crazyvatar'} do
-      url = str_gravatar_url_for( 'rms@gnu.org', :size => 50 )
-      assert_match(/^http:\/\/www\.gravatar\.com\/avatar\.php\?/, url)
-      assert_match(/(\?|&)gravatar_id=ed5214d4b49154ba0dc397a28ee90eb7(&|$)/, url)
-      assert_match(/(\?|&)d=nicevatar(&|$)/, url)
-      assert_match(/(\?|&)size=50(&|$)/, url)
+      assert_equal gravatar_default, 'nicevatar'
     end
   end
  
-  should 'generate a gravatar profile url' do
-    url = gravatar_profile_url( 'rms@gnu.org' )
-    assert_equal('http://www.gravatar.com/ed5214d4b49154ba0dc397a28ee90eb7', url)
-  end
-
   should 'use theme passed via param when in development mode' do
     stubs(:environment).returns(Environment.new(:theme => 'environment-theme'))
     ENV.stubs(:[]).with('RAILS_ENV').returns('development')
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class GravatarTest < ActiveSupport::TestCase
+
+  def setup
+    @object = Object.new
+    @object.extend(Noosfero::Gravatar)
+  end
+
+  should 'generate a gravatar image url' do
+    url = @object.gravatar_profile_image_url( 'rms@gnu.org', :size => 50, :d => 'crazyvatar' )
+    assert_match(/^http:\/\/www\.gravatar\.com\/avatar\/ed5214d4b49154ba0dc397a28ee90eb7?/, url)
+    assert_match(/(\?|&)d=crazyvatar(&|$)/, url)
+    assert_match(/(\?|&)size=50(&|$)/, url)
+
+    url = @object.gravatar_profile_image_url( 'rms@gnu.org', :size => 50, :d => 'nicevatar' )
+    assert_match(/^http:\/\/www\.gravatar\.com\/avatar\/ed5214d4b49154ba0dc397a28ee90eb7?/, url)
+    assert_match(/(\?|&)d=nicevatar(&|$)/, url)
+    assert_match(/(\?|&)size=50(&|$)/, url)
+  end
+
+  should 'generate a gravatar profile url' do
+    url = @object.gravatar_profile_url( 'rms@gnu.org' )
+    assert_equal('http://www.gravatar.com/ed5214d4b49154ba0dc397a28ee90eb7', url)
+  end
+end
@@ -1393,4 +1393,24 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_not_includes user.memberships_by_role(member_role), c1
   end
  
+  should 'not list leave_scrap_to_self in activities' do
+    person = fast_create(Person)
+    at = ActionTracker::Record.create!(:user => person, :verb => 'leave_scrap_to_self')
+    person.reload
+    assert_equal person.activities, []
+  end
+
+  should 'not list add_member_in_community in activities' do
+    person = fast_create(Person)
+    at = ActionTracker::Record.create!(:user => person, :verb => 'add_member_in_community')
+    person.reload
+    assert_equal person.activities, []
+  end
+
+  should 'not list reply_scrap_on_self in activities' do
+    person = fast_create(Person)
+    at = ActionTracker::Record.create!(:user => person, :verb => 'reply_scrap_on_self')
+    person.reload
+    assert_equal person.activities, []
+  end
 end
@@ -232,6 +232,14 @@ class ScrapTest &lt; ActiveSupport::TestCase
     assert_equal s, s2.root
   end
  
+  should "have the top_root defined" do
+    s = fast_create(Scrap)
+    s1 = fast_create(Scrap, :scrap_id => s.id)
+    s2 = fast_create(Scrap, :scrap_id => s1.id)
+    assert_equal s, s1.top_root
+    assert_equal s, s2.top_root
+  end
+
   should 'strip all html tags' do
     s, r = fast_create(Person), fast_create(Person)
     s = Scrap.new :sender => s, :receiver => r, :content => "<p>Test <b>Rails</b></p>"
@@ -276,4 +284,14 @@ class ScrapTest &lt; ActiveSupport::TestCase
     assert_equal s.scrap_wall_url, s.receiver.wall_url
   end
  
+  should 'create activity with reply_scrap_on_self when top_root scrap receiver is the same as sender' do
+    s, r = fast_create(Person), fast_create(Person)
+    root = fast_create(Scrap, :sender_id => s.id, :receiver_id => r.id)
+    assert_difference ActionTracker::Record, :count, 1 do
+      reply = Scrap.create!(:sender => r, :receiver => s, :scrap_id => root.id, :content => 'sample')
+    end
+    activity = ActionTracker::Record.last
+    assert_equal 'reply_scrap_on_self', activity.verb.to_s
+  end
+
 end
@@ -336,10 +336,22 @@ class UserTest &lt; ActiveSupport::TestCase
     Person.any_instance.stubs(:is_admin?).returns(true)
     Person.any_instance.stubs(:created_at).returns(DateTime.parse('16-08-2010'))
     expected_hash = {
-      'login' => 'x_and_y', 'is_admin' => true, 'since_month' => 8, 'chat_enabled' => false, 'since_year' => 2010, 'email_domain' => nil, 'amount_of_friends' => 0,
+      'login' => 'x_and_y', 'is_admin' => true, 'since_month' => 8,
+      'chat_enabled' => false, 'since_year' => 2010, 'avatar' =>
+      'http://www.gravatar.com/avatar/a0517761d5125820c28d87860bc7c02e?only_path=false&d=&size=20',
+        'email_domain' => nil, 'amount_of_friends' => 0,
       'friends_list' => {}, 'enterprises' => [],
     }
-    assert_equal expected_hash, person.user.data_hash
+
+    assert_equal expected_hash['login'], person.user.data_hash['login']
+    assert_equal expected_hash['is_admin'], person.user.data_hash['is_admin']
+    assert_equal expected_hash['since_month'], person.user.data_hash['since_month']
+    assert_equal expected_hash['chat_enabled'], person.user.data_hash['chat_enabled']
+    assert_equal expected_hash['since_year'], person.user.data_hash['since_year']
+    assert_equal expected_hash['avatar'], person.user.data_hash['avatar']
+    assert_equal expected_hash['email_domain'], person.user.data_hash['email_domain']
+    assert_equal expected_hash['amount_of_friends'], person.user.data_hash['amount_of_friends']
+    assert_equal expected_hash['friends_list'], person.user.data_hash['friends_list']
   end
  
   should "data_hash return the friends_list information" do
@@ -62,7 +62,6 @@ end
  
 unless Rails.env.development?
   middleware = ActionController::Dispatcher.middleware
-  cookies_mw = ActionController::Session::CookieStore
   ActionController::Base.send(:include, NoosferoHttpCaching)
-  middleware.insert_before(cookies_mw, NoosferoHttpCaching::Middleware)
+  middleware.use NoosferoHttpCaching::Middleware
 end
...	...	@@ -149,6 +149,7 @@ João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
149	149	João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
150	150	Joenio Costa <joenio@colivre.coop.br>
151	151	Josef Spillner <josef.spillner@tu-dresden.de>
	152	+Junior Silva <juniorsilva1001@gmail.com>
152	153	Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
153	154	Keilla Menezes <keilla@colivre.coop.br>
154	155	Larissa Reis <larissa@colivre.coop.br>
...	...	@@ -161,6 +162,7 @@ Lucas Melo <lucaspradomelo@gmail.com>
161	162	Luis David Aguilar Carlos <ludwig9003@gmail.com>
162	163	Martín Olivera <molivera@solar.org.ar>
163	164	Moises Machado <moises@colivre.coop.br>
	165	+Naíla Alves <naila@colivre.coop.br>
164	166	Nanda Lopes <nanda.listas+psl@gmail.com>
165	167	Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
166	168	Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
...	...	@@ -197,6 +199,7 @@ root <root@debian.sdr.serpro>
197	199	Samuel R. C. Vale <srcvale@holoscopio.com>
198	200	Valessio Brito <valessio@gmail.com>
199	201	vfcosta <vfcosta@gmail.com>
	202	+Victor Costa <vfcosta@gmail.com>
200	203	Vinicius Cubas Brand <viniciuscb@gmail.com>
201	204	Visita <visita@debian.(none)>
202	205	Yann Lugrin <yann.lugrin@liquid-concept.ch>
...	...
...	...	@@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base
2	2
3	3	before_filter :setup_multitenancy
4	4	before_filter :detect_stuff_by_domain
5		- before_filter :init_noosfero_plugins
	5	+ before_filter :init_noosfero_plugins_controller_filters
6	6	before_filter :allow_cross_domain_access
7	7
8	8	def allow_cross_domain_access
...	...	@@ -21,8 +21,12 @@ class ApplicationController < ActionController::Base
21	21	include ApplicationHelper
22	22	layout :get_layout
23	23	def get_layout
24		- prepend_view_path('public/' + theme_path)
25		- theme_option(:layout) \|\| 'application'
	24	+ theme_layout = theme_option(:layout)
	25	+ if theme_layout
	26	+ theme_view_file('layouts/'+theme_layout) \|\| theme_layout
	27	+ else
	28	+ 'application'
	29	+ end
26	30	end
27	31
28	32	filter_parameter_logging :password
...	...	@@ -122,22 +126,21 @@ class ApplicationController < ActionController::Base
122	126
123	127	include Noosfero::Plugin::HotSpot
124	128
125		- def init_noosfero_plugins
126		- plugins.each do \|plugin\|
127		- prepend_view_path(plugin.class.view_path)
128		- end
129		- init_noosfero_plugins_controller_filters
130		- end
131		-
132	129	# This is a generic method that initialize any possible filter defined by a
133	130	# plugin to the current controller being initialized.
134	131	def init_noosfero_plugins_controller_filters
135	132	plugins.each do \|plugin\|
136	133	filters = plugin.send(self.class.name.underscore + '_filters')
137	134	filters = [filters] if !filters.kind_of?(Array)
	135	+ controller_filters = self.class.filter_chain.map {\|c\| c.method }
138	136	filters.each do \|plugin_filter\|
139		- self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] \|\| {}))
140		- self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
	137	+ filter_method = plugin.class.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]
	138	+ unless controller_filters.include?(filter_method)
	139	+ self.class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] \|\| {}))
	140	+ self.class.send(:define_method, filter_method) do
	141	+ instance_eval(&plugin_filter[:block]) if environment.plugin_enabled?(plugin.class)
	142	+ end
	143	+ end
141	144	end
142	145	end
143	146	end
...	...
...	...	@@ -274,7 +274,7 @@ class AccountController < ApplicationController
274	274	def user_data
275	275	user_data =
276	276	if logged_in?
277		- current_user.data_hash
	277	+ current_user.data_hash(gravatar_default)
278	278	else
279	279	{ }
280	280	end
...	...
...	...	@@ -96,7 +96,7 @@ class ContentViewerController < ApplicationController
96	96	end
97	97
98	98	if @page.folder? && @page.gallery?
99		- @images = @page.images
	99	+ @images = @page.images.select{ \|a\| a.display_to? user }
100	100	@images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
101	101	end
102	102
...	...
...	...	@@ -38,6 +38,8 @@ module ApplicationHelper
38	38
39	39	include LayoutHelper
40	40
	41	+ include Noosfero::Gravatar
	42	+
41	43	def locale
42	44	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale
43	45	end
...	...	@@ -366,7 +368,7 @@ module ApplicationHelper
366	368	def current_theme
367	369	@current_theme \|\|=
368	370	begin
369		- if (session[:theme])
	371	+ if session[:theme]
370	372	session[:theme]
371	373	else
372	374	# utility for developers: set the theme to 'random' in development mode and
...	...	@@ -375,7 +377,7 @@ module ApplicationHelper
375	377	if ENV['RAILS_ENV'] == 'development' && environment.theme == 'random'
376	378	@random_theme \|\|= Dir.glob('public/designs/themes/*').map { \|f\| File.basename(f) }.rand
377	379	@random_theme
378		- elsif ENV['RAILS_ENV'] == 'development' && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
	380	+ elsif ENV['RAILS_ENV'] == 'development' && respond_to?(:params) && params[:theme] && File.exists?(File.join(Rails.root, 'public/designs/themes', params[:theme]))
379	381	params[:theme]
380	382	else
381	383	if profile && !profile.theme.nil?
...	...	@@ -397,16 +399,23 @@ module ApplicationHelper
397	399	end
398	400	end
399	401
400		- def theme_include(template)
	402	+ def theme_view_file(template)
401	403	['.rhtml', '.html.erb'].each do \|ext\|
402		- file = (RAILS_ROOT + '/public' + theme_path + '/' + template + ext)
403		- if File.exists?(file)
404		- return render :file => file, :use_full_path => false
405		- end
	404	+ file = (RAILS_ROOT + '/public' + theme_path + '/' + template + ext)
	405	+ return file if File.exists?(file)
406	406	end
407	407	nil
408	408	end
409	409
	410	+ def theme_include(template)
	411	+ file = theme_view_file(template)
	412	+ if file
	413	+ render :file => file, :use_full_path => false
	414	+ else
	415	+ nil
	416	+ end
	417	+ end
	418	+
410	419	def theme_favicon
411	420	return '/designs/themes/' + current_theme + '/favicon.ico' if profile.nil? \|\| profile.theme.nil?
412	421	if File.exists?(File.join(RAILS_ROOT, 'public', theme_path, 'favicon.ico'))
...	...	@@ -589,33 +598,8 @@ module ApplicationHelper
589	598	:class => 'vcard'), :class => 'common-profile-list-block')
590	599	end
591	600
592		- def gravatar_url_for(email, options = {})
593		- # Ta dando erro de roteamento
594		- default = theme_option['gravatar'] \|\| NOOSFERO_CONF['gravatar'] \|\| nil
595		- url_for( { :gravatar_id => Digest::MD5.hexdigest(email.to_s),
596		- :host => 'www.gravatar.com',
597		- :protocol => 'http://',
598		- :only_path => false,
599		- :controller => 'avatar.php',
600		- :d => default
601		- }.merge(options) )
602		- end
603		-
604		- def str_gravatar_url_for(email, options = {})
605		- default = theme_option['gravatar'] \|\| NOOSFERO_CONF['gravatar'] \|\| nil
606		- url = 'http://www.gravatar.com/avatar.php?gravatar_id=' +
607		- Digest::MD5.hexdigest(email.to_s)
608		- {
609		- :only_path => false,
610		- :d => default
611		- }.merge(options).each { \|k,v\|
612		- url += ( '&%s=%s' % [ k,v ] )
613		- }
614		- url
615		- end
616		-
617		- def gravatar_profile_url(email)
618		- 'http://www.gravatar.com/'+ Digest::MD5.hexdigest(email.to_s)
	601	+ def gravatar_default
	602	+ (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) \|\| NOOSFERO_CONF['gravatar']
619	603	end
620	604
621	605	attr_reader :environment
...	...	@@ -940,7 +924,7 @@ module ApplicationHelper
940	924	(@category ? " - #{@category.full_name}" : '')
941	925	end
942	926
943		- # DEPRECATED. Do not use this·
	927	+ # DEPRECATED. Do not use this.
944	928	def import_controller_stylesheets(options = {})
945	929	stylesheet_import( "controller_"+ @controller.controller_name(), options )
946	930	end
...	...	@@ -1158,12 +1142,12 @@ module ApplicationHelper
1158	1142	pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1159	1143	end
1160	1144
1161		- (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
	1145	+ (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i style="background-image:url({avatar})"></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
1162	1146	render_environment_features(:usermenu) +
1163		- 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') +
	1147	+ link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
1164	1148	manage_enterprises.to_s +
1165	1149	manage_communities.to_s +
1166		- 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")) +
	1150	+ link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
1167	1151	pending_tasks_count +
1168	1152	link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
1169	1153	end
...	...
...	...	@@ -476,7 +476,7 @@ class Person < Profile
476	476	end
477	477
478	478	def activities
479		- Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' ORDER BY updated_at DESC")
	479	+ Scrap.find_by_sql("SELECT id, updated_at, '#{Scrap.to_s}' AS klass FROM #{Scrap.table_name} WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, '#{ActionTracker::Record.to_s}' AS klass FROM #{ActionTracker::Record.table_name} WHERE action_tracker.user_id = #{self.id} and action_tracker.verb != 'leave_scrap_to_self' and action_tracker.verb != 'add_member_in_community' and action_tracker.verb != 'reply_scrap_on_self' ORDER BY updated_at DESC")
480	480	end
481	481
482	482	# by default, all fields are private
...	...	@@ -484,6 +484,13 @@ class Person < Profile
484	484	self.fields_privacy.nil? ? [] : self.fields_privacy.reject{ \|k, v\| v != 'public' }.keys.map(&:to_s)
485	485	end
486	486
	487	+ include Noosfero::Gravatar
	488	+
	489	+ def profile_custom_icon(gravatar_default=nil)
	490	+ (self.image.present? && self.image.public_filename(:icon)) \|\|
	491	+ gravatar_profile_image_url(self.email, :size=>20, :d => gravatar_default)
	492	+ end
	493	+
487	494	protected
488	495
489	496	def followed_by?(profile)
...	...
...	...	@@ -845,8 +845,10 @@ private :generate_url, :url_options
845	845	}[amount] \|\| _("%s members") % amount
846	846	end
847	847
848		- def profile_custom_icon
849		- self.image.public_filename(:icon) unless self.image.blank?
	848	+ include Noosfero::Gravatar
	849	+
	850	+ def profile_custom_icon(gravatar_default=nil)
	851	+ image.public_filename(:icon) if image.present?
850	852	end
851	853
852	854	def jid(options = {})
...	...
...	...	@@ -14,9 +14,11 @@ class Scrap < ActiveRecord::Base
14	14
15	15	named_scope :not_replies, :conditions => {:scrap_id => nil}
16	16
17		- track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{\|s\| s.receiver != s.sender}, :custom_target => :action_tracker_target
	17	+ track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target
18	18
19		- track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.receiver == s.sender}
	19	+ track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.sender == s.receiver}
	20	+
	21	+ track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender == s.top_root.receiver}
20	22
21	23	after_create do \|scrap\|
22	24	scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
...	...	@@ -25,6 +27,12 @@ class Scrap < ActiveRecord::Base
25	27
26	28	before_validation :strip_all_html_tags
27	29
	30	+ def top_root
	31	+ scrap = self
	32	+ scrap = Scrap.find(scrap.scrap_id) while scrap.scrap_id
	33	+ scrap
	34	+ end
	35	+
28	36	def strip_all_html_tags
29	37	sanitizer = HTML::WhiteListSanitizer.new
30	38	self.content = sanitizer.sanitize(self.content, :tags => [])
...	...
...	...	@@ -290,19 +290,21 @@ class User < ActiveRecord::Base
290	290	end
291	291	end
292	292
293		- def data_hash
	293	+ def data_hash(gravatar_default = nil)
294	294	friends_list = {}
295	295	enterprises = person.enterprises.map { \|e\| { 'name' => e.short_name, 'identifier' => e.identifier } }
296	296	self.person.friends.online.map do \|person\|
297	297	friends_list[person.identifier] = {
298		- 'avatar' => person.profile_custom_icon,
	298	+ 'avatar' => person.profile_custom_icon(gravatar_default),
299	299	'name' => person.short_name,
300	300	'jid' => person.full_jid,
301	301	'status' => person.user.chat_status,
302	302	}
303	303	end
	304	+
304	305	{
305	306	'login' => self.login,
	307	+ 'avatar' => self.person.profile_custom_icon(gravatar_default),
306	308	'is_admin' => self.person.is_admin?,
307	309	'since_month' => self.person.created_at.month,
308	310	'since_year' => self.person.created_at.year,
...	...
...	...	@@ -13,11 +13,11 @@
13	13	<% else %>
14	14	<% url_image, status_class = comment.author_id ?
15	15	[comment.removed_user_image, 'icon-user-removed'] :
16		- [str_gravatar_url_for( comment.email, :size => 50, :d=>404 ), 'icon-user-unknown'] %>
	16	+ [gravatar_profile_image_url( comment.email, :size => 50, :d=>404 ), 'icon-user-unknown'] %>
17	17
18	18	<%= link_to(
19	19	image_tag(url_image, :onerror=>'gravatarCommentFailback(this)',
20		- 'data-gravatar'=>str_gravatar_url_for(comment.email, :size=>50)) +
	20	+ 'data-gravatar'=>gravatar_profile_image_url(comment.email, :size=>50)) +
21	21	content_tag('span', comment.author_name, :class => 'comment-info') +
22	22	content_tag('span', comment.message,
23	23	:class => 'comment-user-status ' + status_class),
...	...