Merge branch 'master' into rails3

Victor Costa
2 parents 56a0d4fa db82bf4c
Showing 27 changed files with 293 additions and 214 deletions Show diff stats
AUTHORS
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/mailers/user_mailer.rb
app/models/image.rb
app/models/user.rb
app/views/user/mailer/activation_email_notify.html.erb
app/views/user/mailer/signup_welcome_email.html.erb
app/views/user_mailer/activation_code.html.erb
app/views/user_mailer/activation_email_notify.html.erb
app/views/user_mailer/signup_welcome_email.html.erb
db/schema.rb
debian/changelog
features/clickable_images.feature
lib/noosfero.rb
lib/noosfero/plugin.rb
plugins/stoa/install.rb
plugins/stoa/lib/ext/person.rb
plugins/stoa/lib/stoa_plugin.rb
plugins/stoa/lib/stoa_plugin/person_api.rb
@@ -6,6 +6,7 @@ noosfero, that&#39;s not a problem).
 Developers
 ==========
+Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
 Alan Freihof Tygel <alantygel@gmail.com>
 alcampelo <alcampelo@alcampelo.(none)>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
@@ -43,6 +44,7 @@ Ana Losnak &lt;analosnak@gmail.com&gt;
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
+Arthur Del Esposte <arthurmde@gmail.com>
 Arthur Del Esposte <arthurmde@yahoo.com.br>
 Aurelio A. Heckert <aurelio@colivre.coop.br>
 Braulio Bhavamitra <brauliobo@gmail.com>
@@ -71,12 +73,14 @@ Caio Salgado + Renan Teruo &lt;caio.salgado@gmail.com&gt;
 Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
 Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
 Caio SBA <caio@colivre.coop.br>
+Caio Tiago Oliveira <caiotiago@colivre.coop.br>
 Carlos Andre de Souza <carlos.andre.souza@msn.com>
 Carlos Morais <carlos88morais@gmail.com>
 Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
 Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
+Daniela Feitosa <dani@dohko.(none)>
 Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
 Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
 Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
@@ -117,6 +121,8 @@ Diego Martinez &lt;diegoamc90@gmail.com&gt;
 Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
+Evandro Jr <evandrojr@gmail.com>
+Evandro Junior <evandrojr@gmail.com>
 Fabio Teixeira <fabio1079@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
@@ -132,6 +138,7 @@ Italo Valcy &lt;italo@dcc.ufba.br&gt;
 Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
+João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
 João da Silva <jaodsilv@linux.ime.usp.br>
 João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
 João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
@@ -166,6 +173,7 @@ Junior Silva &lt;junior@bajor.localhost.localdomain&gt;
 Junior Silva <juniorsilva1001@gmail.com>
 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
 Junior Silva <juniorsilva@colivre.coop.br>
+juniorsilva <juniorsilva@QonoS.localhost.localdomain>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
 Larissa Reis <reiss.larissa@gmail.com>
@@ -176,7 +184,9 @@ Leandro Nunes dos Santos &lt;leandro.santos@serpro.gov.br&gt;
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
 Lucas Melo <lucas@colivre.coop.br>
 Lucas Melo <lucaspradomelo@gmail.com>
+Luciano <lucianopcbr@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
+Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
 Marcos Ramos <ms.ramos@outlook.com>
 Martín Olivera <molivera@solar.org.ar>
 Moises Machado <moises@colivre.coop.br>
@@ -8,49 +8,31 @@ class ContentViewerController &lt; ApplicationController
   helper TagsHelper
   def view_page
-    path = params[:page]
-    path = path.join('/') if path.kind_of?(Array)
-    path = "#{path}.#{params[:format]}" if params[:format]
+    path = get_path(params[:page], params[:format])
+
     @version = params[:version].to_i
     if path.blank?
-      @page = profile.home_page
-      if @page.nil?
-        redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
-        return
-      end
+      @page = profile.home_page 
+      return if redirected_to_profile_index
     else
       @page = profile.articles.find_by_path(path)
-      unless @page
-        page_from_old_path = profile.articles.find_by_old_path(path)
-        if page_from_old_path
-          redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
-          return
-        end
-      end
+      return if redirected_page_from_old_path(path)
     end
     return unless allow_access_to_page(path)
     if @version > 0
       return render_access_denied unless @page.display_versions?
-      @versioned_article = @page.versions.find_by_version(@version)
-      if @versioned_article && @page.versions.latest.version != @versioned_article.version
-        render :template => 'content_viewer/versioned_article.html.erb'
-        return
-      end
+      return if rendered_versioned_article
     end
     redirect_to_translation and return if @page.profile.redirect_l10n
-    if request.post?
-      if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
-        @page.add_agreed_user(user)
-      end
-    elsif !@page.parent.nil? && @page.parent.forum?
-      unless @page.parent.agrees_with_terms?(user)
-        redirect_to @page.parent.url
-      end
+    if request.post? && @page.forum?
+      process_forum_terms_of_use(user, params[:terms_accepted])
+    elsif is_a_forum_topic?(@page)
+      redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)
     end
     # At this point the page will be showed
@@ -58,64 +40,22 @@ class ContentViewerController &lt; ApplicationController
     @page = FilePresenter.for @page
-    if @page.download? params[:view]
-      headers['Content-Type'] = @page.mime_type
-      headers.merge! @page.download_headers
-      data = @page.data
-
-      # TODO test the condition
-      if data.nil?
-        raise "No data for file"
-      end
-
-      render :text => data, :layout => false
-      return
-    end
+    return if rendered_file_download(params[:view])
     @form_div = params[:form]
     #FIXME see a better way to do this. It's not need to pass this variable anymore
     @comment = Comment.new
