Merge branch 'stable'

Antonio Terceiro
2 parents ee3ac2ce 9abf114d
Showing 31 changed files with 197 additions and 58 deletions Show diff stats
Rakefile.pkg
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/helpers/display_helper.rb
app/models/blog_archives_block.rb
app/models/communities_block.rb
app/models/enterprises_block.rb
app/models/link_list_block.rb
app/models/person.rb
app/models/product.rb
app/models/products_block.rb
app/models/profile.rb
app/models/tags_block.rb
app/models/uploaded_file.rb
app/views/profile_editor/index.rhtml
db/schema.rb
lib/noosfero.rb
public/images/icons-app/user_icon_size-big.png
public/images/icons-app/users_size-big.png
test/functional/cms_controller_test.rb
@@ -59,7 +59,7 @@ Rake::PackageTask.new(Noosfero::PROJECT, Noosfero::VERSION) do |p|
   p.package_files.include('util/**/*')
  
   # external resources
-  p.package_files.include('vendor/**/*')
+  p.package_files.include('vendor/plugins/**/*')
  
   # exclusions
   p.package_files.exclude('coverage/**/*')
@@ -21,9 +21,9 @@ class CmsController &lt; MyProfileController
   def available_article_types
     articles = [
       TinyMceArticle,
-      TextileArticle,
-      Event
+      TextileArticle
     ]
+    articles << Event unless profile.environment.enabled?(:disable_asset_events)
     parent_id = params ? params[:parent_id] : nil
     if !parent_id or !Article.find(parent_id).blog?
       articles += [
@@ -74,10 +74,10 @@ class FriendsController &lt; MyProfileController
           end
  
           friend = User.find_by_email(friend_email)
-          if !friend.nil? && friend.person.person?
-            InviteFriend.create(:person => profile, :friend => friend.person)
-          else
+          if friend.nil?
             InviteFriend.create(:person => profile, :friend_name => friend_name, :friend_email => friend_email, :message =>  params[:message])
+          elsif !friend.person.is_a_friend?(profile)
+            InviteFriend.create(:person => profile, :friend => friend.person)
           end
         end
  
@@ -2,7 +2,7 @@ module DisplayHelper
  
   def link_to_product(product, opts={})
     return _('No product') unless product
-    target = product.enterprise.enabled? ? product.enterprise.generate_url(:controller => 'catalog', :action => 'show', :id => product) : product.enterprise.url
+    target = product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'catalog', :action => 'show', :id => product) : product.enterprise.url
     link_to content_tag( 'span', product.name ),
             target,
             opts
@@ -22,7 +22,7 @@ class BlogArchivesBlock &lt; Block
       results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
       results << "<ul class='#{year}-archive'>"
       results_by_year.group_by{|i| [ ('%02d' % i.published_at.month()), gettext(MONTHS[i.published_at.month() - 1])]}.sort.reverse.each do |month, results_by_month|
-        results << content_tag('li', link_to("#{month[1]} (#{results_by_month.size})", owner.generate_url(:controller => 'content_viewer', :action => 'view_page', :page => [owner.blog.path], :year => year, :month => month[0])))
+        results << content_tag('li', link_to("#{month[1]} (#{results_by_month.size})", owner.blog.url.merge(:year => year, :month => month[0])))
       end
       results << "</ul>"
     end
@@ -33,7 +33,7 @@ class CommunitiesBlock &lt; ProfileListBlock
   end
  
   def profile_count
-    owner.communities.count
+    owner.communities(:public_profile => true).count
   end
  
   def profile_finder
@@ -29,7 +29,7 @@ class EnterprisesBlock &lt; ProfileListBlock
   end
  
   def profile_count
-    owner.enterprises.count
+    owner.enterprises(:public_profile => true).count
   end
  
   def profile_finder
@@ -49,15 +49,22 @@ class LinkListBlock &lt; Block
  
   def link_html(link)
     klass = 'icon-' + link[:icon] if link[:icon]
