Commit 928dbe2e759c59c941cda05d5070818dd90092f5
Exists in
staging
and in
1 other branch
Merge branch 'master' into staging
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
plugins/spaminator/lib/spaminator_plugin/mailer.rb
| @@ -2,14 +2,14 @@ class SpaminatorPlugin::Mailer < Noosfero::Plugin::MailerBase | @@ -2,14 +2,14 @@ class SpaminatorPlugin::Mailer < Noosfero::Plugin::MailerBase | ||
| 2 | 2 | ||
| 3 | include Rails.application.routes.url_helpers | 3 | include Rails.application.routes.url_helpers |
| 4 | def inactive_person_notification(person) | 4 | def inactive_person_notification(person) |
| 5 | + @person = person | ||
| 6 | + @environment = person.environment | ||
| 7 | + @url = url_for(:host => person.default_hostname, :controller => 'account', :action => 'forgot_password') | ||
| 5 | mail( | 8 | mail( |
| 6 | :to => person.email, | 9 | :to => person.email, |
| 7 | :from => "#{person.environment.name} <#{person.environment.noreply_email}>", | 10 | :from => "#{person.environment.name} <#{person.environment.noreply_email}>", |
| 8 | :subject => _("[%s] You must reactivate your account.") % person.environment.name, | 11 | :subject => _("[%s] You must reactivate your account.") % person.environment.name, |
| 9 | :content_type => 'text/html', | 12 | :content_type => 'text/html', |
| 10 | - :body => {:person => person, | ||
| 11 | - :environment => person.environment, | ||
| 12 | - :url => url_for(:host => person.default_hostname, :controller => 'account', :action => 'forgot_password')} | ||
| 13 | ) | 13 | ) |
| 14 | end | 14 | end |
| 15 | 15 |
plugins/spaminator/views/spaminator_plugin/mailer/inactive_person_notification.html.erb
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | <%= _('Due to the recent increase in the number of spams on %s, we decided to deactivate all inactive users on the network. It just happens that you are one of them! But there is no need to worry. Your account is completely preserved and if you want to reactivate it you just need to click on the following link and recover your password (since it was changed to a huge scramble of random characters):') % @environment.name %> | 10 | <%= _('Due to the recent increase in the number of spams on %s, we decided to deactivate all inactive users on the network. It just happens that you are one of them! But there is no need to worry. Your account is completely preserved and if you want to reactivate it you just need to click on the following link and recover your password (since it was changed to a huge scramble of random characters):') % @environment.name %> |
| 11 | </p> | 11 | </p> |
| 12 | <p> | 12 | <p> |
| 13 | - <%= @url %> | 13 | + <a href="<%= @url %>"><%= @url %></a> |
| 14 | </p> | 14 | </p> |
| 15 | <p> | 15 | <p> |
| 16 | <%= _("We are sorry that this procedure might bother you a lot, but it's necessary for the healthy of our network.") %> | 16 | <%= _("We are sorry that this procedure might bother you a lot, but it's necessary for the healthy of our network.") %> |
script/install-dependencies/ubuntu-precise.sh
| @@ -7,7 +7,7 @@ export DEBIAN_INTERFACE=noninteractive | @@ -7,7 +7,7 @@ export DEBIAN_INTERFACE=noninteractive | ||
| 7 | 7 | ||
| 8 | run sudo apt-get install -qy dctrl-tools | 8 | run sudo apt-get install -qy dctrl-tools |
| 9 | 9 | ||
| 10 | -packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debian/control | sed -e 's/([^)]*)//g; s/,\s*/\n/g' | grep -v 'rake\|ruby\|thin\|debhelper\|cucumber\|rail\|memcached\|debconf\|dbconfig-common\|misc:Depends\|adduser\|mail-transport-agent') | 10 | +packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debian/control | sed -e 's/([^)]*)//g; s/,\s*/\n/g' | grep -v 'rake\|ruby\|thin\|debhelper\|cucumber\|rail\|memcached\|debconf\|dbconfig-common\|misc:Depends\|adduser\|mail-transport-agent\|bundler\|unicorn') |
| 11 | 11 | ||
| 12 | run sudo apt-get install -qy ruby1.9.1-full build-essential libxml2-dev libxslt-dev libpq-dev libmagickcore-dev libmagickwand-dev $packages | 12 | run sudo apt-get install -qy ruby1.9.1-full build-essential libxml2-dev libxslt-dev libpq-dev libmagickcore-dev libmagickwand-dev $packages |
| 13 | 13 |