-    if @page.has_posts?
-      posts = if params[:year] and params[:month]
-        filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
-        @page.posts.by_range(filter_date..filter_date.at_end_of_month)
-      else
-        @page.posts
-      end
-
-      #FIXME Need to run this before the pagination because this version of
-      #      will_paginate returns a will_paginate collection instead of a
-      #      relation.
-      blog_with_translation = @page.blog? && @page.display_posts_in_current_language?
-      posts = posts.native_translations if blog_with_translation
-
-      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
-
-      if blog_with_translation
-        @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
-      end
-    end
+    process_page_posts(params)
     if @page.folder? && @page.gallery?
-      @images = @page.images.select{ |a| a.display_to? user }
-      @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
+      @images = get_images(@page, params[:npage], params[:slideshow])
     end
-    @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
-    if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
-      @page.followers -= [params[:email]]
-      if @page.save
-        session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
-      end
-    end
+    process_page_followers(params)
-    @comments = @page.comments.without_spam
-    @comments = @plugins.filter(:unavailable_comments, @comments)
-    @comments_count = @comments.count
-    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
-    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+    process_comments(params)
     if request.xhr? and params[:comment_order]
       if @comment_order == 'newest'
@@ -203,4 +143,127 @@ class ContentViewerController &lt; ApplicationController
     user_agent.match(/crawler/) ||
     user_agent.match(/\(.*https?:\/\/.*\)/)
   end
+
+  def get_path(page, format = nil)
+    path = page
+    path = path.join('/') if path.kind_of?(Array)
+    path = "#{path}.#{format}" if format
+
+    return path
+  end
+
+  def redirected_to_profile_index
+    if @page.nil?
+      redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
+      return true
+    end
+
+    return false
+  end
+
+  def redirected_page_from_old_path(path)
+    unless @page
+      page_from_old_path = profile.articles.find_by_old_path(path)
+      if page_from_old_path
+        redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
+        return true
+      end
+    end
+
+    return false
+  end
+
+  def process_forum_terms_of_use(user, terms_accepted = nil)
+    if @page.forum? && @page.has_terms_of_use && terms_accepted == "true"
+      @page.add_agreed_user(user)
+    end
+  end 
+
+  def is_a_forum_topic? (page)
+    return (!@page.parent.nil? && @page.parent.forum?)
+  end
+
+  def rendered_versioned_article
+    @versioned_article = @page.versions.find_by_version(@version)
+    if @versioned_article && @page.versions.latest.version != @versioned_article.version
+      render :template => 'content_viewer/versioned_article.html.erb'
+      return true
+    end
+
+    return false
+  end
+
+  def rendered_file_download(view = nil)
+    if @page.download? view
+      headers['Content-Type'] = @page.mime_type
+      headers.merge! @page.download_headers
+      data = @page.data
+
+      # TODO test the condition
+      if data.nil?
+        raise "No data for file"
+      end
+
+      render :text => data, :layout => false
+      return true
+    end
+
+    return false
+  end
+
+  def process_page_posts(params)
+    if @page.has_posts?
+      posts = get_posts(params[:year], params[:month])
+
+      #FIXME Need to run this before the pagination because this version of
+      #      will_paginate returns a will_paginate collection instead of a
+      #      relation.
+      posts = posts.native_translations if blog_with_translation?(@page)
+
+      @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
+
+      if blog_with_translation?(@page)
+        @posts.replace @posts.map{ |p| p.get_translation_to(FastGettext.locale) }.compact
+      end
+    end
+  end
+
+  def get_posts(year = nil, month = nil)
+    if year && month
+      filter_date = DateTime.parse("#{year}-#{month}-01")
+      return @page.posts.by_range(filter_date..filter_date.at_end_of_month)
+    else
+      return @page.posts
+    end
+  end
+
+  def blog_with_translation?(page)
+    return (page.blog? && page.display_posts_in_current_language?)
+  end
+
+  def get_images(page, npage, slideshow)
+    images = page.images.select{ |a| a.display_to? user }
+    images = images.paginate(:per_page => per_page, :page => npage) unless slideshow
+
+    return images
+  end
+
+  def process_page_followers(params)
+    @unfollow_form = params[:unfollow] == 'true'
+    if params[:unfollow] == 'commit' && request.post?
+      @page.followers -= [params[:email]]
+      if @page.save
+        session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
+      end
+    end
+  end
+
+  def process_comments(params)
+    @comments = @page.comments.without_spam
+    @comments = @plugins.filter(:unavailable_comments, @comments)
+    @comments_count = @comments.count
+    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
+    @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
+  end
+
 end
@@ -1002,17 +1002,26 @@ module ApplicationHelper
   def display_category_menu(block, categories, root = true)
     categories = categories.sort{|x,y| x.name <=> y.name}
     return "" if categories.blank?