-    link_to(link[:name], expand_address(link[:address]), :class => klass)
+    sanitize_link(
+      link_to(link[:name], expand_address(link[:address]), :class => klass)
+    )
   end
  
   def expand_address(address)
-    if owner.respond_to?(:identifier)
+    add = if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
     else
       address
     end
+    if add !~ /^[a-z]+:\/\// && add !~ /^\//
+      'http://' + add
+    else
+      add
+    end
   end
  
   def editable?
@@ -71,4 +78,10 @@ class LinkListBlock &lt; Block
     end
   end
  
+  private
+
+  def sanitize_link(text)
+    sanitizer = HTML::WhiteListSanitizer.new
+    sanitizer.sanitize(text)
+  end
 end
@@ -128,14 +128,14 @@ class Person &lt; Profile
       :select => 'profiles.*').uniq
   end
  
-  def enterprise_memberships
-    memberships(:type => Enterprise.name)
+  def enterprise_memberships(conditions = {})
+    memberships({:type => Enterprise.name}.merge(conditions))
   end
  
   alias :enterprises :enterprise_memberships
  
-  def community_memberships
-    memberships(:type => Community.name)
+  def community_memberships(conditions = {})
+    memberships({:type => Community.name}.merge(conditions))
   end
  
   alias :communities :community_memberships
@@ -60,7 +60,7 @@ class Product &lt; ActiveRecord::Base
   end
  
   def url
-    enterprise.generate_url(:controller => 'catalog', :action => 'show', :id => id)
+    enterprise.public_profile_url.merge(:controller => 'catalog', :action => 'show', :id => id)
   end
  
   def public?
@@ -25,7 +25,7 @@ class ProductsBlock &lt; Block
   end
  
   def footer
-    link_to(_('View all products'), owner.generate_url(:controller => 'catalog', :action => 'index'))
+    link_to(_('View all products'), owner.public_profile_url.merge(:controller => 'catalog', :action => 'index'))
   end
  
   settings_items :product_ids, Array
@@ -362,6 +362,8 @@ class Profile &lt; ActiveRecord::Base
     Noosfero.url_options.merge(options)
   end
  
+private :generate_url, :url_options
+
   def default_hostname
     @default_hostname ||= (hostname || environment.default_hostname)
   end
@@ -543,11 +545,12 @@ class Profile &lt; ActiveRecord::Base
   def custom_header_expanded
     header = custom_header
     if header
-      if self.respond_to?(:name) && header.include?('{name}')
-        header.gsub('{name}', self.name)
-      else
-        header
+      %w[name short_name].each do |att|
+        if self.respond_to?(att) && header.include?("{#{att}}")
+          header.gsub!("{#{att}}", self.send(att))
+        end
       end
+      header
     end
   end
  
@@ -24,7 +24,7 @@ class TagsBlock &lt; Block
     block_title(title) +
     "\n<div class='tag_cloud'>\n"+
     tag_cloud( tags, :id,
-               owner.generate_url(:controller => 'profile', :action => 'tag'),
+               owner.public_profile_url.merge(:controller => 'profile', :action => 'tag'),
                :max_size => 16, :min_size => 9 ) +
     "\n</div><!-- end class='tag_cloud' -->\n";
   end
@@ -50,7 +50,14 @@ class UploadedFile &lt; Article
   include ActionView::Helpers::TagHelper
  
   def to_html(options = {})
-    tag('img', :src => public_filename(:display), :class => css_class_name, :style => 'max-width: 100%') if image?
+    if image?
+      tag('img', :src => public_filename(:display), :class => css_class_name, :style => 'max-width: 100%')
+    else
+      article = self
+      lambda do
+        content_tag('ul', content_tag('li', link_to(article.name, article.url, :class => article.css_class_name)))
+      end
+    end
   end
  
   def allow_children?
 <div id="profile-editor-index">
  
   <h1 class="block-title">
