invite-members: Merge rails3 stoa plugin

Larissa Reis
2 parents 56f774e6 00d5c1ac
Showing 21 changed files with 366 additions and 97 deletions Show diff stats
app/controllers/public/invite_controller.rb
app/helpers/invite_helper.rb
app/models/invitation.rb
app/models/invite_member.rb
app/views/friends/index.html.erb
app/views/invite/_personalize_invitation_mail.html.erb
app/views/invite/_select_address_book.html.erb
app/views/invite/invite_friends.html.erb
app/views/invite/select_address_book.html.erb
app/views/invite/select_friends.html.erb
app/views/profile/friends.html.erb
app/views/profile/members.html.erb
app/views/profile_members/_index_buttons.html.erb
config/routes.rb
lib/noosfero/plugin.rb
plugins/stoa/lib/stoa_plugin.rb
plugins/stoa/test/functional/invite_controller_test.rb
test/functional/invite_controller_test.rb
test/integration/routing_test.rb
test/unit/invitation_test.rb
@@ -4,8 +4,9 @@ class InviteController &lt; PublicController
   before_filter :login_required
   before_filter :check_permissions_to_invite
-  def select_address_book
+  def invite_friends
     @import_from = params[:import_from] || "manual"
+    @mail_template = params[:mail_template] || environment.invitation_mail_template(profile)
     if request.post?
       contact_list = ContactList.create
       Delayed::Job.enqueue GetEmailContactsJob.new(@import_from, params[:login], params[:password], contact_list.id) if @import_from != 'manual'
@@ -22,7 +23,7 @@ class InviteController &lt; PublicController
       webmail_import_addresses = params[:webmail_import_addresses]
       contacts_to_invite = Invitation.join_contacts(manual_import_addresses, webmail_import_addresses)
       if !contacts_to_invite.empty?