-    content_tag(:ul,
+    content_tag(:ul) do
       categories.map do |category|
         category_path = category.kind_of?(ProductCategory) ? {:controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id} : { :controller => 'search', :action => 'category_index', :category_path => category.explode_path }
-        category.display_in_menu? ?
-        content_tag(:li,
-          ( !category.is_leaf_displayable_in_menu? ? content_tag(:a, collapsed_item_icon, :href => "#", :id => "block_#{block.id}_category_#{category.id}", :class => 'category-link-expand ' + (root ? 'category-root' : 'category-no-root'), :onclick => "expandCategory(#{block.id}, #{category.id}); return false", :style => 'display: none') : leaf_item_icon) +
-          link_to(content_tag(:span, category.name, :class => 'category-name'), category_path, :class => ("category-leaf" if category.is_leaf_displayable_in_menu?)) +
-          content_tag(:div, display_category_menu(block, category.children, false), :id => "block_#{block.id}_category_content_#{category.id}", :class => 'child-category')
-        ) : ''
-      end
-    ) +
+        if category.display_in_menu?
+          content_tag(:li) do
+            if !category.is_leaf_displayable_in_menu?
+              content_tag(:a, collapsed_item_icon, :href => "#", :id => "block_#{block.id}_category_#{category.id}", :class => "category-link-expand " + (root ? "category-root" : "category-no-root"), :onclick => "expandCategory(#{block.id}, #{category.id}); return false", :style => "display: none")
+            else
+              leaf_item_icon
+            end +
+            link_to(content_tag(:span, category.name, :class => "category-name"), category_path, :class => ("category-leaf" if category.is_leaf_displayable_in_menu?)) +
+            content_tag(:div, :id => "block_#{block.id}_category_content_#{category.id}", :class => 'child-category') do
+              display_category_menu(block, category.children, false)
+            end
+          end
+        else
+          ""
+        end
+      end.join.html_safe
+    end +
     content_tag(:p) +
     (root ? javascript_tag("
       jQuery('.child-category').hide();
@@ -1104,14 +1113,18 @@ module ApplicationHelper
   end
   def manage_enterprises
-    return unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
-    manage_link(user.enterprises, :enterprises)
+    return '' unless user && user.environment.enabled?(:display_my_enterprises_on_user_menu)
+    manage_link(user.enterprises, :enterprises).to_s
   end
   def manage_communities
-    return unless user && user.environment.enabled?(:display_my_communities_on_user_menu)
+    return '' unless user && user.environment.enabled?(:display_my_communities_on_user_menu)
     administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
-    manage_link(administered_communities, :communities)
+    manage_link(administered_communities, :communities).to_s
+  end
+
+  def admin_link
+    user.is_admin?(environment) ? link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', environment.admin_url, :title => _("Configure the environment"), :class => 'admin-link') : ''
   end
   def usermenu_logged_in
@@ -1123,9 +1136,9 @@ module ApplicationHelper
     (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
-    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.admin_url, :title => _("Configure the environment"), :class => 'admin-link') +
-    manage_enterprises.to_s +
-    manage_communities.to_s +
+    admin_link +
+    manage_enterprises +
+    manage_communities +
     link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :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"))
@@ -15,10 +15,12 @@ class UserMailer &lt; ActionMailer::Base
   end
   def activation_code(user)
-    @recipient = user.name,
+    @recipient = user.name
     @activation_code = user.activation_code
     @environment = user.environment.name
     @url = user.environment.top_url
+    @redirection = (true if user.return_to)
+    @join = (user.community_to_join if user.community_to_join)
     mail(
       from: "#{user.environment.name} <#{user.environment.contact_email}>",
@@ -25,4 +25,7 @@ class Image &lt; ActiveRecord::Base
   attr_accessible :uploaded_data
+  def current_data
+    File.file?(full_filename) ? File.read(full_filename) : nil
+  end
 end
@@ -66,45 +66,6 @@ class User &lt; ActiveRecord::Base
   # virtual attribute used to stash which community to join on signup or login
   attr_accessor :community_to_join
-  class Mailer < ActionMailer::Base
-    def activation_email_notify(user)
-      user_email = "#{user.login}@#{user.email_domain}"
-      recipients user_email
-      from "#{user.environment.name} <#{user.environment.noreply_email}>"
-      subject _("[%{environment}] Welcome to %{environment} mail!") % { :environment => user.environment.name }
-      body :name => user.name,
-        :email => user_email,
-        :webmail => MailConf.webmail_url(user.login, user.email_domain),
-        :environment => user.environment.name,
-        :url => url_for(:host => user.environment.default_hostname, :controller => 'home')
-    end
-
-    def activation_code(user)
-      recipients user.email
-
-      from "#{user.environment.name} <#{user.environment.noreply_email}>"
-      subject _("[%s] Activate your account") % [user.environment.name]
-      body :recipient => user.name,
-        :activation_code => user.activation_code,
-        :environment => user.environment.name,
-        :url => user.environment.top_url,
-        :redirection => (true if user.return_to),
-        :join => (user.community_to_join if user.community_to_join)
-    end
-
-    def signup_welcome_email(user)
-      email_body = user.environment.signup_welcome_text_body.gsub('{user_name}', user.name)
-      email_subject = user.environment.signup_welcome_text_subject
-
-      content_type 'text/html'
-      recipients user.email
-
-      from "#{user.environment.name} <#{user.environment.noreply_email}>"
-      subject email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject
-      body email_body
-    end
-  end
-
   def signup!
     User.transaction do
       self.save!
@@ -1,12 +0,0 @@
-<%= _('Hello %s,') % @name  %>
-
-<%= _('Your email %s was just activated.') % [@email] %>
-
-<%= _('You can access your e-mail from anywhere, using the following address:') %>
-<%= @webmail %>
-
-<%= _('Greetings,') %>
-
---
-<%= _('%s team.') % @environment %>
-<%= @url %>
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  </head>
-  <body>
-    <p><%= word_wrap @body %></p>
-  </body>
-</html>
@@ -0,0 +1,9 @@
+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
+
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
@@ -0,0 +1,12 @@
+<%= _('Hello %s,') % @name  %>
+
+<%= _('Your email %s was just activated.') % [@email] %>
+
+<%= _('You can access your e-mail from anywhere, using the following address:') %>
+<%= @webmail %>
+
+<%= _('Greetings,') %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= @url %>
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  </head>
+  <body>
+    <p><%= word_wrap @body %></p>
+  </body>
+</html>
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140415125414) do
+ActiveRecord::Schema.define(:version => 20140605222753) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
+noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
+
+  * Another rc with rails3
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 18 Jun 2014 20:25:01 +0000
+
 noosfero (0.47.1) unstable; urgency=low
   * Bugfix release
@@ -14,6 +14,7 @@ Feature: clickable images
       | owner   | name  | image     | dimensions |
       | booking | small | rails.png | 20x20      |
     When I go to /booking/small
+    And display ".zoomify-image"
     Then I should see "Zoom in"
   @selenium
@@ -22,6 +23,7 @@ Feature: clickable images
       | owner   | name | image     | dimensions |
       | booking | real | rails.png | 50x64      |
     When I go to /booking/real
+    And display ".zoomify-image"
     Then "Zoom in" should not be visible within "a#zoomify-image"
   @selenium
@@ -30,6 +32,7 @@ Feature: clickable images
       | owner   | name    | image     |
       | booking | not set | rails.png |
     When I go to /booking/not-set
+    And display ".zoomify-image"
     Then "Zoom in" should not be visible within "a#zoomify-image"
   @selenium-fixme
@@ -3,7 +3,7 @@
 require 'fast_gettext'
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.47.1'
+  VERSION = '0.99.0~rc20140618202455'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -395,7 +395,7 @@ class Noosfero::Plugin
   end
   # -> Adds fields to the signup form
-  # returns = lambda block that creates html code
+  # returns = proc that creates html code
   def signup_extra_contents
     nil
   end
@@ -470,7 +470,7 @@ class Noosfero::Plugin
   end
   # -> Adds fields to the login form
-  # returns = lambda block that creates html code
+  # returns = proc that creates html code
   def login_extra_contents
     nil
   end
 require 'fileutils'
-config_path = File.join('plugins', 'stoa', 'config.yml')
-config_template = File.join('plugins', 'stoa', 'config.yml.dist')
+config_path = File.join(File.dirname(__FILE__), 'config.yml')
+config_template = File.join(File.dirname(__FILE__), 'config.yml.dist')
 FileUtils.cp(config_template, config_path) if !File.exist?(config_path)
 require_dependency 'person'
 class Person
+  attr_accessible :usp_id, :invitation_code
+
   validates_uniqueness_of :usp_id, :allow_nil => true
   settings_items :invitation_code
   validate :usp_id_or_invitation, :if => lambda { |person| person.environment && person.environment.plugin_enabled?(StoaPlugin)}
@@ -2,8 +2,6 @@ require_dependency &#39;person&#39;
 class StoaPlugin < Noosfero::Plugin
-  Person.human_names[:usp_id] = _('USP number')
-
   def self.plugin_name
     "Stoa"
   end
@@ -17,7 +15,7 @@ class StoaPlugin &lt; Noosfero::Plugin
   end
   def signup_extra_contents
-    lambda {
+    proc {
       content_tag(:div, labelled_form_field(_('USP number'), text_field(:profile_data, :usp_id, :id => 'usp_id_field')) +
       content_tag(:small, _('The usp id grants you special powers in the network. Don\'t forget to fill it with a valid number if you have one.'), :id => 'usp-id-balloon') +
       content_tag('p', _("Either this usp number is being used by another user or is not valid"), :id => 'usp-id-invalid') +
@@ -45,7 +43,7 @@ class StoaPlugin &lt; Noosfero::Plugin
   end
   def login_extra_contents
-    lambda {
+    proc {
       content_tag('div', labelled_form_field(_('USP number / Username'), text_field_tag('usp_id_login', '', :id => 'stoa_field_login')) +
       labelled_form_field(_('Password'), password_field_tag('password', '', :id => 'stoa_field_password')), :id => 'stoa-login-fields')
     }
@@ -62,14 +60,13 @@ class StoaPlugin &lt; Noosfero::Plugin
   end
   def account_controller_filters
-    environment = context.environment
-    block = lambda do
+    block = lambda do |context|
       params[:profile_data] ||= {}
       params[:profile_data][:invitation_code] = params[:invitation_code]
       invitation = Task.pending.find(:first, :conditions => {:code => params[:invitation_code]})
       if request.post?
         if !invitation && !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
-          @person = Person.new(:environment => environment)
+          @person = Person.new(:environment => context.environment)
           @person.errors.add(:usp_id, _(' validation failed'))
           render :action => :signup
         end
@@ -83,7 +80,7 @@ class StoaPlugin &lt; Noosfero::Plugin
   end
   def profile_editor_controller_filters
-    block = lambda do
+    block = proc do
       if request.post?
         if !params[:profile_data][:usp_id].blank? && !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
           @profile_data = profile
@@ -106,7 +103,7 @@ class StoaPlugin &lt; Noosfero::Plugin
   def invite_controller_filters
     [{ :type => 'before_filter',
       :method_name => 'check_usp_id_existence',
-      :block => lambda {render_access_denied if !user || user.usp_id.blank?} }]
+      :block => proc {render_access_denied if !user || user.usp_id.blank?} }]
   end
   def control_panel_buttons
@@ -28,7 +28,7 @@ class StoaPlugin::PersonApi &lt; Noosfero::FieldsDecorator
   end
   def tags
-    articles.published.tag_counts({:order => 'tags.count desc', :limit => 10}).inject({}) do |memo,tag|
+    articles.published.tag_counts({:order => 'count desc', :limit => 10}).inject({}) do |memo,tag|
       memo[tag.name] = tag.count
       memo
     end
@@ -3,7 +3,7 @@ class StoaPlugin::UspUser &lt; ActiveRecord::Base
   establish_connection(:stoa)
   set_table_name('pessoa')
-  SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt']
+  SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
   alias_attribute :cpf, :numcpf
   alias_attribute :birth_date, :dtanas
@@ -6,32 +6,29 @@ class AccountController; def rescue_action(e) raise e end; end
 class AccountControllerTest < ActionController::TestCase
-  SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt']
+  SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
+
+  @db = Tempfile.new('stoa-test')
+  configs = ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => @db.path}
+  ActiveRecord::Base.establish_connection(:stoa)
+  ActiveRecord::Schema.verbose = false
+  ActiveRecord::Schema.create_table "pessoa" do |t|
+    t.integer  "codpes"
+    t.text     "numcpf"
+    t.date     "dtanas"
+  end
+  ActiveRecord::Base.establish_connection(:test)
   def setup
     @controller = AccountController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @db = Tempfile.new('stoa-test')
-    configs = ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => @db.path}
-    ActiveRecord::Base.establish_connection(:stoa)
-    ActiveRecord::Schema.verbose = false
-    ActiveRecord::Schema.create_table "pessoa" do |t|
-      t.integer  "codpes"
-      t.text     "numcpf"
-      t.date     "dtanas"
-    end
-    ActiveRecord::Base.establish_connection(:test)
-    StoaPlugin::UspUser.create!(:codpes => 12345678, :cpf => Digest::MD5.hexdigest(SALT+'12345678'), :birth_date => '1970-01-30')
+    StoaPlugin::UspUser.create!({:codpes => 12345678, :cpf => Digest::MD5.hexdigest(SALT+'12345678'), :birth_date => '1970-01-30'}, :without_protection => true)
     Environment.default.enable_plugin(StoaPlugin.name)
     @user = create_user('joao-stoa', {:password => 'pass', :password_confirmation => 'pass'},:usp_id=>'87654321')
     @user.activate
   end
-  def teardown
-    @db.unlink
-  end
-
   should 'fail if confirmation value doesn\'t match' do
     #StoaPlugin::UspUser.stubs(:matches?).returns(false)
     post :signup, :profile_data => {:usp_id => '12345678'}, :confirmation_field => 'cpf', :cpf => '00000000'
@@ -41,10 +38,10 @@ class AccountControllerTest &lt; ActionController::TestCase
   should 'pass if confirmation value matches' do
     #StoaPlugin::UspUser.stubs(:matches?).returns(true)
     post :signup, :profile_data => {:usp_id => '12345678'}, :confirmation_field => 'cpf', :cpf => '12345678'
-    assert_nil assigns(:person).errors[:usp_id]
+    assert !assigns(:person).errors.include?(:usp_id)
   end
-  should 'inlude invitation_code param in the persons attributes' do
+  should 'include invitation_code param in the persons attributes' do
     get :signup, :invitation_code => 12345678
     assert assigns(:person).invitation_code == '12345678'
   end
@@ -6,7 +6,7 @@ class ProfileEditorController; def rescue_action(e) raise e end; end
 class StoaPluginProfileEditorControllerTest < ActionController::TestCase
-  SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt']
+  SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
   def setup
     @controller = ProfileEditorController.new
@@ -45,7 +45,7 @@ class StoaPluginProfileEditorControllerTest &lt; ActionController::TestCase
   should 'display error if usp_id does not match with supplied confirmation' do
     StoaPlugin::UspUser.stubs(:matches?).returns(false)
     post :edit, :profile => person.identifier, :profile_data => {:usp_id => 12345678}, :confirmation_field => 'cpf', :cpf => 99999999
-    assert assigns(:profile_data).errors.invalid?(:usp_id)
+    assert assigns(:profile_data).errors.include?(:usp_id)
   end
   should 'save usp_id if everyhtings is ok' do
@@ -6,7 +6,7 @@ class StoaPluginController; def rescue_action(e) raise e end; end
 class StoaPluginControllerTest < ActionController::TestCase
-  SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt']
+  SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
   def setup
     @controller = StoaPluginController.new
@@ -18,6 +18,7 @@ class StoaPluginControllerTest &lt; ActionController::TestCase
     env.enable('skip_new_user_email_confirmation')
     env.save!
     @user = create_user_full('real_user', {:password => '123456', :password_confirmation => '123456'}, {:usp_id => 9999999})
+    @user.activate
   end
   attr_accessor :user
@@ -15,7 +15,7 @@ class StoaPlugin::Person &lt; ActiveSupport::TestCase
     another_person = Person.new(:usp_id => usp_id)
     another_person.valid?
-    assert another_person.errors.invalid?(:usp_id)
+    assert another_person.errors.include?(:usp_id)
   end
   should 'not allow usp_id as an empty string' do
@@ -28,17 +28,17 @@ class StoaPlugin::Person &lt; ActiveSupport::TestCase
   should 'allow nil usp_id only if person has an invitation_code or is a template' do
     person = Person.new(:environment => environment)
     person.valid?
-    assert person.errors.invalid?(:usp_id)
+    assert person.errors.include?(:usp_id)
     Task.create!(:code => 12345678)
     person.invitation_code = 12345678
     person.valid?
-    assert !person.errors.invalid?(:usp_id)
+    assert !person.errors.include?(:usp_id)
     person.invitation_code = nil
     person.is_template = true
     person.valid?
-    assert !person.errors.invalid?(:usp_id)
+    assert !person.errors.include?(:usp_id)
   end
   should 'allow multiple nil usp_id' do
@@ -47,7 +47,7 @@ class StoaPlugin::Person &lt; ActiveSupport::TestCase
     person = Person.new(:invitation_code => 87654321)
     person.valid?
-    assert !person.errors.invalid?(:usp_id)
+    assert !person.errors.include?(:usp_id)
   end
   should 'not allow person to be saved with a finished invitation that is not his own' do
@@ -56,7 +56,7 @@ class StoaPlugin::Person &lt; ActiveSupport::TestCase
     person = Person.new(:environment => environment, :invitation_code => 87654321)
     person.valid?
-    assert person.errors.invalid?(:usp_id)
+    assert person.errors.include?(:usp_id)
   end
   should 'allow person to be saved with a finished invitation if it is his own' do
@@ -68,7 +68,7 @@ class StoaPlugin::Person &lt; ActiveSupport::TestCase
     t.finish
     person.valid?
-    assert !person.errors.invalid?(:usp_id)
+    assert !person.errors.include?(:usp_id)
   end
@@ -2,24 +2,21 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
 class StoaPlugin::UspUserTest < ActiveSupport::TestCase
-  SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt']
-
-  def setup
-    @db = Tempfile.new('stoa-test')
-    configs = ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => @db.path}
-    ActiveRecord::Base.establish_connection(:stoa)
-    ActiveRecord::Schema.verbose = false
-    ActiveRecord::Schema.create_table "pessoa" do |t|
-      t.integer  "codpes"
-      t.text     "numcpf"
-      t.date     "dtanas"
-    end
-    ActiveRecord::Base.establish_connection(:test)
-    StoaPlugin::UspUser.create!(:codpes => 123456, :cpf => Digest::MD5.hexdigest(SALT+'12345678'), :birth_date => '1970-01-30')
+  SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
+
+  @db = Tempfile.new('stoa-test')
+  configs = ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => @db.path}
+  ActiveRecord::Base.establish_connection(:stoa)
+  ActiveRecord::Schema.verbose = false
+  ActiveRecord::Schema.create_table "pessoa" do |t|
+    t.integer  "codpes"
+    t.text     "numcpf"
+    t.date     "dtanas"
   end