-    <span class='control-panel-title'><%= profile.name %></span>
+    <span class='control-panel-title'><%= profile.short_name %></span>
     <span class='control-panel-sep'>&#150;</span>
     <span class='control-panel-subtitle'><%= _('Control Panel') %></span>
   </h1>
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 69) do
+ActiveRecord::Schema.define(:version => 71) do
  
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -59,7 +59,6 @@ ActiveRecord::Schema.define(:version =&gt; 69) do
     t.datetime "created_at"
     t.integer  "last_changed_by_id"
     t.integer  "version"
-    t.integer  "lock_version"
     t.string   "type"
     t.integer  "size"
     t.string   "content_type"
@@ -253,6 +252,7 @@ ActiveRecord::Schema.define(:version =&gt; 69) do
     t.boolean  "public_profile",                    :default => true
     t.date     "birth_date"
     t.integer  "preferred_domain_id"
+    t.datetime "updated_at"
   end
  
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.19.3'
+  VERSION = '0.19.4'
   SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'
  
   def self.pattern_for_controllers_in_directory(dir)
@@ -560,12 +560,12 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
  
   should 'not make enterprise homepage available to person' do
-    @controller.stubs(:profile).returns(Person.new)
+    @controller.stubs(:profile).returns(create_user('test_user').person)
     assert_not_includes @controller.available_article_types, EnterpriseHomepage
   end
  
   should 'make enterprise homepage available to enterprises' do
-    @controller.stubs(:profile).returns(Enterprise.new)
+    @controller.stubs(:profile).returns(Enterprise.create(:name => 'test_ent', :identifier => 'test_ent'))
     assert_includes @controller.available_article_types, EnterpriseHomepage
   end
  
@@ -767,7 +767,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
  
   should 'not offer folder to blog articles' do
-    @controller.stubs(:profile).returns(Enterprise.new)
+    @controller.stubs(:profile).returns(Enterprise.create(:name => 'test_ent', :identifier => 'test_ent'))
     blog = Blog.create!(:name => 'Blog for test', :profile => profile)
     @controller.stubs(:params).returns({ :parent_id => blog.id })
  
@@ -775,7 +775,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
  
   should 'not offer rssfeed to blog articles' do
-    @controller.stubs(:profile).returns(Enterprise.new)
+    @controller.stubs(:profile).returns(Enterprise.create(:name => 'test_ent', :identifier => 'test_ent'))
     blog = Blog.create!(:name => 'Blog for test', :profile => profile)
     @controller.stubs(:params).returns({ :parent_id => blog.id })
  
@@ -1137,4 +1137,15 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/upload_files?parent_id=#{profile.blog.id}"}
   end
  
+  should 'not offer to create events if events is disabled' do
+    e = profile.environment
+    e.enable(:disable_asset_events)
+    e.save!
+
+    get :new, :profile => profile.identifier
+
+
+    assert_not_includes assigns(:article_types).map{|at|at[:name]}, 'Event'
+  end
+
 end
@@ -157,4 +157,11 @@ class FriendsControllerTest &lt; Test::Unit::TestCase
     end
   end
  
+  should 'not create InviteFriend if is a friend' do
+    friend = create_user('testfriend', :email => 'friend@noosfero.org')
+    friend.person.add_friend(profile)
+    assert_no_difference InviteFriend, :count do
+      post :invite, :manual_import_addresses => "#{friend.name} <#{friend.email}>", :import_from => "manual", :message => "click: <url>", :confirmation => 1, :wizard => true
+    end
+  end
 end
@@ -816,4 +816,20 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
     end
   end
  
+  should 'show profile nickname on title' do
+    person = create_user('testuser', {}, :nickname => 'my nick').person
+    get :index, :profile => 'testuser'
+    assert_tag :tag => 'h1', :attributes => { :class => 'block-title'}, :descendant => {
+      :tag => 'span', :attributes => { :class => 'control-panel-title' }, :content => 'my nick'
+    }
+  end
+
+  should 'show profile name on title when no nickname' do
+    person = create_user('testuser').person
+    get :index, :profile => 'testuser'
+    assert_tag :tag => 'h1', :attributes => { :class => 'block-title'}, :descendant => {
+      :tag => 'span', :attributes => { :class => 'control-panel-title' }, :content => 'testuser'
+    }
+  end
+
 end