-        Delayed::Job.enqueue InvitationJob.new(current_user.person.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
+        Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
         session[:notice] = _('Your invitations are being sent.')
         if profile.person?
           redirect_to :controller => 'profile', :action => 'friends'
@@ -52,14 +53,42 @@ class InviteController &lt; PublicController
   def cancel_fetching_emails
     contact_list = ContactList.find(params[:contact_list])
     contact_list.destroy
-    redirect_to :action => 'select_address_book'
+    redirect_to :action => 'invite_friends'
+  end
+
+  def invite_registered_friend
+    contacts_to_invite = params['q'].split(',')
+    if !contacts_to_invite.empty? && request.post?
+      Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
+      session[:notice] = _('Your invitations are being sent.')
+      if profile.person?
+        redirect_to :controller => 'profile', :action => 'friends'
+      else
+        redirect_to :controller => 'profile', :action => 'members'
+      end
+      return
+    else
+      redirect_to :action => 'invite_friends'
+      session[:notice] = _('Please enter a valid profile.')
+    end
+  end
+
+  include InviteHelper
+  helper :invite
+
+  def search_friend
+    fields = %w[name identifier email] + plugins_options.map {|field| field[:field].to_s }
+    values = ["%#{params['q']}%"] * fields.count
+    render :text => environment.people.find(:all, :joins => ['INNER JOIN users ON profiles.user_id=users.id'], :conditions => [fields.map {|field| "LOWER(#{field}) LIKE ?"}.join(' OR '), *values]).
+      select {|person| !profile.members.include?(person) }.
+      map {|person| {:id => person.id, :name => person.name} }.to_json
   end
   protected
   def check_permissions_to_invite
-    if profile.person? and !current_user.person.has_permission?(:manage_friends, profile) or
-      profile.community? and !current_user.person.has_permission?(:invite_members, profile)
+    if profile.person? and !user.has_permission?(:manage_friends, profile) or
+      profile.community? and !user.has_permission?(:invite_members, profile)
       render_access_denied
     end
   end
 module InviteHelper
+  def plugins_options
+    @plugins.dispatch(:search_friend_fields)
+  end
+
+  def search_friend_fields
+    labels = [
+      _('Name'),
+      _('Username'),
+      _('Email'),
+    ] + plugins_options.map { |options| options[:name] }
+
+    last = labels.pop
+    label = labels.join(', ')
+    "#{label} #{_('or')} #{last}"
+  end
 end
@@ -51,7 +51,10 @@ class Invitation &lt; Task
       next if contact_to_invite == _("Firstname Lastname <friend@email.com>")
       contact_to_invite.strip!
-      if match = contact_to_invite.match(/(.*)<(.*)>/) and match[2].match(Noosfero::Constants::EMAIL_FORMAT)
+      find_by_profile_id = false
+      if contact_to_invite.match(/^\d*$/)
+        find_by_profile_id = true
+      elsif match = contact_to_invite.match(/(.*)<(.*)>/) and match[2].match(Noosfero::Constants::EMAIL_FORMAT)
         friend_name = match[1].strip
         friend_email = match[2]
       elsif match = contact_to_invite.strip.match(Noosfero::Constants::EMAIL_FORMAT)
@@ -61,19 +64,23 @@ class Invitation &lt; Task
         next
       end
-      user = User.find_by_email(friend_email)
+      begin
+        user = find_by_profile_id ? Person.find_by_id(contact_to_invite).user : User.find_by_email(friend_email)
+      rescue
+        user = nil
+      end
-      task_args = if user.nil?
+      task_args = if user.nil? && !find_by_profile_id
         {:person => person, :friend_name => friend_name, :friend_email => friend_email, :message => message}
-      elsif !user.person.is_a_friend?(person)
+      elsif user.present? && !(user.person.is_a_friend?(person) && profile.person?)
         {:person => person, :target => user.person}
       end
       if !task_args.nil?
         if profile.person?
-          InviteFriend.create(task_args)
+          InviteFriend.create(task_args) if !user || user.person.tasks.pending.of("InviteFriend").find(:all, :conditions => {:requestor_id => person.id, :target_id => user.person.id}).blank?
         elsif profile.community?
-          InviteMember.create(task_args.merge(:community_id => profile.id))
+          InviteMember.create(task_args.merge(:community_id => profile.id)) if !user || user.person.tasks.pending.of("InviteMember").find(:all, :conditions => {:requestor_id => person.id}).select { |t| t.data[:community_id] == profile.id }.blank?
         else
           raise NotImplementedError, 'Don\'t know how to invite people to a %s' % profile.class.to_s
         end
@@ -12,7 +12,7 @@ class InviteMember &lt; Invitation
   end
   def perform
-    community.add_member(friend)
+    community.add_member(friend) and friend.tasks.pending.of("InviteMember").select { |t| t.data[:community_id] == community_id }.each { |invite| invite.cancel }
   end
   def title
@@ -39,6 +39,14 @@ class InviteMember &lt; Invitation
     _('%{requestor} invited you to join %{community}.') % {:requestor => requestor.name, :community => community.name}
   end
+  def target_notification_message
+    if friend
+      _('%{requestor} is inviting you to join "%{community}" on %{system}.') % { :system => target.environment.name, :requestor => requestor.name, :community => community.name }
+    else
+      super
+    end
+  end
+
   def expanded_message
     super.gsub /<community>/, community.name
   end
@@ -15,7 +15,7 @@
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
       <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
       <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
-        <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+        <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
       <% end %>
     <% end %>
   <% end %>
@@ -46,7 +46,7 @@
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
     <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
-      <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+      <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
     <% end %>
   <% end %>
 <% end %>
@@ -0,0 +1,10 @@
+<br/>
+
+<%= link_to_function(_('Personalize invitation mail'), nil) do |page|
+  page['invitation-mail_template'].show
+end %>
+
+<div id='invitation-mail_template' style='display:none'>
+  <%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
+  <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, mail_template, :cols => 72, :rows => 8)) %>
+</div>
@@ -0,0 +1,41 @@
+<% header ||='h2' %>
+<<%= header %>><%= _('Step 1 of 2: Select address book') %></<%= header %>>
+
+<% form_tag do %>
+
+  <%= [
+        radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
+        radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
+        radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
+        radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
+      ].join("\n<br/>\n") %>
+
+  <script type="text/javascript">
+    function hide_invite_friend_login_password() {
+      $('invite-friends-login-password').hide();
+    }
+    function show_invite_friend_login_password(option) {
+      if (option == 'hotmail') {
+        $('hotmail_username_tip').show();
+      } else {
+        $('hotmail_username_tip').hide();
+      }
+      $('invite-friends-login-password').show();
+      $('login').focus();
+    }
+  </script>
+  <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
+    <div id='hotmail_username_tip'>
+      <%= ui_icon('ui-icon-alert') %>
+      <%= _('Please type your username in the format yourname@example.com') %>
+    </div>
+
+    <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
+    <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
+  </div>
+
+  <% button_bar do %>
+    <%= submit_button(:forward, _("Next")) %>
+  <% end %>
+  <p><%= _("We won't store your password or contact anyone without your permission.") %></p>
+<% end %>
@@ -0,0 +1,30 @@
+<% if profile.person? %>
+  <h1><%= _('Invite your friends') %></h1>
+<% else %>
+  <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
+<% end %>
+
+<% unless profile.person? %>
+  <h2><%= _('Invite other registered users') %></h2>
+  <p><%= _('You can search for user profiles and invite them to join this community.') %></p>
+  <% form_tag :action => 'invite_registered_friend' do %>
+    <% search_action = url_for(:action => 'search_friend') %>
+    <%= token_input_field_tag(:q, 'search-friends', search_action,
+                              { :hint_text => _('Type in your friend\'s ') + search_friend_fields,
+                                :focus => false }) %>
+
+    <% button_bar do %>
+      <%= submit_button('save', _('Invite'))%>
+      <%= button('cancel', _('Cancel'), profile.url)%>
+    <% end %>
+  <% end %>
+
+  <br />
+  <h2><%= _('Invite people from my e-mail contacts') %></h2>
+  <% header = 'h3' %>
+
+<% end %>
+
+<%= render :partial => 'invite/select_address_book', :locals => {:header => header} %>
+
+<div id="loadingScreen"></div>
@@ -1,51 +0,0 @@
-<% if profile.person? %>
-  <h1><%= _('Invite your friends') %></h1>
-<% else %>
-  <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
-<% end %>
-
-<h2><%= _('Step 1 of 2: Select address book') %></h2>
-
-<%= form_tag do %>
-
-  <%= [
-        radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
-        radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
-        radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
-        radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
-      ].join("\n<br/>\n") %>
-
-  <script type="text/javascript">
-    function hide_invite_friend_login_password() {
-      $('invite-friends-login-password').hide();
-    }
-    function show_invite_friend_login_password(option) {
-      if (option == 'hotmail') {
-        $('hotmail_username_tip').show();
-      } else {
-        $('hotmail_username_tip').hide();
-      }
-      $('invite-friends-login-password').show();
-      $('login').focus();
-    }
-  </script>
-  <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
-    <div id='hotmail_username_tip'>
-      <%= ui_icon('ui-icon-alert') %>
-      <%= _('Please type your username in the format yourname@example.com') %>
-    </div>
-
-    <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
-    <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
-  </div>
-
-  <% button_bar do %>
-    <%= submit_button(:forward, _("Next")) %>
-  <% end %>
-  <p><%= _("We won't store your password or contact anyone without your permission.") %></p>
-<% end %>
-
-<div id="loadingScreen"></div>
-
-
-
@@ -9,7 +9,7 @@
 <h2><%= _('Step 2 of 2: Selecting Friends') %></h2>