+  ActiveRecord::Base.establish_connection(:test)
-  def teardown
-    @db.unlink
+  def setup
+    StoaPlugin::UspUser.create({:codpes => 123456, :cpf => Digest::MD5.hexdigest(SALT+'12345678'), :birth_date => '1970-01-30'}, :without_protection => true)
   end
   should 'check existence of usp_id' do
@@ -48,4 +45,3 @@ class StoaPlugin::UspUserTest &lt; ActiveSupport::TestCase
     assert  !StoaPlugin::UspUser.matches?(123456, nil, '00012345678')
   end
 end
-
@@ -606,6 +606,22 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal 'Open chat', render_environment_features(:usermenu)
   end
+  should 'not inlude administration link if user is not an environment administrator' do
+    user = mock()
+    stubs(:environment).returns(Environment.default)
+    user.stubs(:is_admin?).with(environment).returns(false)
+    stubs(:user).returns(user)
+    assert admin_link.blank?
+  end
+
+  should 'inlude administration link if user is an environment administrator' do
+    user = mock()
+    stubs(:environment).returns(Environment.default)
+    user.stubs(:is_admin?).with(environment).returns(true)
+    stubs(:user).returns(user)
+    assert admin_link.present?
+  end
+
   should 'not return mime type of profile icon if not requested' do
     stubs(:profile).returns(Person.new)
     stubs(:current_theme).returns('default')
	@@ -8,49 +8,31 @@ class ContentViewerController < ApplicationController		@@ -8,49 +8,31 @@ class ContentViewerController < ApplicationController