@@ -992,6 +992,15 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'div', :attributes => {:id => 'wizard-steps'}
   end
  
+  should 'find products when enterprises has own hostname' do
+    ent = Enterprise.create!(:name => 'teste', :identifier => 'teste')
+    ent.domains << Domain.new(:name => 'testent.com'); ent.save!
+    prod = ent.products.create!(:name => 'a beautiful product')
+    get 'index', :query => 'beautiful', :find_in => ['products']
+    assert_includes assigns(:results)[:products], prod
+  end
+
+
   ##################################################################
   ##################################################################
  
@@ -90,10 +90,10 @@ class CommunitiesBlockTest &lt; Test::Unit::TestCase
   should 'count number of owner communities' do
     user = create_user('testuser').person
  
-    community1 = Community.create!(:name => 'test community 1', :identifier => 'comm1', :environment => Environment.default)
+    community1 = Community.create!(:name => 'test community 1', :identifier => 'comm1', :environment => Environment.default, :public_profile => true)
     community1.add_member(user)
  
-    community2 = Community.create!(:name => 'test community 2', :identifier => 'comm2', :environment => Environment.default)
+    community2 = Community.create!(:name => 'test community 2', :identifier => 'comm2', :environment => Environment.default, :public_profile => true)
     community2.add_member(user)
  
     block = CommunitiesBlock.new
@@ -102,4 +102,19 @@ class CommunitiesBlockTest &lt; Test::Unit::TestCase
     assert_equal 2, block.profile_count
   end
  
+  should 'not count non-public communities' do
+    user = create_user('testuser').person
+
+    community_public = Community.create!(:name => 'tcommunity 1', :identifier => 'comm1', :environment => Environment.default, :public_profile => true)
+    community_public.add_member(user)
+
+    community_private = Community.create!(:name => ' community 2', :identifier => 'comm2', :environment => Environment.default, :public_profile => false)
+    community_private.add_member(user)
+
+    block = CommunitiesBlock.new
+    block.expects(:owner).at_least_once.returns(user)
+
+    assert_equal 1, block.profile_count
+  end
+
 end
@@ -114,4 +114,21 @@ class EnterprisesBlockTest &lt; Test::Unit::TestCase
     assert_equal 2, block.profile_count
   end
  
+  should 'not count non-public enterprises' do
+    user = create_user('testuser').person
+
+    ent1 = Enterprise.create!(:name => 'test enterprise 1', :identifier => 'ent1', :environment => Environment.default, :public_profile => true)
+    ent1.expects(:closed?).returns(false)
+    ent1.add_member(user)
+
+    ent2 = Enterprise.create!(:name => 'test enterprise 2', :identifier => 'ent2', :environment => Environment.default, :public_profile => false)
+    ent2.expects(:closed?).returns(false)
+    ent2.add_member(user)
+
+    block = EnterprisesBlock.new
+    block.expects(:owner).at_least_once.returns(user)
+
+    assert_equal 1, block.profile_count
+  end
+
 end
@@ -57,4 +57,21 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
     assert_no_match /class="/, l.link_html({:icon => nil, :name => 'test', :address => 'test.com'})
   end
  
+  should 'not add link to javascript' do
+    l = LinkListBlock.new(:links => [{:name => 'link', :address => "javascript:alert('Message test')"}])
+    assert_no_match /href="javascript/, l.link_html(l.links.first)
+  end
+
+  should 'not add link to onclick' do
+    l = LinkListBlock.new(:links => [{:name => 'link', :address => "#\" onclick=\"alert(123456)"}])
+    assert_no_match /onclick/, l.link_html(l.links.first)
+  end
+
+  should 'add http in front of incomplete external links' do
+    {'/local/link' => '/local/link', 'http://example.org' => 'http://example.org', 'example.org' => 'http://example.org'}.each do |input, output|
+      l = LinkListBlock.new(:links => [{:name => 'categ', :address => input}])
+      assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => output}
+    end
+  end
+
 end