-<%= button(:back, _('Back'), { :action => 'select_address_book' }, :id => 'invitation_back_button') %>
+<%= button(:back, _('Back'), { :action => 'invite_friends' }, :id => 'invitation_back_button') %>
 <p>
 <%= _('Indicate which friends you want to invite.') %>
@@ -30,16 +30,7 @@
     </div>
   <% end -%>
-  <br/>
-
-  <%= link_to_function(_('Personalize invitation mail'), nil) do |page|
-    page['invitation-mail_template'].show
-  end %>
-
-  <div id='invitation-mail_template' style='display:none'>
-    <%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
-    <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, @mail_template, :cols => 72, :rows => 8)) %>
-  </div>
+  <%= render :partial => 'invite/personalize_invitation_mail', :locals => {:mail_template => @mail_template } %>
   <% button_bar do %>
     <%= submit_button(:ok, _("Invite my friends!")) %>
@@ -18,7 +18,7 @@
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <% if user == profile %>
     <%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
-    <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+    <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
   <% end %>
 <% end %>
@@ -18,7 +18,7 @@
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
   <% if profile.community? and user %>
     <% if user.has_permission?(:invite_members, profile) %>
-      <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
+      <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'invite_friends' %>
     <% end %>
     <% if user.has_permission?(:send_mail_to_members, profile) %>
       <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
@@ -2,7 +2,7 @@
   <%= button :back, _('Back'), :controller => 'profile_editor' %>
   <%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>
   <% if profile.community? and user.has_permission?(:invite_members, profile) %>
-    <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'select_address_book' %>
+    <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'invite_friends' %>
   <% end %>
   <% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
     <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
@@ -67,7 +67,7 @@ Noosfero::Application.routes.draw do
   match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/, :as => :catalog
   # invite
-  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'select_address_book', :profile => /#{Noosfero.identifier_format}/
+  match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => /#{Noosfero.identifier_format}/
   match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/
   # feeds per tag
@@ -513,6 +513,12 @@ class Noosfero::Plugin
     nil
   end
+  # -> Adds aditional fields for invite_friends search
+  # returns = [{:field => 'field1', :name => 'field 1 name'}, {...}]
+  def search_friend_fields
+    nil
+  end
+
   # -> Adds additional blocks to profiles and environments.
   # Your plugin must implements a class method called 'extra_blocks'
   # that returns a hash with the following syntax.
@@ -110,7 +110,7 @@ class StoaPlugin &lt; Noosfero::Plugin
     { :title => _('Invite friends'),
       :icon => 'invite-friends',
       :url => {:controller => 'invite',
-               :action => 'select_address_book'} } if context.send(:user) && context.send(:user).usp_id.present?
+               :action => 'invite_friends'} } if context.send(:user) && context.send(:user).usp_id.present?
   end
   def remove_invite_friends_button