8	helper TagsHelper	8	helper TagsHelper
9		9
10	def view_page	10	def view_page
11	- path = params[:page]
12	- path = path.join('/') if path.kind_of?(Array)
13	- path = "#{path}.#{params[:format]}" if params[:format]	11	+ path = get_path(params[:page], params[:format])
		12	+
14	@version = params[:version].to_i	13	@version = params[:version].to_i
15		14
16	if path.blank?	15	if path.blank?
17	- @page = profile.home_page
18	- if @page.nil?
19	- redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
20	- return
21	- end	16	+ @page = profile.home_page
		17	+ return if redirected_to_profile_index
22	else	18	else
23	@page = profile.articles.find_by_path(path)	19	@page = profile.articles.find_by_path(path)
24	- unless @page
25	- page_from_old_path = profile.articles.find_by_old_path(path)
26	- if page_from_old_path
27	- redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
28	- return
29	- end
30	- end	20	+ return if redirected_page_from_old_path(path)
31	end	21	end
32		22
33	return unless allow_access_to_page(path)	23	return unless allow_access_to_page(path)
34		24
35	if @version > 0	25	if @version > 0
36	return render_access_denied unless @page.display_versions?	26	return render_access_denied unless @page.display_versions?
37	- @versioned_article = @page.versions.find_by_version(@version)
38	- if @versioned_article && @page.versions.latest.version != @versioned_article.version
39	- render :template => 'content_viewer/versioned_article.html.erb'
40	- return
41	- end	27	+ return if rendered_versioned_article
42	end	28	end
43		29
44	redirect_to_translation and return if @page.profile.redirect_l10n	30	redirect_to_translation and return if @page.profile.redirect_l10n
45		31
46	- if request.post?
47	- if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
48	- @page.add_agreed_user(user)
49	- end
50	- elsif !@page.parent.nil? && @page.parent.forum?
51	- unless @page.parent.agrees_with_terms?(user)
52	- redirect_to @page.parent.url
53	- end	32	+ if request.post? && @page.forum?
		33	+ process_forum_terms_of_use(user, params[:terms_accepted])
		34	+ elsif is_a_forum_topic?(@page)
		35	+ redirect_to @page.parent.url unless @page.parent.agrees_with_terms?(user)