@@ -112,15 +112,12 @@ class ProductTest &lt; Test::Unit::TestCase
   should 'provide url' do
     product = Product.new
  
-    result = mock
-
     enterprise = Enterprise.new
-    enterprise.expects(:generate_url).with(:controller => 'catalog', :action => 'show', :id => 999).returns(result)
+    enterprise.expects(:public_profile_url).returns({})
  
     product.expects(:id).returns(999)
     product.expects(:enterprise).returns(enterprise)
-
-    assert_same result, product.url
+    assert_equal({:controller => 'catalog', :action => 'show', :id => 999}, product.url)
   end
  
   should 'categorize also with product categorization' do
@@ -123,4 +123,16 @@ class ProductsBlockTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'generate footer when enterprise has own hostname' do
+    enterprise = Enterprise.create!(:name => 'testenterprise', :identifier => 'testenterprise')
+    enterprise.domains << Domain.new(:name => 'sometest.com'); enterprise.save!
+    enterprise.products.create!(:name => 'product one')
+    enterprise.products.create!(:name => 'product two')
+
+    block.stubs(:owner).returns(enterprise)
+
+    footer = block.footer
+
+    assert_tag_in_string footer, :tag => 'a', :attributes => { :href => /\/catalog\/testenterprise$/ }, :content => 'View all products'
+  end
 end
@@ -262,30 +262,18 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal({ :host => 'mycolivre.net', :profile => 'testprofile', :controller => 'profile', :action => 'index' }, profile.public_profile_url)
   end
  