@@ -121,4 +121,8 @@ class StoaPlugin &lt; Noosfero::Plugin
     {:field => :usp_id, :name => _('USP Number'), :model => 'person'}
   end
+  def search_friend_fields
+    [{:field => :usp_id, :name => _('USP Number')}]
+  end
+
 end
@@ -20,7 +20,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     person_without_usp_id = User.create!(:login => 'user-without', :email => 'user-without@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:invitation_code => 12345678}).person
     login_as(person_without_usp_id.identifier)
-    get :select_address_book, :profile => person_without_usp_id.identifier
+    get :invite_friends, :profile => person_without_usp_id.identifier
     assert_response 403
     get :select_friends, :profile => person_without_usp_id.identifier
     assert_response 403
@@ -30,7 +30,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     person_with_usp_id = User.create!(:login => 'user-with', :email => 'user-with@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 12345678}).person
     login_as(person_with_usp_id.identifier)
-    get :select_address_book, :profile => person_with_usp_id.identifier
+    get :invite_friends, :profile => person_with_usp_id.identifier
     assert_response 200
     get :select_friends, :profile => person_with_usp_id.identifier, :contact_list => ContactList.create.id
     assert_response 200
@@ -42,11 +42,23 @@ class InviteControllerTest &lt; ActionController::TestCase
     organization.add_admin(person_with_usp_id)
     login_as(person_with_usp_id.identifier)
-    get :select_address_book, :profile => organization.identifier
+    get :invite_friends, :profile => organization.identifier
     assert_response 200
     get :select_friends, :profile => organization.identifier, :contact_list => ContactList.create.id
     assert_response 200
   end
+  should 'search friends profiles by usp_id' do
+    person1 = User.create!(:login => 'john', :email => 'john@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 12345678}).person
+    User.create!(:login => 'mary', :email => 'mary@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 11111111}).person
+    organization = fast_create(Organization)
+    organization.add_admin(person1)
+
+    login_as(person1.identifier)
+    get :search_friend, :profile => organization.identifier, :q => '1234'
+
+    assert_equal [{"name" => person1.name, "id" => person1.id}].to_json, @response.body
+    assert_response 200
+  end
 end
@@ -99,7 +99,7 @@ class InviteControllerTest &lt; ActionController::TestCase
   end
   should 'display invitation page' do
-    get :select_address_book, :profile => profile.identifier
+    get :invite_friends, :profile => profile.identifier
     assert_response :success
     assert_tag :tag => 'h1', :content => 'Invite your friends'
   end
@@ -118,8 +118,8 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_equal InviteFriend.mail_template, assigns(:mail_template)
   end
-  should 'deny select_address_book f user has no rights to invite members' do
-    get :select_address_book, :profile => community.identifier
+  should 'deny invite_friends if user has no rights to invite members' do
+    get :invite_friends, :profile => community.identifier
     assert_response 403 # forbidden
   end
@@ -128,13 +128,13 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_response 403 # forbidden
   end
-  should 'deny select_address_book access when trying to invite friends to another user' do
-    get :select_address_book, :profile => friend.identifier
+  should 'deny invite_friends access when trying to invite friends to another user' do
+    get :invite_friends, :profile => friend.identifier
     assert_response 403 # forbidden
   end
   should 'deny select_friends access when trying to invite friends to another user' do
-    get :select_address_book, :profile => friend.identifier
+    get :select_friends, :profile => friend.identifier
     assert_response 403 # forbidden
   end
@@ -155,7 +155,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     community.add_admin(profile)
     contact_list = ContactList.create
     assert_difference 'Delayed::Job.count', 1 do
-      post :select_address_book, :profile => community.identifier, :contact_list => contact_list.id, :import_from => 'gmail'
+      post :invite_friends, :profile => community.identifier, :contact_list => contact_list.id, :import_from => 'gmail'
     end
   end
@@ -223,7 +223,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_difference 'ContactList.count', -1 do
       get :cancel_fetching_emails, :profile => profile.identifier, :contact_list => contact_list.id
     end
-    assert_redirected_to :action => 'select_address_book'
+    assert_redirected_to :action => 'invite_friends'
   end
   should 'set locale in the background job' do
@@ -235,6 +235,79 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_equal 'pt', job.payload_object.locale
   end
+  should 'search friends profiles by name, email or identifier' do
+    friend1 = create_user('willy').person
+    friend2 = create_user('william').person
+    friend1.name = 'cris'
+    friend2.email = 'me@example.com'
+    friend1.save
+    friend2.save
+
+    get :search_friend, :profile => profile.identifier, :q => 'me@'
+
+    assert_equal 'text/html', @response.content_type
+    assert_equal [{"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
+
+    get :search_friend, :profile => profile.identifier, :q => 'cri'
+
+    assert_equal [{"name" => friend1.name, "id" => friend1.id}].to_json, @response.body
+
+    get :search_friend, :profile => profile.identifier, :q => 'will'
+
+    assert_equal [{"name" => friend1.name, "id" => friend1.id}, {"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
+  end
+
+  should 'not include members in search friends profiles' do
+    community.add_admin(profile)
+    friend1 = create_user('willy').person
+    friend2 = create_user('william').person
+    friend1.save
+    friend2.save
+
+    community.add_member(friend2)
+
+    get :search_friend, :profile => community.identifier, :q => 'will'
+
+    assert_equal [{"name" => friend1.name, "id" => friend1.id}].to_json, @response.body
+  end
+
+  should 'search friends profiles by fields provided by plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def search_friend_fields
+        [{:field => 'nickname'}, {:field => 'contact_phone'}]
+      end
+    end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+
+    friend1 = create_user('harry').person
+    friend2 = create_user('william').person
+    friend1.nickname = 'prince'
+    friend2.contact_phone = '2222'
+    friend1.save
+    friend2.save
+
+    get :search_friend, :profile => profile.identifier, :q => 'prince'
+    assert_equal [{"name" => friend1.name, "id" => friend1.id}].to_json, @response.body
+
+    get :search_friend, :profile => profile.identifier, :q => '222'
+    assert_equal [{"name" => friend2.name, "id" => friend2.id}].to_json, @response.body
+  end
+
+  should 'invite registered users through profile id' do
+    friend1 = create_user('testuser1').person
+    friend2 = create_user('testuser2').person
+    assert_difference Delayed::Job, :count, 1 do
+      post :invite_registered_friend, :profile => profile.identifier, :q => "#{friend1.id},#{friend2.id}", :mail_template => "click: <url>"
+      assert_redirected_to :controller => 'profile', :action => 'friends'
+    end
+
+    assert_difference InviteFriend, :count, 2 do
+      process_delayed_job_queue
+    end
+  end
+
   private
   def json_response
@@ -213,7 +213,7 @@ class RoutingTest &lt; ActionController::IntegrationTest
   end
   def test_invite_routing
-    assert_routing('/profile/colivre/invite/friends', :controller => 'invite', :action => 'select_address_book', :profile => 'colivre')
+    assert_routing('/profile/colivre/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => 'colivre')
   end
   def test_chat_routing
@@ -72,6 +72,29 @@ class InvitationTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'do nothing if the invited friend is already your friend' do
+    person = create_user('person').person
+    invited_friend = create_user('invited_friend').person
+
+    invited_friend.add_friend(person)
+
+    assert_no_difference InviteFriend, :count do
+      Invitation.invite( person, [invited_friend.user.email], "", person )
+    end
+  end
+
+  should 'and yet be able to invite friends to community' do
+    person = create_user('person').person
+    invited_friend = create_user('invited_friend').person
+
+    invited_friend.add_friend(person)
+    community = fast_create(Community)
+
+    assert_difference InviteMember, :count do
+      Invitation.invite( person, [invited_friend.user.email], "", community )
+    end
+  end
+
   should 'add url on message if user removed it' do
     person = create_user('testuser1').person
     friend = create_user('testuser2').person
@@ -97,4 +120,37 @@ class InvitationTest &lt; ActiveSupport::TestCase
   should 'have a message with url' do
     assert_equal "\n\nTo accept invitation, please follow this link: <url>", Invitation.default_message_to_accept_invitation
   end
+
+  should 'invite friends through profile id' do
+    person = create_user('testuser1').person
+    friend = create_user('testuser2').person
+    community = fast_create(Community)
+
+    assert_difference InviteMember, :count do
+      Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', community)
+    end
+    assert_difference InviteFriend, :count do
+      Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', person)
+    end
+  end
+
+  should 'not invite friends if there is a pending invitation' do
+    person = create_user('testuser1').person
+    friend = create_user('testuser2').person
+    community = fast_create(Community)
+
+    assert_difference InviteMember, :count do
+      Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', community)
+    end
+    assert_difference InviteFriend, :count do
+      Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', person)
+    end
+
+    assert_no_difference InviteMember, :count do
+      Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', community)
+    end
+    assert_no_difference InviteFriend, :count do
+      Invitation.invite(person, [friend.id.to_s], 'hello friend <url>', person)
+    end
+  end
 end
@@ -22,6 +22,20 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     ok('friend is member of community') { community.members.include?(friend) }
   end
+  should 'cancel other invitations for same community when confirmed' do
+    friend = create_user('friend').person
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+    community = fast_create(Community)
+
+    task = InviteMember.create!(:person => p1, :friend => friend, :community_id => community.id)
+    InviteMember.create!(:person => p2, :friend => friend, :community_id => community.id)
+
+    assert_difference friend.tasks.pending, :count, -2 do
+      task.finish
+    end
+  end
+
   should 'require community (person inviting other to be a member)' do
     task = InviteMember.new
     task.valid?
@@ -78,11 +92,11 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     task = InviteMember.create!(:person => p1, :friend_email => 'test@test.com', :message => '<url>', :community_id => fast_create(Community).id)
   end
-  should 'not send e-mails to friend if target given (person being invited)' do
+  should 'send e-mails notification to friend if target given (person being invited)' do
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
-    TaskMailer.expects(:deliver_invitation_notification).never
+    TaskMailer.expects(:deliver_target_notification).once
     task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
   end
@@ -117,7 +131,8 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     assert_match(/#{task.requestor.name} invited you to join #{community.name}/, email.subject)
   end
-  should 'destroy InviteMember task when the community is destroyed' do    
+<<<<<<< HEAD
+  should 'destroy InviteMember task when the community is destroyed' do
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
     p3 = create_user('testuser3').person
@@ -131,5 +146,28 @@ class InviteMemberTest &lt; ActiveSupport::TestCase
     assert_raise ActiveRecord::RecordNotFound do; t2.reload; end
   end
-end
+  should 'have target notification message only if target given (person being invited)' do
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+
+    task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
+    assert_nothing_raised NotImplementedError do
+      task.target_notification_message
+    end
+
+    task = InviteMember.create!(:person => p1, :friend_email => 'test@test.com', :message => '<url>', :community_id => fast_create(Community).id)
+    assert_raise NotImplementedError do
+      task.target_notification_message
+    end
+  end
+  should 'deliver target notification message if target given (person being invited)' do
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+
+    task = InviteMember.create!(:person => p1, :friend => p2, :community_id => fast_create(Community).id)
+
+    email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
+    assert_match(/#{task.requestor.name} invited you to join #{task.community.name}/, email.subject)
+  end
+end
	@@ -4,8 +4,9 @@ class InviteController < PublicController		@@ -4,8 +4,9 @@ class InviteController < PublicController
4	before_filter :login_required	4	before_filter :login_required
5	before_filter :check_permissions_to_invite	5	before_filter :check_permissions_to_invite
6		6
7	- def select_address_book	7	+ def invite_friends
8	@import_from = params[:import_from] \|\| "manual"	8	@import_from = params[:import_from] \|\| "manual"
		9	+ @mail_template = params[:mail_template] \|\| environment.invitation_mail_template(profile)
9	if request.post?	10	if request.post?
10	contact_list = ContactList.create	11	contact_list = ContactList.create
11	Delayed::Job.enqueue GetEmailContactsJob.new(@import_from, params[:login], params[:password], contact_list.id) if @import_from != 'manual'	12	Delayed::Job.enqueue GetEmailContactsJob.new(@import_from, params[:login], params[:password], contact_list.id) if @import_from != 'manual'
	@@ -22,7 +23,7 @@ class InviteController < PublicController		@@ -22,7 +23,7 @@ class InviteController < PublicController
22	webmail_import_addresses = params[:webmail_import_addresses]	23	webmail_import_addresses = params[:webmail_import_addresses]
23	contacts_to_invite = Invitation.join_contacts(manual_import_addresses, webmail_import_addresses)	24	contacts_to_invite = Invitation.join_contacts(manual_import_addresses, webmail_import_addresses)
24	if !contacts_to_invite.empty?	25	if !contacts_to_invite.empty?
25	- Delayed::Job.enqueue InvitationJob.new(current_user.person.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)	26	+ Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, params[:mail_template], profile.id, @contact_list.id, locale)
26	session[:notice] = _('Your invitations are being sent.')	27	session[:notice] = _('Your invitations are being sent.')
27	if profile.person?	28	if profile.person?
28	redirect_to :controller => 'profile', :action => 'friends'	29	redirect_to :controller => 'profile', :action => 'friends'
	@@ -52,14 +53,42 @@ class InviteController < PublicController		@@ -52,14 +53,42 @@ class InviteController < PublicController
52	def cancel_fetching_emails	53	def cancel_fetching_emails
53	contact_list = ContactList.find(params[:contact_list])	54	contact_list = ContactList.find(params[:contact_list])
54	contact_list.destroy	55	contact_list.destroy
55	- redirect_to :action => 'select_address_book'	56	+ redirect_to :action => 'invite_friends'
		57	+ end
		58	+
		59	+ def invite_registered_friend
		60	+ contacts_to_invite = params['q'].split(',')
		61	+ if !contacts_to_invite.empty? && request.post?
		62	+ Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
		63	+ session[:notice] = _('Your invitations are being sent.')
		64	+ if profile.person?
		65	+ redirect_to :controller => 'profile', :action => 'friends'
		66	+ else
		67	+ redirect_to :controller => 'profile', :action => 'members'
		68	+ end
		69	+ return
		70	+ else
		71	+ redirect_to :action => 'invite_friends'
		72	+ session[:notice] = _('Please enter a valid profile.')
		73	+ end
		74	+ end
		75	+
		76	+ include InviteHelper
		77	+ helper :invite
		78	+
		79	+ def search_friend
		80	+ fields = %w[name identifier email] + plugins_options.map {\|field\| field[:field].to_s }
		81	+ values = ["%#{params['q']}%"] * fields.count
		82	+ render :text => environment.people.find(:all, :joins => ['INNER JOIN users ON profiles.user_id=users.id'], :conditions => [fields.map {\|field\| "LOWER(#{field}) LIKE ?"}.join(' OR '), *values]).
		83	+ select {\|person\| !profile.members.include?(person) }.
		84	+ map {\|person\| {:id => person.id, :name => person.name} }.to_json
56	end	85	end
57		86
58	protected	87	protected
59		88
60	def check_permissions_to_invite	89	def check_permissions_to_invite
61	- if profile.person? and !current_user.person.has_permission?(:manage_friends, profile) or
62	- profile.community? and !current_user.person.has_permission?(:invite_members, profile)	90	+ if profile.person? and !user.has_permission?(:manage_friends, profile) or
		91	+ profile.community? and !user.has_permission?(:invite_members, profile)
63	render_access_denied	92	render_access_denied
64	end	93	end
65	end	94	end
1	module InviteHelper	1	module InviteHelper
		2	+ def plugins_options
		3	+ @plugins.dispatch(:search_friend_fields)
		4	+ end
		5	+
		6	+ def search_friend_fields
		7	+ labels = [
		8	+ _('Name'),
		9	+ _('Username'),
		10	+ _('Email'),
		11	+ ] + plugins_options.map { \|options\| options[:name] }
		12	+
		13	+ last = labels.pop
		14	+ label = labels.join(', ')
		15	+ "#{label} #{_('or')} #{last}"
		16	+ end
2	end	17	end
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>	15	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
16	<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>	16	<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
17	<% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>	17	<% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
18	- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>	18	+ <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
19	<% end %>	19	<% end %>
20	<% end %>	20	<% end %>
21	<% end %>	21	<% end %>
	@@ -46,7 +46,7 @@		@@ -46,7 +46,7 @@
46	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>	46	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
47	<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>	47	<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
48	<% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>	48	<% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
49	- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>	49	+ <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
50	<% end %>	50	<% end %>
51	<% end %>	51	<% end %>
52	<% end %>	52	<% end %>
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+<br/>
	2	+
	3	+<%= link_to_function(_('Personalize invitation mail'), nil) do \|page\|
	4	+ page['invitation-mail_template'].show
	5	+end %>
	6	+
	7	+<div id='invitation-mail_template' style='display:none'>
	8	+ <%= h _("Now enter an invitation message. You must keep the <url> code in your invitation text. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
	9	+ <%= labelled_form_field(_('Invitation text:'), text_area_tag(:mail_template, mail_template, :cols => 72, :rows => 8)) %>
	10	+</div>
@@ -0,0 +1,41 @@		@@ -0,0 +1,41 @@
	1	+<% header \|\|='h2' %>
	2	+<<%= header %>><%= _('Step 1 of 2: Select address book') %></<%= header %>>
	3	+
	4	+<% form_tag do %>
	5	+
	6	+ <%= [
	7	+ radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
	8	+ radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
	9	+ radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
	10	+ radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
	11	+ ].join("\n<br/>\n") %>
	12	+
	13	+ <script type="text/javascript">
	14	+ function hide_invite_friend_login_password() {
	15	+ $('invite-friends-login-password').hide();
	16	+ }
	17	+ function show_invite_friend_login_password(option) {
	18	+ if (option == 'hotmail') {
	19	+ $('hotmail_username_tip').show();
	20	+ } else {
	21	+ $('hotmail_username_tip').hide();
	22	+ }
	23	+ $('invite-friends-login-password').show();
	24	+ $('login').focus();
	25	+ }
	26	+ </script>
	27	+ <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
	28	+ <div id='hotmail_username_tip'>
	29	+ <%= ui_icon('ui-icon-alert') %>
	30	+ <%= _('Please type your username in the format yourname@example.com') %>
	31	+ </div>
	32	+
	33	+ <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
	34	+ <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
	35	+ </div>
	36	+
	37	+ <% button_bar do %>
	38	+ <%= submit_button(:forward, _("Next")) %>
	39	+ <% end %>
	40	+ <p><%= _("We won't store your password or contact anyone without your permission.") %></p>
	41	+<% end %>
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+<% if profile.person? %>
	2	+ <h1><%= _('Invite your friends') %></h1>
	3	+<% else %>
	4	+ <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
	5	+<% end %>
	6	+
	7	+<% unless profile.person? %>
	8	+ <h2><%= _('Invite other registered users') %></h2>
	9	+ <p><%= _('You can search for user profiles and invite them to join this community.') %></p>
	10	+ <% form_tag :action => 'invite_registered_friend' do %>
	11	+ <% search_action = url_for(:action => 'search_friend') %>
	12	+ <%= token_input_field_tag(:q, 'search-friends', search_action,
	13	+ { :hint_text => _('Type in your friend\'s ') + search_friend_fields,
	14	+ :focus => false }) %>
	15	+
	16	+ <% button_bar do %>
	17	+ <%= submit_button('save', _('Invite'))%>
	18	+ <%= button('cancel', _('Cancel'), profile.url)%>
	19	+ <% end %>
	20	+ <% end %>
	21	+
	22	+ <br />
	23	+ <h2><%= _('Invite people from my e-mail contacts') %></h2>
	24	+ <% header = 'h3' %>
	25	+
	26	+<% end %>
	27	+
	28	+<%= render :partial => 'invite/select_address_book', :locals => {:header => header} %>
	29	+
	30	+<div id="loadingScreen"></div>
	@@ -1,51 +0,0 @@	@@ -1,51 +0,0 @@
1	-<% if profile.person? %>
2	- <h1><%= _('Invite your friends') %></h1>
3	-<% else %>
4	- <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
5	-<% end %>
6	-
7	-<h2><%= _('Step 1 of 2: Select address book') %></h2>
8	-
9	-<%= form_tag do %>
10	-
11	- <%= [
12	- radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
13	- radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
14	- radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
15	- radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
16	- ].join("\n<br/>\n") %>
17	-
18	- <script type="text/javascript">
19	- function hide_invite_friend_login_password() {
20	- $('invite-friends-login-password').hide();
21	- }
22	- function show_invite_friend_login_password(option) {
23	- if (option == 'hotmail') {
24	- $('hotmail_username_tip').show();
25	- } else {
26	- $('hotmail_username_tip').hide();
27	- }
28	- $('invite-friends-login-password').show();
29	- $('login').focus();
30	- }
31	- </script>
32	- <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
33	- <div id='hotmail_username_tip'>
34	- <%= ui_icon('ui-icon-alert') %>
35	- <%= _('Please type your username in the format yourname@example.com') %>
36	- </div>
37	-
38	- <%= labelled_form_field(_("Username") + ":", text_field_tag(:login, @login)) %>
39	- <%= labelled_form_field(_("Password") + ":", password_field_tag(:password)) %>
40	- </div>
41	-
42	- <% button_bar do %>
43	- <%= submit_button(:forward, _("Next")) %>
44	- <% end %>
45	- <p><%= _("We won't store your password or contact anyone without your permission.") %></p>
46	-<% end %>
47	-
48	-<div id="loadingScreen"></div>
49	-
50	-
51	-
	@@ -18,7 +18,7 @@		@@ -18,7 +18,7 @@
18	<%= button :back, _('Go back'), { :controller => 'profile' } %>	18	<%= button :back, _('Go back'), { :controller => 'profile' } %>
19	<% if user == profile %>	19	<% if user == profile %>
20	<%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>	20	<%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
21	- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>	21	+ <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'invite_friends') %>
22	<% end %>	22	<% end %>
23	<% end %>	23	<% end %>
24		24
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	<%= button :back, _('Back'), :controller => 'profile_editor' %>	2	<%= button :back, _('Back'), :controller => 'profile_editor' %>
3	<%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>	3	<%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>
4	<% if profile.community? and user.has_permission?(:invite_members, profile) %>	4	<% if profile.community? and user.has_permission?(:invite_members, profile) %>
5	- <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'select_address_book' %>	5	+ <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'invite_friends' %>
6	<% end %>	6	<% end %>
7	<% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>	7	<% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
8	<%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>	8	<%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
	@@ -67,7 +67,7 @@ Noosfero::Application.routes.draw do		@@ -67,7 +67,7 @@ Noosfero::Application.routes.draw do
67	match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/, :as => :catalog	67	match 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/, :as => :catalog
68		68
69	# invite	69	# invite
70	- match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'select_address_book', :profile => /#{Noosfero.identifier_format}/	70	+ match 'profile/:profile/invite/friends', :controller => 'invite', :action => 'invite_friends', :profile => /#{Noosfero.identifier_format}/
71	match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/	71	match 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/
72		72
73	# feeds per tag	73	# feeds per tag