54	end	36	end
55		37
56	# At this point the page will be showed	38	# At this point the page will be showed
	@@ -58,64 +40,22 @@ class ContentViewerController < ApplicationController		@@ -58,64 +40,22 @@ class ContentViewerController < ApplicationController
58		40
59	@page = FilePresenter.for @page	41	@page = FilePresenter.for @page
60		42
61	- if @page.download? params[:view]
62	- headers['Content-Type'] = @page.mime_type
63	- headers.merge! @page.download_headers
64	- data = @page.data
65	-
66	- # TODO test the condition
67	- if data.nil?
68	- raise "No data for file"
69	- end
70	-
71	- render :text => data, :layout => false
72	- return
73	- end	43	+ return if rendered_file_download(params[:view])
74		44
75	@form_div = params[:form]	45	@form_div = params[:form]
76		46
77	#FIXME see a better way to do this. It's not need to pass this variable anymore	47	#FIXME see a better way to do this. It's not need to pass this variable anymore
78	@comment = Comment.new	48	@comment = Comment.new
79		49
80	- if @page.has_posts?
81	- posts = if params[:year] and params[:month]
82	- filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
83	- @page.posts.by_range(filter_date..filter_date.at_end_of_month)
84	- else
85	- @page.posts
86	- end
87	-
88	- #FIXME Need to run this before the pagination because this version of
89	- # will_paginate returns a will_paginate collection instead of a
90	- # relation.
91	- blog_with_translation = @page.blog? && @page.display_posts_in_current_language?
92	- posts = posts.native_translations if blog_with_translation
93	-
94	- @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
95	-
96	- if blog_with_translation
97	- @posts.replace @posts.map{ \|p\| p.get_translation_to(FastGettext.locale) }.compact
98	- end
99	- end	50	+ process_page_posts(params)
100		51
101	if @page.folder? && @page.gallery?	52	if @page.folder? && @page.gallery?
102	- @images = @page.images.select{ \|a\| a.display_to? user }
103	- @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]	53	+ @images = get_images(@page, params[:npage], params[:slideshow])
104	end	54	end
105		55
106	- @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
107	- if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
108	- @page.followers -= [params[:email]]
109	- if @page.save
110	- session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
111	- end
112	- end	56	+ process_page_followers(params)
113		57
114	- @comments = @page.comments.without_spam
115	- @comments = @plugins.filter(:unavailable_comments, @comments)
116	- @comments_count = @comments.count
117	- @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
118	- @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]	58	+ process_comments(params)
119		59
120	if request.xhr? and params[:comment_order]	60	if request.xhr? and params[:comment_order]
121	if @comment_order == 'newest'	61	if @comment_order == 'newest'
	@@ -203,4 +143,127 @@ class ContentViewerController < ApplicationController		@@ -203,4 +143,127 @@ class ContentViewerController < ApplicationController