-  should 'generate URL' do
-    profile = Profile.create!(:name => "Test Profile", :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
-
-    assert_equal({ :host => 'mycolivre.net', :profile => 'testprofile', :controller => 'profile', :action => 'friends' }, profile.generate_url(:controller => 'profile', :action => 'friends'))
-  end
-
-  should 'provide URL options' do
-    profile = Profile.create!(:name => "Test Profile", :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
-
-    assert_equal({:host => 'mycolivre.net', :profile => 'testprofile'}, profile.url_options)
-  end
-
   should "use own domain name instead of environment's for home page url" do
     profile = Profile.create!(:name => "Test Profile", :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
     profile.domains << Domain.new(:name => 'micojones.net')
     assert_equal({:host => 'micojones.net', :profile => nil, :controller => 'content_viewer', :action => 'view_page', :page => []}, profile.url)
   end
  
-  should 'help developers by adding a suitable port to url options' do
+  should 'help developers by adding a suitable port to url' do
     profile = Profile.create!(:name => "Test Profile", :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
  
     Noosfero.expects(:url_options).returns({ :port => 9999 })
  
-    ok('Profile#url_options must include port option when running in development mode') { profile.url_options[:port] == 9999 }
+    ok('Profile#url_options must include port option when running in development mode') { profile.url[:port] == 9999 }
   end
  
   should 'help developers by adding a suitable port to url options for own domain urls' do
@@ -809,6 +797,18 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal 'Custom header of Test',  Profile.new(:custom_header => 'Custom header of {name}', :name => 'Test').custom_header_expanded
   end
  
+  should 'provide custom header with nickname when use short_name variable' do
+    profile = Profile.new(:custom_header => 'Custom header of {short_name}', :name => 'Test', :nickname => 'Nickname test')
+    assert_equal 'Custom header of {short_name}', profile.custom_header
+    assert_equal 'Custom header of Nickname test',  profile.custom_header_expanded
+  end
+
+  should 'provide custom header with name when use short_name variable and no nickname' do
+    profile = Profile.new(:custom_header => 'Custom header of {short_name}', :name => 'Test')
+    assert_equal 'Custom header of {short_name}', profile.custom_header
+    assert_equal 'Custom header of Test', profile.custom_header_expanded
+  end
+
   should 'provide custom footer' do
     assert_equal 'my custom footer',  Profile.new(:custom_footer => 'my custom footer').custom_footer
   end
@@ -3,12 +3,12 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class TagsBlockTest < Test::Unit::TestCase
  
   def setup
-    user = create_user('testinguser').person
-    user.articles.build(:name => 'article 1', :tag_list => 'first-tag').save!
-    user.articles.build(:name => 'article 2', :tag_list => 'first-tag, second-tag').save!
-    user.articles.build(:name => 'article 3', :tag_list => 'first-tag, second-tag, third-tag').save!
+    @user = create_user('testinguser').person
+    @user.articles.build(:name => 'article 1', :tag_list => 'first-tag').save!
+    @user.articles.build(:name => 'article 2', :tag_list => 'first-tag, second-tag').save!
+    @user.articles.build(:name => 'article 3', :tag_list => 'first-tag, second-tag, third-tag').save!
  
-    box = Box.create!(:owner => user)
+    box = Box.create!(:owner => @user)
     @block = TagsBlock.create!(:box => box)
   end
   attr_reader :block
@@ -32,4 +32,9 @@ class TagsBlockTest &lt; Test::Unit::TestCase
     assert_equal '', block.content
   end
  
+  should 'generate links when profile has own hostname' do
+    @user.domains << Domain.new(:name => 'testuser.net'); @user.save!
+    assert_match /profile\/testinguser\/tag\/first-tag/, block.content
+  end
+
 end
@@ -109,4 +109,14 @@ class UploadedFileTest &lt; Test::Unit::TestCase
     assert_match /#{UploadedFile.max_size.to_humanreadable}/, up.errors[:size]
   end
  
+  should 'display link to download of non-image files' do
+    p = create_user('test_user').person
+    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :profile => p)
+
+    stubs(:content_tag)
+    expects(:link_to).with(file.name, file.url, :class => file.css_class_name)
+
+    instance_eval(&file.to_html)
+  end
+
 end
...	...	@@ -59,7 +59,7 @@ Rake::PackageTask.new(Noosfero::PROJECT, Noosfero::VERSION) do \|p\|
59	59	p.package_files.include('util/*/')
60	60
61	61	# external resources
62		- p.package_files.include('vendor/*/')
	62	+ p.package_files.include('vendor/plugins/*/')
63	63
64	64	# exclusions
65	65	p.package_files.exclude('coverage/*/')
...	...
...	...	@@ -21,9 +21,9 @@ class CmsController < MyProfileController
21	21	def available_article_types
22	22	articles = [
23	23	TinyMceArticle,
24		- TextileArticle,
25		- Event
	24	+ TextileArticle
26	25	]
	26	+ articles << Event unless profile.environment.enabled?(:disable_asset_events)
27	27	parent_id = params ? params[:parent_id] : nil
28	28	if !parent_id or !Article.find(parent_id).blog?
29	29	articles += [
...	...
...	...	@@ -74,10 +74,10 @@ class FriendsController < MyProfileController
74	74	end
75	75
76	76	friend = User.find_by_email(friend_email)
77		- if !friend.nil? && friend.person.person?
78		- InviteFriend.create(:person => profile, :friend => friend.person)
79		- else
	77	+ if friend.nil?
80	78	InviteFriend.create(:person => profile, :friend_name => friend_name, :friend_email => friend_email, :message => params[:message])
	79	+ elsif !friend.person.is_a_friend?(profile)
	80	+ InviteFriend.create(:person => profile, :friend => friend.person)
81	81	end
82	82	end
83	83
...	...
...	...	@@ -2,7 +2,7 @@ module DisplayHelper
2	2
3	3	def link_to_product(product, opts={})
4	4	return _('No product') unless product
5		- target = product.enterprise.enabled? ? product.enterprise.generate_url(:controller => 'catalog', :action => 'show', :id => product) : product.enterprise.url
	5	+ target = product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'catalog', :action => 'show', :id => product) : product.enterprise.url
6	6	link_to content_tag( 'span', product.name ),
7	7	target,
8	8	opts
...	...
...	...	@@ -22,7 +22,7 @@ class BlogArchivesBlock < Block
22	22	results << content_tag('li', content_tag('strong', "#{year} (#{results_by_year.size})"))
23	23	results << "<ul class='#{year}-archive'>"
24	24	results_by_year.group_by{\|i\| [ ('%02d' % i.published_at.month()), gettext(MONTHS[i.published_at.month() - 1])]}.sort.reverse.each do \|month, results_by_month\|
25		- results << content_tag('li', link_to("#{month[1]} (#{results_by_month.size})", owner.generate_url(:controller => 'content_viewer', :action => 'view_page', :page => [owner.blog.path], :year => year, :month => month[0])))
	25	+ results << content_tag('li', link_to("#{month[1]} (#{results_by_month.size})", owner.blog.url.merge(:year => year, :month => month[0])))
26	26	end
27	27	results << "</ul>"
28	28	end
...	...
...	...	@@ -33,7 +33,7 @@ class CommunitiesBlock < ProfileListBlock
33	33	end
34	34
35	35	def profile_count
36		- owner.communities.count
	36	+ owner.communities(:public_profile => true).count
37	37	end
38	38
39	39	def profile_finder
...	...
...	...	@@ -29,7 +29,7 @@ class EnterprisesBlock < ProfileListBlock
29	29	end
30	30
31	31	def profile_count
32		- owner.enterprises.count
	32	+ owner.enterprises(:public_profile => true).count
33	33	end
34	34
35	35	def profile_finder
...	...
...	...	@@ -49,15 +49,22 @@ class LinkListBlock < Block
49	49
50	50	def link_html(link)
51	51	klass = 'icon-' + link[:icon] if link[:icon]
52		- link_to(link[:name], expand_address(link[:address]), :class => klass)
	52	+ sanitize_link(
	53	+ link_to(link[:name], expand_address(link[:address]), :class => klass)
	54	+ )
53	55	end
54	56
55	57	def expand_address(address)
56		- if owner.respond_to?(:identifier)
	58	+ add = if owner.respond_to?(:identifier)
57	59	address.gsub('{profile}', owner.identifier)
58	60	else
59	61	address
60	62	end
	63	+ if add !~ /^[a-z]+:\/\// && add !~ /^\//
	64	+ 'http://' + add
	65	+ else
	66	+ add
	67	+ end
61	68	end
62	69
63	70	def editable?
...	...	@@ -71,4 +78,10 @@ class LinkListBlock < Block
71	78	end
72	79	end
73	80
	81	+ private
	82	+
	83	+ def sanitize_link(text)
	84	+ sanitizer = HTML::WhiteListSanitizer.new
	85	+ sanitizer.sanitize(text)
	86	+ end
74	87	end
...	...
...	...	@@ -128,14 +128,14 @@ class Person < Profile
128	128	:select => 'profiles.*').uniq
129	129	end
130	130
131		- def enterprise_memberships
132		- memberships(:type => Enterprise.name)
	131	+ def enterprise_memberships(conditions = {})
	132	+ memberships({:type => Enterprise.name}.merge(conditions))
133	133	end
134	134
135	135	alias :enterprises :enterprise_memberships
136	136
137		- def community_memberships
138		- memberships(:type => Community.name)
	137	+ def community_memberships(conditions = {})
	138	+ memberships({:type => Community.name}.merge(conditions))
139	139	end
140	140
141	141	alias :communities :community_memberships
...	...
...	...	@@ -60,7 +60,7 @@ class Product < ActiveRecord::Base
60	60	end
61	61
62	62	def url
63		- enterprise.generate_url(:controller => 'catalog', :action => 'show', :id => id)
	63	+ enterprise.public_profile_url.merge(:controller => 'catalog', :action => 'show', :id => id)
64	64	end
65	65
66	66	def public?
...	...