203	user_agent.match(/crawler/) \|\|	143	user_agent.match(/crawler/) \|\|
204	user_agent.match(/\(.https?:\/\/.\)/)	144	user_agent.match(/\(.https?:\/\/.\)/)
205	end	145	end
		146	+
		147	+ def get_path(page, format = nil)
		148	+ path = page
		149	+ path = path.join('/') if path.kind_of?(Array)
		150	+ path = "#{path}.#{format}" if format
		151	+
		152	+ return path
		153	+ end
		154	+
		155	+ def redirected_to_profile_index
		156	+ if @page.nil?
		157	+ redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
		158	+ return true
		159	+ end
		160	+
		161	+ return false
		162	+ end
		163	+
		164	+ def redirected_page_from_old_path(path)
		165	+ unless @page
		166	+ page_from_old_path = profile.articles.find_by_old_path(path)
		167	+ if page_from_old_path
		168	+ redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
		169	+ return true
		170	+ end
		171	+ end
		172	+
		173	+ return false
		174	+ end
		175	+
		176	+ def process_forum_terms_of_use(user, terms_accepted = nil)
		177	+ if @page.forum? && @page.has_terms_of_use && terms_accepted == "true"
		178	+ @page.add_agreed_user(user)
		179	+ end
		180	+ end
		181	+
		182	+ def is_a_forum_topic? (page)
		183	+ return (!@page.parent.nil? && @page.parent.forum?)
		184	+ end
		185	+
		186	+ def rendered_versioned_article
		187	+ @versioned_article = @page.versions.find_by_version(@version)
		188	+ if @versioned_article && @page.versions.latest.version != @versioned_article.version
		189	+ render :template => 'content_viewer/versioned_article.html.erb'
		190	+ return true
		191	+ end
		192	+
		193	+ return false
		194	+ end
		195	+
		196	+ def rendered_file_download(view = nil)
		197	+ if @page.download? view
		198	+ headers['Content-Type'] = @page.mime_type
		199	+ headers.merge! @page.download_headers
		200	+ data = @page.data
		201	+
		202	+ # TODO test the condition
		203	+ if data.nil?
		204	+ raise "No data for file"
		205	+ end
		206	+
		207	+ render :text => data, :layout => false
		208	+ return true
		209	+ end
		210	+
		211	+ return false
		212	+ end
		213	+
		214	+ def process_page_posts(params)
		215	+ if @page.has_posts?
		216	+ posts = get_posts(params[:year], params[:month])
		217	+
		218	+ #FIXME Need to run this before the pagination because this version of
		219	+ # will_paginate returns a will_paginate collection instead of a
		220	+ # relation.
		221	+ posts = posts.native_translations if blog_with_translation?(@page)
		222	+
		223	+ @posts = posts.paginate({ :page => params[:npage], :per_page => @page.posts_per_page }.merge(Article.display_filter(user, profile))).to_a
		224	+
		225	+ if blog_with_translation?(@page)
		226	+ @posts.replace @posts.map{ \|p\| p.get_translation_to(FastGettext.locale) }.compact
		227	+ end
		228	+ end
		229	+ end
		230	+
		231	+ def get_posts(year = nil, month = nil)
		232	+ if year && month
		233	+ filter_date = DateTime.parse("#{year}-#{month}-01")
		234	+ return @page.posts.by_range(filter_date..filter_date.at_end_of_month)
		235	+ else
		236	+ return @page.posts
		237	+ end
		238	+ end
		239	+
		240	+ def blog_with_translation?(page)
		241	+ return (page.blog? && page.display_posts_in_current_language?)
		242	+ end
		243	+
		244	+ def get_images(page, npage, slideshow)
		245	+ images = page.images.select{ \|a\| a.display_to? user }
		246	+ images = images.paginate(:per_page => per_page, :page => npage) unless slideshow
		247	+
		248	+ return images
		249	+ end
		250	+
		251	+ def process_page_followers(params)
		252	+ @unfollow_form = params[:unfollow] == 'true'
		253	+ if params[:unfollow] == 'commit' && request.post?
		254	+ @page.followers -= [params[:email]]
		255	+ if @page.save
		256	+ session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
		257	+ end
		258	+ end
		259	+ end
		260	+
		261	+ def process_comments(params)
		262	+ @comments = @page.comments.without_spam
		263	+ @comments = @plugins.filter(:unavailable_comments, @comments)
		264	+ @comments_count = @comments.count
		265	+ @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
		266	+ @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
		267	+ end
		268	+
206	end	269	end
	@@ -25,4 +25,7 @@ class Image < ActiveRecord::Base		@@ -25,4 +25,7 @@ class Image < ActiveRecord::Base
25		25
26	attr_accessible :uploaded_data	26	attr_accessible :uploaded_data
27		27
		28	+ def current_data
		29	+ File.file?(full_filename) ? File.read(full_filename) : nil
		30	+ end
28	end	31	end
	@@ -66,45 +66,6 @@ class User < ActiveRecord::Base		@@ -66,45 +66,6 @@ class User < ActiveRecord::Base
66	# virtual attribute used to stash which community to join on signup or login	66	# virtual attribute used to stash which community to join on signup or login
67	attr_accessor :community_to_join	67	attr_accessor :community_to_join
68		68
69	- class Mailer < ActionMailer::Base
70	- def activation_email_notify(user)
71	- user_email = "#{user.login}@#{user.email_domain}"
72	- recipients user_email
73	- from "#{user.environment.name} <#{user.environment.noreply_email}>"
74	- subject _("[%{environment}] Welcome to %{environment} mail!") % { :environment => user.environment.name }
75	- body :name => user.name,
76	- :email => user_email,
77	- :webmail => MailConf.webmail_url(user.login, user.email_domain),
78	- :environment => user.environment.name,
79	- :url => url_for(:host => user.environment.default_hostname, :controller => 'home')
80	- end
81	-
82	- def activation_code(user)
83	- recipients user.email
84	-
85	- from "#{user.environment.name} <#{user.environment.noreply_email}>"
86	- subject _("[%s] Activate your account") % [user.environment.name]
87	- body :recipient => user.name,
88	- :activation_code => user.activation_code,
89	- :environment => user.environment.name,
90	- :url => user.environment.top_url,
91	- :redirection => (true if user.return_to),
92	- :join => (user.community_to_join if user.community_to_join)
93	- end
94	-
95	- def signup_welcome_email(user)
96	- email_body = user.environment.signup_welcome_text_body.gsub('{user_name}', user.name)
97	- email_subject = user.environment.signup_welcome_text_subject
98	-
99	- content_type 'text/html'
100	- recipients user.email
101	-
102	- from "#{user.environment.name} <#{user.environment.noreply_email}>"
103	- subject email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject
104	- body email_body
105	- end
106	- end
107	-
108	def signup!	69	def signup!
109	User.transaction do	70	User.transaction do
110	self.save!	71	self.save!
	@@ -1,12 +0,0 @@	@@ -1,12 +0,0 @@
1	-<%= _('Hello %s,') % @name %>
2	-
3	-<%= _('Your email %s was just activated.') % [@email] %>
4	-
5	-<%= _('You can access your e-mail from anywhere, using the following address:') %>
6	-<%= @webmail %>
7	-
8	-<%= _('Greetings,') %>
9	-
10	---
11	-<%= _('%s team.') % @environment %>
12	-<%= @url %>
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-<!DOCTYPE html>
2	-<html>
3	- <head>
4	- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
5	- </head>
6	- <body>
7	- <p><%= word_wrap @body %></p>
8	- </body>
9	-</html>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
	2	+
	3	+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
	4	+
	5	+<%= _("Greetings,") %>
	6	+
	7	+--
	8	+<%= _('%s team.') % @environment %>
	9	+<%= url_for @url %>
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+<%= _('Hello %s,') % @name %>
	2	+
	3	+<%= _('Your email %s was just activated.') % [@email] %>
	4	+
	5	+<%= _('You can access your e-mail from anywhere, using the following address:') %>
	6	+<%= @webmail %>
	7	+
	8	+<%= _('Greetings,') %>
	9	+
	10	+--
	11	+<%= _('%s team.') % @environment %>
	12	+<%= @url %>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<!DOCTYPE html>
	2	+<html>
	3	+ <head>
	4	+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
	5	+ </head>
	6	+ <body>
	7	+ <p><%= word_wrap @body %></p>
	8	+ </body>
	9	+</html>
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	#	11	#
12	# It's strongly recommended to check this file into your version control system.	12	# It's strongly recommended to check this file into your version control system.
13		13
14	-ActiveRecord::Schema.define(:version => 20140415125414) do	14	+ActiveRecord::Schema.define(:version => 20140605222753) do
15		15
16	create_table "abuse_reports", :force => true do \|t\|	16	create_table "abuse_reports", :force => true do \|t\|
17	t.integer "reporter_id"	17	t.integer "reporter_id"
		1	+noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
		2	+
		3	+ * Another rc with rails3
		4	+
		5	+ -- Rodrigo Souto <rodrigo@colivre.coop.br> Wed, 18 Jun 2014 20:25:01 +0000
		6	+
1	noosfero (0.47.1) unstable; urgency=low	7	noosfero (0.47.1) unstable; urgency=low
2		8
3	* Bugfix release	9	* Bugfix release